Merge "Remove unecessary logs" into main am: 5e487ed591 am: 5079417396
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3191355
Change-Id: Icc26cb00766929916b02230bdabc573d6c95c530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index cb898be..4c472c8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,6 +68,9 @@
static_libs: [
// External dependencies
"androidx.navigation_navigation-fragment-ktx",
+ "androidx.slice_slice-builders",
+ "androidx.slice_slice-core",
+ "androidx.slice_slice-view",
"androidx.window_window-java",
"gson",
"guava",
@@ -85,6 +88,8 @@
"notification_flags_lib",
"securebox",
"android.os.flags-aconfig-java",
+ "//frameworks/libs/systemui:com_android_systemui_shared_flags_lib",
+ "WindowManager-Shell-shared-desktopMode",
// Settings dependencies
"FingerprintManagerInteractor",
@@ -108,8 +113,6 @@
"telephony_flags_core_java_lib",
"setupdesign-lottie-loading-layout",
"device_policy_aconfig_flags_lib",
- "kotlinx-coroutines-core",
- "kotlinx-coroutines-android",
],
plugins: ["androidx.room_room-compiler-plugin"],
@@ -125,6 +128,9 @@
"telephony-common",
"ims-common",
],
+ flags_packages: [
+ "android.app.flags-aconfig",
+ ],
}
platform_compat_config {
@@ -155,6 +161,9 @@
optimize: {
proguard_flags_files: ["proguard.flags"],
},
+ flags_packages: [
+ "android.app.flags-aconfig",
+ ],
}
android_library_import {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 90b42f4..223b473f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -140,7 +140,7 @@
<uses-permission android:name="android.permission.REMAP_MODIFIER_KEYS" />
<uses-permission android:name="android.permission.ACCESS_GPU_SERVICE" />
<uses-permission android:name="android.permission.MANAGE_GAME_MODE" />
- <uses-permission android:name="android.permission.RESTART_PHONE_PROCESS" />
+ <uses-permission android:name="android.permission.RESTART_TELEPHONY_PROCESS" />
<uses-permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES" />
<uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />
@@ -1287,20 +1287,63 @@
</activity>
<activity
- android:name="Settings$ZenModeSettingsActivity"
+ android:name="Settings$ModesSettingsActivity"
android:label="@string/zen_mode_settings_title"
android:icon="@drawable/ic_homepage_notification"
android:exported="true">
- <intent-filter android:priority="1">
+ <intent-filter android:priority="1"
+ android:featureFlag="android.app.modes_ui">
<action android:name="android.settings.ZEN_MODE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
+ <intent-filter android:priority="1"
+ android:featureFlag="android.app.modes_ui">
<action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="41">
+ <intent-filter android:priority="41"
+ android:featureFlag="android.app.modes_ui">
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ <intent-filter android:priority="10"
+ android:featureFlag="android.app.modes_ui">
+ <action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="10"
+ android:featureFlag="android.app.modes_ui">
+ <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
+ <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.notification.modes.ZenModesListFragment"/>
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_notifications"/>
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
+ <activity
+ android:name="Settings$ZenModeSettingsActivity"
+ android:label="@string/zen_mode_settings_title"
+ android:icon="@drawable/ic_homepage_notification"
+ android:exported="true">
+ <intent-filter android:priority="1"
+ android:featureFlag="!android.app.modes_ui">
+ <action android:name="android.settings.ZEN_MODE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="1"
+ android:featureFlag="!android.app.modes_ui">
+ <action android:name="android.settings.ZEN_MODE_PRIORITY_SETTINGS" />
+ <category android:name="android.intent.category.BROWSABLE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="41"
+ android:featureFlag="!android.app.modes_ui">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
@@ -1313,6 +1356,20 @@
</activity>
<activity
+ android:name="Settings$ModeSettingsActivity"
+ android:exported="true">
+ <intent-filter android:priority="1"
+ android:featureFlag="android.app.modes_ui">
+ <action android:name="android.settings.AUTOMATIC_ZEN_RULE_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.notification.modes.ZenModeFragment"/>
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
+ <activity
android:name=".notification.zen.ZenSuggestionActivity"
android:label="@string/zen_mode_settings_title"
android:icon="@drawable/ic_suggestion_dnd"
@@ -1351,11 +1408,13 @@
android:label="@string/zen_mode_automation_settings_title"
android:icon="@drawable/ic_notifications"
android:exported="true">
- <intent-filter android:priority="1">
+ <intent-filter android:priority="10"
+ android:featureFlag="!android.app.modes_ui">
<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="1">
+ <intent-filter android:priority="10"
+ android:featureFlag="!android.app.modes_ui">
<action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1368,6 +1427,19 @@
android:value="true" />
</activity>
+ <activity
+ android:name=".Settings$ManageAdaptiveNotificationsActivity"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.settings.MANAGE_ADAPTIVE_NOTIFICATIONS"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.notification.PoliteNotificationsPreferenceFragment" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_notifications"/>
+ </activity>
+
<activity android:name="Settings$WallpaperSettingsActivity"
android:label="@string/wallpaper_settings_fragment_title"
android:icon="@drawable/ic_wallpaper"
@@ -2727,7 +2799,9 @@
<activity android:name=".biometrics.fingerprint.FingerprintSettings"
android:exported="false"
android:taskAffinity="com.android.settings.root" />
- <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor"
+ android:exported="false"
+ android:theme="@style/GlifTheme.Light"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>
@@ -2741,26 +2815,14 @@
</intent-filter>
</activity>
- <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity"
- android:exported="true"
- android:theme="@style/GlifTheme.Light" />
-
- <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$InternalActivity"
- android:exported="false"
- android:theme="@style/GlifTheme.Light"
- android:taskAffinity="com.android.settings.root" />
-
- <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity$SetupActivity"
- android:exported="true"
- android:permission="android.permission.MANAGE_FINGERPRINT"
- android:theme="@style/GlifTheme.Light" />
-
<activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroductionInternal"
android:exported="false"
android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.root" />
- <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor"
+ android:exported="false"
+ android:theme="@style/GlifTheme.Light"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"
@@ -2832,17 +2894,20 @@
<!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name=".password.ConfirmLockPattern$InternalActivity"
android:exported="false"
+ android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light"/>
<!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name=".password.ConfirmLockPassword$InternalActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize"
+ android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".password.SetupChooseLockGeneric"
android:theme="@style/GlifTheme.Light"
android:exported="true"
+ android:enableOnBackInvokedCallback="false"
android:label="@string/lock_settings_picker_title">
<intent-filter android:priority="1">
<action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -2852,16 +2917,19 @@
<activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
android:exported="false"
+ android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" />
<activity android:name=".password.ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true"
+ android:enableOnBackInvokedCallback="false"
android:exported="false" />
<activity android:name=".password.SetNewPasswordActivity"
android:theme="@android:style/Theme.NoDisplay"
android:exported="true"
+ android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" >
<intent-filter android:priority="1">
<action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -2907,24 +2975,29 @@
<activity android:name=".password.ChooseLockGeneric$InternalActivity"
android:exported="false"
android:label="@string/lockpassword_choose_lock_generic_header"
+ android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" />
<activity android:name=".password.SetupChooseLockPattern"
android:exported="false"
+ android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.ChooseLockPattern"
android:exported="false"
+ android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.SetupChooseLockPassword"
android:exported="false"
android:theme="@style/GlifTheme.Light"
+ android:enableOnBackInvokedCallback="false"
android:windowSoftInputMode="stateVisible|adjustResize" />
<activity android:name=".password.ChooseLockPassword"
android:exported="false"
android:theme="@style/GlifTheme.Light"
+ android:enableOnBackInvokedCallback="false"
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity
@@ -5100,6 +5173,15 @@
<activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>
<activity android:name=".spa.SpaAppBridgeActivity" android:exported="false"/>
+ <activity
+ android:name=".spa.search.SpaSearchLandingActivity"
+ android:exported="true">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.SPA_SEARCH_LANDING" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".Settings$FingerprintSettingsActivityV2"
android:label="@string/security_settings_fingerprint_preference_title"
android:exported="false"
diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig
index 2c92547..3092b8f 100644
--- a/aconfig/accessibility/accessibility_flags.aconfig
+++ b/aconfig/accessibility/accessibility_flags.aconfig
@@ -11,6 +11,26 @@
}
flag {
+ name: "audio_balance_state_description"
+ namespace: "accessibility"
+ description: "Provides a more valuable state description to the audio balance slider."
+ bug: "319575109"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
+
+flag {
+ name: "check_prebundled_is_preinstalled"
+ namespace: "accessibility"
+ description: "Checks that all 'prebundled' components, used for grouping, are also preinstalled"
+ bug: "353888087"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
+}
+
+flag {
name: "edit_shortcuts_in_full_screen"
namespace: "accessibility"
description: "Show the edit shorcuts screen in full screen, since the shortcut options are increasing."
diff --git a/aconfig/settings_bluetooth_declarations.aconfig b/aconfig/settings_bluetooth_declarations.aconfig
index c2684f2..b8b9d9f 100644
--- a/aconfig/settings_bluetooth_declarations.aconfig
+++ b/aconfig/settings_bluetooth_declarations.aconfig
@@ -24,3 +24,10 @@
purpose: PURPOSE_BUGFIX
}
}
+
+flag {
+ name: "enable_bluetooth_device_details_polish"
+ namespace: "cross_device_experiences"
+ description: "Gates whether to enable bluetooth device details polish"
+ bug: "343317785"
+}
diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
index 7942ccd..b255096 100644
--- a/aconfig/settings_connecteddevice_flag_declarations.aconfig
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -9,13 +9,26 @@
}
flag {
+ name: "rotation_connected_display_setting"
+ namespace: "display_manager"
+ description: "Allow changing rotation of the connected display."
+ bug: "294015706"
+}
+
+flag {
+ name: "resolution_and_enable_connected_display_setting"
+ namespace: "display_manager"
+ description: "Allow enabling/disabling and changing resolution of the connected display."
+ bug: "253296253"
+}
+
+flag {
name: "enable_auth_challenge_for_usb_preferences"
namespace: "safety_center"
description: "Gates whether to require an auth challenge for changing USB preferences"
bug: "317367746"
}
-
flag {
name: "enable_bonded_bluetooth_device_searchable"
namespace: "pixel_cross_device_control"
@@ -24,4 +37,14 @@
metadata {
purpose: PURPOSE_BUGFIX
}
+}
+
+flag {
+ name: "exclude_webcam_auth_challenge"
+ namespace: "safety_center"
+ description: "Gates whether to exclude webcam from USB preferences auth challenge."
+ bug: "349370229"
+ metadata {
+ purpose: PURPOSE_BUGFIX
+ }
}
\ No newline at end of file
diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig
index b90ff9f..2c8eade 100644
--- a/aconfig/settings_flag_declarations.aconfig
+++ b/aconfig/settings_flag_declarations.aconfig
@@ -42,3 +42,10 @@
description: "Feature flag to remove relevant slices dependencies."
bug: "297367302"
}
+
+flag {
+ name: "support_raw_dynamic_icons"
+ namespace: "android_settings"
+ description: "Flag to gate support of injected preference icons containing raw data"
+ bug: "351884562"
+}
diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig
index 48f3a29..2f046d0 100644
--- a/aconfig/settings_globalintl_flag_declarations.aconfig
+++ b/aconfig/settings_globalintl_flag_declarations.aconfig
@@ -14,3 +14,10 @@
description: "Feature flag for locale notification"
bug: "301380610"
}
+
+flag {
+ name: "accessibility_appearance_settings_backup_enabled"
+ namespace: "globalintl"
+ description: "Feature flag for B&R accessibility appearance settings"
+ bug: "341210043"
+}
diff --git a/aconfig/settings_wifi_flag_declarations.aconfig b/aconfig/settings_wifi_flag_declarations.aconfig
new file mode 100644
index 0000000..cb8007f
--- /dev/null
+++ b/aconfig/settings_wifi_flag_declarations.aconfig
@@ -0,0 +1,12 @@
+package: "com.android.settings.flags"
+container: "system_ext"
+
+# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
+
+flag {
+ name: "enable_wifi_sharing_runtime_fragment"
+ namespace: "prism_qr"
+ description: "Use WifiFeatureProvider to get the instance of WifiDppQrCodeGeneratorFragment."
+ bug: "329012096"
+}
+
diff --git a/proguard.flags b/proguard.flags
index 492404c..d1c97f3 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -65,3 +65,6 @@
-keep class androidx.window.extensions.** { *; }
-dontwarn androidx.window.extensions.**
-keep class androidx.window.** { *; }
+
+# Keep the com.android.settings.media_drm.FakeFeatureFlagsImpl
+-keep class com.android.settings.media_drm.FakeFeatureFlagsImpl { *; }
diff --git a/res-product/values-af/strings.xml b/res-product/values-af/strings.xml
index da5e11d..9aa1a22 100644
--- a/res-product/values-af/strings.xml
+++ b/res-product/values-af/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"\'n PIN word vereis om Gesigslot op te stel.\n\n\'n PIN beskerm die foon as dit verloor of gesteel word."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"\'n Patroon word vereis om Gesigslot op te stel.\n\n\'n Patroon beskerm die foon as dit verloor of gesteel word."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"\'n Wagwoord word vereis om Gesigslot op te stel.\n\n\'n Wagwoord beskerm die foon as dit verloor of gesteel word."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"\'n PIN word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n PIN beskerm die tablet as dit verloor of gesteel word."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"\'n Patroon word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Patroon beskerm die tablet as dit verloor of gesteel word."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"\'n Wagwoord word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Wagwoord beskerm die tablet as dit verloor of gesteel word."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"\'n PIN word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n PIN beskerm die toestel as dit verloor of gesteel word."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"\'n Patroon word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Patroon beskerm die toestel as dit verloor of gesteel word."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"\'n Wagwoord word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Wagwoord beskerm die toestel as dit verloor of gesteel word."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"\'n PIN word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n PIN beskerm die foon as dit verloor of gesteel word."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"\'n Patroon word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Patroon beskerm die foon as dit verloor of gesteel word."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"\'n Wagwoord word vereis om Gesigslot en Vingerafdrukslot op te stel.\n\n\'n Wagwoord beskerm die foon as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"’n PIN word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n PIN beskerm die tablet as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"’n Patroon word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Patroon beskerm die tablet as dit verloor of gesteel word."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"’n Wagwoord word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Wagwoord beskerm die tablet as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"’n PIN word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n PIN beskerm die toestel as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"’n Patroon word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Patroon beskerm die toestel as dit verloor of gesteel word."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"’n Wagwoord word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Wagwoord beskerm die toestel as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"’n PIN word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n PIN beskerm die foon as dit verloor of gesteel word."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"’n Patroon word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Patroon beskerm die foon as dit verloor of gesteel word."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"’n Wagwoord word vereis om Vingerafdrukslot en Gesigslot op te stel.\n\n’n Wagwoord beskerm die foon as dit verloor of gesteel word."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou foon geberg is"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou tablet geberg is"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dit vee die vingerafdrukprente en -model uit wat met \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" geassosieer word en op jou toestel geberg is"</string>
diff --git a/res-product/values-am/strings.xml b/res-product/values-am/strings.xml
index f798028..6a7d19b 100644
--- a/res-product/values-am/strings.xml
+++ b/res-product/values-am/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"በመልክ መክፈትን ለማዋቀር ፒን ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"በመልክ መክፈትን ለማዋቀር ስርዓተ ጥለት ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ስርዓተ ጥለት ይጠብቀዋል።"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"በመልክ መክፈትን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ፒን ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ስርዓተ ጥለት ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ ስርዓተ ጥለት ይጠብቀዋል።"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ፒን ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ስርዓተ ጥለት ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ ስርዓተ ጥለት ይጠብቀዋል።"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ፒን ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር ስርዓተ ጥለት ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ስርዓተ ጥለት ይጠብቀዋል።"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"በመልክ መክፈት እና በጣት አሻራ መክፈቻን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ፒን ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ሥርዓተ ጥለት ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ ሥርዓተ ጥለት ይጠብቀዋል።"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nጡባዊው ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ፒን ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ሥርዓተ ጥለት ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ ሥርዓተ ጥለት ይጠብቀዋል።"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"በጣት አሻራ መክፈቻን እና በመልክ መክፈት ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nመሣሪያው ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ፒን ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ፒን ይጠብቀዋል።"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር ሥርዓተ ጥለት ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ ሥርዓተ ጥለት ይጠብቀዋል።"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"በጣት አሻራ መክፈቻን እና በመልክ መክፈትን ለማዋቀር የይለፍ ቃል ያስፈልጋል።\n\nስልኩ ከጠፋ ወይም ከተሰረቀ የይለፍ ቃል ይጠብቀዋል።"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ይህ በስልክዎ ላይ የተከማቹት የጣት አሻራ ምስሎችን እና ከ«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» ጋር የተጎዳኘውን ሞዴል ይሰርዛል"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ይህ በጡባዊዎ ላይ የተከማቹት የጣት አሻራ ምስሎችን እና ከ«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» ጋር የተጎዳኘውን ሞዴል ይሰርዛል"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ይህ በመሣሪያዎ ላይ ከተከማቸው «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» ጋር የተጎዳኙ የጣት አሻራ ምስሎችን እና ሞዴልን ይሰርዛል"</string>
diff --git a/res-product/values-ar/strings.xml b/res-product/values-ar/strings.xml
index 3e9ddb5..2a5fce0 100644
--- a/res-product/values-ar/strings.xml
+++ b/res-product/values-ar/strings.xml
@@ -170,24 +170,24 @@
<string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3396830571282413409">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز ببصمة الإصبع\".\n\nيحمي رقم التعريف الشخصي الجهاز في حال فقدانه أو سرقته."</string>
<string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="2952431330433118050">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز ببصمة الإصبع\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>
<string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="8499384469890032816">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز ببصمة الإصبع\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="657464034320090412">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="1057921621902514520">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي النقش الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_face_message" product="tablet" msgid="7178731554533608255">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nتحمي كلمة المرور الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_face_message" product="device" msgid="1932467886606343431">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_face_message" product="device" msgid="3670112640345602511">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي النقش الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_face_message" product="device" msgid="256847653854178247">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nتحمي كلمة المرور الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي رقم التعريف الشخصي الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي رقم التعريف الشخصي الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي النقش الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nتحمي كلمة المرور الجهاز اللوحي في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي رقم التعريف الشخصي الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي النقش الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nتحمي كلمة المرور الجهاز في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي رقم التعريف الشخصي الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="657464034320090412">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="1057921621902514520">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي النقش الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_face_message" product="tablet" msgid="7178731554533608255">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_face_message" product="device" msgid="1932467886606343431">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_face_message" product="device" msgid="3670112640345602511">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي النقش الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_face_message" product="device" msgid="256847653854178247">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"يجب ضبط رقم تعريف شخصي لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"يجب ضبط نقش لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"يجب ضبط كلمة مرور لإعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nيحمي النقش الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الجهاز اللوحي في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nيحمي النقش الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الجهاز في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"يجب ضبط رقم تعريف شخصي لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nيحمي رقم التعريف الشخصي الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"يجب ضبط نقش لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز بببصمة الوجه\".\n\nيحمي النقش الهاتف في حال فقدانه أو سرقته."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"يجب ضبط كلمة مرور لإعداد ميزتَي \"فتح الجهاز ببصمة الإصبع\" و\"فتح الجهاز ببصمة الوجه\".\n\nتحمي كلمة المرور الهاتف في حال فقدانه أو سرقته."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على هاتفك"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك اللوحي"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"يؤدي هذا الإجراء إلى حذف النموذج والصور المرتبطة ببصمة الإصبع \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\"، والتي تم تخزينها على جهازك"</string>
diff --git a/res-product/values-as/strings.xml b/res-product/values-as/strings.xml
index 157f78a..9d9dd51 100644
--- a/res-product/values-as/strings.xml
+++ b/res-product/values-as/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ফেচ আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ফেচ আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ফেচ আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে টেবলেটটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে টেবলেটটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ফেচ আনলক ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে টেবলেটটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে ডিভাইছটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে ডিভাইছটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ফেচ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে ফ’নটো হেৰালে অথবা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে টেবলেটটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে টেবলেটটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ফে’চ আনলক ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে টেবলেটটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে ডিভাইচটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে ডিভাইচটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে ডিভাইচটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পিনৰ আৱশ্যক।\n\nএটা পিনে ফ’নটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা আৰ্হিৰ আৱশ্যক।\n\nএটা আৰ্হিয়ে ফ’নটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ফে’চ আনলক আৰু ফিংগাৰপ্ৰিণ্ট আনলক ছেট আপ কৰিবলৈ এটা পাছৱৰ্ডৰ আৱশ্যক।\n\nএটা পাছৱৰ্ডে ফ’নটো হেৰালে বা চুৰি হ’লে সেইটো সুৰক্ষিত কৰে।"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"এইটোৱে আপোনাৰ ফ’নটোত ষ্ট’ৰ হৈ থকা \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ৰ সৈতে জড়িত ফিংগাৰপ্ৰিণ্টৰ প্ৰতিচ্ছবি আৰু মডেল মচি পেলায়"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"এইটোৱে আপোনাৰ টেবলেটটোত ষ্ট’ৰ হৈ থকা \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ৰ সৈতে জড়িত ফিংগাৰপ্ৰিণ্টৰ প্ৰতিচ্ছবি আৰু মডেল মচি পেলায়"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"এইটোৱে আপোনাৰ ডিভাইচত ষ্ট’ৰ হৈ থকা \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'ৰ সৈতে জড়িত ফিংগাৰপ্ৰিণ্টৰ প্ৰতিচ্ছবি আৰু মডেল মচি পেলায়"</string>
diff --git a/res-product/values-az/strings.xml b/res-product/values-az/strings.xml
index 62f2db8..b54794c 100644
--- a/res-product/values-az/strings.xml
+++ b/res-product/values-az/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Feyskontrol üçün PIN lazımdır.\n\nCihaz itəndə və ya oğurlananda məlumatları qoruyur."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Üz ilə kiliddən çıxarma ayarlamaq üçün model tələb edilir.\n\nTelefonunuz itdikdə və ya oğurlandıqda model onu qoruyur."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Üz ilə kiliddən çıxarma ayarlamaq üçün parol tələb edilir.\n\nTelefonunuz itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Feyskontrol və barmaq izi ilə kiliddən çıxarmaq üçün PIN lazımdır.\n\nCihaz itəndə və ya oğurlananda məlumatları qoruyur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün model tələb edilir.\n\nPlanşetiniz itdikdə və ya oğurlandıqda model onu qoruyur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün parol tələb edilir.\n\nPlanşetiniz itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Feyskontrol və barmaq izi ilə kiliddən çıxarmaq üçün PIN lazımdır.\n\nCihaz itəndə və ya oğurlananda məlumatları qoruyur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün model tələb edilir.\n\nCihazınız itdikdə və ya oğurlandıqda model onu qoruyur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün parol tələb edilir.\n\nCihazınız itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Feyskontrol və barmaq izi ilə kiliddən çıxarmaq üçün PIN lazımdır.\n\nCihaz itəndə və ya oğurlananda məlumatları qoruyur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün model tələb edilir.\n\nTelefonunuz itdikdə və ya oğurlandıqda model onu qoruyur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Üz ilə kiliddən çıxarma və Barmaq izi ilə kiliddən çıxarma ayarlamaq üçün parol tələb edilir.\n\nTelefonunuz itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün PIN tələb edilir.\n\nPlanşet itdikdə və ya oğurlandıqda PIN onu qoruyur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün model tələb edilir.\n\nPlanşet itdikdə və ya oğurlandıqda model onu qoruyur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün parol tələb edilir.\n\nPlanşet itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün PIN tələb edilir.\n\nCihaz itdikdə və ya oğurlandıqda PIN onu qoruyur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün model tələb edilir.\n\nCihaz itdikdə və ya oğurlandıqda model onu qoruyur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün parol tələb edilir.\n\nCihaz itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün PIN tələb edilir.\n\nTelefon itdikdə və ya oğurlandıqda PIN onu qoruyur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün model tələb edilir.\n\nTelefon itdikdə və ya oğurlandıqda model onu qoruyur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Barmaqla Kilidaçma və Üzlə Kilidaçma ayarlamaq üçün parol tələb edilir.\n\nTelefon itdikdə və ya oğurlandıqda parol onu qoruyur."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Bu, telefonunuzda saxlanılan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ilə əlaqəli barmaq izi şəkillərini və modelini silir"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Bu, planşetinizdə saxlanılan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ilə əlaqəli barmaq izi şəkillərini və modelini silir"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Bu, cihazınızda saxlanılan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ilə əlaqəli barmaq izi şəkillərini və modelini silir"</string>
diff --git a/res-product/values-b+sr+Latn/strings.xml b/res-product/values-b+sr+Latn/strings.xml
index bbb1d70..7926331 100644
--- a/res-product/values-b+sr+Latn/strings.xml
+++ b/res-product/values-b+sr+Latn/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Za podešavanje otključavanja licem neophodan je PIN.\n\nPIN štiti telefon ako ga izgubite ili ga neko ukrade."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Za podešavanje otključavanja licem neophodan je šablon.\n\nŠablon štiti telefon ako ga izgubite ili ga neko ukrade."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Za podešavanje otključavanja licem neophodna je lozinka.\n\nLozinka štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Za podešavanje otključavanja licem i otiskom prsta neophodan je PIN.\n\nPIN štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Za podešavanje otključavanja licem i otiskom prsta neophodan je šablon.\n\nŠablon štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Za podešavanje otključavanja licem i otiskom prsta neophodna je lozinka.\n\nLozinka štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Za podešavanje otključavanja licem i otiskom prsta neophodan je PIN.\n\nPIN štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Za podešavanje otključavanja licem i otiskom prsta neophodan je šablon.\n\nŠablon štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Za podešavanje otključavanja licem i otiskom prsta neophodna je lozinka.\n\nLozinka štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Za podešavanje otključavanja licem i otiskom prsta neophodan je PIN.\n\nPIN štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Za podešavanje otključavanja licem i otiskom prsta neophodan je šablon.\n\nŠablon štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Za podešavanje otključavanja licem i otiskom prsta neophodna je lozinka.\n\nLozinka štiti telefon ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je PIN.\n\nPIN štiti tablet ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je šablon.\n\nŠablon štiti tablet ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodna je lozinka.\n\nLozinka štiti tablet ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je PIN.\n\nPIN štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je šablon.\n\nŠablon štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodna je lozinka.\n\nLozinka štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je PIN.\n\nPIN štiti telefon ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodan je šablon.\n\nŠablon štiti telefon ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Za podešavanje otključavanja otiskom prsta i otključavanja licem neophodna je lozinka.\n\nLozinka štiti telefon ako ga izgubite ili ga neko ukrade."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ovim se brišu slike i model otiska prsta u vezi sa otiskom <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su sačuvani na telefonu"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ovim se brišu slike i model otiska prsta u vezi sa otiskom <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su sačuvani na tabletu"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ovim se brišu slike i model otiska prsta u vezi sa otiskom <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su sačuvani na uređaju"</string>
diff --git a/res-product/values-be/strings.xml b/res-product/values-be/strings.xml
index 2fe5f40..d4d2f19 100644
--- a/res-product/values-be/strings.xml
+++ b/res-product/values-be/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Каб наладзіць распазнаванне твару, неабходна ўвесці PIN-код.\n\nPIN-код абараняе тэлефон у выпадку страты ці крадзяжу."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Каб наладзіць распазнаванне твару, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе тэлефон у выпадку страты ці крадзяжу."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Каб наладзіць распазнаванне твару, неабходна ўвесці пароль.\n\nПароль абараняе тэлефон у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці PIN-код.\n\nPIN-код абараняе планшэт у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе планшэт у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці пароль.\n\nПароль абараняе планшэт у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці PIN-код.\n\nPIN-код абараняе прыладу ў выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе прыладу ў выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці пароль.\n\nПароль абараняе прыладу ў выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці PIN-код.\n\nPIN-код абараняе тэлефон у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе тэлефон у выпадку страты ці крадзяжу."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Каб наладзіць распазнаванне твару і разблакіроўку адбіткам пальца, неабходна ўвесці пароль.\n\nПароль абараняе тэлефон у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці PIN-код.\n\nPIN-код абараняе планшэт у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе планшэт у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці пароль.\n\nПароль абараняе планшэт у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці PIN-код.\n\nPIN-код абараняе прыладу ў выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе прыладу ў выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці пароль.\n\nПароль абараняе прыладу ў выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці PIN-код.\n\nPIN-код абараняе тэлефон у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці ўзор разблакіроўкі.\n\nУзор разблакіроўкі абараняе тэлефон у выпадку страты ці крадзяжу."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Каб наладзіць разблакіроўку адбіткам пальца і распазнаванне твару, неабходна ўвесці пароль.\n\nПароль абараняе тэлефон у выпадку страты ці крадзяжу."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Відарысы і мадэль адбіткаў пальцаў, звязаныя з адбіткам \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", будуць выдалены з тэлефона"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Відарысы і мадэль адбіткаў пальцаў, звязаныя з адбіткам \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", будуць выдалены з планшэта"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Відарысы і мадэль адбіткаў пальцаў, звязаныя з адбіткам \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", будуць выдалены з прылады"</string>
diff --git a/res-product/values-bg/strings.xml b/res-product/values-bg/strings.xml
index bd8df6d..d9c1be5 100644
--- a/res-product/values-bg/strings.xml
+++ b/res-product/values-bg/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"За настройване на функцията за отключване с лице се изисква ПИН код.\n\nПИН кодът защитава телефона, ако бъде изгубен или откраднат."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"За настройване на функцията за отключване с лице се изисква фигура.\n\nФигурата защитава телефона, ако бъде изгубен или откраднат."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"За настройване на функцията за отключване с лице се изисква парола.\n\nПаролата защитава телефона, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава таблета, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава таблета, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава таблета, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава устройството, ако бъде изгубено или откраднато."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава устройството, ако бъде изгубено или откраднато."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава устройството, ако бъде изгубено или откраднато."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава телефона, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава телефона, ако бъде изгубен или откраднат."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава телефона, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава таблета, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава таблета, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава таблета, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава устройството, ако бъде изгубено или откраднато."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава устройството, ако бъде изгубено или откраднато."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава устройството, ако бъде изгубено или откраднато."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"За настройване на функциите за отключване с лице и отпечатък се изисква ПИН код.\n\nПИН кодът защитава телефона, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"За настройване на функциите за отключване с лице и отпечатък се изисква фигура.\n\nФигурата защитава телефона, ако бъде изгубен или откраднат."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"За настройване на функциите за отключване с лице и отпечатък се изисква парола.\n\nПаролата защитава телефона, ако бъде изгубен или откраднат."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Това действие ще изтрие изображенията и модела на отпечатъка, свързани с(ъс) <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> и съхранявани на телефона ви"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Това действие ще изтрие изображенията и модела на отпечатъка, свързани с(ъс) <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> и съхранявани на таблета ви"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Това действие ще изтрие изображенията и модела на отпечатъка, свързани с(ъс) <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> и съхранявани на това устройство"</string>
diff --git a/res-product/values-bn/strings.xml b/res-product/values-bn/strings.xml
index d7e0e3a..e7187b6 100644
--- a/res-product/values-bn/strings.xml
+++ b/res-product/values-bn/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"\'ফেস আনলক\' সেট আপ করতে একটি পিন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"\'ফেস আনলক\' সেট আপ করতে একটি প্যাটার্ন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"\'ফেস আনলক\' সেট আপ করতে একটি পাসওয়ার্ড প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পিন প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি প্যাটার্ন প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পাসওয়ার্ড প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পিন প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি প্যাটার্ন প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পাসওয়ার্ড প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পিন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট-আপ করতে একটি প্যাটার্ন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"\'ফেস আনলক\' এবং \'ফিঙ্গারপ্রিন্ট আনলক\' সেট আপ করতে একটি পাসওয়ার্ড প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পিন প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে প্যাটার্ন প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পাসওয়ার্ড প্রয়োজন।\n\nট্যাবলেট হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পিন প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে প্যাটার্ন প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পাসওয়ার্ড প্রয়োজন।\n\nডিভাইস হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পিন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পিন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে প্যাটার্ন প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, প্যাটার্ন সেটি সুরক্ষিত রাখে।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"\'ফিঙ্গারপ্রিন্ট আনলক\' এবং \'ফেস আনলক\' সেট-আপ করতে পাসওয়ার্ড প্রয়োজন।\n\nফোন হারিয়ে বা চুরি হয়ে গেলে, পাসওয়ার্ড সেটি সুরক্ষিত রাখে।"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"এটি আপনার ফোনে সেভ হয়ে থাকা \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-এর সাথে সম্পর্কিত ফিঙ্গারপ্রিন্টের ছবি ও মডেল মুছে দেয়"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"এটি আপনার ট্যাবলেটে সেভ হয়ে থাকা ফিঙ্গারপ্রিন্টের ছবি এবং \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-এর সাথে সম্পর্কিত অন্যান্য মডেল মুছে দেয়"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"এটি আপনার ডিভাইসে স্টোর হয়ে থাকা আঙ্গুলের ছাপের ইমেজ এবং \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-এর সঙ্গে সম্পর্কিত অন্যান্য মডেল মুছে দেয়"</string>
diff --git a/res-product/values-bs/strings.xml b/res-product/values-bs/strings.xml
index 7586f2d..c2690d1 100644
--- a/res-product/values-bs/strings.xml
+++ b/res-product/values-bs/strings.xml
@@ -100,13 +100,13 @@
<string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"Koristite lice da otključate telefon ili izvršite autentifikaciju u aplikacijama, npr. kada se prijavljujete ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTelefon možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTelefon može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTelefon može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="tablet" msgid="6932278790700490818">"Koristite lice da otključate tablet ili izvršite autentifikaciju u aplikacijama, npr. kada se prijavljujete ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTablet možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTablet može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTablet može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"Koristite lice da otključate uređaj ili izvršite autentifikaciju u aplikacijama, npr. kada se prijavljujete ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nUređaj možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nUređaj može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nUređaj može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"Koristite lice da otključate telefon ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTelefon možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTelefon može otključati i neko drugi ako ga prinese vašem licu.\n\nTelefon može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"Koristite lice da otključate tablet ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTablet možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTablet može otključati i neko drugi ako ga prinese vašem licu.\n\nTablet može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Koristite lice da otključate uređaj ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nUređaj možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nUređaj može otključati i neko drugi ako ga prinese vašem licu.\n\nUređaj može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Koristite lice da otključate telefon ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTelefon možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTelefon može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTelefon može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Koristite lice da otključate tablet ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTablet možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTablet može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTablet može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Koristite lice da otključate uređaj ili potvrdite identitet, npr. kada se prijavljujete u aplikacije ili odobravate kupovinu.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nUređaj možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nUređaj može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nUređaj može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
- <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Pomoću otiska prsta otključajte uređaj <xliff:g id="DEVICENAME">%s</xliff:g> ili potvrdite svoj identitet, naprimjer kada se prijavljujete u aplikacije ili odobravate kupovinu"</string>
+ <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"Koristite lice da otključate telefon ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTelefon možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTelefon može otključati i neko drugi ako ga prinese vašem licu.\n\nTelefon može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"Koristite lice da otključate tablet ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTablet možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTablet može otključati i neko drugi ako ga prinese vašem licu.\n\nTablet može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Koristite lice da otključate uređaj ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nUređaj možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nUređaj može otključati i neko drugi ako ga prinese vašem licu.\n\nUređaj može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Koristite lice da otključate telefon ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTelefon možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTelefon može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTelefon može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Koristite lice da otključate tablet ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nTablet možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nTablet može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nTablet može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Koristite lice da otključate uređaj ili potvrdite identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine.\n\nImajte na umu:\nu datom trenutku možete imati postavljeno samo jedno lice. Da dodate drugo lice, izbrišite postojeće.\n\nUređaj možete otključati ako pogledate u njega čak i ako vam to nije bila namjera.\n\nUređaj može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nUređaj može otključati osoba koja mnogo liči na vas, npr. identični blizanac."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Pomoću otiska prsta otključajte uređaj <xliff:g id="DEVICENAME">%s</xliff:g> ili potvrdite svoj identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine"</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Dozvolite djetetu da koristi otisak prsta da otključa telefon ili potvrdi identitet. To će se dešavati prilikom prijava u aplikacije, odobravanja kupovina i drugih radnji."</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Dozvolite djetetu da koristi otisak prsta da otključa tablet ili potvrdi identitet. To će se dešavati prilikom prijava u aplikacije, odobravanja kupovina i drugih radnji."</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Dozvolite djetetu da koristi otisak prsta da otključa uređaj ili potvrdi identitet. To će se dešavati prilikom prijava u aplikacije, odobravanja kupovina i drugih radnji."</string>
@@ -131,9 +131,9 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Telefon vašeg djeteta se može otključati kada to djetetu nije namjera, npr. kada ga neko prinese prstu djeteta."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"Tablet vašeg djeteta se može otključati kada to djetetu nije namjera, npr. kada ga neko prinese prstu djeteta."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"Uređaj vašeg djeteta se može otključati kada to djetetu nije namjera, npr. kada ga neko prinese prstu djeteta."</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Otiskom prsta otključajte tablet ili potvrdite identitet, npr. kada se prijavljujete u aplikacije"</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Otiskom prsta otključajte uređaj ili potvrdite identitet, npr. kada se prijavljujete u aplikacije"</string>
- <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Otiskom prsta otključajte telefon ili potvrdite identitet, npr. kada se prijavljujete u aplikacije"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Otiskom prsta otključajte tablet ili potvrdite identitet, npr. prilikom prijave u aplikacije"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Otiskom prsta otključajte uređaj ili potvrdite identitet, npr. prilikom prijave u aplikacije"</string>
+ <string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Otiskom prsta otključajte telefon ili potvrdite identitet, npr. prilikom prijave u aplikacije"</string>
<string name="biometric_settings_hand_back_to_guardian" product="tablet" msgid="9034560319613439593">"Vrati tablet roditelju"</string>
<string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Vrati telefon roditelju"</string>
<string name="biometric_settings_hand_back_to_guardian" product="default" msgid="2060265104488529949">"Vrati telefon roditelju"</string>
@@ -146,9 +146,9 @@
<string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="2006739081527422127">"Senzor za otisak prsta je na dugmetu za uključivanje. To je ravno dugme pored izdignutog dugmeta za jačinu zvuka na rubu tableta."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="device" msgid="1209233633252372907">"Senzor za otisak prsta je na dugmetu za uključivanje. To je ravno dugme pored izdignutog dugmeta za jačinu zvuka na rubu uređaja."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="6862493139500275821">"Senzor za otisak prsta je na dugmetu za uključivanje. To je ravno dugme pored izdignutog dugmeta za jačinu zvuka na rubu telefona."</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="2012126789397819713">"Sada pomoću otiska prsta možete otključati tablet ili potvrditi svoj identitet, naprimjer kada se prijavljujete u aplikacije ili odobravate kupovinu"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="7119860465479161782">"Sada pomoću otiska prsta možete otključati uređaj ili potvrditi svoj identitet, naprimjer kada se prijavljujete u aplikacije ili odobravate kupovinu"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="8255422287180693200">"Sada pomoću otiska prsta možete otključati telefon ili potvrditi svoj identitet, naprimjer kada se prijavljujete u aplikacije ili odobravate kupovinu"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="2012126789397819713">"Sada pomoću otiska prsta možete otključati tablet ili potvrditi svoj identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="7119860465479161782">"Sada pomoću otiska prsta možete otključati uređaj ili potvrditi svoj identitet, npr. prilikom prijave u aplikacije ili odobravanje kupovine"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="8255422287180693200">"Sada pomoću otiska prsta možete otključati telefon ili potvrditi svoj identitet, npr. prilikom prijave u aplikacije ili odobravanja kupovine"</string>
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="tablet" msgid="7814892482046294464">"Sada pomoću otiska prsta možete otključati tablet ili potvrditi identitet, naprimjer prilikom prijave u aplikacije ili odobravanja kupovine. \n\nDodajte drugi otisak prsta da vam je lakše otključati tablet kada ga držite na drugi način."</string>
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="device" msgid="8418220207105495988">"Sada pomoću otiska prsta možete otključati uređaj ili potvrditi identitet, naprimjer prilikom prijave u aplikacije ili odobravanja kupovine.\n\nDodajte drugi otisak prsta da vam je lakše otključati uređaj kada ga držite na drugi način."</string>
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="default" msgid="3545300825124248359">"Sada pomoću otiska prsta možete otključati telefon ili potvrditi identitet, naprimjer prilikom prijave u aplikacije ili odobravanja kupovine.\n\nDodajte drugi otisak prsta da vam je lakše otključati telefon kada ga držite na drugi način."</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Za postavljanje otključavanja licem potreban je PIN.\n\nOn štiti telefon ako ga izgubite ili ga neko ukrade."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Za postavljanje otključavanja licem potreban je uzorak.\n\nOn štiti telefon ako ga izgubite ili ga neko ukrade."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Za postavljanje otključavanja licem potrebna je lozinka.\n\nOna štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je PIN.\n\nOn štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je uzorak.\n\nOn štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potrebna je lozinka.\n\nOna štiti tablet ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je PIN.\n\nOn štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je uzorak.\n\nOn štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potrebna je lozinka.\n\nOna štiti uređaj ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je PIN.\n\nOn štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potreban je uzorak.\n\nOn štiti telefon ako ga izgubite ili ga neko ukrade."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Za postavljanje otključavanja licem i otključavanja otiskom prsta potrebna je lozinka.\n\nOna štiti telefon ako ga izgubite ili ga neko ukrade."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nPIN štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Uzorak je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nUzorak štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Lozinka je obavezna da postavite otključavanje otiskom prsta i otključavanje licem.\n\nLozinka štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nPIN štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Uzorak je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nUzorak štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Lozinka je obavezna da postavite otključavanje otiskom prsta i otključavanje licem.\n\nLozinka štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nPIN štiti telefon u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Uzorak je obavezan da postavite otključavanje otiskom prsta i otključavanje licem.\n\nUzorak štiti telefon u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Lozinka je obavezna da postavite otključavanje otiskom prsta i otključavanje licem.\n\nLozinka štiti telefon u slučaju gubitka ili krađe."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ovim će se izbrisati slike i model otiska prsta koji su povezani s ID-om \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" i pohranjeni na vašem telefonu"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ovim će se izbrisati slike i model otiska prsta koji su povezani s ID-om \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" i pohranjeni na vašem tabletu"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ovim će se izbrisati slike i model otiska prsta koji su povezani s ID-om \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" i pohranjeni na vašem uređaju"</string>
diff --git a/res-product/values-ca/strings.xml b/res-product/values-ca/strings.xml
index bf2c066..e807aa1 100644
--- a/res-product/values-ca/strings.xml
+++ b/res-product/values-ca/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Cal definir un PIN per configurar Desbloqueig facial.\n\nEl PIN protegeix el telèfon si es perd o te\'l roben."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Cal definir un patró per configurar Desbloqueig facial.\n\nEl patró protegeix el telèfon si es perd o te\'l roben."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Cal definir una contrasenya per configurar Desbloqueig facial.\n\nLa contrasenya protegeix el telèfon si es perd o te\'l roben."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix la tauleta si es perd o te la roben."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix la tauleta si es perd o te la roben."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix la tauleta si es perd o te la roben."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix el dispositiu si es perd o te\'l roben."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix el dispositiu si es perd o te\'l roben."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix el dispositiu si es perd o te\'l roben."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix el telèfon si es perd o te\'l roben."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix el telèfon si es perd o te\'l roben."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix el telèfon si es perd o te\'l roben."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix la tauleta si es perd o te la roben."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix la tauleta si es perd o te la roben."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix la tauleta si es perd o te la roben."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix el dispositiu si es perd o te\'l roben."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix el dispositiu si es perd o te\'l roben."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix el dispositiu si es perd o te\'l roben."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Cal definir un PIN per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl PIN protegeix el telèfon si es perd o te\'l roben."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Cal definir un patró per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nEl patró protegeix el telèfon si es perd o te\'l roben."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Cal definir una contrasenya per configurar Desbloqueig facial i Desbloqueig amb empremta digital.\n\nLa contrasenya protegeix el telèfon si es perd o te\'l roben."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Aquesta acció suprimeix les imatges i el model d\'empremta digital associats a <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estan emmagatzemats al teu telèfon"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Aquesta acció suprimeix les imatges i el model d\'empremta digital associats a <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estan emmagatzemats a la teva tauleta"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Aquesta acció suprimeix les imatges i el model d\'empremta digital associats a <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estan emmagatzemats al teu dispositiu"</string>
diff --git a/res-product/values-cs/strings.xml b/res-product/values-cs/strings.xml
index 8502c24..47bd48b 100644
--- a/res-product/values-cs/strings.xml
+++ b/res-product/values-cs/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"K nastavení odemknutí obličejem je vyžadován PIN.\n\nPIN chrání telefon v případě ztráty nebo odcizení."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"K nastavení odemknutí obličejem je vyžadováno gesto.\n\nGesto chrání telefon v případě ztráty nebo odcizení."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"K nastavení odemknutí obličejem je vyžadováno heslo.\n\nHeslo chrání telefon v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadován PIN.\n\nPIN chrání tablet v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno gesto.\n\nGesto chrání tablet v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno heslo.\n\nHeslo chrání tablet v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadován PIN.\n\nPIN chrání zařízení v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno gesto.\n\nGesto chrání zařízení v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno heslo.\n\nHeslo chrání zařízení v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadován PIN.\n\nPIN chrání telefon v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno gesto.\n\nGesto chrání telefon v případě ztráty nebo odcizení."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"K nastavení odemknutí obličejem a odemknutí otiskem prstu je vyžadováno heslo.\n\nHeslo chrání telefon v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadován PIN.\n\nPIN chrání tablet v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno gesto.\n\nGesto chrání tablet v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno heslo.\n\nHeslo chrání tablet v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadován PIN.\n\nPIN chrání zařízení v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno gesto.\n\nGesto chrání zařízení v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno heslo.\n\nHeslo chrání zařízení v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadován PIN.\n\nPIN chrání telefon v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno gesto.\n\nGesto chrání telefon v případě ztráty nebo odcizení."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"K nastavení odemknutí otiskem prstu nebo obličejem je vyžadováno heslo.\n\nHeslo chrání telefon v případě ztráty nebo odcizení."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Touto akcí smažete snímky a model otisků prstů pro „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, které jsou uloženy ve vašem telefonu."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Touto akcí vymažete snímky a model otisků prstů pro „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, které jsou uloženy ve vašem tabletu"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Touto akcí vymažete snímky a model otisku prstu pro „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, které jsou uloženy ve vašem zařízení"</string>
diff --git a/res-product/values-da/strings.xml b/res-product/values-da/strings.xml
index d46edcf..cf3f60c 100644
--- a/res-product/values-da/strings.xml
+++ b/res-product/values-da/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Du skal angive en pinkode for at konfigurere ansigtsoplåsning.\n\nEn pinkode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Du skal angive et mønster for at konfigurere ansigtsoplåsning.\n\nEt mønster beskytter telefonen, hvis den bliver væk eller stjålet."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Du skal angive en adgangskode for at konfigurere ansigtsoplåsning.\n\nEn adgangskode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Du skal angive en pinkode for at konfigurere ansigts- og fingeroplåsning.\n\nEn pinkode beskytter din tablet, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Du skal angive et mønster for at konfigurere ansigts- og fingeroplåsning.\n\nEt mønster beskytter din tablet, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Du skal angive en adgangskode for at konfigurere ansigts- og fingeroplåsning.\n\nEn adgangskode beskytter din tablet, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Du skal angive en pinkode for at konfigurere ansigts- og fingeroplåsning.\n\nEn pinkode beskytter enheden, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Du skal angive et mønster for at konfigurere ansigts- og fingeroplåsning.\n\nEt mønster beskytter enheden, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Du skal angive en adgangskode for at konfigurere ansigts- og fingeroplåsning.\n\nEn adgangskode beskytter enheden, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Du skal angive en pinkode for at konfigurere ansigts- og fingeroplåsning.\n\nEn pinkode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Du skal angive et mønster for at konfigurere ansigts- og fingeroplåsning.\n\nEt mønster beskytter telefonen, hvis den bliver væk eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Du skal angive en adgangskode for at konfigurere ansigts- og fingeroplåsning.\n\nEn adgangskode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Du skal angive en pinkode for at konfigurere finger- og ansigtsoplåsning\n\nEn pinkode beskytter din tablet, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Du skal angive et mønster for at konfigurere finger- og ansigtsoplåsning.\n\nEt mønster beskytter din tablet, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Du skal angive en adgangskode for at konfigurere finger- og ansigtsoplåsning.\n\nEn adgangskode beskytter din tablet, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Du skal angive en pinkode for at konfigurere finger- og ansigtsoplåsning.\n\nEn pinkode beskytter enheden, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Du skal angive et mønster for at konfigurere finger- og ansigtsoplåsning.\n\nEt mønster beskytter enheden, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Du skal angive en adgangskode for at konfigurere finger- og ansigtsoplåsning.\n\nEn adgangskode beskytter enheden, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Du skal angive en pinkode for at konfigurere finger- og ansigtsoplåsning.\n\nEn pinkode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Du skal angive et mønster for at konfigurere finger- og ansigtsoplåsning.\n\nEt mønster beskytter telefonen, hvis den bliver væk eller stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Du skal angive en adgangskode for at konfigurere finger- og ansigtsoplåsning.\n\nEn adgangskode beskytter telefonen, hvis den bliver væk eller stjålet."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dette sletter de fingeraftryksbilleder og den fingeraftryksmodel, der er knyttet til \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", og som er gemt på din telefon"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dette sletter de fingeraftryksbilleder og den fingeraftryksmodel, der er knyttet til \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", og som er gemt på din tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dette sletter de fingeraftryksbilleder og den fingeraftryksmodel, der er knyttet til \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", og som er gemt på din enhed"</string>
diff --git a/res-product/values-de/strings.xml b/res-product/values-de/strings.xml
index b736873..01f0e51 100644
--- a/res-product/values-de/strings.xml
+++ b/res-product/values-de/strings.xml
@@ -128,15 +128,15 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="6272159089589340181">"Es kann passieren, dass dein Smartphone unbeabsichtigt entsperrt wird, wenn es z. B. von jemandem gegen deinen Finger gehalten wird."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="2420109998272019149">"Es kann passieren, dass dein Tablet entsperrt wird, wenn du es nicht möchtest, z. B. wenn es von jemandem gegen deinen Finger gehalten wird."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="5915844445830045866">"Es kann passieren, dass dein Gerät entsperrt wird, wenn du es nicht möchtest, z. B. wenn es von jemandem gegen deinen Finger gehalten wird."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Das Smartphone deines Kindes kann entsperrt werden, selbst wenn es das nicht beabsichtigt. Dazu kann es z. B. an seinen Finger gehalten werden."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"Das Tablet deines Kindes kann auch unbeabsichtigt entsperrt werden, z. B. wenn jemand es an seinen Finger hält."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Das Smartphone deines Kindes kann auch entsperrt werden, ohne dass dein Kind das möchte, z. B. wenn jemand das Smartphone an den Finger deines Kindes hält."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"Das Tablet deines Kindes kann auch entsperrt werden, ohne dass dein Kind das möchte, z. B. wenn jemand das Tablet an den Finger deines Kindes hält."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"Das Gerät deines Kindes kann auch unbeabsichtigt entsperrt werden, z. B. wenn jemand es an seinen Finger hält."</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Du kannst deinen Fingerabdruck verwenden, um dein Tablet zu entsperren oder dich zu authentifizieren, beispielsweise um dich in Apps anzumelden"</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Du kannst deinen Fingerabdruck verwenden, um dein Gerät zu entsperren oder dich zu authentifizieren, beispielsweise um dich in Apps anzumelden"</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder dich zu authentifizieren, beispielsweise um dich in Apps anzumelden"</string>
<string name="biometric_settings_hand_back_to_guardian" product="tablet" msgid="9034560319613439593">"Gib das Tablet an dein Elternteil zurück"</string>
- <string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Gib das Gerät an dein Elternteil zurück"</string>
- <string name="biometric_settings_hand_back_to_guardian" product="default" msgid="2060265104488529949">"Gib das Telefon an dein Elternteil zurück"</string>
+ <string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Gib das Gerät an deinen Elternteil zurück"</string>
+ <string name="biometric_settings_hand_back_to_guardian" product="default" msgid="2060265104488529949">"Gib das Smartphone an deinen Elternteil zurück"</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7526137517192538870">"Die Schutzfunktionen für dein Mobilgerät werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Tablet verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1350434793163709209">"Die Schutzfunktionen für dein Mobilgerät werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Gerät verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8367731653387033354">"Die Schutzfunktionen für dein Mobilgerät werden nicht aktiviert. Du kannst dann nicht verhindern, dass andere Personen dieses Smartphone verwenden, falls es verloren geht, gestohlen oder zurückgesetzt wird."</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Zum Einrichten der Entsperrung per Gesichtserkennung ist eine PIN erforderlich.\n\nEine PIN schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Zum Einrichten der Entsperrung per Gesichtserkennung ist ein Muster erforderlich.\n\nEin Muster schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Zum Einrichten der Entsperrung per Gesichtserkennung ist ein Passwort erforderlich.\n\nEin Passwort schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist eine PIN erforderlich.\n\nEine PIN schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Muster erforderlich.\n\nEin Muster schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Passwort erforderlich.\n\nEin Passwort schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist eine PIN erforderlich.\n\nEine PIN schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Muster erforderlich.\n\nEin Muster schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Passwort erforderlich.\n\nEin Passwort schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist eine PIN erforderlich.\n\nEine PIN schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Muster erforderlich.\n\nEin Muster schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Zum Einrichten der Entsperrung per Gesichtserkennung und der Entsperrung per Fingerabdruck ist ein Passwort erforderlich.\n\nEin Passwort schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist eine PIN erforderlich.\n\nEine PIN schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Muster erforderlich.\n\nEin Muster schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Passwort erforderlich.\n\nEin Passwort schützt das Tablet, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist eine PIN erforderlich.\n\nEine PIN schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Muster erforderlich.\n\nEin Muster schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Passwort erforderlich.\n\nEin Passwort schützt das Gerät, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist eine PIN erforderlich.\n\nEine PIN schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Muster erforderlich.\n\nEin Muster schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Zum Einrichten der Entsperrung per Fingerabdruck und der Entsperrung per Gesichtserkennung ist ein Passwort erforderlich.\n\nEin Passwort schützt das Smartphone, falls es verloren geht oder gestohlen wird."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dadurch werden die Aufnahmen und das Modell des Fingerabdrucks für „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ gelöscht, die auf deinem Smartphone gespeichert sind"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dadurch werden die Aufnahmen und das Modell des Fingerabdrucks für „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ gelöscht, die auf deinem Tablet gespeichert sind"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dadurch werden die Aufnahmen und das Modell des Fingerabdruck für „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ gelöscht, die auf deinem Gerät gespeichert sind"</string>
@@ -312,7 +312,7 @@
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Wenn auch andere Nutzer dein Tablet verwenden dürfen, kannst du ihm neue Nutzer hinzufügen. Jeder Nutzer erhält auf deinem Tablet sein privates Profil für benutzerdefinierte Startbildschirme, Konten, Apps, Einstellungen usw."</string>
<string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Wenn du dein Smartphone mit anderen teilen möchtest, kannst du neue Nutzer hinzufügen. Jeder Nutzer erhält auf deinem Smartphone ein privates Profil für eigene Startbildschirme, Konten, Apps, Einstellungen usw."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Nur der Eigentümer des Tablets kann Nutzer verwalten."</string>
- <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Nur der Eigentümer des Telefons kann Nutzer verwalten."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Nur der Eigentümer des Smartphones kann Nutzer verwalten."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Dein Profil und deine Daten werden vom Tablet entfernt. Du kannst diese Aktion nicht rückgängig machen."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"Dein Profil und deine Daten werden vom Telefon entfernt. Du kannst diese Aktion nicht rückgängig machen."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"Hilfeartikel, Telefon- & Chatsupport"</string>
diff --git a/res-product/values-el/strings.xml b/res-product/values-el/strings.xml
index a36b81c..5f377d1 100644
--- a/res-product/values-el/strings.xml
+++ b/res-product/values-el/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Απαιτείται PIN για τη ρύθμιση της λειτουργίας Ξεκλείδωμα με το πρόσωπο.\n\nΤο PIN προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Απαιτείται μοτίβο για τη ρύθμιση της λειτουργίας Ξεκλείδωμα με το πρόσωπο.\n\nΤο μοτίβο προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση της λειτουργίας Ξεκλείδωμα με το πρόσωπο.\n\nΟ κωδικός πρόσβασης προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο PIN προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο μοτίβο προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΟ κωδικός πρόσβασης προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο PIN προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο μοτίβο προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΟ κωδικός πρόσβασης προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο PIN προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΤο μοτίβο προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με το πρόσωπο και Ξεκλείδωμα με δακτυλικό αποτύπωμα.\n\nΟ κωδικός πρόσβασης προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο PIN προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο μοτίβο προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΟ κωδικός πρόσβασης προστατεύει το tablet σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο PIN προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο μοτίβο προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΟ κωδικός πρόσβασης προστατεύει τη συσκευή σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Απαιτείται PIN για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο PIN προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Απαιτείται μοτίβο για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΤο μοτίβο προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Απαιτείται κωδικός πρόσβασης για τη ρύθμιση των λειτουργιών Ξεκλείδωμα με δακτυλικό αποτύπωμα και Ξεκλείδωμα με το πρόσωπο.\n\nΟ κωδικός πρόσβασης προστατεύει το τηλέφωνο σε περίπτωση απώλειας ή κλοπής."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Με αυτόν τον τρόπο διαγράφονται οι εικόνες και το μοντέλο δακτυλικού αποτυπώματος που έχουν αποθηκευτεί στο τηλέφωνό σας και συσχετίζονται με το <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Με αυτόν τον τρόπο διαγράφονται οι εικόνες και το μοντέλο δακτυλικού αποτυπώματος που έχουν αποθηκευτεί στο tablet και συσχετίζονται με το <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Με αυτόν τον τρόπο διαγράφονται οι εικόνες και το μοντέλο δακτυλικού αποτυπώματος που έχουν αποθηκευτεί στη συσκευή σας και συσχετίζονται με το <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>"</string>
diff --git a/res-product/values-en-rAU/strings.xml b/res-product/values-en-rAU/strings.xml
index 92368e4..d13d99e 100644
--- a/res-product/values-en-rAU/strings.xml
+++ b/res-product/values-en-rAU/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"A PIN is required to set up Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"A pattern is required to set up Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"A password is required to set up Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it\'s lost or stolen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
diff --git a/res-product/values-en-rCA/strings.xml b/res-product/values-en-rCA/strings.xml
index fb30906..2f42e74 100644
--- a/res-product/values-en-rCA/strings.xml
+++ b/res-product/values-en-rCA/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"A PIN is required to set up Face Unlock.\n\nA PIN protects the phone if it\'s lost or stolen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"A pattern is required to set up Face Unlock.\n\nA pattern protects the phone if it\'s lost or stolen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"A password is required to set up Face Unlock.\n\nA password protects the phone if it\'s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it\'s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it\'s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it\'s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it\'s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it\'s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it\'s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it\'s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it\'s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
diff --git a/res-product/values-en-rGB/strings.xml b/res-product/values-en-rGB/strings.xml
index a047137..5c4ed50 100644
--- a/res-product/values-en-rGB/strings.xml
+++ b/res-product/values-en-rGB/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"A PIN is required to set up Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"A pattern is required to set up Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"A password is required to set up Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it\'s lost or stolen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
diff --git a/res-product/values-en-rIN/strings.xml b/res-product/values-en-rIN/strings.xml
index a047137..5c4ed50 100644
--- a/res-product/values-en-rIN/strings.xml
+++ b/res-product/values-en-rIN/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"A PIN is required to set up Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"A pattern is required to set up Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"A password is required to set up Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it\'s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it\'s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it\'s lost or stolen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
diff --git a/res-product/values-en-rXC/strings.xml b/res-product/values-en-rXC/strings.xml
index 8569809..c096adfe 100644
--- a/res-product/values-en-rXC/strings.xml
+++ b/res-product/values-en-rXC/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"A PIN is required to set up Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"A pattern is required to set up Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"A password is required to set up Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it’s lost or stolen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it’s lost or stolen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it’s lost or stolen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your phone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"This deletes the fingerprint images and model associated with \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' that are stored on your device"</string>
diff --git a/res-product/values-es-feminine/strings.xml b/res-product/values-es-feminine/strings.xml
new file mode 100644
index 0000000..61a55da
--- /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 0000000..54f55d6
--- /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 0000000..54f55d6
--- /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-rUS/strings.xml b/res-product/values-es-rUS/strings.xml
index ed3237d..27961e6 100644
--- a/res-product/values-es-rUS/strings.xml
+++ b/res-product/values-es-rUS/strings.xml
@@ -55,12 +55,12 @@
<string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"Usa tu rostro para desbloquear el teléfono o autenticarte en apps, como cuando accedes o apruebas compras"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"Usa tu rostro para desbloquear la tablet o autenticarte en apps, como cuando accedes o apruebas compras"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"Usa tu rostro para desbloquear el dispositivo o autenticarte en apps, como cuando accedes o apruebas compras"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Permite que tu hijo desbloquee su teléfono con el rostro"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Permite que tu hijo desbloquee su tablet con el rostro"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Permite que tu hijo desbloquee su dispositivo con el rostro"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Permite que tu hijo o hija desbloquee su teléfono con el rostro"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Permite que tu hijo o hija desbloquee su tablet con el rostro"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Permite que tu hijo o hija desbloquee su dispositivo con el rostro"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Permite que tu hijo o hija use su rostro para desbloquear el teléfono o verificar su identidad. Permitirá el acceso a apps, aprobar compras y mucho más."</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="tablet" msgid="5932555218164668532">"Permite que tu hijo o hija use su rostro para desbloquear la tablet o verificar su identidad. Permitirá el acceso a apps, aprobar compras y mucho más."</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Permite que tu hijo o hija use su rostro para desbloquear el dispositivo o verificar su identidad. Permitirá el acceso a apps, aprobar compras y mucho más."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Permite que tu hijo o hija use su rostro para desbloquear el dispositivo o verificar su identidad. Permitirá acceder a apps, aprobar compras y mucho más."</string>
<string name="security_settings_face_enroll_introduction_consent_message" product="default" msgid="3698558920963989416">"Usar el desbloqueo facial para que tu hijo acceda a su teléfono puede ser menos seguro que usar un buen patrón o un PIN."</string>
<string name="security_settings_face_enroll_introduction_consent_message" product="tablet" msgid="2689983368730833505">"Usar el desbloqueo facial para que tu hijo acceda a su tablet puede ser menos seguro que usar un buen patrón o un PIN."</string>
<string name="security_settings_face_enroll_introduction_consent_message" product="device" msgid="5768077532130409820">"Usar el desbloqueo facial para que tu hijo acceda a su dispositivo puede ser menos seguro que usar un buen patrón o un PIN."</string>
@@ -107,9 +107,9 @@
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Usa tu rostro para desbloquear la tablet o verificar tu identidad, por ejemplo, cuando accedes a apps o apruebas compras.\n\nTen en cuenta lo siguiente:\nSolo puedes configurar un rostro por vez. Para agregar otro rostro, borra el actual.\n\nPuedes desbloquear la tablet aunque no lo desees cuando la miras.\n\nUn tercero puede desbloquear la tablet si la sostiene frente a tu rostro, incluso aunque tengas los ojos cerrados.\n\nTambién puede desbloquearla cualquier persona que se parezca a ti, como un hermano gemelo."</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Usa tu rostro para desbloquear el dispositivo o verificar tu identidad, por ejemplo, cuando accedes a apps o apruebas compras.\n\nTen en cuenta lo siguiente:\nSolo puedes configurar un rostro por vez. Para agregar otro rostro, borra el actual.\n\nPuedes desbloquear el dispositivo aunque no lo desees cuando lo miras.\n\nUn tercero puede desbloquear el dispositivo si lo sostiene frente a tu rostro, incluso aunque tengas los ojos cerrados.\n\nTambién puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
<string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Usa tu huella dactilar para desbloquear el dispositivo <xliff:g id="DEVICENAME">%s</xliff:g> o verificar tu identidad, como cuando accedes a apps o apruebas compras."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Permite que tu hijo use su huella dactilar para desbloquear el teléfono o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permite que tu hijo use su huella dactilar para desbloquear la tablet o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permite que tu hijo use su huella dactilar para desbloquear el dispositivo o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Permite que tu hijo o hija use su huella dactilar para desbloquear el teléfono o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permite que tu hijo o hija use su huella dactilar para desbloquear la tablet o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permite que tu hijo o hija use su huella dactilar para desbloquear el dispositivo o verificar su identidad. Eso le permitirá acceder a apps, aprobar compras y mucho más."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default" msgid="8488497844109768268">"Es posible que el desbloqueo con huella dactilar sea menos seguro que un patrón o un PIN eficaz"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="tablet" msgid="5688664190282817312">"El uso de la huella dactilar para desbloquear la tablet puede ser menos seguro que un patrón o PIN confiables"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="device" msgid="2814616139536479018">"El uso de la huella dactilar para desbloquear el dispositivo puede ser menos seguro que un patrón o PIN confiables"</string>
@@ -128,9 +128,9 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="6272159089589340181">"Tu teléfono se puede desbloquear aunque no lo desees, por ejemplo, si alguien lo acerca a tu dedo."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="2420109998272019149">"Tu tablet se puede desbloquear aunque no lo desees, por ejemplo, cuando alguien la sostiene frente a tu dedo."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="5915844445830045866">"Tu dispositivo se puede desbloquear aunque no lo desees, por ejemplo, cuando alguien lo sostiene frente a tu dedo."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"El teléfono de tu hijo puede desbloquearse sin que así lo quisiera, por ejemplo, porque alguien se lo acercó al dedo."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"El teléfono de tu hijo o hija puede desbloquearse de manera no intencional, por ejemplo, si alguien se lo acerca al dedo."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"La tablet de tu hijo puede desbloquearse de manera no intencional, por ejemplo, si alguien se la acerca al dedo."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"El dispositivo de tu hijo puede desbloquearse de manera no intencional, por ejemplo, si alguien se lo acerca al dedo."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"El dispositivo de tu hijo o hija puede desbloquearse de manera no intencional, por ejemplo, si alguien se lo acerca al dedo."</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Usa tu huella dactilar para desbloquear la tablet o verificar tu identidad, por ejemplo, cuando accedes a apps."</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Usa tu huella dactilar para desbloquear el dispositivo o verificar tu identidad, por ejemplo, cuando accedes a apps"</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Usa tu huella dactilar para desbloquear el teléfono o verificar tu identidad, como cuando accedes a apps"</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Se requiere un PIN para configurar la función Desbloqueo facial.\n\nEn caso de robo o extravío, un PIN protege el teléfono."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Se requiere un patrón para configurar la función Desbloqueo facial.\n\nEn caso de robo o extravío, un patrón protege el teléfono."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Se requiere una contraseña para configurar la función Desbloqueo facial.\n\nEn caso de robo o extravío, una contraseña protege el teléfono."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Se requiere un PIN para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un PIN protege la tablet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Se requiere un patrón para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un patrón protege la tablet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Se requiere una contraseña para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, una contraseña protege la tablet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Se requiere un PIN para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un PIN protege el dispositivo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Se requiere un patrón para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un patrón protege el dispositivo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Se requiere una contraseña para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, una contraseña protege el dispositivo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Se requiere un PIN para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un PIN protege el teléfono."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Se requiere un patrón para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, un patrón protege el teléfono."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Se requiere una contraseña para configurar las funciones Desbloqueo facial y Desbloqueo con huellas dactilares.\n\nEn caso de robo o extravío, una contraseña protege el teléfono."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Se requiere un PIN para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un PIN protege la tablet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Se requiere un patrón para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un patrón protege la tablet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Se requiere una contraseña para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, una contraseña protege la tablet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Se requiere un PIN para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un PIN protege el dispositivo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Se requiere un patrón para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un patrón protege el dispositivo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Se requiere una contraseña para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, una contraseña protege el dispositivo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Se requiere un PIN para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un PIN protege el teléfono."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Se requiere un patrón para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, un patrón protege el teléfono."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Se requiere una contraseña para configurar las funciones Desbloqueo con huellas dactilares y Desbloqueo facial.\n\nEn caso de robo o extravío, una contraseña protege el teléfono."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Esta opción borra las imágenes y el modelo de la huella dactilar asociados con \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que se guardaron en el teléfono."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Esta opción borra las imágenes de la huella dactilar y el modelo asociado con \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que se guardaron en la tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Esta opción borra las imágenes de la huella dactilar y el modelo asociado con \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que se guardaron en el dispositivo"</string>
@@ -243,7 +243,7 @@
<string name="storage_wizard_init_v2_internal_title" product="default" msgid="2049551739429034707">"Formatear tarjeta SD como almacenamiento interno"</string>
<string name="storage_wizard_init_v2_internal_summary" product="default" msgid="4395040788668914783">"Almacenar apps y contenido multimedia para usar solo en este teléfono. <a href=https://support.google.com/android/answer/12153449>Más información para configurar una tarjeta SD</a>."</string>
<string name="storage_wizard_init_v2_internal_action" product="default" msgid="560506072518373839">"Formatear"</string>
- <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="7539293889421540797">"Puedes transferir archivos, contenido multimedia y determinadas apps a este <xliff:g id="NAME">^1</xliff:g>. \n\nSi lo haces, podrás liberar hasta <xliff:g id="SIZE">^2</xliff:g> de almacenamiento en tu tablet. El proceso llevará aproximadamente <xliff:g id="DURATION">^3</xliff:g>."</string>
+ <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="7539293889421540797">"Puedes transferir archivos, contenido multimedia y determinadas apps a \"<xliff:g id="NAME">^1</xliff:g>\". \n\nSi lo haces, podrás liberar hasta <xliff:g id="SIZE">^2</xliff:g> de almacenamiento en tu tablet. El proceso tardará aproximadamente <xliff:g id="DURATION">^3</xliff:g>."</string>
<string name="storage_wizard_migrate_v2_body" product="default" msgid="3807501187945770401">"Puedes transferir archivos, contenido multimedia y algunas apps a este <xliff:g id="NAME">^1</xliff:g>. \n\nSi lo haces, podrás liberar hasta <xliff:g id="SIZE">^2</xliff:g> de almacenamiento en tu teléfono. El proceso llevará aproximadamente <xliff:g id="DURATION">^3</xliff:g>."</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5326017162943304749">"Mantén la tablet cargada"</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="8041162611685970218">"Mantén el teléfono cargado"</string>
@@ -272,9 +272,9 @@
<string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Tu tablet y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu tablet y la pérdida de datos debido al uso de estas apps."</string>
<string name="install_all_warning" product="default" msgid="4597256179485325694">"Tu teléfono y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu teléfono y la pérdida de datos que pueda derivar de su uso."</string>
<string name="install_all_warning" product="device" msgid="6293002353591632851">"Tu dispositivo y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra el dispositivo o de la pérdida de datos que se pueda derivar de su uso."</string>
- <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="6321057186549848774">"Si detienes este servicio, algunas funciones de la tablet podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+ <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="6321057186549848774">"Si detienes este servicio, algunas funciones de la tablet podrían dejar de ejecutarse correctamente hasta que la reinicies."</string>
<string name="runningservicedetails_stop_dlg_text" product="default" msgid="6869998550403667737">"Si detienes este servicio, algunas funciones del dispositivo podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
- <string name="testing_phone_info" product="tablet" msgid="8267746802132630741">"Información del tablet"</string>
+ <string name="testing_phone_info" product="tablet" msgid="8267746802132630741">"Información de la tablet"</string>
<string name="testing_phone_info" product="default" msgid="7507506297352160191">"Información del dispositivo"</string>
<string name="accessibility_text_reading_confirm_dialog_message" product="default" msgid="1773409172676594981">"Se restablecerán las preferencias de tamaño de visualización y texto de la pantalla a las de la configuración original del teléfono"</string>
<string name="accessibility_text_reading_confirm_dialog_message" product="tablet" msgid="2547948891207211388">"Se restablecerán las preferencias de tamaño de visualización y texto de la pantalla a las de la configuración original de la tablet."</string>
@@ -312,7 +312,7 @@
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Agrega nuevos usuarios para compartir tu tablet. Cada usuario tendrá un espacio propio en la tablet con pantalla principal, cuentas, apps y opciones de configuración personalizadas, y mucho más."</string>
<string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Agrega nuevos usuarios para compartir tu teléfono. Cada usuario tendrá un espacio propio en el teléfono con pantalla principal, cuentas, apps y opciones de configuración personalizadas, y mucho más."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Solo los propietarios de la tablet pueden administrar los usuarios."</string>
- <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo los propietarios del dispositivo pueden administrar los usuarios."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo el propietario del teléfono puede administrar usuarios."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Perderás tu espacio y tus datos en esta tablet. No puedes deshacer esta acción."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"Perderás tu espacio y tus datos en este dispositivo. No puedes deshacer esta acción."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"Artículos de ayuda, teléfono y chat"</string>
diff --git a/res-product/values-es/strings.xml b/res-product/values-es/strings.xml
index da1951c..ac2b31b 100644
--- a/res-product/values-es/strings.xml
+++ b/res-product/values-es/strings.xml
@@ -56,8 +56,8 @@
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"Usa la cara para desbloquear tu tablet o autenticarte en aplicaciones, como al iniciar sesión o aprobar compras"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"Usa la cara para desbloquear tu dispositivo o autenticarte en aplicaciones, como al iniciar sesión o aprobar compras"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Permitir que tu hijo/a use el reconocimiento facial para desbloquear su teléfono"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Permitir que tu hijo/a use el reconocimiento facial para desbloquear su tablet"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Permitir que tu hijo/a use el reconocimiento facial para desbloquear su dispositivo"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Permite que tu hijo/a use el reconocimiento facial para desbloquear su tablet"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Permite que tu hijo/a use el reconocimiento facial para desbloquear su dispositivo"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Permite que tu hijo/a pueda desbloquear su teléfono o verificar su identidad mediante su cara, por ejemplo, para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="tablet" msgid="5932555218164668532">"Permite que tu hijo/a pueda desbloquear su tablet o verificar su identidad mediante su cara, por ejemplo, para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Permite que tu hijo/a pueda desbloquear su dispositivo o verificar su identidad mediante su cara, por ejemplo, para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
@@ -94,27 +94,27 @@
<string name="security_settings_face_enroll_introduction_control_consent_message" product="default" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="tablet" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="device" msgid="6983939010814873996"></string>
- <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"Usa la cara para desbloquear tu teléfono o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el teléfono."</string>
- <string name="security_settings_face_settings_footer" product="tablet" msgid="3467711032275909082">"Usa la cara para desbloquear tu tablet o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear la tablet."</string>
+ <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"Usa la cara para desbloquear tu teléfono o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el teléfono."</string>
+ <string name="security_settings_face_settings_footer" product="tablet" msgid="3467711032275909082">"Usa la cara para desbloquear tu tablet o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear la tablet."</string>
<string name="security_settings_face_settings_footer" product="device" msgid="6237815625247917310">"Usa la cara para desbloquear tu dispositivo o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo si lo pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el dispositivo."</string>
- <string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"Usa la cara para desbloquear tu teléfono o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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>
- <string name="security_settings_face_settings_footer_attention_not_supported" product="tablet" msgid="6932278790700490818">"Usa la cara para desbloquear tu tablet o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la 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 la tablet."</string>
- <string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"Usa la cara para desbloquear tu dispositivo o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo 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 dispositivo."</string>
+ <string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"Usa la cara para desbloquear tu teléfono o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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>
+ <string name="security_settings_face_settings_footer_attention_not_supported" product="tablet" msgid="6932278790700490818">"Usa la cara para desbloquear tu tablet o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la 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 la tablet."</string>
+ <string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"Usa la cara para desbloquear tu dispositivo o autenticarte en aplicaciones (por ejemplo, para iniciar sesión o autorizar 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo 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 dispositivo."</string>
<string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"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.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el teléfono."</string>
- <string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"Usa la cara para desbloquear tu tablet 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear la tablet."</string>
- <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Usa la cara para desbloquear tu dispositivo 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo si lo pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el dispositivo."</string>
- <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>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Usa la cara para desbloquear tu tablet 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la 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 la tablet."</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Usa la cara para desbloquear tu dispositivo 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo 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 dispositivo."</string>
+ <string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"Usa la cara para desbloquear tu tablet 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear la tablet."</string>
+ <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Usa la cara para desbloquear tu dispositivo 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo si lo pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti (como un gemelo) pueda desbloquear el dispositivo."</string>
+ <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>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Usa la cara para desbloquear tu tablet 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 la tablet se desbloquee si la miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear la tablet si la 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 la tablet."</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Usa la cara para desbloquear tu dispositivo 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 dispositivo se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el dispositivo 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 dispositivo."</string>
<string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Usa tu huella digital para desbloquear tu <xliff:g id="DEVICENAME">%s</xliff:g> o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras)"</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Permítele a tu hijo/a que, con su huella digital, pueda desbloquear el teléfono o verificar su identidad para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permite que tu hijo/a pueda desbloquear su tablet o verificar su identidad mediante su huella digital, por ejemplo, para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permite que tu hijo/a pueda desbloquear su dispositivo o verificar su identidad mediante su huella digital, por ejemplo, para iniciar sesión en aplicaciones, aprobar compras, etc."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Permite que tu hijo/a pueda desbloquear su tablet o verificar su identidad mediante su huella digital (por ejemplo, para iniciar sesión en aplicaciones o aprobar compras)."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Permite que tu hijo/a pueda desbloquear su dispositivo o verificar su identidad mediante su huella digital (por ejemplo, para iniciar sesión en aplicaciones o aprobar compras)."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default" msgid="8488497844109768268">"Es posible que usar la huella digital para desbloquear el teléfono sea menos seguro que un buen patrón o PIN"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="tablet" msgid="5688664190282817312">"Usar la huella digital para desbloquear el tablet puede ser menos seguro que un buen patrón o PIN"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="device" msgid="2814616139536479018">"Usar la huella digital para desbloquear el dispositivo puede ser menos seguro que un buen patrón o PIN"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="default" msgid="3334689370761542152">"Cuando usas Pixel Imprint, se utilizan imágenes para actualizar el modelo de tu huella digital. Las imágenes usadas para crear el modelo no se guardan nunca, pero el modelo en sí se almacena de manera segura en tu teléfono y nunca sale de él. Todos los procesos se llevan a cabo de forma segura en el teléfono."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="tablet" msgid="6142978289780449828">"Cuando usas Pixel Imprint, se usan imágenes para actualizar el modelo de tu huella digital. Las imágenes usadas para crear el modelo no se guardan nunca, pero el modelo sí se almacena de manera segura en tu tablet y nunca sale de él. Todos los procesos se llevan a cabo de forma segura en el tablet."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="tablet" msgid="6142978289780449828">"Cuando usas Pixel Imprint, se usan imágenes para actualizar el modelo de tu huella digital. Las imágenes usadas para crear el modelo no se guardan nunca, pero el modelo sí se almacena de manera segura en tu tablet y nunca sale de ella. Todos los procesos se llevan a cabo de forma segura en la tablet."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3" product="device" msgid="9221017777932077429">"Cuando usas Pixel Imprint, se usan imágenes para actualizar el modelo de tu huella digital. Las imágenes usadas para crear el modelo no se guardan nunca, pero el modelo sí se almacena de manera segura en tu dispositivo y nunca sale de él. Todos los procesos se llevan a cabo de forma segura en el dispositivo."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="default" msgid="6804981319922169283">"Cuando usa Pixel Imprint, se utilizan imágenes para actualizar el modelo de su huella digital. Las imágenes usadas para crear el modelo de huella digital de tu hijo/a nunca se guardan, pero el modelo en sí se almacena de manera segura en el teléfono y nunca sale de él. Todos los procesos se llevan a cabo de forma segura en el teléfono."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3" product="tablet" msgid="1426913673720862863">"Cuando usa Pixel Imprint, se usan imágenes para actualizar el modelo de su huella digital. Las imágenes usadas para crear el modelo de huella digital de tu hijo/a nunca se guardan, pero el modelo sí se almacena de manera segura en el tablet y nunca sale de él. Todos los procesos se llevan a cabo de forma segura en el tablet."</string>
@@ -123,26 +123,26 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="tablet" msgid="8207309581266022275">"Puedes eliminar las imágenes y el modelo de tu huella, así como desactivar Desbloqueo con huella digital cuando quieras desde Ajustes. Las imágenes y los modelos de huellas digitales se almacenan en el tablet hasta que los eliminas."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="device" msgid="2498580070051496133">"Puedes eliminar las imágenes y el modelo de tu huella, así como desactivar Desbloqueo con huella digital cuando quieras desde Ajustes. Las imágenes y los modelos de huellas digitales se almacenan en el dispositivo hasta que los eliminas."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default" msgid="5003753461032107715">"Tú y tu hijo/a podéis eliminar el modelo y las imágenes de su huella digital, así como desactivar Desbloqueo con huella digital en cualquier momento desde Ajustes. Los modelos y las imágenes de la huella digital se almacenan en el teléfono hasta que se eliminan."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8772005555323461143">"Tú y tu hijo/a podéis eliminar el modelo y las imágenes de su huella digital, así como desactivar Desbloqueo con huella digital en cualquier momento desde Ajustes. Los modelos y las imágenes de la huella digital se almacenan en el tablet hasta que se eliminan."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8772005555323461143">"Tú y tu hijo/a podéis eliminar el modelo y las imágenes de su huella digital, así como desactivar Desbloqueo con huella digital en cualquier momento desde Ajustes. Los modelos y las imágenes de la huella digital se almacenan en la tablet hasta que se eliminan."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="device" msgid="7254955922685507093">"Tú y tu hijo/a podéis eliminar el modelo y las imágenes de su huella digital, así como desactivar Desbloqueo con huella digital en cualquier momento desde Ajustes. Los modelos y las imágenes de la huella digital se almacenan en el dispositivo hasta que se eliminan."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="6272159089589340181">"Tu teléfono puede desbloquearse aunque no sea tu intención (por ejemplo, si alguien lo acerca a tu dedo)."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="2420109998272019149">"Tu tablet puede desbloquearse aunque no sea tu intención (por ejemplo, si alguien la acerca a tu dedo)."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="5915844445830045866">"Tu dispositivo puede desbloquearse aunque no sea tu intención (por ejemplo, si alguien lo acerca a tu dedo)."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"El teléfono de tu hijo/a puede desbloquearse sin que quiera, por ejemplo, porque alguien se lo ha acercado al dedo."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"El tablet de tu hijo/a puede desbloquearse sin que quiera, por ejemplo, porque alguien se lo ha acercado al dedo."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"El dispositivo de tu hijo/a puede desbloquearse sin que quiera, por ejemplo, porque alguien se lo ha acercado al dedo."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"El teléfono de tu hijo/a puede desbloquearse sin que quiera (por ejemplo, porque alguien se lo ha acercado al dedo)."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"La tablet de tu hijo/a puede desbloquearse sin que quiera, por ejemplo, porque alguien se la ha acercado al dedo."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"El dispositivo de tu hijo/a puede desbloquearse sin que quiera (por ejemplo, porque alguien se lo ha acercado al dedo)."</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Usa tu huella digital para desbloquear tu tablet o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="device" msgid="7398339851724524558">"Usa tu huella digital para desbloquear tu dispositivo o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="default" msgid="5376408603508393038">"Usa tu huella digital para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones)"</string>
- <string name="biometric_settings_hand_back_to_guardian" product="tablet" msgid="9034560319613439593">"Pásale el tablet a tu padre o a tu madre"</string>
- <string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Pásale el dispositivo a tu padre o a tu madre"</string>
- <string name="biometric_settings_hand_back_to_guardian" product="default" msgid="2060265104488529949">"Pásale el teléfono a tu padre o a tu madre"</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7526137517192538870">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen esta tablet si la pierdes, te la roban o se restablece su estado de fábrica."</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1350434793163709209">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablecen su estado de fábrica."</string>
- <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8367731653387033354">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes, te lo roban o se restablecen su estado de fábrica."</string>
- <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="1957425614489669582">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen esta tablet si lo pierdes o te lo roban."</string>
+ <string name="biometric_settings_hand_back_to_guardian" product="tablet" msgid="9034560319613439593">"Pásale la tablet a tu padre o a tu madre"</string>
+ <string name="biometric_settings_hand_back_to_guardian" product="device" msgid="2149647165743006307">"Pásale el dispositivo a tu padre o madre"</string>
+ <string name="biometric_settings_hand_back_to_guardian" product="default" msgid="2060265104488529949">"Pásale el teléfono a tu padre o madre"</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7526137517192538870">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen esta tablet si la pierdes, te la roban o la restablecen."</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="1350434793163709209">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes, te lo roban o se restablece su estado de fábrica."</string>
+ <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="8367731653387033354">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas utilicen este teléfono si lo pierdes, te lo roban o restablecen su estado de fábrica."</string>
+ <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="1957425614489669582">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen esta tablet si la pierdes o te la roban."</string>
<string name="lock_screen_intro_skip_dialog_text" product="device" msgid="7427748422888413977">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios lo utilicen si lo pierdes o te lo roban."</string>
- <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="8970036878014302990">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otros usuarios utilicen este teléfono si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="8970036878014302990">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas utilicen este teléfono si lo pierdes o te lo roban."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="2006739081527422127">"El sensor de huellas digitales está en el botón de encendido. Es el botón plano situado junto al botón de volumen con relieve en el lateral de la tablet."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="device" msgid="1209233633252372907">"El sensor de huellas digitales está en el botón de encendido. Es el botón plano situado junto al botón de volumen con relieve en el lateral del dispositivo."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="6862493139500275821">"El sensor de huellas digitales está en el botón de encendido. Es el botón plano situado junto al botón de volumen con relieve en el lateral del teléfono."</string>
@@ -152,8 +152,8 @@
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="tablet" msgid="7814892482046294464">"Ahora puedes usar tu huella digital para desbloquear tu tablet o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras). \n\nAñade otra huella digital para que sea más fácil desbloquear la tablet cuando la sujetas de diferentes formas."</string>
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="device" msgid="8418220207105495988">"Ahora puedes usar tu huella digital para desbloquear tu dispositivo o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras).\n\nAñade otra huella digital para que sea más fácil desbloquear el dispositivo cuando lo sujetas de diferentes formas."</string>
<string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="default" msgid="3545300825124248359">"Ahora puedes usar tu huella digital para desbloquear tu teléfono o verificar que eres tú (por ejemplo, al iniciar sesión en aplicaciones o para aprobar compras).\n\nAñade otra huella digital para que sea más fácil desbloquear el teléfono cuando lo sujetas de diferentes formas."</string>
- <string name="lock_screen_pin_skip_message" product="tablet" msgid="2125894016330764666">"El PIN protege tu tablet si lo pierdes o te lo roban"</string>
- <string name="lock_screen_pattern_skip_message" product="tablet" msgid="7022124791463099454">"El patrón protege tu tablet si lo pierdes o te lo roban"</string>
+ <string name="lock_screen_pin_skip_message" product="tablet" msgid="2125894016330764666">"El PIN protege tu tablet si la pierdes o te la roban"</string>
+ <string name="lock_screen_pattern_skip_message" product="tablet" msgid="7022124791463099454">"El patrón protege tu tablet si la pierdes o te la roban"</string>
<string name="lock_screen_password_skip_message" product="tablet" msgid="7117050321575989041">"La contraseña protege tu tablet si la pierdes o te la roban"</string>
<string name="lock_screen_pin_skip_message" product="device" msgid="6028521833666812314">"El PIN protege tu dispositivo si lo pierdes o te lo roban"</string>
<string name="lock_screen_pattern_skip_message" product="device" msgid="8959252397804630340">"El patrón protege tu dispositivo si lo pierdes o te lo roban"</string>
@@ -161,7 +161,7 @@
<string name="lock_screen_pin_skip_message" product="default" msgid="1488786078805713892">"El PIN protege tu teléfono si lo pierdes o te lo roban"</string>
<string name="lock_screen_pattern_skip_message" product="default" msgid="827145253475892869">"El patrón protege tu teléfono si lo pierdes o te lo roban"</string>
<string name="lock_screen_password_skip_message" product="default" msgid="8112387870039469467">"La contraseña protege tu teléfono si lo pierdes o te lo roban"</string>
- <string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2645508906847445498">"Se necesita un PIN para configurar Desbloqueo con huella digital.\n\nEl PIN protege tu tablet si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pin_skip_fingerprint_message" product="tablet" msgid="2645508906847445498">"Se necesita un PIN para configurar Desbloqueo con huella digital.\n\nEl PIN protege tu tablet si la pierdes o te la roban."</string>
<string name="lock_screen_pattern_skip_fingerprint_message" product="tablet" msgid="2792582623472935881">"Se necesita un patrón para configurar Desbloqueo con huella digital.\n\nEl patrón protege tu tablet si lo pierdes o te lo roban."</string>
<string name="lock_screen_password_skip_fingerprint_message" product="tablet" msgid="1541137095940752409">"Se necesita una contraseña para configurar Desbloqueo con huella digital.\n\nLa contraseña protege tu tablet si la pierdes o te la roban."</string>
<string name="lock_screen_pin_skip_fingerprint_message" product="device" msgid="7716542198483220546">"Se necesita un PIN para configurar Desbloqueo con huella digital.\n\nEl PIN protege tu dispositivo si lo pierdes o te lo roban."</string>
@@ -170,7 +170,7 @@
<string name="lock_screen_pin_skip_fingerprint_message" product="default" msgid="3396830571282413409">"Se necesita un PIN para configurar Desbloqueo con huella digital.\n\nEl PIN protege tu teléfono si lo pierdes o te lo roban."</string>
<string name="lock_screen_pattern_skip_fingerprint_message" product="default" msgid="2952431330433118050">"Se necesita un patrón para configurar Desbloqueo con huella digital.\n\nEl patrón protege tu teléfono si lo pierdes o te lo roban."</string>
<string name="lock_screen_password_skip_fingerprint_message" product="default" msgid="8499384469890032816">"Se necesita una contraseña para configurar Desbloqueo con huella digital.\n\nLa contraseña protege tu teléfono si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="657464034320090412">"Se necesita un PIN para configurar Desbloqueo facial.\n\nEl PIN protege tu tablet si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pin_skip_face_message" product="tablet" msgid="657464034320090412">"Se necesita un PIN para configurar Desbloqueo facial.\n\nEl PIN protege tu tablet si la pierdes o te la roban."</string>
<string name="lock_screen_pattern_skip_face_message" product="tablet" msgid="1057921621902514520">"Se necesita un patrón para configurar Desbloqueo facial.\n\nEl patrón protege tu tablet si lo pierdes o te lo roban."</string>
<string name="lock_screen_password_skip_face_message" product="tablet" msgid="7178731554533608255">"Se necesita una contraseña para configurar Desbloqueo facial.\n\nLa contraseña protege tu tablet si la pierdes o te la roban."</string>
<string name="lock_screen_pin_skip_face_message" product="device" msgid="1932467886606343431">"Se necesita un PIN para configurar Desbloqueo facial.\n\nEl PIN protege tu dispositivo si lo pierdes o te lo roban."</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Se necesita un PIN para configurar Desbloqueo facial.\n\nEl PIN protege tu teléfono si lo pierdes o te lo roban."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Se necesita un patrón para configurar Desbloqueo facial.\n\nEl patrón protege tu teléfono si lo pierdes o te lo roban."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Se necesita una contraseña para configurar Desbloqueo facial.\n\nLa contraseña protege tu teléfono si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Se necesita un PIN para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl PIN protege tu tablet si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Se necesita un patrón para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl patrón protege tu tablet si lo pierdes o te lo roban."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Se necesita una contraseña para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nLa contraseña protege tu tablet si la pierdes o te la roban."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Se necesita un PIN para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl PIN protege tu dispositivo si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Se necesita un patrón para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl patrón protege tu dispositivo si lo pierdes o te lo roban."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Se necesita una contraseña para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nLa contraseña protege tu dispositivo si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Se necesita un PIN para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl PIN protege tu teléfono si lo pierdes o te lo roban."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Se necesita un patrón para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nEl patrón protege tu teléfono si lo pierdes o te lo roban."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Se necesita una contraseña para configurar Desbloqueo facial y Desbloqueo con huella digital.\n\nLa contraseña protege tu teléfono si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Se necesita un PIN para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl PIN protege la tablet si la pierdes o te la roban."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Se necesita un patrón para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl patrón protege la tablet si la pierdes o te la roban."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Se necesita una contraseña para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nLa contraseña protege la tablet si la pierdes o te la roban."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Se necesita un PIN para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl PIN protege el dispositivo si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Se necesita un patrón para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl patrón protege el dispositivo si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Se necesita una contraseña para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nLa contraseña protege el dispositivo si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Se necesita un PIN para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl PIN protege el teléfono si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Se necesita un patrón para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nEl patrón protege el teléfono si lo pierdes o te lo roban."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Se necesita una contraseña para configurar Desbloqueo con huella digital y Desbloqueo facial.\n\nLa contraseña protege el teléfono si lo pierdes o te lo roban."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Se eliminarán las imágenes y el modelo de huella digital asociados a <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que están almacenados en tu teléfono."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Se eliminarán las imágenes y el modelo de huella digital asociados a <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que están almacenados en tu tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Se eliminarán las imágenes y el modelo de huella digital asociados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que están almacenados en tu dispositivo"</string>
@@ -205,7 +205,7 @@
<string name="biometrics_unlock_title" product="device" msgid="3342994085226864170">"Puedes desbloquear el dispositivo con tu cara o con tu huella digital. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
<string name="encrypt_title" product="tablet" msgid="8915795247786124547">"Cifrar tablet"</string>
<string name="encrypt_title" product="default" msgid="511146128799853404">"Cifrar teléfono"</string>
- <string name="suggested_lock_settings_summary" product="tablet" msgid="8821254377043173267">"Añade bloqueo de pantalla para proteger el tablet"</string>
+ <string name="suggested_lock_settings_summary" product="tablet" msgid="8821254377043173267">"Añade un bloqueo de pantalla para proteger la tablet"</string>
<string name="suggested_lock_settings_summary" product="device" msgid="4863929838844014122">"Añade bloqueo de pantalla para proteger el dispositivo"</string>
<string name="suggested_lock_settings_summary" product="default" msgid="8050809409337082738">"Añade bloqueo de pantalla para proteger el teléfono"</string>
<string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="8565330205932332157"></string>
@@ -227,9 +227,9 @@
<string name="wifi_add_app_networks_summary" product="tablet" msgid="6433255556506891439">"<xliff:g id="APPNAME">%1$s</xliff:g> quiere guardar estas redes en tu tablet"</string>
<string name="auto_rotate_screen_summary" product="default" msgid="5562937346878935483">"Ajusta automáticamente la orientación de la pantalla cuando cambias tu teléfono de vertical a horizontal"</string>
<string name="auto_rotate_screen_summary" product="tablet" msgid="3163709742477804994">"Ajusta automáticamente la orientación de la pantalla cuando cambias tu tablet de vertical a horizontal"</string>
- <string name="sim_lock_on" product="tablet" msgid="227481196121403470">"Solicitar PIN para utilizar el tablet"</string>
+ <string name="sim_lock_on" product="tablet" msgid="227481196121403470">"Solicitar PIN para usar la tablet"</string>
<string name="sim_lock_on" product="default" msgid="6896034657274595838">"Pide el PIN para usar el teléfono"</string>
- <string name="sim_lock_off" product="tablet" msgid="4619320846576958981">"Solicitar PIN para utilizar el tablet"</string>
+ <string name="sim_lock_off" product="tablet" msgid="4619320846576958981">"Solicitar PIN para utilizar la tablet"</string>
<string name="sim_lock_off" product="default" msgid="2064502270875375541">"Pide el PIN para usar el teléfono"</string>
<string name="status_number" product="tablet" msgid="6746773328312218158">"MDN"</string>
<string name="status_number" product="default" msgid="2333455505912871374">"Número de teléfono"</string>
@@ -245,7 +245,7 @@
<string name="storage_wizard_init_v2_internal_action" product="default" msgid="560506072518373839">"Formatear"</string>
<string name="storage_wizard_migrate_v2_body" product="tablet" msgid="7539293889421540797">"Puedes mover archivos, contenido multimedia y determinadas aplicaciones a tu <xliff:g id="NAME">^1</xliff:g>. \n\nAl hacerlo, se liberarán <xliff:g id="SIZE">^2</xliff:g> del almacenamiento de tu teléfono. El proceso tardará <xliff:g id="DURATION">^3</xliff:g>, aproximadamente."</string>
<string name="storage_wizard_migrate_v2_body" product="default" msgid="3807501187945770401">"Puedes mover archivos, contenido multimedia y determinadas aplicaciones a tu <xliff:g id="NAME">^1</xliff:g>. \n\nAl hacerlo, se liberarán <xliff:g id="SIZE">^2</xliff:g> del almacenamiento de tu teléfono. El proceso tardará <xliff:g id="DURATION">^3</xliff:g>, aproximadamente."</string>
- <string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5326017162943304749">"El tablet tiene que estar cargado"</string>
+ <string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5326017162943304749">"La tablet tiene que estar cargada"</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="8041162611685970218">"El teléfono tiene que estar cargado"</string>
<string name="main_clear_desc" product="tablet" msgid="5778614597513856716">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
<string name="main_clear_desc" product="default" msgid="1888412491866186706">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
@@ -274,7 +274,7 @@
<string name="install_all_warning" product="device" msgid="6293002353591632851">"Tu dispositivo y tus datos personales son más vulnerables a los ataques de aplicaciones desconocidas. Al instalar aplicaciones de esta fuente, aceptas ser responsable de cualquier daño que sufra tu dispositivo o de la pérdida de datos que se pueda derivar de su uso."</string>
<string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="6321057186549848774">"Si detienes este servicio, es posible que algunas funciones del tablet dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
<string name="runningservicedetails_stop_dlg_text" product="default" msgid="6869998550403667737">"Si detienes este servicio, es posible que algunas funciones del teléfono dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
- <string name="testing_phone_info" product="tablet" msgid="8267746802132630741">"Información del tablet"</string>
+ <string name="testing_phone_info" product="tablet" msgid="8267746802132630741">"Información de la tablet"</string>
<string name="testing_phone_info" product="default" msgid="7507506297352160191">"Información sobre el teléfono"</string>
<string name="accessibility_text_reading_confirm_dialog_message" product="default" msgid="1773409172676594981">"Tus preferencias de tamaño de visualización y del texto se restablecerán a las de la configuración original del teléfono"</string>
<string name="accessibility_text_reading_confirm_dialog_message" product="tablet" msgid="2547948891207211388">"Tus preferencias de tamaño de visualización y del texto se restablecerán a las de la configuración original de la tablet"</string>
@@ -306,20 +306,20 @@
<string name="really_remove_account_message" product="device" msgid="1482438683708606820">"Si quitas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7137933271689383781">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en la tablet.\n\nEs posible que algunas cuentas copien los cambios que hagas en la tablet también en la Web. Las cuentas de Google funcionan así."</string>
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="7207326473052484970">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el teléfono.\n\nEs posible que algunas cuentas copien los cambios que hagas en el teléfono también en la Web. Las cuentas de Google funcionan así."</string>
- <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"El tablet desactivará los datos móviles cuando se alcance el límite que configures.\n\nComo el uso de datos lo calcula el tablet y es posible que tu operador lo mida de forma diferente, se recomienda establecer un límite conservador."</string>
+ <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"Tu tablet desactivará los datos móviles cuando se alcance el límite que configures.\n\nComo el uso de datos lo calcula la tablet y es posible que tu operador lo mida de forma diferente, se recomienda establecer un límite conservador."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Tu teléfono desactivará los datos móviles cuando se alcance el límite que configures.\n\nComo el uso de datos lo calcula el teléfono y es posible que tu operador lo mida de forma diferente, se recomienda establecer un límite conservador."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Comparte tu dispositivo añadiendo usuarios. Cada uno tiene su propio espacio personal en el dispositivo con opciones de configuración, aplicaciones, cuentas y pantallas de inicio personalizadas, entre otras cosas."</string>
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Comparte tu tablet añadiendo usuarios. Cada uno tiene su propio espacio personal en la tablet con opciones de configuración, aplicaciones, cuentas y pantallas de inicio personalizadas, entre otras cosas."</string>
<string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Comparte tu teléfono añadiendo usuarios. Cada uno tiene su propio espacio personal en el teléfono para personalizar las pantallas de inicio, las cuentas, las aplicaciones, los ajustes y más."</string>
- <string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Solo el propietario del tablet puede administrar los usuarios."</string>
- <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo el propietario del teléfono puede administrar los usuarios."</string>
+ <string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Solo el propietario de la tablet puede gestionar usuarios."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo el propietario del teléfono puede gestionar usuarios."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Perderás tu espacio y tus datos en esta tablet. Esta acción no se puede deshacer."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"Perderás tu espacio y tus datos en este teléfono. Esta acción no se puede deshacer."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"Artículos de ayuda, asistencia por teléfono y chat"</string>
<string name="support_summary" product="tablet" msgid="2588832599234347108">"Artículos de ayuda, tablet y chat"</string>
<string name="support_summary" product="device" msgid="6821511162132497205">"Artículos de ayuda, dispositivo y chat"</string>
<string name="ambient_display_title" product="default" msgid="8027137727044125809">"Doble toque para consultar el teléfono"</string>
- <string name="ambient_display_title" product="tablet" msgid="2347746118188465334">"Doble toque para consultar el tablet"</string>
+ <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>
diff --git a/res-product/values-et/strings.xml b/res-product/values-et/strings.xml
index 16f5737..80a72ed 100644
--- a/res-product/values-et/strings.xml
+++ b/res-product/values-et/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Näoga avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Näoga avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Näoga avamise seadistamiseks on vaja parooli.\n\nParool kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja parooli.\n\nParool kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja parooli.\n\nParool kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Näoga avamise ja sõrmejäljega avamise seadistamiseks on vaja parooli.\n\nParool kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja parooli.\n\nParool kaitseb tahvelarvutit juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja parooli.\n\nParool kaitseb seadet juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja PIN-koodi.\n\nPIN-kood kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja mustrit.\n\nMuster kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Sõrmejäljega avamise ja näoga avamise seadistamiseks on vaja parooli.\n\nParool kaitseb telefoni juhul, kui see läheb kaotsi või varastatakse."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"See kustutab sõrmejäljega „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ seotud sõrmejäljekujutised ja -mudeli, mis on teie telefoni salvestatud"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"See kustutab sõrmejäljega „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ seotud sõrmejäljekujutised ja -mudeli, mis on teie tahvelarvutisse salvestatud"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"See kustutab sõrmejäljega „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ seotud sõrmejäljekujutised ja -mudeli, mis on teie seadmesse salvestatud"</string>
diff --git a/res-product/values-eu/strings.xml b/res-product/values-eu/strings.xml
index bf74312..2493934 100644
--- a/res-product/values-eu/strings.xml
+++ b/res-product/values-eu/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"PIN bat behar da aurpegi bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPINak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Eredu bat behar da aurpegi bidez desblokeatzeko eginbidea konfiguratzeko.\n\nEreduak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPasahitzak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPINak babestu egiten du tableta, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nEreduak babestu egiten du tableta, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPasahitzak babestu egiten du tableta, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"PIN bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPINak babestu egiten du gailua, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Eredu bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nEreduak babestu egiten du gailua, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPasahitzak babestu egiten du gailua, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"PIN bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPINak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nEreduak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Pasahitz bat behar da aurpegi bidez desblokeatzeko eginbidea eta hatz-marka bidez desblokeatzeko eginbidea konfiguratzeko.\n\nPasahitzak babestu egiten du telefonoa, hura galtzen baduzu edo lapurtzen badizute."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTableta galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Eredu bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTableta galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Pasahitz bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTableta galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nGailua galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Eredu bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nGailua galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Pasahitz bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nGailua galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTelefonoa galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Eredu bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTelefonoa galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Pasahitz bat behar da hatz-marka bidez eta aurpegi bidez desblokeatzeko eginbideak konfiguratzeko.\n\nTelefonoa galtzen baduzu edo lapurtzen badizute, pasahitzarekin babestuta egongo da."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Telefonoan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" izenarekin gordetako hatz-markaren irudiak eta eredua ezabatuko dira."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Tabletan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" izenarekin gordetako hatz-markaren irudiak eta eredua ezabatuko dira."</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ezabatu egingo dira gailuan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" izenarekin gordetako hatz-markaren irudiak eta eredua"</string>
diff --git a/res-product/values-fa/strings.xml b/res-product/values-fa/strings.xml
index 7bfa002..08460ba 100644
--- a/res-product/values-fa/strings.xml
+++ b/res-product/values-fa/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"برای راهاندازی «قفلگشایی با چهره»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، پین از آن محافظت میکند."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"برای راهاندازی «قفلگشایی با چهره»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، الگو از آن محافظت میکند."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"برای راهاندازی «قفلگشایی با چهره»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، گذرواژه از آن محافظت میکند."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، پین از آن محافظت میکند."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، الگو از آن محافظت میکند."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، گذرواژه از آن محافظت میکند."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، پین از آن محافظت میکند."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، الگو از آن محافظت میکند."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، گذرواژه از آن محافظت میکند."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، پین از آن محافظت میکند."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، الگو از آن محافظت میکند."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"برای راهاندازی «قفلگشایی با چهره» و «قفلگشایی با اثر انگشت»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، گذرواژه از آن محافظت میکند."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، پین از آن محافظت میکند."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، الگو از آن محافظت میکند."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن رایانه لوحی، گذرواژه از آن محافظت میکند."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، پین از آن محافظت میکند."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، الگو از آن محافظت میکند."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن دستگاه، گذرواژه از آن محافظت میکند."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن پین الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، پین از آن محافظت میکند."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن الگو الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، الگو از آن محافظت میکند."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"برای راهاندازی «قفلگشایی با اثر انگشت» و «قفلگشایی با چهره»، افزودن گذرواژه الزامی است.\n\nدرصورت گم شدن یا بهسرقت رفتن تلفن، گذرواژه از آن محافظت میکند."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"با این کار مدل و تصاویر اثر انگشت مرتبط با «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» که در تلفنتان ذخیره شده حذف میشوند"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"با این کار مدل و تصاویر اثر انگشت مرتبط با «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» که در رایانه لوحیتان ذخیره شدهاند حذف میشوند"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"با این کار مدل و تصاویر اثر انگشت مرتبط با «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» که در دستگاهتان ذخیره شدهاند حذف میشوند"</string>
@@ -257,8 +257,8 @@
<string name="erase_external_storage" product="default" msgid="645024170825543458">"پاک کردن کارت SD"</string>
<string name="erase_external_storage_description" product="nosdcard" msgid="6285187323873212966">"همه دادههای موجود در حافظهٔ USB داخلی مانند موسیقی یا عکسها را پاک کنید"</string>
<string name="erase_external_storage_description" product="default" msgid="3294267929524578503">"همه دادههای موجود در کارت SD از جمله موسیقی یا عکسها حذف میشوند"</string>
- <string name="main_clear_button_text" product="tablet" msgid="3763748694468489783">"پاک کردن تمام دادهها"</string>
- <string name="main_clear_button_text" product="default" msgid="3763748694468489783">"پاک کردن تمام دادهها"</string>
+ <string name="main_clear_button_text" product="tablet" msgid="3763748694468489783">"پاک کردن همه دادهها"</string>
+ <string name="main_clear_button_text" product="default" msgid="3763748694468489783">"پاک کردن همه دادهها"</string>
<string name="usb_tethering_subtext" product="default" msgid="5969806206311342779">"همرسانی اتصال اینترنت تلفن ازطریق USB"</string>
<string name="usb_tethering_subtext" product="tablet" msgid="4550828946207155142">"همرسانی اینترنت رایانه لوحی ازطریق USB"</string>
<string name="bluetooth_tethering_subtext" product="tablet" msgid="1339730853653511849">"همرسانی اتصال اینترنت رایانه لوحی ازطریق بلوتوث"</string>
diff --git a/res-product/values-fi/strings.xml b/res-product/values-fi/strings.xml
index 895fcfe..1c42071 100644
--- a/res-product/values-fi/strings.xml
+++ b/res-product/values-fi/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Kasvojentunnistusavauksen käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa puhelinta, jos se katoaa tai varastetaan."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Kasvojentunnistusavauksen käyttöönotto edellyttää kuviota.\n\nKuvio suojaa puhelinta, jos se katoaa tai varastetaan."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Kasvojentunnistusavauksen käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa puhelinta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa tablettia, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa tablettia, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa tablettia, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa laitetta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa laitetta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa laitetta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa puhelinta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa puhelinta, jos se katoaa tai varastetaan."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Kasvojentunnistus- ja sormenjälkiavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa puhelinta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa tablettia, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa tablettia, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa tablettia, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa laitetta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa laitetta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa laitetta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää PIN-koodia.\n\nPIN-koodi suojaa puhelinta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää kuviota.\n\nKuvio suojaa puhelinta, jos se katoaa tai varastetaan."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Sormenjälki- ja kasvojentunnistusavausten käyttöönotto edellyttää salasanaa.\n\nSalasana suojaa puhelinta, jos se katoaa tai varastetaan."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Tämä poistaa puhelimelle tallennetut sormenjäljen kuvat ja mallit, joihin <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> liittyy"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Tämä poistaa tabletille tallennetut sormenjäljen kuvat ja mallit, joihin <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> liittyy"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Tämä poistaa laitteelle tallennetut sormenjäljen kuvat ja mallit, joihin <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> liittyy"</string>
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 0000000..3b065d8
--- /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-product/values-fr-rCA-masculine/strings.xml b/res-product/values-fr-rCA-masculine/strings.xml
new file mode 100644
index 0000000..ed2e2ca
--- /dev/null
+++ b/res-product/values-fr-rCA-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_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 0000000..6b27fad
--- /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-fr-rCA/strings.xml b/res-product/values-fr-rCA/strings.xml
index c8b8e1f..680c2f7 100644
--- a/res-product/values-fr-rCA/strings.xml
+++ b/res-product/values-fr-rCA/strings.xml
@@ -25,20 +25,20 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8944917742814573320">"Adresse Bluetooth de l\'appareil : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_ask_discovery" product="tablet" msgid="7430581669309228387">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite rendre votre tablette visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%2$d</xliff:g> secondes."</string>
<string name="bluetooth_ask_discovery" product="default" msgid="3947027393224406367">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%2$d</xliff:g> secondes."</string>
- <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="440976482246291783">"Une application souhaite rendre votre tablette visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
- <string name="bluetooth_ask_discovery_no_name" product="default" msgid="5164413774312648842">"Une application souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="440976482246291783">"Une appli souhaite rendre votre tablette visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="default" msgid="5164413774312648842">"Une appli souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
<string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="750347558570909906">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite rendre votre tablette visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
<string name="bluetooth_ask_lasting_discovery" product="default" msgid="5844129004156080891">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce paramètres plus tard dans les paramètres Bluetooth."</string>
- <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1062185767225450964">"Une application souhaite rendre votre tablette visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
- <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="7909547303183236140">"Une application souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
+ <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1062185767225450964">"Une appli souhaite rendre votre tablette visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
+ <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="7909547303183236140">"Une appli souhaite rendre votre téléphone visible à d\'autres appareils Bluetooth. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
<string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="6187874232925632790">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%2$d</xliff:g> secondes."</string>
<string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="1018495685727482700">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%2$d</xliff:g> secondes."</string>
- <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"Une application souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
- <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="4847493437698663706">"Une application souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+ <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="3469927640700478737">"Une appli souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
+ <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="4847493437698663706">"Une appli souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils pendant <xliff:g id="TIMEOUT">%1$d</xliff:g> secondes."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="487436507630570730">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="5169934906530139494">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
- <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="505214056751470551">"Une application souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
- <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6187216564831513193">"Une application souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
+ <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="505214056751470551">"Une appli souhaite activer le Bluetooth et rendre votre tablette visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
+ <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6187216564831513193">"Une appli souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
<string name="encryption_and_credential_settings_summary" product="default" msgid="3741475436042800617">"Téléphone chiffré"</string>
<string name="not_encrypted_summary" product="default" msgid="330652312169527734">"Téléphone non chiffré"</string>
<string name="encryption_and_credential_settings_summary" product="tablet" msgid="2220021007677215054">"Appareil chiffré"</string>
@@ -49,20 +49,20 @@
<string name="security_settings_face_enroll_introduction_accessibility_expanded" product="default" msgid="2221590003018953090"></string>
<string name="security_settings_face_enroll_introduction_accessibility_expanded" product="tablet" msgid="2221590003018953090"></string>
<string name="security_settings_face_enroll_introduction_accessibility_expanded" product="device" msgid="2221590003018953090"></string>
- <string name="security_settings_face_enroll_introduction_message" product="default" msgid="847716059867943459">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications."</string>
- <string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="3976493376026067375">"Utilisez votre visage pour déverrouiller votre tablette, autoriser vos achats et vous connecter à des applications."</string>
- <string name="security_settings_face_enroll_introduction_message" product="device" msgid="6432265830098806034">"Utilisez votre visage pour déverrouiller votre appareil, autoriser vos achats et vous connecter à des applications."</string>
+ <string name="security_settings_face_enroll_introduction_message" product="default" msgid="847716059867943459">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applis."</string>
+ <string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="3976493376026067375">"Utilisez votre visage pour déverrouiller votre tablette, autoriser vos achats et vous connecter à des applis."</string>
+ <string name="security_settings_face_enroll_introduction_message" product="device" msgid="6432265830098806034">"Utilisez votre visage pour déverrouiller votre appareil, autoriser vos achats et vous connecter à des applis."</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"Utilisez votre visage pour déverrouiller votre téléphone ou pour confirmer votre identité dans les applis, par exemple lorsque vous vous connectez ou que vous approuvez un achat"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"Utilisez votre visage pour déverrouiller votre tablette ou pour confirmer votre identité dans les applis, par exemple lorsque vous vous connectez ou que vous approuvez un achat"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"Utilisez votre visage pour déverrouiller votre appareil ou pour confirmer votre identité dans les applis, par exemple lorsque vous vous connectez ou que vous approuvez un achat"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Autoriser votre enfant à utiliser son visage pour déverrouiller son téléphone"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Autoriser votre enfant à utiliser son visage pour déverrouiller sa tablette"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Autorisez votre enfant à utiliser son visage pour déverrouiller sa tablette"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Autoriser votre enfant à utiliser son visage pour déverrouiller son appareil"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Autorisez votre enfant à utiliser son visage pour déverrouiller son téléphone ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="tablet" msgid="5932555218164668532">"Autorisez votre enfant à utiliser son visage pour déverrouiller sa tablette ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Autorisez votre enfant à utiliser son visage pour déverrouiller son appareil ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
- <string name="security_settings_face_enroll_introduction_consent_message" product="default" msgid="3698558920963989416">"L\'utilisation du visage de votre enfant pour déverrouiller son téléphone peut être moins sûre qu\'un schéma ou un NIP robustes."</string>
- <string name="security_settings_face_enroll_introduction_consent_message" product="tablet" msgid="2689983368730833505">"L\'utilisation du visage de votre enfant pour déverrouiller sa tablette peut être moins sûre qu\'un schéma ou un NIP robustes."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Autorisez votre enfant à utiliser son visage pour déverrouiller son téléphone ou confirmer qu\'il s\'agit bien de votre enfant. Cette situation se produit lorsque votre enfant se connecte à des applis, approuve un achat et plus."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="tablet" msgid="5932555218164668532">"Autorisez votre enfant à utiliser son visage pour déverrouiller sa tablette ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applis, approuve un achat et plus."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Autorisez votre enfant à utiliser son visage pour déverrouiller son appareil ou confirmer qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message" product="default" msgid="3698558920963989416">"L\'utilisation du visage de votre enfant pour déverrouiller son téléphone peut être moins sûre qu\'un schéma ou un NIP robuste."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message" product="tablet" msgid="2689983368730833505">"L\'utilisation du visage de votre enfant pour déverrouiller sa tablette peut être moins sûre qu\'un schéma ou un NIP robuste."</string>
<string name="security_settings_face_enroll_introduction_consent_message" product="device" msgid="5768077532130409820">"L\'utilisation du visage de votre enfant pour déverrouiller son appareil peut être moins sûre qu\'un schéma ou un NIP robustes."</string>
<string name="security_settings_face_enroll_introduction_info_looking" product="default" msgid="6532489273492650716"></string>
<string name="security_settings_face_enroll_introduction_info_looking" product="tablet" msgid="6532489273492650716"></string>
@@ -94,22 +94,22 @@
<string name="security_settings_face_enroll_introduction_control_consent_message" product="default" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="tablet" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="device" msgid="6983939010814873996"></string>
- <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"Utilisez votre visage pour déverrouiller votre téléphone ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer" product="tablet" msgid="3467711032275909082">"Utilisez votre visage pour déverrouiller votre tablette ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller la tablette en la regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre tablette en la tenant devant votre visage.\n\nVotre tablette pourrait être déverrouillée par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer" product="device" msgid="6237815625247917310">"Utilisez votre visage pour déverrouiller votre appareil ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"Utilisez votre visage pour déverrouiller votre téléphone ou pour vous authentifier dans les applis, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer" product="tablet" msgid="3467711032275909082">"Utilisez votre visage pour déverrouiller votre tablette ou pour vous authentifier dans les applis, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller la tablette en la regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre tablette en la tenant devant votre visage.\n\nVotre tablette pourrait être déverrouillée par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer" product="device" msgid="6237815625247917310">"Utilisez votre visage pour déverrouiller votre appareil ou pour vous authentifier dans les applis, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme votre jumeau ou jumelle identique."</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"Utilisez votre visage pour déverrouiller votre téléphone ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="tablet" msgid="6932278790700490818">"Utilisez votre visage pour déverrouiller votre tablette ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller la tablette en la regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre tablette en la tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre tablette pourrait être déverrouillée par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"Utilisez votre visage pour déverrouiller votre appareil ou pour vous authentifier dans les applications, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"Utilisez votre visage pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"Utilisez votre visage pour déverrouiller votre appareil ou pour vous authentifier dans les applis, par exemple lorsque vous vous connectez ou approuvez un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"Utilisez votre visage pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
<string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"Utilisez votre visage pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller la tablette en la regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre tablette en la tenant devant votre visage.\n\nVotre tablette pourrait être déverrouillée par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Utilisez votre visage pour déverrouiller votre appareil ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Utilisez votre visage pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
+ <string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"Utilisez votre visage pour déverrouiller votre appareil ou confirmer qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme votre jumeau ou jumelle identique."</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"Utilisez votre visage pour déverrouiller votre téléphone ou confirmer qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller le téléphone en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme votre jumeau ou jumelle identique."</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Utilisez votre visage pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller la tablette en la regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre tablette en la tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre tablette pourrait être déverrouillée par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Utilisez votre visage pour déverrouiller votre appareil ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat.\n\nGardez à l\'esprit :\nUn seul visage peut être configuré à la fois. Pour ajouter un autre visage, supprimez le visage actuel.\n\nVous pourriez déverrouiller l\'appareil en le regardant, même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre appareil en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre appareil pourrait être déverrouillé par une personne qui vous ressemble beaucoup, comme un jumeau identique."</string>
- <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Utilisez votre empreinte digitale pour déverrouiller votre <xliff:g id="DEVICENAME">%s</xliff:g> ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat"</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller son téléphone ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller sa tablette ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller son appareil ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applications, approuve un achat et plus."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Utilisez votre empreinte digitale pour déverrouiller votre <xliff:g id="DEVICENAME">%s</xliff:g> ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller son téléphone ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applis, approuve un achat et plus."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller sa tablette ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applis, approuve un achat et plus."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Autorisez votre enfant à utiliser son empreinte digitale pour déverrouiller son appareil ou vérifier qu\'il s\'agit bien de lui. Cette situation se produit lorsqu\'il se connecte à des applis, approuve un achat et plus."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default" msgid="8488497844109768268">"Déverrouiller votre téléphone avec votre empreinte digitale peut être plus risqué qu\'avec un schéma ou un NIP robuste"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="tablet" msgid="5688664190282817312">"Le déverrouillage de votre tablette avec votre empreinte digitale peut être plus risqué qu\'avec un schéma ou un NIP robuste"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="device" msgid="2814616139536479018">"Le déverrouillage de votre appareil avec votre empreinte digitale peut être plus risqué qu\'avec un schéma ou un NIP robuste"</string>
@@ -146,12 +146,12 @@
<string name="security_settings_sfps_enroll_find_sensor_message" product="tablet" msgid="2006739081527422127">"Le capteur d\'empreintes digitales est situé sur l\'interrupteur. Il s\'agit du bouton plat situé à côté du bouton de volume surélevé, sur le bord de la tablette."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="device" msgid="1209233633252372907">"Le capteur d\'empreintes digitales est situé sur l\'interrupteur. Il s\'agit du bouton plat situé à côté du bouton de volume surélevé, sur le bord de l\'appareil."</string>
<string name="security_settings_sfps_enroll_find_sensor_message" product="default" msgid="6862493139500275821">"Le capteur d\'empreintes digitales est situé sur l\'interrupteur. Il s\'agit du bouton plat situé à côté du bouton de volume surélevé, sur le bord du téléphone."</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="2012126789397819713">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="7119860465479161782">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre appareil ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="8255422287180693200">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou approuver un achat"</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="tablet" msgid="7814892482046294464">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou pour approuver un achat. \n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre tablette de différentes façons."</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="device" msgid="8418220207105495988">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre appareil ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou pour approuver un achat.\n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre appareil de différentes façons."</string>
- <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="default" msgid="3545300825124248359">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applications ou pour approuver un achat.\n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre téléphone de différentes façons."</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet" msgid="2012126789397819713">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device" msgid="7119860465479161782">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre appareil ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default" msgid="8255422287180693200">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou approuver un achat"</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="tablet" msgid="7814892482046294464">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre tablette ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou pour approuver un achat. \n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre tablette de différentes façons."</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="device" msgid="8418220207105495988">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre appareil ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou pour approuver un achat.\n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre appareil de différentes façons."</string>
+ <string name="security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message" product="default" msgid="3545300825124248359">"Vous pouvez maintenant utiliser votre empreinte digitale pour déverrouiller votre téléphone ou pour vérifier qu\'il s\'agit bien de vous, par exemple pour vous connecter à des applis ou pour approuver un achat.\n\nAjoutez une autre empreinte digitale pour faciliter le déverrouillage lorsque vous tenez votre téléphone de différentes façons."</string>
<string name="lock_screen_pin_skip_message" product="tablet" msgid="2125894016330764666">"Un NIP protège la tablette en cas de perte ou de vol de celle-ci"</string>
<string name="lock_screen_pattern_skip_message" product="tablet" msgid="7022124791463099454">"Un schéma protège la tablette en cas de perte ou de vol de celle-ci"</string>
<string name="lock_screen_password_skip_message" product="tablet" msgid="7117050321575989041">"Un mot de passe protège la tablette en cas de perte ou de vol de celle-ci"</string>
@@ -179,21 +179,21 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale.\n\nUn NIP protège le téléphone en cas de perte ou de vol de celui-ci."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale.\n\nUn schéma protège le téléphone en cas de perte ou de vol de celui-ci."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale.\n\nUn mot de passe protège le téléphone en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège la tablette en cas de perte ou de vol de celle-ci."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège la tablette en cas de perte ou de vol de celle-ci."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège la tablette en cas de perte ou de vol de celle-ci."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège le téléphone en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège le téléphone en cas de perte ou de vol de celui-ci."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège le téléphone en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège la tablette en cas de perte ou de vol de celle-ci."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège la tablette en cas de perte ou de vol de celle-ci."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège la tablette en cas de perte ou de vol de celle-ci."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège l\'appareil en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Un NIP est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn NIP protège le téléphone en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Un schéma est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège le téléphone en cas de perte ou de vol de celui-ci."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Un mot de passe est requis pour configurer la fonctionnalité de déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège le téléphone en cas de perte ou de vol de celui-ci."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Les images et le modèle d\'empreinte digitale associés à « <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> » et stockés sur votre téléphone seront supprimés"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Les images et le modèle d\'empreinte digitale associés à « <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> » et stockés sur votre tablette seront supprimés"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Les images et le modèle d\'empreinte digitale associés à « <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> » et stockés sur votre appareil seront supprimés"</string>
- <string name="fingerprint_last_delete_message" product="default" msgid="3187410175262625294">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre téléphone ni pour vérifier qu\'il s\'agit bien de vous dans les applications."</string>
- <string name="fingerprint_last_delete_message" product="tablet" msgid="8618307419148004587">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre tablette ni pour vérifier qu\'il s\'agit bien de vous dans les applications."</string>
- <string name="fingerprint_last_delete_message" product="device" msgid="3910012280858587242">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre appareil ni pour vérifier qu\'il s\'agit bien de vous dans les applications."</string>
+ <string name="fingerprint_last_delete_message" product="default" msgid="3187410175262625294">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre téléphone ni pour vérifier qu\'il s\'agit bien de vous dans les applis."</string>
+ <string name="fingerprint_last_delete_message" product="tablet" msgid="8618307419148004587">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre tablette ni pour vérifier qu\'il s\'agit bien de vous dans les applis."</string>
+ <string name="fingerprint_last_delete_message" product="device" msgid="3910012280858587242">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre appareil ni pour vérifier qu\'il s\'agit bien de vous dans les applis."</string>
<string name="fingerprint_unlock_title" product="default" msgid="3224008661274975980">"Vous pouvez déverrouiller votre téléphone avec votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
<string name="fingerprint_unlock_title" product="tablet" msgid="6920040586231644124">"Vous pouvez déverrouiller votre tablette avec votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
<string name="fingerprint_unlock_title" product="device" msgid="1469790269368691678">"Vous pouvez déverrouiller votre appareil avec votre empreinte digitale. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
@@ -238,17 +238,17 @@
<string name="status_number_sim_status" product="tablet" msgid="9003886361856568694">"NRM sur la carte SIM"</string>
<string name="status_number_sim_status" product="default" msgid="7536755538266735352">"N° de téléphone sur la carte SIM"</string>
<string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="2049551739429034707">"Formater la carte SD en tant que mémoire interne"</string>
- <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6130017080675241337">"Stockez vos applications et vos contenus multimédias pour les utiliser uniquement sur cette tablette. <a href=https://support.google.com/android/answer/12153449>En savoir plus sur la configuration d\'une carte SD</a>."</string>
+ <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="6130017080675241337">"Stockez vos applis et vos contenus multimédias pour les utiliser uniquement sur cette tablette. <a href=https://support.google.com/android/answer/12153449>En savoir plus sur la configuration d\'une carte SD</a>."</string>
<string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="560506072518373839">"Formater"</string>
<string name="storage_wizard_init_v2_internal_title" product="default" msgid="2049551739429034707">"Formater la carte SD en tant que mémoire interne"</string>
- <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="4395040788668914783">"Stockez vos applications et vos contenus multimédias pour les utiliser uniquement sur ce téléphone. <a href=https://support.google.com/android/answer/12153449>En savoir plus sur la configuration d\'une carte SD</a>."</string>
+ <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="4395040788668914783">"Stockez vos applis et vos contenus multimédias pour les utiliser uniquement sur ce téléphone. <a href=https://support.google.com/android/answer/12153449>En savoir plus sur la configuration d\'une carte SD</a>."</string>
<string name="storage_wizard_init_v2_internal_action" product="default" msgid="560506072518373839">"Formater"</string>
- <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="7539293889421540797">"Vous pouvez déplacer vos fichiers et certaines applications sur le périphérique <xliff:g id="NAME">^1</xliff:g>. \n\nCe déplacement libérerait <xliff:g id="SIZE">^2</xliff:g> du stockage de votre tablette et prendrait environ <xliff:g id="DURATION">^3</xliff:g>."</string>
- <string name="storage_wizard_migrate_v2_body" product="default" msgid="3807501187945770401">"Vous pouvez déplacer vos fichiers et certaines applications sur le périphérique <xliff:g id="NAME">^1</xliff:g>. \n\nCe déplacement libérerait <xliff:g id="SIZE">^2</xliff:g> du stockage de votre téléphone et prendrait environ <xliff:g id="DURATION">^3</xliff:g>."</string>
+ <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="7539293889421540797">"Vous pouvez déplacer vos fichiers et certaines applis sur le périphérique <xliff:g id="NAME">^1</xliff:g>. \n\nCe déplacement libérerait <xliff:g id="SIZE">^2</xliff:g> du stockage de votre tablette et prendrait environ <xliff:g id="DURATION">^3</xliff:g>."</string>
+ <string name="storage_wizard_migrate_v2_body" product="default" msgid="3807501187945770401">"Vous pouvez déplacer vos fichiers et certaines applis sur le périphérique <xliff:g id="NAME">^1</xliff:g>. \n\nCe déplacement libérerait <xliff:g id="SIZE">^2</xliff:g> du stockage de votre téléphone et prendrait environ <xliff:g id="DURATION">^3</xliff:g>."</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="tablet" msgid="5326017162943304749">"Gardez cette tablette chargée"</string>
<string name="storage_wizard_migrate_v2_checklist_battery" product="default" msgid="8041162611685970218">"Gardez ce téléphone chargé"</string>
- <string name="main_clear_desc" product="tablet" msgid="5778614597513856716">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
- <string name="main_clear_desc" product="default" msgid="1888412491866186706">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+ <string name="main_clear_desc" product="tablet" msgid="5778614597513856716">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'appli"</li>\n<li>"Les applis téléchargées"</li></string>
+ <string name="main_clear_desc" product="default" msgid="1888412491866186706">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'appli"</li>\n<li>"Les applis téléchargées"</li></string>
<string name="main_clear_accounts" product="default" msgid="3604029744509330786">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
<string name="main_clear_other_users_present" product="default" msgid="7750368595882863399">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
<string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="5834269984459195918">\n\n"Pour supprimer la musique, les photos et les autres données de l\'utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
@@ -269,9 +269,9 @@
<string name="about_settings" product="default" msgid="2621311564780208250">"À propos du téléphone"</string>
<string name="about_settings" product="device" msgid="7595574154492383452">"À propos de l\'appareil"</string>
<string name="about_settings" product="emulator" msgid="1099246296173401003">"À propos de l\'appareil émulé"</string>
- <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
- <string name="install_all_warning" product="default" msgid="4597256179485325694">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
- <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+ <string name="install_all_warning" product="tablet" msgid="1732116924846572063">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applis inconnues. En installant des applis provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applis."</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 provenant d\'applis inconnues. En installant des applis provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applis."</string>
+ <string name="install_all_warning" product="device" msgid="6293002353591632851">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applis inconnues. En installant des applis provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applis."</string>
<string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="6321057186549848774">"Si vous arrêtez ce service, certaines fonctionnalités de votre tablette peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
<string name="runningservicedetails_stop_dlg_text" product="default" msgid="6869998550403667737">"Si vous arrêtez ce service, certaines fonctionnalités de votre téléphone peuvent cesser de fonctionner correctement jusqu\'à ce que vous ayez éteint, puis rallumé votre appareil."</string>
<string name="testing_phone_info" product="tablet" msgid="8267746802132630741">"Informations sur la tablette"</string>
@@ -289,13 +289,13 @@
<string name="battery_tip_summary_summary" product="device" msgid="45436555475195632">"L\'appareil utilise une quantité normale d\'énergie en arrière-plan"</string>
<string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="4134817691837413711">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prendront fin, votre téléphone se rechargera normalement de façon automatique."</string>
<string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="9123428127699951337">"Dans certaines conditions, comme des températures élevées ou de longues périodes de charge, la charge pourrait être limitée à <xliff:g id="PERCENT">%1$s</xliff:g> pour aider à préserver la santé de la pile.\n\nLorsque ces conditions prendront fin, votre tablette se rechargera normalement de façon automatique."</string>
- <string name="battery_tip_dialog_message" product="default" msgid="7183790460600610222">"Comme vous avez utilisé votre téléphone plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
- <string name="battery_tip_dialog_message" product="tablet" msgid="2702706858728966181">"Comme vous avez utilisé votre tablette plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
- <string name="battery_tip_dialog_message" product="device" msgid="6488208467377974021">"Comme vous avez utilisé votre appareil plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applications qui utilisent le plus d\'énergie de la pile :"</string>
- <string name="battery_tip_dialog_summary_message" product="default" msgid="5760208650901831793">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre téléphone vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
- <string name="battery_tip_dialog_summary_message" product="tablet" msgid="236339248261391160">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre tablette vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
- <string name="battery_tip_dialog_summary_message" product="device" msgid="7885502661524685786">"Vos applications utilisent une quantité normale d\'énergie. Si les applications utilisent trop d\'énergie, votre appareil vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
- <string name="smart_battery_summary" product="default" msgid="1210637215867635435">"Restreindre l\'usage de la pile pour les applications que vous n\'utilisez pas souvent"</string>
+ <string name="battery_tip_dialog_message" product="default" msgid="7183790460600610222">"Comme vous avez utilisé votre téléphone plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applis qui utilisent le plus d\'énergie de la pile :"</string>
+ <string name="battery_tip_dialog_message" product="tablet" msgid="2702706858728966181">"Comme vous avez utilisé votre tablette plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applis qui utilisent le plus d\'énergie de la pile :"</string>
+ <string name="battery_tip_dialog_message" product="device" msgid="6488208467377974021">"Comme vous avez utilisé votre appareil plus que d\'habitude, votre pile risque de s\'épuiser plus tôt que prévu. \n\nLes applis qui utilisent le plus d\'énergie de la pile :"</string>
+ <string name="battery_tip_dialog_summary_message" product="default" msgid="5760208650901831793">"Vos applis utilisent une quantité normale d\'énergie. Si les applis utilisent trop d\'énergie, votre téléphone vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
+ <string name="battery_tip_dialog_summary_message" product="tablet" msgid="236339248261391160">"Vos applis utilisent une quantité normale d\'énergie. Si les applis utilisent trop d\'énergie, votre tablette vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
+ <string name="battery_tip_dialog_summary_message" product="device" msgid="7885502661524685786">"Vos applis utilisent une quantité normale d\'énergie. Si les applis utilisent trop d\'énergie, votre appareil vous suggérera des actions à essayer.\n\nVous pouvez toujours activer la fonction Économiseur de pile si la pile est trop faible."</string>
+ <string name="smart_battery_summary" product="default" msgid="1210637215867635435">"Restreindre l\'usage de la pile pour les applis que vous n\'utilisez pas souvent"</string>
<string name="battery_usage_screen_footer" product="default" msgid="8872101342490341865">"L\'utilisation de la pile et le temps d\'utilisation des écrans ne sont pas mesurés pendant la recharge du téléphone"</string>
<string name="battery_usage_screen_footer" product="tablet" msgid="1876984641036532124">"L\'utilisation de la pile et le temps d\'utilisation des écrans ne sont pas mesurés pendant la recharge de la tablette"</string>
<string name="battery_usage_screen_footer" product="device" msgid="6488857833906266507">"L\'utilisation de la pile et le temps d\'utilisation des écrans ne sont pas mesurés pendant la recharge de l\'appareil"</string>
@@ -308,11 +308,11 @@
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="7207326473052484970">"Toutes les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone.\n\nCertains comptes peuvent également copier automatiquement sur le Web toutes les modifications que vous apportez sur le téléphone. Les comptes Google fonctionnent de cette façon."</string>
<string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"Votre tablette désactivera les données cellulaires lorsqu\'elle atteindra la limite que vous définissez.\n\nComme c\'est votre tablette qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons d\'utiliser une limite plus basse."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Votre téléphone désactivera les données cellulaires lorsqu\'il atteindra la limite que vous définissez.\n\nComme c\'est votre téléphone qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons de définir une limite plus basse."</string>
- <string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Partagez votre appareil en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre appareil pour ses écrans d\'accueil personnalisés, ses comptes, ses applications, ses paramètres et plus encore."</string>
- <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Partagez votre tablette en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre tablette pour ses écrans d\'accueil personnalisés, ses comptes, ses applications, ses paramètres et plus encore."</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Partagez votre téléphone en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre téléphone pour ses écrans d\'accueil personnalisés, ses comptes, ses applications, ses paramètres et plus encore."</string>
+ <string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Partagez votre appareil en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre appareil pour ses écrans d\'accueil personnalisés, ses comptes, ses applis, ses paramètres et plus encore."</string>
+ <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Partagez votre tablette en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre tablette pour ses écrans d\'accueil personnalisés, ses comptes, ses applis, ses paramètres et plus encore."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Partagez votre téléphone en ajoutant des utilisateurs. Chaque utilisateur dispose d\'un espace personnel sur votre téléphone pour ses écrans d\'accueil personnalisés, ses comptes, ses applis, ses paramètres et plus encore."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
- <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Seule la personne propriétaire de la tablette peut gérer les utilisateurs."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Votre espace et vos données vont disparaître de cette tablette. Cette action est irréversible."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"Votre espace et vos données vont être supprimés de ce téléphone. Cette action est irréversible."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"Articles d\'aide, téléphone et clavardage"</string>
@@ -344,7 +344,7 @@
<string name="lockpassword_confirm_your_pin_details_frp" product="default" msgid="2027547169650312092">"Téléphone réinitialisé aux paramètres par défaut Pour l\'utiliser, entrez votre ancien NIP."</string>
<string name="lockpassword_confirm_your_pin_details_frp" product="tablet" msgid="8264086895022779707">"Tablette réinitialisée aux paramètres par défaut. Pour l\'utiliser, entrez votre ancien NIP."</string>
<string name="lockpassword_confirm_your_pin_details_frp" product="device" msgid="1654340132011802578">"Appareil réinitialisé aux paramètres par défaut. Pour l\'utiliser, entrez votre ancien NIP."</string>
- <string name="lockpassword_confirm_your_password_details_frp" product="default" msgid="1465326741724776281">"Téléphone réinitialisé aux paramètres par défaut Pour l\'utiliser, entrez votre ancien mot de passe."</string>
+ <string name="lockpassword_confirm_your_password_details_frp" product="default" msgid="1465326741724776281">"Téléphone réinitialisé aux paramètres par défaut. Pour l\'utiliser, entrez votre ancien mot de passe."</string>
<string name="lockpassword_confirm_your_password_details_frp" product="tablet" msgid="1333164951750797865">"Tablette réinitialisée aux paramètres par défaut. Pour l\'utiliser, entrez votre ancien mot de passe."</string>
<string name="lockpassword_confirm_your_password_details_frp" product="device" msgid="116667646012224967">"Appareil réinitialisé aux paramètres par défaut. Pour l\'utiliser, entrez votre ancien mot de passe."</string>
<string name="battery_tip_incompatible_charging_message" product="default" msgid="5097154279720383707">"Votre téléphone pourrait se recharger lentement ou ne pas se recharger. Pour une recharge plus rapide, utilisez un adaptateur et un câble recommandés."</string>
@@ -365,9 +365,9 @@
<string name="audio_sharing_dialog_share_more_content" product="default" msgid="4517503016262565607">"La musique et les vidéos de ce téléphone peuvent être lues sur les écouteurs que vous connectez"</string>
<string name="audio_sharing_dialog_share_more_content" product="tablet" msgid="7742344946644657414">"La musique et les vidéos de cette tablette peuvent être lues sur les écouteurs que vous connectez"</string>
<string name="audio_sharing_dialog_share_more_content" product="device" msgid="3409470560712324580">"La musique et les vidéos de cet appareil peuvent être lues sur les écouteurs que vous connectez"</string>
- <string name="audio_streams_dialog_no_le_device_subtitle" product="default" msgid="1388450179345665604">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'application LE Audio à ce téléphone."</string>
- <string name="audio_streams_dialog_no_le_device_subtitle" product="tablet" msgid="6577207951269720001">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'application LE Audio à cette tablette."</string>
- <string name="audio_streams_dialog_no_le_device_subtitle" product="device" msgid="6192141045820029654">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'application LE Audio à cet appareil."</string>
+ <string name="audio_streams_dialog_no_le_device_subtitle" product="default" msgid="1388450179345665604">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'appli LE Audio à ce téléphone."</string>
+ <string name="audio_streams_dialog_no_le_device_subtitle" product="tablet" msgid="6577207951269720001">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'appli LE Audio à cette tablette."</string>
+ <string name="audio_streams_dialog_no_le_device_subtitle" product="device" msgid="6192141045820029654">"Pour écouter un flux audio, connectez d\'abord des écouteurs prenant en charge l\'appli LE Audio à cet appareil."</string>
<string name="audio_streams_dialog_unsupported_device_subtitle" product="default" msgid="4634360514260385687">"Ce téléphone ne prend pas en charge l\'appli LE Audio, et celle-ci est nécessaire pour effectuer la lecture des flux audio."</string>
<string name="audio_streams_dialog_unsupported_device_subtitle" product="tablet" msgid="234603191628345605">"Cette tablette ne prend pas en charge l\'appli LE Audio, et celle-ci est nécessaire pour effectuer la lecture des flux audio."</string>
<string name="audio_streams_dialog_unsupported_device_subtitle" product="device" msgid="6350485541420926260">"Cet appareil ne prend pas en charge l\'appli LE Audio, et celle-ci est nécessaire pour effectuer la lecture des flux audio."</string>
diff --git a/res-product/values-fr/strings.xml b/res-product/values-fr/strings.xml
index 6b7d0c8..5555136 100644
--- a/res-product/values-fr/strings.xml
+++ b/res-product/values-fr/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale.\n\nUn code protège votre téléphone en cas de perte ou de vol."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale.\n\nUn schéma protège votre téléphone en cas de perte ou de vol."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale.\n\nUn mot de passe protège votre téléphone en cas de perte ou de vol."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre tablette en cas de perte ou de vol."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre tablette en cas de perte ou de vol."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre tablette en cas de perte ou de vol."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre appareil en cas de perte ou de vol."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre appareil en cas de perte ou de vol."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre appareil en cas de perte ou de vol."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre téléphone en cas de perte ou de vol."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre téléphone en cas de perte ou de vol."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre téléphone en cas de perte ou de vol."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre tablette en cas de perte ou de vol."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre tablette en cas de perte ou de vol."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre tablette en cas de perte ou de vol."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre appareil en cas de perte ou de vol."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre appareil en cas de perte ou de vol."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre appareil en cas de perte ou de vol."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Veuillez saisir un code pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn code protège votre téléphone en cas de perte ou de vol."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Veuillez dessiner un schéma pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn schéma protège votre téléphone en cas de perte ou de vol."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Veuillez saisir un mot de passe pour configurer le déverrouillage par reconnaissance faciale et par empreinte digitale.\n\nUn mot de passe protège votre téléphone en cas de perte ou de vol."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Les images et le modèle associés à \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" et stockés sur votre téléphone seront supprimés"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Les images et le modèle associés à \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" et stockés sur votre tablette seront supprimés"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Les images et le modèle associés à \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" et stockés sur votre appareil seront supprimés"</string>
@@ -309,8 +309,8 @@
<string name="data_usage_limit_dialog_mobile" product="tablet" msgid="5609616352941038118">"Les données mobiles sont désactivées sur votre tablette lorsque la limite de consommation des données que vous avez définie est atteinte.\n\nLa consommation mesurée par votre tablette pouvant différer de celle mesurée par votre opérateur, nous vous recommandons de définir une limite stricte."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Votre téléphone désactivera les données mobiles lorsqu\'elles auront atteint la limite définie.\n\nLa consommation mesurée par votre téléphone pouvant différer de celle mesurée par votre opérateur, nous vous recommandons de définir une limite prudente."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Partagez votre appareil en ajoutant des utilisateurs. Chacun dispose ainsi de son propre espace sur l\'appareil pour les écrans d\'accueil personnalisés, les comptes, les applications, les paramètres et autres."</string>
- <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Partagez votre tablette en ajoutant des utilisateurs. Chacun dispose ainsi de son propre espace sur l\'appareil pour les écrans d\'accueil personnalisés, les comptes, les applications, les paramètres et autres."</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Partagez votre téléphone en ajoutant des utilisateurs. Chacun dispose de son propre espace sur votre téléphone pour ses réglages (écran d\'accueil, comptes, applis, paramètres, etc.)."</string>
+ <string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Partagez votre tablette en ajoutant des utilisateurs. Chacun dispose ainsi de son propre espace sur l\'appareil pour ses réglages (écran d\'accueil, comptes, applis, paramètres, etc.)."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Partagez votre téléphone en ajoutant des utilisateurs. Chacun dispose ainsi de son propre espace sur l\'appareil pour ses réglages (écran d\'accueil, comptes, applis, paramètres, etc.)."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
<string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Seul le propriétaire du téléphone peut gérer les utilisateurs."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Votre espace et vos données vont être supprimés de cette tablette. Cette action est irréversible."</string>
diff --git a/res-product/values-gl/strings.xml b/res-product/values-gl/strings.xml
index 003e50f..d41f20d 100644
--- a/res-product/values-gl/strings.xml
+++ b/res-product/values-gl/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Para configurar o desbloqueo facial, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Para configurar o desbloqueo facial, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Para configurar o desbloqueo facial, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nA tableta estará protexida por un PIN en caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nA tableta estará protexida por un padrón en caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nA tableta estará protexida por un contrasinal en caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nO dispositivo estará protexido por un PIN en caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nO dispositivo estará protexido por un padrón en caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nO dispositivo estará protexido por un contrasinal en caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Para configurar o desbloqueo facial e dactilar, necesítase un PIN.\n\nO teléfono estará protexido por un PIN en caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Para configurar o desbloqueo facial e dactilar, necesítase un padrón.\n\nO teléfono estará protexido por un padrón en caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Para configurar o desbloqueo facial e dactilar, necesítase un contrasinal.\n\nO teléfono estará protexido por un contrasinal en caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Para configurar o desbloqueo facial e o dactilar, necesítase un PIN.\n\nUsarase para protexer a tableta en caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Para configurar o desbloqueo facial e o dactilar, necesítase un padrón.\n\nUsarase para protexer a tableta en caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Para configurar o desbloqueo facial e o dactilar, necesítase un contrasinal.\n\nUsarase para protexer a tableta en caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Para configurar o desbloqueo facial e o dactilar, necesítase un PIN.\n\nUsarase para protexer o dispositivo en caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Para configurar o desbloqueo facial e o dactilar, necesítase un padrón.\n\nUsarase para protexer o dispositivo en caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Para configurar o desbloqueo facial e o dactilar, necesítase un contrasinal.\n\nUsarase para protexer o dispositivo en caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Para configurar o desbloqueo facial e o dactilar, necesítase un PIN.\n\nUsarase para protexer o teléfono en caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Para configurar o desbloqueo facial e o dactilar, necesítase un padrón.\n\nUsarase para protexer o teléfono en caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Para configurar o desbloqueo facial e o dactilar, necesítase un contrasinal.\n\nUsarase para protexer o teléfono en caso de perda ou roubo."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ao realizar esta acción, eliminaranse as imaxes e o modelo da impresión dixital <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estean almacenados no teléfono"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ao realizar esta acción, eliminaranse as imaxes e o modelo da impresión dixital <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estean almacenados na tableta"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ao realizar esta acción, eliminaranse as imaxes e o modelo da impresión dixital <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> que estean almacenados no teu dispositivo"</string>
diff --git a/res-product/values-gu/strings.xml b/res-product/values-gu/strings.xml
index 5f9669a..d63a47d 100644
--- a/res-product/values-gu/strings.xml
+++ b/res-product/values-gu/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારું ટૅબ્લેટ ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારું ડિવાઇસ ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પિન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પિન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પૅટર્ન જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પૅટર્ન તેને સુરક્ષિત રાખે છે."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ફિંગરપ્રિન્ટ અનલૉક અને ફેસ અનલૉકની સુવિધાનું સેટઅપ કરવા માટે પાસવર્ડ જરૂરી છે.\n\nજો તમારો ફોન ખોવાઈ જાય કે ચોરાઈ જાય, તો પાસવર્ડ તેને સુરક્ષિત રાખે છે."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"આ તમારા ફોન પર સ્ટોર કરવામાં આવેલી ફિંગરપ્રિન્ટની છબીઓ અને \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' સાથે સંકળાયેલા મૉડલને ડિલીટ કરે છે"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"આ તમારા ટૅબ્લેટ પર સ્ટોર કરવામાં આવેલી ફિંગરપ્રિન્ટની છબીઓ અને \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' સાથે સંકળાયેલા મૉડલને ડિલીટ કરે છે"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"આ તમારા ડિવાઇસ પર સ્ટોર કરવામાં આવેલી ફિંગરપ્રિન્ટ અને \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' સાથે સંકળાયેલા મૉડલને ડિલીટ કરે છે"</string>
diff --git a/res-product/values-hi/strings.xml b/res-product/values-hi/strings.xml
index 85c6dad..d4977f3 100644
--- a/res-product/values-hi/strings.xml
+++ b/res-product/values-hi/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पिन आपके फ़ोन की सुरक्षा करता है."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पैटर्न आपके फ़ोन की सुरक्षा करता है."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके फ़ोन की सुरक्षा करता है."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पिन आपके टैबलेट की सुरक्षा करता है."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पैटर्न आपके टैबलेट की सुरक्षा करता है."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके टैबलेट की सुरक्षा करता है."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पिन आपके डिवाइस की सुरक्षा करता है."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पैटर्न आपके डिवाइस की सुरक्षा करता है."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके डिवाइस की सुरक्षा करता है."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पिन आपके फ़ोन की सुरक्षा करता है."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पैटर्न आपके फ़ोन की सुरक्षा करता है."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"फ़ेस अनलॉक और फ़िंगरप्रिंट अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके फ़ोन की सुरक्षा करता है."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पिन आपके टैबलेट को सुरक्षित रखता है."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पैटर्न आपके टैबलेट को सुरक्षित रखता है."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका टैबलेट खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके टैबलेट को सुरक्षित रखता है."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पिन आपके डिवाइस को सुरक्षित रखता है."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पैटर्न आपके डिवाइस को सुरक्षित रखता है."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका डिवाइस खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके डिवाइस को सुरक्षित रखता है."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पिन की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पिन आपके फ़ोन को सुरक्षित रखता है."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"फ़िंगरप्रिंट अनलॉकऔर फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पैटर्न की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पैटर्न आपके फ़ोन को सुरक्षित रखता है."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"फ़िंगरप्रिंट अनलॉक और फ़ेस अनलॉक की सुविधा सेट अप करने के लिए, पासवर्ड की ज़रूरत है.\n\nअगर आपका फ़ोन खो जाता है या चोरी हो जाता है, तो पासवर्ड आपके फ़ोन को सुरक्षित रखता है."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ऐसा करने से, आपके फ़ोन पर सेव किए गए \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' से जुड़े फ़िंगरप्रिंट की इमेज और मॉडल मिट जाएंगे"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ऐसा करने से, आपके टैबलेट पर मौजूद \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' से जुड़ी फ़िंगरप्रिंट की इमेज और मॉडल मिट जाएंगे"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ऐसा करने से, आपके डिवाइस पर मौजूद <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> से जुड़ी फ़िंगरप्रिंट की इमेज और मॉडल मिट जाएंगे"</string>
@@ -310,13 +310,13 @@
<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="default" msgid="5440172971747221370">"नए उपयोगकर्ता जोड़कर अपना फ़ोन शेयर करें. आपके फ़ोन पर हर उपयोगकर्ता की अपनी एक निजी जगह होगी, जिसमें वह अपनी ज़रूरत के मुताबिक होम स्क्रीन, खाते, ऐप्लिकेशन, सेटिंग वगैरह रख सकता है."</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>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"आप इस टैबलेट पर जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"आप इस फ़ोन पर अपनी जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"सहायता लेख, फ़ोन और चैट"</string>
- <string name="support_summary" product="tablet" msgid="2588832599234347108">"सहायता लेख, टैबलेट, और चैट"</string>
+ <string name="support_summary" product="tablet" msgid="2588832599234347108">"सहायता लेख, टैबलेट और चैट"</string>
<string name="support_summary" product="device" msgid="6821511162132497205">"सहायता लेख, डिवाइस, और चैट"</string>
<string name="ambient_display_title" product="default" msgid="8027137727044125809">"फ़ोन देखने के लिए दो बार टैप करें"</string>
<string name="ambient_display_title" product="tablet" msgid="2347746118188465334">"टैबलेट देखने के लिए दो बार छूएं"</string>
diff --git a/res-product/values-hr/strings.xml b/res-product/values-hr/strings.xml
index e9a9e64a5..f1e4a0c 100644
--- a/res-product/values-hr/strings.xml
+++ b/res-product/values-hr/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Za postavljanje otključavanja licem potreban je PIN.\n\nPIN štiti telefon u slučaju gubitka ili krađe."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Za postavljanje otključavanja licem potreban je uzorak.\n\nUzorak štiti telefon u slučaju gubitka ili krađe."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Za postavljanje otključavanja licem potrebna je zaporka.\n\nZaporka štiti telefon u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je PIN.\n\nPIN štiti tablet u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je uzorak.\n\nUzorak štiti tablet u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potrebna je zaporka.\n\nZaporka štiti tablet u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je PIN.\n\nPIN štiti uređaj u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je uzorak.\n\nUzorak štiti uređaj u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potrebna je zaporka.\n\nZaporka štiti uređaj u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je PIN.\n\nPIN štiti telefon u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potreban je uzorak.\n\nUzorak štiti telefon u slučaju gubitka ili krađe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Za postavljanje otključavanja licem ili otključavanja otiskom prsta potrebna je zaporka.\n\nZaporka štiti telefon u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je PIN.\n\nPIN štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je uzorak.\n\nUzorak štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potrebna je zaporka.\n\nZaporka štiti tablet u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je PIN.\n\nPIN štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je uzorak.\n\nUzorak štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potrebna je zaporka.\n\nZaporka štiti uređaj u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je PIN.\n\nPIN štiti telefon u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potreban je uzorak.\n\nUzorak štiti telefon u slučaju gubitka ili krađe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Za postavljanje otključavanja otiskom prsta ili otključavanja licem potrebna je zaporka.\n\nZaporka štiti telefon u slučaju gubitka ili krađe."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Time se brišu slike i model otiska prsta povezani s otiskom prsta <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su pohranjeni na vašem telefonu"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Time se brišu slike i model otiska prsta povezani s otiskom prsta <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su pohranjeni na vašem tabletu"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Time se brišu slike i model otiska prsta povezani s otiskom prsta <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> koji su pohranjeni na vašem uređaju"</string>
diff --git a/res-product/values-hu/strings.xml b/res-product/values-hu/strings.xml
index ae44815..f4191a2 100644
--- a/res-product/values-hu/strings.xml
+++ b/res-product/values-hu/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"PIN-kód szükséges az Arcalapú feloldás beállításához.\n\nPIN-kód védi a telefont, ha elvész vagy ellopják."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Minta szükséges az Arcalapú feloldás beállításához.\n\nMinta védi a telefont, ha elvész vagy ellopják."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Jelszó szükséges az Arcalapú feloldás beállításához.\n\nJelszó védi a telefont, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"PIN-kód szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nPIN-kód védi a táblagépet, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Minta szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nMinta védi a táblagépet, ha elvész vagy ellopják."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Jelszó szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nJelszó védi a táblagépet, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"PIN-kód szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nPIN-kód védi az eszközt, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Minta szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nMinta védi az eszközt, ha elvész vagy ellopják."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Jelszó szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nJelszó védi az eszközt, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"PIN-kód szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nA PIN-kód megvédi a telefont, ha elvész vagy ellopják."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Minta szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nA minta megvédi a telefont, ha elvész vagy ellopják."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Jelszó szükséges az Arcalapú feloldás és a Feloldás ujjlenyomattal funkció beállításához.\n\nJelszó védi a telefont, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN-kód szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nPIN-kód védi a táblagépet, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Minta szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nMinta védi a táblagépet, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Jelszó szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nJelszó védi a táblagépet, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN-kód szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nPIN-kód védi az eszközt, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Minta szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nMinta védi az eszközt, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Jelszó szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nJelszó védi az eszközt, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN-kód szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nPIN-kód védi a telefont, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Minta szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nMinta védi a telefont, ha elvész vagy ellopják."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Jelszó szükséges a Feloldás ujjlenyomattal és az Arcalapú feloldás funkció beállításához.\n\nJelszó védi a telefont, ha elvész vagy ellopják."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ezzel törli a telefonján tárolt „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” ujjlenyomattal kapcsolatos ujjlenyomatképeket és -modellt."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ezzel törli a táblagépén tárolt „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” ujjlenyomattal kapcsolatos ujjlenyomatképeket és -modellt"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ezzel törli az eszközén tárolt „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” ujjlenyomattal kapcsolatos ujjlenyomatképeket és -modellt"</string>
diff --git a/res-product/values-hy/strings.xml b/res-product/values-hy/strings.xml
index b41bec4..3142b8a 100644
--- a/res-product/values-hy/strings.xml
+++ b/res-product/values-hy/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Դեմքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Դեմքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Դեմքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել պլանշետը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել սարքը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է PIN կոդ։\n\nPIN կոդի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է նախշ։\n\nՆախշի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Դեմքով և մատնահետքով ապակողպումը կարգավորելու համար անհրաժեշտ է գաղտնաբառ։\n\nԳաղտնաբառի միջոցով դուք կարող եք պաշտպանել հեռախոսը, եթե այն կորչի կամ գողանան։"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» մատնահետքի հետ կապված պատկերներն ու նմուշը, որոնք պահված են ձեր հեռախոսում, կջնջվեն"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» մատնահետքի հետ կապված պատկերներն ու նմուշը, որոնք պահված են ձեր հեռախոսում, կջնջվեն"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"«<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» մատնահետքի պատկերներն ու նմուշը, որոնք պահված են ձեր սարքում, կջնջվեն"</string>
diff --git a/res-product/values-in/strings.xml b/res-product/values-in/strings.xml
index bbdc030..08981cb 100644
--- a/res-product/values-in/strings.xml
+++ b/res-product/values-in/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Perlu PIN untuk menyiapkan Buka dengan Wajah.\n\nPIN melindungi ponsel jika hilang atau dicuri."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Perlu pola untuk menyiapkan Buka dengan Wajah.\n\nPola melindungi ponsel jika hilang atau dicuri."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Perlu sandi untuk menyiapkan Buka dengan Wajah.\n\nSandi melindungi ponsel jika hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Perlu PIN untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPIN melindungi tablet jika hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Perlu pola untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPola melindungi tablet jika hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Perlu sandi untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nSandi melindungi tablet jika hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Perlu PIN untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPIN melindungi perangkat jika hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Perlu pola untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPola melindungi perangkat jika hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Perlu sandi untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nSandi melindungi perangkat jika hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Perlu PIN untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPIN melindungi ponsel jika hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Perlu pola untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nPola melindungi ponsel jika hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Perlu sandi untuk menyiapkan Buka dengan Wajah dan Buka dengan Sidik Jari.\n\nSandi melindungi ponsel jika hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Memerlukan PIN untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPIN melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Memerlukan pola untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPola melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Memerlukan sandi untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nSandi melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Memerlukan PIN untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPIN melindungi perangkat jika perangkat hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Memerlukan pola untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPola melindungi perangkat jika perangkat hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Memerlukan sandi untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nSandi melindungi perangkat jika perangkat hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Memerlukan PIN untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPIN melindungi ponsel jika ponsel hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Memerlukan pola untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nPola melindungi ponsel jika ponsel hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Memerlukan sandi untuk menyiapkan Buka dengan Sidik Jari dan Buka dengan Wajah.\n\nSandi melindungi ponsel jika ponsel hilang atau dicuri."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Tindakan ini akan menghapus gambar dan model sidik jari yang terkait dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan di ponsel Anda"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Tindakan ini akan menghapus gambar dan model sidik jari yang terkait dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan di tablet Anda"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Tindakan ini akan menghapus gambar dan model sidik jari yang terkait dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan di perangkat Anda"</string>
diff --git a/res-product/values-is/strings.xml b/res-product/values-is/strings.xml
index 6530b7e..0b79678 100644
--- a/res-product/values-is/strings.xml
+++ b/res-product/values-is/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"PIN-númer er áskilið til að setja upp andlitskenni.\n\nPIN-númer verndar símann ef hann týnist eða ef honum er stolið."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Mynstur er áskilið til að setja upp andlitskenni.\n\nMynstur verndar símann ef hann týnist eða ef honum er stolið."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Aðgangsorð er áskilið til að setja upp andlitskenni.\n\nAðgangsorð verndar símann ef hann týnist eða ef honum er stolið."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"PIN-númer er áskilið til að setja upp andlits- og fingrafarskenni.\n\nPIN-númer verndar spjaldtölvuna ef hún týnist eða ef henni er stolið."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Mynstur er áskilið til að setja upp andlits- og fingrafarskenni.\n\nMynstur verndar spjaldtölvuna ef hún týnist eða ef henni er stolið."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Aðgangsorð er áskilið til að setja upp andlits- og fingrafarskenni.\n\nAðgangsorð verndar spjaldtölvuna ef hún týnist eða ef henni er stolið."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"PIN-númer er áskilið til að setja upp andlits- og fingrafarskenni.\n\nPIN-númer verndar tækið ef það týnist eða ef því er stolið."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Mynstur er áskilið til að setja upp andlits- og fingrafarskenni.\n\nMynstur verndar tækið ef það týnist eða ef því er stolið."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Aðgangsorð er áskilið til að setja upp andlits- og fingrafarskenni.\n\nAðgangsorð verndar tækið ef það týnist eða ef því er stolið."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"PIN-númer er áskilið til að setja upp andlits- og fingrafarskenni.\n\nPIN-númer verndar símann ef hann týnist eða ef honum er stolið."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Mynstur er áskilið til að setja upp andlits- og fingrafarskenni.\n\nMynstur verndar símann ef hann týnist eða ef honum er stolið."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Aðgangsorð er áskilið til að setja upp andlits- og fingrafarskenni.\n\nAðgangsorð verndar símann ef hann týnist eða ef honum er stolið."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN-númers er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nPIN-númer verndar spjaldtölvuna ef hún týnist eða henni er stolið."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Mynsturs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nMynstur verndar spjaldtölvuna ef hún týnist eða henni er stolið."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Aðgangsorðs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nAðgangsorð verndar spjaldtölvuna ef hún týnist eða henni er stolið."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN-númers er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nPIN-númer verndar tækið ef það týnist eða því er stolið."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Mynsturs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nMynstur verndar tækið ef það týnist eða því er stolið."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Aðgangsorðs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nAðgangsorð verndar tækið ef það týnist eða því er stolið."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN-númers er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nPIN-númer verndar símann ef hann týnist eða honum er stolið."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Mynsturs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nMynstur verndar símann ef hann týnist eða honum er stolið."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Aðgangsorðs er krafist fyrir uppsetningu á andlits- og fingrafarskenni.\n\nAðgangsorð verndar símann ef hann týnist eða honum er stolið."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Þetta eyðir fingrafaramyndum og -líkani sem tengist „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ og er vistað í símanum"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Þetta eyðir fingrafaramyndum og -líkani sem tengist „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ og er vistað í spjaldtölvunni"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Þetta eyðir fingrafaramyndum og -líkani sem tengjast „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ og eru vistuð í tækinu"</string>
diff --git a/res-product/values-it-feminine/strings.xml b/res-product/values-it-feminine/strings.xml
new file mode 100644
index 0000000..d7f3aa0
--- /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 0000000..d4e98e4
--- /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 0000000..160a6d9
--- /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-it/strings.xml b/res-product/values-it/strings.xml
index f7671e7..ed3fa64 100644
--- a/res-product/values-it/strings.xml
+++ b/res-product/values-it/strings.xml
@@ -55,10 +55,10 @@
<string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"Usa il tuo volto per sbloccare lo smartphone o per l\'autenticazione nelle app, ad esempio per accedere alle app o approvare un acquisto"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"Usa il tuo volto per sbloccare il tablet o per l\'autenticazione nelle app, ad esempio per accedere alle app o approvare un acquisto"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"Usa il tuo volto per sbloccare il dispositivo o per l\'autenticazione nelle app, ad esempio per accedere alle app o approvare un acquisto"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Consenti a tuo figlio di usare il suo volto per sbloccare il suo telefono"</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Consenti a tuo figlio di usare il suo volto per sbloccare lo smartphone"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="tablet" msgid="4560949471246282574">"Consenti a tuo figlio di usare il suo volto per sbloccare il suo tablet"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="device" msgid="1156063265854416046">"Consenti a tuo figlio di usare il suo volto per sbloccare il suo dispositivo"</string>
- <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Consenti a tuo figlio di usare il volto per sbloccare il suo telefono o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
+ <string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="default" msgid="5082581184108528408">"Consenti a tuo figlio di usare il volto per sbloccare il suo smartphone o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="tablet" msgid="5932555218164668532">"Consenti a tuo figlio di usare il volto per sbloccare il suo tablet o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_face_enroll_introduction_consent_message_0_class3" product="device" msgid="8943878265098867810">"Consenti a tuo figlio di usare il volto per sbloccare il suo dispositivo o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_face_enroll_introduction_consent_message" product="default" msgid="3698558920963989416">"L\'uso del volto di tuo figlio per sbloccare il suo telefono potrebbe essere meno sicuro di una sequenza o un PIN efficaci."</string>
@@ -107,7 +107,7 @@
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"Usa il tuo volto per sbloccare il tablet o verificare la tua identità, ad esempio quando vuoi accedere alle app o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il tablet, potresti sbloccarlo anche senza volerlo.\n\nIl tuo tablet può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo tablet può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello o una gemella."</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"Usa il tuo volto per sbloccare il dispositivo o verificare la tua identità, ad esempio quando vuoi accedere alle app o approvare un acquisto.\n\nTieni presente che:\nPuoi configurare un solo volto alla volta. Per aggiungere un altro volto devi eliminare quello attuale.\n\nSe guardi direttamente il dispositivo, potresti sbloccarlo anche senza volerlo.\n\nIl tuo dispositivo può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo dispositivo può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello o una gemella."</string>
<string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"Usa l\'impronta per sbloccare <xliff:g id="DEVICENAME">%s</xliff:g> o per verificare la tua identità, ad esempio per accedere alle app o approvare un acquisto"</string>
- <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Consenti a tuo figlio di usare l\'impronta per sbloccare il suo telefono o verificare la sua identità. Questo si verifica quando accedono alle app, approvano un acquisto e altro ancora."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message" product="default" msgid="5101253231118659496">"Consenti a tuo figlio di usare l\'impronta per sbloccare il suo smartphone o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="tablet" msgid="3063978167545799342">"Consenti a tuo figlio di usare l\'impronta per sbloccare il suo tablet o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_fingerprint_enroll_introduction_consent_message" product="device" msgid="4399560001732497632">"Consenti a tuo figlio di usare l\'impronta per sbloccare il suo dispositivo o verificare la sua identità. Questo si verifica quando accede alle app, approva un acquisto e altro ancora."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_1" product="default" msgid="8488497844109768268">"L\'uso dell\'impronta per sbloccare il telefono potrebbe essere meno sicuro dell\'uso di una sequenza o un PIN efficaci"</string>
@@ -122,13 +122,13 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="default" msgid="1354488801088258040">"Puoi eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sullo smartphone finché non li elimini."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="tablet" msgid="8207309581266022275">"Puoi eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sul tablet finché non li elimini."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4" product="device" msgid="2498580070051496133">"Puoi eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sul dispositivo finché non li elimini."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default" msgid="5003753461032107715">"Tu e tuo figlio potete eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sul telefono finché non vengono eliminati."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="default" msgid="5003753461032107715">"Tu e tuo figlio potete eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sullo smartphone finché non vengono eliminati."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="tablet" msgid="8772005555323461143">"Tu e tuo figlio potete eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sul tablet finché non vengono eliminati."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4" product="device" msgid="7254955922685507093">"Tu e tuo figlio potete eliminare le immagini e il modello dell\'impronta o disattivare lo Sblocco con l\'Impronta in qualsiasi momento nelle Impostazioni. Le immagini e i modelli delle impronte rimangono memorizzati sul dispositivo finché non vengono eliminati."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="default" msgid="6272159089589340181">"Il tuo smartphone può essere sbloccato anche quando non hai intenzione di farlo, ad esempio se qualcuno te lo avvicina al dito."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="tablet" msgid="2420109998272019149">"Il tuo tablet può essere sbloccato anche quando non hai intenzione di farlo, ad esempio se qualcuno lo avvicina al tuo dito."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5" product="device" msgid="5915844445830045866">"Il tuo dispositivo può essere sbloccato anche quando non hai intenzione di farlo, ad esempio se qualcuno lo avvicina al tuo dito."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Il telefono di tuo figlio può essere sbloccato anche quando non vuole farlo intenzionalmente, ad esempio se qualcuno lo rivolge verso il suo dito."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="default" msgid="6556725426776167791">"Lo smartphone di tuo figlio può essere sbloccato anche quando non vuole farlo intenzionalmente, ad esempio se qualcuno lo rivolge verso il suo dito."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="tablet" msgid="5156581794964551571">"Il tablet di tuo figlio può essere sbloccato anche quando non vuole farlo intenzionalmente, ad esempio se qualcuno lo rivolge verso il suo dito."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5" product="device" msgid="8309101436391515400">"Il dispositivo di tuo figlio può essere sbloccato anche quando non vuole farlo intenzionalmente, ad esempio se qualcuno lo rivolge verso il suo dito."</string>
<string name="security_settings_fingerprint_v2_home_screen_text" product="tablet" msgid="5074447304036758639">"Usa l\'impronta per sbloccare il tablet o verificare la tua identità, ad esempio per accedere alle app"</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"È necessario un PIN per configurare lo Sblocco con il Volto.\n\nIl PIN protegge il telefono se viene smarrito o rubato."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"È necessaria una sequenza per configurare lo Sblocco con il Volto.\n\nLa sequenza protegge il telefono se viene smarrito o rubato."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"È necessaria una password per configurare lo Sblocco con il Volto.\n\nLa password protegge il telefono se viene smarrito o rubato."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"È necessario un PIN per configurare lo Sblocco con il Volto e con l\'impronta.\n\nIl PIN protegge il tablet se viene smarrito o rubato."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"È necessaria una sequenza per configurare lo Sblocco con il Volto e con l\'impronta.\n\nLa sequenza protegge il tablet se viene smarrito o rubato."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"È necessaria una password per configurare lo Sblocco con il Volto e con l\'impronta.\n\nLa password protegge il tablet se viene smarrito o rubato."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"È necessario un PIN per configurare lo Sblocco con il Volto e con l\'impronta.\n\nIl PIN protegge il dispositivo se viene smarrito o rubato."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"È necessaria una sequenza per configurare lo Sblocco con il Volto e l\'Impronta.\n\nLa sequenza protegge il dispositivo se viene smarrito o rubato."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"È necessaria una password per configurare lo Sblocco con il Volto e con l\'impronta.\n\nLa password protegge il dispositivo se viene smarrito o rubato."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"È necessario un PIN per configurare lo Sblocco con il Volto e con l\'impronta.\n\nIl PIN protegge il telefono se viene smarrito o rubato."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"È necessaria una sequenza per configurare lo Sblocco con il Volto e l\'Impronta.\n\nLa sequenza protegge il telefono se viene smarrito o rubato."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"È necessaria una password per configurare lo Sblocco con il Volto e con l\'impronta.\n\nLa password protegge il telefono se viene smarrito o rubato."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"È necessario un PIN per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nIl PIN protegge il tablet se viene smarrito o rubato."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"È necessaria una sequenza per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa sequenza protegge il tablet se viene smarrito o rubato."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"È necessaria una password per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa password protegge il tablet se viene smarrito o rubato."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"È necessario un PIN per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nIl PIN protegge il dispositivo se viene smarrito o rubato."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"È necessaria una sequenza per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa sequenza protegge il dispositivo se viene smarrito o rubato."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"È necessaria una password per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa password protegge il dispositivo se viene smarrito o rubato."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"È necessario un PIN per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nIl PIN protegge lo smartphone se viene smarrito o rubato."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"È necessaria una sequenza per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa sequenza protegge lo smartphone se viene smarrito o rubato."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"È necessaria una password per configurare lo Sblocco con l\'Impronta e con il Volto.\n\nLa password protegge lo smartphone se viene smarrito o rubato."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Vengono eliminati il modello e le immagini dell\'impronta associati a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" e memorizzati sullo smartphone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Vengono eliminati il modello e le immagini dell\'impronta associati a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" e memorizzati sul tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Vengono eliminati il modello e le immagini dell\'impronta associati a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" e memorizzati sul dispositivo"</string>
@@ -204,7 +204,7 @@
<string name="biometrics_unlock_title" product="tablet" msgid="4239121143654305269">"Puoi sbloccare il tablet usando il tuo volto o la tua impronta. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
<string name="biometrics_unlock_title" product="device" msgid="3342994085226864170">"Puoi sbloccare il dispositivo usando il tuo volto o la tua impronta. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
<string name="encrypt_title" product="tablet" msgid="8915795247786124547">"Cripta tablet"</string>
- <string name="encrypt_title" product="default" msgid="511146128799853404">"Cripta telefono"</string>
+ <string name="encrypt_title" product="default" msgid="511146128799853404">"Cripta smartphone"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="8821254377043173267">"Imposta un blocco schermo per proteggere il tablet"</string>
<string name="suggested_lock_settings_summary" product="device" msgid="4863929838844014122">"Imposta un blocco schermo per proteggere il dispositivo"</string>
<string name="suggested_lock_settings_summary" product="default" msgid="8050809409337082738">"Imposta un blocco schermo per proteggere il telefono"</string>
@@ -310,9 +310,9 @@
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Il telefono disattiverà i dati mobili una volta raggiunto il limite impostato.\n\nPoiché l\'utilizzo dei dati viene misurato dal telefono e le misurazioni dell\'operatore potrebbero differire, è consigliabile stabilire un limite prudenziale."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Condividi il tuo dispositivo aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sul dispositivo per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Condividi il tuo tablet aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sul tablet per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Condividi il tuo telefono aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sul telefono per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Condividi il tuo smartphone aggiungendo nuovi utenti. Ogni utente dispone di uno spazio personale sullo smartphone per impostare schermate Home personalizzate, account, app, impostazioni e altro ancora."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Solo il proprietario del tablet può gestire gli utenti."</string>
- <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo il proprietario del telefono può gestire gli utenti."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Solo il proprietario dello smartphone può gestire gli utenti."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Perderai il tuo spazio e i tuoi dati sul tablet. Non è possibile annullare l\'azione."</string>
<string name="user_confirm_remove_self_message" product="default" msgid="3209762447055039706">"Perderai il tuo spazio e i tuoi dati sul telefono. Non è possibile annullare l\'azione."</string>
<string name="support_summary" product="default" msgid="2044721479256103419">"Articoli del Centro assistenza, telefono e chat"</string>
diff --git a/res-product/values-iw/strings.xml b/res-product/values-iw/strings.xml
index 5c285e2..11c328f 100644
--- a/res-product/values-iw/strings.xml
+++ b/res-product/values-iw/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"כדי להגדיר את התכונה \'פתיחה ע\"י זיהוי הפנים\', נדרש קוד אימות.\n\nקוד האימות מגן על הטלפון במקרים של אובדן או גניבה."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"כדי להגדיר את התכונה \'פתיחה ע\"י זיהוי הפנים\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על הטלפון במקרים של אובדן או גניבה."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"כדי להגדיר את התכונה \'פתיחה ע\"י זיהוי הפנים\', נדרשת סיסמה.\n\nהסיסמה מגינה על הטלפון במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על הטאבלט במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על הטאבלט במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על הטאבלט במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על המכשיר במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על המכשיר במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על המכשיר במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על הטלפון במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על הטלפון במקרים של אובדן או גניבה."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"כדי להגדיר את התכונות \'פתיחה ע\"י זיהוי הפנים\' ו\'ביטול הנעילה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על הטלפון במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על הטאבלט במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על הטאבלט במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על הטאבלט במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על המכשיר במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על המכשיר במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על המכשיר במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קוד אימות.\n\nקוד האימות מגן על הטלפון במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרש קו ביטול נעילה.\n\nקו ביטול הנעילה מגן על הטלפון במקרים של אובדן או גניבה."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"כדי להגדיר את התכונות \'פתיחה בזיהוי פנים\' ו\'פתיחה בטביעת אצבע\', נדרשת סיסמה.\n\nהסיסמה מגינה על הטלפון במקרים של אובדן או גניבה."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"הפעולה הזו מוחקת את התבנית והתמונות של טביעת האצבע המשויכות אל <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>, שמאוחסנות בטלפון שלך"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"הפעולה הזו מוחקת את התבנית והתמונות של טביעת האצבע המשויכות אל <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>, שמאוחסנות בטאבלט שלך"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"הפעולה הזו מוחקת את התבנית והתמונות של טביעת האצבע שמשויכות אל <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> ושמורה במכשיר שלך"</string>
diff --git a/res-product/values-ja/strings.xml b/res-product/values-ja/strings.xml
index beefc63..464d42a 100644
--- a/res-product/values-ja/strings.xml
+++ b/res-product/values-ja/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"顔認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にスマートフォンを保護します。"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"顔認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にスマートフォンを保護します。"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"顔認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にスマートフォンを保護するものです。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"顔認証と指紋認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にタブレットを保護します。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"顔認証と指紋認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にタブレットを保護します。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"顔認証と指紋認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にタブレットを保護するものです。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"顔認証と指紋認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にデバイスを保護します。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"顔認証と指紋認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にデバイスを保護します。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"顔認証と指紋認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にデバイスを保護するものです。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"顔認証と指紋認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にスマートフォンを保護します。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"顔認証と指紋認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にスマートフォンを保護します。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"顔認証と指紋認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にスマートフォンを保護するものです。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"指紋認証と顔認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にタブレットを保護します。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"指紋認証と顔認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にタブレットを保護します。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"指紋認証と顔認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にタブレットを保護するものです。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"指紋認証と顔認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にデバイスを保護します。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"指紋認証と顔認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にデバイスを保護します。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"指紋認証と顔認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にデバイスを保護するものです。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"指紋認証と顔認証を設定するには PIN が必要です。\n\nPIN は紛失・盗難時にスマートフォンを保護します。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"指紋認証と顔認証を設定するにはパターンが必要です。\n\nパターンは紛失・盗難時にスマートフォンを保護します。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"指紋認証と顔認証を設定するにはパスワードが必要です。\n\nパスワードは、紛失したり盗難に遭ったりした場合にスマートフォンを保護するものです。"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」に関連付けられた指紋の画像とモデルがスマートフォンから削除されます"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」に関連付けられた指紋の画像とモデルがタブレットから削除されます"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」に関連付けられた指紋の画像とモデルがデバイスから削除されます"</string>
diff --git a/res-product/values-ka/strings.xml b/res-product/values-ka/strings.xml
index 764d445..d87d5ad 100644
--- a/res-product/values-ka/strings.xml
+++ b/res-product/values-ka/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"სახით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"სახით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"სახით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს ტაბლეტს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს ტაბლეტს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს ტაბლეტს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს მოწყობილობას, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს მოწყობილობას, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს მოწყობილობას, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს ტელეფონს, თუ ის დაიკარგება ან მას მოგპარავენ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს ტაბლეტს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს ტაბლეტს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს ტაბლეტს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს მოწყობილობას, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს მოწყობილობას, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს მოწყობილობას, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"სახით და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა PIN-კოდი.\n\nPIN-კოდი დაიცავს ტელეფონს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა ნიმუში.\n\nნიმუში დაიცავს ტელეფონს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"სახითა და ანაბეჭდით განბლოკვის დასაყენებლად საჭიროა პაროლი.\n\nპაროლი დაიცავს ტელეფონს, თუ მას დაკარგავთ ან მოგპარავენ."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ამ მოქმედებით წაიშლება თითის ანაბეჭდის სურათები და თქვენს ტელეფონზე შენახული მოდელები, რომლებიც ასოცირებულია „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“-თან"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ამ მოქმედებით წაიშლება თითის ანაბეჭდის სურათები და თქვენს ტაბლეტზე შენახული მოდელები, რომლებიც ასოცირებულია „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“-თან"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ამ მოქმედებით წაიშლება თითის ანაბეჭდის სურათები და თქვენს მოწყობილობაზე შენახული მოდელები, რომლებიც ასოცირებულია „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“-თან"</string>
diff --git a/res-product/values-kk/strings.xml b/res-product/values-kk/strings.xml
index bfd8f6b..d3e2027 100644
--- a/res-product/values-kk/strings.xml
+++ b/res-product/values-kk/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Бет тану функциясын реттеу үшін PIN коды қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Бет тану функциясын реттеу үшін өрнек қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Бет тану функциясын реттеу үшін құпия сөз қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін PIN коды қажет.\n\nПланшет жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін өрнек қажет.\n\nПланшет жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін құпия сөз қажет.\n\nПланшет жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін PIN коды қажет.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін өрнек қажет.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін құпия сөз қажет.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін PIN коды қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін өрнек қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Бет тану және саусақ ізімен ашу функциясын реттеу үшін құпия сөз қажет.\n\nТелефон жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін PIN коды керек.\n\nПланшет жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін өрнек керек.\n\nПланшет жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін құпия сөз керек.\n\nПланшет жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін PIN коды керек.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін өрнек керек.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін құпия сөз керек.\n\nҚұрылғы жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін PIN коды керек.\n\nТелефон жоғалған немесе ұрланған жағдайда, PIN коды оны қорғайды."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін өрнек керек.\n\nТелефон жоғалған немесе ұрланған жағдайда, өрнек оны қорғайды."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Саусақ ізімен ашу және Бет тану функциясын реттеу үшін құпия сөз керек.\n\nТелефон жоғалған немесе ұрланған жағдайда, құпия сөз оны қорғайды."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ізінің телефонда сақталған суреттері мен үлгісі жойылады"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ізінің планшетте сақталған суреттері мен үлгісі жойылады"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"\"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ізінің құрылғыда сақталған суреттері мен үлгісі жойылады"</string>
diff --git a/res-product/values-km/strings.xml b/res-product/values-km/strings.xml
index 6190458..9c45736 100644
--- a/res-product/values-km/strings.xml
+++ b/res-product/values-km/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ។\n\nកូដ PIN ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ។\n\nលំនាំការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ។\n\nពាក្យសម្ងាត់ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនមុខ និងការដោះសោដោយស្កេនស្នាមម្រាមដៃ។\n\nកូដ PIN ការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ និងការដោះសោដោយប្រើស្នាមម្រាមដៃ។\n\nលំនាំការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ និងការដោះសោដោយប្រើស្នាមម្រាមដៃ។\n\nពាក្យសម្ងាត់ការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនមុខ និងការដោះសោដោយស្កេនស្នាមម្រាមដៃ។\n\nកូដ PIN ការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ និងការដោះសោដោយប្រើស្នាមម្រាមដៃ។\n\nលំនាំការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោតាមទម្រង់មុខ និងការដោះសោដោយប្រើស្នាមម្រាមដៃ។\n\nពាក្យសម្ងាត់ការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនមុខ និងការដោះសោដោយស្កេនស្នាមម្រាមដៃ។\n\nកូដ PIN ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោដោយស្កេនមុខ និងការដោះសោដោយស្កេនស្នាមម្រាមដៃ។\n\nលំនាំការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោដោយស្កេនមុខ និងការដោះសោដោយស្កេនស្នាមម្រាមដៃ។\n\nពាក្យសម្ងាត់ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nកូដ PIN ការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nលំនាំការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nពាក្យសម្ងាត់ការពារថេប្លេត ប្រសិនបើបាត់ថេប្លេត ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nកូដ PIN ការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nលំនាំការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nពាក្យសម្ងាត់ការពារឧបករណ៍ ប្រសិនបើបាត់ឧបករណ៍ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"តម្រូវឱ្យមានកូដ PIN ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nកូដ PIN ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"តម្រូវឱ្យមានលំនាំ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nលំនាំការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"តម្រូវឱ្យមានពាក្យសម្ងាត់ ដើម្បីរៀបចំការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងការដោះសោដោយស្កេនមុខ។\n\nពាក្យសម្ងាត់ការពារទូរសព្ទ ប្រសិនបើបាត់ទូរសព្ទ ឬត្រូវបានគេលួច។"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"សកម្មភាពនេះលុបគំរូ និងរូបភាពស្នាមម្រាមដៃ ដែលពាក់ព័ន្ធនឹង \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ដែលត្រូវបានរក្សាទុកនៅលើទូរសព្ទរបស់អ្នក"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"សកម្មភាពនេះលុបគំរូ និងរូបភាពស្នាមម្រាមដៃ ដែលពាក់ព័ន្ធនឹង \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ដែលត្រូវបានរក្សាទុកនៅលើថេប្លេតរបស់អ្នក"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"សកម្មភាពនេះលុបគំរូ និងរូបភាពស្នាមម្រាមដៃ ដែលពាក់ព័ន្ធនឹង \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ដែលត្រូវបានរក្សាទុកនៅលើឧបករណ៍របស់អ្នក"</string>
diff --git a/res-product/values-kn/strings.xml b/res-product/values-kn/strings.xml
index cd61786..01fbbb6 100644
--- a/res-product/values-kn/strings.xml
+++ b/res-product/values-kn/strings.xml
@@ -52,7 +52,7 @@
<string name="security_settings_face_enroll_introduction_message" product="default" msgid="847716059867943459">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ."</string>
<string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="3976493376026067375">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ."</string>
<string name="security_settings_face_enroll_introduction_message" product="device" msgid="6432265830098806034">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ."</string>
- <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಆ್ಯಪ್ಗಳಲ್ಲಿ ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ, ಅಂದರೆ, ನೀವು ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸುವಾಗ"</string>
+ <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನೀವು ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸುವ ಸಂದರ್ಭಗಳಲ್ಲಿ ಆ್ಯಪ್ಗಳಲ್ಲಿ ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಆ್ಯಪ್ಗಳಲ್ಲಿ ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ, ಅಂದರೆ, ನೀವು ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸುವಾಗ"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಆ್ಯಪ್ಗಳಲ್ಲಿ ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ, ಅಂದರೆ, ನೀವು ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸುವಾಗ"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"ನಿಮ್ಮ ಮಗುವಿಗೆ ತಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅವರ ಮುಖವನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಿನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪ್ಯಾಟರ್ನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಾಸ್ವರ್ಡ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಿನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪ್ಯಾಟರ್ನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಾಸ್ವರ್ಡ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಿನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪ್ಯಾಟರ್ನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಾಸ್ವರ್ಡ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಿನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪ್ಯಾಟರ್ನ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಅದನ್ನು ಪಾಸ್ವರ್ಡ್ ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಿನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪ್ಯಾಟರ್ನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಟ್ಯಾಬ್ಲೆಟ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಾಸ್ವರ್ಡ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಿನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪ್ಯಾಟರ್ನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಸಾಧನ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಾಸ್ವರ್ಡ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಿನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಿನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪ್ಯಾಟರ್ನ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ಫೇಸ್ ಅನ್ಲಾಕ್ ಮತ್ತು ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಪಾಸ್ವರ್ಡ್ ಅಗತ್ಯವಿದೆ.\n\nಫೋನ್ ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ ಪಾಸ್ವರ್ಡ್ ಅದನ್ನು ರಕ್ಷಿಸುತ್ತದೆ."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ಗೆ ಸಂಬಂಧಿಸಿದ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಚಿತ್ರಗಳು ಮತ್ತು ಮಾಡೆಲ್ ಅನ್ನು ಇದು ಅಳಿಸುತ್ತದೆ"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ಗೆ ಸಂಬಂಧಿಸಿದ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಚಿತ್ರಗಳು ಮತ್ತು ಮಾಡೆಲ್ ಅನ್ನು ಇದು ಅಳಿಸುತ್ತದೆ"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ಗೆ ಸಂಬಂಧಿಸಿದ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಚಿತ್ರಗಳು ಮತ್ತು ಮಾಡೆಲ್ ಅನ್ನು ಇದು ಅಳಿಸುತ್ತದೆ"</string>
diff --git a/res-product/values-ko/strings.xml b/res-product/values-ko/strings.xml
index c173981..69d6e25 100644
--- a/res-product/values-ko/strings.xml
+++ b/res-product/values-ko/strings.xml
@@ -52,7 +52,7 @@
<string name="security_settings_face_enroll_introduction_message" product="default" msgid="847716059867943459">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인하세요."</string>
<string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="3976493376026067375">"태블릿을 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 때 얼굴 인식을 사용합니다."</string>
<string name="security_settings_face_enroll_introduction_message" product="device" msgid="6432265830098806034">"기기를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 때 얼굴 인식을 사용합니다."</string>
- <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"휴대전화를 잠금 해제하거나 앱에서 인증할 때(예: 앱 로그인 또는 구매 승인 시) 얼굴 인식을 사용하세요"</string>
+ <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"휴대전화를 잠금 해제하거나 앱 로그인 및 구매 승인 등 앱에서 인증이 필요할 때 얼굴 인식을 사용하세요."</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"태블릿을 잠금 해제하거나 앱에서 인증할 때(예: 앱 로그인 또는 구매 승인 시) 얼굴 인식을 사용하세요"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"기기를 잠금 해제하거나 앱에서 인증할 때(예: 앱 로그인 또는 구매 승인 시) 얼굴 인식을 사용하세요"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"자녀가 얼굴 인식을 사용하여 휴대전화를 잠금 해제할 수 있도록 허용합니다."</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"얼굴 인식 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 휴대전화를 분실하거나 도난당했을 때 휴대전화를 보호할 수 있습니다."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"얼굴 인식 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 휴대전화를 분실하거나 도난당했을 때 휴대전화를 보호할 수 있습니다."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"얼굴 인식 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 휴대전화를 분실하거나 도난당했을 때 보호할 수 있습니다."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 휴대전화를 분실하거나 도난당했을 때 보호할 수 있습니다."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 휴대전화를 분실하거나 도난당했을 때 보호할 수 있습니다."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"얼굴 인식 잠금 해제 및 지문 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 휴대전화를 분실하거나 도난당했을 때 보호할 수 있습니다."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 태블릿을 분실하거나 도난당했을 때 태블릿을 보호할 수 있습니다."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 기기를 분실하거나 도난당했을 때 기기를 보호할 수 있습니다."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 PIN이 필요합니다.\n\nPIN을 사용하면 휴대전화를 분실하거나 도난당했을 때 휴대전화를 보호할 수 있습니다."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 패턴이 필요합니다.\n\n패턴을 사용하면 휴대전화를 분실하거나 도난당했을 때 휴대전화를 보호할 수 있습니다."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"지문 잠금 해제 및 얼굴 인식 잠금 해제를 설정하려면 비밀번호가 필요합니다.\n\n비밀번호를 사용하면 휴대전화를 분실하거나 도난당했을 때 보호할 수 있습니다."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"휴대전화에 저장된 \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' 지문과 관련된 지문 이미지와 모델이 삭제됩니다"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"태블릿에 저장된 \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' 지문과 관련된 지문 이미지와 모델이 삭제됩니다"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"기기에 저장된 \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' 지문과 관련된 지문 이미지와 모델이 삭제됩니다"</string>
@@ -310,7 +310,7 @@
<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="default" msgid="5440172971747221370">"새 사용자를 추가하여 휴대전화를 공유합니다. 사용자마다 휴대전화에서 맞춤 홈 화면, 계정, 앱, 설정 등을 이용할 수 있는 자신만의 공간을 갖게 됩니다."</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>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"이 태블릿에 있는 내 저장 공간 및 데이터가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
diff --git a/res-product/values-ky/strings.xml b/res-product/values-ky/strings.xml
index 10d8f62..0b0b7c6 100644
--- a/res-product/values-ky/strings.xml
+++ b/res-product/values-ky/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Жүзүнөн таанып ачуу функциясын кошуу үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Жүзүнөн таанып ачуу функциясын кошуу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Жүзүнөн таанып ачуу функциясын кошуу үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз планшет жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Жүзүнөн таанып ачуу жана манжа изи менен ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз планшет жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз түзмөк жоголсо же уурдалса, аны коргойт."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн PIN код талап кылынат.\n\nPIN код жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн графикалык ачкыч талап кылынат.\n\nГрафикалык ачкыч жоголгон же уурдалган телефондогу нерселерди коргойт."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Манжа изи менен ачуу жана Жүзүнөн таанып ачуу функцияларын коюу үчүн сырсөз талап кылынат.\n\nСырсөз жоголгон же уурдалган телефонуңуздагы нерселерди коргойт."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ушуну менен телефонуңуздагы \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" менен байланышкан манжа изинин сүрөттөрү менен үлгүсү өчөт"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ушуну менен планшетиңиздеги \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" менен байланышкан манжа изинин сүрөттөрү менен үлгүсү өчөт"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ушуну менен түзмөгүңүздөгү \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" менен байланышкан манжа изинин сүрөттөрү менен үлгүсү өчөт"</string>
@@ -308,9 +308,9 @@
<string name="data_usage_auto_sync_on_dialog" product="default" msgid="7207326473052484970">"Вебсайтта аккаунттарга киргизилген өзгөрүүлөр автоматтык түрдө телефонуңузга көчүрүлүп турат.\n\nАйрым учурларда, тескерисинче, телефонуңуздан вебсайтка көчүрүлөт. Кыскасы, Google аккаунту ушинтип иштейт."</string>
<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="default" msgid="5440172971747221370">"Телефонуңузду бир нече адам менен чогуу пайдалансаңыз болот. Ал үчүн алардын ар бирине профиль түзүп бериңиз. Ар бир колдонуучу өз профилин өзү каалагандай тууралап алышат (башкы экранын өзгөртүп, аккаунттарын жана колдонмолорун кошуп)."</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="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>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
diff --git a/res-product/values-lo/strings.xml b/res-product/values-lo/strings.xml
index 4db22ac..44ec957 100644
--- a/res-product/values-lo/strings.xml
+++ b/res-product/values-lo/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ.\n\nPIN ຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ.\n\nຮູບແບບຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ.\n\nລະຫັດຜ່ານຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nPIN ຈະປົກປ້ອງແທັບເລັດຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nຮູບແບບຈະປົກປ້ອງແທັບເລັດຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nລະຫັດຜ່ານຈະປົກປ້ອງແທັບເລັດຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nPIN ຈະປົກປ້ອງອຸປະກອນຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nຮູບແບບຈະປົກປ້ອງອຸປະກອນຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nລະຫັດຜ່ານຈະປົກປ້ອງອຸປະກອນຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nPIN ຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nຮູບແບບຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ ແລະ ການປົດລັອກດ້ວຍລາຍນິ້ວມື.\n\nລະຫັດຜ່ານຈະປົກປ້ອງໂທລະສັບຫາກມັນເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nPIN ຈະຊ່ວຍປົກປ້ອງແທັບເລັດໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nຮູບແບບຈະຊ່ວຍປົກປ້ອງແທັບເລັດໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nລະຫັດຜ່ານຈະຊ່ວຍປົກປ້ອງແທັບເລັດໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nPIN ຈະຊ່ວຍປົກປ້ອງອຸປະກອນໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nຮູບແບບຈະຊ່ວຍປົກປ້ອງອຸປະກອນໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nລະຫັດຜ່ານຈະຊ່ວຍປົກປ້ອງອຸປະກອນໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ຕ້ອງໃຊ້ PIN ເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nPIN ຈະຊ່ວຍປົກປ້ອງໂທລະສັບໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ຕ້ອງໃຊ້ຮູບແບບເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nຮູບແບບຈະຊ່ວຍປົກປ້ອງໂທລະສັບໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ຕ້ອງໃຊ້ລະຫັດຜ່ານເພື່ອຕັ້ງຄ່າປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ການປົດລັອກດ້ວຍໜ້າ.\n\nລະຫັດຜ່ານຈະຊ່ວຍປົກປ້ອງໂທລະສັບໃນກໍລະນີທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ນີ້ຈະລຶບຮູບ ແລະ ຮູບແບບລາຍນິ້ວມືທີ່ເຊື່ອມໂຍງກັບ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ທີ່ຈັດເກັບໄວ້ຢູ່ໂທລະສັບຂອງທ່ານອອກ"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ນີ້ຈະລຶບຮູບ ແລະ ຮູບແບບລາຍນິ້ວມືທີ່ເຊື່ອມໂຍງກັບ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ທີ່ຈັດເກັບໄວ້ຢູ່ແທັບເລັດຂອງທ່ານອອກ"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ນີ້ຈະລຶບຮູບ ແລະ ຮູບແບບລາຍນິ້ວມືທີ່ເຊື່ອມໂຍງກັບ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ທີ່ຈັດເກັບໄວ້ຢູ່ອຸປະກອນຂອງທ່ານອອກ"</string>
diff --git a/res-product/values-lt/strings.xml b/res-product/values-lt/strings.xml
index 9688a06..d9584d2 100644
--- a/res-product/values-lt/strings.xml
+++ b/res-product/values-lt/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Norint nustatyti atrakinimą pagal veidą, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą telefoną."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Norint nustatyti atrakinimą pagal veidą, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą telefoną."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Norint nustatyti atrakinimą pagal veidą, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą telefoną."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą įrenginį."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą įrenginį."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą įrenginį."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą telefoną."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą telefoną."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Norint nustatyti atrakinimą pagal veidą ir atrakinimą kontroliniu kodu, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą telefoną."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą planšetinį kompiuterį."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą įrenginį."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą įrenginį."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą įrenginį."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas PIN kodas.\n\nPIN kodas apsaugo pamestą ar pavogtą telefoną."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas atrakinimo piešinys.\n\nAtrakinimo piešinys apsaugo pamestą ar pavogtą telefoną."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Norint nustatyti atrakinimą piršto atspaudu ir atrakinimą pagal veidą, būtinas slaptažodis.\n\nSlaptažodis apsaugo pamestą ar pavogtą telefoną."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Bus ištrinti telefone saugomi piršto atspaudo vaizdai ir modelis, susieti su „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Bus ištrinti planšetiniame kompiuteryje saugomi kontrolinio kodo vaizdai ir modelis, susieti su „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Bus ištrinti įrenginyje saugomi kontrolinio kodo vaizdai ir modelis, susieti su „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
diff --git a/res-product/values-lv/strings.xml b/res-product/values-lv/strings.xml
index a6ddbcf..2b86b9c 100644
--- a/res-product/values-lv/strings.xml
+++ b/res-product/values-lv/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Lai iestatītu autorizāciju pēc sejas, ir jābūt iestatītam PIN.\n\nPIN aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Lai iestatītu autorizāciju pēc sejas, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Lai iestatītu autorizāciju pēc sejas, ir jābūt iestatītai parolei.\n\nParole aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītam PIN.\n\nPIN aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai parolei.\n\nParole aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītam PIN.\n\nPIN aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai parolei.\n\nParole aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītam PIN.\n\nPIN aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Lai iestatītu autorizāciju pēc sejas un autorizāciju ar pirksta nospiedumu, ir jābūt iestatītai parolei.\n\nParole aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītam PIN.\n\nPIN aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai parolei.\n\nParole aizsargā planšetdatoru, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītam PIN.\n\nPIN aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai parolei.\n\nParole aizsargā ierīci, ja tā tiek nozaudēta vai nozagta."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītam PIN.\n\nPIN aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai kombinācijai.\n\nKombinācija aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Lai iestatītu autorizāciju ar pirksta nospiedumu un autorizāciju pēc sejas, ir jābūt iestatītai parolei.\n\nParole aizsargā tālruni, ja tas tiek nozaudēts vai nozagts."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Tādējādi tiks dzēsti jūsu tālrunī saglabātie pirksta nospieduma attēli un modelis, kas saistīti ar pirksta nospiedumu “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Tādējādi tiks dzēsti jūsu planšetdatorā saglabātie pirksta nospieduma attēli un modelis, kas saistīti ar pirksta nospiedumu “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Tādējādi tiks dzēsti jūsu ierīcē glabātie pirksta nospieduma attēli un modelis, kas saistīti ar “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
diff --git a/res-product/values-mk/strings.xml b/res-product/values-mk/strings.xml
index 1e03880..8e1548f 100644
--- a/res-product/values-mk/strings.xml
+++ b/res-product/values-mk/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Потребен е PIN-код за да поставите „Отклучување со лик“.\n\nPIN-кодот го заштитува телефонот ако го изгубите или ви го украдат."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Потребна е шема за да поставите „Отклучување со лик“.\n\nШемата го заштитува телефонот ако го изгубите или ви го украдат."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Потребна е лозинка за да поставите „Отклучување со лик“.\n\nЛозинката го заштитува телефонот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Потребен е PIN-код за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nPIN-кодот го заштитува таблетот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Потребна е шема за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nШемата го заштитува таблетот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Потребна е лозинка за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nЛозинката го заштитува таблетот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Потребен е PIN-код за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nPIN-кодот го заштитува уредот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Потребна е шема за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nШемата го заштитува уредот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Потребна е лозинка за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nЛозинката го заштитува уредот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Потребен е PIN-код за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nPIN-кодот го заштитува телефонот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Потребна е шема за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nШемата го заштитува телефонот ако го изгубите или ви го украдат."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Потребна е лозинка за да поставите „Отклучување со лик“ и „Отклучување со отпечаток“.\n\nЛозинката го заштитува телефонот ако го изгубите или ви го украдат."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Потребен е PIN-код за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nPIN-кодот го штити таблетот при губење или кражба."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Потребна е шема за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nШемата го штити таблетот при губење или кражба."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Потребна е лозинка за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nЛозинката го штити таблетот при губење или кражба."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Потребен е PIN-код за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nPIN-кодот го штити уредот при губење или кражба."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Потребна е шема за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nШемата го штити уредот при губење или кражба."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Потребна е лозинка за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nЛозинката го штити уредот при губење или кражба."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Потребен е PIN-код за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nPIN-кодот го штити телефонот при губење или кражба."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Потребна е шема за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nШемата го штити телефонот при губење или кражба."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Потребна е лозинка за да поставите „Отклучување со отпечаток“ и „Отклучување со лик“.\n\nЛозинката го штити телефонот при губење или кражба."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ова ги брише сликите и моделот на отпечатокот „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ што се складирани на телефонот"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ова ги брише сликите и моделот на отпечатокот „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ што се складирани на таблетот"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ова ги брише сликите и моделот на отпечатокот „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“ што се складирани на уредот"</string>
diff --git a/res-product/values-ml/strings.xml b/res-product/values-ml/strings.xml
index e0d09ea..00c732a 100644
--- a/res-product/values-ml/strings.xml
+++ b/res-product/values-ml/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ഫെയ്സ് അൺലോക്ക് സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ഫെയ്സ് അൺലോക്ക് സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ഫെയ്സ് അൺലോക്ക് സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ഫെയ്സ് അൺലോക്കും ഫിംഗർപ്രിന്റ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nടാബ്ലെറ്റ് നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nഉപകരണം നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പിൻ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പിൻ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാറ്റേൺ ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാറ്റേൺ അതിനെ പരിരക്ഷിക്കുന്നു."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ഫിംഗർപ്രിന്റ് അൺലോക്കും ഫെയ്സ് അൺലോക്കും സജ്ജീകരിക്കാൻ പാസ്വേഡ് ആവശ്യമാണ്.\n\nഫോൺ നഷ്ടപ്പെടുകയോ മോഷ്ടിക്കപ്പെടുകയോ ചെയ്താൽ പാസ്വേഡ് അതിനെ പരിരക്ഷിക്കുന്നു."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' എന്നതുമായി ബന്ധപ്പെട്ട് നിങ്ങളുടെ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഫിംഗർപ്രിന്റ് ചിത്രങ്ങളും മോഡലും ഇത് ഇല്ലാതാക്കുന്നു"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' എന്നതുമായി ബന്ധപ്പെട്ട് നിങ്ങളുടെ ടാബ്ലെറ്റിൽ സംഭരിച്ചിരിക്കുന്ന ഫിംഗർപ്രിന്റ് ചിത്രങ്ങളും മോഡലും ഇത് ഇല്ലാതാക്കുന്നു"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' എന്നതുമായി ബന്ധപ്പെട്ട് നിങ്ങളുടെ ഉപകരണത്തിൽ സംഭരിച്ചിരിക്കുന്ന ഫിംഗർപ്രിന്റ് ചിത്രങ്ങളും മോഡലും ഇത് ഇല്ലാതാക്കുന്നു"</string>
diff --git a/res-product/values-mn/strings.xml b/res-product/values-mn/strings.xml
index e7ad331..48d5e42 100644
--- a/res-product/values-mn/strings.xml
+++ b/res-product/values-mn/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Царайгаар түгжээ тайлахыг тохируулахын тулд ПИН шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН үүнийг хамгаалдаг."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Царайгаар түгжээ тайлахыг тохируулахын тулд хээ шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ үүнийг хамгаалдаг."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Царайгаар түгжээ тайлахыг тохируулахын тулд нууц үг шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд ПИН шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд хээ шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ үүнийг хамгаалдаг."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд нууц үг шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд ПИН шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд хээ шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ үүнийг хамгаалдаг."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд нууц үг шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд ПИН шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН үүнийг хамгаалдаг."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд хээ шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ үүнийг хамгаалдаг."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Царайгаар түгжээ тайлах болон Хурууны хээгээр түгжээ тайлахыг тохируулахын тулд нууц үг шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг үүнийг хамгаалдаг."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад ПИН шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН хамгаалдаг."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад хээ шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ хамгаалдаг."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад нууц үг шаардлагатай.\n\nТаблетыг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг хамгаалдаг."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад ПИН шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН хамгаалдаг."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад хээ шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ хамгаалдаг."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад нууц үг шаардлагатай.\n\nТөхөөрөмжийг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг хамгаалдаг."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад ПИН шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд ПИН хамгаалдаг."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад хээ шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд хээ хамгаалдаг."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Хурууны хээгээр түгжээ тайлах болон Царайгаар түгжээ тайлахыг тохируулахад нууц үг шаардлагатай.\n\nУтсыг гээсэн эсвэл хулгайд алдсан тохиолдолд нууц үг хамгаалдаг."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Энэ нь таны утсан дээр хадгалсан \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-тай холбоотой хурууны хээний зургууд болон загварыг устгана"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Энэ нь таны таблет дээр хадгалсан \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-тай холбоотой хурууны хээний зургууд болон загварыг устгана"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Энэ нь таны төхөөрөмж дээр хадгалсан \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'-тай холбоотой хурууны хээний зургууд болон загварыг устгана"</string>
diff --git a/res-product/values-mr/strings.xml b/res-product/values-mr/strings.xml
index a210786..ef8e745 100644
--- a/res-product/values-mr/strings.xml
+++ b/res-product/values-mr/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"फेस अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"फेस अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करते."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"फेस अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nटॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nटॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करते."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nटॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nडिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nडिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करते."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nडिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करते."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"फेस अनलॉक आणि फिंगरप्रिंट अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nफोन हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nतुमचा टॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nतुमचा टॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nतुमचा टॅबलेट हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nतुमचे डिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nतुमचे डिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nतुमचे डिव्हाइस हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पिन आवश्यक आहे.\n\nतुमचा फोन हरवल्यास किंवा चोरीला गेल्यास, पिन त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पॅटर्न आवश्यक आहे.\n\nतुमचा फोन हरवल्यास किंवा चोरीला गेल्यास, पॅटर्न त्याचे संरक्षण करतो."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"फिंगरप्रिंट अनलॉक आणि फेस अनलॉक सेट करण्यासाठी पासवर्ड आवश्यक आहे.\n\nतुमचा फोन हरवल्यास किंवा चोरीला गेल्यास, पासवर्ड त्याचे संरक्षण करतो."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"हे तुमच्या फोनवर स्टोअर केलेल्या फिंगरप्रिंट इमेज आणि \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' शी संबंधित असलेले मॉडेल हटवते"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"हे तुमच्या टॅबलेटवर स्टोअर केलेल्या फिंगरप्रिंट इमेज आणि \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' शी संबंधित असलेले मॉडेल हटवते"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"हे तुमच्या डिव्हाइसवर स्टोअर केलेल्या फिंगरप्रिंट इमेज आणि \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' शी संबंधित असलेले मॉडेल हटवते"</string>
diff --git a/res-product/values-ms/strings.xml b/res-product/values-ms/strings.xml
index ec25e3d..d44395e 100644
--- a/res-product/values-ms/strings.xml
+++ b/res-product/values-ms/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"PIN diperlukan untuk menyediakan Buka Kunci Wajah.\n\nPIN melindungi telefon jika telefon hilang atau dicuri."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Corak diperlukan untuk menyediakan Buka Kunci Wajah.\n\nCorak melindungi telefon jika telefon hilang atau dicuri."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Kata laluan diperlukan untuk menyediakan Buka Kunci Wajah.\n\nKata laluan melindungi telefon jika telefon hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"PIN diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nPIN melindungi tablet jika tablet hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Corak diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nCorak melindungi tablet jika tablet hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Kata laluan diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nKata laluan melindungi tablet jika tablet hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"PIN diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nPIN melindungi peranti jika peranti hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Corak diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nCorak melindungi peranti jika peranti hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Kata laluan diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nKata laluan melindungi peranti jika peranti hilang atau dicuri."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"PIN diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nPIN melindungi telefon jika telefon hilang atau dicuri."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Corak diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nCorak melindungi telefon jika telefon hilang atau dicuri."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Kata laluan diperlukan untuk menyediakan Buka Kunci Wajah dan Buka Kunci Cap Jari.\n\nKata laluan melindungi telefon jika telefon hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nPIN melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Corak diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nCorak melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Kata laluan diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nKata laluan melindungi tablet jika tablet hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nPIN melindungi peranti jika peranti hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Corak diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nCorak melindungi peranti jika peranti hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Kata laluan diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nKata laluan melindungi peranti jika peranti hilang atau dicuri."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nPIN melindungi telefon jika telefon hilang atau dicuri."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Corak diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nCorak melindungi telefon jika telefon hilang atau dicuri."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Kata laluan diperlukan untuk menyediakan Buka Kunci Cap Jari dan Buka Kunci Wajah.\n\nKata laluan melindungi telefon jika telefon hilang atau dicuri."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Tindakan ini akan memadamkan imej dan model cap jari yang berkaitan dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan dalam telefon anda"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Tindakan ini akan memadamkan imej dan model cap jari yang berkaitan dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan dalam tablet anda"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ini akan memadamkan imej cap jari dan model yang berkaitan dengan \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' yang disimpan dalam peranti anda"</string>
diff --git a/res-product/values-my/strings.xml b/res-product/values-my/strings.xml
index 21799ca..5a3e4bc 100644
--- a/res-product/values-my/strings.xml
+++ b/res-product/values-my/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံစံ လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံစံက ကာကွယ်ပေးသည်။"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံစံ လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံစံက ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံစံ လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံစံက ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံစံ လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံစံက ကာကွယ်ပေးသည်။"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံဖော်ခြင်း လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံဖော်ခြင်းက ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤတက်ဘလက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံဖော်ခြင်း လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံဖော်ခြင်းက ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤစက်ပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပင်နံပါတ် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပင်နံပါတ်က ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် ပုံဖော်ခြင်း လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို ပုံဖော်ခြင်းက ကာကွယ်ပေးသည်။"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"‘လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’ နှင့် ‘မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း’ ကို ထည့်သွင်းရန် စကားဝှက် လိုအပ်သည်။\n\nဤဖုန်းပျောက်သွားလျှင် (သို့) ခိုးခံရလျှင် ၎င်းကို စကားဝှက်က ကာကွယ်ပေးသည်။"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"သင့်ဖုန်းတွင်သိုလှောင်ထားသည့် ‘<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>’ နှင့် ဆက်စပ်သည့် လက်ဗွေပုံများနှင့် နမူနာကို ဖျက်ပါမည်"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"သင့်တက်ဘလက်တွင်သိုလှောင်ထားသည့် ‘<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>’ နှင့် ဆက်စပ်သည့် လက်ဗွေပုံများနှင့် နမူနာကို ဖျက်ပါမည်"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"သင့်စက်တွင်သိုလှောင်ထားသည့် \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' နှင့် ဆက်စပ်သည့် လက်ဗွေပုံများနှင့် နမူနာကို ဖျက်ပါမည်"</string>
diff --git a/res-product/values-nb/strings.xml b/res-product/values-nb/strings.xml
index b5a9df0..3da2ea8 100644
--- a/res-product/values-nb/strings.xml
+++ b/res-product/values-nb/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"En PIN-kode kreves for å konfigurere ansiktslås.\n\nEn PIN-kode beskytter telefonen hvis den blir mistet eller stjålet."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Et mønster kreves for å konfigurere ansiktslås.\n\nEt mønster beskytter telefonen hvis den blir mistet eller stjålet."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Et passord kreves for å konfigurere ansiktslås.\n\nEt passord beskytter telefonen hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"En PIN-kode kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEn PIN-kode beskytter nettbrettet hvis det blir mistet eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Et mønster kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt mønster beskytter nettbrettet hvis det blir mistet eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Et passord kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt passord beskytter nettbrettet hvis det blir mistet eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"En PIN-kode kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEn PIN-kode beskytter enheten hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Et mønster kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt mønster beskytter enheten hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Et passord kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt passord beskytter enheten hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"En PIN-kode kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEn PIN-kode beskytter telefonen hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Et mønster kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt mønster beskytter telefonen hvis den blir mistet eller stjålet."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Et passord kreves for å konfigurere ansiktslås og opplåsing med fingeravtrykk.\n\nEt passord beskytter telefonen hvis den blir mistet eller stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"En PIN-kode kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har en PIN-kode, er nettbrettet beskyttet hvis du mister det eller det blir stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Et mønster kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et mønster, er nettbrettet beskyttet hvis du mister det eller det blir stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Et passord kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et passord, er nettbrettet beskyttet hvis du mister det eller det blir stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"En PIN-kode kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har en PIN-kode, er enheten beskyttet hvis du mister den eller den blir stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Et mønster kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et mønster, er enheten beskyttet hvis du mister den eller den blir stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Et passord kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et passord, er enheten beskyttet hvis du mister den eller den blir stjålet."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"En PIN-kode kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har en PIN-kode, er telefonen beskyttet hvis du mister den eller den blir stjålet."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Et mønster kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et mønster, er telefonen beskyttet hvis du mister den eller den blir stjålet."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Et passord kreves for å konfigurere opplåsing med fingeravtrykk og ansiktslås.\n\nNår du har et passord, er telefonen beskyttet hvis du mister den eller den blir stjålet."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dette sletter fingeravtrykkbildene og -modellen tilknyttet «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» som er lagret på telefonen"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dette sletter fingeravtrykkbildene og -modellen tilknyttet «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» som er lagret på nettbrettet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dette sletter fingeravtrykkbildene og -modellen tilknyttet «<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>» som er lagret på enheten"</string>
diff --git a/res-product/values-ne/strings.xml b/res-product/values-ne/strings.xml
index fa40d6c..5e5b965 100644
--- a/res-product/values-ne/strings.xml
+++ b/res-product/values-ne/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"फेस अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा PIN ले उक्त फोन सुरक्षित राख्छ।"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"फेस अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त फोन सुरक्षित राख्छ।"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"फेस अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त फोन सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा PIN ले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा PIN ले उक्त डिभाइस सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त डिभाइस सुरक्षित राख्छ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त डिभाइस सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा PIN ले उक्त फोन सुरक्षित राख्छ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त फोन सुरक्षित राख्छ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"फेस अनलक र फिंगरप्रिन्ट अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त फोन सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा PIN ले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको ट्याब्लेट हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त ट्याब्लेट सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा PIN ले उक्त डिभाइस सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त डिभाइस सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त डिभाइस सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले PIN सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा PIN ले उक्त फोन सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले प्याटर्न सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा प्याटर्नले उक्त फोन सुरक्षित राख्छ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"फिंगरप्रिन्ट अनलक र फेस अनलक सेटअप गर्न तपाईंले पासवर्ड सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको फोन हराएको वा चोरी भएको खण्डमा पासवर्डले उक्त फोन सुरक्षित राख्छ।"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"यो फिंगरप्रिन्ट मेटाइयो भने तपाईंको फोनमा भण्डारण गरिएका \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' सँग सम्बन्धित फिंगरप्रिन्टका फोटो र मोडेल मेटाइन्छन्"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"यो फिंगरप्रिन्ट मेटाइयो भने तपाईंको ट्याब्लेटमा भण्डारण गरिएका \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' सँग सम्बन्धित फिंगरप्रिन्टका फोटो र मोडेल मेटाइन्छन्"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"यो फिंगरप्रिन्ट मेटाइयो भने तपाईंको डिभाइसमा भण्डारण गरिएका \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' सँग सम्बन्धित फिंगरप्रिन्टका फोटो र मोडेल मेटाइन्छन्"</string>
diff --git a/res-product/values-nl/strings.xml b/res-product/values-nl/strings.xml
index bdd1ba5..ee1b141 100644
--- a/res-product/values-nl/strings.xml
+++ b/res-product/values-nl/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Je hebt een pincode nodig voor het instellen van Ontgrendelen via gezichtsherkenning.\n\nEen pincode beschermt de telefoon bij verlies of diefstal."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Je hebt een patroon nodig voor het instellen van Ontgrendelen via gezichtsherkenning.\n\nEen patroon beschermt de telefoon bij verlies of diefstal."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen via gezichtsherkenning.\n\nEen wachtwoord beschermt de telefoon bij verlies of diefstal."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Je hebt een pincode nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen pincode beschermt de tablet bij verlies of diefstal."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Je hebt een patroon nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen patroon beschermt de tablet bij verlies of diefstal."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen wachtwoord beschermt de tablet bij verlies of diefstal."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Je hebt een pincode nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen pincode beschermt het apparaat bij verlies of diefstal."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Je hebt een patroon nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen patroon beschermt het apparaat bij verlies of diefstal."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen wachtwoord beschermt het apparaat bij verlies of diefstal."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Je hebt een pincode nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen pincode beschermt de telefoon bij verlies of diefstal."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Je hebt een patroon nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen patroon beschermt de telefoon bij verlies of diefstal."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen via gezichtsherkenning en Ontgrendelen met vingerafdruk.\n\nEen wachtwoord beschermt de telefoon bij verlies of diefstal."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Je hebt een pincode nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen pincode beschermt de tablet bij verlies of diefstal."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Je hebt een patroon nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen patroon beschermt de tablet bij verlies of diefstal."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen wachtwoord beschermt de tablet bij verlies of diefstal."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Je hebt een pincode nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen pincode beschermt het apparaat bij verlies of diefstal."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Je hebt een patroon nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen patroon beschermt het apparaat bij verlies of diefstal."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen wachtwoord beschermt het apparaat bij verlies of diefstal."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Je hebt een pincode nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen pincode beschermt de telefoon bij verlies of diefstal."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Je hebt een patroon nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen patroon beschermt de telefoon bij verlies of diefstal."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Je hebt een wachtwoord nodig voor het instellen van Ontgrendelen met vingerafdruk en Ontgrendelen via gezichtsherkenning.\n\nEen wachtwoord beschermt de telefoon bij verlies of diefstal."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Hiermee verwijder je de afbeeldingen en het model van je vingerafdruk die aan <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> zijn gekoppeld en op je telefoon zijn opgeslagen"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Hiermee verwijder je de afbeeldingen en het model van je vingerafdruk die aan <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> zijn gekoppeld en op je tablet zijn opgeslagen"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Hiermee verwijder je de afbeeldingen en het model van je vingerafdruk die aan <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> zijn gekoppeld en op je apparaat zijn opgeslagen"</string>
diff --git a/res-product/values-or/strings.xml b/res-product/values-or/strings.xml
index 732f99a..3b8fb8a 100644
--- a/res-product/values-or/strings.xml
+++ b/res-product/values-or/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ଫେସ୍ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ PIN ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ଫେସ୍ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାଟର୍ନ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ଫେସ୍ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ PIN ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାଟର୍ନ ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ PIN ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାଟର୍ନ ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ PIN ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ଫେସ୍ ଅନଲକ୍ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଏକ ପାଟର୍ନ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ଫେସ ଅନଲକ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏହି ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଟାବଲେଟଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଡିଭାଇସଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ PIN ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାଟର୍ନ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ ଏବଂ ଫେସ ଅନଲକ ସେଟ ଅପ କରିବା ପାଇଁ ଏକ ପାସୱାର୍ଡ ଆବଶ୍ୟକ।\n\nଯଦି ଫୋନଟି ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ ଏକ ପାସୱାର୍ଡ ଏହାକୁ ସୁରକ୍ଷିତ ରଖେ।"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ଏହା ଆପଣଙ୍କ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ସହ ସମ୍ବନ୍ଧିତ ଟିପଚିହ୍ନର ଇମେଜ ଏବଂ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ କରେ"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ଏହା ଆପଣଙ୍କ ଟାବଲେଟରେ ଷ୍ଟୋର କରାଯାଇଥିବା \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ସହ ସମ୍ବନ୍ଧିତ ଟିପଚିହ୍ନର ଇମେଜ ଏବଂ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ କରେ"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ଏହା ଆପଣଙ୍କ ଡିଭାଇସରେ ଷ୍ଟୋର କରାଯାଇଥିବା \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ସହ ସମ୍ବନ୍ଧିତ ଟିପଚିହ୍ନର ଇମେଜ ଏବଂ ମଡେଲଗୁଡ଼ିକୁ ଡିଲିଟ କରେ"</string>
diff --git a/res-product/values-pa/strings.xml b/res-product/values-pa/strings.xml
index eb57ca7..546d2e0 100644
--- a/res-product/values-pa/strings.xml
+++ b/res-product/values-pa/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ਫ਼ੇਸ ਅਣਲਾਕ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਟੈਬਲੈੱਟ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਡੀਵਾਈਸ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਿੰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਿੰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪੈਟਰਨ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਹੈ।\n\nਫ਼ੋਨ ਦੇ ਗੁਆਚਣ ਜਾਂ ਚੋਰੀ ਹੋਣ \'ਤੇ ਪਾਸਵਰਡ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਦਾ ਹੈ।"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਸਟੋਰ ਕੀਤੇ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ਨਾਲ ਸੰਬੰਧਿਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਚਿੱਤਰਾਂ ਅਤੇ ਮਾਡਲ ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ \'ਤੇ ਸਟੋਰ ਕੀਤੇ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ਨਾਲ ਸੰਬੰਧਿਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਚਿੱਤਰਾਂ ਅਤੇ ਮਾਡਲ ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ਇਹ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸਟੋਰ ਕੀਤੇ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ਨਾਲ ਸੰਬੰਧਿਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਚਿੱਤਰਾਂ ਅਤੇ ਮਾਡਲ ਨੂੰ ਮਿਟਾ ਦਿੰਦੀ ਹੈ"</string>
diff --git a/res-product/values-pl/strings.xml b/res-product/values-pl/strings.xml
index 198cc31..67be811 100644
--- a/res-product/values-pl/strings.xml
+++ b/res-product/values-pl/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Do skonfigurowania rozpoznawania twarzy wymagany jest kod PIN.\n\nKod PIN ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Do skonfigurowania rozpoznawania twarzy wymagany jest wzór.\n\nWzór ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Do skonfigurowania rozpoznawania twarzy wymagane jest hasło.\n\nHasło ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest kod PIN.\n\nKod PIN ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest wzór.\n\nWzór ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagane jest hasło.\n\nHasło ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest kod PIN.\n\nKod PIN ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest wzór.\n\nWzór ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagane jest hasło.\n\nHasło ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest kod PIN.\n\nKod PIN ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagany jest wzór.\n\nWzór ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Do skonfigurowania rozpoznawania twarzy i odblokowywania odciskiem palca wymagane jest hasło.\n\nHasło ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest kod PIN.\n\nKod PIN ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest wzór.\n\nWzór ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagane jest hasło.\n\nHasło ochroni tablet, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest kod PIN.\n\nKod PIN ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest wzór.\n\nWzór ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagane jest hasło.\n\nHasło ochroni urządzenie, jeśli zostanie zgubione lub skradzione."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest kod PIN.\n\nKod PIN ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagany jest wzór.\n\nWzór ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Do skonfigurowania odblokowywania odciskiem palca i rozpoznawania twarzy wymagane jest hasło.\n\nHasło ochroni telefon, jeśli zostanie zgubiony lub skradziony."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Ta czynność usuwa zapisane na telefonie obrazy i model odcisku palca powiązane z identyfikatorem „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Ta czynność usuwa zapisane na tablecie obrazy i model odcisku palca powiązane z identyfikatorem „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Ta czynność usuwa zapisane na urządzeniu obrazy i model odcisku palca powiązane z identyfikatorem „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”"</string>
diff --git a/res-product/values-pt-rBR/strings.xml b/res-product/values-pt-rBR/strings.xml
index 6f4c0f3..f5cecc7 100644
--- a/res-product/values-pt-rBR/strings.xml
+++ b/res-product/values-pt-rBR/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Você precisa usar um PIN para poder configurar o Desbloqueio facial.\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Você precisa usar um padrão para poder configurar o Desbloqueio facial.\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Você precisa usar uma senha para poder configurar o Desbloqueio facial.\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu smartphone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu dispositivo"</string>
@@ -310,7 +310,7 @@
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Seu smartphone desativará os dados móveis quando o limite especificado for atingido.\n\nComo o uso de dados é calculado pelo seu smartphone, e sua operadora pode entender o uso de forma diferente, defina um limite moderado."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Para compartilhar seu dispositivo, adicione novos usuários. Cada usuário tem um espaço pessoal no dispositivo para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Para compartilhar seu tablet, adicione novos usuários. Cada usuário tem um espaço pessoal no tablet para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Para compartilhar seu smartphone, adicione novos usuários. Cada usuário tem um espaço pessoal no smartphone para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Para compartilhar seu smartphone, adicione outros usuários. Cada pessoa vai ter um espaço separado e pode personalizar a tela inicial, conta, configurações, apps e muito mais."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
<string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Você perderá seu espaço e seus dados no tablet. Não é possível desfazer esta ação."</string>
diff --git a/res-product/values-pt-rPT/strings.xml b/res-product/values-pt-rPT/strings.xml
index 4c9f391..75795e0 100644
--- a/res-product/values-pt-rPT/strings.xml
+++ b/res-product/values-pt-rPT/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"É necessário um PIN para configurar o Desbloqueio facial.\n\nUm PIN protege o telemóvel em caso de perda ou roubo."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"É necessário um padrão para configurar o Desbloqueio facial.\n\nUm padrão protege o telemóvel em caso de perda ou roubo."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"É necessária uma palavra-passe para configurar o Desbloqueio facial.\n\nUma palavra-passe protege o telemóvel em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o telemóvel em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o telemóvel em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o telemóvel em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"É necessário um PIN para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm PIN protege o telemóvel em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"É necessário um padrão para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUm padrão protege o telemóvel em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"É necessária uma palavra-passe para configurar o Desbloqueio facial e o Desbloqueio por impressão digital.\n\nUma palavra-passe protege o telemóvel em caso de perda ou roubo."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Esta ação elimina as imagens da impressão digital e o modelo associado ao \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no telemóvel"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Esta ação elimina as imagens da impressão digital e o modelo associado ao \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Esta ação elimina as imagens da impressão digital e o modelo associado ao \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no dispositivo"</string>
diff --git a/res-product/values-pt/strings.xml b/res-product/values-pt/strings.xml
index 6f4c0f3..f5cecc7 100644
--- a/res-product/values-pt/strings.xml
+++ b/res-product/values-pt/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Você precisa usar um PIN para poder configurar o Desbloqueio facial.\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Você precisa usar um padrão para poder configurar o Desbloqueio facial.\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Você precisa usar uma senha para poder configurar o Desbloqueio facial.\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o tablet em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o dispositivo em caso de perda ou roubo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Você precisa usar um PIN para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Você precisa usar um padrão para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Você precisa usar uma senha para poder configurar o Desbloqueio facial e por impressão digital.\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o tablet em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o dispositivo em caso de perda ou roubo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Você precisa usar um PIN para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um PIN protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Você precisa usar um padrão para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de um padrão protege o smartphone em caso de perda ou roubo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Você precisa usar uma senha para poder configurar o \"Desbloqueio por impressão digital\" e o \"Desbloqueio facial\".\n\nO uso de uma senha protege o smartphone em caso de perda ou roubo."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu smartphone"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Essa ação exclui as imagens e o modelo de impressão digital associados a \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" que estão armazenados no seu dispositivo"</string>
@@ -310,7 +310,7 @@
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Seu smartphone desativará os dados móveis quando o limite especificado for atingido.\n\nComo o uso de dados é calculado pelo seu smartphone, e sua operadora pode entender o uso de forma diferente, defina um limite moderado."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Para compartilhar seu dispositivo, adicione novos usuários. Cada usuário tem um espaço pessoal no dispositivo para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Para compartilhar seu tablet, adicione novos usuários. Cada usuário tem um espaço pessoal no tablet para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Para compartilhar seu smartphone, adicione novos usuários. Cada usuário tem um espaço pessoal no smartphone para telas iniciais personalizadas, contas, apps, configurações e muito mais."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Para compartilhar seu smartphone, adicione outros usuários. Cada pessoa vai ter um espaço separado e pode personalizar a tela inicial, conta, configurações, apps e muito mais."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
<string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Você perderá seu espaço e seus dados no tablet. Não é possível desfazer esta ação."</string>
diff --git a/res-product/values-ro/strings.xml b/res-product/values-ro/strings.xml
index 0b5d920..597f058 100644
--- a/res-product/values-ro/strings.xml
+++ b/res-product/values-ro/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Pentru a configura Deblocarea facială, este necesar un PIN.\n\nPIN-ul îți protejează telefonul dacă este pierdut sau furat."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Pentru a configura Deblocarea facială, este necesar un model.\n\nModelul îți protejează telefonul dacă este pierdut sau furat."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Pentru a configura Deblocarea facială, este necesară o parolă.\n\nParola îți protejează telefonul dacă este pierdut sau furat."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un PIN.\n\nPIN-ul îți protejează tableta dacă este pierdută sau furată."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un model.\n\nModelul îți protejează tableta dacă este pierdută sau furată."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesară o parolă.\n\nParola îți protejează tableta dacă este pierdută sau furată."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un PIN.\n\nPIN-ul îți protejează dispozitivul dacă este pierdut sau furat."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un model.\n\nModelul îți protejează dispozitivul dacă este pierdut sau furat."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesară o parolă.\n\nParola îți protejează dispozitivul dacă este pierdut sau furat."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un PIN.\n\nPIN-ul îți protejează telefonul dacă este pierdut sau furat."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesar un model.\n\nModelul îți protejează telefonul dacă este pierdut sau furat."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Pentru a configura Deblocarea facială și Deblocarea cu amprenta, este necesară o parolă.\n\nParola îți protejează telefonul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un PIN.\n\nPIN-ul îți protejează tableta dacă este pierdută sau furată."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un model.\n\nModelul îți protejează tableta dacă este pierdută sau furată."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesară o parolă.\n\nParola îți protejează tableta dacă este pierdută sau furată."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un PIN.\n\nPIN-ul îți protejează dispozitivul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un model.\n\nModelul îți protejează dispozitivul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesară o parolă.\n\nParola îți protejează dispozitivul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un PIN.\n\nPIN-ul îți protejează telefonul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesar un model.\n\nModelul îți protejează telefonul dacă este pierdut sau furat."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Pentru a configura Deblocarea cu amprenta și Deblocarea facială, este necesară o parolă.\n\nParola îți protejează telefonul dacă este pierdut sau furat."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Astfel, imaginile amprentelor și modelul de amprentă asociate cu <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> stocate pe telefon vor fi șterse"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Astfel, imaginile amprentelor și modelul de amprentă asociate cu <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> stocate pe tabletă vor fi șterse"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Astfel, imaginile amprentelor și modelul de amprentă asociate cu <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> stocate pe acest dispozitiv vor fi șterse"</string>
diff --git a/res-product/values-ru/strings.xml b/res-product/values-ru/strings.xml
index f6d3ebb..cc7f255 100644
--- a/res-product/values-ru/strings.xml
+++ b/res-product/values-ru/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Чтобы настроить фейсконтроль, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи телефона."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Чтобы настроить фейсконтроль, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи телефона."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Чтобы настроить фейсконтроль, нужен пароль.\n\nОн защитит данные в случае потери или кражи телефона."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи планшета."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи планшета."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи планшета."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи устройства."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи устройства."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи устройства."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи телефона."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи телефона."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи телефона."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи планшета."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи планшета."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи планшета."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи устройства."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи устройства."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи устройства."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен PIN-код.\n\nОн защитит данные в случае потери или кражи телефона."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен графический ключ.\n\nОн защитит данные в случае потери или кражи телефона."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Чтобы настроить фейсконтроль и разблокировку по отпечатку пальца, нужен пароль.\n\nОн защитит данные в случае потери или кражи телефона."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Изображения и модель отпечатка \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" будут удалены с телефона."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Изображения и модель отпечатка \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" будут удалены с планшета"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Изображения и модель отпечатка \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" будут удалены с устройства"</string>
diff --git a/res-product/values-si/strings.xml b/res-product/values-si/strings.xml
index e766758..97177f1 100644
--- a/res-product/values-si/strings.xml
+++ b/res-product/values-si/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"මුහුණෙන් අගුළු හැරීම පිහිටුවීමට PIN එකක් අවශ්යයි.\n\nPIN එකක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"මුහුණෙන් අගුළු හැරීම පිහිටුවීමට රටාවක් අවශ්යයි.\n\nරටාවක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට PIN එකක් අවශ්යයි.\n\nPIN එකක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට රටාවක් අවශ්යයි.\n\nරටාවක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට PIN එකක් අවශ්යයි.\n\nPIN එකක් උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට රටාවක් අවශ්යයි.\n\nරටාවක් උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් උපාංගය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට PIN එකක් අවශ්යයි.\n\nPIN එකක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට රටාවක් අවශ්යයි.\n\nරටාවක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"මුහුණෙන් අගුළු හැරීම සහ ඇඟිලි සලකුණු අගුලු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කළහොත් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nPIN එකක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nරටාවක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් ටැබ්ලටය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nPIN එකක් උපාංගය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nරටාවක් උපාංගය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් උපාංගය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nPIN එකක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nරටාවක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ඇඟිලි සලකුණු අගුළු හැරීම සහ මුහුණෙන් අගුළු හැරීම පිහිටුවීමට මුරපදයක් අවශ්යයි.\n\nමුරපදයක් දුරකථනය නැති වුවහොත් හෝ සොරකම් කර ඇත්නම් එය ආරක්ෂා කරයි."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"මෙය ඔබේ දුරකථනයෙහි ගබඩා වී ඇති ඇඟිලි සලකුණු රූප සහ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' සමග ආශ්රිත ආකෘතිය මකයි"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"මෙය ඔබේ ටැබ්ලටයෙහි ගබඩා වී ඇති ඇඟිලි සලකුණු රූප සහ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' සමග ආශ්රිත ආකෘතිය මකයි"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"මෙය ඔබගේ උපාංගයෙහි ගබඩා වී ඇති ඇඟිලි සලකුණු රූප සහ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' හා ආශ්රිත මාදිලි මකයි"</string>
diff --git a/res-product/values-sk/strings.xml b/res-product/values-sk/strings.xml
index 8cf56de..2ccac36 100644
--- a/res-product/values-sk/strings.xml
+++ b/res-product/values-sk/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Na nastavenie odomknutia tvárou sa vyžaduje PIN.\n\nPIN chráni telefón v prípade jeho straty alebo odcudzenia."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Na nastavenie odomknutia tvárou sa vyžaduje vzor.\n\nVzor chráni telefón v prípade jeho straty alebo odcudzenia."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Na nastavenie odomknutia tvárou sa vyžaduje heslo.\n\nHeslo chráni telefón v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje PIN.\n\nPIN chráni tablet v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje vzor.\n\nVzor chráni tablet v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje heslo.\n\nHeslo chráni tablet v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje PIN.\n\nPIN chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje vzor.\n\nVzor chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje heslo.\n\nHeslo chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje PIN.\n\nPIN chráni telefón v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje vzor.\n\nVzor chráni telefón v prípade jeho straty alebo odcudzenia."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Na nastavenie odomknutia tvárou a odtlačkom prsta sa vyžaduje heslo.\n\nHeslo chráni telefón v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje PIN.\n\nPIN chráni tablet v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje vzor.\n\nVzor chráni tablet v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje heslo.\n\nHeslo chráni tablet v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje PIN.\n\nPIN chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje vzor.\n\nVzor chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Na nastavenie odomknutia odtlačkom prsta a tvárou sa vyžaduje heslo.\n\nHeslo chráni zariadenie v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje PIN.\n\nPIN chráni telefón v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje vzor.\n\nVzor chráni telefón v prípade jeho straty alebo odcudzenia."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Na nastavenie odomknutia odtlačkom prsta alebo tvárou sa vyžaduje heslo.\n\nHeslo chráni telefón v prípade jeho straty alebo odcudzenia."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Týmto odstránite snímky a model odtlačku prsta „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, ktoré sú uložené vo vašom telefóne."</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Týmto odstránite snímky a model odtlačku prsta „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, ktoré sú uložené vo vašom tablete"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Týmto odstránite snímky a model odtlačku prsta „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“, ktoré sú uložené vo vašom zariadení"</string>
diff --git a/res-product/values-sl/strings.xml b/res-product/values-sl/strings.xml
index 248e278..2cc05fd 100644
--- a/res-product/values-sl/strings.xml
+++ b/res-product/values-sl/strings.xml
@@ -52,7 +52,7 @@
<string name="security_settings_face_enroll_introduction_message" product="default" msgid="847716059867943459">"Uporabljajte obraz za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije."</string>
<string name="security_settings_face_enroll_introduction_message" product="tablet" msgid="3976493376026067375">"Uporabljajte obraz za odklepanje tabličnega računalnika, odobritev nakupov ali prijavo v aplikacije."</string>
<string name="security_settings_face_enroll_introduction_message" product="device" msgid="6432265830098806034">"Uporabljajte obraz za odklepanje naprave, odobritev nakupov ali prijavo v aplikacije."</string>
- <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"Z obrazom odklepajte telefon ali preverjajte pristnost v aplikacijah, na primer ob prijavi v aplikacije ali za odobritev nakupa"</string>
+ <string name="security_settings_face_enroll_introduction_message_class3" product="default" msgid="8492576130109033451">"Z obrazom odklenite telefon ali preverite pristnost v aplikacijah, na primer ob prijavi v aplikacije ali za odobritev nakupa."</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="tablet" msgid="8736497842795690098">"Z obrazom odklepajte tablični računalnik ali preverjajte pristnost v aplikacijah, na primer ob prijavi v aplikacije ali za odobritev nakupa"</string>
<string name="security_settings_face_enroll_introduction_message_class3" product="device" msgid="2558057312718921078">"Z obrazom odklepajte napravo ali preverjajte pristnost v aplikacijah, na primer ob prijavi v aplikacije ali za odobritev nakupa"</string>
<string name="security_settings_face_enroll_introduction_consent_message_0" product="default" msgid="9086377203303858619">"Otroku dovolite odklepanje telefona z obrazom."</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Za nastavitev odklepanja z obrazom je potrebna koda PIN.\n\nKoda PIN ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Za nastavitev odklepanja z obrazom je potreben vzorec.\n\nVzorec ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Za nastavitev odklepanja z obrazom je potrebno geslo.\n\nGeslo ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebna koda PIN.\n\nKoda PIN ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potreben vzorec.\n\nVzorec ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebno geslo.\n\nGeslo ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebna koda PIN.\n\nKoda PIN ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potreben vzorec.\n\nVzorec ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebno geslo.\n\nGeslo ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebna koda PIN.\n\nKoda PIN ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potreben vzorec.\n\nVzorec ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Za nastavitev odklepanja z obrazom in prstnim odtisom je potrebno geslo.\n\nGeslo ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebna koda PIN.\n\nKoda PIN ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potreben vzorec.\n\nVzorec ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebno geslo.\n\nGeslo ščiti tablični računalnik, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebna koda PIN.\n\nKoda PIN ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potreben vzorec.\n\nVzorec ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebno geslo.\n\nGeslo ščiti napravo, če jo izgubite ali vam jo ukradejo."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebna koda PIN.\n\nKoda PIN ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potreben vzorec.\n\nVzorec ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Za nastavitev odklepanja s prstnim odtisom in odklepanja z obrazom je potrebno geslo.\n\nGeslo ščiti telefon, če ga izgubite ali vam ga ukradejo."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"S tem boste izbrisali v telefonu shranjene slike in model prstnega odtisa, povezane z odtisom »<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>«"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"S tem boste izbrisali v tabličnem računalniku shranjene slike in model prstnega odtisa, povezane z odtisom »<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>«"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"S tem boste izbrisali v napravi shranjene slike in model prstnega odtisa, povezan z odtisom »<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>«"</string>
diff --git a/res-product/values-sq/strings.xml b/res-product/values-sq/strings.xml
index 216751f..3f44329 100644
--- a/res-product/values-sq/strings.xml
+++ b/res-product/values-sq/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me fytyrë\".\n\nKodi PIN e mbron telefonin nëse të humbet apo ta vjedhin."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me fytyrë\".\n\nMotivi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me fytyrë\".\n\nFjalëkalimi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nKodi PIN e mbron tabletin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nMotivi e mbron tabletin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nFjalëkalimi e mbron tabletin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nKodi PIN e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nMotivi e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nFjalëkalimi e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nKodi PIN e mbron telefonin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nMotivi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me fytyrë\" dhe \"Shkyçjen me gjurmën e gishtit\".\n\nFjalëkalimi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nKodi PIN e mbron tabletin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nMotivi e mbron tabletin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nFjalëkalimi e mbron tabletin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nKodi PIN e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nMotivi e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nFjalëkalimi e mbron pajisjen nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Kërkohet një kod PIN për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nKodi PIN e mbron telefonin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Kërkohet një motiv për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nMotivi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Kërkohet një fjalëkalim për të konfiguruar \"Shkyçjen me gjurmën e gishtit\" dhe \"Shkyçjen me fytyrë\".\n\nFjalëkalimi e mbron telefonin nëse të humbet apo ta vjedhin."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Kjo fshin imazhet e gjurmës së gishtit dhe modelin e lidhur me \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" që ruhen në telefonin tënd"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Kjo fshin imazhet e gjurmës së gishtit dhe modelin e lidhur me \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" që ruhen në tabletin tënd"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Kjo fshin imazhet e gjurmës së gishtit dhe modelin e lidhur me \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" që ruhen në pajisjen tënde"</string>
diff --git a/res-product/values-sr/strings.xml b/res-product/values-sr/strings.xml
index ffd40f1..5b78557 100644
--- a/res-product/values-sr/strings.xml
+++ b/res-product/values-sr/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"За подешавање откључавања лицем неопходан је PIN.\n\nPIN штити телефон ако га изгубите или га неко украде."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"За подешавање откључавања лицем неопходан је шаблон.\n\nШаблон штити телефон ако га изгубите или га неко украде."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"За подешавање откључавања лицем неопходна је лозинка.\n\nЛозинка штити телефон ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"За подешавање откључавања лицем и отиском прста неопходан је PIN.\n\nPIN штити таблет ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"За подешавање откључавања лицем и отиском прста неопходан је шаблон.\n\nШаблон штити таблет ако га изгубите или га неко украде."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"За подешавање откључавања лицем и отиском прста неопходна је лозинка.\n\nЛозинка штити таблет ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"За подешавање откључавања лицем и отиском прста неопходан је PIN.\n\nPIN штити уређај ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"За подешавање откључавања лицем и отиском прста неопходан је шаблон.\n\nШаблон штити уређај ако га изгубите или га неко украде."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"За подешавање откључавања лицем и отиском прста неопходна је лозинка.\n\nЛозинка штити уређај ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"За подешавање откључавања лицем и отиском прста неопходан је PIN.\n\nPIN штити телефон ако га изгубите или га неко украде."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"За подешавање откључавања лицем и отиском прста неопходан је шаблон.\n\nШаблон штити телефон ако га изгубите или га неко украде."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"За подешавање откључавања лицем и отиском прста неопходна је лозинка.\n\nЛозинка штити телефон ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"За подешавање откључавања отиском прста и откључавања лицем неопходан је PIN.\n\nPIN штити таблет ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"За подешавање откључавања отиском прста и откључавања лицем неопходан је шаблон.\n\nШаблон штити таблет ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"За подешавање откључавања отиском прста и откључавања лицем неопходна је лозинка.\n\nЛозинка штити таблет ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"За подешавање откључавања отиском прста и откључавања лицем неопходан је PIN.\n\nPIN штити уређај ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"За подешавање откључавања отиском прста и откључавања лицем неопходан је шаблон.\n\nШаблон штити уређај ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"За подешавање откључавања отиском прста и откључавања лицем неопходна је лозинка.\n\nЛозинка штити уређај ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"За подешавање откључавања отиском прста и откључавања лицем неопходан је PIN.\n\nPIN штити телефон ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"За подешавање откључавања отиском прста и откључавања лицем неопходан је шаблон.\n\nШаблон штити телефон ако га изгубите или га неко украде."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"За подешавање откључавања отиском прста и откључавања лицем неопходна је лозинка.\n\nЛозинка штити телефон ако га изгубите или га неко украде."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Овим се бришу слике и модел отиска прста у вези са отиском <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> који су сачувани на телефону"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Овим се бришу слике и модел отиска прста у вези са отиском <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> који су сачувани на таблету"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Овим се бришу слике и модел отиска прста у вези са отиском <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> који су сачувани на уређају"</string>
diff --git a/res-product/values-sv/strings.xml b/res-product/values-sv/strings.xml
index e112315..fb0f3ef 100644
--- a/res-product/values-sv/strings.xml
+++ b/res-product/values-sv/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Det krävs en pinkod för att konfigurera ansiktslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Det krävs ett mönster för att konfigurera ansiktslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Det krävs ett lösenord för att konfigurera ansiktslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar surfplattan om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar surfplattan om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar enheten om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar enheten om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Det krävs en pinkod för att konfigurera ansiktslås och fingeravtryckslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Det krävs ett mönster för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Det krävs ett lösenord för att konfigurera ansiktslås och fingeravtryckslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Det krävs en pinkod för att ställa in fingeravtryckslås och ansiktslås.\n\nEn pinkod skyddar surfplattan om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Det krävs ett mönster för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt mönster skyddar surfplattan om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Det krävs ett lösenord för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt lösenord skyddar surfplattan om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Det krävs en pinkod för att ställa in fingeravtryckslås och ansiktslås.\n\nEn pinkod skyddar enheten om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Det krävs ett mönster för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt mönster skyddar enheten om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Det krävs ett lösenord för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt lösenord skyddar enheten om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Det krävs en pinkod för att ställa in fingeravtryckslås och ansiktslås.\n\nEn pinkod skyddar telefonen om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Det krävs ett mönster för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt mönster skyddar telefonen om den kommer bort eller blir stulen."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Det krävs ett lösenord för att ställa in fingeravtryckslås och ansiktslås.\n\nEtt lösenord skyddar telefonen om den kommer bort eller blir stulen."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Om du gör detta raderas fingeravtrycksbilderna och fingeravtrycksmodellen som har kopplats till <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> och lagras på telefonen"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Om du gör detta raderas fingeravtrycksbilderna och fingeravtrycksmodellen som har kopplats till <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> och lagras på surfplattan"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Om du gör detta raderas fingeravtrycksbilderna och fingeravtrycksmodellen som har kopplats till <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> och lagras på enheten"</string>
diff --git a/res-product/values-sw/strings.xml b/res-product/values-sw/strings.xml
index dbf833e..0f689de 100644
--- a/res-product/values-sw/strings.xml
+++ b/res-product/values-sw/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"PIN inahitajika ili kuweka mipangilio ya Kufungua kwa uso.\n\nPIN hulinda simu ikipotea au ikiibwa."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Mchoro unahitajika ili kuweka mipangilio ya Kufungua kwa uso.\n\nMchoro hulinda simu ikipotea au ikiibwa."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Nenosiri linahitajika ili kuweka mipangilio ya Kufungua kwa uso.\n\nNenosiri hulinda simu ikipotea au ikiibwa."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"PIN inahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nPIN hulinda kompyuta kibao ikipotea au ikiibwa."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Mchoro unahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nMchoro hulinda kompyuta kibao ikipotea au ikiibwa."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Nenosiri linahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nNenosiri hulinda kompyuta kibao ikipotea au ikiibwa."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"PIN inahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nPIN hulinda kifaa kikipotea au kikiibwa."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Mchoro unahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nMchoro hulinda kifaa kikipotea au kikiibwa."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Nenosiri linahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nNenosiri hulinda kifaa kikipotea au kikiibwa."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"PIN inahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nPIN hulinda simu ikipotea au ikiibwa."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Mchoro unahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nMchoro hulinda simu ikipotea au ikiibwa."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Nenosiri linahitajika ili kuweka mipangilio ya Kufungua kwa uso na Kufungua kwa alama ya kidole.\n\nNenosiri hulinda simu ikipotea au ikiibwa."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"PIN inatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nPIN hulinda kishikwambi kikipotea au kikiibwa."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Mchoro unatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nMchoro hulinda kishikwambi kikipotea au kikiibwa."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Nenosiri linatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nNenosiri hulinda kishikwambi kikipotea au kikiibwa."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"PIN inatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nPIN hulinda kifaa kikipotea au kikiibwa."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Mchoro unatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nMchoro hulinda kifaa kikipotea au kikiibwa."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Nenosiri linatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nNenosiri hulinda kifaa kikipotea au kikiibwa."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"PIN inatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nPIN hulinda simu ikipotea au ikiibwa."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Mchoro unatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nMchoro hulinda simu ikipotea au ikiibwa."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Nenosiri linatakikana ili kuweka mipangilio ya Kufungua kwa Alama ya Kidole na Kufungua kwa Uso.\n\nNenosiri hulinda simu ikipotea au ikiibwa."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Hatua hii hufuta miundo na picha za alama ya kidole zinazohusiana na \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' zilizohifadhiwa kwenye simu yako"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Hatua hii hufuta miundo na picha za alama za kidole zinazohusiana na \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' zilizohifadhiwa kwenye kishikwambi chako"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Hatua hii hufuta miundo na picha za alama za kidole zinazohusiana na \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' zilizohifadhiwa kwenye kifaa chako"</string>
@@ -310,7 +310,7 @@
<string name="data_usage_limit_dialog_mobile" product="default" msgid="4552449053646826676">"Simu yako itazima data ya mtandao wa simu pindi itakapofikia kikomo cha matumizi ya data ulichoweka. \n\nKwa kuwa simu yako ndiyo huwa inapima matumizi ya data, na kampuni inayokupa huduma za mtandao huenda ikahesabu matumizi kwa njia tofauti, unashauriwa kuweka kikomo cha wastani."</string>
<string name="user_settings_footer_text" product="device" msgid="8543171604218174424">"Shiriki kifaa chako kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye kifaa chako kwa ajili ya Skrini ya kwanza, akaunti, programu, mipangilio na vipengee vingine maalum."</string>
<string name="user_settings_footer_text" product="tablet" msgid="4749331578207116797">"Shiriki kompyuta yako kibao kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye kompyuta yako kibao kwa ajili ya Skrini ya kwanza, akaunti, programu, mipangilio na vipengee vingine maalum"</string>
- <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Shiriki simu yako kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye simu yako ya kuweka Skrini ya Kwanza, akaunti, programu, mipangilio na vipengee vingine maalum kwake."</string>
+ <string name="user_settings_footer_text" product="default" msgid="5440172971747221370">"Tumia simu yako na wengine kwa kuongeza watumiaji wapya. Kila mtumiaji ana nafasi ya binafsi kwenye simu yako ya kuweka Skrini ya Kwanza, akaunti, programu, mipangilio na vipengee vingine maalum kwake."</string>
<string name="user_cannot_manage_message" product="tablet" msgid="5566619500245432179">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
<string name="user_cannot_manage_message" product="default" msgid="8596259161937605316">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
<string name="user_confirm_remove_self_message" product="tablet" msgid="6880861846664267876">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
diff --git a/res-product/values-ta/strings.xml b/res-product/values-ta/strings.xml
index 0f10934..33dd0f8 100644
--- a/res-product/values-ta/strings.xml
+++ b/res-product/values-ta/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"முகம் காட்டித் திறத்தல் அம்சத்தை அமைக்க \'பின்\' தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவை \'பின்\' பாதுகாக்கும்."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"முகம் காட்டித் திறத்தல் அம்சத்தை அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"முகம் காட்டித் திறத்தல் அம்சத்தை அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க \'பின்\' தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவை \'பின்\' பாதுகாக்கும்."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க \'பின்\' தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவை \'பின்\' பாதுகாக்கும்."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க \'பின்\' தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவை \'பின்\' பாதுகாக்கும்."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"முகம் காட்டித் திறத்தல் அம்சத்தையும் கைரேகை அன்லாக் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பின் (PIN) தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பின் (PIN) பாதுகாக்கும்."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் டேப்லெட் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பின் (PIN) தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பின் (PIN) பாதுகாக்கும்."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் சாதனம் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பின் (PIN) தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பின் (PIN) பாதுகாக்கும்."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க பேட்டர்ன் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைப் பேட்டர்ன் பாதுகாக்கும்."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"கைரேகை அன்லாக் அம்சத்தையும் முகம் காட்டித் திறத்தல் அம்சத்தையும் அமைக்க கடவுச்சொல் தேவை.\n\nஉங்கள் மொபைல் தொலைந்துபோனாலோ திருடுபோனாலோ அதிலுள்ள தரவைக் கடவுச்சொல் பாதுகாக்கும்."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"உங்கள் மொபைலில் சேமிக்கப்பட்டுள்ள, \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' உடன் தொடர்புடைய கைரேகைப் படங்களையும் பதிவையும் இது நீக்கும்"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"உங்கள் டேப்லெட்டில் சேமிக்கப்பட்டுள்ள, \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' உடன் தொடர்புடைய கைரேகைப் படங்களையும் பதிவுவையும் இது நீக்கும்"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"இந்தச் சாதனத்தில் சேமித்து வைக்கப்பட்டிருக்கும் \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' உடன் தொடர்புடைய கைரேகைப் படங்களையும் பதிவுகளையும் இது நீக்கிவிடும்"</string>
diff --git a/res-product/values-te/strings.xml b/res-product/values-te/strings.xml
index cb66d2e..3486980 100644
--- a/res-product/values-te/strings.xml
+++ b/res-product/values-te/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ఫేస్ అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని PIN రక్షిస్తుంది."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ఫేస్ అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని ఆకృతి రక్షిస్తుంది."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ఫేస్ అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని పాస్వర్డ్ రక్షిస్తుంది."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nటాబ్లెట్ పోయినా లేదా దొంగిలించబడినా దాన్ని PIN రక్షిస్తుంది."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nటాబ్లెట్ పోయినా లేదా దొంగిలించబడినా దాన్ని ఆకృతి రక్షిస్తుంది."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nటాబ్లెట్ పోయినా లేదా దొంగిలించబడినా దాన్ని పాస్వర్డ్ రక్షిస్తుంది."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nపరికరం పోయినా లేదా దొంగిలించబడినా దాన్ని PIN రక్షిస్తుంది."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nపరికరం పోయినా లేదా దొంగిలించబడినా దాన్ని ఆకృతి రక్షిస్తుంది."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్లను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nపరికరం పోయినా లేదా దొంగిలించబడినా, పాస్వర్డ్ దాన్ని రక్షిస్తుంది."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని PIN రక్షిస్తుంది."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని ఆకృతి రక్షిస్తుంది."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ఫేస్ అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nఫోన్ పోయినా లేదా దొంగిలించబడినా దాన్ని పాస్వర్డ్ రక్షిస్తుంది."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nటాబ్లెట్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, PIN దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nటాబ్లెట్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, ఆకృతి దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"వేలిముద్ర అన్లాక్, వేలిముద్ర అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nటాబ్లెట్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, పాస్వర్డ్ దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nపరికరాన్ని పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, PIN దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nపరికరాన్ని పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, ఆకృతి దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nపరికరాన్ని పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, పాస్వర్డ్ దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి PIN అవసరం.\n\nఫోన్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, PIN దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి ఆకృతి అవసరం.\n\nఫోన్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, ఆకృతి దానిని రక్షిస్తుంది."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"వేలిముద్ర అన్లాక్, ఫేస్ అన్లాక్ను సెటప్ చేయడానికి పాస్వర్డ్ అవసరం.\n\nఫోన్ను పోగొట్టుకున్నా లేదా ఎవరైనా దానిని దొంగిలించినా, పాస్వర్డ్ దానిని రక్షిస్తుంది."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"ఇది మీ ఫోన్లో స్టోర్ చేయబడిన \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'తో అనుబంధించబడిన వేలిముద్ర ఇమేజ్లను, మోడల్ను తొలగిస్తుంది"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"ఇది మీ టాబ్లెట్లో స్టోర్ చేయబడిన \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'తో అనుబంధించబడిన వేలిముద్ర ఇమేజ్లను, మోడల్ను తొలగిస్తుంది"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"ఇది మీ పరికరంలో స్టోర్ చేయబడిన \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\'తో అనుబంధించబడిన వేలిముద్ర ఇమేజ్లను, మోడల్ను తొలగిస్తుంది"</string>
diff --git a/res-product/values-th/strings.xml b/res-product/values-th/strings.xml
index 0655b5d..7578091 100644
--- a/res-product/values-th/strings.xml
+++ b/res-product/values-th/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยใบหน้า\n\nPIN จะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยใบหน้า\n\nรูปแบบจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยใบหน้า\n\nรหัสผ่านจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nPIN จะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรูปแบบจะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรหัสผ่านจะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nPIN จะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรูปแบบจะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรหัสผ่านจะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nPIN จะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรูปแบบจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยใบหน้าและลายนิ้วมือ\n\nรหัสผ่านจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nPIN จะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรูปแบบจะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรหัสผ่านจะช่วยปกป้องแท็บเล็ตในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nPIN จะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรูปแบบจะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรหัสผ่านจะช่วยปกป้องอุปกรณ์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"ต้องมี PIN เพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nPIN จะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"ต้องมีรูปแบบเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรูปแบบจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"ต้องมีรหัสผ่านเพื่อตั้งค่าการปลดล็อกด้วยลายนิ้วมือและการปลดล็อกด้วยใบหน้า\n\nรหัสผ่านจะช่วยปกป้องโทรศัพท์ในกรณีที่สูญหายหรือถูกขโมย"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"การดำเนินการนี้จะลบรูปภาพและรูปแบบลายนิ้วมือที่เชื่อมโยงกับ \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ซึ่งจัดเก็บในโทรศัพท์ของคุณ"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"การดำเนินการนี้จะลบรูปภาพและรูปแบบลายนิ้วมือที่เชื่อมโยงกับ \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ซึ่งจัดเก็บในแท็บเล็ตของคุณ"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"การดำเนินการนี้จะลบรูปภาพและรูปแบบลายนิ้วมือที่เชื่อมโยงกับ \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ซึ่งจัดเก็บในอุปกรณ์ของคุณ"</string>
diff --git a/res-product/values-tl/strings.xml b/res-product/values-tl/strings.xml
index 565cc51..af56959 100644
--- a/res-product/values-tl/strings.xml
+++ b/res-product/values-tl/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng PIN ang telepono kung mawala o manakaw ito."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng pattern ang telepono kung mawala o manakaw ito."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng password ang telepono kung mawala o manakaw ito."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng PIN ang tablet kung mawala o manakaw ito."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng pattern ang tablet kung mawala o manakaw ito."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng password ang tablet kung mawala o manakaw ito."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng PIN ang device kung mawala o manakaw ito."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng pattern ang device kung mawala o manakaw ito."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng password ang device kung mawala o manakaw ito."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng PIN ang telepono kung mawala o manakaw ito."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng pattern ang telepono kung mawala o manakaw ito."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Mukha at Pag-unlock Gamit ang Fingerprint.\n\nPinoprotektahan ng password ang telepono kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng PIN ang tablet kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng pattern ang tablet kung mawala o manakaw ito."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng password ang tablet kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng PIN ang device kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng pattern ang device kung mawala o manakaw ito."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng password ang device kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Kinakailangan ang PIN para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng PIN ang telepono kung mawala o manakaw ito."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Kinakailangan ang pattern para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng pattern ang telepono kung mawala o manakaw ito."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Kinakailangan ang password para ma-set up ang Pag-unlock Gamit ang Fingerprint at Pag-unlock Gamit ang Mukha.\n\nPinoprotektahan ng password ang telepono kung mawala o manakaw ito."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Dine-delete nito ang mga larawan at modelo ng fingerprint na nauugnay sa \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' na naka-store sa iyong telepono"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Dine-delete nito ang mga larawan at modelo ng fingerprint na nauugnay sa \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' na naka-store sa iyong tablet"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Dine-delete nito ang mga larawan at modelo ng fingerprint na nauugnay sa \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' na naka-store sa iyong device"</string>
diff --git a/res-product/values-tr/strings.xml b/res-product/values-tr/strings.xml
index 843e330..986d173 100644
--- a/res-product/values-tr/strings.xml
+++ b/res-product/values-tr/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Yüz Tanıma Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde telefonu korur."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Yüz Tanıma Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde telefonu korur."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Yüz Tanıma Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde telefonu korur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde tableti korur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde tableti korur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde tableti korur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde cihazı korur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde cihazı korur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde cihazı korur."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde telefonu korur."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde telefonu korur."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Yüz Tanıma Kilidi ve Parmak İzi Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde telefonu korur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde tableti korur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde tableti korur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde tableti korur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde cihazı korur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde cihazı korur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde cihazı korur."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için PIN gereklidir.\n\nPIN, kaybolması veya çalınması halinde telefonu korur."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için desen gereklidir.\n\nDesen, kaybolması veya çalınması halinde telefonu korur."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Parmak İzi Kilidi ve Yüz Tanıma Kilidi kurulumu için şifre gereklidir.\n\nŞifre, kaybolması veya çalınması halinde telefonu korur."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Bu işlem, telefonunuzda saklanan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ile ilişkilendirilmiş parmak izi resimlerini ve modeli siler"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Bu işlem, tabletinizde saklanan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ile ilişkilendirilmiş parmak izi resimlerini ve modeli siler"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Bu işlem, cihazınızda saklanan \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" ile ilişkilendirilmiş parma izi resimlerini ve modeli siler"</string>
diff --git a/res-product/values-uk/strings.xml b/res-product/values-uk/strings.xml
index 1fbb698..e664519 100644
--- a/res-product/values-uk/strings.xml
+++ b/res-product/values-uk/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Щоб налаштувати фейс-контроль, потрібен PIN-код.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Щоб налаштувати фейс-контроль, потрібен ключ.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Щоб налаштувати фейс-контроль, потрібен пароль.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен PIN-код.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен ключ.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен пароль.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен PIN-код.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен ключ.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен пароль.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен PIN-код.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен ключ.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Щоб налаштувати фейс-контроль або розблокування відбитком пальця, потрібен пароль.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен PIN-код.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен ключ.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен пароль.\n\nВін захищає планшет у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен PIN-код.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен ключ.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен пароль.\n\nВін захищає пристрій у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен PIN-код.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен ключ.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Щоб налаштувати розблокування відбитком пальця або фейс-контроль, потрібен пароль.\n\nВін захищає телефон у разі його втрати чи викрадення."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Буде видалено зображення й модель відбитка пальця \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", що зберігаються на вашому телефоні"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Буде видалено зображення й модель відбитка пальця \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", що зберігаються на вашому планшеті"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Буде видалено зображення й модель відбитка пальця \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\", що зберігаються на вашому пристрої"</string>
diff --git a/res-product/values-ur/strings.xml b/res-product/values-ur/strings.xml
index 7b413ad..a63da6f 100644
--- a/res-product/values-ur/strings.xml
+++ b/res-product/values-ur/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"فیس اَنلاک سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"فیس اَنلاک سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"فیس اَنلاک سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"فیس اَنلاک اور فنگر پرنٹ اَنلاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ ٹیبلیٹ کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"فنگر پرنٹ ان لاک اور فیس ان لاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"فیس اَنلاک اور فنگر پرنٹ اَن لاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ آلے کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے PIN درکار ہوتا ہے۔\n\nPIN فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"فنگر پرنٹ ان لاک اور فیس اَنلاک کو سیٹ اپ کرنے کے لیے پیٹرن درکار ہوتا ہے۔\n\nپیٹرن فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"فنگر پرنٹ ان لاک اور فیس اَن لاک کو سیٹ اپ کرنے کے لیے پاس ورڈ درکار ہوتا ہے۔\n\nپاس ورڈ فون کے گم یا چوری ہونے پر اس کی حفاظت کرتا ہے۔"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"اس سے آپ کے فون پر اسٹور کردہ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' سے وابستہ فنگر پرنٹ کی تصاویر اور ماڈل حذف ہو جائیں گے"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"اس سے آپ کے ٹیبلیٹ پر اسٹور کردہ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' سے وابستہ فنگر پرنٹ کی تصاویر اور ماڈل حذف ہو جائیں گے"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"اس سے آپ کے آلے پر اسٹور کردہ \'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' سے وابستہ فنگر پرنٹ کی تصاویر اور ماڈل حذف ہو جائیں گے"</string>
diff --git a/res-product/values-uz/strings.xml b/res-product/values-uz/strings.xml
index 70f4c8b..430886b 100644
--- a/res-product/values-uz/strings.xml
+++ b/res-product/values-uz/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Yuz bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Yuz bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Yuz bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Yuz va barmoq izi bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nPlanshet yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nQurilma yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun PIN kod belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, PIN kod undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun grafik kalit belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, grafik kalit undagi maʼlumotlarni himoyalaydi."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Barmoq izi va yuz bilan ochish funksiyalarini sozlash uchun parol belgilanishi zarur.\n\nTelefon yoʻqolib qolsa yoki oʻgʻirlansa, parol undagi maʼlumotlarni himoyalaydi."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Bunda telefoningizga saqlangan “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” barmoq iziga oid tasvir va modellar oʻchirib tashlanadi"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Bunda planshetingizga saqlangan “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” barmoq iziga oid tasvir va modellar oʻchirib tashlanadi"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Bunda qurilmangizga saqlangan “<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>” barmoq iziga oid tasvir va modellar oʻchirib tashlanadi"</string>
diff --git a/res-product/values-vi/strings.xml b/res-product/values-vi/strings.xml
index e47a4e0..6d24645 100644
--- a/res-product/values-vi/strings.xml
+++ b/res-product/values-vi/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Bạn cần phải nhập mã PIN để thiết lập tính năng Mở khóa bằng khuôn mặt.\n\nMã PIN giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Bạn cần phải nhập hình mở khóa để thiết lập tính năng Mở khóa bằng khuôn mặt.\n\nHình mở khóa giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Bạn cần phải nhập mật khẩu để thiết lập tính năng Mở khóa bằng khuôn mặt.\n\nMật khẩu giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Bạn cần phải nhập mã PIN để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMã PIN giúp bảo vệ máy tính bảng trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Bạn cần phải nhập hình mở khóa để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nHình mở khóa giúp bảo vệ máy tính bảng trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Bạn cần phải nhập mật khẩu để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMật khẩu giúp bảo vệ máy tính bảng trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Bạn cần phải nhập mã PIN để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMã PIN giúp bảo vệ thiết bị trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Bạn cần phải nhập hình mở khóa để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nHình mở khóa giúp bảo vệ thiết bị trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Bạn cần phải nhập mật khẩu để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMật khẩu giúp bảo vệ thiết bị trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Bạn cần phải nhập mã PIN để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMã PIN giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Bạn cần phải nhập hình mở khóa để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nHình mở khóa giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Bạn cần phải nhập mật khẩu để thiết lập tính năng Mở khóa bằng khuôn mặt và Mở khóa bằng vân tay.\n\nMật khẩu giúp bảo vệ điện thoại trong trường hợp bị mất hoặc bị đánh cắp."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Bạn cần phải nhập mã PIN để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMã PIN giúp bảo vệ máy tính bảng trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Bạn cần phải nhập hình mở khoá để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nHình mở khoá giúp bảo vệ máy tính bảng trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Bạn cần phải nhập mật khẩu để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMật khẩu giúp bảo vệ máy tính bảng trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Bạn cần phải nhập mã PIN để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMã PIN giúp bảo vệ thiết bị trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Bạn cần phải nhập hình mở khoá để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nHình mở khoá giúp bảo vệ thiết bị trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Bạn cần phải nhập mật khẩu để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMật khẩu giúp bảo vệ thiết bị trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Bạn cần phải nhập mã PIN để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMã PIN giúp bảo vệ điện thoại trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Bạn cần phải nhập hình mở khoá để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nHình mở khoá giúp bảo vệ điện thoại trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Bạn cần phải nhập mật khẩu để thiết lập các tính năng Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt.\n\nMật khẩu giúp bảo vệ điện thoại trong trường hợp bị thất lạc hoặc bị mất cắp."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Thao tác này sẽ xoá các hình ảnh và mẫu vân tay liên kết với \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" được lưu trữ trên điện thoại của bạn"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Thao tác này sẽ xoá các hình ảnh và mẫu vân tay liên kết với \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" được lưu trữ trên máy tính bảng của bạn"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Thao tác này sẽ xoá các hình ảnh và mẫu vân tay liên kết với \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\" được lưu trữ trên thiết bị của bạn"</string>
diff --git a/res-product/values-zh-rCN/strings.xml b/res-product/values-zh-rCN/strings.xml
index e37febd..f83cc07 100644
--- a/res-product/values-zh-rCN/strings.xml
+++ b/res-product/values-zh-rCN/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"必须设置 PIN 码，才能设置人脸解锁。\n\n手机丢失或被盗时，PIN 码可为其提供保护。"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"必须设置解锁图案，才能设置人脸解锁。\n\n手机丢失或被盗时，解锁图案可为其提供保护。"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"必须设置密码，才能设置人脸解锁。\n\n手机丢失或被盗时，密码可为其提供保护。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"必须设置 PIN 码，才能设置人脸解锁和指纹解锁。\n\n平板电脑丢失或被盗时，PIN 码可为其提供保护。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"必须设置解锁图案，才能设置人脸解锁和指纹解锁。\n\n平板电脑丢失或被盗时，解锁图案可为其提供保护。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"必须设置密码，才能设置人脸解锁和指纹解锁。\n\n平板电脑丢失或被盗时，密码可为其提供保护。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"必须设置 PIN 码，才能设置人脸解锁和指纹解锁。\n\n设备丢失或被盗时，PIN 码可为其提供保护。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"必须设置解锁图案，才能设置人脸解锁和指纹解锁。\n\n设备丢失或被盗时，解锁图案可为其提供保护。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"必须设置密码，才能设置人脸解锁和指纹解锁。\n\n设备丢失或被盗时，密码可为其提供保护。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"必须设置 PIN 码，才能设置人脸解锁和指纹解锁。\n\n手机丢失或被盗时，PIN 码可为其提供保护。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"必须设置解锁图案，才能设置人脸解锁和指纹解锁。\n\n手机丢失或被盗时，解锁图案可为其提供保护。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"必须设置密码，才能设置人脸解锁和指纹解锁。\n\n手机丢失或被盗时，密码可为其提供保护。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"必须设置 PIN 码，才能设置指纹解锁和人脸解锁。\n\n平板电脑丢失或被盗时，PIN 码可为其提供保护。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"必须设置解锁图案，才能设置指纹解锁和人脸解锁。\n\n平板电脑丢失或被盗时，解锁图案可为其提供保护。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"必须设置密码，才能设置指纹解锁和人脸解锁。\n\n平板电脑丢失或被盗时，密码可为其提供保护。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"必须设置 PIN 码，才能设置指纹解锁和人脸解锁。\n\n设备丢失或被盗时，PIN 码可为其提供保护。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"必须设置解锁图案，才能设置指纹解锁和人脸解锁。\n\n设备丢失或被盗时，解锁图案可为其提供保护。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"必须设置密码，才能设置指纹解锁和人脸解锁。\n\n设备丢失或被盗时，密码可为其提供保护。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"必须设置 PIN 码，才能设置指纹解锁和人脸解锁。\n\n手机丢失或被盗时，PIN 码可为其提供保护。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"必须设置解锁图案，才能设置指纹解锁和人脸解锁。\n\n手机丢失或被盗时，解锁图案可为其提供保护。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"必须设置密码，才能设置指纹解锁和人脸解锁。\n\n手机丢失或被盗时，密码可为其提供保护。"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"确认删除后，手机上存储的与“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”关联的指纹图像和模型将被删除"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"确认删除后，平板电脑上存储的与“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”关联的指纹图像和模型将被删除"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"确认删除后，设备上存储的与“<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>”关联的指纹图像和模型将被删除"</string>
diff --git a/res-product/values-zh-rHK/strings.xml b/res-product/values-zh-rHK/strings.xml
index 82941ca..be82269 100644
--- a/res-product/values-zh-rHK/strings.xml
+++ b/res-product/values-zh-rHK/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"你必須先設定 PIN，才能設定「面孔解鎖」。\n\n手機遺失或被盜時，PIN 可保護手機中的資料。"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"你必須先設定圖案，才能設定「面孔解鎖」。\n\n手機遺失或被盜時，圖案可保護手機中的資料。"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"你必須先設定密碼，才能設定「面孔解鎖」。\n\n手機遺失或被盜時，密碼可保護手機中的資料。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"你必須先設定 PIN，才能設定「面孔解鎖」和「指紋解鎖」。\n\n平板電腦遺失或被盜時，PIN 可保護平板電腦中的資料。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"你必須先設定圖案，才能設定「面孔解鎖」和「指紋解鎖」。\n\n平板電腦遺失或被盜時，圖案可保護平板電腦中的資料。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"你必須先設定密碼，才能設定「面孔解鎖」和「指紋解鎖」。\n\n平板電腦遺失或被盜時，密碼可保護平板電腦中的資料。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"你必須先設定 PIN，才能設定「面孔解鎖」和「指紋解鎖」。\n\n裝置遺失或被盜時，PIN 可保護裝置中的資料。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"你必須先設定圖案，才能設定「面孔解鎖」和「指紋解鎖」。\n\n裝置遺失或被盜時，圖案可保護裝置中的資料。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"你必須先設定密碼，才能設定「面孔解鎖」和「指紋解鎖」。\n\n裝置遺失或被盜時，密碼可保護裝置中的資料。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"你必須先設定 PIN，才能設定「面孔解鎖」和「指紋解鎖」。\n\n手機遺失或被盜時，PIN 可保護手機中的資料。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"你必須先設定圖案，才能設定「面孔解鎖」和「指紋解鎖」。\n\n手機遺失或被盜時，圖案可保護手機中的資料。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"你必須先設定密碼，才能設定「面孔解鎖」和「指紋解鎖」。\n\n手機遺失或被盜時，密碼可保護手機中的資料。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"你需要先設定 PIN，才能設定「指紋解鎖」和「面孔解鎖」。\n\n平板電腦遺失或被盜時，PIN 可保護平板電腦中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"你需要先設定圖案，才能設定「指紋解鎖」和「面孔解鎖」。\n\n平板電腦遺失或被盜時，圖案可保護平板電腦中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"你需要先設定密碼，才能設定「指紋解鎖」和「面孔解鎖」。\n\n平板電腦遺失或被盜時，密碼可保護平板電腦中的資料。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"你需要先設定 PIN，才能設定「指紋解鎖」和「面孔解鎖」。\n\n裝置遺失或被盜時，PIN 可保護裝置中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"你需要先設定圖案，才能設定「指紋解鎖」和「面孔解鎖」。\n\n裝置遺失或被盜時，圖案可保護裝置中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"你需要先設定密碼，才能設定「指紋解鎖」和「面孔解鎖」。\n\n裝置遺失或被盜時，密碼可保護裝置中的資料。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"你需要先設定 PIN，才能設定「指紋解鎖」和「面孔解鎖」。\n\n手機遺失或被盜時，PIN 可保護手機中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"你需要先設定圖案，才能設定「指紋解鎖」和「面孔解鎖」。\n\n手機遺失或被盜時，圖案可保護手機中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"你需要先設定密碼，才能設定「指紋解鎖」和「面孔解鎖」。\n\n手機遺失或被盜時，密碼可保護手機中的資料。"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"此操作會刪除與手機上儲存的「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」相關聯的指紋圖像和模型"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"此操作會刪除與平板電腦上儲存的「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」相關聯的指紋圖像和模型"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"此操作會刪除與裝置上儲存的「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」相關聯的指紋圖像和模型"</string>
diff --git a/res-product/values-zh-rTW/strings.xml b/res-product/values-zh-rTW/strings.xml
index 85d560e..c010c88 100644
--- a/res-product/values-zh-rTW/strings.xml
+++ b/res-product/values-zh-rTW/strings.xml
@@ -94,16 +94,16 @@
<string name="security_settings_face_enroll_introduction_control_consent_message" product="default" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="tablet" msgid="6983939010814873996"></string>
<string name="security_settings_face_enroll_introduction_control_consent_message" product="device" msgid="6983939010814873996"></string>
- <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"你可以使用臉孔解鎖手機或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
+ <string name="security_settings_face_settings_footer" product="default" msgid="3036403896485044957">"你可以使用臉孔解鎖手機或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n看著手機時，可能會意外解鎖手機。\n\n如果有人將手機對著你的臉，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
<string name="security_settings_face_settings_footer" product="tablet" msgid="3467711032275909082">"你可以使用臉孔解鎖平板電腦或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著平板電腦，就可能會讓平板電腦意外解鎖。\n\n如果有人將平板電腦對著你的臉，平板電腦可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的平板電腦。"</string>
<string name="security_settings_face_settings_footer" product="device" msgid="6237815625247917310">"你可以使用臉孔解鎖裝置或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著裝置，就可能會讓裝置意外解鎖。\n\n如果有人將裝置對著你的臉，裝置可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的裝置。"</string>
- <string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"你可以使用臉孔解鎖手機或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉 (無論是否睜開雙眼)，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
+ <string name="security_settings_face_settings_footer_attention_not_supported" product="default" msgid="8266896471278294942">"你可以使用臉孔解鎖手機或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n看著手機時，可能會意外解鎖手機。\n\n如果有人將手機對著你的臉 (無論是否睜開雙眼)，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="tablet" msgid="6932278790700490818">"你可以使用臉孔解鎖平板電腦或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著平板電腦，就可能會讓平板電腦意外解鎖。\n\n如果有人將平板電腦對著你的臉 (無論是否睜開雙眼)，平板電腦可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的平板電腦。"</string>
<string name="security_settings_face_settings_footer_attention_not_supported" product="device" msgid="2559602951942339212">"你可以使用臉孔解鎖裝置或在應用程式中驗證身分，以便執行特定操作，例如登入或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著裝置，就可能會讓裝置意外解鎖。\n\n如果有人將裝置對著你的臉 (無論是否睜開雙眼)，裝置可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的裝置。"</string>
- <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"你可以使用臉孔解鎖手機或驗證身分，方便你登入應用程式、核准購物交易或其他用途。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
+ <string name="security_settings_face_settings_footer_class3" product="default" msgid="7050076350282827484">"你可以使用臉孔解鎖手機或驗證身分，方便你登入應用程式、核准購物交易或其他用途。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n看著手機時，可能會意外解鎖手機。\n\n如果有人將手機對著你的臉，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
<string name="security_settings_face_settings_footer_class3" product="tablet" msgid="8013245173915280810">"你可以使用臉孔解鎖平板電腦或驗證身分，以便執行特定操作，例如登入應用程式或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著平板電腦，就可能會讓平板電腦意外解鎖。\n\n如果有人將平板電腦對著你的臉，平板電腦可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的平板電腦。"</string>
<string name="security_settings_face_settings_footer_class3" product="device" msgid="4411845832787210264">"你可以使用臉孔解鎖裝置或驗證身分，以便執行特定操作，例如登入應用程式或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著裝置，就可能會讓裝置意外解鎖。\n\n如果有人將裝置對著你的臉，裝置可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的裝置。"</string>
- <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"你可以使用臉孔解鎖手機或驗證身分，方便你登入應用程式、核准購物交易或其他用途。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉 (無論是否睜開雙眼)，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
+ <string name="security_settings_face_settings_footer_class3_attention_not_supported" product="default" msgid="5512898803063743303">"你可以使用臉孔解鎖手機或驗證身分，方便你登入應用程式、核准購物交易或其他用途。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n看著手機時，可能會意外解鎖手機。\n\n如果有人將手機對著你的臉 (無論是否睜開雙眼)，手機可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="tablet" msgid="6790505667764631343">"你可以使用臉孔解鎖平板電腦或驗證身分，以便執行特定操作，例如登入應用程式或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著平板電腦，就可能會讓平板電腦意外解鎖。\n\n如果有人將平板電腦對著你的臉 (無論是否睜開雙眼)，平板電腦可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的平板電腦。"</string>
<string name="security_settings_face_settings_footer_class3_attention_not_supported" product="device" msgid="7858917821957779752">"你可以使用臉孔解鎖裝置或驗證身分，以便執行特定操作，例如登入應用程式或核准購買交易。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著裝置，就可能會讓裝置意外解鎖。\n\n如果有人將裝置對著你的臉 (無論是否睜開雙眼)，裝置可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的裝置。"</string>
<string name="security_settings_fingerprint_enroll_introduction_v3_message" msgid="2145273491174234191">"你可以用指紋解鎖「<xliff:g id="DEVICENAME">%s</xliff:g>」或驗證身分，輕鬆登入應用程式、核准購物交易或執行其他操作"</string>
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"你必須先設定 PIN 碼，才能設定人臉解鎖功能。\n\n手機遺失或遭竊時，PIN 碼可以保護手機。"</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"你必須先設定解鎖圖案，才能設定人臉解鎖功能。\n\n手機遺失或遭竊時，解鎖圖案可以保護手機。"</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"你必須先設定密碼，才能設定人臉解鎖功能。\n\n手機遺失或遭竊時，密碼可以保護手機。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"你必須先設定 PIN 碼，才能設定人臉解鎖和指紋解鎖功能。\n\n平板電腦遺失或遭竊時，PIN 碼可以保護平板電腦。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"你必須先設定解鎖圖案，才能設定人臉解鎖和指紋解鎖功能。\n\n平板電腦遺失或遭竊時，解鎖圖案可以保護平板電腦。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"你必須先設定密碼，才能設定人臉解鎖和指紋解鎖功能。\n\n平板電腦遺失或遭竊時，密碼可以保護平板電腦。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"你必須先設定 PIN 碼，才能設定人臉解鎖和指紋解鎖功能。\n\n裝置遺失或遭竊時，PIN 碼可以保護裝置。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"你必須先設定解鎖圖案，才能設定人臉解鎖和指紋解鎖功能。\n\n裝置遺失或遭竊時，解鎖圖案可以保護裝置。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"你必須先設定密碼，才能設定人臉解鎖和指紋解鎖功能。\n\n裝置遺失或遭竊時，密碼可以保護裝置。"</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"你必須先設定 PIN 碼，才能設定人臉解鎖和指紋解鎖功能。\n\n手機遺失或遭竊時，PIN 碼可以保護手機。"</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"你必須先設定解鎖圖案，才能設定人臉解鎖和指紋解鎖功能。\n\n手機遺失或遭竊時，解鎖圖案可以保護手機。"</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"你必須先設定密碼，才能設定人臉解鎖和指紋解鎖功能。\n\n手機遺失或遭竊時，密碼可以保護手機。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"必須先設定 PIN 碼，才能設定指紋解鎖和人臉解鎖功能。\n\n平板電腦遺失或遭竊時，PIN 碼可以保護平板電腦中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"必須先設定解鎖圖案，才能設定指紋解鎖和人臉解鎖功能。\n\n平板電腦遺失或遭竊時，解鎖圖案可以保護平板電腦中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"必須先設定密碼，才能設定指紋解鎖和人臉解鎖功能。\n\n平板電腦遺失或遭竊時，密碼可以保護平板電腦中的資料。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"必須先設定 PIN 碼，才能設定指紋解鎖和人臉解鎖功能。\n\n裝置遺失或遭竊時，PIN 碼可以保護裝置中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"必須先設定解鎖圖案，才能設定指紋解鎖和人臉解鎖功能。\n\n裝置遺失或遭竊時，解鎖圖案可以保護裝置中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"必須先設定密碼，才能設定指紋解鎖和人臉解鎖功能。\n\n裝置遺失或遭竊時，密碼可以保護裝置中的資料。"</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"必須先設定 PIN 碼，才能設定指紋解鎖和人臉解鎖功能。\n\n手機遺失或遭竊時，PIN 碼可以保護手機中的資料。"</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"必須先設定解鎖圖案，才能設定指紋解鎖和人臉解鎖功能。\n\n手機遺失或遭竊時，解鎖圖案可以保護手機中的資料。"</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"必須先設定密碼，才能設定指紋解鎖和人臉解鎖功能。\n\n手機遺失或遭竊時，密碼可以保護手機中的資料。"</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"這項操作會刪除手機上儲存的「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」相關指紋圖像和模型"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"如果指紋圖像和模型與平板電腦上儲存的「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」相關聯，系統也將一併刪除"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"系統會一併刪除裝置上與「<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>」連結的指紋圖像和模型"</string>
@@ -226,7 +226,7 @@
<string name="wifi_add_app_networks_summary" product="default" msgid="7014504084783236696">"「<xliff:g id="APPNAME">%1$s</xliff:g>」想在你的手機中新增這些網路"</string>
<string name="wifi_add_app_networks_summary" product="tablet" msgid="6433255556506891439">"「<xliff:g id="APPNAME">%1$s</xliff:g>」想在你的平板電腦中新增這些網路"</string>
<string name="auto_rotate_screen_summary" product="default" msgid="5562937346878935483">"將手機從直向/橫向轉為另一個方向時，系統會自動調整螢幕方向"</string>
- <string name="auto_rotate_screen_summary" product="tablet" msgid="3163709742477804994">"在你以直向或橫向模式使用平板電腦時，自動調整螢幕方向"</string>
+ <string name="auto_rotate_screen_summary" product="tablet" msgid="3163709742477804994">"隨著平板電腦轉為直向或橫向，自動調整螢幕方向"</string>
<string name="sim_lock_on" product="tablet" msgid="227481196121403470">"需要 PIN 才能使用平板電腦"</string>
<string name="sim_lock_on" product="default" msgid="6896034657274595838">"需要輸入 PIN 碼才能使用手機"</string>
<string name="sim_lock_off" product="tablet" msgid="4619320846576958981">"需要 PIN 才能使用平板電腦"</string>
diff --git a/res-product/values-zu/strings.xml b/res-product/values-zu/strings.xml
index 5ead8ab..2d97aa9 100644
--- a/res-product/values-zu/strings.xml
+++ b/res-product/values-zu/strings.xml
@@ -179,15 +179,15 @@
<string name="lock_screen_pin_skip_face_message" product="default" msgid="358903382559327157">"Iphinikhodi iyadingeka ukusetha Ukuvula ngobuso.\n\nIphinikhodi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
<string name="lock_screen_pattern_skip_face_message" product="default" msgid="6400426500859622964">"Iphethini iyadingeka ukusetha Ukuvula ngobuso.\n\nIphethini ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
<string name="lock_screen_password_skip_face_message" product="default" msgid="1555954661782997039">"Iphasiwedi iyadingeka ukusetha Ukuvula ngobuso.\n\nIphasiwedi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="3792419626110520922">"Iphinikhodi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphinikhodi ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="2937217199563914791">"Iphethini iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphethini ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="1988360407507443804">"Iphasiwedi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphasiwedi ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="4423227124669516582">"Iphinikhodi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphinikhodi ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="6409777941433213751">"Iphethini iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphethini ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="7939217127900065677">"Iphasiwedi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphasiwedi ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="2717938545326672010">"Iphinikhodi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphinikhodi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="6067309080610183546">"Iphethini iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphethini ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
- <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="4739690336878613804">"Iphasiwedi iyadingeka ukusetha Ukuvula ngobuso Nokuvula Ngesigxivizo Seminwe.\n\nIphasiwedi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet" msgid="6016574209955764097">"Iphinikhodi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphinikhodi ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet" msgid="5193008948766756870">"Iphethini iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphethini ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet" msgid="2157871617774498976">"Iphasiwedi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphasiwedi ivikela ithebulethi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device" msgid="3023595865822720071">"Iphinikhodi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphinikhodi ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device" msgid="3039110875534893916">"Iphethini iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphethini ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device" msgid="6506194961404887073">"Iphasiwedi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphasiwedi ivikela idivayisi uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default" msgid="6614355211073480369">"Iphinikhodi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphinikhodi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default" msgid="969489650005656159">"Iphethini iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphethini ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default" msgid="2934343185175325368">"Iphasiwedi iyadingeka ukuze usethe Ukuvula ngesigxivizo somunwe kanye Nokuvula Ngobuso.\n\nIphasiwedi ivikela ifoni uma ilahlekile noma intshontshiwe."</string>
<string name="fingerprint_v2_delete_message" product="default" msgid="8723083814238510088">"Lokhu kusula imifanekiso yesigxivizo somunwe nemodeli ehambisana ne-\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' egcinwe kufoni yakho"</string>
<string name="fingerprint_v2_delete_message" product="tablet" msgid="527375244730792698">"Lokhu kusula imifanekiso yesigxivizo somunwe nemodeli ehambisana ne-\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' egcinwe kwithebulethi yakho"</string>
<string name="fingerprint_v2_delete_message" product="device" msgid="4549780655045100171">"Lokhu kusula izithombe zezigxivizo zeminwe nemodeli ehambisana ne-\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' ezigcinwe kwidivayisi yakho"</string>
diff --git a/res-product/values/config.xml b/res-product/values/config.xml
index ba49418..86af614 100755
--- a/res-product/values/config.xml
+++ b/res-product/values/config.xml
@@ -19,9 +19,6 @@
<item name="a11y_timeout_banner" type="raw" product="default">@raw/accessibility_timeout_banner</item>
<item name="a11y_timeout_banner" type="raw" product="tablet">@raw/accessibility_timeout_banner_tablet</item>
- <item name="a11y_shortcut_type_triple_tap" type="raw" product="default">@raw/accessibility_shortcut_type_triple_tap</item>
- <item name="a11y_shortcut_type_triple_tap" type="raw" product="tablet">@raw/accessibility_shortcut_type_triple_tap_tablet</item>
-
<item name="a11y_color_inversion_banner" type="raw" product="default">@raw/accessibility_color_inversion_banner</item>
<item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>
diff --git a/res-product/values/drawables.xml b/res-product/values/drawables.xml
index 68b2115..01fbc32 100644
--- a/res-product/values/drawables.xml
+++ b/res-product/values/drawables.xml
@@ -14,45 +14,9 @@
limitations under the License.
-->
<resources>
- <drawable name="a11y_button_preview_large_floating_menu" product="default">@drawable/accessibility_button_preview_large_floating_menu</drawable>
- <drawable name="a11y_button_preview_large_floating_menu" product="tablet">@drawable/accessibility_button_preview_large_floating_menu_tablet</drawable>
-
- <drawable name="a11y_button_preview_small_floating_menu" product="default">@drawable/accessibility_button_preview_small_floating_menu</drawable>
- <drawable name="a11y_button_preview_small_floating_menu" product="tablet">@drawable/accessibility_button_preview_small_floating_menu_tablet</drawable>
-
- <drawable name="a11y_button_navigation" product="default">@drawable/accessibility_button_navigation</drawable>
- <drawable name="a11y_button_navigation" product="tablet">@drawable/accessibility_button_navigation_tablet</drawable>
-
<drawable name="a11y_captioning_banner" product="default">@drawable/accessibility_captioning_banner</drawable>
<drawable name="a11y_captioning_banner" product="tablet">@drawable/accessibility_captioning_banner_tablet</drawable>
- <drawable name="a11y_shortcut_type_hardware" product="default">@drawable/accessibility_shortcut_type_hardware</drawable>
- <drawable name="a11y_shortcut_type_hardware" product="tablet">@drawable/accessibility_shortcut_type_hardware_tablet</drawable>
-
- <drawable name="a11y_shortcut_type_software" product="default">@drawable/accessibility_shortcut_type_software</drawable>
- <drawable name="a11y_shortcut_type_software" product="tablet">@drawable/accessibility_shortcut_type_software_tablet</drawable>
-
- <drawable name="a11y_shortcut_type_software_floating" product="default">@drawable/accessibility_shortcut_type_software_floating</drawable>
- <drawable name="a11y_shortcut_type_software_floating" product="tablet">@drawable/accessibility_shortcut_type_software_floating_tablet</drawable>
-
- <drawable name="a11y_shortcut_type_software_gesture" product="default">@drawable/accessibility_shortcut_type_software_gesture</drawable>
- <drawable name="a11y_shortcut_type_software_gesture" product="tablet">@drawable/accessibility_shortcut_type_software_gesture_tablet</drawable>
-
- <drawable name="a11y_shortcut_type_software_gesture_talkback" product="default">@drawable/accessibility_shortcut_type_software_gesture_talkback</drawable>
- <drawable name="a11y_shortcut_type_software_gesture_talkback" product="tablet">@drawable/accessibility_shortcut_type_software_gesture_talkback_tablet</drawable>
-
- <drawable name="a11y_gesture_navigation_two_finger_preview" product="default">@drawable/accessibility_gesture_navigation_two_finger_preview</drawable>
- <drawable name="a11y_gesture_navigation_two_finger_preview" product="tablet">@drawable/accessibility_gesture_navigation_two_finger_preview_tablet</drawable>
-
- <drawable name="a11y_gesture_navigation_three_finger_preview" product="default">@drawable/accessibility_gesture_navigation_three_finger_preview</drawable>
- <drawable name="a11y_gesture_navigation_three_finger_preview" product="tablet">@drawable/accessibility_gesture_navigation_three_finger_preview_tablet</drawable>
-
- <drawable name="a11y_button_preview_two_finger" product="default">@drawable/accessibility_button_preview_two_finger</drawable>
- <drawable name="a11y_button_preview_two_finger" product="tablet">@drawable/accessibility_button_preview_two_finger_tablet</drawable>
-
- <drawable name="a11y_button_preview_three_finger" product="default">@drawable/accessibility_button_preview_three_finger</drawable>
- <drawable name="a11y_button_preview_three_finger" product="tablet">@drawable/accessibility_button_preview_three_finger_tablet</drawable>
-
<drawable name="a11y_magnification_mode_fullscreen" product="default">@drawable/accessibility_magnification_mode_fullscreen</drawable>
<drawable name="a11y_magnification_mode_fullscreen" product="tablet">@drawable/accessibility_magnification_mode_fullscreen_tablet</drawable>
diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index 987548a..83963cb 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -338,23 +338,23 @@
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face. (default) [CHAR LIMIT=NONE] -->
<string name="lock_screen_password_skip_face_message" product="default">A password is required to set up Face Unlock.\n\nA password protects the phone if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (tablet) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pin_skip_biometrics_message" product="tablet">A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the tablet if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="tablet">A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the tablet if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (tablet) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pattern_skip_biometrics_message" product="tablet">A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the tablet if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="tablet">A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the tablet if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (tablet) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_password_skip_biometrics_message" product="tablet">A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the tablet if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="tablet">A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the tablet if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (device) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pin_skip_biometrics_message" product="device">A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the device if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="device">A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the device if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (device) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pattern_skip_biometrics_message" product="device">A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the device if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="device">A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the device if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (device) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_password_skip_biometrics_message" product="device">A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the device if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="device">A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the device if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (default) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pin_skip_biometrics_message" product="default">A PIN is required to set up Face Unlock and Fingerprint Unlock.\n\nA PIN protects the phone if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pin_skip_biometrics_message" product="default">A PIN is required to set up Fingerprint Unlock and Face Unlock.\n\nA PIN protects the phone if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (default) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_pattern_skip_biometrics_message" product="default">A pattern is required to set up Face Unlock and Fingerprint Unlock.\n\nA pattern protects the phone if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_pattern_skip_biometrics_message" product="default">A pattern is required to set up Fingerprint Unlock and Face Unlock.\n\nA pattern protects the phone if it\u2019s lost or stolen.</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set up face or fingerprint. (default) [CHAR LIMIT=NONE] -->
- <string name="lock_screen_password_skip_biometrics_message" product="default">A password is required to set up Face Unlock and Fingerprint Unlock.\n\nA password protects the phone if it\u2019s lost or stolen.</string>
+ <string name="lock_screen_password_skip_biometrics_message" product="default">A password is required to set up Fingerprint Unlock and Face Unlock.\n\nA password protects the phone if it\u2019s lost or stolen.</string>
<!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
<string name="fingerprint_v2_delete_message" product="default">This deletes the fingerprint images and model associated with \'<xliff:g id="fingerprint_id" example="Fingerprint 2">%1$s</xliff:g>\' that are stored on your phone</string>
<!-- Message shown in a dialog which asks the user to confirm when a single fingerprint gets deleted. [CHAR LIMIT=NONE]-->
diff --git a/res/color/modes_icon_selectable_background.xml b/res/color/modes_icon_selectable_background.xml
new file mode 100644
index 0000000..f9280c6
--- /dev/null
+++ b/res/color/modes_icon_selectable_background.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ 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.
+ -->
+
+<!-- Color list for the background in each item in the icon picker list. -->
+<selector
+ 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" />
+</selector>
diff --git a/res/color/modes_icon_selectable_icon.xml b/res/color/modes_icon_selectable_icon.xml
new file mode 100644
index 0000000..8a517d5
--- /dev/null
+++ b/res/color/modes_icon_selectable_icon.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ 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.
+ -->
+
+<!-- Color list for the icon in each item in the icon picker list. -->
+<selector
+ 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" />
+</selector>
diff --git a/res/drawable-night/accessibility_button_navigation.xml b/res/drawable-night/accessibility_button_navigation.xml
deleted file mode 100644
index d6fd485..0000000
--- a/res/drawable-night/accessibility_button_navigation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M325.2,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7v-42.2h239V231.9z"
- android:fillColor="#3D4043"/>
- <path
- android:pathData="M269.7,205.2c1.5,0 2.7,1.2 2.7,2.7s-1.2,2.7 -2.7,2.7c-1.5,0 -2.7,-1.2 -2.7,-2.7S268.2,205.2 269.7,205.2zM273.8,214.7v17.6H271v-8.1h-2.7v8.1h-2.7v-17.6c-2.7,-0.2 -5.6,-0.7 -8.1,-1.4l0.7,-2.7c3.5,0.9 7.7,1.4 11.5,1.4c3.8,0 8,-0.4 11.5,-1.4l0.7,2.7C279.4,214 276.5,214.5 273.8,214.7z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M205.7,219.7m-9.4,0a9.4,9.4 0,1 1,18.8 0a9.4,9.4 0,1 1,-18.8 0"
- android:fillColor="#808589"/>
- <path
- android:pathData="M132.1,219.7l16,9.2l0,-18.5z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M269.7,255.3c-19.6,0 -35.6,-16 -35.6,-35.6s16,-35.6 35.6,-35.6s35.6,16 35.6,35.6S289.3,255.3 269.7,255.3zM269.7,187.1c-17.9,0 -32.5,14.6 -32.5,32.5c0,17.9 14.6,32.5 32.5,32.5s32.5,-14.6 32.5,-32.5C302.2,201.7 287.6,187.1 269.7,187.1z"
- android:fillColor="#729CEE"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_navigation_tablet.xml b/res/drawable-night/accessibility_button_navigation_tablet.xml
deleted file mode 100644
index d92b144..0000000
--- a/res/drawable-night/accessibility_button_navigation_tablet.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M28,0L384,0A28,28 0,0 1,412 28L412,272A28,28 0,0 1,384 300L28,300A28,28 0,0 1,0 272L0,28A28,28 0,0 1,28 0z"
- android:fillColor="#000000"/>
- <group>
- <clip-path
- android:pathData="M62.23,50.19L349.77,50.19A16,16 0,0 1,365.77 66.19L365.77,236.14A16,16 0,0 1,349.77 252.14L62.23,252.14A16,16 0,0 1,46.23 236.14L46.23,66.19A16,16 0,0 1,62.23 50.19z"/>
- <path
- android:pathData="M46.23,204.14h320v48h-320z"
- android:fillColor="#3D4043"/>
- <path
- android:pathData="M268.93,214.14C270.43,214.14 271.63,215.34 271.63,216.84C271.63,218.34 270.43,219.54 268.93,219.54C267.43,219.54 266.23,218.34 266.23,216.84C266.23,215.34 267.43,214.14 268.93,214.14ZM273.03,223.64V241.24H270.23V233.14H267.53V241.24H264.83V223.64C262.13,223.44 259.23,222.94 256.73,222.24L257.43,219.54C260.93,220.44 265.13,220.94 268.93,220.94C272.73,220.94 276.93,220.54 280.43,219.54L281.13,222.24C278.63,222.94 275.73,223.44 273.03,223.64Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M206.23,238.04C211.42,238.04 215.63,233.83 215.63,228.64C215.63,223.45 211.42,219.24 206.23,219.24C201.04,219.24 196.83,223.45 196.83,228.64C196.83,233.83 201.04,238.04 206.23,238.04Z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M131.33,228.64L147.33,237.84V219.34L131.33,228.64Z"
- android:fillColor="#808589"/>
- </group>
- <path
- android:pathData="M62.23,51.69L349.77,51.69A14.5,14.5 0,0 1,364.27 66.19L364.27,236.14A14.5,14.5 0,0 1,349.77 250.64L62.23,250.64A14.5,14.5 0,0 1,47.73 236.14L47.73,66.19A14.5,14.5 0,0 1,62.23 51.69z"
- android:strokeWidth="3"
- android:fillColor="#00000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.87 313.92,47.87L322.84,47.87C324.2,47.87 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.87 266.06,47.87L287.85,47.87C289.22,47.87 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M268.93,259.69C251.31,259.69 236.93,245.3 236.93,227.69C236.93,210.07 251.31,195.69 268.93,195.69C286.55,195.69 300.93,210.07 300.93,227.69C300.93,245.3 286.55,259.69 268.93,259.69ZM268.93,198.38C252.84,198.38 239.72,211.51 239.72,227.6C239.72,243.69 252.84,256.81 268.93,256.81C285.02,256.81 298.14,243.69 298.14,227.6C298.14,211.51 285.02,198.38 268.93,198.38Z"
- android:fillColor="#729CEE"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable-night/accessibility_button_preview_large_floating_menu.xml b/res/drawable-night/accessibility_button_preview_large_floating_menu.xml
deleted file mode 100644
index 74ecbfc..0000000
--- a/res/drawable-night/accessibility_button_preview_large_floating_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M325.4,198.2h-40.9c-22.1,0 -40,-18 -40,-40s18,-40 40,-40h40.9v2.6h-40.9c-20.7,0 -37.5,16.8 -37.5,37.5s16.8,37.5 37.5,37.5h40.9V198.2z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M284.3,128.4c-16.5,0 -29.8,13.4 -29.8,29.8c0,16.5 13.4,29.8 29.8,29.8s29.8,-13.4 29.8,-29.8C314.2,141.7 300.9,128.4 284.3,128.4zM284.3,142.7c1.7,0 3.1,1.4 3.1,3.1c0,1.7 -1.4,3.1 -3.1,3.1s-3.1,-1.4 -3.1,-3.1C281.2,144.1 282.7,142.7 284.3,142.7zM289.1,153.7V174H286v-9.4h-3.1v9.4h-3.2v-20.3c-3.1,-0.3 -6.5,-0.8 -9.4,-1.5l0.8,-3.1c4.1,1 8.9,1.5 13.3,1.5s9.2,-0.5 13.3,-1.5l0.8,3.1C295.6,152.9 292.2,153.4 289.1,153.7z"
- android:fillColor="#D9DBDF"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_large_floating_menu_tablet.xml b/res/drawable-night/accessibility_button_preview_large_floating_menu_tablet.xml
deleted file mode 100644
index 426403f..0000000
--- a/res/drawable-night/accessibility_button_preview_large_floating_menu_tablet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M365.76,226.17h-27.68c-14.95,0 -27.07,-12.18 -27.07,-27.07s12.18,-27.07 27.07,-27.07h27.68v1.76h-27.68c-14.01,0 -25.37,11.37 -25.37,25.37s11.37,25.37 25.37,25.37h27.68v1.62Z"
- android:fillColor="#80868b"/>
- <path
- android:pathData="M337.95,178.94c-11.16,0 -20.16,9.07 -20.16,20.16 0,11.16 9.07,20.16 20.16,20.16s20.16,-9.07 20.16,-20.16c0.07,-11.16 -8.93,-20.16 -20.16,-20.16ZM337.95,188.62c1.15,0 2.1,0.95 2.1,2.1 0,1.15 -0.95,2.1 -2.1,2.1s-2.1,-0.95 -2.1,-2.1c0,-1.15 1.02,-2.1 2.1,-2.1ZM341.2,196.06v13.74h-2.1v-6.36h-2.1v6.36h-2.17v-13.74c-2.1,-0.2 -4.4,-0.54 -6.36,-1.01l0.54,-2.1c2.77,0.68 6.02,1.01 9,1.01s6.23,-0.34 9,-1.01l0.54,2.1c-1.96,0.47 -4.26,0.81 -6.36,1.01Z"
- android:fillColor="#d9dbdf"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_small_floating_menu.xml b/res/drawable-night/accessibility_button_preview_small_floating_menu.xml
deleted file mode 100644
index 4226086..0000000
--- a/res/drawable-night/accessibility_button_preview_small_floating_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M325.4,189.2h-31.7c-17.1,0 -31,-13.9 -31,-31s13.9,-31 31,-31h31.7v2h-31.7c-16,0 -29,13 -29,29s13,29 29,29h31.7V189.2z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M293.6,135.1c-12.8,0 -23.1,10.4 -23.1,23.1c0,12.8 10.4,23.1 23.1,23.1s23.1,-10.4 23.1,-23.1C316.7,145.4 306.4,135.1 293.6,135.1zM293.6,146.2c1.3,0 2.4,1.1 2.4,2.4s-1.1,2.4 -2.4,2.4s-2.4,-1.1 -2.4,-2.4S292.3,146.2 293.6,146.2zM297.3,154.7v15.7h-2.4v-7.3h-2.4v7.3H290v-15.7c-2.4,-0.2 -5,-0.6 -7.3,-1.2l0.6,-2.4c3.2,0.8 6.9,1.2 10.3,1.2s7.1,-0.4 10.3,-1.2l0.6,2.4C302.3,154.1 299.7,154.5 297.3,154.7z"
- android:fillColor="#D9DBDF"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_small_floating_menu_tablet.xml b/res/drawable-night/accessibility_button_preview_small_floating_menu_tablet.xml
deleted file mode 100644
index b738d8f..0000000
--- a/res/drawable-night/accessibility_button_preview_small_floating_menu_tablet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M365.88,219.24h-20.7c-5.38,0 -10.43,-2.09 -14.23,-5.9s-5.9,-8.86 -5.9,-14.23c0,-5.38 2.09,-10.43 5.9,-14.24 3.8,-3.8 8.86,-5.9 14.23,-5.9h20.7v1h-20.7c-5.11,0 -9.91,1.99 -13.53,5.6s-5.6,8.42 -5.6,13.53c0,5.11 1.99,9.91 5.6,13.53s8.42,5.6 13.53,5.6h20.7v1Z"
- android:fillColor="#80868b"/>
- <path
- android:pathData="M345.19,184c-2.99,-0 -5.91,0.88 -8.4,2.54 -2.49,1.66 -4.43,4.02 -5.57,6.78s-1.45,5.8 -0.86,8.73c0.58,2.93 2.02,5.63 4.13,7.74 2.11,2.11 4.81,3.55 7.74,4.14 2.93,0.58 5.97,0.29 8.73,-0.86 2.76,-1.14 5.12,-3.08 6.78,-5.57 1.66,-2.49 2.55,-5.41 2.55,-8.4 0,-4.01 -1.59,-7.85 -4.42,-10.68 -2.83,-2.83 -6.67,-4.43 -10.68,-4.43ZM345.19,191.28c0.4,0.03 0.77,0.21 1.04,0.51 0.27,0.29 0.42,0.68 0.42,1.08 0,0.4 -0.15,0.79 -0.42,1.08 -0.27,0.29 -0.64,0.47 -1.04,0.51 -0.22,0.02 -0.44,-0.01 -0.65,-0.08 -0.21,-0.07 -0.4,-0.19 -0.56,-0.33 -0.16,-0.15 -0.29,-0.33 -0.38,-0.53 -0.09,-0.2 -0.13,-0.42 -0.13,-0.64 0,-0.22 0.05,-0.44 0.13,-0.64 0.09,-0.2 0.22,-0.38 0.38,-0.53 0.16,-0.15 0.35,-0.26 0.56,-0.33 0.21,-0.07 0.43,-0.1 0.65,-0.08ZM347.56,196.82v10.29h-1.58v-4.76h-1.59v4.75h-1.58v-10.28c-1.6,-0.12 -3.19,-0.39 -4.75,-0.79l0.4,-1.58c4.42,1.05 9.04,1.05 13.46,0l0.39,1.58c-1.57,0.41 -3.17,0.67 -4.79,0.79h0.04Z"
- android:fillColor="#dadce0"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_three_finger.xml b/res/drawable-night/accessibility_button_preview_three_finger.xml
deleted file mode 100644
index 7afb0f7..0000000
--- a/res/drawable-night/accessibility_button_preview_three_finger.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M242.5,226.9h-73.3c-1.7,0 -3.1,1.4 -3.1,3.1s1.4,3.1 3.1,3.1h73.3c1.7,0 3.1,-1.4 3.1,-3.1S244.2,226.9 242.5,226.9z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M182.7,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C187.6,226.7 185.6,223.8 182.7,222.6z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M209,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C213.9,226.7 211.9,223.8 209,222.6z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M235.2,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C240,226.7 238,223.8 235.2,222.6z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#80868B"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_three_finger_tablet.xml b/res/drawable-night/accessibility_button_preview_three_finger_tablet.xml
deleted file mode 100644
index 5a0925c..0000000
--- a/res/drawable-night/accessibility_button_preview_three_finger_tablet.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M188.7,229.14V217.74H193.6L186.7,205.54L179.8,217.74H184.7V229.14C182.8,229.94 181.5,231.74 181.5,233.94C181.5,236.84 183.8,239.14 186.7,239.14C189.6,239.14 191.9,236.84 191.9,233.94C191.9,231.84 190.5,229.94 188.7,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M208,229.14V217.74H212.9L206,205.54L199.1,217.74H204V229.14C202.1,229.94 200.8,231.74 200.8,233.94C200.8,236.84 203.1,239.14 206,239.14C208.9,239.14 211.2,236.84 211.2,233.94C211.2,231.84 209.9,229.94 208,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M227.29,229.14V217.74H232.2L225.29,205.54L218.4,217.74H223.29V229.14C221.4,229.94 220.1,231.74 220.1,233.94C220.1,236.84 222.4,239.14 225.29,239.14C228.2,239.14 230.49,236.84 230.49,233.94C230.49,231.84 229.2,229.94 227.29,229.14Z"
- android:fillColor="#669DF6"/>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_two_finger.xml b/res/drawable-night/accessibility_button_preview_two_finger.xml
deleted file mode 100644
index 05871d9..0000000
--- a/res/drawable-night/accessibility_button_preview_two_finger.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M242.4,226.9h-9.3h-5.6h-43.4h-4.7h-10.2c-1.7,0 -3.1,1.4 -3.1,3.1s1.4,3.1 3.1,3.1h10.2h3.9h45h4.8h9.3c1.7,0 3.1,-1.4 3.1,-3.1S244.1,226.9 242.4,226.9z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M194,223.5v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-1.6,0.7 -2.9,1.9 -3.8,3.4c-0.7,1.2 -1.1,2.5 -1.1,4c0,0.7 0.1,1.5 0.3,2.2c0.9,3.3 4,5.8 7.7,5.8c3.6,0 6.7,-2.5 7.7,-5.8c0.2,-0.7 0.3,-1.4 0.3,-2.2c0,-1.5 -0.4,-2.8 -1.1,-4C197,225.4 195.6,224.2 194,223.5z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M223.7,223.5v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-1.6,0.7 -2.9,1.9 -3.8,3.4c-0.7,1.2 -1.1,2.5 -1.1,4c0,0.7 0.1,1.5 0.3,2.2c0.9,3.3 4,5.8 7.7,5.8c3.6,0 6.7,-2.5 7.7,-5.8c0.2,-0.7 0.3,-1.4 0.3,-2.2c0,-1.5 -0.4,-2.8 -1.1,-4C226.6,225.4 225.3,224.2 223.7,223.5z"
- android:fillColor="#669DF6"/>
-</vector>
diff --git a/res/drawable-night/accessibility_button_preview_two_finger_tablet.xml b/res/drawable-night/accessibility_button_preview_two_finger_tablet.xml
deleted file mode 100644
index ba9c771..0000000
--- a/res/drawable-night/accessibility_button_preview_two_finger_tablet.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M198.35,229.14V217.74H203.25L196.35,205.54L189.45,217.74H194.35V229.14C192.45,229.94 191.15,231.74 191.15,233.94C191.15,236.84 193.45,239.14 196.35,239.14C199.25,239.14 201.55,236.84 201.55,233.94C201.55,231.84 200.15,229.94 198.35,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M217.65,229.14V217.74H222.55L215.65,205.54L208.75,217.74H213.65V229.14C211.75,229.94 210.45,231.74 210.45,233.94C210.45,236.84 212.75,239.14 215.65,239.14C218.55,239.14 220.85,236.84 220.85,233.94C220.85,231.84 219.55,229.94 217.65,229.14Z"
- android:fillColor="#669DF6"/>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_gesture_navigation_three_finger_preview.xml b/res/drawable-night/accessibility_gesture_navigation_three_finger_preview.xml
deleted file mode 100644
index 593c3af..0000000
--- a/res/drawable-night/accessibility_gesture_navigation_three_finger_preview.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M176.7,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C183.4,212.6 180.4,209.6 176.7,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="176.75"
- android:endY="209.6335"
- android:endX="176.75"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M206,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C212.6,212.6 209.7,209.6 206,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="206.05"
- android:endY="209.6335"
- android:endX="206.05"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M235.3,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H242v-24.6C241.9,212.6 239,209.6 235.3,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="235.35"
- android:endY="209.6335"
- android:endX="235.35"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
-</vector>
diff --git a/res/drawable-night/accessibility_gesture_navigation_three_finger_preview_tablet.xml b/res/drawable-night/accessibility_gesture_navigation_three_finger_preview_tablet.xml
deleted file mode 100644
index 1710fa4..0000000
--- a/res/drawable-night/accessibility_gesture_navigation_three_finger_preview_tablet.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <group>
- <clip-path
- android:pathData="M0,0h412v300h-412z"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M176.84,188.94C173.14,188.94 170.24,191.94 170.24,195.54V220.14H183.54V195.54C183.54,191.94 180.54,188.94 176.84,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="176.89"
- android:startY="220.23"
- android:endX="176.89"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.69" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M206.14,188.94C202.44,188.94 199.54,191.94 199.54,195.54V220.14H212.84V195.54C212.74,191.94 209.84,188.94 206.14,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="206.19"
- android:startY="220.23"
- android:endX="206.19"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.69" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M235.44,188.94C231.74,188.94 228.84,191.94 228.84,195.54V220.14H242.14V195.54C242.04,191.94 239.14,188.94 235.44,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="235.49"
- android:startY="220.23"
- android:endX="235.49"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.69" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_gesture_navigation_two_finger_preview.xml b/res/drawable-night/accessibility_gesture_navigation_two_finger_preview.xml
deleted file mode 100644
index c95523b..0000000
--- a/res/drawable-night/accessibility_gesture_navigation_two_finger_preview.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M188.6,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C195.3,212.6 192.3,209.6 188.6,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="188.65"
- android:endY="209.6335"
- android:endX="188.65"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M223.4,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H230v-24.6C230,212.6 227.1,209.6 223.4,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="223.4"
- android:endY="209.6335"
- android:endX="223.4"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
-</vector>
diff --git a/res/drawable-night/accessibility_gesture_navigation_two_finger_preview_tablet.xml b/res/drawable-night/accessibility_gesture_navigation_two_finger_preview_tablet.xml
deleted file mode 100644
index 7a5cc48..0000000
--- a/res/drawable-night/accessibility_gesture_navigation_two_finger_preview_tablet.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <group>
- <clip-path
- android:pathData="M0,0h412v300h-412z"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M188.15,188.94C184.45,188.94 181.55,191.94 181.55,195.54V220.14H194.85V195.54C194.85,191.94 191.85,188.94 188.15,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="188.2"
- android:startY="220.23"
- android:endX="188.2"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.69" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M222.95,188.94C219.25,188.94 216.35,191.94 216.35,195.54V220.14H229.55V195.54C229.55,191.94 226.65,188.94 222.95,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="222.95"
- android:startY="220.23"
- android:endX="222.95"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.69" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_hardware.xml b/res/drawable-night/accessibility_shortcut_type_hardware.xml
deleted file mode 100644
index 9ef3664..0000000
--- a/res/drawable-night/accessibility_shortcut_type_hardware.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M206.1,19.1c35,0 67.9,13.6 92.6,38.4C323.4,82.1 337,115 337,150s-13.6,67.9 -38.4,92.6C273.9,267.3 241,281 206,281s-67.9,-13.6 -92.6,-38.4C88.8,217.9 75.1,185 75.1,150s13.6,-67.9 38.4,-92.6S171.1,19.1 206.1,19.1M206.1,17.1c-73.4,0 -133,59.5 -133,132.9S132.6,282.9 206,282.9s133,-59.5 133,-132.9S279.5,17.1 206.1,17.1L206.1,17.1z"
- android:fillColor="#3C4043"/>
- <path
- android:pathData="M287,187.8v-1.5h2.9v-13.7c0,-1.6 -1.3,-2.9 -2.9,-2.9v-23.2c1.6,0 2.9,-1.3 2.9,-2.9V132c0,-1.6 -1.3,-2.9 -2.9,-2.9V68.4c0,-8 -6.5,-14.5 -14.5,-14.5H139.4c-8,0 -14.5,6.5 -14.5,14.5v185.3c1,0.7 1.9,1.4 2.9,2.1V68.4c0,-6.4 5.2,-11.6 11.6,-11.6h133.1c6.4,0 11.6,5.2 11.6,11.6v188.7c1,-0.7 1.9,-1.4 2.9,-2.2v-50.5c1.6,0 2.9,-1.3 2.9,-2.9v-13.7H287z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M287,204.4c1.6,0 2.9,-1.3 2.9,-2.9v-14H287v-0.9h2.9v-14c0,-1.6 -1.3,-2.9 -2.9,-2.9"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M825.7,300H469.3c-15.3,0 -27.8,-12.8 -27.8,-28.5v-243C441.5,12.8 454,0 469.3,0h356.5c15.2,0 27.7,12.8 27.7,28.5v243.2C853.5,287.2 841,300 825.7,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M728.5,187.8v-1.5h2.9v-13.7c0,-1.6 -1.3,-2.9 -2.9,-2.9v-23.2c1.6,0 2.9,-1.3 2.9,-2.9V132c0,-1.6 -1.3,-2.9 -2.9,-2.9V68.4c0,-8 -6.5,-14.5 -14.5,-14.5H580.9c-8,0 -14.5,6.5 -14.5,14.5v185.3c1,0.7 1.9,1.4 2.9,2.1V68.4c0,-6.4 5.2,-11.6 11.6,-11.6H714c6.4,0 11.6,5.2 11.6,11.6v188.7c1,-0.7 1.9,-1.4 2.9,-2.2v-50.5c1.6,0 2.9,-1.3 2.9,-2.9v-13.7H728.5z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M728.5,204.4c1.6,0 2.9,-1.3 2.9,-2.9v-14h-2.9v-0.9h2.9v-14c0,-1.6 -1.3,-2.9 -2.9,-2.9"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M648.2,19.1c35,0 67.9,13.6 92.6,38.4c24.7,24.6 38.3,57.5 38.3,92.5s-13.6,67.9 -38.4,92.6C716,267.3 683.1,281 648.1,281s-67.9,-13.6 -92.6,-38.4c-24.6,-24.7 -38.3,-57.6 -38.3,-92.6s13.6,-67.9 38.4,-92.6C580.4,32.7 613.2,19.1 648.2,19.1M648.2,17.1c-73.4,0 -133,59.5 -133,132.9s59.5,132.9 132.9,132.9s133,-59.5 133,-132.9S721.6,17.1 648.2,17.1L648.2,17.1z"
- android:fillColor="#E8EAED"/>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_hardware_tablet.xml b/res/drawable-night/accessibility_shortcut_type_hardware_tablet.xml
deleted file mode 100644
index 1040d05..0000000
--- a/res/drawable-night/accessibility_shortcut_type_hardware_tablet.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<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="M255.38,94.3C255.38,93.14 256.32,92.21 257.47,92.21L275.86,92.21C277.01,92.21 277.95,93.14 277.95,94.3L267.08,95.14L255.38,94.3Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M340.09,110.17L340.09,248.55A14.5,14.5 0,0 1,325.59 263.05L88,263.05A14.5,14.5 0,0 1,73.5 248.55L73.5,110.17A14.5,14.5 0,0 1,88 95.67L325.59,95.67A14.5,14.5 0,0 1,340.09 110.17z"
- android:strokeWidth="3"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M295.77,94.3C295.77,93.14 296.7,92.21 297.86,92.21L305.38,92.21C306.53,92.21 307.46,93.14 307.46,94.3L302.45,95.14L295.77,94.3Z"
- android:fillColor="#80868B"/>
- <group>
- <clip-path
- android:pathData="M274,30L274,30A93,93 0,0 1,367 123L367,123A93,93 0,0 1,274 216L274,216A93,93 0,0 1,181 123L181,123A93,93 0,0 1,274 30z"/>
- <path
- android:pathData="M274,30L274,30A93,93 0,0 1,367 123L367,123A93,93 0,0 1,274 216L274,216A93,93 0,0 1,181 123L181,123A93,93 0,0 1,274 30z"
- android:fillColor="#000000"/>
- <path
- android:pathData="M206.07,85.49C206.07,83.45 207.72,81.79 209.75,81.79L242.17,81.79C244.21,81.79 245.86,83.45 245.86,85.49L226.7,86.97L206.07,85.49Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M345.84,101.25L345.84,369.73A14.25,14.25 0,0 1,331.59 383.98L-111.85,383.98A14.25,14.25 0,0 1,-126.1 369.73L-126.1,101.25A14.25,14.25 0,0 1,-111.85 87L331.59,87A14.25,14.25 0,0 1,345.84 101.25z"
- android:strokeWidth="3.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M266.77,85.49C266.77,83.45 268.42,81.79 270.46,81.79L283.72,81.79C285.75,81.79 287.4,83.45 287.4,85.49L278.56,86.97L266.77,85.49Z"
- android:fillColor="#80868B"/>
- </group>
- <path
- android:strokeWidth="1"
- android:pathData="M274,30.5L274,30.5A92.5,92.5 0,0 1,366.5 123L366.5,123A92.5,92.5 0,0 1,274 215.5L274,215.5A92.5,92.5 0,0 1,181.5 123L181.5,123A92.5,92.5 0,0 1,274 30.5z"
- android:fillColor="#00000000"
- android:strokeColor="#80868B"/>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software.xml b/res/drawable-night/accessibility_shortcut_type_software.xml
deleted file mode 100644
index 8d55ae9..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- 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:pathData="M142,225.3H275.1a14.51,14.51 0,0 0,14.5 -14.5V69a2.9,2.9 0,0 0,2.9 -2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7V210.8a11.61,11.61 0,0 1,-11.6 11.6H142a11.61,11.61 0,0 1,-11.6 -11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1V210.9A14.62,14.62 0,0 0,142 225.3Z"
- android:fillColor="#80868b"/>
- <path
- android:pathData="M286.7,210.83a11.59,11.59 0,0 1,-11.58 11.58H142a11.59,11.59 0,0 1,-11.58 -11.58V183.26H286.7Z"
- android:fillColor="#3c4043"/>
- <path
- android:pathData="M250.41,193.38a1.77,1.77 0,1 1,-1.78 1.77A1.77,1.77 0,0 1,250.41 193.38ZM253.07,199.58v11.53h-1.78v-5.32h-1.77v5.32h-1.77L247.75,199.58a30.78,30.78 0,0 1,-5.32 -0.89l0.44,-1.77a32.34,32.34 0,0 0,15.07 0l0.45,1.77A30.78,30.78 0,0 1,253.07 199.58Z"
- android:fillColor="#fff"/>
- <path
- android:pathData="M208.55,202.84m-6.13,0a6.13,6.13 0,1 1,12.26 0a6.13,6.13 0,1 1,-12.26 0"
- android:fillColor="#80868b"/>
- <path
- android:pathData="M250.41,202.84m-22.28,0a22.28,22.28 0,1 1,44.56 0a22.28,22.28 0,1 1,-44.56 0"
- android:strokeWidth="2"
- android:fillColor="#00000000"
- android:strokeColor="#669df6"/>
- <path
- android:pathData="M160.45,202.84l10.43,6.02l0,-12.05l-10.43,6.03z"
- android:fillColor="#80868b"/>
- <path
- android:pathData="M207.4,19.1a131.11,131.11 0,0 1,131 131,131 131,0 0,1 -262,-0.1 130.94,130.94 0,0 1,131 -130.9m0,-2A132.9,132.9 0,1 0,340.3 150,133 133,0 0,0 207.4,17.1Z"
- android:fillColor="#3c4043"/>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software_floating.xml b/res/drawable-night/accessibility_shortcut_type_software_floating.xml
deleted file mode 100644
index 25d53ca..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_floating.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- 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:pathData="M142,225.3H275.1a14.51,14.51 0,0 0,14.5 -14.5V69a2.9,2.9 0,0 0,2.9 -2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7V210.8a11.61,11.61 0,0 1,-11.6 11.6H142a11.61,11.61 0,0 1,-11.6 -11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1V210.9A14.62,14.62 0,0 0,142 225.3Z"
- android:fillColor="#80868b"/>
- <path
- android:strokeWidth="1"
- android:pathData="M286.7,144.13H266a19.63,19.63 0,1 0,0 39.26H286.7"
- android:fillColor="#00000000"
- android:strokeColor="#80868b"/>
- <path
- android:pathData="M266,148.65a15.11,15.11 0,1 0,15.1 15.11A15.11,15.11 0,0 0,266 148.65ZM266,155.93a1.59,1.59 0,0 1,0 3.17,1.59 1.59,0 1,1 0,-3.17ZM268.37,161.47v10.29h-1.58L266.79,167h-1.59v4.75h-1.58L263.62,161.47a27.23,27.23 0,0 1,-4.75 -0.79l0.4,-1.58a29.06,29.06 0,0 0,13.46 0l0.39,1.58A27.23,27.23 0,0 1,268.33 161.47Z"
- android:fillColor="#dadce0"/>
- <path
- android:pathData="M207.4,19.1a131.11,131.11 0,0 1,131 131,131 131,0 0,1 -262,-0.1 130.94,130.94 0,0 1,131 -130.9m0,-2A132.9,132.9 0,1 0,340.3 150,133 133,0 0,0 207.4,17.1Z"
- android:fillColor="#3c4043"/>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software_floating_tablet.xml b/res/drawable-night/accessibility_shortcut_type_software_floating_tablet.xml
deleted file mode 100644
index c0b562e..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_floating_tablet.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- </group>
- <path
- android:strokeWidth="1"
- android:pathData="M365.64,179.48H344.94C339.74,179.48 334.74,181.54 331.06,185.23C327.38,188.91 325.31,193.9 325.31,199.11C325.31,204.31 327.38,209.3 331.06,212.99C334.74,216.67 339.74,218.74 344.94,218.74H365.64"
- android:fillColor="#00000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M344.95,184C341.96,183.99 339.04,184.88 336.55,186.54C334.06,188.2 332.12,190.56 330.98,193.32C329.83,196.08 329.53,199.12 330.11,202.05C330.7,204.98 332.14,207.67 334.25,209.79C336.36,211.9 339.05,213.34 341.98,213.93C344.92,214.51 347.95,214.21 350.72,213.07C353.48,211.92 355.84,209.99 357.5,207.5C359.16,205.02 360.05,202.1 360.05,199.11C360.05,195.1 358.46,191.26 355.62,188.43C352.79,185.59 348.95,184 344.95,184ZM344.95,191.28C345.35,191.31 345.72,191.49 345.99,191.78C346.26,192.08 346.41,192.46 346.41,192.86C346.41,193.26 346.26,193.65 345.99,193.94C345.72,194.23 345.35,194.41 344.95,194.45C344.73,194.46 344.51,194.43 344.3,194.36C344.09,194.29 343.9,194.18 343.74,194.03C343.58,193.88 343.45,193.7 343.36,193.5C343.28,193.3 343.23,193.08 343.23,192.86C343.23,192.64 343.28,192.43 343.36,192.22C343.45,192.02 343.58,191.84 343.74,191.69C343.9,191.54 344.09,191.43 344.3,191.36C344.51,191.29 344.73,191.26 344.95,191.28ZM347.32,196.82V207.11H345.74V202.35H344.15V207.1H342.57V196.82C340.96,196.69 339.37,196.43 337.82,196.03L338.22,194.45C342.64,195.5 347.25,195.5 351.68,194.45L352.07,196.03C350.5,196.43 348.89,196.7 347.28,196.82H347.32Z"
- android:fillColor="#DADCE0"/>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software_gesture.xml b/res/drawable-night/accessibility_shortcut_type_software_gesture.xml
deleted file mode 100644
index ea19f74..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_gesture.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M139.5,225.3h133.1c8,0 14.5,-6.5 14.5,-14.5V69c1.6,0 2.9,-1.3 2.9,-2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7v166.4c0,6.4 -5.2,11.6 -11.6,11.6H139.5c-6.4,0 -11.6,-5.2 -11.6,-11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1v166.1C125.1,218.8 131.6,225.3 139.5,225.3z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M229.9,207.9h-47.8c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h47.8c1.1,0 2,-0.9 2,-2S231,207.9 229.9,207.9z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M198.4,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2s5.2,-2.3 5.2,-5.2C201.6,208.4 200.2,206.5 198.4,205.7z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M217.7,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2s5.2,-2.3 5.2,-5.2C220.9,208.4 219.6,206.5 217.7,205.7z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M206.1,19.1c35,0 67.9,13.6 92.6,38.4c24.7,24.7 38.4,57.6 38.4,92.6s-13.6,67.9 -38.4,92.6c-24.7,24.7 -57.6,38.4 -92.6,38.4s-67.9,-13.6 -92.6,-38.4C88.8,217.9 75.1,185 75.1,150s13.6,-67.9 38.4,-92.6C138.2,32.7 171.1,19.1 206.1,19.1M206.1,17.1c-73.4,0 -133,59.5 -133,132.9S132.6,282.9 206,282.9S339,223.4 339,150S279.5,17.1 206.1,17.1L206.1,17.1z"
- android:fillColor="#3C4043"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable-night/accessibility_shortcut_type_software_gesture_tablet.xml b/res/drawable-night/accessibility_shortcut_type_software_gesture_tablet.xml
deleted file mode 100644
index 129f13d..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_gesture_tablet.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M198.35,229.14V217.74H203.25L196.35,205.54L189.45,217.74H194.35V229.14C192.45,229.94 191.15,231.74 191.15,233.94C191.15,236.84 193.45,239.14 196.35,239.14C199.25,239.14 201.55,236.84 201.55,233.94C201.55,231.84 200.15,229.94 198.35,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M217.65,229.14V217.74H222.55L215.65,205.54L208.75,217.74H213.65V229.14C211.75,229.94 210.45,231.74 210.45,233.94C210.45,236.84 212.75,239.14 215.65,239.14C218.55,239.14 220.85,236.84 220.85,233.94C220.85,231.84 219.55,229.94 217.65,229.14Z"
- android:fillColor="#669DF6"/>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback.xml b/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback.xml
deleted file mode 100644
index bd9bf19..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"/>
- <path
- android:pathData="M138,225.3h133.1c8,0 14.5,-6.5 14.5,-14.5V69c1.6,0 2.9,-1.3 2.9,-2.9V45.7c-1.9,-1.5 -3.8,-2.9 -5.8,-4.3v169.4c0,6.4 -5.2,11.6 -11.6,11.6H138c-6.4,0 -11.6,-5.2 -11.6,-11.6V43.5c-1,0.7 -1.9,1.5 -2.9,2.2v165C123.5,218.8 130,225.3 138,225.3z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M206,283.9c-73.9,0 -133.9,-60.1 -133.9,-133.9S132.1,16.1 206,16.1c73.9,0 133.9,60.1 133.9,133.9S279.9,283.9 206,283.9zM206,18.1C133.2,18.1 74.1,77.2 74.1,150S133.2,281.9 206,281.9S337.9,222.8 337.9,150S278.8,18.1 206,18.1z"
- android:fillColor="#3C4043"/>
- <path
- android:pathData="M229.9,207.9h-47.8c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h47.8c1.1,0 2,-0.9 2,-2S231,207.9 229.9,207.9z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M190.9,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C194.1,208.4 192.8,206.5 190.9,205.7z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M208,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C211.2,208.4 209.9,206.5 208,205.7z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M225.1,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C228.2,208.4 226.9,206.5 225.1,205.7z"
- android:fillColor="#669DF6"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback_tablet.xml b/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback_tablet.xml
deleted file mode 100644
index d113fff..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_gesture_talkback_tablet.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M188.7,229.14V217.74H193.6L186.7,205.54L179.8,217.74H184.7V229.14C182.8,229.94 181.5,231.74 181.5,233.94C181.5,236.84 183.8,239.14 186.7,239.14C189.6,239.14 191.9,236.84 191.9,233.94C191.9,231.84 190.5,229.94 188.7,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M208,229.14V217.74H212.9L206,205.54L199.1,217.74H204V229.14C202.1,229.94 200.8,231.74 200.8,233.94C200.8,236.84 203.1,239.14 206,239.14C208.9,239.14 211.2,236.84 211.2,233.94C211.2,231.84 209.9,229.94 208,229.14Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M227.29,229.14V217.74H232.2L225.29,205.54L218.4,217.74H223.29V229.14C221.4,229.94 220.1,231.74 220.1,233.94C220.1,236.84 222.4,239.14 225.29,239.14C228.2,239.14 230.49,236.84 230.49,233.94C230.49,231.84 229.2,229.94 227.29,229.14Z"
- android:fillColor="#669DF6"/>
- </group>
-</vector>
diff --git a/res/drawable-night/accessibility_shortcut_type_software_tablet.xml b/res/drawable-night/accessibility_shortcut_type_software_tablet.xml
deleted file mode 100644
index 49a2661..0000000
--- a/res/drawable-night/accessibility_shortcut_type_software_tablet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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="M62.23,50.19L349.77,50.19A16,16 0,0 1,365.77 66.19L365.77,236.14A16,16 0,0 1,349.77 252.14L62.23,252.14A16,16 0,0 1,46.23 236.14L46.23,66.19A16,16 0,0 1,62.23 50.19z"/>
- <path
- android:pathData="M46.23,204.14h320v48h-320z"
- android:fillColor="#3D4043"/>
- <path
- android:pathData="M268.93,214.14C270.43,214.14 271.63,215.34 271.63,216.84C271.63,218.34 270.43,219.54 268.93,219.54C267.43,219.54 266.23,218.34 266.23,216.84C266.23,215.34 267.43,214.14 268.93,214.14ZM273.03,223.64V241.24H270.23V233.14H267.53V241.24H264.83V223.64C262.13,223.44 259.23,222.94 256.73,222.24L257.43,219.54C260.93,220.44 265.13,220.94 268.93,220.94C272.73,220.94 276.93,220.54 280.43,219.54L281.13,222.24C278.63,222.94 275.73,223.44 273.03,223.64Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M206.23,238.04C211.42,238.04 215.63,233.83 215.63,228.64C215.63,223.45 211.42,219.24 206.23,219.24C201.04,219.24 196.83,223.45 196.83,228.64C196.83,233.83 201.04,238.04 206.23,238.04Z"
- android:fillColor="#808589"/>
- <path
- android:pathData="M131.33,228.64L147.33,237.84V219.34L131.33,228.64Z"
- android:fillColor="#808589"/>
- </group>
- <path
- android:pathData="M62.23,51.69L349.77,51.69A14.5,14.5 0,0 1,364.27 66.19L364.27,236.14A14.5,14.5 0,0 1,349.77 250.64L62.23,250.64A14.5,14.5 0,0 1,47.73 236.14L47.73,66.19A14.5,14.5 0,0 1,62.23 51.69z"
- android:strokeWidth="3"
- android:fillColor="#00000000"
- android:strokeColor="#80868B"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.87 313.92,47.87L322.84,47.87C324.2,47.87 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.87 266.06,47.87L287.85,47.87C289.22,47.87 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M268.93,259.69C251.31,259.69 236.93,245.3 236.93,227.69C236.93,210.07 251.31,195.69 268.93,195.69C286.55,195.69 300.93,210.07 300.93,227.69C300.93,245.3 286.55,259.69 268.93,259.69ZM268.93,198.38C252.84,198.38 239.72,211.51 239.72,227.6C239.72,243.69 252.84,256.81 268.93,256.81C285.02,256.81 298.14,243.69 298.14,227.6C298.14,211.51 285.02,198.38 268.93,198.38Z"
- android:fillColor="#729CEE"/>
-</vector>
diff --git a/res/drawable/accessibility_button_navigation.xml b/res/drawable/accessibility_button_navigation.xml
deleted file mode 100644
index 8fdb627..0000000
--- a/res/drawable/accessibility_button_navigation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:fillColor="#FF000000"
- android:pathData="M325.2,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7v-42.2h239V231.9z"/>
- <path
- android:pathData="M269.7,205.2c1.5,0 2.7,1.2 2.7,2.7s-1.2,2.7 -2.7,2.7c-1.5,0 -2.7,-1.2 -2.7,-2.7S268.2,205.2 269.7,205.2zM273.8,214.7v17.6H271v-8.1h-2.7v8.1h-2.7v-17.6c-2.7,-0.2 -5.6,-0.7 -8.1,-1.4l0.7,-2.7c3.5,0.9 7.7,1.4 11.5,1.4c3.8,0 8,-0.4 11.5,-1.4l0.7,2.7C279.4,214 276.5,214.5 273.8,214.7z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M205.7,219.7m-9.4,0a9.4,9.4 0,1 1,18.8 0a9.4,9.4 0,1 1,-18.8 0"
- android:fillColor="#BDC0C4"/>
- <path
- android:pathData="M132.1,219.7l16,9.2l0,-18.5z"
- android:fillColor="#BDC0C4"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M269.7,255.3c-19.6,0 -35.6,-16 -35.6,-35.6s16,-35.6 35.6,-35.6s35.6,16 35.6,35.6S289.3,255.3 269.7,255.3zM269.7,187.1c-17.9,0 -32.5,14.6 -32.5,32.5c0,17.9 14.6,32.5 32.5,32.5s32.5,-14.6 32.5,-32.5C302.2,201.7 287.6,187.1 269.7,187.1z"
- android:fillColor="#3773DF"/>
-</vector>
diff --git a/res/drawable/accessibility_button_navigation_tablet.xml b/res/drawable/accessibility_button_navigation_tablet.xml
deleted file mode 100644
index d8ae503..0000000
--- a/res/drawable/accessibility_button_navigation_tablet.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M28,0L384,0A28,28 0,0 1,412 28L412,272A28,28 0,0 1,384 300L28,300A28,28 0,0 1,0 272L0,28A28,28 0,0 1,28 0z"
- android:fillColor="#ffffff"/>
- <group>
- <clip-path
- android:pathData="M62.23,50.19L349.77,50.19A16,16 0,0 1,365.77 66.19L365.77,236.14A16,16 0,0 1,349.77 252.14L62.23,252.14A16,16 0,0 1,46.23 236.14L46.23,66.19A16,16 0,0 1,62.23 50.19z"/>
- <path
- android:pathData="M46.23,204.14h320v48h-320z"
- android:fillColor="#000000"/>
- <path
- android:pathData="M268.93,214.14C270.43,214.14 271.63,215.34 271.63,216.84C271.63,218.34 270.43,219.54 268.93,219.54C267.43,219.54 266.23,218.34 266.23,216.84C266.23,215.34 267.43,214.14 268.93,214.14ZM273.03,223.64V241.24H270.23V233.14H267.53V241.24H264.83V223.64C262.13,223.44 259.23,222.94 256.73,222.24L257.43,219.54C260.93,220.44 265.13,220.94 268.93,220.94C272.73,220.94 276.93,220.54 280.43,219.54L281.13,222.24C278.63,222.94 275.73,223.44 273.03,223.64Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M206.23,238.04C211.42,238.04 215.63,233.83 215.63,228.64C215.63,223.45 211.42,219.24 206.23,219.24C201.04,219.24 196.83,223.45 196.83,228.64C196.83,233.83 201.04,238.04 206.23,238.04Z"
- android:fillColor="#BDC0C4"/>
- <path
- android:pathData="M131.33,228.64L147.33,237.84V219.34L131.33,228.64Z"
- android:fillColor="#BDC0C4"/>
- </group>
- <path
- android:pathData="M62.23,51.69L349.77,51.69A14.5,14.5 0,0 1,364.27 66.19L364.27,236.14A14.5,14.5 0,0 1,349.77 250.64L62.23,250.64A14.5,14.5 0,0 1,47.73 236.14L47.73,66.19A14.5,14.5 0,0 1,62.23 51.69z"
- android:strokeWidth="3"
- android:fillColor="#00000000"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.87 313.92,47.87L322.84,47.87C324.2,47.87 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.87 266.06,47.87L287.85,47.87C289.22,47.87 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M268.93,259.69C251.31,259.69 236.93,245.3 236.93,227.69C236.93,210.07 251.31,195.69 268.93,195.69C286.55,195.69 300.93,210.07 300.93,227.69C300.93,245.3 286.55,259.69 268.93,259.69ZM268.93,198.38C252.84,198.38 239.72,211.51 239.72,227.6C239.72,243.69 252.84,256.81 268.93,256.81C285.02,256.81 298.14,243.69 298.14,227.6C298.14,211.51 285.02,198.38 268.93,198.38Z"
- android:fillColor="#729CEE"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_large_floating_menu.xml b/res/drawable/accessibility_button_preview_large_floating_menu.xml
deleted file mode 100644
index 794f3ca..0000000
--- a/res/drawable/accessibility_button_preview_large_floating_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M325.4,198.2h-40.9c-22.1,0 -40,-18 -40,-40s18,-40 40,-40h40.9v2.6h-40.9c-20.7,0 -37.5,16.8 -37.5,37.5s16.8,37.5 37.5,37.5h40.9V198.2z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M284.3,128.4c-16.5,0 -29.8,13.4 -29.8,29.8c0,16.5 13.4,29.8 29.8,29.8s29.8,-13.4 29.8,-29.8C314.2,141.7 300.9,128.4 284.3,128.4zM284.3,142.7c1.7,0 3.1,1.4 3.1,3.1c0,1.7 -1.4,3.1 -3.1,3.1s-3.1,-1.4 -3.1,-3.1C281.2,144.1 282.7,142.7 284.3,142.7zM289.1,153.7V174H286v-9.4h-3.1v9.4h-3.2v-20.3c-3.1,-0.3 -6.5,-0.8 -9.4,-1.5l0.8,-3.1c4.1,1 8.9,1.5 13.3,1.5s9.2,-0.5 13.3,-1.5l0.8,3.1C295.6,152.9 292.2,153.4 289.1,153.7z"
- android:fillColor="#606368"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_large_floating_menu_tablet.xml b/res/drawable/accessibility_button_preview_large_floating_menu_tablet.xml
deleted file mode 100644
index 99798d5..0000000
--- a/res/drawable/accessibility_button_preview_large_floating_menu_tablet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M365.76,226.17h-27.68c-14.95,0 -27.07,-12.18 -27.07,-27.07s12.18,-27.07 27.07,-27.07h27.68v1.76h-27.68c-14.01,0 -25.37,11.37 -25.37,25.37s11.37,25.37 25.37,25.37h27.68v1.62Z"
- android:fillColor="#dadce0"/>
- <path
- android:pathData="M337.95,178.94c-11.16,0 -20.16,9.07 -20.16,20.16 0,11.16 9.07,20.16 20.16,20.16s20.16,-9.07 20.16,-20.16c0.07,-11.16 -8.93,-20.16 -20.16,-20.16ZM337.95,188.62c1.15,0 2.1,0.95 2.1,2.1 0,1.15 -0.95,2.1 -2.1,2.1s-2.1,-0.95 -2.1,-2.1c0,-1.15 1.02,-2.1 2.1,-2.1ZM341.2,196.06v13.74h-2.1v-6.36h-2.1v6.36h-2.17v-13.74c-2.1,-0.2 -4.4,-0.54 -6.36,-1.01l0.54,-2.1c2.77,0.68 6.02,1.01 9,1.01s6.23,-0.34 9,-1.01l0.54,2.1c-1.96,0.47 -4.26,0.81 -6.36,1.01Z"
- android:fillColor="#5f6368"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_small_floating_menu.xml b/res/drawable/accessibility_button_preview_small_floating_menu.xml
deleted file mode 100644
index 670a516..0000000
--- a/res/drawable/accessibility_button_preview_small_floating_menu.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M325.4,189.2h-31.7c-17.1,0 -31,-13.9 -31,-31s13.9,-31 31,-31h31.7v2h-31.7c-16,0 -29,13 -29,29s13,29 29,29h31.7V189.2z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M293.6,135.1c-12.8,0 -23.1,10.4 -23.1,23.1c0,12.8 10.4,23.1 23.1,23.1s23.1,-10.4 23.1,-23.1C316.7,145.4 306.4,135.1 293.6,135.1zM293.6,146.2c1.3,0 2.4,1.1 2.4,2.4s-1.1,2.4 -2.4,2.4s-2.4,-1.1 -2.4,-2.4S292.3,146.2 293.6,146.2zM297.3,154.7v15.7h-2.4v-7.3h-2.4v7.3H290v-15.7c-2.4,-0.2 -5,-0.6 -7.3,-1.2l0.6,-2.4c3.2,0.8 6.9,1.2 10.3,1.2s7.1,-0.4 10.3,-1.2l0.6,2.4C302.3,154.1 299.7,154.5 297.3,154.7z"
- android:fillColor="#606368"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_small_floating_menu_tablet.xml b/res/drawable/accessibility_button_preview_small_floating_menu_tablet.xml
deleted file mode 100644
index e31265c..0000000
--- a/res/drawable/accessibility_button_preview_small_floating_menu_tablet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M365.88,219.24h-20.7c-5.38,0 -10.43,-2.09 -14.23,-5.9s-5.9,-8.86 -5.9,-14.23c0,-5.38 2.09,-10.43 5.9,-14.24 3.8,-3.8 8.86,-5.9 14.23,-5.9h20.7v1h-20.7c-5.11,0 -9.91,1.99 -13.53,5.6s-5.6,8.42 -5.6,13.53c0,5.11 1.99,9.91 5.6,13.53s8.42,5.6 13.53,5.6h20.7v1Z"
- android:fillColor="#dadce0"/>
- <path
- android:pathData="M345.19,184c-2.99,-0 -5.91,0.88 -8.4,2.54 -2.49,1.66 -4.43,4.02 -5.57,6.78s-1.45,5.8 -0.86,8.73c0.58,2.93 2.02,5.63 4.13,7.74 2.11,2.11 4.81,3.55 7.74,4.14 2.93,0.58 5.97,0.29 8.73,-0.86 2.76,-1.14 5.12,-3.08 6.78,-5.57 1.66,-2.49 2.55,-5.41 2.55,-8.4 0,-4.01 -1.59,-7.85 -4.42,-10.68 -2.83,-2.83 -6.67,-4.43 -10.68,-4.43ZM345.19,191.28c0.4,0.03 0.77,0.21 1.04,0.51 0.27,0.29 0.42,0.68 0.42,1.08 0,0.4 -0.15,0.79 -0.42,1.08 -0.27,0.29 -0.64,0.47 -1.04,0.51 -0.22,0.02 -0.44,-0.01 -0.65,-0.08 -0.21,-0.07 -0.4,-0.19 -0.56,-0.33 -0.16,-0.15 -0.29,-0.33 -0.38,-0.53 -0.09,-0.2 -0.13,-0.42 -0.13,-0.64 0,-0.22 0.05,-0.44 0.13,-0.64 0.09,-0.2 0.22,-0.38 0.38,-0.53 0.16,-0.15 0.35,-0.26 0.56,-0.33 0.21,-0.07 0.43,-0.1 0.65,-0.08ZM347.56,196.82v10.29h-1.58v-4.76h-1.59v4.75h-1.58v-10.28c-1.6,-0.12 -3.19,-0.39 -4.75,-0.79l0.4,-1.58c4.42,1.05 9.04,1.05 13.46,0l0.39,1.58c-1.57,0.41 -3.17,0.67 -4.79,0.79h0.04Z"
- android:fillColor="#5f6368"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_three_finger.xml b/res/drawable/accessibility_button_preview_three_finger.xml
deleted file mode 100644
index d18ce60..0000000
--- a/res/drawable/accessibility_button_preview_three_finger.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M242.5,226.9h-73.3c-1.7,0 -3.1,1.4 -3.1,3.1s1.4,3.1 3.1,3.1h73.3c1.7,0 3.1,-1.4 3.1,-3.1S244.2,226.9 242.5,226.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M182.7,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C187.6,226.7 185.6,223.8 182.7,222.6z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M209,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C213.9,226.7 211.9,223.8 209,222.6z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M235.2,222.6v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-2.9,1.2 -4.9,4 -4.9,7.4c0,4.4 3.5,8 8,8c4.4,0 8,-3.5 8,-8C240,226.7 238,223.8 235.2,222.6z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#DADCE0"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_three_finger_tablet.xml b/res/drawable/accessibility_button_preview_three_finger_tablet.xml
deleted file mode 100644
index a5590c4..0000000
--- a/res/drawable/accessibility_button_preview_three_finger_tablet.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M188.7,229.14V217.74H193.6L186.7,205.54L179.8,217.74H184.7V229.14C182.8,229.94 181.5,231.74 181.5,233.94C181.5,236.84 183.8,239.14 186.7,239.14C189.6,239.14 191.9,236.84 191.9,233.94C191.9,231.84 190.5,229.94 188.7,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M208,229.14V217.74H212.9L206,205.54L199.1,217.74H204V229.14C202.1,229.94 200.8,231.74 200.8,233.94C200.8,236.84 203.1,239.14 206,239.14C208.9,239.14 211.2,236.84 211.2,233.94C211.2,231.84 209.9,229.94 208,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M227.29,229.14V217.74H232.2L225.29,205.54L218.4,217.74H223.29V229.14C221.4,229.94 220.1,231.74 220.1,233.94C220.1,236.84 222.4,239.14 225.29,239.14C228.2,239.14 230.49,236.84 230.49,233.94C230.49,231.84 229.2,229.94 227.29,229.14Z"
- android:fillColor="#1A73E8"/>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_two_finger.xml b/res/drawable/accessibility_button_preview_two_finger.xml
deleted file mode 100644
index bec95af..0000000
--- a/res/drawable/accessibility_button_preview_two_finger.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M325.4,231.9c0,9.8 -7.9,17.7 -17.7,17.7H103.9c-9.8,0 -17.7,-7.9 -17.7,-17.7V0h-4.4v231.9c0,12.2 9.9,22.2 22.1,22.2h203.8c12.2,0 22.1,-9.9 22.1,-22.2V14.8c2.4,0 4.4,-2 4.4,-4.4V0h-8.9V231.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M242.4,226.9h-9.3h-5.6h-43.4h-4.7h-10.2c-1.7,0 -3.1,1.4 -3.1,3.1s1.4,3.1 3.1,3.1h10.2h3.9h45h4.8h9.3c1.7,0 3.1,-1.4 3.1,-3.1S244.1,226.9 242.4,226.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M194,223.5v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-1.6,0.7 -2.9,1.9 -3.8,3.4c-0.7,1.2 -1.1,2.5 -1.1,4c0,0.7 0.1,1.5 0.3,2.2c0.9,3.3 4,5.8 7.7,5.8c3.6,0 6.7,-2.5 7.7,-5.8c0.2,-0.7 0.3,-1.4 0.3,-2.2c0,-1.5 -0.4,-2.8 -1.1,-4C197,225.4 195.6,224.2 194,223.5z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M223.7,223.5v-17.5h7.5l-10.6,-18.7l-10.6,18.7h7.5v17.5c-1.6,0.7 -2.9,1.9 -3.8,3.4c-0.7,1.2 -1.1,2.5 -1.1,4c0,0.7 0.1,1.5 0.3,2.2c0.9,3.3 4,5.8 7.7,5.8c3.6,0 6.7,-2.5 7.7,-5.8c0.2,-0.7 0.3,-1.4 0.3,-2.2c0,-1.5 -0.4,-2.8 -1.1,-4C226.6,225.4 225.3,224.2 223.7,223.5z"
- android:fillColor="#1A73E8"/>
-</vector>
diff --git a/res/drawable/accessibility_button_preview_two_finger_tablet.xml b/res/drawable/accessibility_button_preview_two_finger_tablet.xml
deleted file mode 100644
index dbc5ad4..0000000
--- a/res/drawable/accessibility_button_preview_two_finger_tablet.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M198.35,229.14V217.74H203.25L196.35,205.54L189.45,217.74H194.35V229.14C192.45,229.94 191.15,231.74 191.15,233.94C191.15,236.84 193.45,239.14 196.35,239.14C199.25,239.14 201.55,236.84 201.55,233.94C201.55,231.84 200.15,229.94 198.35,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M217.65,229.14V217.74H222.55L215.65,205.54L208.75,217.74H213.65V229.14C211.75,229.94 210.45,231.74 210.45,233.94C210.45,236.84 212.75,239.14 215.65,239.14C218.55,239.14 220.85,236.84 220.85,233.94C220.85,231.84 219.55,229.94 217.65,229.14Z"
- android:fillColor="#1A73E8"/>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_gesture_navigation_three_finger_preview.xml b/res/drawable/accessibility_gesture_navigation_three_finger_preview.xml
deleted file mode 100644
index c14d744..0000000
--- a/res/drawable/accessibility_gesture_navigation_three_finger_preview.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M176.7,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C183.4,212.6 180.4,209.6 176.7,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="176.7163"
- android:endY="209.6335"
- android:endX="176.7163"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M206,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C212.6,212.6 209.7,209.6 206,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="206"
- android:endY="209.6335"
- android:endX="206"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M235.3,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C241.9,212.6 239,209.6 235.3,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="235.2837"
- android:endY="209.6335"
- android:endX="235.2837"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
-</vector>
diff --git a/res/drawable/accessibility_gesture_navigation_three_finger_preview_tablet.xml b/res/drawable/accessibility_gesture_navigation_three_finger_preview_tablet.xml
deleted file mode 100644
index fab0853..0000000
--- a/res/drawable/accessibility_gesture_navigation_three_finger_preview_tablet.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <group>
- <clip-path
- android:pathData="M0,0h412v300h-412z"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M176.84,188.94C173.14,188.94 170.24,191.94 170.24,195.54V220.14H183.54V195.54C183.54,191.94 180.54,188.94 176.84,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="176.89"
- android:startY="220.23"
- android:endX="176.89"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#001A73E8"/>
- <item android:offset="0.69" android:color="#FF1A73E8"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M206.14,188.94C202.44,188.94 199.54,191.94 199.54,195.54V220.14H212.84V195.54C212.74,191.94 209.84,188.94 206.14,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="206.19"
- android:startY="220.23"
- android:endX="206.19"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#001A73E8"/>
- <item android:offset="0.69" android:color="#FF1A73E8"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M235.44,188.94C231.74,188.94 228.84,191.94 228.84,195.54V220.14H242.14V195.54C242.04,191.94 239.14,188.94 235.44,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="235.49"
- android:startY="220.23"
- android:endX="235.49"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#001A73E8"/>
- <item android:offset="0.69" android:color="#FF1A73E8"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_gesture_navigation_two_finger_preview.xml b/res/drawable/accessibility_gesture_navigation_two_finger_preview.xml
deleted file mode 100644
index 3ef4fd1..0000000
--- a/res/drawable/accessibility_gesture_navigation_two_finger_preview.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M274.9,97.7v-9.5c0,-1.3 -1.1,-2.4 -2.4,-2.4V35.9c0,-6.6 -5.3,-11.9 -11.9,-11.9H151.3c-6.6,0 -11.9,5.3 -11.9,11.9v228.2c0,6.6 5.3,11.9 11.9,11.9h109.4c6.6,0 11.9,-5.3 11.9,-11.9V147.6c1.3,0 2.4,-1.1 2.4,-2.4v-23.8c0,-1.3 -1.1,-2.4 -2.4,-2.4v-19C273.9,100.1 274.9,99 274.9,97.7zM270.2,264.1c0,5.2 -4.3,9.5 -9.5,9.5H151.3c-5.2,0 -9.5,-4.3 -9.5,-9.5V35.9c0,-5.2 4.3,-9.5 9.5,-9.5h109.4c5.2,0 9.5,4.3 9.5,9.5V264.1z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M188.6,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6h13.3v-24.6C195.3,212.6 192.3,209.6 188.6,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="188.65"
- android:endY="209.6335"
- android:endX="188.65"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M223.4,209.6c-3.7,0 -6.6,3 -6.6,6.6v24.6H230v-24.6C230,212.6 227.1,209.6 223.4,209.6z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startY="240.8954"
- android:startX="223.4"
- android:endY="209.6335"
- android:endX="223.4"
- android:type="linear">
- <item android:offset="0" android:color="#00669DF6"/>
- <item android:offset="0.695" android:color="#FF669DF6"/>
- </gradient>
- </aapt:attr>
- </path>
-</vector>
diff --git a/res/drawable/accessibility_gesture_navigation_two_finger_preview_tablet.xml b/res/drawable/accessibility_gesture_navigation_two_finger_preview_tablet.xml
deleted file mode 100644
index f976f02..0000000
--- a/res/drawable/accessibility_gesture_navigation_two_finger_preview_tablet.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <group>
- <clip-path
- android:pathData="M0,0h412v300h-412z"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M188.15,188.94C184.45,188.94 181.55,191.94 181.55,195.54V220.14H194.85V195.54C194.85,191.94 191.85,188.94 188.15,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="188.2"
- android:startY="220.23"
- android:endX="188.2"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#001A73E8"/>
- <item android:offset="0.69" android:color="#FF1A73E8"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M222.95,188.94C219.25,188.94 216.35,191.94 216.35,195.54V220.14H229.55V195.54C229.55,191.94 226.65,188.94 222.95,188.94Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="222.95"
- android:startY="220.23"
- android:endX="222.95"
- android:endY="188.97"
- android:type="linear">
- <item android:offset="0" android:color="#001A73E8"/>
- <item android:offset="0.69" android:color="#FF1A73E8"/>
- </gradient>
- </aapt:attr>
- </path>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_hardware.xml b/res/drawable/accessibility_shortcut_type_hardware.xml
deleted file mode 100644
index b6b227b..0000000
--- a/res/drawable/accessibility_shortcut_type_hardware.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M287,187.8v-1.5h2.9v-13.7c0,-1.6 -1.3,-2.9 -2.9,-2.9v-23.2c1.6,0 2.9,-1.3 2.9,-2.9V132c0,-1.6 -1.3,-2.9 -2.9,-2.9V68.4c0,-8 -6.5,-14.5 -14.5,-14.5H139.4c-8,0 -14.5,6.5 -14.5,14.5v185.3c1,0.7 1.9,1.4 2.9,2.1V68.4c0,-6.4 5.2,-11.6 11.6,-11.6h133.1c6.4,0 11.6,5.2 11.6,11.6v188.7c1,-0.7 1.9,-1.4 2.9,-2.2v-50.5c1.6,0 2.9,-1.3 2.9,-2.9v-13.7L287,187.8L287,187.8z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M287,204.4c1.6,0 2.9,-1.3 2.9,-2.9v-14H287v-0.9h2.9v-14c0,-1.6 -1.3,-2.9 -2.9,-2.9"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M206.7,19.1c35,0 67.9,13.6 92.6,38.4C324,82.1 337.6,115 337.6,150s-13.6,67.9 -38.4,92.6c-24.7,24.7 -57.6,38.4 -92.6,38.4s-67.9,-13.6 -92.6,-38.4C89.4,217.9 75.7,185 75.7,150s13.6,-67.9 38.4,-92.6C138.9,32.7 171.7,19.1 206.7,19.1M206.7,17.1c-73.4,0 -133,59.5 -133,132.9s59.5,132.9 132.9,132.9s133,-59.5 133,-132.9S280.1,17.1 206.7,17.1L206.7,17.1z"
- android:fillColor="#E8EAED"/>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_hardware_tablet.xml b/res/drawable/accessibility_shortcut_type_hardware_tablet.xml
deleted file mode 100644
index db0906e..0000000
--- a/res/drawable/accessibility_shortcut_type_hardware_tablet.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<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="M255.38,94.3C255.38,93.14 256.32,92.21 257.47,92.21L275.86,92.21C277.01,92.21 277.95,93.14 277.95,94.3L267.08,95.14L255.38,94.3Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M340.09,110.17L340.09,248.55A14.5,14.5 0,0 1,325.59 263.05L88,263.05A14.5,14.5 0,0 1,73.5 248.55L73.5,110.17A14.5,14.5 0,0 1,88 95.67L325.59,95.67A14.5,14.5 0,0 1,340.09 110.17z"
- android:strokeWidth="3"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M295.77,94.3C295.77,93.14 296.7,92.21 297.86,92.21L305.38,92.21C306.53,92.21 307.46,93.14 307.46,94.3L302.45,95.14L295.77,94.3Z"
- android:fillColor="#DADCE0"/>
- <group>
- <clip-path
- android:pathData="M274,30L274,30A93,93 0,0 1,367 123L367,123A93,93 0,0 1,274 216L274,216A93,93 0,0 1,181 123L181,123A93,93 0,0 1,274 30z"/>
- <path
- android:pathData="M274,30L274,30A93,93 0,0 1,367 123L367,123A93,93 0,0 1,274 216L274,216A93,93 0,0 1,181 123L181,123A93,93 0,0 1,274 30z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M206.07,85.49C206.07,83.45 207.72,81.79 209.75,81.79L242.17,81.79C244.21,81.79 245.86,83.45 245.86,85.49L226.7,86.97L206.07,85.49Z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M331.59,87C339.46,87 345.84,93.38 345.84,101.25L345.84,369.73C345.84,377.6 339.46,383.98 331.59,383.98L-111.85,383.98C-119.72,383.98 -126.1,377.6 -126.1,369.73L-126.1,101.25C-126.1,93.38 -119.72,87 -111.85,87L331.59,87Z"
- android:strokeWidth="3.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M266.77,85.49C266.77,83.45 268.42,81.79 270.46,81.79L283.72,81.79C285.75,81.79 287.4,83.45 287.4,85.49L278.56,86.97L266.77,85.49Z"
- android:fillColor="#DADCE0"/>
- </group>
- <path
- android:strokeWidth="1"
- android:pathData="M274,30.5L274,30.5A92.5,92.5 0,0 1,366.5 123L366.5,123A92.5,92.5 0,0 1,274 215.5L274,215.5A92.5,92.5 0,0 1,181.5 123L181.5,123A92.5,92.5 0,0 1,274 30.5z"
- android:fillColor="#00000000"
- android:strokeColor="#DADCE0"/>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software.xml b/res/drawable/accessibility_shortcut_type_software.xml
deleted file mode 100644
index d0573aa..0000000
--- a/res/drawable/accessibility_shortcut_type_software.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="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"
- android:fillColor="#fff"/>
- <path
- android:pathData="M142,225.3H275.1a14.51,14.51 0,0 0,14.5 -14.5V69a2.9,2.9 0,0 0,2.9 -2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7V210.8a11.61,11.61 0,0 1,-11.6 11.6H142a11.61,11.61 0,0 1,-11.6 -11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1V210.9A14.62,14.62 0,0 0,142 225.3Z"
- android:fillColor="#dadce0"/>
- <path
- android:pathData="M207.4,19.1a131.11,131.11 0,0 1,131 131,131 131,0 0,1 -262,-0.1 130.94,130.94 0,0 1,131 -130.9m0,-2A132.9,132.9 0,1 0,340.3 150,133 133,0 0,0 207.4,17.1Z"
- android:fillColor="#e8eaed"/>
- <path
- android:fillColor="#FF000000"
- android:pathData="M286.7,210.83a11.59,11.59 0,0 1,-11.58 11.58H142a11.59,11.59 0,0 1,-11.58 -11.58V183.26H286.7Z"/>
- <path
- android:pathData="M250.41,193.38a1.77,1.77 0,1 1,-1.78 1.77A1.77,1.77 0,0 1,250.41 193.38ZM253.07,199.58v11.53h-1.78v-5.32h-1.77v5.32h-1.77L247.75,199.58a30.78,30.78 0,0 1,-5.32 -0.89l0.44,-1.77a32.34,32.34 0,0 0,15.07 0l0.45,1.77A30.78,30.78 0,0 1,253.07 199.58Z"
- android:fillColor="#fff"/>
- <path
- android:pathData="M208.55,202.84m-6.13,0a6.13,6.13 0,1 1,12.26 0a6.13,6.13 0,1 1,-12.26 0"
- android:fillColor="#bdc1c6"/>
- <path
- android:pathData="M250.41,202.84m-22.28,0a22.28,22.28 0,1 1,44.56 0a22.28,22.28 0,1 1,-44.56 0"
- android:strokeWidth="2"
- android:fillColor="#00000000"
- android:strokeColor="#1a73e8"/>
- <path
- android:pathData="M160.45,202.84l10.43,6.02l0,-12.05l-10.43,6.03z"
- android:fillColor="#bdc1c6"/>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_floating.xml b/res/drawable/accessibility_shortcut_type_software_floating.xml
deleted file mode 100644
index 88ce42d..0000000
--- a/res/drawable/accessibility_shortcut_type_software_floating.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="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"
- android:fillColor="#fff"/>
- <path
- android:pathData="M142,225.3H275.1a14.51,14.51 0,0 0,14.5 -14.5V69a2.9,2.9 0,0 0,2.9 -2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7V210.8a11.61,11.61 0,0 1,-11.6 11.6H142a11.61,11.61 0,0 1,-11.6 -11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1V210.9A14.62,14.62 0,0 0,142 225.3Z"
- android:fillColor="#dadce0"/>
- <path
- android:strokeWidth="1"
- android:pathData="M286.7,144.13H266a19.63,19.63 0,1 0,0 39.26H286.7"
- android:fillColor="#00000000"
- android:strokeColor="#dadce0"/>
- <path
- android:pathData="M266,148.65a15.11,15.11 0,1 0,15.1 15.11A15.11,15.11 0,0 0,266 148.65ZM266,155.93a1.59,1.59 0,0 1,0 3.17,1.59 1.59,0 1,1 0,-3.17ZM268.37,161.47v10.29h-1.58L266.79,167h-1.59v4.75h-1.58L263.62,161.47a27.23,27.23 0,0 1,-4.75 -0.79l0.4,-1.58a29.06,29.06 0,0 0,13.46 0l0.39,1.58A27.23,27.23 0,0 1,268.33 161.47Z"
- android:fillColor="#5f6368"/>
- <path
- android:pathData="M207.4,19.1a131.11,131.11 0,0 1,131 131,131 131,0 0,1 -262,-0.1 130.94,130.94 0,0 1,131 -130.9m0,-2A132.9,132.9 0,1 0,340.3 150,133 133,0 0,0 207.4,17.1Z"
- android:fillColor="#e8eaed"/>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_floating_tablet.xml b/res/drawable/accessibility_shortcut_type_software_floating_tablet.xml
deleted file mode 100644
index 4b04704..0000000
--- a/res/drawable/accessibility_shortcut_type_software_floating_tablet.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- </group>
- <path
- android:strokeWidth="1"
- android:pathData="M365.64,179.48H344.94C339.74,179.48 334.74,181.54 331.06,185.23C327.38,188.91 325.31,193.9 325.31,199.11C325.31,204.31 327.38,209.3 331.06,212.99C334.74,216.67 339.74,218.74 344.94,218.74H365.64"
- android:fillColor="#00000000"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M344.95,184C341.96,183.99 339.04,184.88 336.55,186.54C334.06,188.2 332.12,190.56 330.98,193.32C329.83,196.08 329.53,199.12 330.11,202.05C330.7,204.98 332.14,207.67 334.25,209.79C336.36,211.9 339.05,213.34 341.98,213.93C344.92,214.51 347.95,214.21 350.72,213.07C353.48,211.92 355.84,209.99 357.5,207.5C359.16,205.02 360.05,202.1 360.05,199.11C360.05,195.1 358.46,191.26 355.62,188.43C352.79,185.59 348.95,184 344.95,184ZM344.95,191.28C345.35,191.31 345.72,191.49 345.99,191.78C346.26,192.08 346.41,192.46 346.41,192.86C346.41,193.26 346.26,193.65 345.99,193.94C345.72,194.23 345.35,194.41 344.95,194.45C344.73,194.46 344.51,194.43 344.3,194.36C344.09,194.29 343.9,194.18 343.74,194.03C343.58,193.88 343.45,193.7 343.36,193.5C343.28,193.3 343.23,193.08 343.23,192.86C343.23,192.64 343.28,192.43 343.36,192.22C343.45,192.02 343.58,191.84 343.74,191.69C343.9,191.54 344.09,191.43 344.3,191.36C344.51,191.29 344.73,191.26 344.95,191.28ZM347.32,196.82V207.11H345.74V202.35H344.15V207.1H342.57V196.82C340.96,196.69 339.37,196.43 337.82,196.03L338.22,194.45C342.64,195.5 347.25,195.5 351.68,194.45L352.07,196.03C350.5,196.43 348.89,196.7 347.28,196.82H347.32Z"
- android:fillColor="#5F6368"/>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture.xml b/res/drawable/accessibility_shortcut_type_software_gesture.xml
deleted file mode 100644
index 2ded59f..0000000
--- a/res/drawable/accessibility_shortcut_type_software_gesture.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:fillColor="#FF000000"
- android:pathData="M842.3,299.9H485.9c-15.3,0 -27.8,-12.8 -27.8,-28.5v-243c0,-15.7 12.5,-28.5 27.8,-28.5h356.5c15.2,0 27.7,12.8 27.7,28.5v243.2C870.1,287.1 857.6,299.9 842.3,299.9z"/>
- <path
- android:pathData="M597.6,225.2h133.1c8,0 14.5,-6.5 14.5,-14.5V68.9c1.6,0 2.9,-1.3 2.9,-2.9V49c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7v166.4c0,6.4 -5.2,11.6 -11.6,11.6H597.6c-6.4,0 -11.6,-5.2 -11.6,-11.6V42.6c-1,0.7 -1.9,1.4 -2.9,2.1v166.1C583.2,218.7 589.7,225.2 597.6,225.2z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M688,207.8h-47.8c-1.1,0 -2,0.9 -2,2s0.9,2 2,2H688c1.1,0 2,-0.9 2,-2S689.1,207.8 688,207.8z"
- android:fillColor="#80868B"/>
- <path
- android:pathData="M656.5,205.6v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C659.7,208.3 658.3,206.4 656.5,205.6z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M675.8,205.6v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C679,208.3 677.7,206.4 675.8,205.6z"
- android:fillColor="#669DF6"/>
- <path
- android:pathData="M664.2,19c35,0 67.9,13.6 92.6,38.4c24.7,24.7 38.4,57.6 38.4,92.6s-13.6,67.9 -38.4,92.6c-24.7,24.7 -57.6,38.4 -92.6,38.4s-67.9,-13.6 -92.6,-38.4c-24.7,-24.8 -38.4,-57.7 -38.4,-92.7s13.6,-67.9 38.4,-92.6C596.3,32.6 629.2,19 664.2,19M664.2,17c-73.4,0 -133,59.5 -133,132.9s59.5,132.9 132.9,132.9s133,-59.5 133,-132.9S737.6,17 664.2,17L664.2,17z"
- android:fillColor="#3C4043"/>
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M139.4,225.3h133.1c8,0 14.5,-6.5 14.5,-14.5V69c1.6,0 2.9,-1.3 2.9,-2.9v-17c-1.9,-1.6 -3.8,-3.2 -5.8,-4.7v166.4c0,6.4 -5.2,11.6 -11.6,11.6H139.4c-6.4,0 -11.6,-5.2 -11.6,-11.6V42.7c-1,0.7 -1.9,1.4 -2.9,2.1v166.1C125,218.8 131.5,225.3 139.4,225.3z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M229.9,207.9h-47.8c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h47.8c1.1,0 2,-0.9 2,-2S231,207.9 229.9,207.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M198.4,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2s5.2,-2.3 5.2,-5.2C201.5,208.4 200.1,206.5 198.4,205.7z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M217.6,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2s5.2,-2.3 5.2,-5.2C220.9,208.4 219.5,206.5 217.6,205.7z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M206.1,19.1c35,0 67.9,13.6 92.6,38.4c24.7,24.7 38.4,57.6 38.4,92.6s-13.6,67.9 -38.4,92.6c-24.7,24.7 -57.6,38.4 -92.6,38.4s-67.9,-13.6 -92.6,-38.4S75.1,185 75.1,150s13.6,-67.9 38.4,-92.6C138.2,32.7 171.1,19.1 206.1,19.1M206.1,17.1c-73.4,0 -133,59.5 -133,132.9S132.6,282.9 206,282.9S339,223.4 339,150S279.5,17.1 206.1,17.1L206.1,17.1z"
- android:fillColor="#E8EAED"/>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture_tablet.xml b/res/drawable/accessibility_shortcut_type_software_gesture_tablet.xml
deleted file mode 100644
index 2dccf2a..0000000
--- a/res/drawable/accessibility_shortcut_type_software_gesture_tablet.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M198.35,229.14V217.74H203.25L196.35,205.54L189.45,217.74H194.35V229.14C192.45,229.94 191.15,231.74 191.15,233.94C191.15,236.84 193.45,239.14 196.35,239.14C199.25,239.14 201.55,236.84 201.55,233.94C201.55,231.84 200.15,229.94 198.35,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M217.65,229.14V217.74H222.55L215.65,205.54L208.75,217.74H213.65V229.14C211.75,229.94 210.45,231.74 210.45,233.94C210.45,236.84 212.75,239.14 215.65,239.14C218.55,239.14 220.85,236.84 220.85,233.94C220.85,231.84 219.55,229.94 217.65,229.14Z"
- android:fillColor="#1A73E8"/>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture_talkback.xml b/res/drawable/accessibility_shortcut_type_software_gesture_talkback.xml
deleted file mode 100644
index 2de804c..0000000
--- a/res/drawable/accessibility_shortcut_type_software_gesture_talkback.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="412dp"
- android:height="300dp"
- android:viewportWidth="412"
- android:viewportHeight="300">
- <path
- android:pathData="M384.2,300H27.8C12.5,300 0,287.2 0,271.5v-243C0,12.8 12.5,0 27.8,0h356.5C399.5,0 412,12.8 412,28.5v243.2C412,287.2 399.5,300 384.2,300z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M138,225.3h133.1c8,0 14.5,-6.5 14.5,-14.5V69c1.6,0 2.9,-1.3 2.9,-2.9V45.7c-1.9,-1.5 -3.8,-2.9 -5.8,-4.3v169.4c0,6.4 -5.2,11.6 -11.6,11.6H138c-6.4,0 -11.6,-5.2 -11.6,-11.6V43.5c-1,0.7 -1.9,1.5 -2.9,2.2v165C123.5,218.8 130,225.3 138,225.3z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M206,283.9c-73.9,0 -133.9,-60.1 -133.9,-133.9S132.1,16.1 206,16.1c73.9,0 133.9,60.1 133.9,133.9S279.9,283.9 206,283.9zM206,18.1C133.2,18.1 74.1,77.2 74.1,150S133.2,281.9 206,281.9S337.9,222.8 337.9,150S278.8,18.1 206,18.1z"
- android:fillColor="#E8EAED"/>
- <path
- android:pathData="M229.9,207.9h-47.8c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h47.8c1.1,0 2,-0.9 2,-2S231,207.9 229.9,207.9z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M190.9,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C194.1,208.4 192.8,206.5 190.9,205.7z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M208,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C211.2,208.4 209.9,206.5 208,205.7z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M225.1,205.7v-11.4h4.9l-6.9,-12.2l-6.9,12.2h4.9v11.4c-1.9,0.8 -3.2,2.6 -3.2,4.8c0,2.9 2.3,5.2 5.2,5.2c2.9,0 5.2,-2.3 5.2,-5.2C228.2,208.4 226.9,206.5 225.1,205.7z"
- android:fillColor="#1A73E8"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture_talkback_tablet.xml b/res/drawable/accessibility_shortcut_type_software_gesture_talkback_tablet.xml
deleted file mode 100644
index e122ae1..0000000
--- a/res/drawable/accessibility_shortcut_type_software_gesture_talkback_tablet.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<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="M263.59,50.35C263.59,48.98 264.7,47.86 266.06,47.86L287.85,47.86C289.22,47.86 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M364.52,66.19L364.52,236.14A14.75,14.75 0,0 1,349.77 250.89L62.23,250.89A14.75,14.75 0,0 1,47.48 236.14L47.48,66.19A14.75,14.75 0,0 1,62.23 51.44L349.77,51.44A14.75,14.75 0,0 1,364.52 66.19z"
- android:strokeWidth="2.5"
- android:fillColor="#ffffff"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.86 313.92,47.86L322.84,47.86C324.2,47.86 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M170.9,232.14L241.9,232.14A2,2 0,0 1,243.9 234.14L243.9,234.14A2,2 0,0 1,241.9 236.14L170.9,236.14A2,2 0,0 1,168.9 234.14L168.9,234.14A2,2 0,0 1,170.9 232.14z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M188.7,229.14V217.74H193.6L186.7,205.54L179.8,217.74H184.7V229.14C182.8,229.94 181.5,231.74 181.5,233.94C181.5,236.84 183.8,239.14 186.7,239.14C189.6,239.14 191.9,236.84 191.9,233.94C191.9,231.84 190.5,229.94 188.7,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M208,229.14V217.74H212.9L206,205.54L199.1,217.74H204V229.14C202.1,229.94 200.8,231.74 200.8,233.94C200.8,236.84 203.1,239.14 206,239.14C208.9,239.14 211.2,236.84 211.2,233.94C211.2,231.84 209.9,229.94 208,229.14Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M227.29,229.14V217.74H232.2L225.29,205.54L218.4,217.74H223.29V229.14C221.4,229.94 220.1,231.74 220.1,233.94C220.1,236.84 222.4,239.14 225.29,239.14C228.2,239.14 230.49,236.84 230.49,233.94C230.49,231.84 229.2,229.94 227.29,229.14Z"
- android:fillColor="#1A73E8"/>
- </group>
-</vector>
diff --git a/res/drawable/accessibility_shortcut_type_software_tablet.xml b/res/drawable/accessibility_shortcut_type_software_tablet.xml
deleted file mode 100644
index 334344d..0000000
--- a/res/drawable/accessibility_shortcut_type_software_tablet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<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="M62.23,50.19L349.77,50.19A16,16 0,0 1,365.77 66.19L365.77,236.14A16,16 0,0 1,349.77 252.14L62.23,252.14A16,16 0,0 1,46.23 236.14L46.23,66.19A16,16 0,0 1,62.23 50.19z"/>
- <path
- android:pathData="M46.23,204.14h320v48h-320z"
- android:fillColor="#000000"/>
- <path
- android:pathData="M268.93,214.14C270.43,214.14 271.63,215.34 271.63,216.84C271.63,218.34 270.43,219.54 268.93,219.54C267.43,219.54 266.23,218.34 266.23,216.84C266.23,215.34 267.43,214.14 268.93,214.14ZM273.03,223.64V241.24H270.23V233.14H267.53V241.24H264.83V223.64C262.13,223.44 259.23,222.94 256.73,222.24L257.43,219.54C260.93,220.44 265.13,220.94 268.93,220.94C272.73,220.94 276.93,220.54 280.43,219.54L281.13,222.24C278.63,222.94 275.73,223.44 273.03,223.64Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M206.23,238.04C211.42,238.04 215.63,233.83 215.63,228.64C215.63,223.45 211.42,219.24 206.23,219.24C201.04,219.24 196.83,223.45 196.83,228.64C196.83,233.83 201.04,238.04 206.23,238.04Z"
- android:fillColor="#BDC0C4"/>
- <path
- android:pathData="M131.33,228.64L147.33,237.84V219.34L131.33,228.64Z"
- android:fillColor="#BDC0C4"/>
- </group>
- <path
- android:pathData="M62.23,51.69L349.77,51.69A14.5,14.5 0,0 1,364.27 66.19L364.27,236.14A14.5,14.5 0,0 1,349.77 250.64L62.23,250.64A14.5,14.5 0,0 1,47.73 236.14L47.73,66.19A14.5,14.5 0,0 1,62.23 51.69z"
- android:strokeWidth="3"
- android:fillColor="#00000000"
- android:strokeColor="#DADCE0"/>
- <path
- android:pathData="M311.45,50.35C311.45,48.98 312.56,47.87 313.92,47.87L322.84,47.87C324.2,47.87 325.32,48.98 325.32,50.35L319.37,51.34L311.45,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M263.59,50.35C263.59,48.98 264.7,47.87 266.06,47.87L287.85,47.87C289.22,47.87 290.33,48.98 290.33,50.35L277.45,51.34L263.59,50.35Z"
- android:fillColor="#DADCE0"/>
- <path
- android:pathData="M268.93,259.69C251.31,259.69 236.93,245.3 236.93,227.69C236.93,210.07 251.31,195.69 268.93,195.69C286.55,195.69 300.93,210.07 300.93,227.69C300.93,245.3 286.55,259.69 268.93,259.69ZM268.93,198.38C252.84,198.38 239.72,211.51 239.72,227.6C239.72,243.69 252.84,256.81 268.93,256.81C285.02,256.81 298.14,243.69 298.14,227.6C298.14,211.51 285.02,198.38 268.93,198.38Z"
- android:fillColor="#729CEE"/>
-</vector>
diff --git a/res/drawable/audio_sharing_rounded_bg.xml b/res/drawable/audio_sharing_rounded_bg.xml
index db1e1bb..35517ea 100644
--- a/res/drawable/audio_sharing_rounded_bg.xml
+++ b/res/drawable/audio_sharing_rounded_bg.xml
@@ -15,8 +15,10 @@
~ limitations under the License.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
+<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="?android:colorButtonNormal" />
+ <solid android:color="?androidprv:attr/colorAccentPrimary" />
<corners android:radius="12dp" />
</shape>
\ No newline at end of file
diff --git a/res/drawable/external_display_mirror_landscape.xml b/res/drawable/external_display_mirror_landscape.xml
new file mode 100644
index 0000000..4272ddb
--- /dev/null
+++ b/res/drawable/external_display_mirror_landscape.xml
@@ -0,0 +1,55 @@
+<?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:height="232.02106dp"
+ android:viewportHeight="214"
+ android:viewportWidth="380"
+ android:width="412dp">
+ <path
+ android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,198A16,16 0,0 1,364 214L16,214A16,16 0,0 1,0 198L0,16A16,16 0,0 1,16 0z"
+ android:fillColor="#00000000"/>
+ <path
+ android:pathData="M150.5,38L327.5,38A5.5,5.5 0,0 1,333 43.5L333,138.5A5.5,5.5 0,0 1,327.5 144L150.5,144A5.5,5.5 0,0 1,145 138.5L145,43.5A5.5,5.5 0,0 1,150.5 38z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M150.58,39L327.42,39A4.58,4.58 0,0 1,332 43.58L332,138.42A4.58,4.58 0,0 1,327.42 143L150.58,143A4.58,4.58 0,0 1,146 138.42L146,43.58A4.58,4.58 0,0 1,150.58 39z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M254.25,144H223.75L221.52,173.34C221.48,173.82 221.08,174.18 220.6,174.18H211.37C211.25,174.18 211.12,174.21 211.01,174.26C210.11,174.65 210.39,176 211.37,176H266.63C267.61,176 267.89,174.65 266.99,174.26C266.88,174.21 266.75,174.18 266.63,174.18H257.4C256.92,174.18 256.52,173.82 256.48,173.34L254.25,144Z"
+ android:fillColor="#5F6368"/>
+ <path
+ android:pathData="M330,53L330,129A3,3 0,0 1,327 132L151,132A3,3 0,0 1,148 129L148,53A3,3 0,0 1,151 50L327,50A3,3 0,0 1,330 53z"
+ android:strokeWidth="2"
+ android:fillColor="#00000000"
+ android:strokeColor="#E0E994"/>
+ <path
+ android:pathData="M113,91.08V86.55C113,86.25 112.88,85.96 112.67,85.75C112.45,85.54 112.17,85.42 111.86,85.41V61.64C111.84,60.15 111.24,58.72 110.17,57.66C109.1,56.61 107.66,56.01 106.16,56H53.71C52.2,56.01 50.75,56.61 49.68,57.67C48.62,58.73 48.01,60.17 48,61.66V170.34C48.01,171.83 48.62,173.27 49.68,174.33C50.75,175.39 52.2,175.99 53.71,176H106.16C107.67,175.99 109.11,175.39 110.18,174.33C111.25,173.27 111.85,171.83 111.86,170.34V114.86C112.16,114.86 112.45,114.74 112.67,114.52C112.88,114.31 113,114.03 113,113.73V102.4C113,102.1 112.88,101.82 112.67,101.6C112.45,101.39 112.17,101.27 111.86,101.27V92.21C112.16,92.21 112.45,92.09 112.67,91.88C112.88,91.67 113,91.38 113,91.08ZM110.72,170.34C110.72,171.54 110.24,172.69 109.38,173.54C108.53,174.39 107.37,174.87 106.16,174.87H53.71C52.5,174.87 51.34,174.39 50.48,173.54C49.62,172.69 49.14,171.54 49.14,170.34V61.64C49.14,60.44 49.62,59.29 50.48,58.44C51.34,57.59 52.5,57.11 53.71,57.11H106.16C107.37,57.11 108.53,57.59 109.38,58.44C110.24,59.29 110.72,60.44 110.72,61.64V170.34Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M54,59L106,59A3,3 0,0 1,109 62L109,170A3,3 0,0 1,106 173L54,173A3,3 0,0 1,51 170L51,62A3,3 0,0 1,54 59z"
+ android:strokeColor="#E0E994"
+ android:strokeWidth="2"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M80,184.72V189.7C80,193.73 83.27,197 87.3,197H164.7C168.73,197 172,193.73 172,189.7V144"
+ android:strokeColor="#5F6368"
+ android:strokeWidth="0.684"
+ android:fillColor="#00000000"/>
+ <path
+ android:pathData="M77,176H83V184.09C83,184.59 82.59,185 82.09,185H77.91C77.41,185 77,184.59 77,184.09V176Z"
+ android:fillColor="#5F6368"/>
+</vector>
diff --git a/res/drawable/external_display_mirror_portrait.xml b/res/drawable/external_display_mirror_portrait.xml
new file mode 100644
index 0000000..0fe7f93
--- /dev/null
+++ b/res/drawable/external_display_mirror_portrait.xml
@@ -0,0 +1,55 @@
+<?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:height="232.02106dp"
+ android:viewportHeight="214"
+ android:viewportWidth="380"
+ android:width="412dp" >
+ <path
+ android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,198A16,16 0,0 1,364 214L16,214A16,16 0,0 1,0 198L0,16A16,16 0,0 1,16 0z"
+ android:fillColor="#00000000"/>
+ <path
+ android:pathData="M150.5,38L327.5,38A5.5,5.5 0,0 1,333 43.5L333,138.5A5.5,5.5 0,0 1,327.5 144L150.5,144A5.5,5.5 0,0 1,145 138.5L145,43.5A5.5,5.5 0,0 1,150.5 38z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M150.58,39L327.42,39A4.58,4.58 0,0 1,332 43.58L332,138.42A4.58,4.58 0,0 1,327.42 143L150.58,143A4.58,4.58 0,0 1,146 138.42L146,43.58A4.58,4.58 0,0 1,150.58 39z"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M254.25,144H223.75L221.52,173.34C221.48,173.82 221.08,174.18 220.6,174.18H211.37C211.25,174.18 211.12,174.21 211.01,174.26C210.11,174.65 210.39,176 211.37,176H266.63C267.61,176 267.89,174.65 266.99,174.26C266.88,174.21 266.75,174.18 266.63,174.18H257.4C256.92,174.18 256.52,173.82 256.48,173.34L254.25,144Z"
+ android:fillColor="#5F6368"/>
+ <path
+ android:pathData="M216,41L262,41A3,3 0,0 1,265 44L265,138A3,3 0,0 1,262 141L216,141A3,3 0,0 1,213 138L213,44A3,3 0,0 1,216 41z"
+ android:strokeWidth="2"
+ android:fillColor="#00000000"
+ android:strokeColor="#E0E994"/>
+ <path
+ android:pathData="M113,91.08V86.55C113,86.25 112.88,85.96 112.67,85.75C112.45,85.54 112.17,85.42 111.86,85.41V61.64C111.84,60.15 111.24,58.72 110.17,57.66C109.1,56.61 107.66,56.01 106.16,56H53.71C52.2,56.01 50.75,56.61 49.68,57.67C48.62,58.73 48.01,60.17 48,61.66V170.34C48.01,171.83 48.62,173.27 49.68,174.33C50.75,175.39 52.2,175.99 53.71,176H106.16C107.67,175.99 109.11,175.39 110.18,174.33C111.25,173.27 111.85,171.83 111.86,170.34V114.86C112.16,114.86 112.45,114.74 112.67,114.52C112.88,114.31 113,114.03 113,113.73V102.4C113,102.1 112.88,101.82 112.67,101.6C112.45,101.39 112.17,101.27 111.86,101.27V92.21C112.16,92.21 112.45,92.09 112.67,91.88C112.88,91.67 113,91.38 113,91.08ZM110.72,170.34C110.72,171.54 110.24,172.69 109.38,173.54C108.53,174.39 107.37,174.87 106.16,174.87H53.71C52.5,174.87 51.34,174.39 50.48,173.54C49.62,172.69 49.14,171.54 49.14,170.34V61.64C49.14,60.44 49.62,59.29 50.48,58.44C51.34,57.59 52.5,57.11 53.71,57.11H106.16C107.37,57.11 108.53,57.59 109.38,58.44C110.24,59.29 110.72,60.44 110.72,61.64V170.34Z"
+ android:fillColor="#80868B"/>
+ <path
+ android:pathData="M54,59L106,59A3,3 0,0 1,109 62L109,170A3,3 0,0 1,106 173L54,173A3,3 0,0 1,51 170L51,62A3,3 0,0 1,54 59z"
+ android:strokeColor="#E0E994"
+ android:strokeWidth="2"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M80,184.72V189.7C80,193.73 83.27,197 87.3,197H164.7C168.73,197 172,193.73 172,189.7V144"
+ android:strokeColor="#5F6368"
+ android:strokeWidth="0.684"
+ android:fillColor="#00000000"/>
+ <path
+ android:pathData="M77,176H83V184.09C83,184.59 82.59,185 82.09,185H77.91C77.41,185 77,184.59 77,184.09V176Z"
+ android:fillColor="#5F6368"/>
+</vector>
diff --git a/res/drawable/ic_do_not_disturb_on_24dp.xml b/res/drawable/ic_do_not_disturb_on_24dp.xml
deleted file mode 100644
index cace8d4..0000000
--- a/res/drawable/ic_do_not_disturb_on_24dp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Copyright (C) 2018 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M7,11h10v2h-10z"/>
-</vector>
diff --git a/res/drawable/ic_external_display_32dp.xml b/res/drawable/ic_external_display_32dp.xml
new file mode 100644
index 0000000..3e18282
--- /dev/null
+++ b/res/drawable/ic_external_display_32dp.xml
@@ -0,0 +1,32 @@
+<?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="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+ <path
+ android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+ android:fillColor="#FAFBD8"/>
+ <group>
+ <clip-path
+ android:pathData="M5.333,5.332h21.333v21.333h-21.333z"/>
+ <path
+ android:pathData="M12.689,23.288V21.643H14.333V19.976H9C8.555,19.976 8.17,19.813 7.844,19.488C7.518,19.162 7.355,18.769 7.355,18.31V9.665C7.355,9.206 7.518,8.814 7.844,8.488C8.17,8.162 8.555,7.999 9,7.999H23C23.444,7.999 23.829,8.162 24.155,8.488C24.481,8.814 24.644,9.206 24.644,9.665V18.31C24.644,18.769 24.481,19.162 24.155,19.488C23.829,19.813 23.444,19.976 23,19.976H17.666V21.643H19.311V23.288H12.689ZM9,18.31H23V9.665H9V18.31ZM9,18.31V9.665V18.31Z"
+ android:fillColor="#8E964B"/>
+ </group>
+</vector>
diff --git a/res/drawable/ic_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml
deleted file mode 100644
index e3b21fa..0000000
--- a/res/drawable/ic_pan_tool_18dp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="18dp"
- android:height="18dp"
- android:viewportWidth="48"
- android:viewportHeight="48"
- android:tint="?android:attr/colorControlNormal">
- <group>
- <clip-path
- android:pathData="M0,0h48v48H0z M 0,0"/>
- <path
- android:pathData="M46,11v29c0,4.4 -3.6,8 -8,8H23.4c-2.16,0 -4.2,-0.86 -5.7,-2.38L2,29.66s2.52,-2.46 2.6,-2.5c0.44,-0.38 0.98,-0.58 1.58,-0.58 0.44,0 0.84,0.12 1.2,0.32 0.08,0.02 8.62,4.92 8.62,4.92V8c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v14h2V3c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v19h2V5c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v17h2V11c0,-1.66 1.34,-3 3,-3s3,1.34 3,3z"
- android:fillColor="#FFFFFF"/>
- </group>
-</vector>
diff --git a/res/drawable/ic_zen_mode_category_apps.xml b/res/drawable/ic_zen_mode_category_apps.xml
new file mode 100644
index 0000000..f21fc6a
--- /dev/null
+++ b/res/drawable/ic_zen_mode_category_apps.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M240,800Q207,800 183.5,776.5Q160,753 160,720Q160,687 183.5,663.5Q207,640 240,640Q273,640 296.5,663.5Q320,687 320,720Q320,753 296.5,776.5Q273,800 240,800ZM480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM720,800Q687,800 663.5,776.5Q640,753 640,720Q640,687 663.5,663.5Q687,640 720,640Q753,640 776.5,663.5Q800,687 800,720Q800,753 776.5,776.5Q753,800 720,800ZM240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560ZM240,320Q207,320 183.5,296.5Q160,273 160,240Q160,207 183.5,183.5Q207,160 240,160Q273,160 296.5,183.5Q320,207 320,240Q320,273 296.5,296.5Q273,320 240,320ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320ZM720,320Q687,320 663.5,296.5Q640,273 640,240Q640,207 663.5,183.5Q687,160 720,160Q753,160 776.5,183.5Q800,207 800,240Q800,273 776.5,296.5Q753,320 720,320Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_category_display.xml b/res/drawable/ic_zen_mode_category_display.xml
new file mode 100644
index 0000000..4771951
--- /dev/null
+++ b/res/drawable/ic_zen_mode_category_display.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M360,580L360,520L600,520L600,580L360,580ZM320,460L320,400L640,400L640,460L320,460ZM280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_category_duration.xml b/res/drawable/ic_zen_mode_category_duration.xml
new file mode 100644
index 0000000..56d9c4a
--- /dev/null
+++ b/res/drawable/ic_zen_mode_category_duration.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M360,120L360,40L600,40L600,120L360,120ZM440,560L520,560L520,320L440,320L440,560ZM480,880Q406,880 340.5,851.5Q275,823 226,774Q177,725 148.5,659.5Q120,594 120,520Q120,446 148.5,380.5Q177,315 226,266Q275,217 340.5,188.5Q406,160 480,160Q542,160 599,180Q656,200 706,238L762,182L818,238L762,294Q800,344 820,401Q840,458 840,520Q840,594 811.5,659.5Q783,725 734,774Q685,823 619.5,851.5Q554,880 480,880ZM480,800Q596,800 678,718Q760,636 760,520Q760,404 678,322Q596,240 480,240Q364,240 282,322Q200,404 200,520Q200,636 282,718Q364,800 480,800ZM480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_category_other.xml b/res/drawable/ic_zen_mode_category_other.xml
new file mode 100644
index 0000000..9a47523
--- /dev/null
+++ b/res/drawable/ic_zen_mode_category_other.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M560,829L560,747Q650,721 705,647Q760,573 760,479Q760,385 705,311Q650,237 560,211L560,129Q684,157 762,254.5Q840,352 840,479Q840,606 762,703.5Q684,801 560,829ZM120,600L120,360L280,360L480,160L480,800L280,600L120,600ZM560,640L560,318Q607,340 633.5,384Q660,428 660,480Q660,531 633.5,574.5Q607,618 560,640ZM400,354L314,440L200,440L200,520L314,520L400,606L400,354ZM300,480L300,480L300,480L300,480L300,480L300,480Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_category_people.xml b/res/drawable/ic_zen_mode_category_people.xml
new file mode 100644
index 0000000..e763c45
--- /dev/null
+++ b/res/drawable/ic_zen_mode_category_people.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M40,800L40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,800L40,800ZM760,800L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,800L760,800ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM760,320Q760,386 713,433Q666,480 600,480Q589,480 572,477.5Q555,475 544,472Q571,440 585.5,401Q600,362 600,320Q600,278 585.5,239Q571,200 544,168Q558,163 572,161.5Q586,160 600,160Q666,160 713,207Q760,254 760,320ZM120,720L600,720L600,688Q600,677 594.5,668Q589,659 580,654Q526,627 471,613.5Q416,600 360,600Q304,600 249,613.5Q194,627 140,654Q131,659 125.5,668Q120,677 120,688L120,720ZM360,400Q393,400 416.5,376.5Q440,353 440,320Q440,287 416.5,263.5Q393,240 360,240Q327,240 303.5,263.5Q280,287 280,320Q280,353 303.5,376.5Q327,400 360,400ZM360,720L360,720L360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720ZM360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_display_aod.xml b/res/drawable/ic_zen_mode_display_aod.xml
new file mode 100644
index 0000000..9d60fb1
--- /dev/null
+++ b/res/drawable/ic_zen_mode_display_aod.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M820,932L28,140L84,84L876,876L820,932ZM200,257L280,337L280,720L664,720L760,816L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920Q247,920 223.5,896.5Q200,873 200,840L200,257ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM353,240L274,160L680,160L680,120Q680,120 680,120Q680,120 680,120L234,120L234,120L206,92Q216,69 235.5,54.5Q255,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,646L680,566L680,240L353,240ZM480,800L480,800Q480,800 480,800Q480,800 480,800L480,800Q480,800 480,800Q480,800 480,800L480,800ZM457,160L457,160L457,160L457,160Q457,160 457,160Q457,160 457,160Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_display_dark_theme.xml b/res/drawable/ic_zen_mode_display_dark_theme.xml
new file mode 100644
index 0000000..43bc682
--- /dev/null
+++ b/res/drawable/ic_zen_mode_display_dark_theme.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,840Q347,840 253.5,747.5Q160,655 160,524Q160,458 185,402Q210,346 254,302L480,80L706,302Q750,346 775,402Q800,458 800,524Q800,655 706.5,747.5Q613,840 480,840ZM480,760L480,192L310,360Q275,393 257.5,434.5Q240,476 240,524Q240,621 310,690.5Q380,760 480,760Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_display_grayscale.xml b/res/drawable/ic_zen_mode_display_grayscale.xml
new file mode 100644
index 0000000..d7fe9ab
--- /dev/null
+++ b/res/drawable/ic_zen_mode_display_grayscale.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,416 775.5,357.5Q751,299 706,254L254,706Q299,751 357.5,775.5Q416,800 480,800ZM480,640L480,580L680,580L680,640L480,640ZM320,460L380,460L380,380L460,380L460,320L380,320L380,240L320,240L320,320L240,320L240,380L320,380L320,460Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_display_wallpaper.xml b/res/drawable/ic_zen_mode_display_wallpaper.xml
new file mode 100644
index 0000000..27d169c
--- /dev/null
+++ b/res/drawable/ic_zen_mode_display_wallpaper.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,680Q463,680 451.5,668.5Q440,657 440,640Q440,623 451.5,611.5Q463,600 480,600Q497,600 508.5,611.5Q520,623 520,640Q520,657 508.5,668.5Q497,680 480,680ZM440,520L440,280L520,280L520,520L440,520ZM280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_generic_contact.xml b/res/drawable/ic_zen_mode_generic_contact.xml
new file mode 100644
index 0000000..3721dc5
--- /dev/null
+++ b/res/drawable/ic_zen_mode_generic_contact.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800ZM240,720L720,720L720,688Q720,677 714.5,668Q709,659 700,654Q646,627 591,613.5Q536,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400ZM480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320ZM480,720L480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720L480,720Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_icon_cookie.xml b/res/drawable/ic_zen_mode_icon_cookie.xml
new file mode 100644
index 0000000..0e4bafb
--- /dev/null
+++ b/res/drawable/ic_zen_mode_icon_cookie.xml
@@ -0,0 +1,25 @@
+<!--
+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="136dp"
+ android:height="136dp"
+ android:tint="?android:attr/colorControlNormal"
+ android:viewportHeight="136"
+ android:viewportWidth="136">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M58.0961 4.18448C58.326 3.95917 58.441 3.84652 58.5407 3.75268C63.8544 -1.25089 72.1456 -1.25089 77.4593 3.75268C77.559 3.84652 77.674 3.95917 77.9039 4.18448C78.0419 4.31967 78.1109 4.38727 78.1765 4.44986C81.5767 7.69486 86.3948 8.98588 90.962 7.87573C91.0501 7.85432 91.1436 7.83027 91.3307 7.78218C91.6425 7.70204 91.7984 7.66196 91.9317 7.63052C99.0352 5.95417 106.216 10.0998 108.316 17.0898C108.355 17.2209 108.398 17.376 108.485 17.6861C108.537 17.8722 108.563 17.9652 108.588 18.0522C109.91 22.5626 113.437 26.0897 117.948 27.4118C118.035 27.4373 118.128 27.4633 118.314 27.5152C118.624 27.6017 118.779 27.6449 118.91 27.6843C125.9 29.7844 130.046 36.9648 128.369 44.0684C128.338 44.2016 128.298 44.3575 128.218 44.6693C128.17 44.8564 128.146 44.9499 128.124 45.038C127.014 49.6052 128.305 54.4233 131.55 57.8235C131.613 57.8891 131.68 57.9581 131.816 58.0961C132.041 58.326 132.153 58.441 132.247 58.5407C137.251 63.8544 137.251 72.1456 132.247 77.4593C132.153 77.559 132.041 77.674 131.816 77.9039C131.68 78.0419 131.613 78.1109 131.55 78.1765C128.305 81.5767 127.014 86.3948 128.124 90.962C128.146 91.0501 128.17 91.1436 128.218 91.3307C128.298 91.6425 128.338 91.7984 128.369 91.9316C130.046 99.0352 125.9 106.216 118.91 108.316C118.779 108.355 118.624 108.398 118.314 108.485C118.128 108.537 118.035 108.563 117.948 108.588C113.437 109.91 109.91 113.437 108.588 117.948C108.563 118.035 108.537 118.128 108.485 118.314C108.398 118.624 108.355 118.779 108.316 118.91C106.216 125.9 99.0352 130.046 91.9316 128.369C91.7984 128.338 91.6425 128.298 91.3307 128.218C91.1436 128.17 91.0501 128.146 90.962 128.124C86.3948 127.014 81.5767 128.305 78.1765 131.55C78.1109 131.613 78.0419 131.68 77.9039 131.816C77.674 132.041 77.559 132.153 77.4593 132.247C72.1456 137.251 63.8544 137.251 58.5407 132.247C58.441 132.153 58.326 132.041 58.0961 131.816C57.9581 131.68 57.8891 131.613 57.8235 131.55C54.4233 128.305 49.6052 127.014 45.038 128.124C44.9499 128.146 44.8564 128.17 44.6693 128.218C44.3575 128.298 44.2016 128.338 44.0684 128.369C36.9648 130.046 29.7844 125.9 27.6843 118.91C27.6449 118.779 27.6017 118.624 27.5152 118.314C27.4633 118.128 27.4373 118.035 27.4118 117.948C26.0897 113.437 22.5626 109.91 18.0522 108.588C17.9652 108.563 17.8722 108.537 17.6861 108.485C17.376 108.398 17.2209 108.355 17.0898 108.316C10.0998 106.216 5.95417 99.0352 7.63052 91.9317C7.66196 91.7984 7.70204 91.6425 7.78218 91.3307C7.83027 91.1436 7.85432 91.0501 7.87573 90.962C8.98588 86.3948 7.69486 81.5767 4.44986 78.1765C4.38727 78.1109 4.31967 78.0419 4.18448 77.9039C3.95917 77.674 3.84652 77.559 3.75268 77.4593C-1.25089 72.1456 -1.25089 63.8544 3.75268 58.5407C3.84652 58.441 3.95917 58.326 4.18448 58.0961C4.31967 57.9581 4.38727 57.8891 4.44986 57.8235C7.69486 54.4233 8.98588 49.6052 7.87573 45.038C7.85432 44.9499 7.83027 44.8564 7.78218 44.6693C7.70204 44.3575 7.66196 44.2016 7.63052 44.0683C5.95417 36.9648 10.0998 29.7844 17.0898 27.6843C17.2209 27.6449 17.376 27.6017 17.6861 27.5152C17.8722 27.4633 17.9652 27.4373 18.0522 27.4118C22.5626 26.0897 26.0897 22.5626 27.4118 18.0522C27.4373 17.9652 27.4633 17.8722 27.5152 17.6861C27.6017 17.376 27.6449 17.2209 27.6843 17.0898C29.7844 10.0998 36.9648 5.95417 44.0683 7.63052C44.2016 7.66196 44.3575 7.70204 44.6693 7.78218C44.8564 7.83027 44.9499 7.85432 45.038 7.87573C49.6052 8.98588 54.4233 7.69486 57.8235 4.44986C57.8891 4.38727 57.9581 4.31967 58.0961 4.18448Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_action_change_icon.xml b/res/drawable/ic_zen_mode_new_option_custom.xml
similarity index 65%
rename from res/drawable/ic_zen_mode_action_change_icon.xml
rename to res/drawable/ic_zen_mode_new_option_custom.xml
index 4cf4167..c3a45cc 100644
--- a/res/drawable/ic_zen_mode_action_change_icon.xml
+++ b/res/drawable/ic_zen_mode_new_option_custom.xml
@@ -21,5 +21,5 @@
android:viewportWidth="960">
<path
android:fillColor="@android:color/white"
- android:pathData="M620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,700Q548,700 603.5,661.5Q659,623 684,560L276,560Q301,623 356.5,661.5Q412,700 480,700ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z" />
+ android:pathData="M620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,700Q548,700 603.5,661.5Q659,623 684,560L618,560Q596,597 559.5,618.5Q523,640 480,640Q437,640 400.5,618.5Q364,597 342,560L276,560Q301,623 356.5,661.5Q412,700 480,700ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_people_all.xml b/res/drawable/ic_zen_mode_people_all.xml
new file mode 100644
index 0000000..c6194d5
--- /dev/null
+++ b/res/drawable/ic_zen_mode_people_all.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M0,720L0,657Q0,614 44,587Q88,560 160,560Q173,560 185,560.5Q197,561 208,563Q194,584 187,607Q180,630 180,655L180,720L0,720ZM240,720L240,655Q240,623 257.5,596.5Q275,570 307,550Q339,530 383.5,520Q428,510 480,510Q533,510 577.5,520Q622,530 654,550Q686,570 703,596.5Q720,623 720,655L720,720L240,720ZM780,720L780,655Q780,629 773.5,606Q767,583 754,563Q765,561 776.5,560.5Q788,560 800,560Q872,560 916,586.5Q960,613 960,657L960,720L780,720ZM325,640L636,640L636,640Q626,620 580.5,605Q535,590 480,590Q425,590 379.5,605Q334,620 325,640ZM160,520Q127,520 103.5,496.5Q80,473 80,440Q80,406 103.5,383Q127,360 160,360Q194,360 217,383Q240,406 240,440Q240,473 217,496.5Q194,520 160,520ZM800,520Q767,520 743.5,496.5Q720,473 720,440Q720,406 743.5,383Q767,360 800,360Q834,360 857,383Q880,406 880,440Q880,473 857,496.5Q834,520 800,520ZM480,480Q430,480 395,445Q360,410 360,360Q360,309 395,274.5Q430,240 480,240Q531,240 565.5,274.5Q600,309 600,360Q600,410 565.5,445Q531,480 480,480ZM480,400Q497,400 508.5,388.5Q520,377 520,360Q520,343 508.5,331.5Q497,320 480,320Q463,320 451.5,331.5Q440,343 440,360Q440,377 451.5,388.5Q463,400 480,400ZM481,640L481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640Q481,640 481,640L481,640ZM480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_people_calls.xml b/res/drawable/ic_zen_mode_people_calls.xml
new file mode 100644
index 0000000..6aacc03
--- /dev/null
+++ b/res/drawable/ic_zen_mode_people_calls.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M798,840Q673,840 551,785.5Q429,731 329,631Q229,531 174.5,409Q120,287 120,162Q120,144 132,132Q144,120 162,120L324,120Q338,120 349,129.5Q360,139 362,152L388,292Q390,308 387,319Q384,330 376,338L279,436Q299,473 326.5,507.5Q354,542 387,574Q418,605 452,631.5Q486,658 524,680L618,586Q627,577 641.5,572.5Q656,568 670,570L808,598Q822,602 831,612.5Q840,623 840,636L840,798Q840,816 828,828Q816,840 798,840ZM241,360L307,294Q307,294 307,294Q307,294 307,294L290,200Q290,200 290,200Q290,200 290,200L201,200Q201,200 201,200Q201,200 201,200Q206,241 215,281Q224,321 241,360ZM599,718Q638,735 678.5,745Q719,755 760,758Q760,758 760,758Q760,758 760,758L760,670Q760,670 760,670Q760,670 760,670L666,651Q666,651 666,651Q666,651 666,651L599,718ZM241,360Q241,360 241,360Q241,360 241,360Q241,360 241,360Q241,360 241,360L241,360Q241,360 241,360Q241,360 241,360L241,360Q241,360 241,360Q241,360 241,360ZM599,718L599,718Q599,718 599,718Q599,718 599,718L599,718Q599,718 599,718Q599,718 599,718L599,718Q599,718 599,718Q599,718 599,718Q599,718 599,718Q599,718 599,718Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_people_messages.xml b/res/drawable/ic_zen_mode_people_messages.xml
new file mode 100644
index 0000000..21db1f4
--- /dev/null
+++ b/res/drawable/ic_zen_mode_people_messages.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M240,560L560,560L560,480L240,480L240,560ZM240,440L720,440L720,360L240,360L240,440ZM240,320L720,320L720,240L240,240L240,320ZM80,880L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L240,720L80,880ZM206,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,685L206,640ZM160,640L160,640L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_sound_alarms.xml b/res/drawable/ic_zen_mode_sound_alarms.xml
new file mode 100644
index 0000000..b2761ca
--- /dev/null
+++ b/res/drawable/ic_zen_mode_sound_alarms.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520Q120,445 148.5,379.5Q177,314 225.5,265.5Q274,217 339.5,188.5Q405,160 480,160Q555,160 620.5,188.5Q686,217 734.5,265.5Q783,314 811.5,379.5Q840,445 840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880ZM480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520Q480,520 480,520ZM592,688L648,632L520,504L520,320L440,320L440,536L592,688ZM224,94L280,150L110,320L54,264L224,94ZM736,94L906,264L850,320L680,150L736,94ZM480,800Q597,800 678.5,718.5Q760,637 760,520Q760,403 678.5,321.5Q597,240 480,240Q363,240 281.5,321.5Q200,403 200,520Q200,637 281.5,718.5Q363,800 480,800Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_sound_events.xml b/res/drawable/ic_zen_mode_sound_events.xml
new file mode 100644
index 0000000..15035e4
--- /dev/null
+++ b/res/drawable/ic_zen_mode_sound_events.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M580,720Q538,720 509,691Q480,662 480,620Q480,578 509,549Q538,520 580,520Q622,520 651,549Q680,578 680,620Q680,662 651,691Q622,720 580,720ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240Q120,207 143.5,183.5Q167,160 200,160L240,160L240,80L320,80L320,160L640,160L640,80L720,80L720,160L760,160Q793,160 816.5,183.5Q840,207 840,240L840,800Q840,833 816.5,856.5Q793,880 760,880L200,880ZM200,800L760,800Q760,800 760,800Q760,800 760,800L760,400L200,400L200,800Q200,800 200,800Q200,800 200,800ZM200,320L760,320L760,240Q760,240 760,240Q760,240 760,240L200,240Q200,240 200,240Q200,240 200,240L200,320ZM200,320L200,240Q200,240 200,240Q200,240 200,240L200,240Q200,240 200,240Q200,240 200,240L200,320Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_sound_media.xml b/res/drawable/ic_zen_mode_sound_media.xml
new file mode 100644
index 0000000..f2bedcb
--- /dev/null
+++ b/res/drawable/ic_zen_mode_sound_media.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M400,840Q334,840 287,793Q240,746 240,680Q240,614 287,567Q334,520 400,520Q423,520 442.5,525.5Q462,531 480,542L480,120L720,120L720,280L560,280L560,680Q560,746 513,793Q466,840 400,840Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_sound_reminders.xml b/res/drawable/ic_zen_mode_sound_reminders.xml
new file mode 100644
index 0000000..cd9490a
--- /dev/null
+++ b/res/drawable/ic_zen_mode_sound_reminders.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M260,320L300,320L300,280Q300,263 288.5,251.5Q277,240 260,240Q243,240 231.5,251.5Q220,263 220,280Q220,297 231.5,308.5Q243,320 260,320ZM440,320Q457,320 468.5,308.5Q480,297 480,280Q480,263 468.5,251.5Q457,240 440,240Q423,240 411.5,251.5Q400,263 400,280L400,320L440,320ZM502,620L502,620L502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620L502,620ZM419,880Q391,880 366.5,868Q342,856 325,834L107,557L126,537Q146,516 174,512Q202,508 226,523L300,568L300,400L260,400Q210,400 175,365Q140,330 140,280Q140,230 175,195Q210,160 260,160Q271,160 280.5,162Q290,164 300,167L300,120Q300,103 311.5,91.5Q323,80 340,80Q357,80 369,91.5Q381,103 381,120L381,176Q395,168 409.5,164Q424,160 440,160Q490,160 525,195Q560,230 560,280Q560,330 525,365Q490,400 440,400L381,400L381,712L284,652L388,785Q394,792 402,796Q410,800 419,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 708.5,531.5Q697,520 680,520L461,520L461,440L680,440Q730,440 765,475Q800,510 800,560L800,720Q800,786 753,833Q706,880 640,880L419,880Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_sound_system.xml b/res/drawable/ic_zen_mode_sound_system.xml
new file mode 100644
index 0000000..2da05d8
--- /dev/null
+++ b/res/drawable/ic_zen_mode_sound_system.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M419,880Q391,880 366.5,868Q342,856 325,834L107,557L126,537Q146,516 174,512Q202,508 226,523L300,568L300,240Q300,223 311.5,211.5Q323,200 340,200Q357,200 369,211.5Q381,223 381,240L381,712L284,652L388,785Q394,792 402,796Q410,800 419,800L640,800Q673,800 696.5,776.5Q720,753 720,720L720,560Q720,543 708.5,531.5Q697,520 680,520L461,520L461,440L680,440Q730,440 765,475Q800,510 800,560L800,720Q800,786 753,833Q706,880 640,880L419,880ZM167,340Q154,318 147,292.5Q140,267 140,240Q140,157 198.5,98.5Q257,40 340,40Q423,40 481.5,98.5Q540,157 540,240Q540,267 533,292.5Q526,318 513,340L444,300Q452,286 456,271.5Q460,257 460,240Q460,190 425,155Q390,120 340,120Q290,120 255,155Q220,190 220,240Q220,257 224,271.5Q228,286 236,300L167,340ZM502,620L502,620L502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620Q502,620 502,620Q502,620 502,620L502,620L502,620Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_trigger_with_activity.xml b/res/drawable/ic_zen_mode_trigger_with_activity.xml
new file mode 100644
index 0000000..567f01a
--- /dev/null
+++ b/res/drawable/ic_zen_mode_trigger_with_activity.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="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,600L200,600L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,360L120,360L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM420,680L364,622L466,520L120,520L120,440L466,440L364,338L420,280L620,480L420,680Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_zen_mode_trigger_without_activity.xml b/res/drawable/ic_zen_mode_trigger_without_activity.xml
new file mode 100644
index 0000000..11a97f1
--- /dev/null
+++ b/res/drawable/ic_zen_mode_trigger_without_activity.xml
@@ -0,0 +1,25 @@
+<!--
+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">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M352,840L200,840Q167,840 143.5,816.5Q120,793 120,760L120,608Q168,608 204,577.5Q240,547 240,500Q240,453 204,422.5Q168,392 120,392L120,240Q120,207 143.5,183.5Q167,160 200,160L360,160Q360,118 389,89Q418,60 460,60Q502,60 531,89Q560,118 560,160L720,160Q753,160 776.5,183.5Q800,207 800,240L800,400Q842,400 871,429Q900,458 900,500Q900,542 871,571Q842,600 800,600L800,760Q800,793 776.5,816.5Q753,840 720,840L568,840Q568,790 536.5,755Q505,720 460,720Q415,720 383.5,755Q352,790 352,840ZM200,760L285,760Q309,694 362,667Q415,640 460,640Q505,640 558,667Q611,694 635,760L720,760L720,520L800,520Q808,520 814,514Q820,508 820,500Q820,492 814,486Q808,480 800,480L720,480L720,240L480,240L480,160Q480,152 474,146Q468,140 460,140Q452,140 446,146Q440,152 440,160L440,240L200,240L200,328Q254,348 287,395Q320,442 320,500Q320,557 287,604Q254,651 200,672L200,760ZM460,500L460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500L460,500L460,500L460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500L460,500L460,500L460,500L460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500L460,500L460,500L460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500Q460,500 460,500Z" />
+</vector>
\ 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
new file mode 100644
index 0000000..faaa1fd
--- /dev/null
+++ b/res/drawable/preference_circular_icons_plus_item_background.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ 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"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ android:shape="oval">
+ <size
+ android:width="@dimen/zen_mode_circular_icon_diameter"
+ android:height="@dimen/zen_mode_circular_icon_diameter" />
+ <solid android:color="?androidprv:attr/materialColorSecondaryContainer" />
+</shape>
\ No newline at end of file
diff --git a/res/layout-land/bluetooth_audio_streams_qr_code.xml b/res/layout-land/bluetooth_audio_streams_qr_code.xml
new file mode 100644
index 0000000..1715197
--- /dev/null
+++ b/res/layout-land/bluetooth_audio_streams_qr_code.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:padding="25dp"
+ android:baselineAligned="false">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="start"
+ android:textSize="15sp"
+ android:textColor="?android:attr/textColorPrimary" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/qrcode_view"
+ android:layout_width="@dimen/qrcode_size"
+ android:layout_height="@dimen/qrcode_size"
+ android:contentDescription="@string/qr_code_content_description"
+ android:focusable="true" />
+
+ <TextView
+ android:id="@+id/password"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="15sp"
+ android:textColor="?android:attr/textColorPrimary" />
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout-land/qrcode_scanner_fragment.xml b/res/layout-land/qrcode_scanner_fragment.xml
new file mode 100644
index 0000000..0e563e3
--- /dev/null
+++ b/res/layout-land/qrcode_scanner_fragment.xml
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
+ <TextView
+ android:id="@android:id/summary"
+ style="@style/QrCodeScanner"
+ android:gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:gravity="center"
+ android:clipChildren="true"
+ android:contentDescription="@string/audio_streams_qr_code_scanner_label"
+ android:focusable="true">
+ <TextureView
+ android:id="@+id/preview_view"
+ android:layout_marginStart="@dimen/qrcode_preview_margin"
+ android:layout_marginEnd="@dimen/qrcode_preview_margin"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/qrcode_preview_size"/>
+ </FrameLayout>
+
+ <TextView
+ android:id="@+id/error_message"
+ style="@style/TextAppearance.ErrorText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:visibility="invisible"/>
+
+ </LinearLayout>
+
+
+</LinearLayout>
+
diff --git a/res/layout-land/request_manage_credentials.xml b/res/layout-land/request_manage_credentials.xml
index fbe0bd0..f6bfa0e 100644
--- a/res/layout-land/request_manage_credentials.xml
+++ b/res/layout-land/request_manage_credentials.xml
@@ -16,6 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
diff --git a/res/layout-sw600dp/request_manage_credentials.xml b/res/layout-sw600dp/request_manage_credentials.xml
index 42facd3..529edf1 100644
--- a/res/layout-sw600dp/request_manage_credentials.xml
+++ b/res/layout-sw600dp/request_manage_credentials.xml
@@ -17,6 +17,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
diff --git a/res/layout/accessibility_edit_shortcut.xml b/res/layout/accessibility_edit_shortcut.xml
deleted file mode 100644
index d0c925e..0000000
--- a/res/layout/accessibility_edit_shortcut.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License
- -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipChildren="true">
-
- <ScrollView
- android:id="@+id/container_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scrollbarStyle="outsideOverlay">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="24dp">
-
- <include android:id="@+id/software_shortcut"
- layout="@layout/accessibility_edit_shortcut_component"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="32dp" />
-
- <include android:id="@+id/hardware_shortcut"
- layout="@layout/accessibility_edit_shortcut_component" />
-
- </LinearLayout>
- </ScrollView>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/accessibility_edit_shortcut_component.xml b/res/layout/accessibility_edit_shortcut_component.xml
deleted file mode 100644
index d54fff6..0000000
--- a/res/layout/accessibility_edit_shortcut_component.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:orientation="vertical">
-
- <CheckBox
- android:id="@+id/checkbox"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="48dp"
- android:background="@null"
- android:clickable="false"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:paddingStart="12dp"
- android:saveEnabled="false"
- android:textColor="?android:attr/textColorAlertDialogListItem"
- android:textSize="16sp" />
-
- <TextView
- android:id="@+id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingStart="44dp"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary" />
-
- </LinearLayout>
-
- <include layout="@layout/accessibility_lottie_animation_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="44dp"/>
-
-</LinearLayout>
diff --git a/res/layout/accessibility_edit_shortcut_magnification.xml b/res/layout/accessibility_edit_shortcut_magnification.xml
deleted file mode 100644
index 0f30a01..0000000
--- a/res/layout/accessibility_edit_shortcut_magnification.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License
- -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clipChildren="true">
-
- <ScrollView
- android:id="@+id/container_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scrollbarStyle="outsideOverlay">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:padding="24dp">
-
- <include
- android:id="@+id/software_shortcut"
- layout="@layout/accessibility_edit_shortcut_component"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="32dp" />
-
- <include
- android:id="@+id/hardware_shortcut"
- layout="@layout/accessibility_edit_shortcut_component"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="32dp" />
-
- <include
- android:id="@+id/two_finger_triple_tap_shortcut"
- layout="@layout/accessibility_edit_shortcut_component"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="32dp"
- android:visibility="gone" />
-
- <LinearLayout
- android:id="@+id/advanced_shortcut"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:orientation="horizontal">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="centerCrop"
- android:src="@drawable/ic_keyboard_arrow_down" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:paddingStart="12dp"
- android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
- android:textAppearance="?android:attr/textAppearanceListItem"
- android:textColor="?android:attr/colorAccent"
- android:textSize="16sp" />
-
- </LinearLayout>
-
- <include
- android:id="@+id/triple_tap_shortcut"
- layout="@layout/accessibility_edit_shortcut_component"
- android:visibility="gone" />
-
- </LinearLayout>
- </ScrollView>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index d29c34f..dd8e43a 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -17,21 +17,43 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
android:orientation="vertical">
- <ImageView
- android:id="@+id/header_icon"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_gravity="center_horizontal"
- android:antialias="true"
- android:background="@drawable/circle_outline"
- android:padding="8dp"
- android:scaleType="fitCenter"/>
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal">
+ <ImageView
+ android:id="@+id/header_icon"
+ android:layout_width="72dp"
+ android:layout_height="72dp"
+ android:layout_gravity="center"
+ android:antialias="true"
+ android:background="@drawable/circle_outline"
+ android:padding="8dp"
+ android:scaleType="fitCenter" />
+
+ <com.google.android.material.progressindicator.CircularProgressIndicator
+ android:id="@+id/battery_ring"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="false"
+ app:trackColor="@android:color/transparent"
+ app:indicatorColor="@color/settingslib_materialColorPrimary"
+ app:trackThickness="4dp"
+ app:indicatorSize="76dp"
+ app:indicatorInset="0dp"
+ app:trackCornerRadius="2dp"
+ android:max="100"
+ android:visibility="gone" />
+
+ </FrameLayout>
<TextView
android:id="@+id/header_title"
diff --git a/res/layout/audio_sharing_device_item.xml b/res/layout/audio_sharing_device_item.xml
index 04ecdd7..c1720e8 100644
--- a/res/layout/audio_sharing_device_item.xml
+++ b/res/layout/audio_sharing_device_item.xml
@@ -17,6 +17,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -27,6 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
+ android:textColor="?androidprv:attr/textColorOnAccent"
android:background="@drawable/audio_sharing_rounded_bg_ripple"
android:textAlignment="center" />
diff --git a/res/xml/bluetooth_audio_streams_qr_code.xml b/res/layout/bluetooth_audio_streams_qr_code.xml
similarity index 91%
rename from res/xml/bluetooth_audio_streams_qr_code.xml
rename to res/layout/bluetooth_audio_streams_qr_code.xml
index 5ec5505..ae2d4e0 100644
--- a/res/xml/bluetooth_audio_streams_qr_code.xml
+++ b/res/layout/bluetooth_audio_streams_qr_code.xml
@@ -47,7 +47,9 @@
<ImageView
android:id="@+id/qrcode_view"
android:layout_width="@dimen/qrcode_size"
- android:layout_height="@dimen/qrcode_size"/>
+ android:layout_height="@dimen/qrcode_size"
+ android:contentDescription="@string/qr_code_content_description"
+ android:focusable="true"/>
<TextView
android:id="@+id/password"
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index fb3435b..9387d5d 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -20,13 +20,13 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/bluetooth_dialog_padding_top">
<LinearLayout
android:paddingStart="16dip"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:layout_marginTop="@dimen/bluetooth_dialog_padding_top"
android:orientation="vertical">
<TextView
@@ -85,7 +85,7 @@
android:orientation="horizontal">
<LinearLayout
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginEnd="10dp"
android:orientation="vertical">
@@ -105,7 +105,6 @@
android:id="@+id/phonebook_sharing_message_confirm_pin"
android:layout_width="wrap_content"
android:layout_height="48dp"
- android:layout_weight="0"
android:gravity="center_vertical"
android:contentDescription="@string/bluetooth_pairing_phonebook_toggle_text"
android:switchMinWidth="48dp" />
diff --git a/res/layout/dialog_custom_body_audio_sharing.xml b/res/layout/dialog_custom_body_audio_sharing.xml
index 388a4941..528bfbb 100644
--- a/res/layout/dialog_custom_body_audio_sharing.xml
+++ b/res/layout/dialog_custom_body_audio_sharing.xml
@@ -15,57 +15,66 @@
~ limitations under the License.
-->
-<LinearLayout
+<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingHorizontal="?android:dialogPreferredPadding"
- android:paddingBottom="?android:dialogPreferredPadding">
+ android:scrollbars="none">
- <TextView
- android:id="@+id/description_text"
- style="@style/DeviceAudioSharingText"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:paddingBottom="24dp"
- android:visibility="gone" />
+ android:orientation="vertical"
+ android:paddingBottom="?android:dialogPreferredPadding"
+ android:paddingHorizontal="?android:dialogPreferredPadding">
- <ImageView
- android:id="@+id/description_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:visibility="gone" />
+ <TextView
+ android:id="@+id/description_text"
+ style="@style/DeviceAudioSharingText"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingBottom="24dp"
+ android:visibility="gone" />
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/device_btn_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:nestedScrollingEnabled="false"
- android:overScrollMode="never"
- android:visibility="gone" />
+ <ImageView
+ android:id="@+id/description_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:visibility="gone" />
- <Button
- android:id="@+id/positive_btn"
- style="@style/SettingsLibActionButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginTop="4dp"
- android:background="@drawable/audio_sharing_rounded_bg_ripple"
- android:visibility="gone" />
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/device_btn_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:nestedScrollingEnabled="false"
+ android:overScrollMode="never"
+ android:visibility="gone" />
- <Button
- android:id="@+id/negative_btn"
- style="@style/SettingsLibActionButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginTop="4dp"
- android:background="@drawable/audio_sharing_rounded_bg_ripple"
- android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
+ <Button
+ android:id="@+id/positive_btn"
+ style="@style/SettingsLibActionButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="4dp"
+ android:textColor="?androidprv:attr/textColorOnAccent"
+ android:background="@drawable/audio_sharing_rounded_bg_ripple"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/negative_btn"
+ style="@style/SettingsLibActionButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="4dp"
+ android:textColor="?androidprv:attr/textColorOnAccent"
+ android:background="@drawable/audio_sharing_rounded_bg_ripple"
+ android:visibility="gone" />
+ </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
deleted file mode 100644
index 96989bb..0000000
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:textDirection="locale"
- android:scrollbarStyle="outsideOverlay"
- android:gravity="top">
-
- <LinearLayout
- android:accessibilityDataSensitive="yes"
- style="@style/AccessibilityDialog">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_horizontal"
- android:paddingLeft="24dp"
- android:paddingRight="24dp">
-
- <ImageView
- android:id="@+id/permissionDialog_icon"
- style="@style/AccessibilityDialogServiceIcon" />
-
- <TextView
- android:id="@+id/permissionDialog_title"
- style="@style/AccessibilityDialogTitle" />
-
- <TextView
- android:id="@+id/permissionDialog_description"
- android:text="@string/accessibility_service_warning_description"
- style="@style/AccessibilityDialogDescription" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="24dp" >
-
- <ImageView
- android:id="@+id/controlScreen_icon"
- android:src="@drawable/ic_visibility_18dp"
- style="@style/AccessibilityDialogIcon" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/controlScreen_title"
- android:text="@string/accessibility_service_screen_control_title"
- style="@style/AccessibilityDialogPermissionTitle" />
-
- <TextView
- android:id="@+id/controlScreen_description"
- android:text="@string/accessibility_service_screen_control_description"
- style="@style/AccessibilityDialogPermissionDescription" />
-
- </LinearLayout>
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginBottom="24dp" >
-
- <ImageView
- android:id="@+id/performAction_icon"
- android:src="@drawable/ic_pan_tool_18dp"
- style="@style/AccessibilityDialogIcon" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/performAction_title"
- android:text="@string/accessibility_service_action_perform_title"
- style="@style/AccessibilityDialogPermissionTitle" />
-
- <TextView
- android:id="@+id/performAction_description"
- android:text="@string/accessibility_service_action_perform_description"
- style="@style/AccessibilityDialogPermissionDescription" />
-
- </LinearLayout>
-
- </LinearLayout>
-
- </LinearLayout>
-
- <!-- Buttons on bottom of dialog -->
- <LinearLayout
- style="@style/AccessibilityDialogButtonList">
-
- <Space
- style="@style/AccessibilityDialogButtonBarSpace"/>
-
- <Button
- android:id="@+id/permission_enable_allow_button"
- android:text="@string/accessibility_dialog_button_allow"
- style="@style/AccessibilityDialogButton" />
-
- <Button
- android:id="@+id/permission_enable_deny_button"
- android:text="@string/accessibility_dialog_button_deny"
- style="@style/AccessibilityDialogButton" />
-
- <Button
- android:id="@+id/permission_enable_uninstall_button"
- android:text="@string/uninstall_text"
- android:visibility="gone"
- style="@style/AccessibilityDialogButton" />
- </LinearLayout>
- </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/modes_activation_button.xml b/res/layout/modes_activation_button.xml
index e8ed824..1441844 100644
--- a/res/layout/modes_activation_button.xml
+++ b/res/layout/modes_activation_button.xml
@@ -18,7 +18,8 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingVertical="8dp">
<Button
android:id="@+id/activate_mode"
diff --git a/res/layout/modes_edit_done_button.xml b/res/layout/modes_edit_done_button.xml
new file mode 100644
index 0000000..dc1f54d
--- /dev/null
+++ b/res/layout/modes_edit_done_button.xml
@@ -0,0 +1,32 @@
+<?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:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <Button
+ android:id="@+id/done"
+ android:text="@string/done"
+ style="@style/ActionPrimaryButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:layout_marginEnd="20dp"
+ />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/modes_edit_name.xml b/res/layout/modes_edit_name.xml
new file mode 100644
index 0000000..0b086c7
--- /dev/null
+++ b/res/layout/modes_edit_name.xml
@@ -0,0 +1,35 @@
+<?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:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <EditText
+ 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" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/modes_icon_list_item.xml b/res/layout/modes_icon_list_item.xml
index aa45de3..72aef52 100644
--- a/res/layout/modes_icon_list_item.xml
+++ b/res/layout/modes_icon_list_item.xml
@@ -24,8 +24,8 @@
<ImageView
android:id="@+id/icon_image_view"
- android:layout_width="@dimen/zen_mode_icon_list_circle_diameter"
- android:layout_height="@dimen/zen_mode_icon_list_circle_diameter"
+ android:layout_width="@dimen/zen_mode_icon_list_item_circle_diameter"
+ android:layout_height="@dimen/zen_mode_icon_list_item_circle_diameter"
android:importantForAccessibility="no"
android:layout_gravity="center" />
</FrameLayout>
diff --git a/res/layout/modes_set_schedule_layout.xml b/res/layout/modes_set_schedule_layout.xml
index 5758cfb..ebb349e 100644
--- a/res/layout/modes_set_schedule_layout.xml
+++ b/res/layout/modes_set_schedule_layout.xml
@@ -30,63 +30,78 @@
android:paddingBottom="24dp">
<!-- Start time & end time row -->
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="fill_horizontal"
android:orientation="horizontal">
- <!-- Start time: title (non-clickable preference), time setter -->
- <LinearLayout
- android:layout_width="0dp"
+ <!-- Start time title (non-clickable preference) -->
+ <TextView
+ android:id="@+id/start_time_label"
+ android:clickable="false"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical">
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintHorizontal_bias="0"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
+ android:text="@string/zen_mode_start_time" />
- <TextView
- android:id="@+id/start_time_label"
- android:clickable="false"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
- android:text="@string/zen_mode_start_time" />
-
- <TextView
- android:id="@+id/start_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
- android:textColor="?android:attr/colorAccent"
- android:textSize="40sp" />
-
- </LinearLayout>
-
- <!-- End time: title (non-clickable preference), time setter -->
- <LinearLayout
- android:layout_width="0dp"
+ <!-- Start time display + setter -->
+ <TextView
+ android:id="@+id/start_time"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical">
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/start_time_label"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintHorizontal_bias="0"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
+ android:textColor="?android:attr/colorAccent"
+ android:textSize="40sp" />
- <TextView
- android:id="@+id/end_time_label"
- android:clickable="false"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
- android:text="@string/zen_mode_end_time" />
+ <!-- Center boundary to make sure each only expands to take up at most half the space -->
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ app:layout_constraintGuide_percent="0.5" />
- <TextView
- android:id="@+id/end_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
- android:textColor="?android:attr/colorAccent"
- android:textSize="40sp" />
+ <!-- End time title (non-clickable preference), left-aligned to edge of time display -->
+ <TextView
+ android:id="@+id/end_time_label"
+ android:clickable="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/end_time"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintHorizontal_bias="0"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Medium"
+ android:text="@string/zen_mode_end_time" />
- </LinearLayout>
+ <!-- End time setter; right-aligned -->
+ <TextView
+ android:id="@+id/end_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@+id/end_time_label"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintHorizontal_bias="1"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"
+ android:textColor="?android:attr/colorAccent"
+ android:textSize="40sp" />
- </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
<!-- Schedule duration display row -->
<LinearLayout
diff --git a/res/layout/pointer_icon_stroke_style_layout.xml b/res/layout/pointer_icon_stroke_style_layout.xml
new file mode 100644
index 0000000..acf919a
--- /dev/null
+++ b/res/layout/pointer_icon_stroke_style_layout.xml
@@ -0,0 +1,60 @@
+<?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="wrap_content"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:orientation="vertical"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/pointer_stroke_style_padding"
+ android:text="@string/pointer_stroke_style"
+ android:textAlignment="viewStart"
+ android:textAppearance="?android:attr/textAppearanceListItem" />
+
+ <RadioGroup
+ android:id="@+id/button_holder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="@dimen/pointer_stroke_style_padding"
+ android:layout_marginBottom="@dimen/pointer_stroke_style_padding"
+ android:padding="@dimen/pointer_stroke_style_padding">
+ <RadioButton android:id="@+id/stroke_style_white"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/pointer_stroke_style_padding"
+ android:text="@string/pointer_stroke_style_name_white"/>
+ <RadioButton android:id="@+id/stroke_style_black"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/pointer_stroke_style_padding"
+ android:text="@string/pointer_stroke_style_name_black"/>
+ <RadioButton android:id="@+id/stroke_style_none"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/pointer_stroke_style_padding"
+ android:text="@string/pointer_stroke_style_name_none"/>
+ </RadioGroup>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_circular_icons.xml b/res/layout/preference_circular_icons.xml
new file mode 100644
index 0000000..ae981b2
--- /dev/null
+++ b/res/layout/preference_circular_icons.xml
@@ -0,0 +1,84 @@
+<?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.
+ -->
+
+<!-- Based off preference_two_target.xml, with the added LinearLayout for the icons. -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:gravity="center_vertical"
+ android:background="?android:attr/selectableItemBackground"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:clipToPadding="false">
+
+ <include layout="@layout/settingslib_icon_frame"/>
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp">
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="2"
+ android:hyphenationFrequency="normalFast"
+ android:lineBreakWordStyle="phrase"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ android:ellipsize="marquee"/>
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary"
+ android:hyphenationFrequency="normalFast"
+ android:lineBreakWordStyle="phrase"
+ android:maxLines="10"/>
+
+ <!-- Circular icons (32dp) will be ImageViews under this LinearLayout -->
+ <LinearLayout
+ android:id="@+id/circles_container"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:layout_below="@android:id/summary"
+ android:layout_alignStart="@android:id/title" />
+
+ </RelativeLayout>
+
+ <include layout="@layout/preference_two_target_divider" />
+
+ <!-- Preference should place its actual preference widget here. -->
+ <LinearLayout
+ android:id="@android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:minWidth="@dimen/two_target_min_width"
+ android:gravity="center"
+ android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout/preference_circular_icons_item.xml b/res/layout/preference_circular_icons_item.xml
new file mode 100644
index 0000000..e5656ce
--- /dev/null
+++ b/res/layout/preference_circular_icons_item.xml
@@ -0,0 +1,24 @@
+<?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.
+ -->
+
+<ImageView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="@dimen/zen_mode_circular_icon_diameter"
+ android:layout_height="@dimen/zen_mode_circular_icon_diameter"
+ android:layout_marginTop="@dimen/zen_mode_circular_icon_margin_vertical"
+ android:layout_marginBottom="@dimen/zen_mode_circular_icon_margin_vertical"
+ android:layout_marginEnd="@dimen/zen_mode_circular_icon_margin_between" />
\ No newline at end of file
diff --git a/res/layout/preference_circular_icons_plus_item.xml b/res/layout/preference_circular_icons_plus_item.xml
new file mode 100644
index 0000000..9882086
--- /dev/null
+++ b/res/layout/preference_circular_icons_plus_item.xml
@@ -0,0 +1,32 @@
+<?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.
+ -->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+ android:layout_width="@dimen/zen_mode_circular_icon_diameter"
+ android:layout_height="@dimen/zen_mode_circular_icon_diameter"
+ android:layout_marginTop="@dimen/zen_mode_circular_icon_margin_vertical"
+ android:layout_marginBottom="@dimen/zen_mode_circular_icon_margin_vertical"
+ android:gravity="center"
+ android:padding="4dp"
+ android:drawablePadding="0dp"
+ android:background="@drawable/preference_circular_icons_plus_item_background"
+ android:textColor="?androidprv:attr/materialColorOnSecondaryContainer"
+ android:maxLines="1"
+ android:autoSizeTextType="uniform"
+ android:autoSizeMinTextSize="6sp" />
\ No newline at end of file
diff --git a/res/layout/private_space_education_screen.xml b/res/layout/private_space_education_screen.xml
index 4df92b7..3afe7f9 100644
--- a/res/layout/private_space_education_screen.xml
+++ b/res/layout/private_space_education_screen.xml
@@ -53,7 +53,7 @@
android:src="@drawable/counter_1_24dp" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
- android:layout_toRightOf="@+id/lockIcon"
+ android:layout_toEndOf="@+id/lockIcon"
android:text="@string/private_space_separate_account_text"/>
</RelativeLayout>
<RelativeLayout
@@ -64,7 +64,7 @@
android:src="@drawable/counter_2_24dp" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
- android:layout_toRightOf="@+id/bellIcon"
+ android:layout_toEndOf="@+id/bellIcon"
android:text="@string/private_space_protected_lock_text"/>
</RelativeLayout>
<RelativeLayout
@@ -77,7 +77,7 @@
android:src="@drawable/counter_3_24dp" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
- android:layout_toRightOf="@+id/appsIcon"
+ android:layout_toEndOf="@+id/appsIcon"
android:text="@string/private_space_install_apps_text"/>
</RelativeLayout>
<TextView
@@ -94,7 +94,7 @@
android:src="@drawable/ic_private_space_edu_icon" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
- android:layout_toRightOf="@+id/eduIcon"
+ android:layout_toEndOf="@+id/eduIcon"
android:text="@string/private_space_apps_stopped_text"/>
</RelativeLayout>
<Space
@@ -112,13 +112,13 @@
android:id="@+id/info"
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:textSize = "14sp"
- android:layout_toRightOf="@+id/infoIcon"
+ android:layout_toEndOf="@+id/infoIcon"
android:text="@string/private_space_apps_permission_text"/>
<TextView
android:id="@+id/learn_more"
style="@style/PrivateSpaceSetupSubHeaderStyle"
android:layout_below="@id/info"
- android:layout_alignLeft="@+id/info"
+ android:layout_alignStart="@+id/info"
android:paddingTop="24dp"
android:paddingLeft="16dp"
android:text="@string/private_space_learn_more_text"/>
diff --git a/res/layout/qrcode_scanner_fragment.xml b/res/layout/qrcode_scanner_fragment.xml
index 4f748c5..72049a4 100644
--- a/res/layout/qrcode_scanner_fragment.xml
+++ b/res/layout/qrcode_scanner_fragment.xml
@@ -55,7 +55,9 @@
android:layout_height="wrap_content"
android:layout_gravity="top"
android:gravity="center"
- android:clipChildren="true">
+ android:clipChildren="true"
+ android:contentDescription="@string/audio_streams_qr_code_scanner_label"
+ android:focusable="true">
<TextureView
android:id="@+id/preview_view"
android:layout_marginStart="@dimen/qrcode_preview_margin"
diff --git a/res/layout/request_manage_credentials.xml b/res/layout/request_manage_credentials.xml
index ee697f7..c25a35d 100644
--- a/res/layout/request_manage_credentials.xml
+++ b/res/layout/request_manage_credentials.xml
@@ -18,7 +18,8 @@
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:layout_height="match_parent"
+ android:fitsSystemWindows="true"
android:clipChildren="true">
<RelativeLayout
diff --git a/res/layout/search_bar_unified_version.xml b/res/layout/search_bar_unified_version.xml
index a8ad6fc..14f46ec 100644
--- a/res/layout/search_bar_unified_version.xml
+++ b/res/layout/search_bar_unified_version.xml
@@ -30,6 +30,7 @@
android:orientation="horizontal"
android:paddingStart="24dp"
android:paddingEnd="24dp"
+ android:focusedByDefault="true"
android:background="@drawable/search_bar_selected_background">
<ImageView
@@ -45,6 +46,6 @@
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
- android:text="@string/search_settings"/>
+ android:text="@string/homepage_search"/>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
diff --git a/res/layout/settings_homepage_container_v2.xml b/res/layout/settings_homepage_container_v2.xml
index 5ae5fbd..b244579 100644
--- a/res/layout/settings_homepage_container_v2.xml
+++ b/res/layout/settings_homepage_container_v2.xml
@@ -69,8 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingTop="8dp"
- android:paddingBottom="24dp"
+ android:paddingVertical="8dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
diff --git a/res/layout/zen_mode_type_item.xml b/res/layout/zen_mode_type_item.xml
new file mode 100644
index 0000000..841ca00
--- /dev/null
+++ b/res/layout/zen_mode_type_item.xml
@@ -0,0 +1,62 @@
+<?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:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center" />
+
+ <RelativeLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:paddingStart="16dp"
+ android:layout_weight="1">
+
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:singleLine="true"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
+ android:textSize="16sp" />
+
+ <TextView
+ android:id="@+id/subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignStart="@id/title"
+ android:layout_below="@id/title"
+ android:maxLines="2"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="14sp" />
+
+ </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/raw/accessibility_shortcut_type_triple_tap.json b/res/raw/accessibility_shortcut_type_triple_tap.json
deleted file mode 100644
index 870e671..0000000
--- a/res/raw/accessibility_shortcut_type_triple_tap.json
+++ /dev/null
@@ -1,1959 +0,0 @@
-{
- "v": "5.6.5",
- "fr": 60,
- "ip": 0,
- "op": 180,
- "w": 412,
- "h": 300,
- "nm": "Triple_Tap_Screen",
- "ddd": 0,
- "assets": [
- {
- "id": "comp_0",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": ".white",
- "cl": "white",
- "hd": true,
- "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
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 15.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.4
- ],
- [
- 0,
- 0
- ],
- [
- -15.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.4
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- -15.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- -15.4
- ],
- [
- 0,
- 0
- ],
- [
- 15.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 15.4
- ]
- ],
- "v": [
- [
- 178,
- 150
- ],
- [
- -178,
- 150
- ],
- [
- -206,
- 122
- ],
- [
- -206,
- -122
- ],
- [
- -178,
- -150
- ],
- [
- 178,
- -150
- ],
- [
- 206,
- -122
- ],
- [
- 206,
- 122
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 1,
- 1,
- 1,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "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
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 1800,
- "st": 0,
- "bm": 0
- }
- ]
- }
- ],
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": ".grey200",
- "cl": "grey200",
- "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
- },
- "a": {
- "a": 0,
- "k": [
- 1.35,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- 0,
- -73.4
- ],
- [
- -73.4,
- 0
- ],
- [
- 0,
- 73.4
- ],
- [
- 73.4,
- 0
- ]
- ],
- "o": [
- [
- -73.4,
- 0
- ],
- [
- 0,
- 73.4
- ],
- [
- 73.4,
- 0
- ],
- [
- 0,
- -73.4
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 1.4,
- -132.9
- ],
- [
- -131.6,
- 0
- ],
- [
- 1.3,
- 132.9
- ],
- [
- 134.3,
- 0
- ],
- [
- 1.4,
- -132.9
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ind": 1,
- "ty": "sh",
- "ix": 2,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- 0,
- 0
- ],
- [
- -24.7,
- -24.8
- ],
- [
- 0,
- -35
- ],
- [
- 24.8,
- -24.7
- ],
- [
- 35,
- 0
- ],
- [
- 24.7,
- 24.8
- ],
- [
- 0,
- 35
- ],
- [
- -24.8,
- 24.7
- ],
- [
- -35,
- 0
- ]
- ],
- "o": [
- [
- 35,
- 0
- ],
- [
- 24.7,
- 24.7
- ],
- [
- 0,
- 35
- ],
- [
- -24.7,
- 24.7
- ],
- [
- -35,
- 0
- ],
- [
- -24.7,
- -24.8
- ],
- [
- 0,
- -35
- ],
- [
- 24.7,
- -24.7
- ],
- [
- 0,
- 0
- ]
- ],
- "v": [
- [
- 1.4,
- -130.9
- ],
- [
- 94,
- -92.5
- ],
- [
- 132.4,
- 0.1
- ],
- [
- 94,
- 92.7
- ],
- [
- 1.4,
- 131.1
- ],
- [
- -91.2,
- 92.7
- ],
- [
- -129.6,
- 0
- ],
- [
- -91.2,
- -92.6
- ],
- [
- 1.4,
- -130.9
- ]
- ],
- "c": false
- },
- "ix": 2
- },
- "nm": "Path 2",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.909803926945,
- 0.917647063732,
- 0.929411768913,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "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
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 300,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": ".grey300",
- "cl": "grey300",
- "sr": 1,
- "ks": {
- "o": {
- "a": 0,
- "k": 100,
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 205,
- 150,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- 0,
- 0,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [
- -7.9,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 8
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 1.6
- ],
- [
- 0,
- 0
- ],
- [
- 2,
- 1.5
- ],
- [
- 0,
- 0
- ],
- [
- 6.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 6.4
- ],
- [
- 0,
- 0
- ],
- [
- 1,
- -0.7
- ],
- [
- 0,
- 0
- ]
- ],
- "o": [
- [
- 0,
- 0
- ],
- [
- 8,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- 1.6,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- -1.9,
- -1.6
- ],
- [
- 0,
- 0
- ],
- [
- 0,
- 6.4
- ],
- [
- 0,
- 0
- ],
- [
- -6.4,
- 0
- ],
- [
- 0,
- 0
- ],
- [
- -1,
- 0.7
- ],
- [
- 0,
- 0
- ],
- [
- 0.1,
- 7.9
- ]
- ],
- "v": [
- [
- -64,
- 75.3
- ],
- [
- 69.1,
- 75.3
- ],
- [
- 83.6,
- 60.8
- ],
- [
- 83.6,
- -81
- ],
- [
- 86.5,
- -83.9
- ],
- [
- 86.5,
- -100.9
- ],
- [
- 80.7,
- -105.6
- ],
- [
- 80.7,
- 60.8
- ],
- [
- 69.1,
- 72.4
- ],
- [
- -64,
- 72.4
- ],
- [
- -75.6,
- 60.8
- ],
- [
- -75.6,
- -107.3
- ],
- [
- -78.5,
- -105.2
- ],
- [
- -78.5,
- 60.9
- ]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.854901969433,
- 0.86274510622,
- 0.878431379795,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "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
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "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
- },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 1,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 300,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "cursor 5",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 36,
- "s": [
- 0
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 39.582,
- "s": [
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 44.953,
- "s": [
- 100
- ]
- },
- {
- "t": 55.697265625,
- "s": [
- 0
- ]
- }
- ],
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 207.641,
- 154.48,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- -180.5,
- -165.5,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0,
- 0
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.45,
- 0.45,
- 0.45
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 37.791,
- "s": [
- 27.252,
- 27.252,
- 100
- ]
- },
- {
- "t": 59,
- "s": [
- 56.661,
- 56.661,
- 100
- ]
- }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": {
- "a": 0,
- "k": [
- 63.109,
- 63.109
- ],
- "ix": 2
- },
- "p": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 3
- },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.182245725744,
- 0.894323072246,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 3,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.522196631338,
- 0.9762855081,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 50,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- -180.5,
- -165.5
- ],
- "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"
- }
- ],
- "nm": "Ellipse 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 36,
- "op": 59,
- "st": -1,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "cursor 4",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 22,
- "s": [
- 0
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 25.58,
- "s": [
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 30.953,
- "s": [
- 100
- ]
- },
- {
- "t": 41.697265625,
- "s": [
- 0
- ]
- }
- ],
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 207.641,
- 154.48,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- -180.5,
- -165.5,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0,
- 0
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.45,
- 0.45,
- 0.45
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 23.789,
- "s": [
- 27.252,
- 27.252,
- 100
- ]
- },
- {
- "t": 45,
- "s": [
- 56.661,
- 56.661,
- 100
- ]
- }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": {
- "a": 0,
- "k": [
- 63.109,
- 63.109
- ],
- "ix": 2
- },
- "p": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 3
- },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.182245725744,
- 0.894323072246,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 3,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.522196631338,
- 0.9762855081,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 50,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- -180.5,
- -165.5
- ],
- "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"
- }
- ],
- "nm": "Ellipse 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 22,
- "op": 45,
- "st": -3,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 5,
- "ty": 4,
- "nm": "cursor",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 8,
- "s": [
- 0
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 11.582,
- "s": [
- 100
- ]
- },
- {
- "i": {
- "x": [
- 0.833
- ],
- "y": [
- 0.833
- ]
- },
- "o": {
- "x": [
- 0.167
- ],
- "y": [
- 0.167
- ]
- },
- "t": 16.953,
- "s": [
- 100
- ]
- },
- {
- "t": 27.697265625,
- "s": [
- 0
- ]
- }
- ],
- "ix": 11
- },
- "r": {
- "a": 0,
- "k": 0,
- "ix": 10
- },
- "p": {
- "a": 0,
- "k": [
- 207.641,
- 154.48,
- 0
- ],
- "ix": 2
- },
- "a": {
- "a": 0,
- "k": [
- -180.5,
- -165.5,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [
- 0,
- 0,
- 0
- ],
- "y": [
- 1,
- 1,
- 1
- ]
- },
- "o": {
- "x": [
- 0.45,
- 0.45,
- 0.45
- ],
- "y": [
- 0,
- 0,
- 0
- ]
- },
- "t": 9.791,
- "s": [
- 27.252,
- 27.252,
- 100
- ]
- },
- {
- "t": 31,
- "s": [
- 56.661,
- 56.661,
- 100
- ]
- }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": {
- "a": 0,
- "k": [
- 63.109,
- 63.109
- ],
- "ix": 2
- },
- "p": {
- "a": 0,
- "k": [
- 0,
- 0
- ],
- "ix": 3
- },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.182245725744,
- 0.894323072246,
- 1
- ],
- "ix": 3
- },
- "o": {
- "a": 0,
- "k": 100,
- "ix": 4
- },
- "w": {
- "a": 0,
- "k": 3,
- "ix": 5
- },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 1,
- 0.522196631338,
- 0.9762855081,
- 1
- ],
- "ix": 4
- },
- "o": {
- "a": 0,
- "k": 50,
- "ix": 5
- },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": {
- "a": 0,
- "k": [
- -180.5,
- -165.5
- ],
- "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"
- }
- ],
- "nm": "Ellipse 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 8,
- "op": 31,
- "st": -5,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 6,
- "ty": 0,
- "nm": "BG_White",
- "refId": "comp_0",
- "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
- },
- "a": {
- "a": 0,
- "k": [
- 206,
- 150,
- 0
- ],
- "ix": 1
- },
- "s": {
- "a": 0,
- "k": [
- 100,
- 100,
- 100
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 412,
- "h": 300,
- "ip": 0,
- "op": 1800,
- "st": 0,
- "bm": 0
- }
- ],
- "markers": []
-}
\ No newline at end of file
diff --git a/res/raw/accessibility_shortcut_type_triple_tap_tablet.json b/res/raw/accessibility_shortcut_type_triple_tap_tablet.json
deleted file mode 100644
index b6a9b14..0000000
--- a/res/raw/accessibility_shortcut_type_triple_tap_tablet.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.10.0","fr":60,"ip":0,"op":180,"w":412,"h":300,"nm":"Triple_Tap_Screen_Tablet-DT","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".grey600","cl":"grey600","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[205.999,149.375,0],"ix":2,"l":2},"a":{"a":0,"k":[205.999,149.375,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.367,0],[0,0],[0,-1.372],[0,0]],"o":[[0,-1.372],[0,0],[1.366,0],[0,0],[0,0]],"v":[[-6.933,0.746],[-4.457,-1.74],[4.457,-1.74],[6.933,0.746],[0.99,1.74]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501960784314,0.525490196078,0.545098039216,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"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},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[318.382,49.604],"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"}],"nm":"Layer 3","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.367,0],[0,0],[0,-1.372],[0,0]],"o":[[0,-1.372],[0,0],[1.367,0],[0,0],[0,0]],"v":[[-13.37,0.746],[-10.894,-1.74],[10.894,-1.74],[13.37,0.746],[0.495,1.74]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.501960784314,0.525490196078,0.545098039216,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"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},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[276.958,49.604],"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"}],"nm":"Layer 2","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-8.146],[0,0],[8.146,0],[0,0],[0,8.146],[0,0],[-8.146,0],[0,0]],"o":[[0,0],[0,8.146],[0,0],[-8.146,0],[0,0],[0,-8.146],[0,0],[8.146,0]],"v":[[158.519,-84.974],[158.519,84.974],[143.769,99.724],[-143.769,99.724],[-158.519,84.974],[-158.519,-84.974],[-143.769,-99.724],[143.769,-99.724]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.501960784314,0.525490196078,0.545098039216,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2.5,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"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},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[205.999,151.162],"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"}],"nm":"Layer 1","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".blue400","cl":"blue400","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":36,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":39.582,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":44.953,"s":[100]},{"t":55.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":37.791,"s":[27.252,27.252,100]},{"t":59,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.4,0.61568627451,0.964705882353,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":36,"op":59,"st":-1,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".blue800","cl":"blue800","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":36,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":39.582,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":44.953,"s":[100]},{"t":55.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":37.791,"s":[27.252,27.252,100]},{"t":59,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.094117647059,0.352941176471,0.737254901961,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":36,"op":59,"st":-1,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".blue400","cl":"blue400","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":25.58,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":30.953,"s":[100]},{"t":41.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":23.789,"s":[27.252,27.252,100]},{"t":45,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.4,0.61568627451,0.964705882353,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":22,"op":45,"st":-3,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".blue800","cl":"blue800","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":25.58,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":30.953,"s":[100]},{"t":41.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":23.789,"s":[27.252,27.252,100]},{"t":45,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.094117647059,0.352941176471,0.737254901961,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":22,"op":45,"st":-3,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".blue400","cl":"blue400","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11.582,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16.953,"s":[100]},{"t":27.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":9.791,"s":[27.252,27.252,100]},{"t":31,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.4,0.61568627451,0.964705882353,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":31,"st":-5,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":".blue800","cl":"blue800","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11.582,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16.953,"s":[100]},{"t":27.697265625,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[207.641,154.48,0],"ix":2,"l":2},"a":{"a":0,"k":[-180.5,-165.5,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.45],"y":[0,0,0]},"t":9.791,"s":[27.252,27.252,100]},{"t":31,"s":[56.661,56.661,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[63.109,63.109],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.094117647059,0.352941176471,0.737254901961,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-180.5,-165.5],"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"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":31,"st":-5,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".black","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}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[15.4,0],[0,0],[0,15.4],[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0]],"o":[[0,0],[-15.4,0],[0,0],[0,-15.4],[0,0],[15.4,0],[0,0],[0,15.4]],"v":[[178,150],[-178,150],[-206,122],[-206,-122],[-178,-150],[178,-150],[206,-122],[206,122]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"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},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1800,"st":0,"ct":1,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/res/raw/lottie_notification_cooldown.json b/res/raw/lottie_notification_cooldown.json
new file mode 100644
index 0000000..67658a1
--- /dev/null
+++ b/res/raw/lottie_notification_cooldown.json
@@ -0,0 +1 @@
+{"v":"5.12.1","fr":60,"ip":0,"op":720,"w":824,"h":600,"nm":"Panel v3 Lottie","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".cream","cl":"cream","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":270,"s":[60.438,75.468,0],"to":[0,0,0],"ti":[0,0,0]},{"t":300,"s":[58.188,65.718,0]}],"ix":2,"l":2},"a":{"a":0,"k":[30.219,37.734,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0,0,0]},"t":270,"s":[200,200,100]},{"t":300,"s":[104.5,104.5,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.914,0],[-1.41,1.209],[-0.772,2.116],[0,2.62],[0.773,2.116],[1.444,1.209],[1.881,0],[1.41,-1.243],[0.773,-2.116],[0,-2.619],[-0.772,-2.116],[-1.411,-1.242]],"o":[[1.881,0],[1.444,-1.242],[0.773,-2.116],[0,-2.619],[-0.772,-2.116],[-1.41,-1.243],[-1.914,0],[-1.411,1.209],[-0.772,2.116],[0,2.62],[0.773,2.116],[1.41,1.209]],"v":[[0,13.955],[4.937,12.141],[8.262,7.104],[9.421,-0.001],[8.262,-7.104],[4.937,-12.09],[0,-13.955],[-4.987,-12.09],[-8.262,-7.104],[-9.42,-0.001],[-8.262,7.104],[-4.987,12.141]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[2.721,0],[2.116,1.578],[1.142,2.721],[0,3.359],[-1.109,2.72],[-2.082,1.579],[-2.754,0],[-2.082,-1.612],[-1.142,-2.754],[0,-3.358],[1.141,-2.754],[2.083,-1.612]],"o":[[-2.72,0],[-2.082,-1.612],[-1.109,-2.754],[0,-3.358],[1.142,-2.754],[2.082,-1.612],[2.721,0],[2.083,1.579],[1.141,2.72],[0,3.359],[-1.142,2.721],[-2.082,1.578]],"v":[[0,18.036],[-7.254,15.668],[-12.09,9.169],[-13.753,-0.001],[-12.09,-9.118],[-7.254,-15.618],[0,-18.036],[7.204,-15.618],[12.041,-9.118],[13.753,-0.001],[12.041,9.169],[7.204,15.668]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[111.033,55.77],"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"}],"nm":"Group 5","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.116,0],[1.511,0.605],[1.242,1.276],[0.538,1.948],[0,0],[-1.277,-1.074],[-1.746,0],[-1.108,0.538],[-0.639,0.974],[0,1.209],[0.671,0.974],[1.142,0.537],[1.343,0],[0,0],[0,0],[0,0],[-1.242,1.041],[0,1.747],[1.209,0.974],[1.78,0],[1.008,-0.906],[0.437,-1.31],[0,0],[-1.713,1.444],[-2.72,0],[-1.612,-0.806],[-0.907,-1.444],[0,-1.78],[0.906,-1.242],[1.344,-0.705],[0,0],[-1.108,-1.478],[0,-1.982],[1.041,-1.612],[1.781,-0.907]],"o":[[-1.444,0],[-1.512,-0.604],[-1.209,-1.31],[0,0],[0.538,1.948],[1.309,1.075],[1.276,0],[1.108,-0.571],[0.671,-1.008],[0,-1.175],[-0.639,-0.974],[-1.108,-0.571],[0,0],[0,0],[0,0],[1.847,0],[1.243,-1.075],[0,-1.612],[-1.209,-0.974],[-1.746,0],[-0.974,0.907],[0,0],[0.604,-1.814],[1.746,-1.478],[2.015,0],[1.612,0.806],[0.941,1.444],[0,1.78],[-0.907,1.243],[0,0],[1.713,0.705],[1.108,1.444],[0,2.015],[-1.008,1.613],[-1.746,0.907]],"v":[[-0.176,18.035],[-4.609,17.128],[-8.74,14.307],[-11.36,9.42],[-7.481,7.808],[-4.76,12.342],[-0.176,13.954],[3.401,13.148],[6.021,10.831],[7.028,7.506],[6.021,4.282],[3.35,2.015],[-0.327,1.158],[-3.299,1.158],[-3.299,-2.821],[-0.629,-2.821],[4.005,-4.383],[5.869,-8.615],[4.056,-12.494],[-0.428,-13.955],[-4.559,-12.595],[-6.675,-9.27],[-10.604,-10.932],[-7.128,-15.819],[-0.428,-18.035],[5.013,-16.826],[8.791,-13.451],[10.202,-8.615],[8.842,-4.081],[5.466,-1.159],[5.466,-0.957],[9.698,2.317],[11.36,7.456],[9.799,12.896],[5.617,16.675]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[81.226,55.77],"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"}],"nm":"Group 6","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.873,0],[0.638,0.605],[0,0.907],[-0.605,0.605],[-0.907,0],[-0.605,-0.638],[0,-0.873],[0.638,-0.638]],"o":[[-0.907,0],[-0.605,-0.638],[0,-0.873],[0.638,-0.638],[0.873,0],[0.638,0.605],[0,0.907],[-0.605,0.605]],"v":[[0.025,12.796],[-2.292,11.889],[-3.199,9.572],[-2.292,7.355],[0.025,6.398],[2.242,7.355],[3.199,9.572],[2.242,11.889]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.873,0],[0.638,0.605],[0,0.907],[-0.605,0.605],[-0.907,0],[-0.605,-0.638],[0,-0.873],[0.638,-0.638]],"o":[[-0.907,0],[-0.605,-0.638],[0,-0.873],[0.638,-0.638],[0.873,0],[0.638,0.605],[0,0.907],[-0.605,0.605]],"v":[[0.025,-6.398],[-2.292,-7.305],[-3.199,-9.622],[-2.292,-11.839],[0.025,-12.796],[2.242,-11.839],[3.199,-9.622],[2.242,-7.305]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[61.915,60.505],"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"}],"nm":"Group 7","np":4,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.343,0],[-1.142,0.638],[-0.672,1.108],[0,1.343],[0.671,1.108],[1.175,0.638],[1.343,0],[1.142,-0.672],[0.672,-1.142],[0,-1.377],[-0.672,-1.142],[-1.108,-0.672]],"o":[[1.343,0],[1.175,-0.672],[0.671,-1.142],[0,-1.377],[-0.672,-1.142],[-1.142,-0.672],[-1.343,0],[-1.108,0.638],[-0.672,1.108],[0,1.343],[0.672,1.108],[1.142,0.638]],"v":[[-0.051,0.806],[3.678,-0.151],[6.449,-2.821],[7.456,-6.549],[6.449,-10.277],[3.678,-12.947],[-0.051,-13.955],[-3.779,-12.947],[-6.449,-10.277],[-7.457,-6.549],[-6.449,-2.821],[-3.779,-0.151]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[1.814,0],[1.679,0.974],[1.074,1.679],[0,2.082],[-1.075,1.746],[-1.78,1.075],[-2.082,0],[-1.78,-1.108],[-0.974,-1.78],[0,-1.948],[0.772,-1.713],[1.41,-2.083],[0,0]],"o":[[0,0],[0,0],[-1.176,0.806],[-1.746,0],[-1.68,-0.974],[-1.041,-1.713],[0,-2.015],[1.075,-1.78],[1.814,-1.075],[2.317,0],[1.814,1.108],[1.008,1.746],[0,1.847],[-0.739,1.679],[0,0],[0,0]],"v":[[-5.089,15.667],[3.628,3.526],[3.527,3.426],[-0.958,4.635],[-6.096,3.174],[-10.227,-0.806],[-11.788,-6.499],[-10.176,-12.141],[-5.895,-16.423],[-0.051,-18.035],[6.096,-16.373],[10.277,-12.04],[11.788,-6.499],[10.63,-1.159],[7.406,4.484],[-1.663,18.035]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[42.007,55.77],"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"}],"nm":"Group 8","np":4,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":168.552,"ix":3},"y":{"a":0,"k":54.681,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0,0,0]},"t":556,"s":[20,20,100]},{"t":586,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[6.428,-491.836],[14.758,-490.711],[22.933,-488.794],[30.879,-486.091],[38.523,-482.63],[45.798,-478.436],[52.619,-473.52],[58.782,-467.809],[64.461,-461.621],[69.338,-454.782],[73.871,-447.708],[78.192,-440.497],[82.517,-433.286],[86.839,-426.075],[91.16,-418.864],[95.482,-411.653],[99.804,-404.442],[104.126,-397.231],[108.483,-390.044],[113.214,-383.095],[118.623,-376.662],[124.659,-370.811],[131.256,-365.6],[138.343,-361.084],[145.852,-357.302],[153.702,-354.292],[161.813,-352.086],[170.105,-350.705],[178.493,-350.164],[186.896,-350.481],[195.21,-351.684],[203.407,-353.545],[211.562,-355.588],[219.718,-357.63],[227.872,-359.673],[236.027,-361.716],[244.181,-363.761],[252.338,-365.803],[260.492,-367.846],[268.646,-369.889],[276.914,-371.411],[285.269,-372.203],[293.657,-372.215],[302.017,-371.414],[310.252,-369.719],[318.231,-367.08],[325.908,-363.685],[333.216,-359.562],[340.096,-354.753],[346.486,-349.301],[352.314,-343.241],[357.412,-336.56],[361.837,-329.422],[365.549,-321.897],[368.509,-314.043],[370.689,-305.936],[372.039,-297.638],[372.361,-289.24],[372.004,-280.849],[370.621,-272.565],[368.824,-264.356],[366.781,-256.2],[364.736,-248.045],[362.693,-239.891],[360.651,-231.737],[358.608,-223.58],[356.565,-215.426],[354.522,-207.272],[352.518,-199.108],[350.948,-190.852],[350.222,-182.478],[350.352,-174.071],[351.328,-165.723],[353.146,-157.514],[355.778,-149.53],[359.199,-141.853],[363.374,-134.555],[368.261,-127.715],[373.81,-121.4],[379.976,-115.683],[386.704,-110.652],[393.816,-106.172],[401.027,-101.85],[408.238,-97.528],[415.449,-93.207],[422.657,-88.885],[429.868,-84.563],[437.079,-80.241],[444.29,-75.919],[451.501,-71.597],[458.424,-66.826],[464.892,-61.481],[470.836,-55.558],[476.182,-49.083],[480.806,-42.061],[484.584,-34.554],[487.613,-26.727],[489.868,-18.643],[491.334,-10.378],[492.001,-2.006],[491.837,6.399],[490.717,14.73],[488.802,22.906],[486.104,30.852],[482.645,38.498],[478.456,45.775],[473.541,52.596],[467.831,58.762],[461.649,64.443],[454.811,69.326],[447.737,73.86],[440.526,78.18],[433.315,82.501],[426.105,86.823],[418.894,91.145],[411.68,95.465],[404.469,99.786],[397.258,104.108],[390.069,108.463],[383.12,113.192],[376.687,118.601],[370.833,124.635],[365.62,131.228],[361.1,138.316],[357.315,145.823],[354.303,153.672],[352.094,161.784],[350.711,170.075],[350.167,178.464],[350.487,186.866],[351.683,195.181],[353.544,203.378],[355.589,211.532],[357.631,219.686],[359.674,227.843],[361.717,235.997],[363.762,244.151],[365.805,252.306],[367.847,260.462],[369.892,268.617],[371.413,276.884],[372.209,285.237],[372.224,293.628],[371.424,301.988],[369.729,310.223],[367.095,318.202],[363.7,325.879],[359.582,333.191],[354.775,340.071],[349.328,346.464],[343.269,352.292],[336.587,357.392],[329.452,361.82],[321.927,365.534],[314.075,368.499],[305.968,370.683],[297.67,372.031],[289.272,372.357],[280.883,372.005],[272.597,370.622],[264.388,368.83],[256.234,366.785],[248.077,364.742],[239.923,362.699],[231.769,360.657],[223.615,358.614],[215.458,356.571],[207.304,354.526],[199.14,352.521],[190.884,350.949],[182.51,350.221],[174.105,350.344],[165.754,351.32],[157.546,353.134],[149.562,355.763],[141.88,359.181],[134.582,363.354],[127.74,368.236],[121.423,373.785],[115.708,379.949],[110.672,386.673],[106.19,393.784],[101.868,400.995],[97.546,408.206],[93.224,415.417],[88.902,422.628],[84.581,429.839],[80.259,437.05],[75.937,444.261],[71.615,451.472],[66.846,458.394],[61.503,464.868],[55.583,470.811],[49.11,476.162],[42.088,480.786],[34.586,484.569],[26.758,487.6],[18.675,489.86],[10.412,491.328],[2.04,492],[-6.367,491.834],[-14.696,490.718],[-22.874,488.808],[-30.82,486.115],[-38.469,482.661],[-45.748,478.474],[-52.569,473.559],[-58.737,467.851],[-64.421,461.671],[-69.305,454.836],[-73.842,447.762],[-78.164,440.551],[-82.484,433.34],[-86.805,426.13],[-91.127,418.918],[-95.449,411.708],[-99.769,404.497],[-104.09,397.283],[-108.445,390.094],[-113.171,383.143],[-118.576,376.707],[-124.607,370.851],[-131.201,365.636],[-138.287,361.113],[-145.793,357.325],[-153.64,354.309],[-161.749,352.098],[-170.041,350.71],[-178.432,350.169],[-186.832,350.483],[-195.149,351.675],[-203.346,353.533],[-211.5,355.578],[-219.654,357.621],[-227.809,359.664],[-235.965,361.706],[-244.12,363.751],[-252.274,365.794],[-260.428,367.837],[-268.585,369.882],[-276.85,371.404],[-285.205,372.204],[-293.594,372.225],[-301.956,371.43],[-310.191,369.735],[-318.17,367.104],[-325.849,363.716],[-333.162,359.6],[-340.046,354.796],[-346.442,349.351],[-352.269,343.291],[-357.371,336.612],[-361.804,329.482],[-365.521,321.956],[-368.488,314.107],[-370.677,306],[-372.025,297.702],[-372.356,289.304],[-372.006,280.915],[-370.628,272.629],[-368.836,264.42],[-366.793,256.264],[-364.75,248.109],[-362.708,239.955],[-360.662,231.801],[-358.62,223.646],[-356.577,215.49],[-354.532,207.336],[-352.527,199.172],[-350.95,190.916],[-350.22,182.542],[-350.34,174.137],[-351.312,165.786],[-353.123,157.578],[-355.749,149.591],[-359.166,141.91],[-363.334,134.609],[-368.216,127.765],[-373.763,121.447],[-379.924,115.728],[-386.645,110.688],[-393.755,106.205],[-400.968,101.886],[-408.179,97.564],[-415.39,93.242],[-422.601,88.923],[-429.814,84.601],[-437.025,80.281],[-444.236,75.96],[-451.449,71.64],[-458.372,66.871],[-464.845,61.533],[-470.793,55.615],[-476.148,49.144],[-480.771,42.123],[-484.556,34.621],[-487.591,26.795],[-489.854,18.714],[-491.327,10.451],[-492.001,2.077],[-491.837,-6.328],[-490.724,-14.659],[-488.818,-22.835],[-486.128,-30.786],[-482.678,-38.434],[-478.496,-45.716],[-473.581,-52.537],[-467.878,-58.71],[-461.701,-64.396],[-454.868,-69.283],[-447.796,-73.822],[-440.586,-78.144],[-433.375,-82.463],[-426.161,-86.785],[-418.95,-91.107],[-411.739,-95.429],[-404.529,-99.751],[-397.318,-104.073],[-390.126,-108.425],[-383.172,-113.146],[-376.732,-118.549],[-370.874,-124.578],[-365.656,-131.167],[-361.128,-138.252],[-357.338,-145.757],[-354.319,-153.601],[-352.104,-161.71],[-350.714,-170.002],[-350.17,-178.393],[-350.482,-186.793],[-351.666,-195.11],[-353.525,-203.307],[-355.567,-211.461],[-357.61,-219.618],[-359.655,-227.772],[-361.698,-235.926],[-363.741,-244.081],[-365.783,-252.237],[-367.826,-260.391],[-369.871,-268.546],[-371.396,-276.813],[-372.202,-285.166],[-372.226,-293.555],[-371.436,-301.917],[-369.741,-310.152],[-367.117,-318.133],[-363.731,-325.815],[-359.617,-333.13],[-354.818,-340.017],[-349.378,-346.414],[-343.318,-352.242],[-336.642,-357.349],[-329.511,-361.784],[-321.991,-365.505],[-314.141,-368.475],[-306.037,-370.669],[-297.738,-372.017],[-289.34,-372.35],[-280.952,-372.005],[-272.665,-370.629],[-264.454,-368.839],[-256.3,-366.796],[-248.146,-364.754],[-239.989,-362.709],[-231.835,-360.666],[-223.681,-358.623],[-215.526,-356.581],[-207.372,-354.535],[-199.208,-352.528],[-190.953,-350.951],[-182.578,-350.216],[-174.174,-350.334],[-165.823,-351.306],[-157.612,-353.115],[-149.626,-355.736],[-141.942,-359.148],[-134.639,-363.314],[-127.794,-368.194],[-121.477,-373.74],[-115.753,-379.899],[-110.708,-386.616],[-106.225,-393.725],[-101.903,-400.936],[-97.582,-408.147],[-93.26,-415.36],[-88.94,-422.571],[-84.618,-429.782],[-80.297,-436.993],[-75.975,-444.204],[-71.584,-451.531],[-66.813,-458.453],[-61.463,-464.917],[-55.538,-470.858],[-49.058,-476.202],[-42.039,-480.826],[-34.53,-484.599],[-26.699,-487.623],[-18.616,-489.876],[-10.351,-491.337],[-1.977,-491.999]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":556,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":550,"s":[168.552]},{"t":580,"s":[226.447]}],"ix":3},"y":{"a":0,"k":54.681,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0,0,0]},"t":466,"s":[20,20,100]},{"t":496,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[1.906,-488.758],[9.421,-487.243],[16.936,-485.728],[24.451,-484.213],[31.966,-482.698],[39.333,-480.59],[46.677,-478.385],[54.02,-476.18],[61.363,-473.975],[68.706,-471.77],[75.88,-469.081],[82.983,-466.201],[90.087,-463.319],[97.193,-460.436],[104.297,-457.556],[111.241,-454.323],[118.039,-450.782],[124.84,-447.241],[131.641,-443.702],[138.442,-440.161],[145.129,-436.429],[151.56,-432.254],[157.991,-428.079],[164.422,-423.907],[170.853,-419.732],[177.281,-415.554],[183.356,-410.878],[189.431,-406.2],[195.508,-401.524],[201.409,-396.642],[207.087,-391.489],[212.765,-386.336],[218.443,-381.184],[224.118,-376.031],[229.796,-370.878],[235.22,-365.461],[240.642,-360.04],[246.063,-354.618],[251.485,-349.197],[256.906,-343.775],[262.328,-338.354],[267.749,-332.932],[273.171,-327.513],[278.592,-322.092],[284.011,-316.671],[289.433,-311.249],[294.854,-305.828],[300.276,-300.406],[305.697,-294.985],[311.118,-289.563],[316.54,-284.142],[321.961,-278.72],[327.383,-273.299],[332.804,-267.88],[338.226,-262.458],[343.645,-257.037],[349.066,-251.615],[354.488,-246.194],[359.909,-240.772],[365.331,-235.351],[370.752,-229.929],[375.907,-224.256],[381.06,-218.578],[386.213,-212.9],[391.366,-207.222],[396.516,-201.547],[401.359,-195.612],[405.938,-189.462],[410.515,-183.315],[415.094,-177.165],[419.674,-171.015],[424.132,-164.785],[428.099,-158.223],[432.066,-151.662],[436.03,-145.1],[439.997,-138.539],[443.964,-131.978],[447.335,-125.097],[450.658,-118.187],[453.981,-111.277],[457.304,-104.369],[460.628,-97.459],[463.476,-90.348],[466.136,-83.158],[468.794,-75.967],[471.451,-68.776],[474.109,-61.583],[476.396,-54.274],[478.371,-46.868],[480.348,-39.459],[482.323,-32.051],[484.301,-24.645],[485.992,-17.176],[487.277,-9.617],[488.56,-2.058],[489.845,5.5],[491.128,13.059],[492.207,20.644],[492.793,28.287],[493.377,35.933],[493.962,43.576],[494.546,51.222],[495.001,58.87],[494.882,66.535],[494.766,74.203],[494.65,81.868],[494.531,89.533],[494.354,97.196],[493.536,104.819],[492.718,112.441],[491.9,120.065],[491.082,127.689],[490.264,135.31],[488.766,142.828],[487.248,150.345],[485.733,157.86],[484.218,165.375],[482.703,172.89],[480.597,180.258],[478.392,187.601],[476.188,194.944],[473.983,202.287],[471.778,209.63],[469.094,216.804],[466.211,223.908],[463.331,231.014],[460.448,238.117],[457.566,245.223],[454.337,252.167],[450.796,258.966],[447.255,265.767],[443.714,272.568],[440.173,279.369],[436.444,286.059],[432.269,292.489],[428.096,298.92],[423.921,305.351],[419.749,311.781],[415.571,318.21],[410.895,324.285],[406.219,330.362],[401.541,336.437],[396.661,342.34],[391.509,348.018],[386.356,353.696],[381.203,359.372],[376.05,365.05],[370.815,370.817],[365.139,375.97],[359.461,381.123],[353.783,386.276],[348.105,391.429],[342.43,396.579],[336.49,401.415],[330.34,405.994],[324.19,410.573],[318.04,415.15],[311.893,419.729],[305.658,424.182],[299.097,428.147],[292.535,432.114],[285.974,436.078],[279.412,440.045],[272.851,444.012],[265.965,447.376],[259.055,450.699],[252.145,454.022],[245.238,457.345],[238.328,460.668],[231.215,463.51],[224.024,466.167],[216.831,468.827],[209.64,471.485],[202.449,474.142],[195.138,476.42],[187.729,478.397],[180.323,480.372],[172.915,482.349],[165.506,484.324],[158.035,486.011],[150.476,487.294],[142.917,488.577],[135.359,489.862],[127.8,491.145],[120.217,492.217],[112.572,492.8],[104.928,493.386],[97.283,493.972],[89.639,494.555],[81.989,495],[74.324,494.884],[66.659,494.766],[58.991,494.649],[51.326,494.533],[43.663,494.347],[36.042,493.529],[28.418,492.711],[20.796,491.893],[13.173,491.075],[5.549,490.257],[-1.966,488.749],[-9.484,487.234],[-16.999,485.718],[-24.514,484.203],[-32.029,482.686],[-39.396,480.575],[-46.737,478.371],[-54.08,476.166],[-61.423,473.961],[-68.767,471.754],[-75.938,469.062],[-83.042,466.18],[-90.148,463.299],[-97.251,460.417],[-104.357,457.534],[-111.296,454.296],[-118.097,450.757],[-124.898,447.216],[-131.697,443.676],[-138.498,440.135],[-145.183,436.398],[-151.613,432.223],[-158.044,428.05],[-164.477,423.875],[-170.908,419.702],[-177.332,415.518],[-183.406,410.842],[-189.484,406.166],[-195.559,401.49],[-201.457,396.601],[-207.135,391.45],[-212.813,386.298],[-218.489,381.145],[-224.167,375.992],[-229.845,370.839],[-235.266,365.42],[-240.688,359.999],[-246.109,354.577],[-251.531,349.156],[-256.952,343.734],[-262.374,338.313],[-267.795,332.894],[-273.216,327.472],[-278.638,322.051],[-284.057,316.629],[-289.478,311.208],[-294.9,305.786],[-300.321,300.365],[-305.743,294.943],[-311.164,289.522],[-316.586,284.101],[-322.007,278.679],[-327.429,273.26],[-332.85,267.839],[-338.272,262.417],[-343.691,256.996],[-349.112,251.574],[-354.534,246.153],[-359.955,240.731],[-365.377,235.31],[-370.798,229.888],[-375.951,224.213],[-381.104,218.535],[-386.257,212.857],[-391.409,207.181],[-396.56,201.503],[-401.398,195.566],[-405.977,189.416],[-410.554,183.266],[-415.133,177.116],[-419.712,170.969],[-424.166,164.734],[-428.132,158.175],[-432.099,151.613],[-436.064,145.052],[-440.031,138.49],[-443.998,131.929],[-447.364,125.043],[-450.687,118.134],[-454.01,111.226],[-457.333,104.316],[-460.656,97.406],[-463.5,90.295],[-466.158,83.102],[-468.818,75.911],[-471.475,68.721],[-474.133,61.53],[-476.413,54.218],[-478.39,46.81],[-480.365,39.404],[-482.342,31.995],[-484.317,24.587],[-486.007,17.118],[-487.289,9.559],[-488.572,2],[-489.857,-5.558],[-491.14,-13.117],[-492.215,-20.702],[-492.798,-28.348],[-493.384,-35.991],[-493.969,-43.637],[-494.553,-51.28],[-495,-58.928],[-494.884,-66.596],[-494.768,-74.261],[-494.65,-81.926],[-494.533,-89.593],[-494.352,-97.254],[-493.534,-104.877],[-492.716,-112.499],[-491.895,-120.123],[-491.077,-127.747],[-490.259,-135.368],[-488.756,-142.886],[-487.239,-150.401],[-485.723,-157.918],[-484.208,-165.433],[-482.693,-172.948],[-480.583,-180.316],[-478.378,-187.659],[-476.173,-195],[-473.968,-202.343],[-471.763,-209.686],[-469.072,-216.86],[-466.192,-223.963],[-463.309,-231.067],[-460.426,-238.173],[-457.546,-245.277],[-454.31,-252.218],[-450.77,-259.019],[-447.229,-265.82],[-443.688,-272.619],[-440.149,-279.42],[-436.412,-286.107],[-432.24,-292.538],[-428.065,-298.968],[-423.892,-305.399],[-419.717,-311.83],[-415.537,-318.256],[-410.859,-324.331],[-406.183,-330.408],[-401.507,-336.483],[-396.62,-342.384],[-391.47,-348.062],[-386.317,-353.737],[-381.164,-359.415],[-376.011,-365.093],[-370.859,-370.771],[-365.185,-375.927],[-359.51,-381.079],[-353.832,-386.232],[-348.154,-391.385],[-342.476,-396.535],[-336.541,-401.376],[-330.394,-405.955],[-324.244,-410.532],[-318.094,-415.111],[-311.944,-419.69],[-305.714,-424.146],[-299.152,-428.113],[-292.591,-432.08],[-286.03,-436.044],[-279.468,-440.011],[-272.907,-443.978],[-266.023,-447.347],[-259.113,-450.67],[-252.203,-453.993],[-245.296,-457.316],[-238.386,-460.639],[-231.275,-463.486],[-224.084,-466.146],[-216.891,-468.803],[-209.701,-471.461],[-202.51,-474.118],[-195.198,-476.403],[-187.792,-478.378],[-180.384,-480.355],[-172.975,-482.33],[-165.569,-484.308],[-158.097,-485.997],[-150.539,-487.282],[-142.98,-488.565],[-135.422,-489.85],[-127.863,-491.133],[-120.28,-492.21],[-112.635,-492.793],[-104.991,-493.379],[-97.346,-493.965],[-89.702,-494.548],[-82.054,-495.001],[-74.387,-494.882],[-66.721,-494.766],[-59.056,-494.647],[-51.389,-494.531],[-43.729,-494.352],[-36.105,-493.534],[-28.481,-492.716],[-20.859,-491.898],[-13.235,-491.079],[-5.614,-490.262]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":466,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":460,"s":[168.552]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":490,"s":[228.36]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":548,"s":[228.36]},{"t":578,"s":[286.255]}],"ix":3},"y":{"a":0,"k":56.117,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0,0,0]},"t":376,"s":[20,20,100]},{"t":406,"s":[50,50,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.166,-494.001],[7.12,-493.774],[14.408,-493.545],[21.649,-492.74],[28.884,-491.832],[36.083,-490.728],[43.201,-489.145],[50.316,-487.56],[57.326,-485.578],[64.297,-483.437],[71.118,-480.865],[77.874,-478.138],[84.452,-474.996],[90.937,-471.679],[97.177,-467.909],[103.351,-464.041],[109.218,-459.713],[115.084,-455.382],[120.918,-451.015],[126.346,-446.147],[131.773,-441.278],[137.2,-436.408],[142.626,-431.541],[148.053,-426.671],[153.481,-421.804],[158.906,-416.935],[164.135,-411.855],[169.32,-406.728],[174.504,-401.604],[179.687,-396.478],[184.872,-391.352],[190.056,-386.225],[195.241,-381.101],[200.426,-375.975],[205.61,-370.849],[210.795,-365.722],[215.952,-360.568],[221.106,-355.413],[226.261,-350.259],[231.417,-345.102],[236.572,-339.948],[241.726,-334.793],[246.883,-329.637],[252.037,-324.482],[257.192,-319.328],[262.348,-314.171],[267.503,-309.017],[272.66,-303.86],[277.814,-298.706],[282.968,-293.551],[288.125,-288.395],[293.279,-283.24],[298.434,-278.086],[303.591,-272.929],[308.745,-267.775],[313.899,-262.62],[319.056,-257.464],[324.21,-252.309],[329.367,-247.155],[334.522,-241.998],[339.676,-236.844],[344.833,-231.687],[349.987,-226.533],[355.141,-221.378],[360.298,-216.222],[365.453,-211.067],[370.493,-205.798],[375.53,-200.53],[380.57,-195.261],[385.608,-189.99],[390.646,-184.721],[395.683,-179.452],[400.723,-174.181],[405.761,-168.912],[410.798,-163.644],[415.836,-158.372],[420.876,-153.104],[425.914,-147.835],[430.952,-142.564],[435.991,-137.295],[441.029,-132.026],[446.067,-126.755],[450.661,-121.106],[455.085,-115.312],[459.508,-109.516],[463.855,-103.668],[467.716,-97.482],[471.57,-91.295],[474.768,-84.743],[477.969,-78.192],[480.665,-71.43],[483.133,-64.569],[485.537,-57.689],[487.344,-50.625],[489.151,-43.564],[490.61,-36.427],[491.744,-29.226],[492.879,-22.024],[493.364,-14.752],[493.82,-7.476],[494.002,-0.195],[493.775,7.093],[493.546,14.379],[492.743,21.622],[491.835,28.854],[490.734,36.056],[489.151,43.171],[487.566,50.289],[485.586,57.299],[483.445,64.27],[480.873,71.091],[478.151,77.849],[475.007,84.427],[471.692,90.913],[467.924,97.152],[464.056,103.329],[459.728,109.196],[455.4,115.062],[451.034,120.898],[446.165,126.326],[441.295,131.751],[436.428,137.178],[431.558,142.606],[426.691,148.031],[421.822,153.458],[416.954,158.886],[411.875,164.115],[406.748,169.3],[401.624,174.482],[396.498,179.667],[391.371,184.852],[386.245,190.036],[381.119,195.221],[375.995,200.406],[370.868,205.591],[365.742,210.775],[360.587,215.932],[355.433,221.086],[350.279,226.241],[345.122,231.398],[339.968,236.552],[334.813,241.706],[329.657,246.863],[324.502,252.017],[319.348,257.172],[314.191,262.328],[309.037,267.483],[303.88,272.637],[298.726,277.794],[293.571,282.948],[288.414,288.105],[283.26,293.259],[278.106,298.414],[272.949,303.571],[267.795,308.725],[262.64,313.879],[257.483,319.036],[252.329,324.19],[247.172,329.345],[242.018,334.502],[236.864,339.656],[231.707,344.813],[226.553,349.967],[221.398,355.121],[216.241,360.278],[211.005,365.514],[205.734,370.554],[200.465,375.592],[195.197,380.63],[189.926,385.667],[184.657,390.707],[179.388,395.745],[174.117,400.783],[168.848,405.82],[163.577,410.86],[158.308,415.898],[153.04,420.936],[147.768,425.973],[142.5,431.013],[137.231,436.051],[131.96,441.089],[126.691,446.129],[121.035,450.713],[115.238,455.137],[109.444,459.561],[103.59,463.901],[97.406,467.759],[91.212,471.606],[84.662,474.805],[78.112,478.005],[71.344,480.692],[64.484,483.159],[57.602,485.559],[50.538,487.366],[43.476,489.173],[36.34,490.623],[29.138,491.759],[21.936,492.894],[14.662,493.37],[7.386,493.825],[0.105,494.001],[-7.183,493.772],[-14.469,493.545],[-21.71,492.733],[-28.944,491.825],[-36.144,490.716],[-43.259,489.133],[-50.377,487.548],[-57.387,485.562],[-64.355,483.421],[-71.176,480.846],[-77.93,478.115],[-84.508,474.973],[-90.991,471.648],[-97.231,467.881],[-103.403,464.006],[-109.269,459.678],[-115.136,455.35],[-120.967,450.977],[-126.392,446.108],[-131.82,441.24],[-137.247,436.373],[-142.675,431.504],[-148.1,426.636],[-153.527,421.767],[-158.955,416.899],[-164.179,411.817],[-169.364,406.691],[-174.549,401.565],[-179.733,396.441],[-184.918,391.314],[-190.103,386.188],[-195.288,381.062],[-200.472,375.937],[-205.657,370.811],[-210.842,365.685],[-215.996,360.53],[-221.153,355.376],[-226.307,350.219],[-231.462,345.065],[-236.619,339.908],[-241.773,334.754],[-246.927,329.599],[-252.084,324.443],[-257.238,319.288],[-262.393,314.132],[-267.547,308.977],[-272.704,303.823],[-277.858,298.666],[-283.013,293.512],[-288.169,288.355],[-293.324,283.201],[-298.478,278.044],[-303.635,272.889],[-308.789,267.735],[-313.944,262.578],[-319.098,257.424],[-324.255,252.267],[-329.409,247.113],[-334.564,241.956],[-339.72,236.802],[-344.875,231.647],[-350.029,226.491],[-355.186,221.336],[-360.34,216.18],[-365.495,211.025],[-370.535,205.756],[-375.572,200.488],[-380.61,195.216],[-385.65,189.948],[-390.688,184.679],[-395.725,179.408],[-400.765,174.139],[-405.803,168.87],[-410.84,163.599],[-415.88,158.331],[-420.918,153.062],[-425.956,147.793],[-430.993,142.522],[-436.033,137.253],[-441.071,131.984],[-446.109,126.713],[-450.698,121.059],[-455.122,115.265],[-459.546,109.469],[-463.888,103.616],[-467.747,97.433],[-471.596,91.242],[-474.794,84.689],[-477.992,78.139],[-480.684,71.371],[-483.151,64.513],[-485.551,57.631],[-487.358,50.567],[-489.167,43.505],[-490.619,36.369],[-491.754,29.167],[-492.888,21.966],[-493.369,14.692],[-493.824,7.415],[-494.002,0.134],[-493.773,-7.151],[-493.546,-14.44],[-492.739,-21.681],[-491.828,-28.915],[-490.722,-36.115],[-489.139,-43.23],[-487.554,-50.347],[-485.57,-57.358],[-483.431,-64.328],[-480.857,-71.147],[-478.128,-77.903],[-474.986,-84.484],[-471.666,-90.966],[-467.898,-97.206],[-464.028,-103.378],[-459.697,-109.245],[-455.369,-115.111],[-450.999,-120.945],[-446.13,-126.37],[-441.26,-131.798],[-436.393,-137.223],[-431.523,-142.65],[-426.654,-148.075],[-421.787,-153.503],[-416.917,-158.93],[-411.835,-164.157],[-406.711,-169.34],[-401.585,-174.524],[-396.458,-179.709],[-391.332,-184.894],[-386.205,-190.078],[-381.081,-195.263],[-375.955,-200.448],[-370.829,-205.63],[-365.702,-210.815],[-360.548,-215.972],[-355.393,-221.129],[-350.239,-226.283],[-345.082,-231.437],[-339.928,-236.594],[-334.774,-241.748],[-329.617,-246.905],[-324.462,-252.06],[-319.308,-257.214],[-314.154,-262.371],[-308.997,-267.525],[-303.843,-272.682],[-298.688,-277.836],[-293.532,-282.993],[-288.377,-288.147],[-283.223,-293.302],[-278.066,-298.458],[-272.912,-303.613],[-267.757,-308.769],[-262.603,-313.924],[-257.446,-319.081],[-252.292,-324.235],[-247.137,-329.389],[-241.981,-334.546],[-236.826,-339.7],[-231.672,-344.857],[-226.515,-350.011],[-221.361,-355.166],[-216.206,-360.323],[-211.052,-365.477],[-205.781,-370.517],[-200.512,-375.555],[-195.243,-380.592],[-189.972,-385.632],[-184.703,-390.67],[-179.435,-395.708],[-174.164,-400.745],[-168.895,-405.783],[-163.624,-410.823],[-158.355,-415.861],[-153.086,-420.898],[-147.815,-425.936],[-142.546,-430.976],[-137.275,-436.014],[-132.006,-441.051],[-126.738,-446.089],[-121.084,-450.681],[-115.29,-455.105],[-109.493,-459.528],[-103.643,-463.87],[-97.459,-467.731],[-91.269,-471.583],[-84.718,-474.781],[-78.168,-477.982],[-71.403,-480.676],[-64.542,-483.143],[-57.662,-485.545],[-50.598,-487.352],[-43.534,-489.159],[-36.4,-490.616],[-29.199,-491.75],[-21.997,-492.885],[-14.723,-493.368],[-7.447,-493.823]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":376,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[167,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.18,0.18,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[-0.009,-0.009,0]},"t":60,"s":[100,100,100]},{"i":{"x":[0.325,0.325,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[0,0,0]},"t":70,"s":[105,105,100]},{"t":80,"s":[40,40,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":80,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[167,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.178,0.178,0.667],"y":[1,1,1]},"o":{"x":[0.562,0.562,0.333],"y":[0,0,0]},"t":82,"s":[40,40,100]},{"i":{"x":[0.351,0.351,0.667],"y":[1,1,1]},"o":{"x":[0.762,0.762,0.333],"y":[0,0,0]},"t":92,"s":[105,105,100]},{"t":102,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":82,"op":150,"st":-10,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":150,"s":[0]},{"t":180,"s":[90]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[167.116]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":300,"s":[167.595]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":370,"s":[167.595]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":400,"s":[227.643]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":458,"s":[227.643]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":488,"s":[287.451]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":546,"s":[287.451]},{"t":576,"s":[348.217]}],"ix":3},"y":{"a":0,"k":56.117,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[50,50,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":150,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[3.419,-496.632],[11.147,-496.256],[18.878,-495.883],[26.606,-495.507],[34.334,-495.132],[42.064,-494.758],[49.739,-493.839],[57.397,-492.716],[65.053,-491.594],[72.709,-490.474],[80.365,-489.352],[88.023,-488.232],[95.594,-486.684],[103.108,-484.832],[110.622,-482.977],[118.135,-481.125],[125.647,-479.273],[133.16,-477.422],[140.563,-475.196],[147.865,-472.639],[155.169,-470.079],[162.471,-467.521],[169.773,-464.961],[177.077,-462.401],[184.232,-459.48],[191.262,-456.243],[198.291,-453.009],[205.321,-449.772],[212.35,-446.538],[219.378,-443.302],[226.21,-439.684],[232.907,-435.807],[239.604,-431.932],[246.302,-428.055],[252.999,-424.178],[259.696,-420.303],[266.124,-416.009],[272.436,-411.53],[278.746,-407.053],[285.058,-402.573],[291.367,-398.097],[297.679,-393.617],[303.632,-388.683],[309.506,-383.645],[315.38,-378.607],[321.251,-373.569],[327.125,-368.531],[332.998,-363.493],[338.412,-357.966],[343.799,-352.41],[349.187,-346.857],[354.574,-341.301],[359.963,-335.747],[365.307,-330.155],[370.165,-324.13],[375.02,-318.107],[379.877,-312.082],[384.732,-306.056],[389.59,-300.033],[394.326,-293.921],[398.608,-287.474],[402.89,-281.03],[407.172,-274.585],[411.454,-268.138],[415.736,-261.694],[419.82,-255.129],[423.488,-248.316],[427.153,-241.501],[430.821,-234.688],[434.486,-227.873],[438.154,-221.057],[441.554,-214.117],[444.569,-206.989],[447.582,-199.863],[450.595,-192.734],[453.61,-185.608],[456.623,-178.48],[459.325,-171.238],[461.651,-163.859],[463.977,-156.478],[466.304,-149.099],[468.63,-141.718],[470.956,-134.339],[472.967,-126.876],[474.579,-119.307],[476.19,-111.738],[477.798,-104.169],[479.409,-96.6],[481.021,-89.033],[482.413,-81.425],[483.41,-73.753],[484.409,-66.078],[485.408,-58.405],[486.251,-50.718],[486.624,-42.99],[487,-35.26],[487.374,-27.532],[487.749,-19.801],[488.125,-12.073],[488.498,-4.345],[488.132,3.385],[487.759,11.113],[487.383,18.844],[487.01,26.572],[486.634,34.302],[486.258,42.03],[485.341,49.708],[484.221,57.363],[483.099,65.019],[481.979,72.675],[480.857,80.333],[479.735,87.989],[478.191,95.563],[476.339,103.074],[474.487,110.588],[472.633,118.102],[470.781,125.615],[468.929,133.129],[466.708,140.532],[464.148,147.834],[461.588,155.135],[459.031,162.44],[456.471,169.742],[453.913,177.046],[450.992,184.201],[447.758,191.23],[444.521,198.26],[441.287,205.29],[438.05,212.319],[434.816,219.349],[431.199,226.181],[427.324,232.878],[423.447,239.576],[419.57,246.273],[415.695,252.97],[411.817,259.667],[407.526,266.098],[403.049,272.407],[398.57,278.719],[394.093,285.029],[389.614,291.341],[385.137,297.65],[380.204,303.606],[375.167,309.479],[370.126,315.353],[365.088,321.227],[360.05,327.098],[355.012,332.972],[349.488,338.388],[343.934,343.775],[338.378,349.162],[332.825,354.55],[327.269,359.939],[321.679,365.286],[315.654,370.143],[309.631,374.998],[303.606,379.855],[297.58,384.71],[291.557,389.568],[285.445,394.307],[279.001,398.589],[272.556,402.871],[266.11,407.153],[259.665,411.435],[253.218,415.716],[246.656,419.803],[239.843,423.471],[233.028,427.136],[226.215,430.804],[219.399,434.469],[212.586,438.137],[205.646,441.54],[198.517,444.555],[191.392,447.568],[184.263,450.58],[177.137,453.596],[170.009,456.608],[162.77,459.313],[155.388,461.639],[148.01,463.965],[140.628,466.292],[133.25,468.62],[125.868,470.947],[118.405,472.958],[110.836,474.569],[103.269,476.18],[95.7,477.791],[88.131,479.402],[80.562,481.013],[72.957,482.405],[65.284,483.405],[57.609,484.402],[49.937,485.401],[42.25,486.246],[34.519,486.622],[26.791,486.995],[19.063,487.371],[11.333,487.744],[3.605,488.12],[-4.249,488.5],[-11.977,488.127],[-19.707,487.752],[-27.435,487.376],[-35.166,487.003],[-42.894,486.627],[-50.624,486.254],[-58.299,485.326],[-65.955,484.204],[-73.611,483.084],[-81.269,481.962],[-88.925,480.84],[-96.581,479.72],[-104.152,478.164],[-111.666,476.312],[-119.179,474.461],[-126.691,472.609],[-134.204,470.757],[-141.718,468.905],[-149.119,466.675],[-156.42,464.115],[-163.725,461.557],[-171.026,458.997],[-178.331,456.437],[-185.632,453.88],[-192.787,450.951],[-199.814,447.715],[-206.844,444.48],[-213.874,441.246],[-220.903,438.01],[-227.933,434.775],[-234.76,431.151],[-241.458,427.274],[-248.155,423.399],[-254.852,419.521],[-261.55,415.647],[-268.247,411.769],[-274.672,407.471],[-280.984,402.991],[-287.294,398.514],[-293.606,394.035],[-299.915,389.558],[-306.225,385.079],[-312.178,380.142],[-318.049,375.101],[-323.923,370.064],[-329.797,365.025],[-335.67,359.987],[-341.542,354.95],[-346.953,349.418],[-352.34,343.864],[-357.727,338.308],[-363.115,332.755],[-368.502,327.199],[-373.843,321.605],[-378.701,315.58],[-383.556,309.557],[-388.413,303.531],[-393.268,297.506],[-398.125,291.483],[-402.858,285.366],[-407.14,278.921],[-411.421,272.477],[-415.703,266.03],[-419.985,259.586],[-424.267,253.139],[-428.346,246.574],[-432.014,239.759],[-435.68,232.943],[-439.347,226.13],[-443.015,219.315],[-446.68,212.502],[-450.076,205.557],[-453.091,198.431],[-456.104,191.303],[-459.116,184.177],[-462.132,177.048],[-465.144,169.922],[-467.841,162.678],[-470.168,155.297],[-472.494,147.918],[-474.821,140.537],[-477.147,133.158],[-479.473,125.777],[-481.477,118.311],[-483.088,110.744],[-484.699,103.176],[-486.31,95.606],[-487.921,88.037],[-489.532,80.468],[-490.917,72.863],[-491.917,65.188],[-492.914,57.515],[-493.913,49.843],[-494.751,42.153],[-495.127,34.425],[-495.5,26.697],[-495.876,18.967],[-496.249,11.239],[-496.625,3.508],[-496.998,-4.22],[-496.627,-11.95],[-496.254,-19.678],[-495.878,-27.406],[-495.502,-35.137],[-495.129,-42.865],[-494.754,-50.595],[-493.831,-58.27],[-492.709,-65.926],[-491.589,-73.584],[-490.467,-81.24],[-489.345,-88.896],[-488.225,-96.552],[-486.674,-104.126],[-484.82,-111.637],[-482.968,-119.151],[-481.116,-126.664],[-479.264,-134.178],[-477.412,-141.692],[-475.184,-149.092],[-472.624,-156.394],[-470.067,-163.698],[-467.507,-171],[-464.949,-178.304],[-462.389,-185.606],[-459.463,-192.761],[-456.229,-199.79],[-452.992,-206.82],[-449.758,-213.847],[-446.524,-220.877],[-443.287,-227.906],[-439.665,-234.736],[-435.79,-241.434],[-431.913,-248.131],[-428.038,-254.828],[-424.161,-261.526],[-420.284,-268.223],[-415.987,-274.65],[-411.51,-280.96],[-407.031,-287.272],[-402.554,-293.582],[-398.075,-299.894],[-393.598,-306.203],[-388.661,-312.156],[-383.623,-318.03],[-378.585,-323.901],[-373.547,-329.775],[-368.507,-335.649],[-363.469,-341.522],[-357.942,-346.934],[-352.386,-352.321],[-346.832,-357.708],[-341.277,-363.095],[-335.723,-368.485],[-330.129,-373.826],[-324.103,-378.684],[-318.08,-383.539],[-312.055,-388.396],[-306.03,-393.251],[-300.007,-398.109],[-293.892,-402.843],[-287.448,-407.125],[-281.001,-411.407],[-274.556,-415.689],[-268.11,-419.971],[-261.665,-424.252],[-255.1,-428.334],[-248.285,-432.002],[-241.472,-435.667],[-234.657,-439.335],[-227.844,-443.003],[-221.029,-446.668],[-214.086,-450.066],[-206.96,-453.081],[-199.831,-456.094],[-192.705,-459.107],[-185.577,-462.122],[-178.451,-465.135],[-171.207,-467.834],[-163.828,-470.161],[-156.447,-472.487],[-149.068,-474.813],[-141.687,-477.14],[-134.308,-479.466],[-126.842,-481.472],[-119.273,-483.083],[-111.704,-484.694],[-104.138,-486.306],[-96.569,-487.917],[-88.999,-489.528],[-81.392,-490.917],[-73.719,-491.914],[-66.046,-492.914],[-58.371,-493.911],[-50.684,-494.751],[-42.956,-495.127],[-35.226,-495.5],[-27.498,-495.876],[-19.77,-496.251],[-12.039,-496.625],[-4.311,-497]],"c":true}]},{"t":180,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.652,-437.366],[8.33,-437.659],[17.312,-437.953],[26.249,-438.778],[35.158,-439.948],[44.07,-441.114],[52.848,-442.998],[61.602,-445.033],[70.348,-447.09],[78.906,-449.835],[87.432,-452.668],[95.787,-455.975],[104.114,-459.352],[112.356,-462.932],[120.6,-466.51],[128.842,-470.088],[137.086,-473.668],[145.494,-476.842],[153.901,-480.013],[162.309,-483.184],[170.98,-485.538],[179.663,-487.853],[188.349,-490.149],[197.221,-491.579],[206.092,-493.009],[214.984,-494.276],[223.954,-494.806],[232.926,-495.333],[241.897,-495.501],[250.877,-495.127],[259.857,-494.753],[268.778,-493.782],[277.678,-492.525],[286.574,-491.265],[295.31,-489.158],[304.044,-487.043],[312.697,-484.654],[321.19,-481.719],[329.683,-478.781],[337.963,-475.306],[346.144,-471.59],[354.301,-467.824],[362.109,-463.379],[369.919,-458.93],[377.531,-454.173],[384.91,-449.042],[392.286,-443.909],[399.256,-438.244],[406.146,-432.478],[412.915,-426.575],[419.27,-420.22],[425.623,-413.867],[431.614,-407.178],[437.38,-400.286],[443.14,-393.391],[448.274,-386.013],[453.404,-378.636],[458.262,-371.087],[462.71,-363.279],[467.158,-355.469],[471.032,-347.367],[474.745,-339.186],[478.338,-330.954],[481.276,-322.461],[484.212,-313.968],[486.723,-305.35],[488.838,-296.616],[490.956,-287.883],[492.333,-279.009],[493.59,-270.109],[494.694,-261.198],[495.065,-252.221],[495.439,-243.241],[495.406,-234.267],[494.88,-225.295],[494.35,-216.325],[493.216,-207.421],[491.786,-198.549],[490.356,-189.678],[488.193,-180.962],[485.878,-172.278],[483.559,-163.597],[480.481,-155.159],[477.307,-146.752],[474.136,-138.342],[470.618,-130.075],[467.038,-121.833],[463.46,-113.589],[459.882,-105.347],[456.543,-97.007],[453.374,-88.597],[450.208,-80.187],[447.684,-71.571],[445.361,-62.891],[443.04,-54.21],[441.544,-45.348],[440.087,-36.481],[438.775,-27.597],[438.19,-18.63],[437.605,-9.663],[437.362,-0.691],[437.653,8.291],[437.947,17.273],[438.77,26.21],[439.939,35.121],[441.105,44.031],[442.987,52.812],[445.022,61.566],[447.074,70.312],[449.819,78.87],[452.649,87.395],[455.956,95.753],[459.333,104.08],[462.911,112.322],[466.488,120.566],[470.069,128.808],[473.646,137.052],[476.823,145.458],[479.994,153.865],[483.165,162.275],[485.521,170.943],[487.84,179.627],[490.138,188.313],[491.568,197.184],[492.998,206.056],[494.27,214.945],[494.799,223.917],[495.326,232.887],[495.497,241.861],[495.123,250.838],[494.752,259.818],[493.783,268.742],[492.524,277.641],[491.267,286.538],[489.162,295.274],[487.047,304.008],[484.661,312.664],[481.725,321.156],[478.787,329.649],[475.315,337.926],[471.599,346.11],[467.838,354.267],[463.39,362.077],[458.944,369.885],[454.19,377.502],[449.059,384.879],[443.925,392.255],[438.263,399.227],[432.497,406.117],[426.596,412.888],[420.241,419.241],[413.888,425.596],[407.202,431.588],[400.31,437.356],[393.415,443.119],[386.039,448.252],[378.663,453.383],[371.113,458.243],[363.305,462.691],[355.498,467.14],[347.396,471.016],[339.215,474.732],[330.985,478.327],[322.492,481.265],[314,484.2],[305.381,486.714],[296.648,488.832],[287.914,490.947],[279.04,492.327],[270.143,493.586],[261.231,494.693],[252.252,495.067],[243.275,495.44],[234.298,495.41],[225.328,494.883],[216.356,494.354],[207.452,493.225],[198.581,491.795],[189.709,490.365],[180.993,488.207],[172.309,485.889],[163.628,483.573],[155.188,480.495],[146.781,477.323],[138.373,474.152],[130.106,470.634],[121.862,467.057],[113.62,463.476],[105.376,459.899],[97.036,456.559],[88.626,453.39],[80.216,450.224],[71.603,447.695],[62.922,445.374],[54.241,443.054],[45.382,441.553],[36.515,440.095],[27.631,438.781],[18.664,438.196],[9.697,437.612],[0.723,437.363],[-8.259,437.654],[-17.239,437.948],[-26.178,438.768],[-35.088,439.935],[-43.999,441.104],[-52.781,442.981],[-61.534,445.016],[-70.283,447.065],[-78.839,449.81],[-87.367,452.638],[-95.721,455.945],[-104.048,459.319],[-112.293,462.897],[-120.535,466.477],[-128.779,470.055],[-137.021,473.633],[-145.429,476.811],[-153.836,479.983],[-162.243,483.154],[-170.912,485.515],[-179.595,487.831],[-188.281,490.134],[-197.153,491.564],[-206.025,492.994],[-214.914,494.269],[-223.883,494.798],[-232.855,495.325],[-241.827,495.501],[-250.807,495.127],[-259.786,494.753],[-268.711,493.789],[-277.607,492.53],[-286.507,491.273],[-295.243,489.173],[-303.976,487.056],[-312.632,484.674],[-321.125,481.737],[-329.618,478.801],[-337.897,475.331],[-346.079,471.615],[-354.241,467.854],[-362.048,463.409],[-369.856,458.96],[-377.473,454.211],[-384.85,449.078],[-392.229,443.947],[-399.201,438.287],[-406.093,432.518],[-412.865,426.62],[-419.22,420.265],[-425.572,413.912],[-431.566,407.228],[-437.334,400.336],[-443.1,393.444],[-448.231,386.068],[-453.364,378.689],[-458.226,371.145],[-462.675,363.334],[-467.123,355.526],[-471.002,347.428],[-474.718,339.246],[-478.316,331.017],[-481.254,322.524],[-484.192,314.031],[-486.708,305.415],[-488.823,296.682],[-490.941,287.948],[-492.323,279.074],[-493.582,270.177],[-494.694,261.265],[-495.068,252.286],[-495.439,243.309],[-495.417,234.332],[-494.887,225.362],[-494.36,216.39],[-493.234,207.486],[-491.804,198.614],[-490.374,189.743],[-488.218,181.024],[-485.9,172.343],[-483.584,163.66],[-480.511,155.22],[-477.34,146.812],[-474.168,138.405],[-470.651,130.138],[-467.07,121.896],[-463.49,113.652],[-459.91,105.41],[-456.568,97.072],[-453.402,88.66],[-450.235,80.25],[-447.704,71.637],[-445.383,62.956],[-443.062,54.275],[-441.562,45.416],[-440.104,36.549],[-438.785,27.665],[-438.2,18.698],[-437.618,9.731],[-437.365,0.759],[-437.658,-8.223],[-437.949,-17.205],[-438.767,-26.145],[-439.934,-35.054],[-441.103,-43.963],[-442.977,-52.747],[-445.012,-61.498],[-447.059,-70.249],[-449.804,-78.805],[-452.631,-87.333],[-455.936,-95.69],[-459.31,-104.017],[-462.891,-112.259],[-466.468,-120.503],[-470.046,-128.745],[-473.684,-137.12],[-476.855,-145.53],[-480.027,-153.938],[-483.198,-162.345],[-485.546,-171.019],[-487.865,-179.699],[-490.153,-188.388],[-491.583,-197.26],[-493.013,-206.131],[-494.277,-215.023],[-494.807,-223.993],[-495.334,-232.965],[-495.497,-241.936],[-495.123,-250.916],[-494.752,-259.896],[-493.776,-268.817],[-492.516,-277.717],[-491.259,-286.613],[-489.149,-295.349],[-487.032,-304.083],[-484.641,-312.734],[-481.703,-321.227],[-478.767,-329.722],[-475.287,-337.996],[-471.572,-346.181],[-467.803,-354.335],[-463.357,-362.143],[-458.909,-369.953],[-454.149,-377.565],[-449.019,-384.941],[-443.885,-392.318],[-438.218,-399.285],[-432.452,-406.177],[-426.546,-412.944],[-420.193,-419.296],[-413.838,-425.652],[-407.147,-431.638],[-400.257,-437.406],[-393.358,-443.164],[-385.981,-448.295],[-378.605,-453.428],[-371.053,-458.283],[-363.245,-462.731],[-355.435,-467.177],[-347.334,-471.048],[-339.149,-474.764],[-330.917,-478.354],[-322.425,-481.29],[-313.932,-484.228],[-305.314,-486.734],[-296.58,-488.852],[-287.846,-490.967],[-278.97,-492.342],[-270.073,-493.599],[-261.161,-494.7],[-252.182,-495.072],[-243.202,-495.445],[-234.228,-495.41],[-225.258,-494.883],[-216.286,-494.354],[-207.382,-493.217],[-198.51,-491.787],[-189.639,-490.357],[-180.925,-488.192],[-172.242,-485.874],[-163.558,-483.558],[-155.123,-480.475],[-146.716,-477.301],[-138.306,-474.129],[-130.041,-470.609],[-121.797,-467.029],[-113.555,-463.449],[-105.313,-459.871],[-96.971,-456.534],[-88.561,-453.368],[-80.151,-450.199],[-71.535,-447.678],[-62.854,-445.357],[-54.171,-443.036],[-45.312,-441.543],[-36.445,-440.086],[-27.561,-438.778],[-18.594,-438.194],[-9.624,-437.609]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":150,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[221,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.18,0.18,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[-0.009,-0.009,0]},"t":66,"s":[100,100,100]},{"i":{"x":[0.325,0.325,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[0,0,0]},"t":76,"s":[105,105,100]},{"t":86,"s":[40,40,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":86,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":156,"s":[0]},{"t":186,"s":[90]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[221]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":300,"s":[225.785]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":368,"s":[225.785]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":398,"s":[288.943]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":456,"s":[288.943]},{"t":486,"s":[349.708]}],"ix":3},"y":{"a":0,"k":56,"ix":4}},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.178,0.178,0.667],"y":[1,1,1]},"o":{"x":[0.562,0.562,0.333],"y":[0,0,0]},"t":88,"s":[40,40,100]},{"i":{"x":[0.351,0.351,0.667],"y":[1,1,1]},"o":{"x":[0.762,0.762,0.333],"y":[0,0,0]},"t":98,"s":[105,105,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":108,"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":540,"s":[100,100,100]},{"t":552,"s":[20,20,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":156,"s":[22]},{"t":186,"s":[15]}],"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":88,"op":552,"st":-10,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[275,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.18,0.18,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[-0.009,-0.009,0]},"t":72,"s":[100,100,100]},{"i":{"x":[0.325,0.325,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[0,0,0]},"t":82,"s":[105,105,100]},{"t":92,"s":[40,40,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":92,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[275,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.178,0.178,0.667],"y":[1,1,1]},"o":{"x":[0.562,0.562,0.333],"y":[0,0,0]},"t":94,"s":[40,40,100]},{"i":{"x":[0.351,0.351,0.667],"y":[1,1,1]},"o":{"x":[0.762,0.762,0.333],"y":[0,0,0]},"t":104,"s":[105,105,100]},{"t":114,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":94,"op":162,"st":-10,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":162,"s":[0]},{"t":192,"s":[90]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[275.262]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":300,"s":[286.267]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":366,"s":[286.267]},{"t":396,"s":[349.664]}],"ix":3},"y":{"a":0,"k":56.117,"ix":4}},"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]},"t":450,"s":[50,50,100]},{"t":462,"s":[20,20,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":162,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[3.419,-496.632],[11.147,-496.256],[18.878,-495.883],[26.606,-495.507],[34.334,-495.132],[42.064,-494.758],[49.739,-493.839],[57.397,-492.716],[65.053,-491.594],[72.709,-490.474],[80.365,-489.352],[88.023,-488.232],[95.594,-486.684],[103.108,-484.832],[110.622,-482.977],[118.135,-481.125],[125.647,-479.273],[133.16,-477.422],[140.563,-475.196],[147.865,-472.639],[155.169,-470.079],[162.471,-467.521],[169.773,-464.961],[177.077,-462.401],[184.232,-459.48],[191.262,-456.243],[198.291,-453.009],[205.321,-449.772],[212.35,-446.538],[219.378,-443.302],[226.21,-439.684],[232.907,-435.807],[239.604,-431.932],[246.302,-428.055],[252.999,-424.178],[259.696,-420.303],[266.124,-416.009],[272.436,-411.53],[278.746,-407.053],[285.058,-402.573],[291.367,-398.097],[297.679,-393.617],[303.632,-388.683],[309.506,-383.645],[315.38,-378.607],[321.251,-373.569],[327.125,-368.531],[332.998,-363.493],[338.412,-357.966],[343.799,-352.41],[349.187,-346.857],[354.574,-341.301],[359.963,-335.747],[365.307,-330.155],[370.165,-324.13],[375.02,-318.107],[379.877,-312.082],[384.732,-306.056],[389.59,-300.033],[394.326,-293.921],[398.608,-287.474],[402.89,-281.03],[407.172,-274.585],[411.454,-268.138],[415.736,-261.694],[419.82,-255.129],[423.488,-248.316],[427.153,-241.501],[430.821,-234.688],[434.486,-227.873],[438.154,-221.057],[441.554,-214.117],[444.569,-206.989],[447.582,-199.863],[450.595,-192.734],[453.61,-185.608],[456.623,-178.48],[459.325,-171.238],[461.651,-163.859],[463.977,-156.478],[466.304,-149.099],[468.63,-141.718],[470.956,-134.339],[472.967,-126.876],[474.579,-119.307],[476.19,-111.738],[477.798,-104.169],[479.409,-96.6],[481.021,-89.033],[482.413,-81.425],[483.41,-73.753],[484.409,-66.078],[485.408,-58.405],[486.251,-50.718],[486.624,-42.99],[487,-35.26],[487.374,-27.532],[487.749,-19.801],[488.125,-12.073],[488.498,-4.345],[488.132,3.385],[487.759,11.113],[487.383,18.844],[487.01,26.572],[486.634,34.302],[486.258,42.03],[485.341,49.708],[484.221,57.363],[483.099,65.019],[481.979,72.675],[480.857,80.333],[479.735,87.989],[478.191,95.563],[476.339,103.074],[474.487,110.588],[472.633,118.102],[470.781,125.615],[468.929,133.129],[466.708,140.532],[464.148,147.834],[461.588,155.135],[459.031,162.44],[456.471,169.742],[453.913,177.046],[450.992,184.201],[447.758,191.23],[444.521,198.26],[441.287,205.29],[438.05,212.319],[434.816,219.349],[431.199,226.181],[427.324,232.878],[423.447,239.576],[419.57,246.273],[415.695,252.97],[411.817,259.667],[407.526,266.098],[403.049,272.407],[398.57,278.719],[394.093,285.029],[389.614,291.341],[385.137,297.65],[380.204,303.606],[375.167,309.479],[370.126,315.353],[365.088,321.227],[360.05,327.098],[355.012,332.972],[349.488,338.388],[343.934,343.775],[338.378,349.162],[332.825,354.55],[327.269,359.939],[321.679,365.286],[315.654,370.143],[309.631,374.998],[303.606,379.855],[297.58,384.71],[291.557,389.568],[285.445,394.307],[279.001,398.589],[272.556,402.871],[266.11,407.153],[259.665,411.435],[253.218,415.716],[246.656,419.803],[239.843,423.471],[233.028,427.136],[226.215,430.804],[219.399,434.469],[212.586,438.137],[205.646,441.54],[198.517,444.555],[191.392,447.568],[184.263,450.58],[177.137,453.596],[170.009,456.608],[162.77,459.313],[155.388,461.639],[148.01,463.965],[140.628,466.292],[133.25,468.62],[125.868,470.947],[118.405,472.958],[110.836,474.569],[103.269,476.18],[95.7,477.791],[88.131,479.402],[80.562,481.013],[72.957,482.405],[65.284,483.405],[57.609,484.402],[49.937,485.401],[42.25,486.246],[34.519,486.622],[26.791,486.995],[19.063,487.371],[11.333,487.744],[3.605,488.12],[-4.249,488.5],[-11.977,488.127],[-19.707,487.752],[-27.435,487.376],[-35.166,487.003],[-42.894,486.627],[-50.624,486.254],[-58.299,485.326],[-65.955,484.204],[-73.611,483.084],[-81.269,481.962],[-88.925,480.84],[-96.581,479.72],[-104.152,478.164],[-111.666,476.312],[-119.179,474.461],[-126.691,472.609],[-134.204,470.757],[-141.718,468.905],[-149.119,466.675],[-156.42,464.115],[-163.725,461.557],[-171.026,458.997],[-178.331,456.437],[-185.632,453.88],[-192.787,450.951],[-199.814,447.715],[-206.844,444.48],[-213.874,441.246],[-220.903,438.01],[-227.933,434.775],[-234.76,431.151],[-241.458,427.274],[-248.155,423.399],[-254.852,419.521],[-261.55,415.647],[-268.247,411.769],[-274.672,407.471],[-280.984,402.991],[-287.294,398.514],[-293.606,394.035],[-299.915,389.558],[-306.225,385.079],[-312.178,380.142],[-318.049,375.101],[-323.923,370.064],[-329.797,365.025],[-335.67,359.987],[-341.542,354.95],[-346.953,349.418],[-352.34,343.864],[-357.727,338.308],[-363.115,332.755],[-368.502,327.199],[-373.843,321.605],[-378.701,315.58],[-383.556,309.557],[-388.413,303.531],[-393.268,297.506],[-398.125,291.483],[-402.858,285.366],[-407.14,278.921],[-411.421,272.477],[-415.703,266.03],[-419.985,259.586],[-424.267,253.139],[-428.346,246.574],[-432.014,239.759],[-435.68,232.943],[-439.347,226.13],[-443.015,219.315],[-446.68,212.502],[-450.076,205.557],[-453.091,198.431],[-456.104,191.303],[-459.116,184.177],[-462.132,177.048],[-465.144,169.922],[-467.841,162.678],[-470.168,155.297],[-472.494,147.918],[-474.821,140.537],[-477.147,133.158],[-479.473,125.777],[-481.477,118.311],[-483.088,110.744],[-484.699,103.176],[-486.31,95.606],[-487.921,88.037],[-489.532,80.468],[-490.917,72.863],[-491.917,65.188],[-492.914,57.515],[-493.913,49.843],[-494.751,42.153],[-495.127,34.425],[-495.5,26.697],[-495.876,18.967],[-496.249,11.239],[-496.625,3.508],[-496.998,-4.22],[-496.627,-11.95],[-496.254,-19.678],[-495.878,-27.406],[-495.502,-35.137],[-495.129,-42.865],[-494.754,-50.595],[-493.831,-58.27],[-492.709,-65.926],[-491.589,-73.584],[-490.467,-81.24],[-489.345,-88.896],[-488.225,-96.552],[-486.674,-104.126],[-484.82,-111.637],[-482.968,-119.151],[-481.116,-126.664],[-479.264,-134.178],[-477.412,-141.692],[-475.184,-149.092],[-472.624,-156.394],[-470.067,-163.698],[-467.507,-171],[-464.949,-178.304],[-462.389,-185.606],[-459.463,-192.761],[-456.229,-199.79],[-452.992,-206.82],[-449.758,-213.847],[-446.524,-220.877],[-443.287,-227.906],[-439.665,-234.736],[-435.79,-241.434],[-431.913,-248.131],[-428.038,-254.828],[-424.161,-261.526],[-420.284,-268.223],[-415.987,-274.65],[-411.51,-280.96],[-407.031,-287.272],[-402.554,-293.582],[-398.075,-299.894],[-393.598,-306.203],[-388.661,-312.156],[-383.623,-318.03],[-378.585,-323.901],[-373.547,-329.775],[-368.507,-335.649],[-363.469,-341.522],[-357.942,-346.934],[-352.386,-352.321],[-346.832,-357.708],[-341.277,-363.095],[-335.723,-368.485],[-330.129,-373.826],[-324.103,-378.684],[-318.08,-383.539],[-312.055,-388.396],[-306.03,-393.251],[-300.007,-398.109],[-293.892,-402.843],[-287.448,-407.125],[-281.001,-411.407],[-274.556,-415.689],[-268.11,-419.971],[-261.665,-424.252],[-255.1,-428.334],[-248.285,-432.002],[-241.472,-435.667],[-234.657,-439.335],[-227.844,-443.003],[-221.029,-446.668],[-214.086,-450.066],[-206.96,-453.081],[-199.831,-456.094],[-192.705,-459.107],[-185.577,-462.122],[-178.451,-465.135],[-171.207,-467.834],[-163.828,-470.161],[-156.447,-472.487],[-149.068,-474.813],[-141.687,-477.14],[-134.308,-479.466],[-126.842,-481.472],[-119.273,-483.083],[-111.704,-484.694],[-104.138,-486.306],[-96.569,-487.917],[-88.999,-489.528],[-81.392,-490.917],[-73.719,-491.914],[-66.046,-492.914],[-58.371,-493.911],[-50.684,-494.751],[-42.956,-495.127],[-35.226,-495.5],[-27.498,-495.876],[-19.77,-496.251],[-12.039,-496.625],[-4.311,-497]],"c":true}]},{"t":192,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[6.428,-491.836],[14.758,-490.711],[22.933,-488.794],[30.879,-486.091],[38.523,-482.63],[45.798,-478.436],[52.619,-473.52],[58.782,-467.809],[64.461,-461.621],[69.338,-454.782],[73.871,-447.708],[78.192,-440.497],[82.517,-433.286],[86.839,-426.075],[91.16,-418.864],[95.482,-411.653],[99.804,-404.442],[104.126,-397.231],[108.483,-390.044],[113.214,-383.095],[118.623,-376.662],[124.659,-370.811],[131.256,-365.6],[138.343,-361.084],[145.852,-357.302],[153.702,-354.292],[161.813,-352.086],[170.105,-350.705],[178.493,-350.164],[186.896,-350.481],[195.21,-351.684],[203.407,-353.545],[211.562,-355.588],[219.718,-357.63],[227.872,-359.673],[236.027,-361.716],[244.181,-363.761],[252.338,-365.803],[260.492,-367.846],[268.646,-369.889],[276.914,-371.411],[285.269,-372.203],[293.657,-372.215],[302.017,-371.414],[310.252,-369.719],[318.231,-367.08],[325.908,-363.685],[333.216,-359.562],[340.096,-354.753],[346.486,-349.301],[352.314,-343.241],[357.412,-336.56],[361.837,-329.422],[365.549,-321.897],[368.509,-314.043],[370.689,-305.936],[372.039,-297.638],[372.361,-289.24],[372.004,-280.849],[370.621,-272.565],[368.824,-264.356],[366.781,-256.2],[364.736,-248.045],[362.693,-239.891],[360.651,-231.737],[358.608,-223.58],[356.565,-215.426],[354.522,-207.272],[352.518,-199.108],[350.948,-190.852],[350.222,-182.478],[350.352,-174.071],[351.328,-165.723],[353.146,-157.514],[355.778,-149.53],[359.199,-141.853],[363.374,-134.555],[368.261,-127.715],[373.81,-121.4],[379.976,-115.683],[386.704,-110.652],[393.816,-106.172],[401.027,-101.85],[408.238,-97.528],[415.449,-93.207],[422.657,-88.885],[429.868,-84.563],[437.079,-80.241],[444.29,-75.919],[451.501,-71.597],[458.424,-66.826],[464.892,-61.481],[470.836,-55.558],[476.182,-49.083],[480.806,-42.061],[484.584,-34.554],[487.613,-26.727],[489.868,-18.643],[491.334,-10.378],[492.001,-2.006],[491.837,6.399],[490.717,14.73],[488.802,22.906],[486.104,30.852],[482.645,38.498],[478.456,45.775],[473.541,52.596],[467.831,58.762],[461.649,64.443],[454.811,69.326],[447.737,73.86],[440.526,78.18],[433.315,82.501],[426.105,86.823],[418.894,91.145],[411.68,95.465],[404.469,99.786],[397.258,104.108],[390.069,108.463],[383.12,113.192],[376.687,118.601],[370.833,124.635],[365.62,131.228],[361.1,138.316],[357.315,145.823],[354.303,153.672],[352.094,161.784],[350.711,170.075],[350.167,178.464],[350.487,186.866],[351.683,195.181],[353.544,203.378],[355.589,211.532],[357.631,219.686],[359.674,227.843],[361.717,235.997],[363.762,244.151],[365.805,252.306],[367.847,260.462],[369.892,268.617],[371.413,276.884],[372.209,285.237],[372.224,293.628],[371.424,301.988],[369.729,310.223],[367.095,318.202],[363.7,325.879],[359.582,333.191],[354.775,340.071],[349.328,346.464],[343.269,352.292],[336.587,357.392],[329.452,361.82],[321.927,365.534],[314.075,368.499],[305.968,370.683],[297.67,372.031],[289.272,372.357],[280.883,372.005],[272.597,370.622],[264.388,368.83],[256.234,366.785],[248.077,364.742],[239.923,362.699],[231.769,360.657],[223.615,358.614],[215.458,356.571],[207.304,354.526],[199.14,352.521],[190.884,350.949],[182.51,350.221],[174.105,350.344],[165.754,351.32],[157.546,353.134],[149.562,355.763],[141.88,359.181],[134.582,363.354],[127.74,368.236],[121.423,373.785],[115.708,379.949],[110.672,386.673],[106.19,393.784],[101.868,400.995],[97.546,408.206],[93.224,415.417],[88.902,422.628],[84.581,429.839],[80.259,437.05],[75.937,444.261],[71.615,451.472],[66.846,458.394],[61.503,464.868],[55.583,470.811],[49.11,476.162],[42.088,480.786],[34.586,484.569],[26.758,487.6],[18.675,489.86],[10.412,491.328],[2.04,492],[-6.367,491.834],[-14.696,490.718],[-22.874,488.808],[-30.82,486.115],[-38.469,482.661],[-45.748,478.474],[-52.569,473.559],[-58.737,467.851],[-64.421,461.671],[-69.305,454.836],[-73.842,447.762],[-78.164,440.551],[-82.484,433.34],[-86.805,426.13],[-91.127,418.918],[-95.449,411.708],[-99.769,404.497],[-104.09,397.283],[-108.445,390.094],[-113.171,383.143],[-118.576,376.707],[-124.607,370.851],[-131.201,365.636],[-138.287,361.113],[-145.793,357.325],[-153.64,354.309],[-161.749,352.098],[-170.041,350.71],[-178.432,350.169],[-186.832,350.483],[-195.149,351.675],[-203.346,353.533],[-211.5,355.578],[-219.654,357.621],[-227.809,359.664],[-235.965,361.706],[-244.12,363.751],[-252.274,365.794],[-260.428,367.837],[-268.585,369.882],[-276.85,371.404],[-285.205,372.204],[-293.594,372.225],[-301.956,371.43],[-310.191,369.735],[-318.17,367.104],[-325.849,363.716],[-333.162,359.6],[-340.046,354.796],[-346.442,349.351],[-352.269,343.291],[-357.371,336.612],[-361.804,329.482],[-365.521,321.956],[-368.488,314.107],[-370.677,306],[-372.025,297.702],[-372.356,289.304],[-372.006,280.915],[-370.628,272.629],[-368.836,264.42],[-366.793,256.264],[-364.75,248.109],[-362.708,239.955],[-360.662,231.801],[-358.62,223.646],[-356.577,215.49],[-354.532,207.336],[-352.527,199.172],[-350.95,190.916],[-350.22,182.542],[-350.34,174.137],[-351.312,165.786],[-353.123,157.578],[-355.749,149.591],[-359.166,141.91],[-363.334,134.609],[-368.216,127.765],[-373.763,121.447],[-379.924,115.728],[-386.645,110.688],[-393.755,106.205],[-400.968,101.886],[-408.179,97.564],[-415.39,93.242],[-422.601,88.923],[-429.814,84.601],[-437.025,80.281],[-444.236,75.96],[-451.449,71.64],[-458.372,66.871],[-464.845,61.533],[-470.793,55.615],[-476.148,49.144],[-480.771,42.123],[-484.556,34.621],[-487.591,26.795],[-489.854,18.714],[-491.327,10.451],[-492.001,2.077],[-491.837,-6.328],[-490.724,-14.659],[-488.818,-22.835],[-486.128,-30.786],[-482.678,-38.434],[-478.496,-45.716],[-473.581,-52.537],[-467.878,-58.71],[-461.701,-64.396],[-454.868,-69.283],[-447.796,-73.822],[-440.586,-78.144],[-433.375,-82.463],[-426.161,-86.785],[-418.95,-91.107],[-411.739,-95.429],[-404.529,-99.751],[-397.318,-104.073],[-390.126,-108.425],[-383.172,-113.146],[-376.732,-118.549],[-370.874,-124.578],[-365.656,-131.167],[-361.128,-138.252],[-357.338,-145.757],[-354.319,-153.601],[-352.104,-161.71],[-350.714,-170.002],[-350.17,-178.393],[-350.482,-186.793],[-351.666,-195.11],[-353.525,-203.307],[-355.567,-211.461],[-357.61,-219.618],[-359.655,-227.772],[-361.698,-235.926],[-363.741,-244.081],[-365.783,-252.237],[-367.826,-260.391],[-369.871,-268.546],[-371.396,-276.813],[-372.202,-285.166],[-372.226,-293.555],[-371.436,-301.917],[-369.741,-310.152],[-367.117,-318.133],[-363.731,-325.815],[-359.617,-333.13],[-354.818,-340.017],[-349.378,-346.414],[-343.318,-352.242],[-336.642,-357.349],[-329.511,-361.784],[-321.991,-365.505],[-314.141,-368.475],[-306.037,-370.669],[-297.738,-372.017],[-289.34,-372.35],[-280.952,-372.005],[-272.665,-370.629],[-264.454,-368.839],[-256.3,-366.796],[-248.146,-364.754],[-239.989,-362.709],[-231.835,-360.666],[-223.681,-358.623],[-215.526,-356.581],[-207.372,-354.535],[-199.208,-352.528],[-190.953,-350.951],[-182.578,-350.216],[-174.174,-350.334],[-165.823,-351.306],[-157.612,-353.115],[-149.626,-355.736],[-141.942,-359.148],[-134.639,-363.314],[-127.794,-368.194],[-121.477,-373.74],[-115.753,-379.899],[-110.708,-386.616],[-106.225,-393.725],[-101.903,-400.936],[-97.582,-408.147],[-93.26,-415.36],[-88.94,-422.571],[-84.618,-429.782],[-80.297,-436.993],[-75.975,-444.204],[-71.584,-451.531],[-66.813,-458.453],[-61.463,-464.917],[-55.538,-470.858],[-49.058,-476.202],[-42.039,-480.826],[-34.53,-484.599],[-26.699,-487.623],[-18.616,-489.876],[-10.351,-491.337],[-1.977,-491.999]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":162,"op":462,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[329,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.18,0.18,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[-0.009,-0.009,0]},"t":78,"s":[100,100,100]},{"i":{"x":[0.325,0.325,0.667],"y":[1,1,1]},"o":{"x":[0.678,0.678,0.333],"y":[0,0,0]},"t":88,"s":[105,105,100]},{"t":98,"s":[40,40,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":98,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[329,56,0],"ix":2,"l":2},"a":{"a":0,"k":[-83.117,-32.398,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.178,0.178,0.667],"y":[1,1,1]},"o":{"x":[0.562,0.562,0.333],"y":[0,0,0]},"t":100,"s":[40,40,100]},{"i":{"x":[0.351,0.351,0.667],"y":[1,1,1]},"o":{"x":[0.762,0.762,0.333],"y":[0,0,0]},"t":110,"s":[105,105,100]},{"t":120,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[44,44],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":22,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-83.117,-32.398],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":100,"op":168,"st":-10,"ct":1,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":168,"s":[0]},{"t":198,"s":[180]}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[329.262]},{"t":300,"s":[348.401]}],"ix":3},"y":{"a":0,"k":56.117,"ix":4}},"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]},"t":360,"s":[50,50,100]},{"t":372,"s":[20,20,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":168,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[3.419,-496.632],[11.147,-496.256],[18.878,-495.883],[26.606,-495.507],[34.334,-495.132],[42.064,-494.758],[49.739,-493.839],[57.397,-492.716],[65.053,-491.594],[72.709,-490.474],[80.365,-489.352],[88.023,-488.232],[95.594,-486.684],[103.108,-484.832],[110.622,-482.977],[118.135,-481.125],[125.647,-479.273],[133.16,-477.422],[140.563,-475.196],[147.865,-472.639],[155.169,-470.079],[162.471,-467.521],[169.773,-464.961],[177.077,-462.401],[184.232,-459.48],[191.262,-456.243],[198.291,-453.009],[205.321,-449.772],[212.35,-446.538],[219.378,-443.302],[226.21,-439.684],[232.907,-435.807],[239.604,-431.932],[246.302,-428.055],[252.999,-424.178],[259.696,-420.303],[266.124,-416.009],[272.436,-411.53],[278.746,-407.053],[285.058,-402.573],[291.367,-398.097],[297.679,-393.617],[303.632,-388.683],[309.506,-383.645],[315.38,-378.607],[321.251,-373.569],[327.125,-368.531],[332.998,-363.493],[338.412,-357.966],[343.799,-352.41],[349.187,-346.857],[354.574,-341.301],[359.963,-335.747],[365.307,-330.155],[370.165,-324.13],[375.02,-318.107],[379.877,-312.082],[384.732,-306.056],[389.59,-300.033],[394.326,-293.921],[398.608,-287.474],[402.89,-281.03],[407.172,-274.585],[411.454,-268.138],[415.736,-261.694],[419.82,-255.129],[423.488,-248.316],[427.153,-241.501],[430.821,-234.688],[434.486,-227.873],[438.154,-221.057],[441.554,-214.117],[444.569,-206.989],[447.582,-199.863],[450.595,-192.734],[453.61,-185.608],[456.623,-178.48],[459.325,-171.238],[461.651,-163.859],[463.977,-156.478],[466.304,-149.099],[468.63,-141.718],[470.956,-134.339],[472.967,-126.876],[474.579,-119.307],[476.19,-111.738],[477.798,-104.169],[479.409,-96.6],[481.021,-89.033],[482.413,-81.425],[483.41,-73.753],[484.409,-66.078],[485.408,-58.405],[486.251,-50.718],[486.624,-42.99],[487,-35.26],[487.374,-27.532],[487.749,-19.801],[488.125,-12.073],[488.498,-4.345],[488.132,3.385],[487.759,11.113],[487.383,18.844],[487.01,26.572],[486.634,34.302],[486.258,42.03],[485.341,49.708],[484.221,57.363],[483.099,65.019],[481.979,72.675],[480.857,80.333],[479.735,87.989],[478.191,95.563],[476.339,103.074],[474.487,110.588],[472.633,118.102],[470.781,125.615],[468.929,133.129],[466.708,140.532],[464.148,147.834],[461.588,155.135],[459.031,162.44],[456.471,169.742],[453.913,177.046],[450.992,184.201],[447.758,191.23],[444.521,198.26],[441.287,205.29],[438.05,212.319],[434.816,219.349],[431.199,226.181],[427.324,232.878],[423.447,239.576],[419.57,246.273],[415.695,252.97],[411.817,259.667],[407.526,266.098],[403.049,272.407],[398.57,278.719],[394.093,285.029],[389.614,291.341],[385.137,297.65],[380.204,303.606],[375.167,309.479],[370.126,315.353],[365.088,321.227],[360.05,327.098],[355.012,332.972],[349.488,338.388],[343.934,343.775],[338.378,349.162],[332.825,354.55],[327.269,359.939],[321.679,365.286],[315.654,370.143],[309.631,374.998],[303.606,379.855],[297.58,384.71],[291.557,389.568],[285.445,394.307],[279.001,398.589],[272.556,402.871],[266.11,407.153],[259.665,411.435],[253.218,415.716],[246.656,419.803],[239.843,423.471],[233.028,427.136],[226.215,430.804],[219.399,434.469],[212.586,438.137],[205.646,441.54],[198.517,444.555],[191.392,447.568],[184.263,450.58],[177.137,453.596],[170.009,456.608],[162.77,459.313],[155.388,461.639],[148.01,463.965],[140.628,466.292],[133.25,468.62],[125.868,470.947],[118.405,472.958],[110.836,474.569],[103.269,476.18],[95.7,477.791],[88.131,479.402],[80.562,481.013],[72.957,482.405],[65.284,483.405],[57.609,484.402],[49.937,485.401],[42.25,486.246],[34.519,486.622],[26.791,486.995],[19.063,487.371],[11.333,487.744],[3.605,488.12],[-4.249,488.5],[-11.977,488.127],[-19.707,487.752],[-27.435,487.376],[-35.166,487.003],[-42.894,486.627],[-50.624,486.254],[-58.299,485.326],[-65.955,484.204],[-73.611,483.084],[-81.269,481.962],[-88.925,480.84],[-96.581,479.72],[-104.152,478.164],[-111.666,476.312],[-119.179,474.461],[-126.691,472.609],[-134.204,470.757],[-141.718,468.905],[-149.119,466.675],[-156.42,464.115],[-163.725,461.557],[-171.026,458.997],[-178.331,456.437],[-185.632,453.88],[-192.787,450.951],[-199.814,447.715],[-206.844,444.48],[-213.874,441.246],[-220.903,438.01],[-227.933,434.775],[-234.76,431.151],[-241.458,427.274],[-248.155,423.399],[-254.852,419.521],[-261.55,415.647],[-268.247,411.769],[-274.672,407.471],[-280.984,402.991],[-287.294,398.514],[-293.606,394.035],[-299.915,389.558],[-306.225,385.079],[-312.178,380.142],[-318.049,375.101],[-323.923,370.064],[-329.797,365.025],[-335.67,359.987],[-341.542,354.95],[-346.953,349.418],[-352.34,343.864],[-357.727,338.308],[-363.115,332.755],[-368.502,327.199],[-373.843,321.605],[-378.701,315.58],[-383.556,309.557],[-388.413,303.531],[-393.268,297.506],[-398.125,291.483],[-402.858,285.366],[-407.14,278.921],[-411.421,272.477],[-415.703,266.03],[-419.985,259.586],[-424.267,253.139],[-428.346,246.574],[-432.014,239.759],[-435.68,232.943],[-439.347,226.13],[-443.015,219.315],[-446.68,212.502],[-450.076,205.557],[-453.091,198.431],[-456.104,191.303],[-459.116,184.177],[-462.132,177.048],[-465.144,169.922],[-467.841,162.678],[-470.168,155.297],[-472.494,147.918],[-474.821,140.537],[-477.147,133.158],[-479.473,125.777],[-481.477,118.311],[-483.088,110.744],[-484.699,103.176],[-486.31,95.606],[-487.921,88.037],[-489.532,80.468],[-490.917,72.863],[-491.917,65.188],[-492.914,57.515],[-493.913,49.843],[-494.751,42.153],[-495.127,34.425],[-495.5,26.697],[-495.876,18.967],[-496.249,11.239],[-496.625,3.508],[-496.998,-4.22],[-496.627,-11.95],[-496.254,-19.678],[-495.878,-27.406],[-495.502,-35.137],[-495.129,-42.865],[-494.754,-50.595],[-493.831,-58.27],[-492.709,-65.926],[-491.589,-73.584],[-490.467,-81.24],[-489.345,-88.896],[-488.225,-96.552],[-486.674,-104.126],[-484.82,-111.637],[-482.968,-119.151],[-481.116,-126.664],[-479.264,-134.178],[-477.412,-141.692],[-475.184,-149.092],[-472.624,-156.394],[-470.067,-163.698],[-467.507,-171],[-464.949,-178.304],[-462.389,-185.606],[-459.463,-192.761],[-456.229,-199.79],[-452.992,-206.82],[-449.758,-213.847],[-446.524,-220.877],[-443.287,-227.906],[-439.665,-234.736],[-435.79,-241.434],[-431.913,-248.131],[-428.038,-254.828],[-424.161,-261.526],[-420.284,-268.223],[-415.987,-274.65],[-411.51,-280.96],[-407.031,-287.272],[-402.554,-293.582],[-398.075,-299.894],[-393.598,-306.203],[-388.661,-312.156],[-383.623,-318.03],[-378.585,-323.901],[-373.547,-329.775],[-368.507,-335.649],[-363.469,-341.522],[-357.942,-346.934],[-352.386,-352.321],[-346.832,-357.708],[-341.277,-363.095],[-335.723,-368.485],[-330.129,-373.826],[-324.103,-378.684],[-318.08,-383.539],[-312.055,-388.396],[-306.03,-393.251],[-300.007,-398.109],[-293.892,-402.843],[-287.448,-407.125],[-281.001,-411.407],[-274.556,-415.689],[-268.11,-419.971],[-261.665,-424.252],[-255.1,-428.334],[-248.285,-432.002],[-241.472,-435.667],[-234.657,-439.335],[-227.844,-443.003],[-221.029,-446.668],[-214.086,-450.066],[-206.96,-453.081],[-199.831,-456.094],[-192.705,-459.107],[-185.577,-462.122],[-178.451,-465.135],[-171.207,-467.834],[-163.828,-470.161],[-156.447,-472.487],[-149.068,-474.813],[-141.687,-477.14],[-134.308,-479.466],[-126.842,-481.472],[-119.273,-483.083],[-111.704,-484.694],[-104.138,-486.306],[-96.569,-487.917],[-88.999,-489.528],[-81.392,-490.917],[-73.719,-491.914],[-66.046,-492.914],[-58.371,-493.911],[-50.684,-494.751],[-42.956,-495.127],[-35.226,-495.5],[-27.498,-495.876],[-19.77,-496.251],[-12.039,-496.625],[-4.311,-497]],"c":true}]},{"t":198,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[1.906,-488.758],[9.421,-487.243],[16.936,-485.728],[24.451,-484.213],[31.966,-482.698],[39.333,-480.59],[46.677,-478.385],[54.02,-476.18],[61.363,-473.975],[68.706,-471.77],[75.88,-469.081],[82.983,-466.201],[90.087,-463.319],[97.193,-460.436],[104.297,-457.556],[111.241,-454.323],[118.039,-450.782],[124.84,-447.241],[131.641,-443.702],[138.442,-440.161],[145.129,-436.429],[151.56,-432.254],[157.991,-428.079],[164.422,-423.907],[170.853,-419.732],[177.281,-415.554],[183.356,-410.878],[189.431,-406.2],[195.508,-401.524],[201.409,-396.642],[207.087,-391.489],[212.765,-386.336],[218.443,-381.184],[224.118,-376.031],[229.796,-370.878],[235.22,-365.461],[240.642,-360.04],[246.063,-354.618],[251.485,-349.197],[256.906,-343.775],[262.328,-338.354],[267.749,-332.932],[273.171,-327.513],[278.592,-322.092],[284.011,-316.671],[289.433,-311.249],[294.854,-305.828],[300.276,-300.406],[305.697,-294.985],[311.118,-289.563],[316.54,-284.142],[321.961,-278.72],[327.383,-273.299],[332.804,-267.88],[338.226,-262.458],[343.645,-257.037],[349.066,-251.615],[354.488,-246.194],[359.909,-240.772],[365.331,-235.351],[370.752,-229.929],[375.907,-224.256],[381.06,-218.578],[386.213,-212.9],[391.366,-207.222],[396.516,-201.547],[401.359,-195.612],[405.938,-189.462],[410.515,-183.315],[415.094,-177.165],[419.674,-171.015],[424.132,-164.785],[428.099,-158.223],[432.066,-151.662],[436.03,-145.1],[439.997,-138.539],[443.964,-131.978],[447.335,-125.097],[450.658,-118.187],[453.981,-111.277],[457.304,-104.369],[460.628,-97.459],[463.476,-90.348],[466.136,-83.158],[468.794,-75.967],[471.451,-68.776],[474.109,-61.583],[476.396,-54.274],[478.371,-46.868],[480.348,-39.459],[482.323,-32.051],[484.301,-24.645],[485.992,-17.176],[487.277,-9.617],[488.56,-2.058],[489.845,5.5],[491.128,13.059],[492.207,20.644],[492.793,28.287],[493.377,35.933],[493.962,43.576],[494.546,51.222],[495.001,58.87],[494.882,66.535],[494.766,74.203],[494.65,81.868],[494.531,89.533],[494.354,97.196],[493.536,104.819],[492.718,112.441],[491.9,120.065],[491.082,127.689],[490.264,135.31],[488.766,142.828],[487.248,150.345],[485.733,157.86],[484.218,165.375],[482.703,172.89],[480.597,180.258],[478.392,187.601],[476.188,194.944],[473.983,202.287],[471.778,209.63],[469.094,216.804],[466.211,223.908],[463.331,231.014],[460.448,238.117],[457.566,245.223],[454.337,252.167],[450.796,258.966],[447.255,265.767],[443.714,272.568],[440.173,279.369],[436.444,286.059],[432.269,292.489],[428.096,298.92],[423.921,305.351],[419.749,311.781],[415.571,318.21],[410.895,324.285],[406.219,330.362],[401.541,336.437],[396.661,342.34],[391.509,348.018],[386.356,353.696],[381.203,359.372],[376.05,365.05],[370.815,370.817],[365.139,375.97],[359.461,381.123],[353.783,386.276],[348.105,391.429],[342.43,396.579],[336.49,401.415],[330.34,405.994],[324.19,410.573],[318.04,415.15],[311.893,419.729],[305.658,424.182],[299.097,428.147],[292.535,432.114],[285.974,436.078],[279.412,440.045],[272.851,444.012],[265.965,447.376],[259.055,450.699],[252.145,454.022],[245.238,457.345],[238.328,460.668],[231.215,463.51],[224.024,466.167],[216.831,468.827],[209.64,471.485],[202.449,474.142],[195.138,476.42],[187.729,478.397],[180.323,480.372],[172.915,482.349],[165.506,484.324],[158.035,486.011],[150.476,487.294],[142.917,488.577],[135.359,489.862],[127.8,491.145],[120.217,492.217],[112.572,492.8],[104.928,493.386],[97.283,493.972],[89.639,494.555],[81.989,495],[74.324,494.884],[66.659,494.766],[58.991,494.649],[51.326,494.533],[43.663,494.347],[36.042,493.529],[28.418,492.711],[20.796,491.893],[13.173,491.075],[5.549,490.257],[-1.966,488.749],[-9.484,487.234],[-16.999,485.718],[-24.514,484.203],[-32.029,482.686],[-39.396,480.575],[-46.737,478.371],[-54.08,476.166],[-61.423,473.961],[-68.767,471.754],[-75.938,469.062],[-83.042,466.18],[-90.148,463.299],[-97.251,460.417],[-104.357,457.534],[-111.296,454.296],[-118.097,450.757],[-124.898,447.216],[-131.697,443.676],[-138.498,440.135],[-145.183,436.398],[-151.613,432.223],[-158.044,428.05],[-164.477,423.875],[-170.908,419.702],[-177.332,415.518],[-183.406,410.842],[-189.484,406.166],[-195.559,401.49],[-201.457,396.601],[-207.135,391.45],[-212.813,386.298],[-218.489,381.145],[-224.167,375.992],[-229.845,370.839],[-235.266,365.42],[-240.688,359.999],[-246.109,354.577],[-251.531,349.156],[-256.952,343.734],[-262.374,338.313],[-267.795,332.894],[-273.216,327.472],[-278.638,322.051],[-284.057,316.629],[-289.478,311.208],[-294.9,305.786],[-300.321,300.365],[-305.743,294.943],[-311.164,289.522],[-316.586,284.101],[-322.007,278.679],[-327.429,273.26],[-332.85,267.839],[-338.272,262.417],[-343.691,256.996],[-349.112,251.574],[-354.534,246.153],[-359.955,240.731],[-365.377,235.31],[-370.798,229.888],[-375.951,224.213],[-381.104,218.535],[-386.257,212.857],[-391.409,207.181],[-396.56,201.503],[-401.398,195.566],[-405.977,189.416],[-410.554,183.266],[-415.133,177.116],[-419.712,170.969],[-424.166,164.734],[-428.132,158.175],[-432.099,151.613],[-436.064,145.052],[-440.031,138.49],[-443.998,131.929],[-447.364,125.043],[-450.687,118.134],[-454.01,111.226],[-457.333,104.316],[-460.656,97.406],[-463.5,90.295],[-466.158,83.102],[-468.818,75.911],[-471.475,68.721],[-474.133,61.53],[-476.413,54.218],[-478.39,46.81],[-480.365,39.404],[-482.342,31.995],[-484.317,24.587],[-486.007,17.118],[-487.289,9.559],[-488.572,2],[-489.857,-5.558],[-491.14,-13.117],[-492.215,-20.702],[-492.798,-28.348],[-493.384,-35.991],[-493.969,-43.637],[-494.553,-51.28],[-495,-58.928],[-494.884,-66.596],[-494.768,-74.261],[-494.65,-81.926],[-494.533,-89.593],[-494.352,-97.254],[-493.534,-104.877],[-492.716,-112.499],[-491.895,-120.123],[-491.077,-127.747],[-490.259,-135.368],[-488.756,-142.886],[-487.239,-150.401],[-485.723,-157.918],[-484.208,-165.433],[-482.693,-172.948],[-480.583,-180.316],[-478.378,-187.659],[-476.173,-195],[-473.968,-202.343],[-471.763,-209.686],[-469.072,-216.86],[-466.192,-223.963],[-463.309,-231.067],[-460.426,-238.173],[-457.546,-245.277],[-454.31,-252.218],[-450.77,-259.019],[-447.229,-265.82],[-443.688,-272.619],[-440.149,-279.42],[-436.412,-286.107],[-432.24,-292.538],[-428.065,-298.968],[-423.892,-305.399],[-419.717,-311.83],[-415.537,-318.256],[-410.859,-324.331],[-406.183,-330.408],[-401.507,-336.483],[-396.62,-342.384],[-391.47,-348.062],[-386.317,-353.737],[-381.164,-359.415],[-376.011,-365.093],[-370.859,-370.771],[-365.185,-375.927],[-359.51,-381.079],[-353.832,-386.232],[-348.154,-391.385],[-342.476,-396.535],[-336.541,-401.376],[-330.394,-405.955],[-324.244,-410.532],[-318.094,-415.111],[-311.944,-419.69],[-305.714,-424.146],[-299.152,-428.113],[-292.591,-432.08],[-286.03,-436.044],[-279.468,-440.011],[-272.907,-443.978],[-266.023,-447.347],[-259.113,-450.67],[-252.203,-453.993],[-245.296,-457.316],[-238.386,-460.639],[-231.275,-463.486],[-224.084,-466.146],[-216.891,-468.803],[-209.701,-471.461],[-202.51,-474.118],[-195.198,-476.403],[-187.792,-478.378],[-180.384,-480.355],[-172.975,-482.33],[-165.569,-484.308],[-158.097,-485.997],[-150.539,-487.282],[-142.98,-488.565],[-135.422,-489.85],[-127.863,-491.133],[-120.28,-492.21],[-112.635,-492.793],[-104.991,-493.379],[-97.346,-493.965],[-89.702,-494.548],[-82.054,-495.001],[-74.387,-494.882],[-66.721,-494.766],[-59.056,-494.647],[-51.389,-494.531],[-43.729,-494.352],[-36.105,-493.534],[-28.481,-492.716],[-20.859,-491.898],[-13.235,-491.079],[-5.614,-490.262]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":168,"op":372,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":".cream","cl":"cream","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[375]},{"t":300,"s":[396.531]}],"ix":3},"y":{"a":0,"k":56,"ix":4}},"a":{"a":0,"k":[196.283,-128.858,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.113,0.113,0.667],"y":[1,1,1]},"o":{"x":[0.353,0.353,0.333],"y":[0,0,0]},"t":174,"s":[40,40,100]},{"i":{"x":[0.311,0.311,0.667],"y":[1,1,1]},"o":{"x":[0.813,0.813,0.333],"y":[0,0,0]},"t":189,"s":[105,105,100]},{"t":204,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[196.283,-128.858],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":174,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":".blue400","cl":"blue400","parent":20,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[352,240,0],"ix":2,"l":2},"a":{"a":0,"k":[352,240,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-1.317],[0.602,-1.186],[0.979,-0.753],[0.338,0.151],[0,0.376],[0,0],[-0.32,0.151],[-0.301,-0.188],[-0.603,-1.185]],"o":[[0,1.317],[-0.603,1.166],[-0.32,0.188],[-0.32,-0.188],[0,0],[0,-0.376],[0.338,-0.188],[0.979,0.79],[0.602,1.186]],"v":[[2.353,0.038],[1.449,3.801],[-0.904,6.661],[-1.882,6.717],[-2.352,5.871],[-2.352,-5.891],[-1.882,-6.681],[-0.904,-6.681],[1.449,-3.727]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.400000029919,0.61568627451,0.964705942191,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[353.047,240.118],"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"}],"nm":"1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":285,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":".blue400","cl":"blue400","parent":20,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":548,"s":[100]},{"t":578,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[352,240,0],"ix":2,"l":2},"a":{"a":0,"k":[352,240,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.374,2.145],[2.315,1.054],[0.226,0.452],[-0.15,0.47],[-0.471,0.226],[-0.508,-0.226],[-1.807,-2.785],[0,-3.387],[1.825,-2.785],[3.03,-1.336],[0.508,0.226],[0.169,0.489],[-0.226,0.452],[-0.47,0.226],[-1.373,2.126],[0,2.597]],"o":[[0,-2.597],[-1.373,-2.165],[-0.47,-0.226],[-0.226,-0.47],[0.188,-0.508],[0.508,-0.226],[3.049,1.355],[1.825,2.766],[0,3.387],[-1.826,2.767],[-0.508,0.226],[-0.471,-0.226],[-0.15,-0.47],[0.226,-0.47],[2.315,-1.072],[1.374,-2.164],[0,0]],"v":[[2.577,0.029],[0.507,-7.084],[-5.044,-11.921],[-6.079,-12.919],[-6.173,-14.329],[-5.194,-15.421],[-3.689,-15.421],[3.594,-9.212],[6.322,0.01],[3.594,9.268],[-3.689,15.421],[-5.194,15.421],[-6.173,14.348],[-6.079,12.975],[-5.044,11.939],[0.507,7.141],[2.577,-0.009]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.400000029919,0.61568627451,0.964705942191,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[357.528,240.098],"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"}],"nm":"2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":285,"op":578,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":".blue400","cl":"blue400","parent":20,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":368,"s":[100]},{"t":398,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[352,240,0],"ix":2,"l":2},"a":{"a":0,"k":[352,240,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,5.231],[2.804,4.253],[4.685,2.088],[0.282,0],[0.282,-0.132],[0.226,-0.583],[-0.263,-0.546],[-0.564,-0.263],[-2.314,-3.613],[0,-4.347],[2.315,-3.613],[3.877,-1.769],[0.264,-0.546],[-0.169,-0.527],[-0.527,-0.244],[-0.264,0],[-0.282,0.131],[-2.804,4.253]],"o":[[2.804,-4.309],[0,-5.231],[-2.804,-4.309],[-0.282,-0.132],[-0.282,0],[-0.508,0.244],[-0.169,0.489],[0.245,0.489],[3.877,1.788],[2.296,3.557],[0,4.347],[-2.314,3.576],[-0.545,0.264],[-0.245,0.508],[0.207,0.546],[0.263,0.113],[0.263,0],[4.685,-2.089],[0,0]],"v":[[5.005,14.388],[9.239,0.011],[5.005,-14.291],[-6.304,-23.925],[-7.132,-24.114],[-7.96,-23.925],[-9.052,-22.721],[-8.92,-21.178],[-7.716,-20.049],[1.599,-11.92],[5.081,-0.008],[1.599,11.979],[-7.716,20.033],[-8.92,21.238],[-9.033,22.743],[-7.941,23.928],[-7.132,24.098],[-6.304,23.91],[5.005,14.35]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.400000029919,0.61568627451,0.964705942191,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[363.834,240.098],"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"}],"nm":"3","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":285,"op":398,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":".blue400","cl":"blue400","parent":21,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":368,"s":[352]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":398,"s":[357]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":548,"s":[357]},{"t":578,"s":[360.25]}],"ix":3},"y":{"a":0,"k":240,"ix":4}},"a":{"a":0,"k":[352,240,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.357,0.338],[0,0.546],[0,0],[-0.358,0.338],[-0.527,0],[0,0],[0,0],[-0.753,-0.339],[0,-0.847],[0,0],[0.771,-0.339],[0.583,0.583]],"o":[[0,0],[-0.527,0],[-0.339,-0.377],[0,0],[0,-0.527],[0.376,-0.377],[0,0],[0,0],[0.602,-0.602],[0.79,0.32],[0,0],[0,0.847],[-0.753,0.32],[0,0]],"v":[[-0.931,5.636],[-6.576,5.636],[-7.931,5.128],[-8.458,3.754],[-8.458,-3.773],[-7.931,-5.09],[-6.576,-5.655],[-0.931,-5.655],[5.279,-11.865],[7.293,-12.241],[8.459,-10.51],[8.459,10.472],[7.293,12.26],[5.279,11.846]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.400000029919,0.61568627451,0.964705942191,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[338.458,240.172],"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"}],"nm":"main","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":285,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":21,"ty":4,"nm":".blue100","cl":"blue100","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-88.83,14.117,0],"ix":2,"l":2},"a":{"a":0,"k":[352,240,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0,0,0],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0,0,0]},"t":285,"s":[40,40,100]},{"t":315,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-10.693],[1.577,-4.275],[7.003,-2.584],[10.693,0],[4.275,1.577],[2.584,7.003],[0,10.693],[-1.577,4.275],[-7.003,2.584],[-10.693,0],[-4.275,-1.577],[-2.584,-7.003]],"o":[[0,10.693],[-2.584,7.003],[-4.275,1.577],[-10.693,0],[-7.003,-2.584],[-1.577,-4.275],[0,-10.693],[2.584,-7.003],[4.275,-1.577],[10.693,0],[7.003,2.584],[1.577,4.275]],"v":[[37,0],[35.423,20.315],[20.315,35.423],[0,37],[-20.315,35.423],[-35.423,20.315],[-37,0],[-35.423,-20.315],[-20.315,-35.423],[0,-37],[20.315,-35.423],[35.423,-20.315]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.823529471603,0.89019613827,0.988235353956,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[352,240],"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"}],"nm":"matte","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":285,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":".grey700","cl":"grey700","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-288.83,-95.383,0],"ix":2,"l":2},"a":{"a":0,"k":[2.19,-41.445,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[223,29],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.372549019608,0.388235294118,0.407843137255,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[113.69,-41.445],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":".grey700","cl":"grey700","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-288.83,-65.383,0],"ix":2,"l":2},"a":{"a":0,"k":[2.19,-41.445,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[290,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.372549019608,0.388235294118,0.407843137255,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[147.219,-37.89],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":".grey700","cl":"grey700","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-384.858,-4.438,0],"ix":2,"l":2},"a":{"a":0,"k":[2.19,-41.445,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[98,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.372549019608,0.388235294118,0.407843137255,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[147.219,-37.89],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":25,"ty":4,"nm":".grey800","cl":"grey800","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":368,"s":[0]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":398,"s":[90]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":456,"s":[90]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":486,"s":[180]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":548,"s":[180]},{"t":578,"s":[270]}],"ix":10},"p":{"s":true,"x":{"a":0,"k":-349.354,"ix":3},"y":{"a":0,"k":-81.358,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[50.682,50.682,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":368,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.652,-437.366],[8.33,-437.659],[17.312,-437.953],[26.249,-438.778],[35.158,-439.948],[44.07,-441.114],[52.848,-442.998],[61.602,-445.033],[70.348,-447.09],[78.906,-449.835],[87.432,-452.668],[95.787,-455.975],[104.114,-459.352],[112.356,-462.932],[120.6,-466.51],[128.842,-470.088],[137.086,-473.668],[145.494,-476.842],[153.901,-480.013],[162.309,-483.184],[170.98,-485.538],[179.663,-487.853],[188.349,-490.149],[197.221,-491.579],[206.092,-493.009],[214.984,-494.276],[223.954,-494.806],[232.926,-495.333],[241.897,-495.501],[250.877,-495.127],[259.857,-494.753],[268.778,-493.782],[277.678,-492.525],[286.574,-491.265],[295.31,-489.158],[304.044,-487.043],[312.697,-484.654],[321.19,-481.719],[329.683,-478.781],[337.963,-475.306],[346.144,-471.59],[354.301,-467.824],[362.109,-463.379],[369.919,-458.93],[377.531,-454.173],[384.91,-449.042],[392.286,-443.909],[399.256,-438.244],[406.146,-432.478],[412.915,-426.575],[419.27,-420.22],[425.623,-413.867],[431.614,-407.178],[437.38,-400.286],[443.14,-393.391],[448.274,-386.013],[453.404,-378.636],[458.262,-371.087],[462.71,-363.279],[467.158,-355.469],[471.032,-347.367],[474.745,-339.186],[478.338,-330.954],[481.276,-322.461],[484.212,-313.968],[486.723,-305.35],[488.838,-296.616],[490.956,-287.883],[492.333,-279.009],[493.59,-270.109],[494.694,-261.198],[495.065,-252.221],[495.439,-243.241],[495.406,-234.267],[494.88,-225.295],[494.35,-216.325],[493.216,-207.421],[491.786,-198.549],[490.356,-189.678],[488.193,-180.962],[485.878,-172.278],[483.559,-163.597],[480.481,-155.159],[477.307,-146.752],[474.136,-138.342],[470.618,-130.075],[467.038,-121.833],[463.46,-113.589],[459.882,-105.347],[456.543,-97.007],[453.374,-88.597],[450.208,-80.187],[447.684,-71.571],[445.361,-62.891],[443.04,-54.21],[441.544,-45.348],[440.087,-36.481],[438.775,-27.597],[438.19,-18.63],[437.605,-9.663],[437.362,-0.691],[437.653,8.291],[437.947,17.273],[438.77,26.21],[439.939,35.121],[441.105,44.031],[442.987,52.812],[445.022,61.566],[447.074,70.312],[449.819,78.87],[452.649,87.395],[455.956,95.753],[459.333,104.08],[462.911,112.322],[466.488,120.566],[470.069,128.808],[473.646,137.052],[476.823,145.458],[479.994,153.865],[483.165,162.275],[485.521,170.943],[487.84,179.627],[490.138,188.313],[491.568,197.184],[492.998,206.056],[494.27,214.945],[494.799,223.917],[495.326,232.887],[495.497,241.861],[495.123,250.838],[494.752,259.818],[493.783,268.742],[492.524,277.641],[491.267,286.538],[489.162,295.274],[487.047,304.008],[484.661,312.664],[481.725,321.156],[478.787,329.649],[475.315,337.926],[471.599,346.11],[467.838,354.267],[463.39,362.077],[458.944,369.885],[454.19,377.502],[449.059,384.879],[443.925,392.255],[438.263,399.227],[432.497,406.117],[426.596,412.888],[420.241,419.241],[413.888,425.596],[407.202,431.588],[400.31,437.356],[393.415,443.119],[386.039,448.252],[378.663,453.383],[371.113,458.243],[363.305,462.691],[355.498,467.14],[347.396,471.016],[339.215,474.732],[330.985,478.327],[322.492,481.265],[314,484.2],[305.381,486.714],[296.648,488.832],[287.914,490.947],[279.04,492.327],[270.143,493.586],[261.231,494.693],[252.252,495.067],[243.275,495.44],[234.298,495.41],[225.328,494.883],[216.356,494.354],[207.452,493.225],[198.581,491.795],[189.709,490.365],[180.993,488.207],[172.309,485.889],[163.628,483.573],[155.188,480.495],[146.781,477.323],[138.373,474.152],[130.106,470.634],[121.862,467.057],[113.62,463.476],[105.376,459.899],[97.036,456.559],[88.626,453.39],[80.216,450.224],[71.603,447.695],[62.922,445.374],[54.241,443.054],[45.382,441.553],[36.515,440.095],[27.631,438.781],[18.664,438.196],[9.697,437.612],[0.723,437.363],[-8.259,437.654],[-17.239,437.948],[-26.178,438.768],[-35.088,439.935],[-43.999,441.104],[-52.781,442.981],[-61.534,445.016],[-70.283,447.065],[-78.839,449.81],[-87.367,452.638],[-95.721,455.945],[-104.048,459.319],[-112.293,462.897],[-120.535,466.477],[-128.779,470.055],[-137.021,473.633],[-145.429,476.811],[-153.836,479.983],[-162.243,483.154],[-170.912,485.515],[-179.595,487.831],[-188.281,490.134],[-197.153,491.564],[-206.025,492.994],[-214.914,494.269],[-223.883,494.798],[-232.855,495.325],[-241.827,495.501],[-250.807,495.127],[-259.786,494.753],[-268.711,493.789],[-277.607,492.53],[-286.507,491.273],[-295.243,489.173],[-303.976,487.056],[-312.632,484.674],[-321.125,481.737],[-329.618,478.801],[-337.897,475.331],[-346.079,471.615],[-354.241,467.854],[-362.048,463.409],[-369.856,458.96],[-377.473,454.211],[-384.85,449.078],[-392.229,443.947],[-399.201,438.287],[-406.093,432.518],[-412.865,426.62],[-419.22,420.265],[-425.572,413.912],[-431.566,407.228],[-437.334,400.336],[-443.1,393.444],[-448.231,386.068],[-453.364,378.689],[-458.226,371.145],[-462.675,363.334],[-467.123,355.526],[-471.002,347.428],[-474.718,339.246],[-478.316,331.017],[-481.254,322.524],[-484.192,314.031],[-486.708,305.415],[-488.823,296.682],[-490.941,287.948],[-492.323,279.074],[-493.582,270.177],[-494.694,261.265],[-495.068,252.286],[-495.439,243.309],[-495.417,234.332],[-494.887,225.362],[-494.36,216.39],[-493.234,207.486],[-491.804,198.614],[-490.374,189.743],[-488.218,181.024],[-485.9,172.343],[-483.584,163.66],[-480.511,155.22],[-477.34,146.812],[-474.168,138.405],[-470.651,130.138],[-467.07,121.896],[-463.49,113.652],[-459.91,105.41],[-456.568,97.072],[-453.402,88.66],[-450.235,80.25],[-447.704,71.637],[-445.383,62.956],[-443.062,54.275],[-441.562,45.416],[-440.104,36.549],[-438.785,27.665],[-438.2,18.698],[-437.618,9.731],[-437.365,0.759],[-437.658,-8.223],[-437.949,-17.205],[-438.767,-26.145],[-439.934,-35.054],[-441.103,-43.963],[-442.977,-52.747],[-445.012,-61.498],[-447.059,-70.249],[-449.804,-78.805],[-452.631,-87.333],[-455.936,-95.69],[-459.31,-104.017],[-462.891,-112.259],[-466.468,-120.503],[-470.046,-128.745],[-473.684,-137.12],[-476.855,-145.53],[-480.027,-153.938],[-483.198,-162.345],[-485.546,-171.019],[-487.865,-179.699],[-490.153,-188.388],[-491.583,-197.26],[-493.013,-206.131],[-494.277,-215.023],[-494.807,-223.993],[-495.334,-232.965],[-495.497,-241.936],[-495.123,-250.916],[-494.752,-259.896],[-493.776,-268.817],[-492.516,-277.717],[-491.259,-286.613],[-489.149,-295.349],[-487.032,-304.083],[-484.641,-312.734],[-481.703,-321.227],[-478.767,-329.722],[-475.287,-337.996],[-471.572,-346.181],[-467.803,-354.335],[-463.357,-362.143],[-458.909,-369.953],[-454.149,-377.565],[-449.019,-384.941],[-443.885,-392.318],[-438.218,-399.285],[-432.452,-406.177],[-426.546,-412.944],[-420.193,-419.296],[-413.838,-425.652],[-407.147,-431.638],[-400.257,-437.406],[-393.358,-443.164],[-385.981,-448.295],[-378.605,-453.428],[-371.053,-458.283],[-363.245,-462.731],[-355.435,-467.177],[-347.334,-471.048],[-339.149,-474.764],[-330.917,-478.354],[-322.425,-481.29],[-313.932,-484.228],[-305.314,-486.734],[-296.58,-488.852],[-287.846,-490.967],[-278.97,-492.342],[-270.073,-493.599],[-261.161,-494.7],[-252.182,-495.072],[-243.202,-495.445],[-234.228,-495.41],[-225.258,-494.883],[-216.286,-494.354],[-207.382,-493.217],[-198.51,-491.787],[-189.639,-490.357],[-180.925,-488.192],[-172.242,-485.874],[-163.558,-483.558],[-155.123,-480.475],[-146.716,-477.301],[-138.306,-474.129],[-130.041,-470.609],[-121.797,-467.029],[-113.555,-463.449],[-105.313,-459.871],[-96.971,-456.534],[-88.561,-453.368],[-80.151,-450.199],[-71.535,-447.678],[-62.854,-445.357],[-54.171,-443.036],[-45.312,-441.543],[-36.445,-440.086],[-27.561,-438.778],[-18.594,-438.194],[-9.624,-437.609]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":398,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.166,-494.001],[7.12,-493.774],[14.408,-493.545],[21.649,-492.74],[28.884,-491.832],[36.083,-490.728],[43.201,-489.145],[50.316,-487.56],[57.326,-485.578],[64.297,-483.437],[71.118,-480.865],[77.874,-478.138],[84.452,-474.996],[90.937,-471.679],[97.177,-467.909],[103.351,-464.041],[109.218,-459.713],[115.084,-455.382],[120.918,-451.015],[126.346,-446.147],[131.773,-441.278],[137.2,-436.408],[142.626,-431.541],[148.053,-426.671],[153.481,-421.804],[158.906,-416.935],[164.135,-411.855],[169.32,-406.728],[174.504,-401.604],[179.687,-396.478],[184.872,-391.352],[190.056,-386.225],[195.241,-381.101],[200.426,-375.975],[205.61,-370.849],[210.795,-365.722],[215.952,-360.568],[221.106,-355.413],[226.261,-350.259],[231.417,-345.102],[236.572,-339.948],[241.726,-334.793],[246.883,-329.637],[252.037,-324.482],[257.192,-319.328],[262.348,-314.171],[267.503,-309.017],[272.66,-303.86],[277.814,-298.706],[282.968,-293.551],[288.125,-288.395],[293.279,-283.24],[298.434,-278.086],[303.591,-272.929],[308.745,-267.775],[313.899,-262.62],[319.056,-257.464],[324.21,-252.309],[329.367,-247.155],[334.522,-241.998],[339.676,-236.844],[344.833,-231.687],[349.987,-226.533],[355.141,-221.378],[360.298,-216.222],[365.453,-211.067],[370.493,-205.798],[375.53,-200.53],[380.57,-195.261],[385.608,-189.99],[390.646,-184.721],[395.683,-179.452],[400.723,-174.181],[405.761,-168.912],[410.798,-163.644],[415.836,-158.372],[420.876,-153.104],[425.914,-147.835],[430.952,-142.564],[435.991,-137.295],[441.029,-132.026],[446.067,-126.755],[450.661,-121.106],[455.085,-115.312],[459.508,-109.516],[463.855,-103.668],[467.716,-97.482],[471.57,-91.295],[474.768,-84.743],[477.969,-78.192],[480.665,-71.43],[483.133,-64.569],[485.537,-57.689],[487.344,-50.625],[489.151,-43.564],[490.61,-36.427],[491.744,-29.226],[492.879,-22.024],[493.364,-14.752],[493.82,-7.476],[494.002,-0.195],[493.775,7.093],[493.546,14.379],[492.743,21.622],[491.835,28.854],[490.734,36.056],[489.151,43.171],[487.566,50.289],[485.586,57.299],[483.445,64.27],[480.873,71.091],[478.151,77.849],[475.007,84.427],[471.692,90.913],[467.924,97.152],[464.056,103.329],[459.728,109.196],[455.4,115.062],[451.034,120.898],[446.165,126.326],[441.295,131.751],[436.428,137.178],[431.558,142.606],[426.691,148.031],[421.822,153.458],[416.954,158.886],[411.875,164.115],[406.748,169.3],[401.624,174.482],[396.498,179.667],[391.371,184.852],[386.245,190.036],[381.119,195.221],[375.995,200.406],[370.868,205.591],[365.742,210.775],[360.587,215.932],[355.433,221.086],[350.279,226.241],[345.122,231.398],[339.968,236.552],[334.813,241.706],[329.657,246.863],[324.502,252.017],[319.348,257.172],[314.191,262.328],[309.037,267.483],[303.88,272.637],[298.726,277.794],[293.571,282.948],[288.414,288.105],[283.26,293.259],[278.106,298.414],[272.949,303.571],[267.795,308.725],[262.64,313.879],[257.483,319.036],[252.329,324.19],[247.172,329.345],[242.018,334.502],[236.864,339.656],[231.707,344.813],[226.553,349.967],[221.398,355.121],[216.241,360.278],[211.005,365.514],[205.734,370.554],[200.465,375.592],[195.197,380.63],[189.926,385.667],[184.657,390.707],[179.388,395.745],[174.117,400.783],[168.848,405.82],[163.577,410.86],[158.308,415.898],[153.04,420.936],[147.768,425.973],[142.5,431.013],[137.231,436.051],[131.96,441.089],[126.691,446.129],[121.035,450.713],[115.238,455.137],[109.444,459.561],[103.59,463.901],[97.406,467.759],[91.212,471.606],[84.662,474.805],[78.112,478.005],[71.344,480.692],[64.484,483.159],[57.602,485.559],[50.538,487.366],[43.476,489.173],[36.34,490.623],[29.138,491.759],[21.936,492.894],[14.662,493.37],[7.386,493.825],[0.105,494.001],[-7.183,493.772],[-14.469,493.545],[-21.71,492.733],[-28.944,491.825],[-36.144,490.716],[-43.259,489.133],[-50.377,487.548],[-57.387,485.562],[-64.355,483.421],[-71.176,480.846],[-77.93,478.115],[-84.508,474.973],[-90.991,471.648],[-97.231,467.881],[-103.403,464.006],[-109.269,459.678],[-115.136,455.35],[-120.967,450.977],[-126.392,446.108],[-131.82,441.24],[-137.247,436.373],[-142.675,431.504],[-148.1,426.636],[-153.527,421.767],[-158.955,416.899],[-164.179,411.817],[-169.364,406.691],[-174.549,401.565],[-179.733,396.441],[-184.918,391.314],[-190.103,386.188],[-195.288,381.062],[-200.472,375.937],[-205.657,370.811],[-210.842,365.685],[-215.996,360.53],[-221.153,355.376],[-226.307,350.219],[-231.462,345.065],[-236.619,339.908],[-241.773,334.754],[-246.927,329.599],[-252.084,324.443],[-257.238,319.288],[-262.393,314.132],[-267.547,308.977],[-272.704,303.823],[-277.858,298.666],[-283.013,293.512],[-288.169,288.355],[-293.324,283.201],[-298.478,278.044],[-303.635,272.889],[-308.789,267.735],[-313.944,262.578],[-319.098,257.424],[-324.255,252.267],[-329.409,247.113],[-334.564,241.956],[-339.72,236.802],[-344.875,231.647],[-350.029,226.491],[-355.186,221.336],[-360.34,216.18],[-365.495,211.025],[-370.535,205.756],[-375.572,200.488],[-380.61,195.216],[-385.65,189.948],[-390.688,184.679],[-395.725,179.408],[-400.765,174.139],[-405.803,168.87],[-410.84,163.599],[-415.88,158.331],[-420.918,153.062],[-425.956,147.793],[-430.993,142.522],[-436.033,137.253],[-441.071,131.984],[-446.109,126.713],[-450.698,121.059],[-455.122,115.265],[-459.546,109.469],[-463.888,103.616],[-467.747,97.433],[-471.596,91.242],[-474.794,84.689],[-477.992,78.139],[-480.684,71.371],[-483.151,64.513],[-485.551,57.631],[-487.358,50.567],[-489.167,43.505],[-490.619,36.369],[-491.754,29.167],[-492.888,21.966],[-493.369,14.692],[-493.824,7.415],[-494.002,0.134],[-493.773,-7.151],[-493.546,-14.44],[-492.739,-21.681],[-491.828,-28.915],[-490.722,-36.115],[-489.139,-43.23],[-487.554,-50.347],[-485.57,-57.358],[-483.431,-64.328],[-480.857,-71.147],[-478.128,-77.903],[-474.986,-84.484],[-471.666,-90.966],[-467.898,-97.206],[-464.028,-103.378],[-459.697,-109.245],[-455.369,-115.111],[-450.999,-120.945],[-446.13,-126.37],[-441.26,-131.798],[-436.393,-137.223],[-431.523,-142.65],[-426.654,-148.075],[-421.787,-153.503],[-416.917,-158.93],[-411.835,-164.157],[-406.711,-169.34],[-401.585,-174.524],[-396.458,-179.709],[-391.332,-184.894],[-386.205,-190.078],[-381.081,-195.263],[-375.955,-200.448],[-370.829,-205.63],[-365.702,-210.815],[-360.548,-215.972],[-355.393,-221.129],[-350.239,-226.283],[-345.082,-231.437],[-339.928,-236.594],[-334.774,-241.748],[-329.617,-246.905],[-324.462,-252.06],[-319.308,-257.214],[-314.154,-262.371],[-308.997,-267.525],[-303.843,-272.682],[-298.688,-277.836],[-293.532,-282.993],[-288.377,-288.147],[-283.223,-293.302],[-278.066,-298.458],[-272.912,-303.613],[-267.757,-308.769],[-262.603,-313.924],[-257.446,-319.081],[-252.292,-324.235],[-247.137,-329.389],[-241.981,-334.546],[-236.826,-339.7],[-231.672,-344.857],[-226.515,-350.011],[-221.361,-355.166],[-216.206,-360.323],[-211.052,-365.477],[-205.781,-370.517],[-200.512,-375.555],[-195.243,-380.592],[-189.972,-385.632],[-184.703,-390.67],[-179.435,-395.708],[-174.164,-400.745],[-168.895,-405.783],[-163.624,-410.823],[-158.355,-415.861],[-153.086,-420.898],[-147.815,-425.936],[-142.546,-430.976],[-137.275,-436.014],[-132.006,-441.051],[-126.738,-446.089],[-121.084,-450.681],[-115.29,-455.105],[-109.493,-459.528],[-103.643,-463.87],[-97.459,-467.731],[-91.269,-471.583],[-84.718,-474.781],[-78.168,-477.982],[-71.403,-480.676],[-64.542,-483.143],[-57.662,-485.545],[-50.598,-487.352],[-43.534,-489.159],[-36.4,-490.616],[-29.199,-491.75],[-21.997,-492.885],[-14.723,-493.368],[-7.447,-493.823]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":456,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-0.166,-494.001],[7.12,-493.774],[14.408,-493.545],[21.649,-492.74],[28.884,-491.832],[36.083,-490.728],[43.201,-489.145],[50.316,-487.56],[57.326,-485.578],[64.297,-483.437],[71.118,-480.865],[77.874,-478.138],[84.452,-474.996],[90.937,-471.679],[97.177,-467.909],[103.351,-464.041],[109.218,-459.713],[115.084,-455.382],[120.918,-451.015],[126.346,-446.147],[131.773,-441.278],[137.2,-436.408],[142.626,-431.541],[148.053,-426.671],[153.481,-421.804],[158.906,-416.935],[164.135,-411.855],[169.32,-406.728],[174.504,-401.604],[179.687,-396.478],[184.872,-391.352],[190.056,-386.225],[195.241,-381.101],[200.426,-375.975],[205.61,-370.849],[210.795,-365.722],[215.952,-360.568],[221.106,-355.413],[226.261,-350.259],[231.417,-345.102],[236.572,-339.948],[241.726,-334.793],[246.883,-329.637],[252.037,-324.482],[257.192,-319.328],[262.348,-314.171],[267.503,-309.017],[272.66,-303.86],[277.814,-298.706],[282.968,-293.551],[288.125,-288.395],[293.279,-283.24],[298.434,-278.086],[303.591,-272.929],[308.745,-267.775],[313.899,-262.62],[319.056,-257.464],[324.21,-252.309],[329.367,-247.155],[334.522,-241.998],[339.676,-236.844],[344.833,-231.687],[349.987,-226.533],[355.141,-221.378],[360.298,-216.222],[365.453,-211.067],[370.493,-205.798],[375.53,-200.53],[380.57,-195.261],[385.608,-189.99],[390.646,-184.721],[395.683,-179.452],[400.723,-174.181],[405.761,-168.912],[410.798,-163.644],[415.836,-158.372],[420.876,-153.104],[425.914,-147.835],[430.952,-142.564],[435.991,-137.295],[441.029,-132.026],[446.067,-126.755],[450.661,-121.106],[455.085,-115.312],[459.508,-109.516],[463.855,-103.668],[467.716,-97.482],[471.57,-91.295],[474.768,-84.743],[477.969,-78.192],[480.665,-71.43],[483.133,-64.569],[485.537,-57.689],[487.344,-50.625],[489.151,-43.564],[490.61,-36.427],[491.744,-29.226],[492.879,-22.024],[493.364,-14.752],[493.82,-7.476],[494.002,-0.195],[493.775,7.093],[493.546,14.379],[492.743,21.622],[491.835,28.854],[490.734,36.056],[489.151,43.171],[487.566,50.289],[485.586,57.299],[483.445,64.27],[480.873,71.091],[478.151,77.849],[475.007,84.427],[471.692,90.913],[467.924,97.152],[464.056,103.329],[459.728,109.196],[455.4,115.062],[451.034,120.898],[446.165,126.326],[441.295,131.751],[436.428,137.178],[431.558,142.606],[426.691,148.031],[421.822,153.458],[416.954,158.886],[411.875,164.115],[406.748,169.3],[401.624,174.482],[396.498,179.667],[391.371,184.852],[386.245,190.036],[381.119,195.221],[375.995,200.406],[370.868,205.591],[365.742,210.775],[360.587,215.932],[355.433,221.086],[350.279,226.241],[345.122,231.398],[339.968,236.552],[334.813,241.706],[329.657,246.863],[324.502,252.017],[319.348,257.172],[314.191,262.328],[309.037,267.483],[303.88,272.637],[298.726,277.794],[293.571,282.948],[288.414,288.105],[283.26,293.259],[278.106,298.414],[272.949,303.571],[267.795,308.725],[262.64,313.879],[257.483,319.036],[252.329,324.19],[247.172,329.345],[242.018,334.502],[236.864,339.656],[231.707,344.813],[226.553,349.967],[221.398,355.121],[216.241,360.278],[211.005,365.514],[205.734,370.554],[200.465,375.592],[195.197,380.63],[189.926,385.667],[184.657,390.707],[179.388,395.745],[174.117,400.783],[168.848,405.82],[163.577,410.86],[158.308,415.898],[153.04,420.936],[147.768,425.973],[142.5,431.013],[137.231,436.051],[131.96,441.089],[126.691,446.129],[121.035,450.713],[115.238,455.137],[109.444,459.561],[103.59,463.901],[97.406,467.759],[91.212,471.606],[84.662,474.805],[78.112,478.005],[71.344,480.692],[64.484,483.159],[57.602,485.559],[50.538,487.366],[43.476,489.173],[36.34,490.623],[29.138,491.759],[21.936,492.894],[14.662,493.37],[7.386,493.825],[0.105,494.001],[-7.183,493.772],[-14.469,493.545],[-21.71,492.733],[-28.944,491.825],[-36.144,490.716],[-43.259,489.133],[-50.377,487.548],[-57.387,485.562],[-64.355,483.421],[-71.176,480.846],[-77.93,478.115],[-84.508,474.973],[-90.991,471.648],[-97.231,467.881],[-103.403,464.006],[-109.269,459.678],[-115.136,455.35],[-120.967,450.977],[-126.392,446.108],[-131.82,441.24],[-137.247,436.373],[-142.675,431.504],[-148.1,426.636],[-153.527,421.767],[-158.955,416.899],[-164.179,411.817],[-169.364,406.691],[-174.549,401.565],[-179.733,396.441],[-184.918,391.314],[-190.103,386.188],[-195.288,381.062],[-200.472,375.937],[-205.657,370.811],[-210.842,365.685],[-215.996,360.53],[-221.153,355.376],[-226.307,350.219],[-231.462,345.065],[-236.619,339.908],[-241.773,334.754],[-246.927,329.599],[-252.084,324.443],[-257.238,319.288],[-262.393,314.132],[-267.547,308.977],[-272.704,303.823],[-277.858,298.666],[-283.013,293.512],[-288.169,288.355],[-293.324,283.201],[-298.478,278.044],[-303.635,272.889],[-308.789,267.735],[-313.944,262.578],[-319.098,257.424],[-324.255,252.267],[-329.409,247.113],[-334.564,241.956],[-339.72,236.802],[-344.875,231.647],[-350.029,226.491],[-355.186,221.336],[-360.34,216.18],[-365.495,211.025],[-370.535,205.756],[-375.572,200.488],[-380.61,195.216],[-385.65,189.948],[-390.688,184.679],[-395.725,179.408],[-400.765,174.139],[-405.803,168.87],[-410.84,163.599],[-415.88,158.331],[-420.918,153.062],[-425.956,147.793],[-430.993,142.522],[-436.033,137.253],[-441.071,131.984],[-446.109,126.713],[-450.698,121.059],[-455.122,115.265],[-459.546,109.469],[-463.888,103.616],[-467.747,97.433],[-471.596,91.242],[-474.794,84.689],[-477.992,78.139],[-480.684,71.371],[-483.151,64.513],[-485.551,57.631],[-487.358,50.567],[-489.167,43.505],[-490.619,36.369],[-491.754,29.167],[-492.888,21.966],[-493.369,14.692],[-493.824,7.415],[-494.002,0.134],[-493.773,-7.151],[-493.546,-14.44],[-492.739,-21.681],[-491.828,-28.915],[-490.722,-36.115],[-489.139,-43.23],[-487.554,-50.347],[-485.57,-57.358],[-483.431,-64.328],[-480.857,-71.147],[-478.128,-77.903],[-474.986,-84.484],[-471.666,-90.966],[-467.898,-97.206],[-464.028,-103.378],[-459.697,-109.245],[-455.369,-115.111],[-450.999,-120.945],[-446.13,-126.37],[-441.26,-131.798],[-436.393,-137.223],[-431.523,-142.65],[-426.654,-148.075],[-421.787,-153.503],[-416.917,-158.93],[-411.835,-164.157],[-406.711,-169.34],[-401.585,-174.524],[-396.458,-179.709],[-391.332,-184.894],[-386.205,-190.078],[-381.081,-195.263],[-375.955,-200.448],[-370.829,-205.63],[-365.702,-210.815],[-360.548,-215.972],[-355.393,-221.129],[-350.239,-226.283],[-345.082,-231.437],[-339.928,-236.594],[-334.774,-241.748],[-329.617,-246.905],[-324.462,-252.06],[-319.308,-257.214],[-314.154,-262.371],[-308.997,-267.525],[-303.843,-272.682],[-298.688,-277.836],[-293.532,-282.993],[-288.377,-288.147],[-283.223,-293.302],[-278.066,-298.458],[-272.912,-303.613],[-267.757,-308.769],[-262.603,-313.924],[-257.446,-319.081],[-252.292,-324.235],[-247.137,-329.389],[-241.981,-334.546],[-236.826,-339.7],[-231.672,-344.857],[-226.515,-350.011],[-221.361,-355.166],[-216.206,-360.323],[-211.052,-365.477],[-205.781,-370.517],[-200.512,-375.555],[-195.243,-380.592],[-189.972,-385.632],[-184.703,-390.67],[-179.435,-395.708],[-174.164,-400.745],[-168.895,-405.783],[-163.624,-410.823],[-158.355,-415.861],[-153.086,-420.898],[-147.815,-425.936],[-142.546,-430.976],[-137.275,-436.014],[-132.006,-441.051],[-126.738,-446.089],[-121.084,-450.681],[-115.29,-455.105],[-109.493,-459.528],[-103.643,-463.87],[-97.459,-467.731],[-91.269,-471.583],[-84.718,-474.781],[-78.168,-477.982],[-71.403,-480.676],[-64.542,-483.143],[-57.662,-485.545],[-50.598,-487.352],[-43.534,-489.159],[-36.4,-490.616],[-29.199,-491.75],[-21.997,-492.885],[-14.723,-493.368],[-7.447,-493.823]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":486,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[1.906,-488.758],[9.421,-487.243],[16.936,-485.728],[24.451,-484.213],[31.966,-482.698],[39.333,-480.59],[46.677,-478.385],[54.02,-476.18],[61.363,-473.975],[68.706,-471.77],[75.88,-469.081],[82.983,-466.201],[90.087,-463.319],[97.193,-460.436],[104.297,-457.556],[111.241,-454.323],[118.039,-450.782],[124.84,-447.241],[131.641,-443.702],[138.442,-440.161],[145.129,-436.429],[151.56,-432.254],[157.991,-428.079],[164.422,-423.907],[170.853,-419.732],[177.281,-415.554],[183.356,-410.878],[189.431,-406.2],[195.508,-401.524],[201.409,-396.642],[207.087,-391.489],[212.765,-386.336],[218.443,-381.184],[224.118,-376.031],[229.796,-370.878],[235.22,-365.461],[240.642,-360.04],[246.063,-354.618],[251.485,-349.197],[256.906,-343.775],[262.328,-338.354],[267.749,-332.932],[273.171,-327.513],[278.592,-322.092],[284.011,-316.671],[289.433,-311.249],[294.854,-305.828],[300.276,-300.406],[305.697,-294.985],[311.118,-289.563],[316.54,-284.142],[321.961,-278.72],[327.383,-273.299],[332.804,-267.88],[338.226,-262.458],[343.645,-257.037],[349.066,-251.615],[354.488,-246.194],[359.909,-240.772],[365.331,-235.351],[370.752,-229.929],[375.907,-224.256],[381.06,-218.578],[386.213,-212.9],[391.366,-207.222],[396.516,-201.547],[401.359,-195.612],[405.938,-189.462],[410.515,-183.315],[415.094,-177.165],[419.674,-171.015],[424.132,-164.785],[428.099,-158.223],[432.066,-151.662],[436.03,-145.1],[439.997,-138.539],[443.964,-131.978],[447.335,-125.097],[450.658,-118.187],[453.981,-111.277],[457.304,-104.369],[460.628,-97.459],[463.476,-90.348],[466.136,-83.158],[468.794,-75.967],[471.451,-68.776],[474.109,-61.583],[476.396,-54.274],[478.371,-46.868],[480.348,-39.459],[482.323,-32.051],[484.301,-24.645],[485.992,-17.176],[487.277,-9.617],[488.56,-2.058],[489.845,5.5],[491.128,13.059],[492.207,20.644],[492.793,28.287],[493.377,35.933],[493.962,43.576],[494.546,51.222],[495.001,58.87],[494.882,66.535],[494.766,74.203],[494.65,81.868],[494.531,89.533],[494.354,97.196],[493.536,104.819],[492.718,112.441],[491.9,120.065],[491.082,127.689],[490.264,135.31],[488.766,142.828],[487.248,150.345],[485.733,157.86],[484.218,165.375],[482.703,172.89],[480.597,180.258],[478.392,187.601],[476.188,194.944],[473.983,202.287],[471.778,209.63],[469.094,216.804],[466.211,223.908],[463.331,231.014],[460.448,238.117],[457.566,245.223],[454.337,252.167],[450.796,258.966],[447.255,265.767],[443.714,272.568],[440.173,279.369],[436.444,286.059],[432.269,292.489],[428.096,298.92],[423.921,305.351],[419.749,311.781],[415.571,318.21],[410.895,324.285],[406.219,330.362],[401.541,336.437],[396.661,342.34],[391.509,348.018],[386.356,353.696],[381.203,359.372],[376.05,365.05],[370.815,370.817],[365.139,375.97],[359.461,381.123],[353.783,386.276],[348.105,391.429],[342.43,396.579],[336.49,401.415],[330.34,405.994],[324.19,410.573],[318.04,415.15],[311.893,419.729],[305.658,424.182],[299.097,428.147],[292.535,432.114],[285.974,436.078],[279.412,440.045],[272.851,444.012],[265.965,447.376],[259.055,450.699],[252.145,454.022],[245.238,457.345],[238.328,460.668],[231.215,463.51],[224.024,466.167],[216.831,468.827],[209.64,471.485],[202.449,474.142],[195.138,476.42],[187.729,478.397],[180.323,480.372],[172.915,482.349],[165.506,484.324],[158.035,486.011],[150.476,487.294],[142.917,488.577],[135.359,489.862],[127.8,491.145],[120.217,492.217],[112.572,492.8],[104.928,493.386],[97.283,493.972],[89.639,494.555],[81.989,495],[74.324,494.884],[66.659,494.766],[58.991,494.649],[51.326,494.533],[43.663,494.347],[36.042,493.529],[28.418,492.711],[20.796,491.893],[13.173,491.075],[5.549,490.257],[-1.966,488.749],[-9.484,487.234],[-16.999,485.718],[-24.514,484.203],[-32.029,482.686],[-39.396,480.575],[-46.737,478.371],[-54.08,476.166],[-61.423,473.961],[-68.767,471.754],[-75.938,469.062],[-83.042,466.18],[-90.148,463.299],[-97.251,460.417],[-104.357,457.534],[-111.296,454.296],[-118.097,450.757],[-124.898,447.216],[-131.697,443.676],[-138.498,440.135],[-145.183,436.398],[-151.613,432.223],[-158.044,428.05],[-164.477,423.875],[-170.908,419.702],[-177.332,415.518],[-183.406,410.842],[-189.484,406.166],[-195.559,401.49],[-201.457,396.601],[-207.135,391.45],[-212.813,386.298],[-218.489,381.145],[-224.167,375.992],[-229.845,370.839],[-235.266,365.42],[-240.688,359.999],[-246.109,354.577],[-251.531,349.156],[-256.952,343.734],[-262.374,338.313],[-267.795,332.894],[-273.216,327.472],[-278.638,322.051],[-284.057,316.629],[-289.478,311.208],[-294.9,305.786],[-300.321,300.365],[-305.743,294.943],[-311.164,289.522],[-316.586,284.101],[-322.007,278.679],[-327.429,273.26],[-332.85,267.839],[-338.272,262.417],[-343.691,256.996],[-349.112,251.574],[-354.534,246.153],[-359.955,240.731],[-365.377,235.31],[-370.798,229.888],[-375.951,224.213],[-381.104,218.535],[-386.257,212.857],[-391.409,207.181],[-396.56,201.503],[-401.398,195.566],[-405.977,189.416],[-410.554,183.266],[-415.133,177.116],[-419.712,170.969],[-424.166,164.734],[-428.132,158.175],[-432.099,151.613],[-436.064,145.052],[-440.031,138.49],[-443.998,131.929],[-447.364,125.043],[-450.687,118.134],[-454.01,111.226],[-457.333,104.316],[-460.656,97.406],[-463.5,90.295],[-466.158,83.102],[-468.818,75.911],[-471.475,68.721],[-474.133,61.53],[-476.413,54.218],[-478.39,46.81],[-480.365,39.404],[-482.342,31.995],[-484.317,24.587],[-486.007,17.118],[-487.289,9.559],[-488.572,2],[-489.857,-5.558],[-491.14,-13.117],[-492.215,-20.702],[-492.798,-28.348],[-493.384,-35.991],[-493.969,-43.637],[-494.553,-51.28],[-495,-58.928],[-494.884,-66.596],[-494.768,-74.261],[-494.65,-81.926],[-494.533,-89.593],[-494.352,-97.254],[-493.534,-104.877],[-492.716,-112.499],[-491.895,-120.123],[-491.077,-127.747],[-490.259,-135.368],[-488.756,-142.886],[-487.239,-150.401],[-485.723,-157.918],[-484.208,-165.433],[-482.693,-172.948],[-480.583,-180.316],[-478.378,-187.659],[-476.173,-195],[-473.968,-202.343],[-471.763,-209.686],[-469.072,-216.86],[-466.192,-223.963],[-463.309,-231.067],[-460.426,-238.173],[-457.546,-245.277],[-454.31,-252.218],[-450.77,-259.019],[-447.229,-265.82],[-443.688,-272.619],[-440.149,-279.42],[-436.412,-286.107],[-432.24,-292.538],[-428.065,-298.968],[-423.892,-305.399],[-419.717,-311.83],[-415.537,-318.256],[-410.859,-324.331],[-406.183,-330.408],[-401.507,-336.483],[-396.62,-342.384],[-391.47,-348.062],[-386.317,-353.737],[-381.164,-359.415],[-376.011,-365.093],[-370.859,-370.771],[-365.185,-375.927],[-359.51,-381.079],[-353.832,-386.232],[-348.154,-391.385],[-342.476,-396.535],[-336.541,-401.376],[-330.394,-405.955],[-324.244,-410.532],[-318.094,-415.111],[-311.944,-419.69],[-305.714,-424.146],[-299.152,-428.113],[-292.591,-432.08],[-286.03,-436.044],[-279.468,-440.011],[-272.907,-443.978],[-266.023,-447.347],[-259.113,-450.67],[-252.203,-453.993],[-245.296,-457.316],[-238.386,-460.639],[-231.275,-463.486],[-224.084,-466.146],[-216.891,-468.803],[-209.701,-471.461],[-202.51,-474.118],[-195.198,-476.403],[-187.792,-478.378],[-180.384,-480.355],[-172.975,-482.33],[-165.569,-484.308],[-158.097,-485.997],[-150.539,-487.282],[-142.98,-488.565],[-135.422,-489.85],[-127.863,-491.133],[-120.28,-492.21],[-112.635,-492.793],[-104.991,-493.379],[-97.346,-493.965],[-89.702,-494.548],[-82.054,-495.001],[-74.387,-494.882],[-66.721,-494.766],[-59.056,-494.647],[-51.389,-494.531],[-43.729,-494.352],[-36.105,-493.534],[-28.481,-492.716],[-20.859,-491.898],[-13.235,-491.079],[-5.614,-490.262]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.05,"y":0},"t":548,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[1.906,-488.758],[9.421,-487.243],[16.936,-485.728],[24.451,-484.213],[31.966,-482.698],[39.333,-480.59],[46.677,-478.385],[54.02,-476.18],[61.363,-473.975],[68.706,-471.77],[75.88,-469.081],[82.983,-466.201],[90.087,-463.319],[97.193,-460.436],[104.297,-457.556],[111.241,-454.323],[118.039,-450.782],[124.84,-447.241],[131.641,-443.702],[138.442,-440.161],[145.129,-436.429],[151.56,-432.254],[157.991,-428.079],[164.422,-423.907],[170.853,-419.732],[177.281,-415.554],[183.356,-410.878],[189.431,-406.2],[195.508,-401.524],[201.409,-396.642],[207.087,-391.489],[212.765,-386.336],[218.443,-381.184],[224.118,-376.031],[229.796,-370.878],[235.22,-365.461],[240.642,-360.04],[246.063,-354.618],[251.485,-349.197],[256.906,-343.775],[262.328,-338.354],[267.749,-332.932],[273.171,-327.513],[278.592,-322.092],[284.011,-316.671],[289.433,-311.249],[294.854,-305.828],[300.276,-300.406],[305.697,-294.985],[311.118,-289.563],[316.54,-284.142],[321.961,-278.72],[327.383,-273.299],[332.804,-267.88],[338.226,-262.458],[343.645,-257.037],[349.066,-251.615],[354.488,-246.194],[359.909,-240.772],[365.331,-235.351],[370.752,-229.929],[375.907,-224.256],[381.06,-218.578],[386.213,-212.9],[391.366,-207.222],[396.516,-201.547],[401.359,-195.612],[405.938,-189.462],[410.515,-183.315],[415.094,-177.165],[419.674,-171.015],[424.132,-164.785],[428.099,-158.223],[432.066,-151.662],[436.03,-145.1],[439.997,-138.539],[443.964,-131.978],[447.335,-125.097],[450.658,-118.187],[453.981,-111.277],[457.304,-104.369],[460.628,-97.459],[463.476,-90.348],[466.136,-83.158],[468.794,-75.967],[471.451,-68.776],[474.109,-61.583],[476.396,-54.274],[478.371,-46.868],[480.348,-39.459],[482.323,-32.051],[484.301,-24.645],[485.992,-17.176],[487.277,-9.617],[488.56,-2.058],[489.845,5.5],[491.128,13.059],[492.207,20.644],[492.793,28.287],[493.377,35.933],[493.962,43.576],[494.546,51.222],[495.001,58.87],[494.882,66.535],[494.766,74.203],[494.65,81.868],[494.531,89.533],[494.354,97.196],[493.536,104.819],[492.718,112.441],[491.9,120.065],[491.082,127.689],[490.264,135.31],[488.766,142.828],[487.248,150.345],[485.733,157.86],[484.218,165.375],[482.703,172.89],[480.597,180.258],[478.392,187.601],[476.188,194.944],[473.983,202.287],[471.778,209.63],[469.094,216.804],[466.211,223.908],[463.331,231.014],[460.448,238.117],[457.566,245.223],[454.337,252.167],[450.796,258.966],[447.255,265.767],[443.714,272.568],[440.173,279.369],[436.444,286.059],[432.269,292.489],[428.096,298.92],[423.921,305.351],[419.749,311.781],[415.571,318.21],[410.895,324.285],[406.219,330.362],[401.541,336.437],[396.661,342.34],[391.509,348.018],[386.356,353.696],[381.203,359.372],[376.05,365.05],[370.815,370.817],[365.139,375.97],[359.461,381.123],[353.783,386.276],[348.105,391.429],[342.43,396.579],[336.49,401.415],[330.34,405.994],[324.19,410.573],[318.04,415.15],[311.893,419.729],[305.658,424.182],[299.097,428.147],[292.535,432.114],[285.974,436.078],[279.412,440.045],[272.851,444.012],[265.965,447.376],[259.055,450.699],[252.145,454.022],[245.238,457.345],[238.328,460.668],[231.215,463.51],[224.024,466.167],[216.831,468.827],[209.64,471.485],[202.449,474.142],[195.138,476.42],[187.729,478.397],[180.323,480.372],[172.915,482.349],[165.506,484.324],[158.035,486.011],[150.476,487.294],[142.917,488.577],[135.359,489.862],[127.8,491.145],[120.217,492.217],[112.572,492.8],[104.928,493.386],[97.283,493.972],[89.639,494.555],[81.989,495],[74.324,494.884],[66.659,494.766],[58.991,494.649],[51.326,494.533],[43.663,494.347],[36.042,493.529],[28.418,492.711],[20.796,491.893],[13.173,491.075],[5.549,490.257],[-1.966,488.749],[-9.484,487.234],[-16.999,485.718],[-24.514,484.203],[-32.029,482.686],[-39.396,480.575],[-46.737,478.371],[-54.08,476.166],[-61.423,473.961],[-68.767,471.754],[-75.938,469.062],[-83.042,466.18],[-90.148,463.299],[-97.251,460.417],[-104.357,457.534],[-111.296,454.296],[-118.097,450.757],[-124.898,447.216],[-131.697,443.676],[-138.498,440.135],[-145.183,436.398],[-151.613,432.223],[-158.044,428.05],[-164.477,423.875],[-170.908,419.702],[-177.332,415.518],[-183.406,410.842],[-189.484,406.166],[-195.559,401.49],[-201.457,396.601],[-207.135,391.45],[-212.813,386.298],[-218.489,381.145],[-224.167,375.992],[-229.845,370.839],[-235.266,365.42],[-240.688,359.999],[-246.109,354.577],[-251.531,349.156],[-256.952,343.734],[-262.374,338.313],[-267.795,332.894],[-273.216,327.472],[-278.638,322.051],[-284.057,316.629],[-289.478,311.208],[-294.9,305.786],[-300.321,300.365],[-305.743,294.943],[-311.164,289.522],[-316.586,284.101],[-322.007,278.679],[-327.429,273.26],[-332.85,267.839],[-338.272,262.417],[-343.691,256.996],[-349.112,251.574],[-354.534,246.153],[-359.955,240.731],[-365.377,235.31],[-370.798,229.888],[-375.951,224.213],[-381.104,218.535],[-386.257,212.857],[-391.409,207.181],[-396.56,201.503],[-401.398,195.566],[-405.977,189.416],[-410.554,183.266],[-415.133,177.116],[-419.712,170.969],[-424.166,164.734],[-428.132,158.175],[-432.099,151.613],[-436.064,145.052],[-440.031,138.49],[-443.998,131.929],[-447.364,125.043],[-450.687,118.134],[-454.01,111.226],[-457.333,104.316],[-460.656,97.406],[-463.5,90.295],[-466.158,83.102],[-468.818,75.911],[-471.475,68.721],[-474.133,61.53],[-476.413,54.218],[-478.39,46.81],[-480.365,39.404],[-482.342,31.995],[-484.317,24.587],[-486.007,17.118],[-487.289,9.559],[-488.572,2],[-489.857,-5.558],[-491.14,-13.117],[-492.215,-20.702],[-492.798,-28.348],[-493.384,-35.991],[-493.969,-43.637],[-494.553,-51.28],[-495,-58.928],[-494.884,-66.596],[-494.768,-74.261],[-494.65,-81.926],[-494.533,-89.593],[-494.352,-97.254],[-493.534,-104.877],[-492.716,-112.499],[-491.895,-120.123],[-491.077,-127.747],[-490.259,-135.368],[-488.756,-142.886],[-487.239,-150.401],[-485.723,-157.918],[-484.208,-165.433],[-482.693,-172.948],[-480.583,-180.316],[-478.378,-187.659],[-476.173,-195],[-473.968,-202.343],[-471.763,-209.686],[-469.072,-216.86],[-466.192,-223.963],[-463.309,-231.067],[-460.426,-238.173],[-457.546,-245.277],[-454.31,-252.218],[-450.77,-259.019],[-447.229,-265.82],[-443.688,-272.619],[-440.149,-279.42],[-436.412,-286.107],[-432.24,-292.538],[-428.065,-298.968],[-423.892,-305.399],[-419.717,-311.83],[-415.537,-318.256],[-410.859,-324.331],[-406.183,-330.408],[-401.507,-336.483],[-396.62,-342.384],[-391.47,-348.062],[-386.317,-353.737],[-381.164,-359.415],[-376.011,-365.093],[-370.859,-370.771],[-365.185,-375.927],[-359.51,-381.079],[-353.832,-386.232],[-348.154,-391.385],[-342.476,-396.535],[-336.541,-401.376],[-330.394,-405.955],[-324.244,-410.532],[-318.094,-415.111],[-311.944,-419.69],[-305.714,-424.146],[-299.152,-428.113],[-292.591,-432.08],[-286.03,-436.044],[-279.468,-440.011],[-272.907,-443.978],[-266.023,-447.347],[-259.113,-450.67],[-252.203,-453.993],[-245.296,-457.316],[-238.386,-460.639],[-231.275,-463.486],[-224.084,-466.146],[-216.891,-468.803],[-209.701,-471.461],[-202.51,-474.118],[-195.198,-476.403],[-187.792,-478.378],[-180.384,-480.355],[-172.975,-482.33],[-165.569,-484.308],[-158.097,-485.997],[-150.539,-487.282],[-142.98,-488.565],[-135.422,-489.85],[-127.863,-491.133],[-120.28,-492.21],[-112.635,-492.793],[-104.991,-493.379],[-97.346,-493.965],[-89.702,-494.548],[-82.054,-495.001],[-74.387,-494.882],[-66.721,-494.766],[-59.056,-494.647],[-51.389,-494.531],[-43.729,-494.352],[-36.105,-493.534],[-28.481,-492.716],[-20.859,-491.898],[-13.235,-491.079],[-5.614,-490.262]],"c":true}]},{"t":578,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[6.428,-491.836],[14.758,-490.711],[22.933,-488.794],[30.879,-486.091],[38.523,-482.63],[45.798,-478.436],[52.619,-473.52],[58.782,-467.809],[64.461,-461.621],[69.338,-454.782],[73.871,-447.708],[78.192,-440.497],[82.517,-433.286],[86.839,-426.075],[91.16,-418.864],[95.482,-411.653],[99.804,-404.442],[104.126,-397.231],[108.483,-390.044],[113.214,-383.095],[118.623,-376.662],[124.659,-370.811],[131.256,-365.6],[138.343,-361.084],[145.852,-357.302],[153.702,-354.292],[161.813,-352.086],[170.105,-350.705],[178.493,-350.164],[186.896,-350.481],[195.21,-351.684],[203.407,-353.545],[211.562,-355.588],[219.718,-357.63],[227.872,-359.673],[236.027,-361.716],[244.181,-363.761],[252.338,-365.803],[260.492,-367.846],[268.646,-369.889],[276.914,-371.411],[285.269,-372.203],[293.657,-372.215],[302.017,-371.414],[310.252,-369.719],[318.231,-367.08],[325.908,-363.685],[333.216,-359.562],[340.096,-354.753],[346.486,-349.301],[352.314,-343.241],[357.412,-336.56],[361.837,-329.422],[365.549,-321.897],[368.509,-314.043],[370.689,-305.936],[372.039,-297.638],[372.361,-289.24],[372.004,-280.849],[370.621,-272.565],[368.824,-264.356],[366.781,-256.2],[364.736,-248.045],[362.693,-239.891],[360.651,-231.737],[358.608,-223.58],[356.565,-215.426],[354.522,-207.272],[352.518,-199.108],[350.948,-190.852],[350.222,-182.478],[350.352,-174.071],[351.328,-165.723],[353.146,-157.514],[355.778,-149.53],[359.199,-141.853],[363.374,-134.555],[368.261,-127.715],[373.81,-121.4],[379.976,-115.683],[386.704,-110.652],[393.816,-106.172],[401.027,-101.85],[408.238,-97.528],[415.449,-93.207],[422.657,-88.885],[429.868,-84.563],[437.079,-80.241],[444.29,-75.919],[451.501,-71.597],[458.424,-66.826],[464.892,-61.481],[470.836,-55.558],[476.182,-49.083],[480.806,-42.061],[484.584,-34.554],[487.613,-26.727],[489.868,-18.643],[491.334,-10.378],[492.001,-2.006],[491.837,6.399],[490.717,14.73],[488.802,22.906],[486.104,30.852],[482.645,38.498],[478.456,45.775],[473.541,52.596],[467.831,58.762],[461.649,64.443],[454.811,69.326],[447.737,73.86],[440.526,78.18],[433.315,82.501],[426.105,86.823],[418.894,91.145],[411.68,95.465],[404.469,99.786],[397.258,104.108],[390.069,108.463],[383.12,113.192],[376.687,118.601],[370.833,124.635],[365.62,131.228],[361.1,138.316],[357.315,145.823],[354.303,153.672],[352.094,161.784],[350.711,170.075],[350.167,178.464],[350.487,186.866],[351.683,195.181],[353.544,203.378],[355.589,211.532],[357.631,219.686],[359.674,227.843],[361.717,235.997],[363.762,244.151],[365.805,252.306],[367.847,260.462],[369.892,268.617],[371.413,276.884],[372.209,285.237],[372.224,293.628],[371.424,301.988],[369.729,310.223],[367.095,318.202],[363.7,325.879],[359.582,333.191],[354.775,340.071],[349.328,346.464],[343.269,352.292],[336.587,357.392],[329.452,361.82],[321.927,365.534],[314.075,368.499],[305.968,370.683],[297.67,372.031],[289.272,372.357],[280.883,372.005],[272.597,370.622],[264.388,368.83],[256.234,366.785],[248.077,364.742],[239.923,362.699],[231.769,360.657],[223.615,358.614],[215.458,356.571],[207.304,354.526],[199.14,352.521],[190.884,350.949],[182.51,350.221],[174.105,350.344],[165.754,351.32],[157.546,353.134],[149.562,355.763],[141.88,359.181],[134.582,363.354],[127.74,368.236],[121.423,373.785],[115.708,379.949],[110.672,386.673],[106.19,393.784],[101.868,400.995],[97.546,408.206],[93.224,415.417],[88.902,422.628],[84.581,429.839],[80.259,437.05],[75.937,444.261],[71.615,451.472],[66.846,458.394],[61.503,464.868],[55.583,470.811],[49.11,476.162],[42.088,480.786],[34.586,484.569],[26.758,487.6],[18.675,489.86],[10.412,491.328],[2.04,492],[-6.367,491.834],[-14.696,490.718],[-22.874,488.808],[-30.82,486.115],[-38.469,482.661],[-45.748,478.474],[-52.569,473.559],[-58.737,467.851],[-64.421,461.671],[-69.305,454.836],[-73.842,447.762],[-78.164,440.551],[-82.484,433.34],[-86.805,426.13],[-91.127,418.918],[-95.449,411.708],[-99.769,404.497],[-104.09,397.283],[-108.445,390.094],[-113.171,383.143],[-118.576,376.707],[-124.607,370.851],[-131.201,365.636],[-138.287,361.113],[-145.793,357.325],[-153.64,354.309],[-161.749,352.098],[-170.041,350.71],[-178.432,350.169],[-186.832,350.483],[-195.149,351.675],[-203.346,353.533],[-211.5,355.578],[-219.654,357.621],[-227.809,359.664],[-235.965,361.706],[-244.12,363.751],[-252.274,365.794],[-260.428,367.837],[-268.585,369.882],[-276.85,371.404],[-285.205,372.204],[-293.594,372.225],[-301.956,371.43],[-310.191,369.735],[-318.17,367.104],[-325.849,363.716],[-333.162,359.6],[-340.046,354.796],[-346.442,349.351],[-352.269,343.291],[-357.371,336.612],[-361.804,329.482],[-365.521,321.956],[-368.488,314.107],[-370.677,306],[-372.025,297.702],[-372.356,289.304],[-372.006,280.915],[-370.628,272.629],[-368.836,264.42],[-366.793,256.264],[-364.75,248.109],[-362.708,239.955],[-360.662,231.801],[-358.62,223.646],[-356.577,215.49],[-354.532,207.336],[-352.527,199.172],[-350.95,190.916],[-350.22,182.542],[-350.34,174.137],[-351.312,165.786],[-353.123,157.578],[-355.749,149.591],[-359.166,141.91],[-363.334,134.609],[-368.216,127.765],[-373.763,121.447],[-379.924,115.728],[-386.645,110.688],[-393.755,106.205],[-400.968,101.886],[-408.179,97.564],[-415.39,93.242],[-422.601,88.923],[-429.814,84.601],[-437.025,80.281],[-444.236,75.96],[-451.449,71.64],[-458.372,66.871],[-464.845,61.533],[-470.793,55.615],[-476.148,49.144],[-480.771,42.123],[-484.556,34.621],[-487.591,26.795],[-489.854,18.714],[-491.327,10.451],[-492.001,2.077],[-491.837,-6.328],[-490.724,-14.659],[-488.818,-22.835],[-486.128,-30.786],[-482.678,-38.434],[-478.496,-45.716],[-473.581,-52.537],[-467.878,-58.71],[-461.701,-64.396],[-454.868,-69.283],[-447.796,-73.822],[-440.586,-78.144],[-433.375,-82.463],[-426.161,-86.785],[-418.95,-91.107],[-411.739,-95.429],[-404.529,-99.751],[-397.318,-104.073],[-390.126,-108.425],[-383.172,-113.146],[-376.732,-118.549],[-370.874,-124.578],[-365.656,-131.167],[-361.128,-138.252],[-357.338,-145.757],[-354.319,-153.601],[-352.104,-161.71],[-350.714,-170.002],[-350.17,-178.393],[-350.482,-186.793],[-351.666,-195.11],[-353.525,-203.307],[-355.567,-211.461],[-357.61,-219.618],[-359.655,-227.772],[-361.698,-235.926],[-363.741,-244.081],[-365.783,-252.237],[-367.826,-260.391],[-369.871,-268.546],[-371.396,-276.813],[-372.202,-285.166],[-372.226,-293.555],[-371.436,-301.917],[-369.741,-310.152],[-367.117,-318.133],[-363.731,-325.815],[-359.617,-333.13],[-354.818,-340.017],[-349.378,-346.414],[-343.318,-352.242],[-336.642,-357.349],[-329.511,-361.784],[-321.991,-365.505],[-314.141,-368.475],[-306.037,-370.669],[-297.738,-372.017],[-289.34,-372.35],[-280.952,-372.005],[-272.665,-370.629],[-264.454,-368.839],[-256.3,-366.796],[-248.146,-364.754],[-239.989,-362.709],[-231.835,-360.666],[-223.681,-358.623],[-215.526,-356.581],[-207.372,-354.535],[-199.208,-352.528],[-190.953,-350.951],[-182.578,-350.216],[-174.174,-350.334],[-165.823,-351.306],[-157.612,-353.115],[-149.626,-355.736],[-141.942,-359.148],[-134.639,-363.314],[-127.794,-368.194],[-121.477,-373.74],[-115.753,-379.899],[-110.708,-386.616],[-106.225,-393.725],[-101.903,-400.936],[-97.582,-408.147],[-93.26,-415.36],[-88.94,-422.571],[-84.618,-429.782],[-80.297,-436.993],[-75.975,-444.204],[-71.584,-451.531],[-66.813,-458.453],[-61.463,-464.917],[-55.538,-470.858],[-49.058,-476.202],[-42.039,-480.826],[-34.53,-484.599],[-26.699,-487.623],[-18.616,-489.876],[-10.351,-491.337],[-1.977,-491.999]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.235294117647,0.250980392157,0.262745098039,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[8.9,8.9],"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"}],"nm":"Material shape","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":26,"ty":4,"nm":".grey700","cl":"grey700","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-349.33,-81.383,0],"ix":2,"l":2},"a":{"a":0,"k":[-212.824,66.939,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[77,77],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":772,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.372549019608,0.388235294118,0.407843137255,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-212.824,66.939],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":27,"ty":4,"nm":".grey800","cl":"grey800","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.05],"y":[0]},"t":270,"s":[1256]},{"t":300,"s":[476]}],"ix":3},"y":{"a":0,"k":342,"ix":4}},"a":{"a":0,"k":[-202.83,-54.883,0],"ix":1,"l":2},"s":{"a":0,"k":[200,200,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[420,190],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":38,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.235294117647,0.250980392157,0.262745098039,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-202.83,-54.883],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":270,"op":720,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":28,"ty":4,"nm":".black","cl":"black","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[412,300,0],"ix":2,"l":2},"a":{"a":0,"k":[-46.322,-74.951,0],"ix":1,"l":2},"s":{"a":0,"k":[200,200,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[412,300],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-46.322,-74.951],"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"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":720,"st":0,"ct":1,"bm":0}],"markers":[{"tm":360,"cm":"1","dr":0},{"tm":450,"cm":"2","dr":0},{"tm":540,"cm":"3","dr":0}],"props":{}}
\ No newline at end of file
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 882b5e0..6db2759 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Slaaptyd"</item>
+ <item msgid="4152450357280759894">"Bestuur"</item>
+ <item msgid="7096549258219399423">"Meesleurend"</item>
+ <item msgid="2760716776980432977">"Bestuur"</item>
+ <item msgid="601734478369121764">"Ster"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Tyd"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Blom"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1d9a295..c5a7a3b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Ontkoppel toestel?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bind nuwe toestel saam"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Skakel dit môre outomaties 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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Gehoortoestelinstellings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Kortpad, gehoortoestel-versoenbaarheid"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Voorafstelling"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Geen voorafstellings deur jou oudioloog geprogrammeer nie"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Kon nie voorafstelling opdateer nie"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Oudio-uitvoer"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Meer oor oudio-uitvoer"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Af"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aan/# app het toegang tot ligging}other{Aan/# apps het toegang tot ligging}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Laai tans …"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps met die Toestelle in die Omtrek-toestemming kan die relatiewe posisie van gekoppelde toestelle bepaal."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps met die Toestelle in die Omtrek-toestemming kan die relatiewe posisie van gekoppelde toestelle bepaal."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Liggingtoegang is af vir apps en dienste. Jou toestelligging kan steeds aan nooddienste gestuur word wanneer jy \'n noodnommer bel of \'n SMS daarheen stuur."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Meer inligting oor ligginginstellings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Gaan na ChromeOS-instellings > Privaatheid en sekuriteit > Privaatheidkontroles > Liggingtoegang om dit te verander"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Gesig en <xliff:g id="WATCH">%s</xliff:g> is bygevoeg"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Gesig, vingerafdruk en <xliff:g id="WATCH">%s</xliff:g> is bygevoeg"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Gesig, vingerafdrukke en <xliff:g id="WATCH">%s</xliff:g> is bygevoeg"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Dit is nodig omdat Identiteitkontrole aan is"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator-ontsluiting"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Horlosie is bygevoeg"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Stel jou horlosie op"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Kom meer te wete oor Horlosieontsluiting"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Voeg horlosie by"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Verwyder horlosie"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Gesig- en Vingerafdrukslot"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Gesigslot en vingerafdrukslot"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Gesig- en Vingerafdrukslot vir werk"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Opstelling is nodig"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Gesig en vingerafdrukke is bygevoeg"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installeer apps"</b>\n"Installeer apps wat jy privaat in jou ruimte wil hou"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Hou in gedagte"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stop wanneer jy jou ruimte sluit"</b>\n"Wanneer jy jou ruimte sluit, word apps in jou ruimte gestop en sal jy nie kennisgewing van hulle af ontvang nie"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privaat ruimtes is nie geskik vir apps, soos mediese apps, wat in die agtergrond moet werk of kritieke kennisgewings moet stuur nie. Dit is omdat kennisgewings en agtergrondaktiwiteit gestop word wanneer jou ruimte gesluit word.\n\nApps in jou privaat ruimte sal nie in toestemmingbestuurder, privaatheidkontroleskerm en ander instellings verskyn wanneer jou privaat ruimte gesluit word nie.\n\nJou privaat ruimte kan nie na ’n nuwe toestel geskuif word nie. Jy sal ’n ander privaat ruimte moet opstel as jy dit op ’n ander toestel wil gebruik.\n\nEnigiemand wat jou toestel aan ’n rekenaar koppel of skadelike apps op jou toestel installeer, sal moontlik toegang tot jou privaat ruimte kan kry."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privaat ruimtes is nie geskik vir apps, soos mediese apps, wat in die agtergrond moet werk of kritieke kennisgewings moet stuur nie. Dit is omdat kennisgewings en agtergrondaktiwiteit gestop word wanneer jou ruimte gesluit word.\n\nApps in jou privaat ruimte sal nie in toestemmingbestuurder, privaatheidkontroleskerm en ander instellings verskyn wanneer jou privaat ruimte gesluit word nie.\n\nJou privaat ruimte kan nie na ’n nuwe toestel geskuif word nie. Jy sal ’n ander ruimte moet opstel as jy dit op ’n ander toestel wil gebruik.\n\nEnigiemand wat jou toestel aan ’n rekenaar koppel of kwaadwillige apps op jou toestel installeer, sal moontlik toegang tot jou privaat ruimte kan kry."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Meer inligting oor privaat ruimte"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Dit sal ’n paar oomblikke neem"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Stel tans privaat ruimte op …"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Herbegin toestel?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Gedetailleerde NFC-loglêers is slegs vir ontwikkelingdoeleindes bedoel. Bykomende NFC-data is by foutverslae ingesluit, wat privaat inligting kan bevat. Herbegin jou toestel om hierdie instelling te verander."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Herbegin"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"weerspieël, eksterne skerm, gekoppelde skerm, usb-skerm, resolusie, rotasie"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotasie"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standaard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Gebruik skermsleutelbord"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Hou dit op die skerm terwyl fisieke sleutelbord aktief is"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Verander wyserinvulstyl na geel"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Verander wyserinvulstyl na pienk"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Verander wyserinvulstyl na blou"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Styl van wyser se haal"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Wit"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Swart"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Geen"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Gebruikergekose: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Spraak"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Wyserspoed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Wyserskaal"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Verklein wyserskaal"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Vergroot wyserskaal"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Speletjiekontroleerder"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Herlei vibrasie"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Stuur vibrasie na speletjiebeheerder wanneer dit gekoppel is"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Gaan in elk geval voort"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Kanselleer"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrotinginstellings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Beeldrol met een vinger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Skuif vergrootglas met 1 vinger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Sleep 1 vinger om op die skerm rond te beweeg"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Skuif die vergrotingarea deur een vinger te sleep."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Skuif die vergrotingarea deur twee vingers te sleep."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Onbeskikbaar terwyl net ’n deel van die skerm vergroot word"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tik op \'n knoppie om te zoem"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zoem vinnig op die skerm in om inhoud groter te maak"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Zoem só in:</b><br/> {0,number,integer}. Gebruik kortpad om vergroting te begin<br/> {1,number,integer}. Tik op die skerm<br/> {2,number,integer}. Sleep 2 vingers om op die skerm rond te beweeg<br/> {3,number,integer}. Knyp met 2 vingers om die zoem te verstel<br/> {4,number,integer}. Gebruik kortpad om vergroting te stop<br/><br/> <b>Zoem só tydelik in:</b><br/> {0,number,integer}. Maak seker dat jou vergrotingtipe op volskerm gestel is<br/> {1,number,integer}. Gebruik kortpad om vergroting te begin<br/> {2,number,integer}. Raak en hou enige plek op die skerm<br/> {3,number,integer}. Sleep vinger om op die skerm rond te beweeg<br/> {4,number,integer}. Lig vinger om vergroting te stop"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Zoem só in:</b><br/> {0,number,integer}. Gebruik kortpad om vergroting te begin<br/> {1,number,integer}. Tik op die skerm<br/> {2,number,integer}. Sleep 2 vingers om op die skerm rond te beweeg<br/> {3,number,integer}. Knyp met 2 vingers om die zoem te verstel<br/> {4,number,integer}. Gebruik kortpad om vergroting te stop<br/><br/> Jy kan ook tydelik en meer inzoem."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Zoem só in:</b><br/> {0,number,integer}. Gebruik kortpad om vergroting te begin<br/> {1,number,integer}. Tik op die skerm<br/> {2,number,integer}. Sleep 1 of 2 vingers om op die skerm rond te beweeg<br/> {3,number,integer}. Knyp met 2 vingers om die zoem te verstel<br/> {4,number,integer}. Gebruik kortpad om vergroting te stop<br/><br/> Jy kan ook tydelik en meer inzoem."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Wanneer vergroting aangeskakel is, kan jy op jou skerm inzoem.\n\n"<b>"Om te zoem"</b>", moet jy vergroting begin en dan op enige plek op die skerm tik.\n"<ul><li>"Sleep 2 of meer vingers om te rollees"</li>\n<li>"Knyp 2 of meer vingers om zoem te verstel"</li></ul>\n\n<b>"Om tydelik te zoem"</b>", moet jy vergroting begin en dan enige plek op die skerm raak en hou.\n"<ul><li>"Sleep om op die skerm rond te beweeg"</li>\n<li>"Lig jou vinger op om uit te zoem"</li></ul>\n\n"Jy kan nie op die sleutelbord of die navigasiebalk inzoem nie."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Bladsy <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> van <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Toeganklikheidknoppiekortpad"</string>
@@ -2182,7 +2207,7 @@
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"Kortpad van sluitskerm af"</string>
<string name="accessibility_shortcut_description" msgid="2184693606202133549">"Laat toe dat kenmerkkortpad van die sluitskerm af aangeskakel word. Hou albei volumesleutels \'n paar sekondes lank."</string>
<string name="accessibility_button_title" msgid="5251235485581552614">"Toeganklikheidknoppie"</string>
- <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"Toeganklikheidsknoppie en -gebaar"</string>
+ <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"Toeganklikheidknoppie en -gebaar"</string>
<string name="accessibility_button_intro_text" msgid="80993874471745687">"Kry van enige skerm af vinnig toegang tot toeganklikheidskenmerke"</string>
<string name="accessibility_button_about_title" msgid="3581116105084067926">"Meer oor toeganklikheidknoppie"</string>
<string name="accessibility_button_gesture_about_title" msgid="8468987303602865536">"Meer oor toeganklikheidknoppie en -gebaar"</string>
@@ -2194,7 +2219,7 @@
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Gebruik knoppie of gebaar"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Ligging"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Grootte"</string>
- <string name="accessibility_button_fade_title" msgid="8081993897680588829">"Verdof wanneer dit nie gebruik word nie"</string>
+ <string name="accessibility_button_fade_title" msgid="8081993897680588829">"Verdof wanneer nie gebruik word nie"</string>
<string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Verdof ná \'n paar sekondes sodat dit makliker is om jou skerm te sien"</string>
<string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Deursigtigheid wanneer nie gebruik word nie"</string>
<string name="accessibility_button_low_label" msgid="4193015407828927741">"Deursigtig"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 skedule gestel}other{# skedules gestel}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Moenie Steur Nie"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriteitmodusse"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Voeg ’n modus by"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Word net deur belangrike mense en apps in kennis gestel"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Kies aktiveringtipe"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tyd"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Bv. \"09:30-17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Bv. \"Persoonlike kalender\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Skep ’n modus"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Gepasmaak"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Beperk onderbrekings"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Skakel Moenie steur nie aan"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Wekkers en mediaklanke kan onderbreek"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Skedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Vee skedules uit"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Vee uit"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Hernoem"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Vee uit"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vee “<xliff:g id="MODE">%1$s</xliff:g>”-modus uit?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Wysig"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Skedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Skedule"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Voeg ’n kalender by"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Gebruik jou kalender"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Skedule"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Stel ’n skedule"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Skedule"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> uur, <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Skakel outomaties aan"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Skedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Maak foon op sekere tye stil"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Stel Moenie Steur Nie-reëls"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Laat onderbrekings wat klanke maak toe"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkeer visuele steurings"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Laat visuele tekens toe"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Kennisgewings wat jou kan bereik"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Bly gefokus"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Bykomende handelinge"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Af}=1{Af / 1 modus kan automaties aanskakel}other{Af / # modusse kan automaties aanskakel}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Vertooninstellings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Vertoon opsies"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grysskaal"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"aktiveer donkertema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Wissel die bedryfstelsel en apps om ligte teks op ’n donker agtergrond te verkies, wat makliker vir die oë kan wees en aansienlike batterybesparings op sekere toestelle bied"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Geen skermveranderinge nie}=1{{effect_1}}=2{{effect_1} en {effect_2}}=3{{effect_1}, {effect_2} en {effect_3}}other{{effect_1}, {effect_2}, en nog #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter onderbrekings"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Geen onderbrekings is gefilter nie"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Vertoon opsies vir gefiltreerde kennisgewings"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Wanneer Moenie Steur Nie aan is"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Geen klank van kennisgewings af nie"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"maak kennisgewing oop"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Laat toe dat kennisgewings gesluimer word"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Kennisgewingkol op appikoon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Kennisgewingbondels"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Borrels"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Borrels"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Laat hierdie gesprek in \'n borrel verskyn"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Hierdie program steun nie verbeterde instellings nie"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Meer instellings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Meer instellings is binne hierdie app beskikbaar"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Kennisgewingbedaring"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<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_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>
<string name="hide_unused_channels" msgid="2019739275175707170">"Versteek ongebruikte kategorieë"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps wat kan onderbreek"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Geselekteerde apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Geen"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alles"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Laat programme toe om te ignoreer"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Programme wat kan onderbreek"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Kies meer apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niks kan onderbreek nie"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kan onderbreek nie"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Sekere mense kan onderbreek"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alle mense kan onderbreek"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Herhaalbellers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Laat herhaalbellers toe"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Verandering aan wekkers vir slegs een uur tot {time}}other{Verandering aan wekkers vir slegs # uur tot {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Verander tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> na net wekkers"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Verander na onderbreek altyd"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Wysig modus"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Voeg modus by"</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="warning_button_text" msgid="1274234338874005639">"Waarskuwing"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Maak toe"</string>
<string name="device_feedback" msgid="5351614458411688608">"Stuur terugvoer oor hierdie toestel"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Houer"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Instellingspaneel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Dwangrekenaarmodus"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Verplig eksperimentele rekenaarmodus op sekondêre skerms"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktiveer vryevormvensters"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktiveer steun vir vryevormvensters."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktiveer vryevormvensters op tweede skerm"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktiveer vryevormvensters slegs op sekondêre skerm."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktiveer nieveranderbare grootte in multivenster"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Laat programme met nieveranderbare grootte toe in multivenster"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ignoreer gedwonge donkermodus"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Hierdie toestel se data-afdeling moet na ext4 omgeskakel word voordat die 16KB-ontwikkelaaropsie gebruik word. 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. Die aktivering van die 16KB-opsie sal daarna nog een herselflaai vereis. Sodra jy in hierdie modus is, kan jy heen en weer oorskakel tussen 4KB- en 16KB-modus met ’n enkele herselflaai. Sommige kenmerke sal gedeaktiveer word in hierdie modusse, so sommige apps sal dalk nie werk nie. Jy sal moet terugskakel na die 4KB-modus en dan die selflaaiprogram moet sluit wat ’n fabriekterugstelling op die toestel doen om die toestel na produksiemodus terug te neem. Jy moet die OEM-ontsluiting in Ontwikkelaaropsies deaktiveer nadat die toestel suksesvol in Android geselflaai het. Die toestel sal skoongevee word en die lêerstelsel sal ná bevestiging na ext4 verander word. Nadat dit voltooi is, moet jy terugkom om 16KB weer te aktiveer."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Vee alle data uit"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Kon nie herformateer en die data-afdeling na ext4 skoonvee nie."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Selflaaiprogram-ontsluiting word vir 16KB-modus vereis"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Ontsluiting van selflaaiprogram is nodig"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Hierdie toestel moet die selflaaiprogram ontsluit hê voordat die 16KB-ontwikkelaaropsie gebruik word. 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. Alle gebruikerdata en -instellings sal skoongevee word wanneer 16KB-modus geaktiveer word. Sodra die selflaaiprogram ontsluit is, sal die aktivering van die 16KB-opsie twee herselflaaie vereis. Sodra jy in hierdie modus is, kan jy heen en weer oorskakel tussen 4KB- en 16KB-modus met ’n enkele herselflaai. Sommige kenmerke sal gedeaktiveer word in hierdie modusse, so sommige apps sal dalk nie werk nie. Jy sal moet terugskakel na die 4KB-modus en dan die toestel moet sluit met die OEM/selflaaiprogramslot (wat ’n fabriekterugstelling op die toestel doen) om die toestel na produksiemodus terug te neem. Ontsluit asseblief die selflaaiprogram en probeer weer. Jy kan instruksies sien oor hoe om dit te doen by <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Gebruik 4KB-bladsy-agnostiese modus"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Jy is in die 4KB-modus van die bladsy-agnostiese 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 die selflaaiprogram van die toestel sluit om weer in die produksiemodus te gaan. Tik om meer te lees."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Jy is in die 4KB-modus van die bladsy-agnostiese 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> en kies “Vee toestel skoon”, “Sluit selflaaiprogram” en “Verpligflits alle afdelings”."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Gebruik 16KB-bladsy-agnostiese modus"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Jy is in die 16KB-modus van die bladsy-agnostiese 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 4K-modus en dan die selflaaiprogram van die toestel sluit om weer in die produksiemodus te gaan. Tik om meer te lees."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Jy is in die 16KB-modus van die bladsy-agnostiese 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 4K-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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> en kies “Vee toestel skoon”, “Sluit selflaaiprogram” en “Verpligflits alle afdelings”."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tik om meer te lees."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Foutverslaghanteerder"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Gebruik appvasspeld"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Gebruik ontwikkelaaropsies"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Gebruik drukdiens"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Laat veelvuldige gebruikers toe"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Laat gebruikerwisseling toe"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"laat toe, veelvuldig, gebruiker, baie"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"veelvuldige, gebruikers, profiele, mense, rekeninge, wissel, baie"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Gebruik draadlose ontfouting"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Kies wat jy op jou skerm sal sien wanneer jou tablet gedok is. Jou toestel kan meer energie gebruik wanneer ’n sluimerskerm gebruik word."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Pasmaak"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Pasmaak <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"\'n Herselflaai word vereis om vryevormsteun te aktiveer."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"\'n Herselflaai word vereis om rekenaarmodus vir sekondêre skerms te verplig."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"’n Herselflaai word vereis om steun vir vorige vryevormvensters te aktiveer."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"’n Herselflaai word vereis om steun vir vryevormvensters te verander."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"’n Herselflaai word vereis om vryevormvensters op sekondêre skerms te verplig."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Herselflaai nou"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Herselflaai later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Ruimtelike Oudio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aan"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Af"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aan"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Oudio %1$d%% links, %2$d%% regs"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Oudio %1$d%% regs, %2$d%% links"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Jou toestelnaam is sigbaar vir apps wat jy geïnstalleer het. Ander mense sal dit dalk ook kan sien as jy aan Bluetooth-toestelle koppel, aan ’n wi-fi-netwerk koppel, of ’n wi-fi-warmkol opstel."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatikale geslag"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Kies grammatikale geslag"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Soekinstellings"</string>
</resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 0380e61..7243712 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"የመኝታ ሰዓት"</item>
+ <item msgid="4152450357280759894">"በመንዳት ላይ"</item>
+ <item msgid="7096549258219399423">"መሳጭ"</item>
+ <item msgid="2760716776980432977">"የሚተዳደር"</item>
+ <item msgid="601734478369121764">"ኮከብ"</item>
+ <item msgid="6243809315432780521">"ቀን መቁጠሪያ"</item>
+ <item msgid="4913577903148415331">"ጊዜ"</item>
+ <item msgid="3653377604690057780">"ቲያትር"</item>
+ <item msgid="3843711267408385410">"አበባ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 5ba79e6..08cd64c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"የመሣሪያ ግንኙነት ይቋረጥ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"አዲስ መሣሪያ ያጣምሩ"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ብሉቱዝ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ነገ በራስ-ሰር ያብሩ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"የመስማት ችሎታ መሣሪያ ቅንብሮች"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"አቋራጭ፣ የመስሚያ ረዳት ተኳዃኝነት"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ቅድመ-ቅምጥ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"በኦዲዮሎጂስትዎ ፕሮግራም የተደረጉ ምንም ቅድመ-ቅምጦች የሉም"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ቅድመ-ቅምጥን ማዘመን አልተቻለም"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"የኦዲዮ ውጽዓት"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ስለኦዲዮ ውፅዓት"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ጠፍቷል"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{በርቷል / # መተግበሪያ የአካባቢ መዳረሻ አለው}one{በርቷል / # መተግበሪያ የአካባቢ መዳረሻ አለው}other{በርቷል / # መተግበሪያዎች የአካባቢ መዳረሻ አላቸው}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"በመጫን ላይ…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"በአቅራቢያ ያሉ የመሣሪያዎች ፈቃድ ያላቸው መተግበሪያዎች የተገናኙ መሣሪያዎችን አንጻራዊ አቀማመጥ ማወቅ ይችላሉ።"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"በአቅራቢያ ያሉ የመሣሪያዎች ፈቃድ ያላቸው መተግበሪያዎች የተገናኙ መሣሪያዎችን አንጻራዊ አቀማመጥ መወሰን ይችላሉ።"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ለመተግበሪያዎች እና ለአገልግሎቶች የአካባቢ መዳረሻ ጠፍቷል። ወደ የአደጋ ጊዜ ቁጥር ሲደውሉ ወይም የጽሑፍ መልዕክት ሲልኩ የመሣሪያዎ አካባቢ አሁንም ወደ የድንገተኛ ጊዜ አደጋ ምላሽ ሰጪዎች ሊላክ ይችላል።"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ስለ የአካባቢ ቅንብሮች የበለጠ ይወቁ"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ለመለወጥ ወደ ChromeOS ቅንብሮች > ግላዊነት እና ደህንነት > የግላዊነት ቁጥጥሮች > የቦታ መዳረሻ ይሂዱ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"መልክ እና <xliff:g id="WATCH">%s</xliff:g> ታክለዋል"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"መልክ፣ የጣት አሻራ እና <xliff:g id="WATCH">%s</xliff:g> ታክለዋል"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"መልክ፣ የጣት አሻራዎች እና <xliff:g id="WATCH">%s</xliff:g> ታክለዋል"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"የማንነት ፍተሻ ስለበራ ይህ ያስፈልጋል"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"የርቀት መቆጣጠሪያ ማረጋገጫ ተከፍቷል"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"የእጅ ሰዓት ታክሏል"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"የእጅ ሰዓትዎን ያዋቅሩ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ስለ በእጅ ሰዓት መክፈቻ የበለጠ ይወቁ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"የእጅ ሰዓትን አክል"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"የእጅ ሰዓትን አስወግድ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"የጣት አሻራ እና በመልክ መክፈት"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"በመልክ እና በጣት አሻራ መክፈት"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"በመልክ እና በጣት አሻራ መክፈቻ ለሥራ"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ውቅረት ያስፈልጋል"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"መልክ እና የጣት አሻራዎች ታክለዋል"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"መተግበሪያዎችን ይጫኑ"</b>\n"በቦታዎ ውስጥ የግል አድርገው ማቆየት የሚፈልጓቸውን መተግበሪያዎች ይጫኑ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ከግምት ውስጥ ያስገቡ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"እርስዎ ቦታዎን ሲቆልፉ መተግበሪያዎች ይቆማሉ"</b>\n"ቦታዎን ሲቆልፉ በቦታዎ ውስጥ ያሉ መተግበሪያዎች ይቆማሉ እና እርስዎ ከእነሱ ማሳወቂያዎች አይደርሱዎትም"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"የግል ቦታዎች እንደ የህክምና መተግበሪያዎች ያሉ ዳራ ውስጥ መሄድ ላለባቸው ወይም ወሳኝ ማሳወቂያዎች መላክ ላለባቸው መተግበሪያዎች ተሰማሚ አይደሉም። ይህ የሆነው ቦታዎ ሲቆለፍ ማሳወቂያዎች እና የዳራ እንቅስቃሴ ስለሚቆሙ ነው።\n\nየእርስዎ የግል ቦታ ሲቆለፍ የግል ቦታዎ ውስጥ ያሉ መተግበሪያዎች የፍቃድ አስተዳዳሪ፣ የግላዊነት ዳሽቦርድ እና ሌሎች ቅንብሮች ላይ አይታዩም።\n\nየግል ቦታዎ ወደ አዲስ መሣሪያ መንቀሳቀስ አይችልም። እሱን በሌላ መሣሪያ ላይ መጠቀም ከፈለጉ ሌላ የግል ቦታን ማዋቀር ያስፈልግዎታል።\n\nመሣሪያዎን ከኮምፒውተር ጋር የሚያገናኙ ወይም በመሣሪያዎ ላይ ጎጂ መተግበሪያዎችን የሚጭኑ ማንኛውም ሰው የእርስዎን የግል ቦታ ሊደርሱ ይችላሉ።"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"የግል ቦታዎች እንደ የህክምና መተግበሪያዎች ያሉ ዳራ ውስጥ መሄድ ላለባቸው ወይም ወሳኝ ማሳወቂያዎች መላክ ላለባቸው መተግበሪያዎች ተሰማሚ አይደሉም። ይህ የሆነው ቦታዎ ሲቆለፍ ማሳወቂያዎች እና የዳራ እንቅስቃሴ ስለሚቆሙ ነው።\n\nየእርስዎ የግል ቦታ ውስጥ ያሉ መተግበሪያዎች የግል ቦታ ሲቆለፍ የፍቃድ አስተዳዳሪ፣ የግላዊነት ዳሽቦርድ እና ሌሎች ቅንብሮች ውስጥ አይታዩም።\n\nየእርስዎ የግል ቦታ ወደ አዲስ መሣሪያ መመለስ አይችልም። እሱን ሌላ መሣሪያ ላይ መጠቀም ከፈለጉ ሌላ ቦታ ማዋቀር ይኖርብዎታል።\n\nመሣሪያዎን ከኮምፒውተር ጋር የሚያገናኙ ወይም በመሣሪያዎ ላይ ተንኮል-አዘል መተግበሪያዎችን የሚጭኑ ማንኛውም ሰው የግል ቦታዎን ሊደርሱ ይችላሉ።"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ስለግል ቦታ የበለጠ ይወቁ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ይህ ጥቂት ጊዜ ይወስዳል"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"የግል ቦታን በማዋቀር ላይ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"መሣሪያ እንደገና ይጀምር?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ዝርዝር የኤንኤፍሲ ምዝግብ ማስታወሻ ለግንባታ ዓላማዎች ብቻ የታሰበ ነው። በሳንካ ሪፖርቶች ውስጥ የግል መረጃን ሊይዝ የሚችል ተጨማሪ የኤንኤፍሲ ውሂብ ተካትቷል። ይህን ቅንብር ለመለወጥ መሣሪያዎን እንደገና ያስጀምሩ።"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ዳግም አስጀምር"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"አንጸባርቅ፣ ውጫዊ ማሳያ፣ የተገናኘ ማሳያ፣ USB ማሳያ፣ ጥራት፣ ማዞር"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ማዞር"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"መደበኛ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"የማያ ገፅ የቁልፍ ሰሌዳ ይጠቀሙ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"አካላዊ የቁልፍ ሰሌዳ ገቢር ሆኖ ሳለ በማያ ገፅ ላይ አቆየው"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"የጠቋሚ ሙሌት ቅጥን ወደ ቢጫ ይለውጡ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"የጠቋሚ ሙሌት ቅጥን ወደ ሮዝ ይለውጡ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"የጠቋሚ ሙሌት ቅጥን ወደ ሰማያዊ ይለውጡ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"የጠቋሚ ጭረት ቅጥ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ነጭ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ጥቁር"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ምንም"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"የተመረጠው ተጠቃሚ፦ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ንግግር"</string>
<string name="pointer_speed" msgid="7398649279282675718">"የጠቋሚ ፍጥነት"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"የጠቋሚ መለኪያ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"የጠቋሚ መለኪያን ይቀንሱ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"የጠቋሚ መለኪያን ይጨምሩ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"የጨዋታ መቆጣጠሪያ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ንዝረትን አዙር"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ሲገናኝ ንዝረትን ወደ የጨዋታ መቆጣጠሪያ ላክ"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ለማንኛውም ቀጥል"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ይቅር"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"የማጉያ ቅንብሮች"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"በአንድ ጣት መጎተት"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ማጉያን በ1 ጣት ያንቀሳቅሱ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"በማያ ገጹ አካባቢ ለመንቀሳቀስ 1 ጣት ይጎትቱ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"አንድ ጣትን በመጎተት የማጉያ ቦታውን ያንቀሳቅሱ።"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ሁለት ጣቶችን በመጎተት የማጉያ ቦታውን ያንቀሳቅሱ።"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"የተወሰነ የማያ ገጹን ክፍል ብቻ በማጉላት ላይ ሳለ አይገኝም"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ለማጉላት አንድ አዝራር መታ ያድርጉ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ይዘቱን ትልቅ ለማድረግ በፍጥነት በማያ ገጹ ላይ ያጉሉ"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ለማጉላት፦</b><br/> {0,number,integer}. ማጉላትን ለመጀመር አቋራጭ ይጠቀሙ<br/> {1,number,integer}. በማያ ገፅ ላይ መታ ያድርጉ<br/> {2,number,integer}. በማያ ገጹ ዙሪያ ላይ ለመንቀሳቀስ በ2 ጣቶች ይጎትቱ<br/> {3,number,integer}. ማጉላትን ለማስተካከል በ2 ጣቶች ይቆንጥጡ<br/> {4,number,integer}. ማጉላትን ለማስቆም አቋራጭ ይጠቀሙ<br/><br/> <b>ለጊዜው ለማጉላት፡-</b><br/> {0,number,integer}. የእርስዎ የማጉላት ዓይነት ወደ ሙሉ ማያ ገፅ መቀናበሩን ያረጋግጡ<br/> {1,number,integer}. ማጉላትን ለመጀመር አቋራጭ ይጠቀሙ<br/> {2,number,integer}. በማያ ገጹ ማንኛውም ቦታ ላይ ነክተው ይያዙ<br/> {3,number,integer}. በማያ ገጹ ዙሪያ ላይ ለመንቀሳቀስ በጣት ይጎትቱ<br/> {4,number,integer}. ማጉላትን ለማስቆም ጣት ያንሱ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ለማጉላት፦</b><br/> {0,number,integer}። ማጉላትን ለመጀመር አቋራጭ ይጠቀሙ<br/> {1,number,integer}። በማያ ገጽ ላይ መታ ያድርጉ<br/> {2,number,integer}። በማያ ገፁ ዙሪያ ለመንቀሳቀስ 2 ጣቶች ይጎትቱ<br/> {3,number,integer}። ማጉላትን ለማስተካከል በ2 ጣቶች ይቆንጥጡ<br/> {4,number,integer}። ማጉላት ለማቆም አቋራጭ ይጠቀሙ<br/><br/> እንዲሁም በጊዜያዊነት ማጉላት እና ሌሎችንም ማድረግ ይችላሉ።"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ለማጉላት፦</b><br/> {0,number,integer}። ማጉላትን ለመጀመር አቋራጭ ይጠቀሙ<br/> {1,number,integer}። በማያ ገጽ ላይ መታ ያድርጉ<br/> {2,number,integer}። በማያ ገፁ ዙሪያ ለመንቀሳቀስ 1 ወይም 2 ጣቶች ይጎትቱ<br/> {3,number,integer}። ማጉላትን ለማስተካከል በ2 ጣቶች ይቆንጥጡ<br/> {4,number,integer}። ማጉላት ለማቆም አቋራጭ ይጠቀሙ<br/><br/> እንዲሁም በጊዜያዊነት ማጉላት እና ሌሎችንም ማድረግ ይችላሉ።"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ማጉያ ሲበራ ማያ ገጽዎን ማጉላት ይችላሉ።\n\n"<b>"ለማጉላት"</b>"፣ ማጉያን ያስጀምሩ፣ ከዚያ በማያ ገጹ ማንኛውም ክፍል ላይ መታ ያድርጉ።\n"<ul><li>"ለማሸብለል 2 ወይም ተጨማሪ ጣቶችን ይጎትቱ"</li>\n<li>"ማጉላትን ለማስተካከል በ2 ወይም ተጨማሪ ጣቶችን ይቆንጥጡ"</li></ul>\n\n<b>"ለጊዜው ለማጉላት"</b>"፣ ማጉላትን ይጀምሩ፣ በመቀጠል በማያ ገጹ ላይ በማናቸውም ቦታ ላይ ነካ ያድርጉ እና ይያዙ።\n"<ul><li>"በማያ ገጹ ላይ ለማንቀሳቀስ ይጎትቱ"</li>\n<li>"ከማጉላት ለመውጣት ጣትን ያንሡ"</li></ul>\n\n"ቁልፍ ሰሌዳውን ወይም የአሰሳ አሞሌውን ማጉላት አይችሉም።"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"ገፅ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ከ<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"የተደራሽነት አዝራር አቋራጭ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ምንም}=1{1 መርሐግብር ተቀናብሯል}one{# መርሐግብሮች ተቀናብረዋል}other{# መርሐግብሮች ተቀናብረዋል}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"አይረብሹ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ቅድሚያ ሁነታዎች"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ሁነታ ያክሉ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"በአስፈላጊ ሰዎች እና መተግበሪያዎች ብቻ ማሳወቂያን ያግኙ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"የማግበሪያ ዓይነት ይምረጡ"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ጊዜ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ለምሳሌ «9:30 – 5:00 ከሰዓት»"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ቀን መቁጠሪያ"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ለምሳሌ «የግል ቀን መቁጠሪያ»"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ሁነታ ይፍጠሩ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ብጁ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"መቆራረጦችን ይገድቡ"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"አትረብሽን አብራ"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ማንቂያዎች እና የሚዲያ ድምፆች ሊያቋርጡ ይችላሉ"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"መርሐግብሮች"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"መርሐግብሮችን ሰርዝ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ሰርዝ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"እንደገና ሰይም"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ሰርዝ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"«<xliff:g id="MODE">%1$s</xliff:g>» ሁነታ ይሰረዝ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"አርትዕ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"መርሐግብሮች"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"መርሐግብር"</string>
@@ -3340,6 +3379,7 @@
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"መርሐግብር ያቀናብሩ"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"መርሐግብር"</string>
<string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ሰዓት፣ <xliff:g id="MINUTES">%2$d</xliff:g> ደ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"በራስ-ሰር አብራ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"መርሐግብር"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"በተወሰኑ ሰዓታት ላይ የስልክ ድምፅ አጥፋ"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"የአትረብሽ ደንቦችን ያቀናብሩ"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ድምፅ የሚፈጥሩ ረብሻዎችን ፍጠር"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ምስላዊ ረብሻዎችን አግድ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ምስላዊ ምልክቶችን ፍቀድ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"እርስዎ ጋር መድረስ የሚችሉ ማሳወቂያዎች"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"እንዳተኮሩ ይቆዩ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"ተጨማሪ እርምጃዎች"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ጠፍቷል}=1{ጠፍቷል / 1 ሁነታ በራስ-ሰር መብራት ይችላል}one{ጠፍቷል / # ሁነታ በራስ-ሰር መብራት ይችላል}other{ጠፍቷል / # ሁነታዎች በራስ-ሰር መብራት ይችላሉ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"የማሳያ ቅንብሮች"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"የማሳያ አማራጮች"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ግርጥነት"</string>
@@ -3366,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ጥቁር ገጽታ አንቃ"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"በጨለማ ዳራ ላይ ብርሃን ጽሁፍን ለመምረጥ ሥርዓተ ክወናውን እና መተግበሪያዎችን ይቀይሩ፣ ይህም ለዓይኖች ቀላል እና በአንዳንድ መሣሪያዎች ላይ ጉልህ የሆነ የባትሪ ኃይል ቁጠባ ይሰጣል"</string>
<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}}one{{effect_1}፣ {effect_2} እና # ተጨማሪ}other{{effect_1}፣ {effect_2} እና # ተጨማሪ}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"የማጣሪያ መቆራረጦች"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ምንም መቆራረጦች አልተጣሩም"</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>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ማሳወቂያን ክፈት"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"የማሳወቂያ ማሸለብን ፍቀድ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"የማሳወቂያ ነቁጥ በመተግበሪያ አዶ ላይ"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"የማሳወቂያ ቅርቅቦች"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"አረፋዎች"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"አረፋዎች"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ይህን ውይይት በአረፋ አድርግ"</string>
@@ -3610,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ይህ መተግበሪያ የተሻሻሉ ቅንብሮችን አይደግፍም"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ተጨማሪ ቅንብሮች"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"በዚህ መተግበሪያ ውስጥ ተጨማሪ ቅንብሮች ይገኛሉ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"የማሳወቂያ ረጋ ማለት"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"የሥራ መገለጫዎች ላይ ይተግብሩ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ለሥራ መገለጫ መተግበሪያዎች ያመልክቱ"</string>
@@ -3662,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ምድቦች"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ሌላ"</string>
<string name="no_channels" msgid="4716199078612071915">"ይህ መተግበሪያ ምንም ማሳወቂያዎችን አልለጠፈም"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ጥቅም ላይ ያልዋሉ ምድቦችን አሳይ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"በመተግበሪያው ውስጥ ያሉ ተጨማሪ ቅንብሮች"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ጥቅም ላይ ያልዋሉ ምድቦችን አሳይ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ጥቅም ላይ ያልዋሉ ምድቦችን ደብቅ"</string>
@@ -3770,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"አቋርጠው መግባት የሚችሉ መተግበሪያዎች"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"የተመረጡ መተግበሪያዎች"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ምንም"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ሁሉም"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"መተግበሪያዎች እንዲሽሩ ይፍቀዱ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"አቋርጠው መግባት የሚችሉ መተግበሪያዎች"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ተጨማሪ መተግበሪያዎችን ይምረጡ"</string>
@@ -3788,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ምንም ማቋረጥ አይችልም"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ማንም ማቋረጥ አይችልም"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"አንዳንድ ሰዎች ማቋረጥ ይችላሉ"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ሁሉም ሰዎች ማቋረጥ ይችላሉ"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ደዋዮችን ድገም"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ተደጋጋሚ ደዋዮችን ፍቀድ"</string>
@@ -3807,9 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{እስከ {time} ድረስ ለአንድ ሰዓት ብቻ ወደ ማንቂያዎች ይለውጡ}one{እስከ {time} ድረስ ለ# ሰዓት ብቻ ወደ ማንቂያዎች ይለውጡ}other{እስከ {time} ድረስ ለ# ሰዓታት ብቻ ወደ ማንቂያዎች ይለውጡ}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"እስከ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ድረስ ብቻ ወደ ማንቂያዎች ይቀይሩ"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ወደ ሁልጊዜ አቋርጥ ለውጥ"</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"እንደገና ሰይም"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"አዶ ለውጥ"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"አዶ ለውጥ"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"የአርትዖት ሁነታ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"የአክል ሁነታ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ብጁ ሁነታ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"የሁነታ ስም"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ማስጠንቀቂያ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ዝጋ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
@@ -4795,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"የዴስክቶፕ ሁነታን አስገድድ"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"በሁለተኛ ማሳያዎች ላይ የሙከራ ዴስክቶፕ ሁነታን አስገድድ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"የነጻ ቅርጽ መስኮቶችን ያንቁ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"የነጻ ቅርጽ መስኮቶች ድጋፍ ያንቁ።"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"በሁለተኛ ማሳያ ላይ የነጻ ቅርጽ በመስኮት ማሳየትን አንቃ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"የነጻ ቅርጽ መስኮቶችን በሁለተኛ ማሳያ ላይ ብቻ አንቃ።"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"በብዝሃ-መስኮት ውስጥ መጠን መቀየር የማይቻለውን አንቃ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"መጠን መቀየር የማይቻሉትን መተግበሪያዎች በብዝሃ-መስኮት ውስጥ እንዲሆኑ ይፈቅዳል"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"አስገዳጅ ጨለማን ሻር"</string>
@@ -4864,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"የ16 ኪባ ገንቢ አማራጭን ከመጠቀምዎ በፊት የዚህ መሣሪያ የውሂብ ክፍልፍል ወደ ext4 መቀየር አለበት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። የ16 ኪባ አማራጩን ማግበር ከዚህ በኋላ አንድ ተጨማሪ ዳግም ማስነሳት ያስፈልገዋል። አንዴ በዚህ ሁነታ ላይ ከሆኑ፣ በአንድ ዳግም ማስነሳት ከ4 ኪባ ወደ 16 ኪባ ሁነታ መካከል መቀያየር ይችላሉ። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። መሣሪያውን ወደ የምርት ሁነታ መመለስ እንዲችሉ ወደ የ4 ኪባ ሁነታ መመለስ እና bootloaderን መቆለፍ ይኖርብዎታል፣ ይህም መሣሪያውን ወደ ፋብሪካ ዳግም ያስጀምረዋል። መሣሪያው በተሳካ ሁኔታ ወደ Android ከተነሳ በኋላ በገንቢ አማራጮች ውስጥ የOEM መክፈቻን ያሰናክሉ። መሣሪያው ይጠረጋል እና የፋይል ሥርዓቱ ከተረጋገጠ በኋላ ወደ ext4 ይቀየራል። ይህ ከተጠናቀቀ በኋላ እባክዎ 16 ኪባን እንደገና ለማንቃት ይመለሱ።"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ሁሉንም ውሂብ ደምስስ"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ቅርጸት መሥራት እና የውሂብ ክፍልፋይን ወደ ext4 መጥረግ አልተሳካም።"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"ለ16 ኪባ ሁነታ bootloader ክፍት መሆን አለበት"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"በBootloader መክፈት ያስፈልጋል"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"ይህ መሣሪያ የ16 ኪባ ገንቢ አማራጩን ከመጠቀሙ በፊት bootloaderን መክፈት አለበት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። የ16 ኪባ ሁነታ ሲነቃ ሁሉም የተጠቃሚ ውሂብ እና ቅንብሮች ይጠረጋሉ። አንዴ bootloader ከተከፈተ በኋላ የ16 ኪባ አማራጩን ለማንቃት ሁለት ዳግም ማስነሳት ያስፈልገዋል። አንዴ በዚህ ሁነታ ላይ ከሆኑ፣ በአንድ ዳግም ማስነሳት ከ4 ኪባ ወደ 16 ኪባ ሁነታ መካከል መቀያየር ይችላሉ። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። መሣሪያውን ወደ የምርት ሁነታ መመለስ እንዲችሉ ወደ የ4 ኪባ ሁነታ መመለስ እና OEM/bootloader መቆለፍ ይኖርብዎታል፣ ይህም መሣሪያውን ወደ (ፋብሪካ ዳግም ያስጀምረዋል)። እባክዎ bootloaderን ይክፈቱ እና እንደገና ይሞክሩ። <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> ላይ ይህንን እንዴት እንደሚያደርጉ መመሪያዎችን ማየት ይችላሉ"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"የ4 ኪባ ለሁሉም ገጽ ተስማሚ ሁነታን በመጠቀም ላይ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"የሁሉም ገጽ ተስማሚ ሁነታ 4 ኪባ ሁነታ ውስጥ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት የመሣሪያውን bootloader መቆለፍ አለብዎት። የበለጠ ለማንበብ መታ ያድርጉ።"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"የሁሉም ገጽ ተስማሚ ሁነታ 4 ኪባ ሁነታ ውስጥ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት የመሣሪያውን bootloader መቆለፍ አለብዎት። ይህ መሣሪያውን ወደ የፋብሪካ ዳግም ያስጀምረዋል እና የምርት ቅንብሮችን ወደነበሩበት ይመልሳል። መሣሪያው በተሳካ ሁኔታ ወደ Android ከተነሳ በኋላ በገንቢ አማራጮች ውስጥ የOEM መክፈቻን ያሰናክሉ። መሣሪያው ወደ Android መነሳት ካልቻለ ወይም ያልተረጋጋ ከሆነ መሣሪያውን <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/ምስሎች</a> በመጡ የቅርብ ጊዜዎቹ የፋብሪካ ምስሎች ዳግም ፍላሽ ያድርጉት ወይም <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ይጠቀሙ እና «መሣሪያን ጥረግ»፣ «Bootloaderን ቆልፍ» እና «የሁሉንም ክፍልፋዮች ፍላሽ አስገድድ» የሚለውን ይምረጡ።"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"የ16 ኪባ ለሁሉም ገጽ ተስማሚ ሁነታን በመጠቀም ላይ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"የሁሉም ገጽ ተስማሚ ሁነታው የ16 ኪባ ሁነታ ላይ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት ወደ የ4 ኪባ ሁነታ መመለስ እና ከዚያ የመሣሪያውን bootloader መቆለፍ አለብዎት። የበለጠ ለማንበብ መታ ያድርጉ።"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"የሁሉም ገጽ ተስማሚ ሁነታው የ16 ኪባ ሁነታ ላይ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም መረጃ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎችላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት ወደ የ4 ኪባ ሁነታ መመለስ እና ከዚያ የመሣሪያውን bootloader መቆለፍ አለብዎት። ይህ መሣሪያውን ወደ የፋብሪካ ዳግም ያስጀምረዋል እና የምርት ቅንብሮችን ወደነበሩበት ይመልሳል። መሣሪያው በተሳካ ሁኔታ ወደ Android ከተነሳ በኋላ በገንቢ አማራጮች ውስጥ የOEM መክፈቻን ያሰናክሉ። መሣሪያው ወደ Android መነሳት ካልቻለ ወይም ያልተረጋጋ ከሆነ መሣሪያውን <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/ምስሎች</a> በመጡ የቅርብ ጊዜዎቹ የፋብሪካ ምስሎች ዳግም ፍላሽ ያድርጉት ወይም <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ይጠቀሙ እና «መሣሪያን ጥረግ»፣ «Bootloaderን ቆልፍ» እና «የሁሉንም ክፍልፋዮች ፍላሽ አስገድድ» የሚለውን ይምረጡ።"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"የገጽ-አግኖስቲክ ሁነታ የ16 ኪባ ሁነታ ላይ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም ውሂብ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎች ላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት ወደ የ4ኪባ ሁነታ መመለስ እና ከዚያ የመሣሪያውን bootloader መቆለፍ አለብዎት። የበለጠ ለማንበብ መታ ያድርጉ።"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"የገጽ-አግኖስቲክ ሁነታ የ16 ኪባ ሁነታ ላይ ነዎት። የሶፍትዌር ታማኝነት በዚህ ሁነታ ሊረጋገጥ አይችልም፣ እና bootloader ክፍት ሆኖ ሳለ በስልኩ ላይ የተከማቸ ማንኛውም ውሂብ ለአደጋ ሊጋለጥ ይችላል። አንዳንድ ባህሪያት በእነዚህ ሁነታዎች ላይ ይሰናከላሉ፣ ስለዚህ አንዳንድ መተግበሪያዎች ላይሰሩ ይችላሉ። ወደ የምርት ሁነታ እንደገና ለመግባት ወደ የ4ኪባ ሁነታ መመለስ እና ከዚያ የመሣሪያውን bootloader መቆለፍ አለብዎት። ይህ መሣሪያውን ወደ የፋብሪካ ዳግም ያስጀምረዋል እና የምርት ቅንብሮችን ወደነበሩበት ይመልሳል። መሣሪያው በተሳካ ሁኔታ ወደ Android ከተነሳ በኋላ በገንቢ አማራጮች ውስጥ የOEM መክፈቻን ያሰናክሉ። መሣሪያው ወደ Android መነሳት ካልቻለ ወይም ያልተረጋጋ ከሆነ መሣሪያውን ከ<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> በመጡ የቅርብ ጊዜዎቹ የፋብሪካ ምስሎች ዳግም ፍላሽ ያድርጉት ወይም <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ይጠቀሙ እና «መሣሪያን ጥረግ»፣ «Bootloaderን ቆልፍ» እና «የሁሉንም ክፍልፋዮች ፍላሽ አስገድድ» የሚለውን ይምረጡ።"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"የ16 ኪባ ለሁሉም ገጽ ተስማሚ ሁነታ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ተጨማሪ ያንብቡ"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"የሳንካ ሪፖርት ተቆጣጣሪ"</string>
@@ -5003,14 +5056,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"መተግበሪያን መሰካትን ይጠቀሙ"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"የገንቢ አማራጮችን ይጠቀሙ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"የህትመት አገልግሎትን ይጠቀሙ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"በርካታ ተጠቃሚዎችን ይፍቀዱ"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"የተጠቃሚ መቀያየርን ይፍቀዱ"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ፍቀድ፣ በርካታ፣ ተጠቃሚ፣ ፈቃድ፣ ብዙ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ብዙ፣ ተጠቃሚዎች፣ መገለጫዎች፣ ሰዎች፣ መለያዎች፣ መቀየሪያ፣ በርካታ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ገመድ አልባ ማረምን ይጠቀሙ"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"የግራፊክስ ነጂ አማራጮችን ይጠቀሙ"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"የምሽት ብርሃንን ይጠቀሙ"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"ኤንኤፍሲን ይጠቀሙ"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"ተለዋዋጭ ብሩህነትን ይጠቀሙ"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"ተለማማጅ ብሩህነትን ይጠቀሙ"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"የWi‑Fi ጥሪ ማድረጊያን ይጠቀሙ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ሁሉንም መተግበሪያዎች ይመልከቱ"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"ብልህ ማስተላለፍ"</string>
@@ -5117,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ጡባዊዎ ሲተከል በማያ ገፅዎ ላይ የሚያዩትን ይምረጡ። የማያ ገፅ ማቆያ ሥራ ላይ ሲውል መሣሪያዎ የበለጠ ኃይል ሊጠቀም ይችላል።"</string>
<string name="customize_button_title" msgid="1110284655990203359">"አብጅ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> አብጅ"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"የነጻ ቅርጽ ድጋፍን ለማንቃት ዳግም ማስነሳት ያስፈልጋል።"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"የዴስክቶፕ ሁነታን በሁለተኛ ደረጃ ማሳያዎች ላይ ለማስገደድ ዳግም ማስነሳት ያስፈልጋል።"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"የቆየ በነጻ ቅርጽ በመስኮት የማሳየት ድጋፍን ለማንቃት ዳግም ማስነሳት ያስፈልጋል።"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"የነጻ ቅርጽ በመስኮት የማሳየት ድጋፍን ለመለወጥ ዳግም ማስነሳት ያስፈልጋል።"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"በሁለተኛ ማሳያዎች ላይ የነጻ ቅርጽ በመስኮት ማሳየትን ለማስገደድ ዳግም ማስነሳት ያስፈልጋል።"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ዳግም አስነሳ"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"በኋላ ዳግም አስነሳ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ከባቢያዊ ኦዲዮ"</string>
@@ -5236,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"በርቷል"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ጠፍቷል"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"በርቷል"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ኦዲዮ %1$d%% ግራ፣ %2$d%% ቀኝ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ኦዲዮ %1$d%% ቀኝ፣ %2$d%% ግራ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"የመሣሪያዎ ስም በጫኗቸው መተግበሪያዎች ላይ ይታያል። እንዲሁም ከብሉቱዝ መሣሪያዎች ጋር ሲገናኙ፣ ከWi-Fi አውታረ መረብ ሲገናኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያዋቅሩ በሌሎች ሰዎች ሊታይ ይችላል።"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ሰዋሰዋዊ ጾታ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ሰዋሰዋዊ ጾታ ይምረጡ"</string>
@@ -5347,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ቅንብሮች ውስጥ ይፈልጉ"</string>
</resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 31c9970..10b3977 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"وقت النوم"</item>
+ <item msgid="4152450357280759894">"القيادة"</item>
+ <item msgid="7096549258219399423">"تجربة غامرة"</item>
+ <item msgid="2760716776980432977">"تجربة مُدارة"</item>
+ <item msgid="601734478369121764">"نجمة"</item>
+ <item msgid="6243809315432780521">"التقويم"</item>
+ <item msgid="4913577903148415331">"الوقت"</item>
+ <item msgid="3653377604690057780">"مسرح"</item>
+ <item msgid="3843711267408385410">"زهرة"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9c40d2e..2e9efc0 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"هل تريد قطع الاتصال بالجهاز؟"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"إقران جهاز جديد"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوتوث"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"التفعيل تلقائيًا غدًا"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"إعدادات سماعات الأذن الطبية"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"الاختصار، التوافق مع السماعات الطبية"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"الإعدادات المسبقة"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"لا يوجد أي إعداد مسبق مُبرمج من قِبَل أخصائي السمعيات"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"تعذَّر تعديل الإعداد المسبق"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"مصدر إخراج الصوت"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"لمحة عن إخراج الصوت"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"خدمة الموقع الجغرافي غير مفعّلة."</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{الخدمة مفعّلة - يملك تطبيق واحد إذن الوصول إلى بيانات الموقع الجغرافي}zero{الخدمة مفعّلة - يملك # تطبيق إذن الوصول إلى بيانات الموقع الجغرافي}two{الخدمة مفعّلة - يملك تطبيقان إذن الوصول إلى بيانات الموقع الجغرافي}few{الخدمة مفعّلة - تملك # تطبيقات إذن الوصول إلى بيانات الموقع الجغرافي}many{الخدمة مفعّلة - يمتلك # تطبيقًا إذن الوصول إلى بيانات الموقع الجغرافي}other{الخدمة مفعّلة - يملك # تطبيق إذن الوصول إلى بيانات الموقع الجغرافي}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"جارٍ التحميل..."</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"يمكن للتطبيقات التي لديها إذن بالوصول إلى الأجهزة المجاورة تحديد الموضع النسبي للأجهزة المتصلة بجهازك."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"يمكن للتطبيقات التي لديها إذن بالوصول إلى الأجهزة المجاورة تحديد الموضع النسبي للأجهزة المتصلة بجهازك."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ميزة وصول التطبيقات والخدمات إلى الموقع الجغرافي غير مفّعلة. قد يستمر إرسال الموقع الجغرافي لجهازك إلى مسؤولي الاستجابة لحالات الطوارئ عند الاتصال برقم طوارئ أو مراسلته نصيًا."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"مزيد من المعلومات حول إعدادات الموقع الجغرافي"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"لتغيير الإعداد، انتقِل إلى \"إعدادات ChromeOS\" > \"الخصوصية والأمان\" > \"عناصر التحكّم في الخصوصية\" > \"الوصول إلى الموقع الجغرافي\""</string>
@@ -299,14 +299,14 @@
<string name="safety_center_summary" msgid="3554867379951053869">"أمان التطبيقات، وقَفل الجهاز، والأذونات"</string>
<string name="security_settings_face_preference_summary" msgid="6675126437396914838">"تمت إضافة وجه"</string>
<string name="security_settings_face_preference_summary_none" msgid="523320857738436024">"يجب إعداد الميزة"</string>
- <string name="security_settings_face_preference_title" msgid="2126625155005348417">"فتح الجهاز بالتعرف على الوجه"</string>
- <string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"فتح قفل ملف العمل بالتعرّف على الوجه"</string>
- <string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"كيفية إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
- <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="security_settings_face_preference_title" msgid="2126625155005348417">"فتح الجهاز ببصمة الوجه"</string>
+ <string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"فتح قفل ملف العمل ببصمة الوجه"</string>
+ <string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"كيفية إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
+ <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
<string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استخدام وجهك للمصادقة"</string>
<string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
<string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"بدء"</string>
- <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="2965952386172202665">"إذا تم إيقاف ميزة \"فتح الجهاز بالتعرف على الوجه\" السهلة الاستخدام، قد لا تعمل بعض خطوات الإعداد بشكل سليم باستخدام TalkBack."</string>
+ <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="2965952386172202665">"إذا تم إيقاف ميزة \"فتح الجهاز ببصمة الوجه\" السهلة الاستخدام، قد لا تعمل بعض خطوات الإعداد بشكل سليم باستخدام TalkBack."</string>
<string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"رجوع"</string>
<string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"مواصلة الإعداد"</string>
<string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"استخدام إعدادات \"سهولة الاستخدام\""</string>
@@ -317,7 +317,7 @@
<string name="security_settings_face_enroll_introduction_agree" msgid="6319476573697497750">"أوافق"</string>
<string name="security_settings_face_enroll_introduction_more" msgid="1970820298889710532">"المزيد"</string>
<string name="security_settings_face_enroll_introduction_title" msgid="7061610077237098046">"فتح القفل باستخدام وجهك"</string>
- <string name="security_settings_face_enroll_consent_introduction_title" msgid="3942331854413767814">"السماح بـ \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="security_settings_face_enroll_consent_introduction_title" msgid="3942331854413767814">"السماح بـ \"فتح الجهاز ببصمة الوجه\""</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"استخدام وجهك للمصادقة"</string>
<string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="5841976283789481311">"يمكنك استخدام وجهك لفتح الهاتف أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام وجهك لفتح هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="765965418187421753">"استخدِم وجهك لفتح هاتفك أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
@@ -337,27 +337,27 @@
<string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"تعذّر مسح الوجه."</string>
<string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"اكتمل التسجيل بنجاح."</string>
<string name="security_settings_face_enroll_done" msgid="3048687969498187442">"تم"</string>
- <string name="security_settings_face_enroll_should_re_enroll_title" msgid="6835778900387289683">"تحسين أداء ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
- <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="7055780282999744813">"إعادة إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
- <string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"إعادة إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="security_settings_face_enroll_should_re_enroll_title" msgid="6835778900387289683">"تحسين أداء ميزة \"فتح الجهاز ببصمة الوجه\""</string>
+ <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="7055780282999744813">"إعادة إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
+ <string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"إعادة إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
<string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"تحسين الأمان ومستوى الأداء"</string>
- <string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
- <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"يمكنك حذف نموذج الوجه الحالي لإعادة إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nسيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد الحذف، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف أو للمصادقة في التطبيقات."</string>
- <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"يمكنك حذف نموذج الوجه الحالي لإعادة إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\".\n\nسيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد الحذف، ستحتاج إلى بصمة الإصبع أو رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف أو للمصادقة في التطبيقات."</string>
- <string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"استخدام \"فتح الجهاز بالتعرف على الوجه\" من أجل"</string>
- <string name="security_settings_face_settings_preferences_category" msgid="7628929873407280453">"عند استخدام ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
+ <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"يمكنك حذف نموذج الوجه الحالي لإعادة إعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nسيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد الحذف، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف أو للمصادقة في التطبيقات."</string>
+ <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"يمكنك حذف نموذج الوجه الحالي لإعادة إعداد ميزة \"فتح الجهاز ببصمة الوجه\".\n\nسيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد الحذف، ستحتاج إلى بصمة الإصبع أو رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف أو للمصادقة في التطبيقات."</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"استخدام \"فتح الجهاز ببصمة الوجه\" من أجل"</string>
+ <string name="security_settings_face_settings_preferences_category" msgid="7628929873407280453">"عند استخدام ميزة \"فتح الجهاز ببصمة الوجه\""</string>
<string name="security_settings_face_settings_require_attention" msgid="4395309855914391104">"مطلوب فتح العينين"</string>
<string name="security_settings_face_settings_require_attention_details" msgid="2546230511769544074">"يتطلب فتح قفل الهاتف النظر إليه بعينين مفتوحتين."</string>
<string name="security_settings_face_settings_require_confirmation" msgid="6603039421004198334">"طلب التأكيد دائمًا"</string>
- <string name="security_settings_face_settings_require_confirmation_details" msgid="3498729789625461914">"طلب خطوة تأكيد دائمًا عند استخدام \"فتح الجهاز بالتعرف على الوجه\" في التطبيقات"</string>
+ <string name="security_settings_face_settings_require_confirmation_details" msgid="3498729789625461914">"طلب خطوة تأكيد دائمًا عند استخدام \"فتح الجهاز ببصمة الوجه\" في التطبيقات"</string>
<string name="security_settings_face_settings_remove_face_model" msgid="812920481303980846">"حذف نموذج الوجه"</string>
- <string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
<string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"هل تريد حذف نموذج الوجه؟"</string>
<string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"سيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد حذفه، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل هاتفك أو لعمليات المصادقة في التطبيقات."</string>
<string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"سيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد حذفه، ستحتاج إلى رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف."</string>
<string name="security_settings_face_remove_dialog_details_fingerprint" msgid="7609582230650860974">"سيتم حذف نموذج الوجه نهائيًا وبشكلٍ آمن.\n\nبعد حذفه، ستحتاج إلى بصمة الإصبع أو رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل هاتفك أو لعمليات المصادقة في التطبيقات."</string>
<string name="security_settings_face_remove_dialog_details_fingerprint_conv" msgid="2627374706274503259">"سيتم حذف نموذج الوجه نهائيًا وبأمان.\n\nبعد حذفه، ستحتاج إلى بصمة الإصبع أو رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف."</string>
- <string name="security_settings_face_settings_context_subtitle" msgid="8284262560781442403">"استخدام ميزة \"فتح الجهاز بالتعرف على الوجه\" لفتح قفل هاتفك"</string>
+ <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>
@@ -383,11 +383,11 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"آلية العمل"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"تنشئ ميزة \"فتح الجهاز ببصمة الإصبع\" نموذجًا فريدًا من بصمة إصبعك لإثبات هويتك. لإنشاء نموذج بصمة الإصبع هذا أثناء عملية الإعداد، عليك تسجيل صور لبصمة إصبعك من جهات مختلفة."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"تنشئ ميزة \"فتح الجهاز ببصمة الإصبع\" نموذجًا فريدًا من بصمة إصبع طفلك لإثبات هويته. لإنشاء نموذج بصمة الإصبع هذا أثناء الإعداد، على طفلك تسجيل صور لبصمة إصبعه من جهات مختلفة."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"للحصول على أفضل النتائج، استخدم واقي شاشة مُعتمَد ويحمل شعار Made for Google. قد لا تعمل بصمة إصبعك، مع واقيات الشاشة الأخرى."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"للحصول على أفضل النتائج، استخدم واقي شاشة مُعتمَد ويحمل شعار Made for Google. قد لا تعمل بصمة إصبعك مع واقيات الشاشة الأخرى."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"للحصول على أفضل النتائج، استخدم واقي شاشة مُعتمَد ويحمل شعار Made for Google. قد لا تعمل بصمة إصبع طفلك مع واقيات الشاشة الأخرى."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
<string name="security_settings_activeunlock_preference_title" msgid="4257580421087062228">"فتح الهاتف من الساعة"</string>
- <string name="biometric_settings_intro_with_activeunlock" msgid="5032953826653108646">"في حال إعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\"، سيطلب منك الهاتف إدخال بصمة إصبعك عندما تكون مرتديًا كمامة أو متواجدًا في منطقة مظلمة.\n\nوتوفِّر لك ميزة \"فتح الهاتف من الساعة\" طريقة سهلة أخرى لفتح هاتفك عندما تكون أصابعك مبتلة أو عندما لا يتم التعرّف على وجهك."</string>
+ <string name="biometric_settings_intro_with_activeunlock" msgid="5032953826653108646">"في حال إعداد ميزتَي \"فتح الجهاز ببصمة الوجه\" و\"فتح الجهاز ببصمة الإصبع\"، سيطلب منك الهاتف إدخال بصمة إصبعك عندما تكون مرتديًا كمامة أو متواجدًا في منطقة مظلمة.\n\nوتوفِّر لك ميزة \"فتح الهاتف من الساعة\" طريقة سهلة أخرى لفتح هاتفك عندما تكون أصابعك مبتلة أو عندما لا يتم التعرّف على وجهك."</string>
<string name="biometric_settings_intro_with_fingerprint" msgid="5881355884547769337">"توفِّر لك ميزة \"فتح الهاتف من الساعة\" طريقة سهلة أخرى لفتح قفل هاتفك عندما لا يتم التعرّف على بصمة إصبعك."</string>
<string name="biometric_settings_intro_with_face" msgid="7671919122230588521">"توفِّر لك ميزة \"فتح الهاتف من الساعة\" طريقة سهلة أخرى لفتح قفل هاتفك عندما لا يتم التعرّف على وجهك."</string>
<string name="biometric_settings_use_fingerprint_or_watch_for" msgid="1160830065613858095">"استخدام بصمة الإصبع أو الساعة من أجل"</string>
@@ -398,11 +398,11 @@
<string name="biometric_settings_use_fingerprint_or_watch_preference_summary" msgid="2425628094194828407">"استخدام بصمة الإصبع أو الساعة"</string>
<string name="biometric_settings_use_face_fingerprint_or_watch_preference_summary" msgid="188805113048792007">"استخدام الوجه أو بصمة الإصبع أو الساعة"</string>
<string name="biometric_settings_use_watch_preference_summary" msgid="2311453276747908475">"استخدام الساعة"</string>
- <string name="security_settings_activeunlock_require_face_fingerprint_setup_title" msgid="8776904312629209685">"إعداد ميزتَي فتح الجهاز بالتعرف على الوجه أو بصمة إصبع أولاً"</string>
+ <string name="security_settings_activeunlock_require_face_fingerprint_setup_title" msgid="8776904312629209685">"إعداد ميزتَي فتح الجهاز ببصمة الوجه أو بصمة إصبع أولاً"</string>
<string name="security_settings_activeunlock_require_face_fingerprint_setup_message" msgid="1669326067732567911">"يمكنك فتح الجهاز باستخدام ساعتك عندما لا يتم التعرف على وجهك أو بصمة إصبعك."</string>
<string name="security_settings_activeunlock_require_fingerprint_setup_title" msgid="6703703635881050623">"يجب إعداد ميزة \"فتح الجهاز ببصمة الإصبع\" أولاً"</string>
<string name="security_settings_activeunlock_require_fingerprint_setup_message" msgid="4966813766409918392">"يمكنك فتح الهاتف من ساعتك عندما لا يتم التعرف على بصمة الإصبع."</string>
- <string name="security_settings_activeunlock_require_face_setup_title" msgid="1428795376597739880">"يجب إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\" أولاً"</string>
+ <string name="security_settings_activeunlock_require_face_setup_title" msgid="1428795376597739880">"يجب إعداد ميزة \"فتح الجهاز ببصمة الوجه\" أولاً"</string>
<string name="security_settings_activeunlock_require_face_setup_message" msgid="8904070645721933399">"يمكنك فتح الهاتف من ساعتك عندما لا يتم التعرف على وجهك."</string>
<string name="security_settings_activeunlock_biometric_setup" msgid="8876454457817955475">"الإعداد"</string>
<string name="security_settings_fingerprint_single_watch_preference_summary" msgid="6464470096384164369">"تمت إضافة بصمة إصبع و\"<xliff:g id="WATCH">%s</xliff:g>\"."</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"تمت إضافة وجه و\"<xliff:g id="WATCH">%s</xliff:g>\"."</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"تمت إضافة وجه وبصمة إصبع و\"<xliff:g id="WATCH">%s</xliff:g>\"."</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"تمت إضافة وجه وبصمات أصابع و\"<xliff:g id="WATCH">%s</xliff:g>\"."</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"هذا الإجراء مطلوب عندما تكون ميزة \"التحقّق من الهوية\" مفعَّلة"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"فتح قفل Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"تمت إضافة الساعة"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ضبط إعدادات ساعتك"</string>
@@ -437,12 +438,12 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"مزيد من المعلومات عن ميزة \"فتح الهاتف من الساعة\""</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"إضافة ساعة"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"إزالة ساعة"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"فتح الجهاز بالتعرّف على الوجه وبصمة الإصبع"</string>
- <string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"فتح قفل ملف العمل ببصمة الإصبع وبالتعرف على الوجه"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"فتح الجهاز ببصمة الوجه وببصمة الإصبع"</string>
+ <string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"فتح قفل ملف العمل ببصمة الإصبع وببصمة الوجه"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"يجب ضبط الإعدادات"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"تمت إضافة وجه وبصمات أصابع."</string>
<string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"تمت إضافة وجه وبصمة إصبع"</string>
- <string name="biometric_settings_intro" msgid="4263069383955676756">"في حال إعداد ميزتَي \"فتح الجهاز بالتعرف على الوجه\" و\"فتح الجهاز ببصمة الإصبع\"، سيطلب منك الهاتف إدخال بصمة إصبعك عندما تكون في منطقة مظلمة أو ترتدي كمّامة."</string>
+ <string name="biometric_settings_intro" msgid="4263069383955676756">"في حال إعداد ميزتَي \"فتح الجهاز ببصمة الوجه\" و\"فتح الجهاز ببصمة الإصبع\"، سيطلب منك الهاتف إدخال بصمة إصبعك عندما تكون في منطقة مظلمة أو ترتدي كمّامة."</string>
<string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"طرق فتح القفل"</string>
<string name="biometric_settings_category_use_face_fingerprint" msgid="4377659744376863913">"استخدام الوجه أو بصمة الإصبع من أجل:"</string>
<string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"فتح قفل الهاتف"</string>
@@ -451,8 +452,8 @@
<string name="biometric_settings_use_fingerprint_preference_summary" msgid="6077762097826050165">"باستخدام بصمة الإصبع"</string>
<string name="biometric_settings_use_face_or_fingerprint_preference_summary" msgid="3029102492674234728">"باستخدام الوجه أو بصمة الإصبع"</string>
<string name="biometric_settings_hand_back_to_guardian_ok" msgid="1763788801883247426">"حسنًا"</string>
- <string name="biometric_settings_add_face_in_split_mode_title" msgid="6041232223862753222">"هل يتعذّر إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\"؟"</string>
- <string name="biometric_settings_add_face_in_split_mode_message" msgid="1904738532939614456">"أغلِق وضع تقسيم الشاشة لإعداد ميزة \"فتح الجهاز بالتعرف على الوجه\"."</string>
+ <string name="biometric_settings_add_face_in_split_mode_title" msgid="6041232223862753222">"هل يتعذّر إعداد ميزة \"فتح الجهاز ببصمة الوجه\"؟"</string>
+ <string name="biometric_settings_add_face_in_split_mode_message" msgid="1904738532939614456">"أغلِق وضع تقسيم الشاشة لإعداد ميزة \"فتح الجهاز ببصمة الوجه\"."</string>
<string name="biometric_settings_add_fingerprint_in_split_mode_title" msgid="9194670722730454903">"يتعذّر إعداد بصمة الإصبع"</string>
<string name="biometric_settings_add_fingerprint_in_split_mode_message" msgid="6960548382076629454">"أغلِق وضع تقسيم الشاشة لإعداد ميزة \"فتح الجهاز ببصمة الإصبع\"."</string>
<string name="biometric_settings_add_biometrics_in_split_mode_ok" msgid="564103789097253645">"حسنًا"</string>
@@ -551,24 +552,24 @@
<string name="private_space_lock_title" msgid="7230836881433350526">"قفل المساحة الخاصة"</string>
<string name="private_space_one_lock_summary" msgid="2106513606571219068">"يمكنك فتح قفل المساحة الخاصة بالطريقة نفسها المستخدَمة لفتح قفل جهازك، أو يمكنك اختيار طريقة أخرى"</string>
<string name="private_space_screen_lock_title" msgid="8679383894967823163">"استخدام قفل شاشة الجهاز"</string>
- <string name="private_space_biometric_title" msgid="3934339826674553174">"فتح الجهاز ببصمة الإصبع والتعرّف على الوجه"</string>
+ <string name="private_space_biometric_title" msgid="3934339826674553174">"فتح الجهاز ببصمة الإصبع وببصمة الوجه"</string>
<string name="private_space_fingerprint_title" msgid="5989254643211889931">"فتح الجهاز ببصمة الإصبع"</string>
- <string name="private_space_face_title" msgid="3290402865367663079">"فتح الجهاز بالتعرّف على الوجه"</string>
+ <string name="private_space_face_title" msgid="3290402865367663079">"فتح الجهاز ببصمة الوجه"</string>
<string name="private_space_biometric_summary" msgid="4403837276018724581">"انقر لإعداد هذه الميزة."</string>
- <string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"استخدام ميزة \"فتح الجهاز ببصمة الإصبع\" للمساحة الخاصة"</string>
- <string name="private_space_face_unlock_title" msgid="462248384776453613">"استخدام ميزة \"فتح الجهاز بالتعرّف على الوجه\" للمساحة الخاصة"</string>
- <string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"فتح القفل باستخدام الوجه وبصمة الإصبع للمساحة الخاصّة"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"ضبط فتح الجهاز ببصمة الإصبع للمساحة الخاصّة"</string>
+ <string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"فتح المساحة الخاصة باستخدام بصمة الإصبع"</string>
+ <string name="private_space_face_unlock_title" msgid="462248384776453613">"فتح المساحة الخاصة باستخدام بصمة الوجه"</string>
+ <string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"فتح المساحة الخاصة باستخدام ميزتي \"بصمة الوجه\" و\"بصمة الإصبع\""</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"فتح المساحة الخاصة باستخدام بصمة الإصبع"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"يمكنك استخدام بصمة الإصبع لفتح قفل المساحة الخاصّة أو لإثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات أو الموافقة على عملية شراء"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"يمكن فتح قفل المساحة الخاصّة بدون قصدك، مثلاً عندما يضع أحد الأشخاص الجهاز على إصبعك."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"يمكنك استخدام بصمة إصبعك لفتح قفل المساحة الخاصّة أو الموافقة على عمليات شراء"</string>
- <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"ضبط فتح الجهاز بالتعرف على الوجه للمساحة الخاصّة"</string>
+ <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"ضبط فتح الجهاز ببصمة الوجه للمساحة الخاصّة"</string>
<string name="private_space_face_enroll_introduction_message" msgid="250239418499081821">"يمكنك استخدام وجهك لفتح قفل المساحة الخاصّة أو لإثبات هويتك، مثلاً عند تسجيل الدخول إلى التطبيقات أو الموافقة على عملية شراء"</string>
<string name="private_space_face_enroll_introduction_info_looking" msgid="5694757845303924042">"يمكن أن يؤدي النظر للهاتف إلى فتح قفل المساحة الخاصّة حتى إذا كنت لا تقصد ذلك. يستطيع أيضًا شخص آخر فتح قفل المساحة الخاصّة إذا كان يشبهك بدرجة كبيرة، مثلاً توأم متماثل أو شقيق شديد الشبه، أو إذا قرَّب الشخص الجهاز من وجهك."</string>
<string name="private_space_face_enroll_introduction_info_less_secure" msgid="8460719783943533172">"قد يكون استخدام وجهك لفتح قفل المساحة الخاصّة أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي أو كلمة مرور قوية"</string>
<string name="private_space_face_settings_require_attention_details" msgid="2799569069549999689">"لفتح قفل المساحة الخاصّة، يجب النظر إلي الجهاز بعينين مفتوحتين. للحصول على أفضل النتائج، يُرجى خلع النظارات الشمسية."</string>
<string name="private_space_face_settings_footer" msgid="7722256209563543711">"يمكنك استخدام وجهك لفتح قفل المساحة الخاصّة.\n\nملاحظة:\nلا يمكنك إعداد أكثر من وجه واحد في كل مرة. لإضافة وجه آخر، يُرجى حذف الوجه الحالي.\n\nقد يؤدي النظر إلي الهاتف إلى فتح قفل المساحة الخاصّة حتى إذا كنت لا تقصد ذلك.\n\nويمكن لشخص آخر فتح قفل المساحة الخاصّة إذا قرَّب الجهاز من وجهك.\n\nويمكن أيضًا لشخص يشبهك كثيرًا، مثل شقيقك التوأم، فتح قفل المساحة الخاصّة."</string>
- <string name="private_space_face_settings_require_confirmation_details" msgid="5406498664903812249">"طلب خطوة تأكيد دائمًا عند استخدام \"فتح الجهاز بالتعرّف على الوجه\""</string>
+ <string name="private_space_face_settings_require_confirmation_details" msgid="5406498664903812249">"طلب خطوة تأكيد دائمًا عند استخدام \"فتح الجهاز ببصمة الوجه\""</string>
<string name="private_space_category_ways_to_unlock" msgid="4356631225316950046">"طُرق فتح القفل"</string>
<string name="private_space_screen_lock_summary" msgid="394837965365561070">"نفس قفل شاشة الجهاز"</string>
<string name="private_space_new_lock_title" msgid="9056139964133004094">"هل تريد اختيار طريقة جديدة لقفل المساحة الخاصة؟"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"تثبيت التطبيقات"</b>\n"بإمكانك تثبيت التطبيقات التي تريد الحفاظ على خصوصيتها في مساحتك الخاصّة"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ملاحظة"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"تتوقّف التطبيقات عند قفل المساحة الخاصّة"</b>\n"عند قفل مساحتك الخاصّة، يتم إيقاف التطبيقات المدرَجة فيها ولن يصلك منها أي إشعار"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"المساحات الخاصّة غير مناسبة للتطبيقات التي تعمل في الخلفية أو ترسِل إشعارات مهمة جدًا، كالتطبيقات الطبية وهذا لأنّ الإشعارات والأنشطة في الخلفية تتوقف عند قفل المساحة.\n\nعند قفل المساحة الخاصّة، لن تظهر التطبيقات المدرَجة فيها ضمن قسم \"إدارة الأذونات\" و\"لوحة بيانات الخصوصية\" والإعدادات الأخرى.\n\nلا يمكن نقل المساحة الخاصّة إلى جهاز جديد. إذا أردت استخدام مساحة خاصّة على جهاز آخر، عليك إعدادها على ذلك الجهاز.\n\nإذا ربطَ أحد المستخدمين جهازك بجهاز كمبيوتر أو ثبَّت تطبيقات ضارة عليه، قد يستطيع هذا المستخدم الوصول إلى المساحة الخاصّة."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"المساحات الخاصّة غير مناسبة للتطبيقات التي تعمل في الخلفية أو ترسِل إشعارات مهمة جدًا، كالتطبيقات الطبية وهذا لأنّ الإشعارات والأنشطة في الخلفية تتوقف عند قفل المساحة.\n\nعند قفل المساحة الخاصّة، لن تظهر التطبيقات المدرَجة فيها ضمن قسم \"إدارة الأذونات\" و\"لوحة بيانات الخصوصية\" والإعدادات الأخرى.\n\nلا يمكن استعادة المساحة الخاصّة على جهاز جديد. إذا أردت استخدام مساحة خاصّة على جهاز آخر، عليك إعدادها على ذلك الجهاز.\n\nإذا ربطَ أحد المستخدمين جهازك بجهاز كمبيوتر أو ثبَّت تطبيقات ضارة عليه، قد يستطيع هذا المستخدم الوصول إلى المساحة الخاصّة."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"مزيد من المعلومات حول المساحة الخاصة"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"سيستغرق هذا الإجراء بضع لحظات"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"جارٍ إعداد المساحة الخاصة…"</string>
@@ -691,7 +690,7 @@
<string name="face_unlock_set_unlock_pattern" msgid="4206669838203096608">"النقش• الوجه"</string>
<string name="face_unlock_set_unlock_pin" msgid="9034912683791069602">"رقم التعريف الشخصي • الوجه"</string>
<string name="face_unlock_set_unlock_password" msgid="5874950853246424756">"كلمة المرور • الوجه"</string>
- <string name="face_unlock_skip_face" msgid="189695556498300008">"المتابعة بدون إعداد ميزة \"فتح الجهاز بالتعرف على الوجه\""</string>
+ <string name="face_unlock_skip_face" msgid="189695556498300008">"المتابعة بدون إعداد ميزة \"فتح الجهاز ببصمة الوجه\""</string>
<string name="biometrics_unlock_skip_biometrics" msgid="7399882488272450182">"المتابعة بدون استخدام الوجه أو بصمة الإصبع"</string>
<string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"بدون قفل"</string>
<string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"التمرير السريع"</string>
@@ -750,12 +749,12 @@
</xliff:g>لن تكون ميزة \"الدفع بدون تلامس الأجهزة\" متاحة.<xliff:g id="EMPTY_LINE_1">
</xliff:g>قد يتأثّر عمل \"محفظة Google\" وGoogle Pay وغيرهما من التطبيقات التي تتطلب المصادقة."</string>
- <string name="unlock_disable_frp_warning_content_face_authbound_keys" msgid="8120786951217029818">"ستتم إزالة ميزَتي \"قفل الشاشة\" و\"فتح الجهاز بالتعرّف على الوجه\".<xliff:g id="EMPTY_LINE_0">
+ <string name="unlock_disable_frp_warning_content_face_authbound_keys" msgid="8120786951217029818">"ستتم إزالة ميزَتي \"قفل الشاشة\" و\"فتح الجهاز ببصمة الوجه\".<xliff:g id="EMPTY_LINE_0">
</xliff:g>لن تكون ميزة \"الدفع بدون تلامس الأجهزة\" متاحة.<xliff:g id="EMPTY_LINE_1">
</xliff:g>قد يتأثّر عمل \"محفظة Google\" وGoogle Pay وغيرهما من التطبيقات التي تتطلب المصادقة."</string>
- <string name="unlock_disable_frp_warning_content_face_fingerprint_authbound_keys" msgid="1574263040292024543">"ستتم إزالة ميزَتي \"قفل الشاشة\" و\"فتح الجهاز بالتعرّف على الوجه وببصمة الإصبع\".<xliff:g id="EMPTY_LINE_0">
+ <string name="unlock_disable_frp_warning_content_face_fingerprint_authbound_keys" msgid="1574263040292024543">"ستتم إزالة ميزَتي \"قفل الشاشة\" و\"فتح الجهاز ببصمة الوجه وببصمة الإصبع\".<xliff:g id="EMPTY_LINE_0">
</xliff:g>لن تكون ميزة \"الدفع بدون تلامس الأجهزة\" متاحة.<xliff:g id="EMPTY_LINE_1">
@@ -776,7 +775,7 @@
<string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2479195488386373253">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
<string name="lock_last_pin_attempt_before_wipe_profile" msgid="7086428013814722436">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
<string name="lock_last_password_attempt_before_wipe_profile" msgid="253673907244112643">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف ملفك الشخصي للعمل وبياناته"</string>
- <string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{يجب أن تحتوي كلمة المرور على حرف واحد على الأقل}zero{يجب ألّا يقل عدد الحروف عن # حرف}two{يجب ألّا يقل عدد الحروف عن حرفَين}few{يجب ألّا يقل عدد الحروف عن # أحرف}many{يجب ألّا يقل عدد الحروف عن # حرفًا}other{يجب ألّا يقل عدد الحروف عن # حرف}}"</string>
+ <string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{يجب أن تحتوي كلمة المرور على حرف واحد على الأقل}zero{يجب ألّا يقل عدد الحروف عن #}two{يجب ألّا يقل عدد الحروف عن حرفَين}few{يجب ألّا يقل عدد الحروف عن #}many{يجب ألّا يقل عدد الحروف عن #}other{يجب ألّا يقل عدد الحروف عن #}}"</string>
<string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على رقم واحد على الأقل.}zero{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقم على الأقل.}two{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على رقمَين على الأقل.}few{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # أرقام على الأقل.}many{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقمًا على الأقل.}other{في حال استخدام الأرقام فقط، يجب أن تحتوي كلمة المرور على # رقم على الأقل.}}"</string>
<string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على رقم واحد على الأقل.}zero{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل.}two{يجب أن يحتوي رقم التعريف الشخصي على رقمَين على الأقل.}few{يجب أن يحتوي رقم التعريف الشخصي على # أرقام على الأقل.}many{يجب أن يحتوي رقم التعريف الشخصي على # رقمًا على الأقل.}other{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل.}}"</string>
<string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{يجب أن يحتوي رقم التعريف الشخصي على رقم واحد على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}zero{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}two{يجب أن يحتوي رقم التعريف الشخصي على رقمَين على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}few{يجب أن يحتوي رقم التعريف الشخصي على # أرقام على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}many{يجب أن يحتوي رقم التعريف الشخصي على # رقمًا على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}other{يجب أن يحتوي رقم التعريف الشخصي على # رقم على الأقل ولكن يُنصَح بأن يكون مكوّنًا من {minAutoConfirmLen} أرقام لمزيد من الأمان}}"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"هل تريد إعادة تشغيل الجهاز؟"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"تسجيل الدخول عبر اتصال قصير المدى (NFC) مفصَّل مصمَّم لأغراض التطوير فقط. يتم تضمين بيانات إضافية عن الاتصال القصير المدى (NFC) في تقارير الأخطاء وقد تحتوي على معلومات خاصة. عليك إعادة تشغيل جهازك لتغيير هذا الخيار."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"إعادة التشغيل"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"نسخ مطابق، شاشة خارجية، شاشة متصلة، شاشة USB، درجة دقة، دوران"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"الدوران"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"عادي"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90 درجة"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180 درجة"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270 درجة"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1642,9 +1657,9 @@
<string name="lockpassword_password_set_toast" msgid="6615759749393973795">"تم ضبط كلمة المرور"</string>
<string name="lockpassword_pin_set_toast" msgid="5415783847198570890">"تم ضبط رمز PIN"</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">"ضبط رقم PIN لاستخدام \"فتح الجهاز بالتعرف على الوجه\""</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">"ضبط رقم PIN لاستخدام \"فتح الجهاز ببصمة الوجه\""</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">"يجب ضبط رقم PIN لفتح جهازك ببصمة الإصبع أو بالتعرف على الوجه"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"استخدام لوحة المفاتيح على الشاشة"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"استمرار عرضها على الشاشة عندما تكون لوحة المفاتيح الخارجية متصلة"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"تغيير نمط منتصف المؤشر إلى الأصفر"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"تغيير نمط منتصف المؤشر إلى الوردي"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"تغيير نمط منتصف المؤشر إلى الأزرق"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"نمط نقرة المؤشر"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"أبيض"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"أسود"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"بدون نمط"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"تنسيق محدَّد من المستخدم: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"الكلام"</string>
<string name="pointer_speed" msgid="7398649279282675718">"سرعة المؤشر"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"حجم المؤشر"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"تصغير حجم المؤشر"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"تكبير حجم المؤشر"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"وحدة التحكم في الألعاب"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"إعادة توجيه الاهتزاز"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"إرسال الاهتزاز إلى وحدة التحكم في الألعاب عند الاتصال"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"المتابعة على أيّ حال"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"إلغاء"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"إعدادات التكبير"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"التحريك بإصبع واحد"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"حرِّك المكبِّر بإصبع واحد"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"اسحب بإصبع واحد للتنقل على الشاشة"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"يمكنك نقل منطقة التكبير عن طريق سحب إصبع واحد."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"يمكنك نقل منطقة التكبير عن طريق سحب إصبعين."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"لا تتوفّر هذه الميزة عند تكبير جزء من الشاشة فقط"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"انقر على أحد الأزرار للتكبير"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"يمكنك تكبير الشاشة بسرعة لتكبير المحتوى"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>لتكبير الشاشة، نفِّذ الخطوات التالية:</b><br/> {0,number,integer}. استخدِم الاختصار المخصّص لبدء تكبير المحتوى<br/> {1,number,integer}. انقر على الشاشة<br/> {2,number,integer}. اسحب إصبعين للتنقّل على الشاشة<br/> {3,number,integer}. باعِد أو قارِب بإصبعين لتعديل مستوى التكبير/التصغير<br/> {4,number,integer}. استخدِم الاختصار المخصّص لإيقاف تكبير المحتوى<br/><br/><b>لتكبير المحتوى مؤقتًا، نفِّذ الخطوات التالية:</b><br/> {0,number,integer}. تأكّد من ضبط نوع التكبير على وضع ملء الشاشة<br/> {1,number,integer}. استخدِم الاختصار المخصّص لبدء تكبير المحتوى<br/> {2,number,integer}. انقر مع الاستمرار على أي مكان على الشاشة<br/> {3,number,integer}. اسحب إصبعك للتنقّل على الشاشة<br/> {4,number,integer}. ارفع إصبعك لإيقاف تكبير الشاشة"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>لتكبير الشاشة:</b><br/> {0,number,integer}. استخدِم الاختصار المخصّص لبدء التكبير<br/> {1,number,integer}. انقر على الشاشة<br/> {2,number,integer}. اسحب بإصبعين للتنقّل على الشاشة<br/> {3,number,integer}. باعِد أو قارِب بإصبعين لتعديل مستوى التكبير أو التصغير<br/> {4,number,integer}. استخدِم الاختصار المخصَّص لإيقاف التكبير<br/><br/> يمكنك أيضًا التكبير بشكل مؤقت وغير ذلك."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>لتكبير الشاشة:</b><br/> {0,number,integer}. استخدِم الاختصار المخصّص لبدء التكبير<br/> {1,number,integer}. انقر على الشاشة<br/> {2,number,integer}. اسحب بإصبع واحد أو إصبعين للتنقّل على الشاشة<br/> {3,number,integer}. باعِد أو قارِب بإصبعين لتعديل مستوى التكبير أو التصغير<br/> {4,number,integer}. استخدِم الاختصار المخصَّص لإيقاف التكبير<br/><br/> يمكنك أيضًا التكبير بشكل مؤقت وغير ذلك."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"عند تفعيل ميزة \"التكبير\"، يمكنك تكبير حجم المحتوى على الشاشة.\n\n"<b>"للتكبير"</b>"، يمكنك تفعيل ميزة \"التكبير\" والنقر بعد ذلك على أي مكان في الشاشة.\n"<ul><li>"يمكنك سحب إصبعين أو أكثر للتمرير."</li>\n<li>"يمكنك ضمّ إصبعين أو أكثر لتعديل حجم المحتوى."</li></ul>\n\n<b>"للتكبير مؤقتًا"</b>"، يمكنك تفعيل ميزة التكبير والنقر مع الاستمرار على أي مكان في الشاشة.\n"<ul><li>"يمكنك السحب للتنقّل داخل الشاشة."</li>\n<li>"يمكنك رفع إصبعك للتصغير."</li></ul>\n\n"لن يكون بإمكانك التكبير على لوحة المفاتيح أو شريط التنقل."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"الصفحة <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> من <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"اختصار زر أدوات تسهيل الاستخدام"</string>
@@ -2195,7 +2220,7 @@
<string name="accessibility_button_location_title" msgid="7182107846092304942">"الموقع"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"حجم الزر"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"تلاشي الزر عند عدم استخدامه"</string>
- <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"يتلاشى الزر بعد بضع ثوانٍ، ما يسهِّل عليك رؤية الشاشة"</string>
+ <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"تلاشي الزر بعد بضع ثوانٍ، ما يسهِّل عليك رؤية الشاشة"</string>
<string name="accessibility_button_opacity_title" msgid="4727355657530362289">"شفافية الزر عند عدم استخدامه"</string>
<string name="accessibility_button_low_label" msgid="4193015407828927741">"شفاف"</string>
<string name="accessibility_button_high_label" msgid="9138077512008190896">"غير شفاف"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ما من جداول زمنية}=1{تم ضبط جدول زمني واحد}two{تم ضبط جدولين زمنيين}few{تم ضبط # جداول زمنية}many{تم ضبط # جدولاً زمنيًا}other{تم ضبط # جدول زمني}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"وضع \"عدم الإزعاج\""</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"الأوضاع ذات الأولوية"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"إضافة وضع"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ستصلك الإشعارات من الأشخاص المهمّين والتطبيقات المهمّة فقط"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"اختيار نوع التفعيل"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"الوقت"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"على سبيل المثال: \"من 9:30 صباحًا حتى 5:00 بعد الظهر\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"التقويم"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"على سبيل المثال: \"التقويم الشخصي\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"إنشاء وضع"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"مخصَّص"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"الحد من المقاطعات"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"تفعيل ميزة \"عدم الإزعاج\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"السماح للمنبهات وأصوات الوسائط بمقاطعة عمل الميزة"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"الجداول الزمنية"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"حذف الجداول الزمنية"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"حذف"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"إعادة التسمية"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"حذف"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"هل تريد حذف وضع \"<xliff:g id="MODE">%1$s</xliff:g>\"؟"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"تعديل"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"الجداول الزمنية"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"الجدول الزمني"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"إضافة تقويم"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"استخدام التقويم"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"وفقًا للجدول الزمني"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ضبط جدول زمني"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"الجدول الزمني"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ساعة و<xliff:g id="MINUTES">%2$d</xliff:g> دقيقة"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"التفعيل تلقائيًا"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"الجدول الزمني"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"كتم صوت الهاتف في أوقات معيّنة"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"تعيين قواعد عدم الإزعاج"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"السماح بالمقاطعات التي تصدر صوتًا"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"حظر الإشعارات المرئية"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"السماح بالإشارات المرئية"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"الإشعارات التي يمكنها الوصول إليك"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"الحفاظ على التركيز"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"الإجراءات الإضافية"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{غير مفعَّلة}=1{غير مفعّلة / يمكن تفعيل وضع واحد تلقائيًا}two{غير مفعّلة / يمكن تفعيل وضعين تلقائيًا}few{غير مفعّلة / يمكن تفعيل # أوضاع تلقائيًا}many{غير مفعّلة / يمكن تفعيل # وضعًا تلقائيًا}other{غير مفعّلة / يمكن تفعيل # وضع تلقائيًا}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"إعدادات العرض"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"خيارات العرض"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"تدرّج الرمادي"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"تفعيل المظهر الداكن"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"يتم تبديل نظام التشغيل والتطبيقات إلى تفضيل النص الفاتح على الخلفية الداكنة لإراحة العين وتوفير شحن البطارية بشكل ملحوظ في بعض الأجهزة"</string>
<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}}few{{effect_1} و{effect_2} و# تغييرات أخرى}many{{effect_1} و{effect_2} و# تغييرًا آخر}other{{effect_1} و{effect_2} و# تغيير آخر}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"فلترة مصادر الإزعاج"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"لا تتم فلترة مصادر الإزعاج"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"فتح الإشعار"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"السماح بتأجيل الإشعارات"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"نقطة الإشعار على رموز التطبيقات"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"حِزم الإشعارات"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"فقاعات المحادثات"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"فقاعات المحادثات"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"إظهار هذه المحادثة كفقاعة"</string>
@@ -3603,7 +3644,7 @@
<string name="notif_type_conversation_summary" msgid="179142405410217101">"الرسائل القصيرة SMS والرسائل النصية والاتصالات الأخرى"</string>
<string name="notif_type_alerting" msgid="4713073696855718576">"الإشعارات"</string>
<string name="notif_type_alerting_summary" msgid="4681068287836313604">"يمكن إصدار رنين أو اهتزاز بناءً على الإعدادات"</string>
- <string name="notif_type_silent" msgid="6273951794420331010">"صامت"</string>
+ <string name="notif_type_silent" msgid="6273951794420331010">"الوضع الصامت"</string>
<string name="notif_type_silent_summary" msgid="7820923063105060844">"الإشعارات التي لا تصدِر صوتًا أو اهتزازًا مطلقًا"</string>
<string name="notification_listener_allowed" msgid="5536962633536318551">"التطبيقات المسموح لها"</string>
<string name="notification_listener_not_allowed" msgid="3352962779597846538">"التطبيقات غير المسموح لها"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"لا يتوافق هذا التطبيق مع الإعدادات المحسَّنة."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"إعدادات إضافية"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"تتوفّر إعدادات إضافية داخل التطبيق."</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"فترة توقُّف الإشعارات"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"التطبيق على ملفات العمل"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"يسري على تطبيقات ملف العمل"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"الفئات"</string>
<string name="notification_channels_other" msgid="18159805343647908">"غير ذلك"</string>
<string name="no_channels" msgid="4716199078612071915">"لم ينشر هذا التطبيق أي إشعارات."</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"عرض الفئات غير المستخدَمة"</string>
<string name="app_settings_link" msgid="6725453466705333311">"الإعدادات الإضافية في التطبيق"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"عرض الفئات غير المستخدَمة"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"إخفاء الفئات غير المستخدَمة"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"التطبيقات التي يمكنها إيقاف الوضع"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"التطبيقات المحدَّدة"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ما مِن تطبيقات"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"كل التطبيقات"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"السماح للتطبيقات بإلغاء وضع \"عدم الإزعاج\""</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"التطبيقات التي يمكنها مقاطعة عمل الميزة"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"اختيار مزيد من التطبيقات"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"عدم السماح لأي مصدر بتجاوز وضع \"عدم الإزعاج\""</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"عدم السماح لأي شخص بتجاوز وضع \"عدم الإزعاج\""</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"السماح لبعض الأشخاص بتجاوز وضع \"عدم الإزعاج\""</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"السماح لكل المستخدمين بمقاطعة عمل الميزة"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"المتصلون المتكرّرون"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"السماح بالمتصلين المتكررين"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{التغيير إلى التنبيهات لمدة ساعة واحدة فقط حتى {time}}zero{التغيير إلى التنبيهات لمدة # ساعة فقط حتى {time}}two{التغيير إلى التنبيهات لمدة ساعتَين فقط حتى {time}}few{التغيير إلى التنبيهات لمدة # ساعات فقط حتى {time}}many{التغيير إلى التنبيهات لمدة # ساعة فقط حتى {time}}other{التغيير إلى التنبيهات لمدة # ساعة فقط حتى {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"التغيير إلى التنبيهات فقط حتى <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"تغيير إلى المقاطعة دائمًا"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"تعديل الوضع"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"إضافة وضع"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"وضع مخصّص"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"اسم الوضع"</string>
<string name="warning_button_text" msgid="1274234338874005639">"تحذير"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"إغلاق"</string>
<string name="device_feedback" msgid="5351614458411688608">"إرسال ملاحظات حول هذا الجهاز"</string>
@@ -4069,7 +4114,7 @@
<string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> متاحة"</string>
<string name="display_dashboard_summary" msgid="1599453894989339454">"المظهر الداكن وحجم الخط والسطوع"</string>
<string name="memory_summary" msgid="8221954450951651735">"تم استخدام متوسط ذاكرة بحجم <xliff:g id="USED_MEMORY">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
- <string name="users_summary" msgid="8473589474976307510">"تم تسجيل الدخول باسم <xliff:g id="USER_NAME">%1$s</xliff:g>."</string>
+ <string name="users_summary" msgid="8473589474976307510">"تم تسجيل الدخول باسم <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="android_version_summary" msgid="7818952662015042768">"تم التحديث إلى الإصدار <xliff:g id="VERSION">%1$s</xliff:g> من Android."</string>
<string name="android_version_pending_update_summary" msgid="5404532347171027730">"هناك تحديث متوفّر."</string>
<string name="disabled_by_policy_title" msgid="6852347040813204503">"سياسة العمل تحظر هذا الإجراء"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"فرض وضع سطح المكتب"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"فرض وضع سطح المكتب التجريبي على شاشات العرض الثانوية"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"تفعيل النوافذ الحرة"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"سيتم تفعيل عرض النوافذ الحرة."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"تفعيل عرض النوافذ الحرة على شاشة عرض أخرى"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"سيتم تفعيل النوافذ الحرة فقط على شاشة عرض ثانوية."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"استخدام التطبيقات التي لا يتغير حجمها في النوافذ المتعددة"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"السماح باستخدام التطبيقات التي لا يتغير حجمها في النوافذ المتعددة"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"إلغاء ميزة فرض تعتيم الشاشة"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"يجب تحويل قسم البيانات في هذا الجهاز إلى نظام الملفات ext4 لتتمكّن من استخدام الوضع ١٦ كيلوبايت ضِمن خيارات المطوِّرين. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. لتفعيل الخيار ١٦ كيلوبايت، يجب إعادة تشغيل الجهاز مرة أخرى بعد ذلك. بعد تفعيل هذا الوضع، يمكنك التبديل بين الوضعَين ٤ كيلوبايت و١٦ كيلوبايت من خلال إعادة تشغيل الجهاز لمرّة واحدة. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة الجهاز إلى وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع ٤ كيلوبايت وقفل برنامج الإقلاع، وسيؤدي ذلك إلى إعادة ضبط الجهاز على الإعدادات الأصلية. بعد تشغيل نظام Android على الجهاز بنجاح، أوقِف الإعداد \"فتح قفل المصنّع الأصلي للجهاز\" ضِمن \"خيارات المطوّرين\". بعد التأكيد، سيتم حجب بيانات الجهاز وتغيير نظام الملفات إلى ext4. بعد إتمام هذه الخطوات، يُرجى إعادة تفعيل الوضع ١٦ كيلوبايت."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"محو جميع البيانات"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"تعذَّر حجب قسم البيانات وإعادة تنسيقه إلى ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"يجب فتح قفل برنامج الإقلاع لتفعيل الوضع 16 كيلوبايت"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"يجب فتح قفل برنامج الإقلاع"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"يجب فتح قفل برنامج الإقلاع على هذا الجهاز قبل استخدام الوضع 16 كيلوبايت ضِمن خيارات المطوِّرين. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. وعند تفعيل الوضع 16 كيلوبايت، سيتم حجب كل بيانات المستخدم وإعداداته. بعد فتح قفل برنامج الإقلاع، سيكون عليك إعادة تشغيل الجهاز مرّتين لتفعيل الخيار 16 كيلوبايت. بعد تفعيل هذا الوضع، يمكنك التبديل بين الوضعَين 4 كيلوبايت و16 كيلوبايت من خلال إعادة تشغيل الجهاز لمرّة واحدة. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة الجهاز إلى وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع 4 كيلوبايت وقفل برنامج الإقلاع أو إعدادات المصنّع الأصلي للجهاز، وسيؤدي ذلك إلى إعادة ضبط الجهاز على الإعدادات الأصلية. يُرجى فتح قفل برنامج الإقلاع ثم إعادة المحاولة. يمكنك الاطّلاع على تعليمات حول كيفية تنفيذ هذا الإجراء من خلال الانتقال إلى: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"استخدام الوضع ٤ كيلوبايت غير المستند إلى حجم الصفحة"</string>
- <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"جهازك الآن في الوضع ٤ كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك قفل برنامج إقلاع الجهاز. انقر لقراءة المزيد."</string>
+ <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"جهازك الآن في الوضع ٤ كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك قفل برنامج إقلاع الجهاز. انقر لقراءة المزيد."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"جهازك الآن في الوضع ٤ كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك قفل برنامج إقلاع الجهاز. سيؤدي هذا الإجراء إلى إعادة ضبط الجهاز على الإعدادات الأصلية لوضع الإنتاج. بعد تشغيل نظام Android على الجهاز بنجاح، أوقِف الإعداد \"فتح قفل المصنّع الأصلي للجهاز\" ضِمن \"خيارات المطوّرين\". إذا تعذَّر تشغيل نظام Android أو كان يعمل بشكل غير مستقر، عليك إعادة تثبيت أحدث نسخ برامج الجهة المصنِّعة من خلال <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> أو <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>، وتحديد الخيارات التالية: \"حجب بيانات الجهاز\" (Wipe Device)، و\"قفل برنامج الإقلاع\" (Lock Bootloader)، و\"فرض تثبيت البيانات في جميع الأقسام\" (Force Flash all partitions)."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"استخدام الوضع ١٦ كيلوبايت غير المستند إلى حجم الصفحة"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"جهازك الآن في الوضع ١٦ كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع ٤ كيلوبايت وقفل برنامج الإقلاع. انقر لقراءة المزيد."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"جهازك الآن في الوضع 16 كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. سيتم إيقاف بعض الميزات في هذَين الوضعَين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع 4 كيلوبايت وقفل برنامج الإقلاع. سيؤدي هذا الإجراء إلى إعادة ضبط الجهاز على الإعدادات الأصلية لوضع الإنتاج. بعد تشغيل نظام Android على الجهاز بنجاح، أوقِف الإعداد \"فتح قفل المصنّع الأصلي للجهاز\" ضِمن \"خيارات المطوّرين\". إذا تعذَّر تشغيل نظام Android أو كان يعمل بشكل غير مستقر، عليك إعادة تثبيت أحدث نسخ برامج الجهة المصنِّعة من خلال <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> أو <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>، وتحديد الخيارات التالية: \"حجب بيانات الجهاز\" (Wipe Device)، و\"قفل برنامج الإقلاع\" (Lock Bootloader)، و\"فرض تثبيت البيانات في جميع الأقسام\" (Force Flash all partitions)."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"جهازك الآن في الوضع 16 كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. وسيتم إيقاف بعض الميزات في هذين الوضعين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع 4 كيلوبايت وقفل برنامج الإقلاع للجهاز. انقر لقراءة المزيد."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"جهازك الآن في الوضع 16 كيلوبايت ضِمن الوضع غير المستند إلى حجم الصفحة. وفي هذا الوضع، لا يمكن ضمان سلامة برنامج النظام. وعندما يكون برنامج الإقلاع غير مقفل، قد تصبح بياناتك المخزَّنة على الهاتف معرَّضة للخطر. وسيتم إيقاف بعض الميزات في هذين الوضعين، وبالتالي قد لا تعمل بعض التطبيقات. لإعادة تفعيل وضع الإنتاج، عليك التبديل مرة أخرى إلى الوضع 4 كيلوبايت وقفل برنامج الإقلاع للجهاز. سيؤدي هذا الإجراء إلى إعادة ضبط الجهاز على الإعدادات الأصلية لوضع الإنتاج. بعد تشغيل نظام Android على الجهاز بنجاح، أوقِف الإعداد \"فتح قفل المصنّع الأصلي للجهاز\" ضِمن \"خيارات المطوّرين\". إذا تعذَّر تشغيل نظام Android أو كان يعمل بشكل غير مستقر، عليك إعادة تثبيت أحدث نُسخ برامج الجهة المصنِّعة من خلال <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> أو استخدام <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>، وتحديد الخيارات التالية: \"حجب بيانات الجهاز\" (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="bug_report_handler_title" msgid="713439959113250125">"معالِج تقارير الأخطاء"</string>
@@ -5013,7 +5060,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"استخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\""</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"استخدام ميزة \"خيارات المطورين\""</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"استخدام خدمة الطباعة"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"السماح لمستخدمين متعددين"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"السماح بتبديل المستخدمين"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"السماح، متعدد، مستخدم، سماح، عديد"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"مستخدمون متعددون، مستخدمون، ملفات شخصية، أشخاص، حسابات، تبديل، غير ذلك"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"استخدام ميزة \"تصحيح الأخطاء اللاسلكي\""</string>
@@ -5127,8 +5174,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"اختَر ما تريد أن يظهر على شاشتك عندما يكون جهازك اللوحي في حالة إرساء. قد يستهلك جهازك قدرًا أكبر من الطاقة عند استخدام شاشة الاستراحة."</string>
<string name="customize_button_title" msgid="1110284655990203359">"تخصيص"</string>
<string name="customize_button_description" msgid="7440248477266126231">"تخصيص <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"يجب إعادة التشغيل لتفعيل النوافذ الحرة."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"يجب إعادة التشغيل لفرض وضع الكمبيوتر المكتبي على الشاشات الثانوية."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"يجب إعادة التشغيل لتفعيل عرض النوافذ الحرة القديمة."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"يجب إعادة التشغيل لتغيير إعدادات عرض النوافذ الحرة."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"يجب إعادة التشغيل لفرض عرض النوافذ الحرة على شاشات العرض الثانوية."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"إعادة التشغيل الآن"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"إعادة التشغيل لاحقًا"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"الصوت المكاني"</string>
@@ -5246,6 +5294,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"الخيار مفعَّل"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"الميزة غير مفعَّلة"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"الميزة مفعَّلة"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"الصوت: %1$d%% جهة اليسار، %2$d%% جهة اليمين"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"الصوت: %1$d%% جهة اليمين، %2$d%% جهة اليسار"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"يظهر اسم جهازك للتطبيقات التي تم تثبيتها. وقد يظهر أيضًا للمستخدمين الآخرين عند الاتصال بأجهزة تتضمّن بلوتوث أو بشبكة Wi-Fi أو عند إعداد نقطة اتصال Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"صيغة المخاطبة المناسبة نحويًا"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"اختيار صيغة مخاطبة مناسبة نحويًا"</string>
@@ -5357,4 +5407,5 @@
<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="homepage_search" msgid="6759334912284663559">"البحث في \"الإعدادات\""</string>
</resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index c414563..fbd43a0 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"বেডটাইম"</item>
+ <item msgid="4152450357280759894">"গাড়ী চলোৱা"</item>
+ <item msgid="7096549258219399423">"ইমাৰ্ছিভ"</item>
+ <item msgid="2760716776980432977">"পৰিচালিত"</item>
+ <item msgid="601734478369121764">"তৰা"</item>
+ <item msgid="6243809315432780521">"কেলেণ্ডাৰ"</item>
+ <item msgid="4913577903148415331">"সময়"</item>
+ <item msgid="3653377604690057780">"থিয়েটাৰ"</item>
+ <item msgid="3843711267408385410">"ফুল"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 79321fc..b77654e 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ডিভাইচৰ সংযোগ বিছিন্ন কৰিবনে?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"নতুন ডিভাইচ পেয়াৰ কৰক"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ব্লুটুথ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"কাইলৈ স্বয়ংক্ৰিয়ভাৱে অন কৰক"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"শুনাৰ ডিভাইচৰ ছেটিং"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"শ্বৰ্টকাট, শ্ৰৱণ যন্ত্ৰৰ সুসংগতা"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"প্ৰিছেট"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"আপোনাৰ অডিঅ’লজিষ্টে প্ৰ’গ্ৰাম কৰা কোনো প্ৰিছেট নাই"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"প্ৰিছেট আপডে’ট কৰিব পৰা নগ’ল"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"অডিঅ’ আউটপুট"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"অডিঅ’ আউটপুটৰ বিষয়ে"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"অফ আছে"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{অন আছে / # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}one{অন আছে / # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}other{অন আছে / # টা এপে অৱস্থান এক্সেছ কৰিব পাৰে}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ল’ড হৈ আছে…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"নিকটৱৰ্তী ডিভাইচৰ সৈতে যোগাযোগ কৰিব পৰাৰ অনুমতি থকা এপ্সমূহে সংযুক্ত হৈ থকা ডিভাইচৰ আপেক্ষিক স্থান নিৰ্ধাৰণ কৰিব পাৰে।"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"নিকটৱৰ্তী ডিভাইচৰ সৈতে যোগাযোগ কৰিব পৰাৰ অনুমতি থকা এপ্সমূহে সংযুক্ত হৈ থকা ডিভাইচৰ আপেক্ষিক স্থান নিৰ্ধাৰণ কৰিব পাৰে।"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"এপ্ আৰু সেৱাৰ বাবে অৱস্থানৰ এক্সেছ অফ কৰা আছে। আপুনি কোনো জৰুৰীকালীন নম্বৰলৈ কল কৰিলে অথবা বাৰ্তা পঠিয়ালে আপোনাৰ ডিভাইচৰ অৱস্থান তথাপি জৰুৰীকালীন পৰিস্থিতিত সঁহাৰি দিয়া লোকলৈ পঠিওৱা হ’ব পাৰে।"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"অৱস্থানৰ ছেটিঙৰ বিষয়ে অধিক জানক"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"সলনি কৰিবলৈ ChromeOS ছেটিং > গোপনীয়তা আৰু সুৰক্ষা > গোপনীয়তাৰ নিয়ন্ত্ৰণ > অৱস্থানৰ এক্সেছলৈ যাওক"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"মুখাৱয়ব আৰু <xliff:g id="WATCH">%s</xliff:g> যোগ দিয়া হৈছে"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"মুখাৱয়ব, ফিংগাৰপ্ৰিণ্ট আৰু <xliff:g id="WATCH">%s</xliff:g> যোগ দিয়া হৈছে"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"মুখাৱয়ব, ফিংগাৰপ্ৰিণ্ট আৰু <xliff:g id="WATCH">%s</xliff:g> যোগ দিয়া হৈছে"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"যিহেতু পৰিচয় পৰীক্ষা কৰাৰ সুবিধাটো অন হৈ আছে, এইটো আৱশ্যকীয়"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Authenticatorৰ দ্বাৰা দূৰৰ পৰা আনলক কৰা"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ঘড়ী যোগ দিয়া হৈছে"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"আপোনাৰ ঘড়ীটো ছেট আপ কৰক"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ঘড়ীৰ দ্বাৰা আনলক কৰাৰ সুবিধাটোৰ বিষয়ে অধিক জানক"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ঘড়ী যোগ দিয়ক"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ঘড়ীটো আঁতৰাওক"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ফিংগাৰপ্ৰিণ্ট আৰু ফে’চ আনলক কৰাৰ সুবিধা"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ফেচ আৰু ফিংগাৰপ্ৰিন্ট আনলক"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"কাৰ্যৰ বাবে ফে’চ আৰু ফিংগাৰপ্ৰিন্ট আনলক"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ছেটআপৰ আৱশ্যক"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"মুখাৱয়ব আৰু ফিংগাৰপ্ৰিণ্ট যোগ দিয়া হ’ল"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"এপ্সমূহ ইনষ্টল কৰক"</b>\n"আপুনি আপোনাৰ স্পে’চত ব্যক্তিগত কৰি ৰাখিব বিচৰা এপ্সমূহ ইনষ্টল কৰক"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"মনত ৰাখিব"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"আপুনি আপোনাৰ স্পে’চ লক কৰিলে এপ্সমূহ বন্ধ হৈ যায়"</b>\n"আপুনি আপোনাৰ স্পে’চ লক কৰিলে, আপোনাৰ স্পে’চত থকা এপ্সমূহ বন্ধ হৈ যায় আৰু আপুনি সেইসমূহৰ পৰা জাননী লাভ নকৰে"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"প্ৰাইভেট স্পে’চসমূহ নেপথ্যত চলিবলগীয়া বা জটিল জাননী প্ৰেৰণ কৰিবলগীয়া এপ্সমূহৰ বাবে উপযুক্ত নহয়, যেনে চিকিৎসা সম্পৰ্কীয় এপ্সমূহ। ইয়াৰ কাৰণ হৈছে আপোনাৰ স্পে’চ লক হ’লে জাননী আৰু নেপথ্যৰ কাৰ্যকলাপ বন্ধ কৰা হয়।\n\nআপোনাৰ প্ৰাইভেট স্পে’চ লক হ’লে আপোনাৰ প্ৰাইভেট স্পে’চত থকা এপ্সমূহ অনুমতি পৰিচালক, গোপনীয়তাৰ ডেশ্বব’ৰ্ড আৰু আন ছেটিংসমূহত প্ৰদৰ্শিত নহ’ব।\n\nআপোনাৰ প্ৰাইভেট স্পে’চ কোনো নতুন ডিভাইচলৈ নিব নোৱাৰি। আপুনি অন্য এটা ডিভাইচত প্ৰাইভেট স্পে’চ ব্যৱহাৰ কৰিব বিচাৰিলে আপুনি অন্য এটা প্ৰাইভেট স্পে’চ ছেট আপ কৰিব লাগিব।\n\nআপোনাৰ ডিভাইচটো কোনো কম্পিউটাৰৰ সৈতে সংযোগ কৰা বা আপোনাৰ ডিভাইচত ক্ষতিকাৰক এপ্ ইনষ্টল কৰা যিকোনো লোকে আপোনাৰ প্ৰাইভেট স্পে’চ এক্সেছ কৰিব পাৰিব পাৰে।"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"প্ৰাইভেট স্পে’চসমূহ নেপথ্যত চলিবলগীয়া বা জটিল জাননী প্ৰেৰণ কৰিবলগীয়া এপ্সমূহৰ বাবে উপযুক্ত নহয়, যেনে চিকিৎসা সম্পৰ্কীয় এপ্সমূহ। ইয়াৰ কাৰণ হৈছে আপোনাৰ স্পে’চ লক হ’লে জাননী আৰু নেপথ্যৰ কাৰ্যকলাপ বন্ধ কৰা হয়।\n\nপ্ৰাইভেট স্পে’চ লক হ’লে আপোনাৰ প্ৰাইভেট স্পে’চত থকা এপ্সমূহ অনুমতি পৰিচালক, গোপনীয়তাৰ ডেশ্বব’ৰ্ড আৰু আন ছেটিংসমূহত প্ৰদৰ্শিত নহ’ব।\n\nআপোনাৰ প্ৰাইভেট স্পে’চ কোনো নতুন ডিভাইচত পুনঃস্থাপন কৰিব নোৱাৰি। আপুনি অন্য এটা ডিভাইচত স্পে’চ ব্যৱহাৰ কৰিব বিচাৰিলে অন্য এটা স্পে’চ ছেট আপ কৰিব লাগিব।\n\nআপোনাৰ ডিভাইচটো কোনো কম্পিউটাৰৰ সৈতে সংযোগ কৰা বা আপোনাৰ ডিভাইচত ক্ষতিকাৰক এপ্ ইনষ্টল কৰা যিকোনো লোকে আপোনাৰ প্ৰাইভেট স্পে’চ এক্সেছ কৰিব পাৰিব পাৰে।"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"প্ৰাইভেট স্পে’চৰ বিষয়ে অধিক জানক"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ইয়াৰ বাবে কেইমুহূৰ্তমান লাগিব"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"প্ৰাইভেট স্পে\'চ ছেট আপ কৰি থকা হৈছে…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ডিভাইচটো ৰিষ্টাৰ্ট কৰিবনে?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"সবিশেষ NFC লগিং কেৱল বিকাশৰ উদ্দেশ্যে কৰা হয়। অতিৰিক্ত NFC ডেটা বাগ ৰিপ’ৰ্টসমূহত অন্তৰ্ভুক্ত কৰা হয়, য’ত ব্যক্তিগত তথ্য থাকিব পাৰে। এই ছেটিং সলনি কৰিবলৈ আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ৰিষ্টাৰ্ট কৰক"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"মিৰ’ৰ, বাহ্যিক ডিছপ্লে’, সংযুক্ত ডিছপ্লে’, ইউএছবি ডিছপ্লে’, ৰিজ’লিউশ্বন, ঘূৰ্ণন"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ঘূৰ্ণন"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"মানক"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"৯০°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"১৮০°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"২৭০°"</string>
+ <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="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>
@@ -900,7 +914,7 @@
<string name="wifi_notify_open_networks" msgid="2610323626246818961">"ৰাজহুৱা নেটৱৰ্কসমূহৰ বাবে জাননী দিয়ক"</string>
<string name="wifi_notify_open_networks_summary" msgid="191058832201741013">"এটা উচ্চ গুণমানৰ ৰাজহুৱা নেটৱৰ্ক উপলব্ধ হ\'লে মোক জনাওক"</string>
<string name="wifi_allow_wep_networks" msgid="8772342993235292010">"WEP নেটৱৰ্কক অনুমতি দিয়ক"</string>
- <string name="wifi_allow_wep_networks_summary" msgid="3033397893296724615">"WEP হৈছে এটা অধিক পুৰণি সুৰক্ষাৰ প্ৰট’কল, যিটো কম সুৰক্ষিত"</string>
+ <string name="wifi_allow_wep_networks_summary" msgid="3033397893296724615">"WEP হৈছে এটা অধিক পুৰণি সুৰক্ষাৰ প্ৰ্ৰ\'টকল, যিটো কম সুৰক্ষিত"</string>
<string name="wifi_allow_wep_networks_summary_carrier_not_allow" msgid="6298103289728210026">"আপোনাৰ বাহকে WEP নেটৱৰ্কক অনুমতি নিদিয়ে, কাৰণ সেইসমূহ কম সুৰক্ষিত"</string>
<string name="wifi_wakeup" msgid="3834327315861781611">"ৱাই-ফাই স্বয়ংক্ৰিয়ভাৱে অন কৰক"</string>
<string name="wifi_wakeup_summary" msgid="5778059083790221465">"ছেভ কৰি থোৱা উচ্চ মানৰ সংৰক্ষিত নেটৱৰ্ক পালেহে ৱাই-ফাই অন হ\'ব, যেনে আপোনাৰ ঘৰৰ নেটৱৰ্ক"</string>
@@ -923,10 +937,10 @@
<string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"ৱাই-ফাই স্কেনিং সুবিধাই ৱাই-ফাই অফ থকা অৱস্থাতো যিকোনো সময়ত এপ্ আৰু সেৱাসমূহক ৱাই-ফাই নেটৱৰ্ক স্কেন কৰিবলৈ দিয়ে। উদাহৰণস্বৰূপে, ইয়াক অৱস্থান আধাৰিত সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্যৱহাৰ কৰিব পাৰি।"</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"অন কৰক"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"ৱাই-ফাই স্কেনিং অন আছে"</string>
- <string name="wifi_settings_warning_wep_network" msgid="7032462362300663466">"এই নেটৱৰ্কটোৱে WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰট’কল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
+ <string name="wifi_settings_warning_wep_network" msgid="7032462362300663466">"এই নেটৱৰ্কটোৱে WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰ্ৰ\'টকল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
<string name="wifi_settings_wep_networks_blocked_title" msgid="8337700496544833669">"<xliff:g id="NAME">%1$s</xliff:g> অৱৰোধ কৰা হৈছে"</string>
- <string name="wifi_settings_wep_networks_summary_toggle_off" msgid="1113138364046142949">"এই নেটৱৰ্কটোৱে এটা কম সুৰক্ষিত অধিক পুৰণি WEP নামৰ সুৰক্ষাৰ প্ৰট’কল ব্যৱহাৰ কৰে। তথাপি সংযোগ কৰিবলৈ, আপুনি WEP নেটৱৰ্কক অনুমতি দিব পাৰে।"</string>
- <string name="wifi_settings_wep_networks_summary_blocked_by_carrier" msgid="5891581925109256871">"আপোনাৰ বাহকে আপোনাক এই নেটৱৰ্কটোৰ সৈতে সংযোগ কৰিবলৈ নিদিয়ে কাৰণ ই WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰট’কল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
+ <string name="wifi_settings_wep_networks_summary_toggle_off" msgid="1113138364046142949">"এই নেটৱৰ্কটোৱে এটা কম সুৰক্ষিত অধিক পুৰণি WEP নামৰ সুৰক্ষাৰ প্ৰ্ৰ\'টকল ব্যৱহাৰ কৰে। তথাপি সংযোগ কৰিবলৈ, আপুনি WEP নেটৱৰ্কক অনুমতি দিব পাৰে।"</string>
+ <string name="wifi_settings_wep_networks_summary_blocked_by_carrier" msgid="5891581925109256871">"আপোনাৰ বাহকে আপোনাক এই নেটৱৰ্কটোৰ সৈতে সংযোগ কৰিবলৈ নিদিয়ে কাৰণ ই WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰ্ৰ\'টকল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
<string name="wifi_settings_wep_networks_button_allow" msgid="2807926329019873706">"WEP অনুমতি দিয়ক"</string>
<string name="wifi_settings_ssid_block_button_close" msgid="3013886895576949908">"বন্ধ কৰক"</string>
<string name="wifi_settings_wep_networks_disconnect_title" msgid="2428960671702242156">"WEP নেটৱৰ্কসমূহৰ অনুমতি দিয়া বন্ধ কৰিবনে?"</string>
@@ -1051,7 +1065,7 @@
<string name="wifi_certificate_summary_system" msgid="6521297326433133669">"ছিষ্টেমৰ প্ৰমাণপত্ৰ"</string>
<string name="wifi_certificate_summary_pinning" msgid="5901067790901727957">"প্ৰমাণপত্ৰ পিন কৰা"</string>
<string name="wifi_details_title" msgid="222735438574597493">"নেটৱৰ্কৰ সবিশেষ"</string>
- <string name="wep_network_less_secure_warning_title" msgid="2118823633436946728">"এই নেটৱৰ্কটোৱে WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰট’কল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
+ <string name="wep_network_less_secure_warning_title" msgid="2118823633436946728">"এই নেটৱৰ্কটোৱে WEP নামৰ এটা পুৰণি সুৰক্ষাৰ প্ৰ্ৰ\'টকল ব্যৱহাৰ কৰে, যিটো কম সুৰক্ষিত"</string>
<string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ছাবনেট মাস্ক"</string>
<string name="server_name_title" msgid="7257095185810299066">"ছাৰ্ভাৰৰ নাম"</string>
<string name="wifi_type_title" msgid="2174893488722015838">"প্ৰকাৰ"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1463,8 +1478,8 @@
<string name="apn_mnc" msgid="1926382406843447854">"এমএনচি"</string>
<string name="apn_auth_type" msgid="4234397513494356932">"বিশ্বাসযোগ্যতা প্ৰমাণীকৰণৰ ধৰণ"</string>
<string name="apn_type" msgid="1835573305077788773">"এপিএনৰ প্ৰকাৰ"</string>
- <string name="apn_protocol" msgid="181529867160380010">"এপিএনৰ নিয়মপ্ৰণালী"</string>
- <string name="apn_roaming_protocol" msgid="1645131094105362513">"এপিএন ৰ\'মিঙৰ নিয়মপ্ৰণালী"</string>
+ <string name="apn_protocol" msgid="181529867160380010">"এপিএনৰ প্ৰ্ৰ\'টকল"</string>
+ <string name="apn_roaming_protocol" msgid="1645131094105362513">"এপিএন ৰ\'মিঙৰ প্ৰ্ৰ\'টকল"</string>
<string name="carrier_enabled" msgid="664074151573150130">"এপিএন সক্ষম/অক্ষম কৰক"</string>
<string name="carrier_enabled_summaryOn" msgid="5212067975273903381">"APN সক্ষম হৈছে"</string>
<string name="carrier_enabled_summaryOff" msgid="8541959867953738521">"এপিএন অক্ষম কৰা হৈছে"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"অন-স্ক্ৰীন কীব’ৰ্ড ব্যৱহাৰ কৰক"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"কায়িক কীব’ৰ্ড সক্ৰিয় হৈ থাকিলে ইয়াক স্ক্ৰীনত ৰাখিব"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"পইণ্টাৰ পূৰ কৰাৰ শৈলী হালধীয়া কৰক"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"পইণ্টাৰ পূৰ কৰাৰ শৈলী গুলপীয়া কৰক"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"পইণ্টাৰ পূৰ কৰাৰ শৈলী নীলা কৰক"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"পইণ্টাৰ ষ্ট্ৰোকৰ শৈলী"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"বগা"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ক’লা"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"নাই"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ব্যৱহাৰকাৰীয়ে বাছনি কৰা: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"কথন"</string>
<string name="pointer_speed" msgid="7398649279282675718">"পইণ্টাৰৰ বেগ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"পইণ্টাৰ স্কে’ল"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"পইণ্টাৰ স্কে’ল কমাওক"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"পইণ্টাৰ স্কে’ল বঢ়াওক"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"গেইম নিয়ন্ত্ৰক"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"কম্পনক পুনৰ নিৰ্দেশিত কৰক"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"গেইম নিয়ন্ত্ৰক সংযোজিত হ\'লে তালৈ কম্পন পঠিয়াওক"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"যি হ’লেও অব্যাহত ৰাখক"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"বাতিল কৰক"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বিবৰ্ধন কৰাৰ ছেটিং"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"এটা আঙুলিৰে পেনিং কৰা"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"১ টা আঙুলিৰে বিবৰ্ধক স্থানান্তৰ কৰক"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"স্ক্ৰীনত ইফাল-সিফাল কৰিবলৈ ১ টা আঙুলিৰে টানি আনি এৰক"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"এটা আঙুলিৰে টানি আনি এৰি দি বিবৰ্ধন কৰা অংশটো লৰচৰ কৰক।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"দুটা আঙুলিৰে টানি আনি এৰি দি বিবৰ্ধন কৰা অংশটো লৰচৰ কৰক।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"স্ক্ৰীনখনৰ কেৱল এটা অংশ বিবৰ্ধন কৰাৰ সময়ত উপলব্ধ নহয়"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"জুম কৰিবলৈ এটা বুটাম টিপক"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"সমলৰ আকাৰ ডাঙৰ কৰিবলৈ স্ক্ৰীনখনত ক্ষিপ্ৰভাৱে জুম ইন কৰক"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>জুম ইন কৰিবলৈ:</b><br/> {0,number,integer}। বিবৰ্ধনৰ সুবিধাটো আৰম্ভ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/> {1,number,integer}। স্ক্ৰীনখনত টিপক<br/> {2,number,integer}। স্ক্ৰীনৰ চাৰিওফালে ইফাল-সিফাল কৰিবলৈ ২ টা আঙুলিৰে টানি আনি এৰক<br/> {3,number,integer}। জুম মিলাবলৈ ২ টা আঙুলিৰে পিঞ্চ কৰক<br/> {4,number,integer}। বিবৰ্ধনৰ সুবিধাটো বন্ধ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/><br/><b>সাময়িকভাৱে জুম ইন কৰিবলৈ:</b><br/> {0,number,integer}। আপোনাৰ বিবৰ্ধনৰ প্ৰকাৰটো সম্পূৰ্ণ স্ক্ৰীনলৈ ছেট কৰাটো নিশ্চিত কৰক<br/> {1,number,integer}। বিবৰ্ধনৰ সুবিধাটো আৰম্ভ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/> {2,number,integer}। স্ক্ৰীনখনৰ যিকোনো স্থানত স্পৰ্শ কৰি ধৰি ৰাখক<br/> {3,number,integer}। স্ক্ৰীনৰ চাৰিওফালে ইফাল-সিফাল কৰিবলৈ আঙুলিৰে টানি আনি এৰক<br/> {4,number,integer}। বিবৰ্ধনৰ সুবিধাটো বন্ধ কৰিবলৈ আঙুলি উঠাওক"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>জুম ইন কৰিবলৈ:</b><br/> {0,number,integer}। বিবৰ্ধনৰ সুবিধাটো আৰম্ভ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/> {1,number,integer}। স্ক্ৰীনখনত টিপক<br/> {2,number,integer}। স্ক্ৰীনত ইফাল-সিফাল কৰিবলৈ ২ টা আঙুলিৰে টানি আনি এৰক<br/> {3,number,integer}। জুম মিলাবলৈ ২ টা আঙুলিৰে পিঞ্চ কৰক<br/> {4,number,integer}। বিবৰ্ধন বন্ধ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/><br/> আপুনি সাময়িকভাৱে জুম ইন কৰাৰ লগতে আৰু বহুতো কাৰ্য কৰিব পাৰে।"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>জুম ইন কৰিবলৈ:</b><br/> {0,number,integer}। বিবৰ্ধনৰ সুবিধাটো আৰম্ভ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/> {1,number,integer}। স্ক্ৰীনখনত টিপক<br/> {2,number,integer}। স্ক্ৰীনত ইফাল-সিফাল কৰিবলৈ ১ টা বা ২ টা আঙুলিৰে টানি আনি এৰক<br/> {3,number,integer}। জুম মিলাবলৈ ২ টা আঙুলিৰে পিঞ্চ কৰক<br/> {4,number,integer}। বিবৰ্ধন বন্ধ কৰিবলৈ শ্বৰ্টকাট ব্যৱহাৰ কৰক<br/><br/> আপুনি সাময়িকভাৱে জুম ইন কৰাৰ লগতে আৰু বহুতো কাৰ্য কৰিব পাৰে।"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"বিৱৰ্ধন অন কৰা থাকিলে আপুনি নিজৰ স্ক্রীনখনত জুম ইন কৰিব পাৰে।\n\n"<b>"জুম কৰিবলৈ"</b>", বিৱৰ্ধন আৰম্ভ কৰক আৰু তাৰ পাছত স্ক্রীনখনৰ যিকোনো ঠাইত টিপক।\n"<ul><li>"স্ক্ৰ’ল কৰিবলৈ ২টা অথবা ততোধিক আঙুলি স্ক্ৰীনত পিছলাওক"</li>\n<li>"জুম মিলাবলৈ স্ক্ৰীনত ২টা অথবা অধিক আঙুলিৰে টিপক"</li></ul>\n\n<b>"সাময়িকভাৱে জুম কৰিবলৈ"</b>"বিৱৰ্ধন আৰম্ভ কৰক, তাৰ পাছত স্ক্ৰীনৰ যিকোনো অংশত স্পৰ্শ কৰি হেঁচি ধৰক।\n"<ul><li>"স্ক্ৰীনখন ইফালে-সিফালে নিবলৈ আঙুলিৰে টানক"</li>\n<li>"জুম আউট কৰিবলৈ আঙুলি উঠাওক"</li></ul>\n\n"আপুনি কীব’ৰ্ড অথবা নেভিগেশ্বন বাৰ জুম কৰিব নোৱাৰে।"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> পৃষ্ঠাৰ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বৰ পৃষ্ঠা"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"সাধ্য সুবিধা বুটামৰ শ্বৰ্টকাট"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{এটাও নাই}=1{1 খন সময়সূচী ছেট কৰা হৈছে}one{# খন সময়সূচী ছেট কৰা হৈছে}other{# খন সময়সূচী ছেট কৰা হৈছে}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"অসুবিধা নিদিব"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"অগ্ৰাধিকাৰপ্ৰাপ্ত ম’ড"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"এটা ম’ড যোগ দিয়ক"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"কেৱল গুৰুত্বপূর্ণ লোক আৰু এপ্সমূহৰ পৰা জাননী পাওক"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"সক্ৰিয়কৰণৰ প্ৰকাৰ বাছনি কৰক"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"সময়"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"উদাহৰণস্বৰূপে, \"আবেলি ৯:৩০ বজাৰ পৰা ৫:০০ বজালৈ\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"কেলেণ্ডাৰ"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"উদাহৰণস্বৰূপে, \"ব্যক্তিগত কেলেণ্ডাৰ\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"এটা ম’ড সৃষ্টি কৰক"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"কাষ্টম"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বাধাবোৰ সীমিত কৰক"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"অসুবিধা নিদিব অন কৰক"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"এলাৰ্ম আৰু মিডিয়া ধ্বনিসমূহে ব্যাঘাত জন্মাব পাৰে"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"সময়সূচী"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"নিৰ্ধাৰিত সূচী মচক"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"মচক"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"নতুন নাম দিয়ক"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"মচক"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" ম’ড মচিবনে?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"সম্পাদনা কৰক"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"সময়সূচী"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"সময়সূচী"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"এখন কেলেণ্ডাৰ যোগ দিয়ক"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"আপোনাৰ কেলেণ্ডাৰ ব্যৱহাৰ কৰক"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"সময়সূচী"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"সময়সূচী ছেট কৰক"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"সময়সূচী"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ঘণ্টা, <xliff:g id="MINUTES">%2$d</xliff:g> মিনিট"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"স্বয়ংক্ৰিয়ভাৱে অন কৰক"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"সময়সূচী"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"নিৰ্দ্দিষ্ট সময়ৰ মূৰত ফ\'ন নিৰৱ কৰক"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"অসুবিধা নিদিবৰ নিয়ম ছেট কৰক"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ধ্বনিৰ সৃষ্টি কৰা বাধাসমূহৰ বাবে অনুমতি দিয়ক"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"দৃশ্যমান বিঘিনি প্ৰতিৰোধ কৰক"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"দৃশ্যমান সংকেতৰ অনুমতি দিয়ক"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পৰা জাননীসমূহ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"মন দি থাকক"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"অতিৰিক্ত কাৰ্য"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{অফ আছে}=1{অফ আছে / ১ টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন কৰিব পাৰি}one{অফ আছে / # টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন কৰিব পাৰি}other{অফ আছে / # টা ম’ড স্বয়ংক্ৰিয়ভাৱে অন কৰিব পাৰি}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ডিছপ্লে’ ছেটিং"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ডিছপ্লে’ৰ বিকল্পসমূহ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"গ্ৰে’স্কে’ল"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"গাঢ় ৰঙৰ থীম সক্ষম কৰক"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"OS আৰু এপ্সমূহক গাঢ় ৰঙৰ পটভূমিত পাতল ৰঙৰ পাঠ পছন্দ কৰিবলৈ সলনি কৰক, যি চকুৰ বাবে সহজ হ’ব পাৰে আৰু কিছুমান ডিভাইচত যথেষ্ট বেটাৰি সঞ্চয় কৰিবলৈ দিয়ে"</string>
<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}}one{{effect_1}, {effect_2} আৰু # অধিক}other{{effect_1}, {effect_2} আৰু # অধিক}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"বাধা ফিল্টাৰ কৰক"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"কোনো বাধা ফিল্টাৰ কৰা নহয়"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"জাননী খোলক"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"জাননী স্নুজ কৰাৰ অনুমতি দিয়ক"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"এপ্ চিহ্নত জাননী বিন্দু"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"জাননীৰ বাণ্ডল"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"এই বাৰ্তালাপটো বাবল কৰক"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"এই এপ্টোৱে উন্নত ছেটিং সমৰ্থন নকৰে"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"অধিক ছেটিং"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"এই এপ্টোৰ ভিতৰত অধিক ছেটিং উপলব্ধ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"জাননী কুলডাউন কৰা"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"কৰ্মস্থানৰ প্ৰ’ফাইলত প্ৰয়োগ কৰক"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ এপত প্ৰয়োগ কৰক"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"শ্ৰেণী"</string>
<string name="notification_channels_other" msgid="18159805343647908">"অন্যান্য"</string>
<string name="no_channels" msgid="4716199078612071915">"এই এপটোৱে এটাও জাননী দিয়া নাই"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"অব্যৱহৃত শিতানসমূহ দেখুৱাওক"</string>
<string name="app_settings_link" msgid="6725453466705333311">"এপত থকা অতিৰিক্ত ছেটিং"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"অব্যৱহৃত শিতানসমূহ দেখুৱাওক"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"অব্যৱহৃত শিতানসমূহ লুকুৱাওক"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ব্যাঘাত জন্মাব পৰা এপ্"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"বাছনি কৰা এপ্"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"এটাও নহয়"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"আটাইবোৰ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"এপক অ\'ভাৰৰাইডৰ অনুমতি দিয়ক"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ব্যাঘাত জন্মাব পৰা এপ্সমূহ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"অধিক এপ্ বাছনি কৰক"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"কোনেও ব্যাঘাত জন্মাব নোৱাৰে"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"কিছুমান মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"সকলো মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"পুনৰাই কল কৰা লোকসকল"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"পুনৰাই কল কৰা লোকসকলক অনুমতি দিয়ক"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} পৰ্যন্ত কেৱল এঘণ্টাৰ বাবে এলাৰ্মলৈ সলনি কৰক}one{{time} পৰ্যন্ত কেৱল # ঘণ্টাৰ বাবে এলাৰ্মলৈ সলনি কৰক}other{{time} পৰ্যন্ত কেৱল # ঘণ্টাৰ বাবে এলাৰ্মলৈ সলনি কৰক}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"কেৱল <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পৰ্যন্ত এলাৰ্ম সলনি কৰক"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"সদায় ব্যাঘাত জন্মোৱা ছেটিঙলৈ সলনি কৰক"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ম’ড যোগ দিয়ক"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ম’ড যোগ দিয়ক"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"কাষ্টম ক’ড"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ম’ডৰ নাম"</string>
<string name="warning_button_text" msgid="1274234338874005639">"সকীয়নি"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"বন্ধ কৰক"</string>
<string name="device_feedback" msgid="5351614458411688608">"ডিভাইচটো ব্যৱহাৰ কৰি কেনে লাগিছে জনাওক"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"বলপূৰ্বক ডেস্কটপ ম’ড"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"দ্বিতীয় ডিছপ্লে’ত পৰীক্ষামূলক ডেস্কটপ ম’ড বলপূৰ্বকভাৱে প্ৰয়োগ কৰক"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ফ্ৰীফৰ্ম ৱিণ্ড’ সক্ষম কৰক"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ফ্ৰীফৰ্ম ৱিণ্ড’ৰ সমৰ্থন সক্ষম কৰক।"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"দ্বিতীয় ডিছপ্লে’ত ফ্ৰীফৰ্ম ৱিণ্ড’ৱিং সক্ষম কৰক"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"কেৱল গৌণ ডিছপ্লে’ত ফ্ৰীফৰ্ম ৱিণ্ড’ সক্ষম কৰক।"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"একাধিক ৱিণ্ড’ত আকাৰ সলনি কৰিব নোৱৰা সুবিধাটো সক্ষম কৰক"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"আকাৰ সলনি কৰিব নোৱৰা এপক একাধিক ৱিণ্ড’ত থকাৰ অনুমতি দিয়ে"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"বলপূর্বকভাৱে গাঢ় ৰঙৰ থীম ব্যৱহাৰ কৰা সুবিধাটো অ\'ভাৰৰাইড কৰক"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"১৬ কেবি বিকাশকৰ্তাৰ বিকল্প ব্যৱহাৰ কৰাৰ আগতে এই ডিভাইচৰ ডেটা বিভাজন ext4 লৈ ৰূপান্তৰ কৰিব লাগিব। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। ১৬ কেবি বিকল্প সক্ৰিয় কৰাৰ বাবে ইয়াৰ পাছত আৰু এবাৰ ৰিবুট কৰাৰ প্ৰয়োজন হ’ব। আপুনি এবাৰ এই ম’ডত থাকিলে, আপুনি এবাৰ ৰিবুট কৰিয়েই ৪ কেবি আৰু ১৬ কেবি ম’ডৰ মাজত আগ-পিছ কৰিব পাৰিব। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। ডিভাইচটোক উৎপাদন ম’ডলৈ উভতাই নিবলৈ, আপুনি ৪ কেবি ম’ডলৈ পুনৰ সলনি কৰিব লাগিব আৰু বুটল’ডাৰ লক কৰিব লাগিব, যিয়ে ডিভাইচটো ফেক্টৰী ৰিছেট কৰে। ডিভাইচটোৱে Androidত সফলতাৰে বুট কৰাৰ পাছত, বিকাশকৰ্তাৰ বিকল্পসমূহত OEM আনলক কৰাটো অক্ষম কৰক। ডিভাইচটো মচি পেলোৱা হ’ব আৰু নিশ্চিতকৰণৰ পাছত ফাইলছিষ্টেম ext4লৈ সলনি কৰা হ’ব। এইটো সম্পূৰ্ণ হোৱাৰ পাছত, ১৬ কেবি পুনৰ সক্ষম কৰিবলৈ কৰিবলৈ অনুগ্ৰহ কৰি উভতি আহক।"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"আটাইবোৰ ডেটা মচক"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ডেটা বিভাজন মচিব আৰু ext4 হিচাপে পুনৰ ফৰ্মেট কৰিব পৰা নগ’ল।"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"১৬ কেবি ম’ডৰ বাবে বুটল’ডাৰ আনলক কৰাৰ প্ৰয়োজন"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"বুটল’ডাৰ আনলক কৰাৰ আৱশ্যক"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"১৬ কেবি বিকাশকৰ্তাৰ বিকল্প ব্যৱহাৰ কৰাৰ আগতে এই ডিভাইচত বুটল’ডাৰ আনলক কৰিব লাগিব। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। ১৬ কেবি ম’ড সক্ৰিয় কৰাৰ সময়ত ব্যৱহাৰকাৰীৰ আটাইবোৰ ডেটা আৰু ছেটিং মচি পেলোৱা হ’ব। এবাৰ বুটল’ডাৰ আনলক কৰা হ’লে, ১৬ কেবি বিকল্প সক্ৰিয় কৰিবলৈ দুবাৰ ৰিবুট কৰাৰ প্ৰয়োজন হ’ব। আপুনি এবাৰ এই ম’ডত থাকিলে, আপুনি এবাৰ ৰিবুট কৰিয়েই ৪ কেবি আৰু ১৬ কেবি ম’ডৰ মাজত আগ-পিছ কৰিব পাৰিব। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। ডিভাইচটোক উৎপাদন ম’ডলৈ উভতাই নিবলৈ, আপুনি ৪ কেবি ম’ডলৈ পুনৰ সলনি কৰিব লাগিব আৰু ডিভাইচটো OEM/বুটল’ডাৰ লক (যিয়ে ফেক্টৰী ৰিছেট কৰে) কৰিব লাগিব। অনুগ্ৰহ কৰি বুটল’ডাৰ আনলক কৰক আৰু পুনৰ চেষ্টা কৰক। আপুনি এইটো কেনেকৈ কৰিব লাগে তাৰ নিৰ্দেশনা <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>ত চাব পাৰে"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"৪ কেবি পেজ-এগন’ষ্টিক ম’ড ব্যৱহাৰ কৰি থকা হৈছে"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ৪ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। অধিক পঢ়িবলৈ টিপক।"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ৪ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। ই ডিভাইচটো পুনৰ ফেক্টৰী ৰিছেট কৰিব আৰু সেইটোক উৎপাদন ছেটিঙলৈ পুনঃস্থাপন কৰিব। ডিভাইচটোৱে Androidত সফলতাৰে বুট কৰাৰ পাছত, বিকাশকৰ্তাৰ বিকল্পসমূহত OEM আনলক কৰাটো অক্ষম কৰক। যদি ডিভাইচটো Androidত বুট কৰিব পৰা নাযায় বা অস্থিৰ হয়, তেন্তে <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>ৰ পৰা শেহতীয়া ফেক্টৰী প্ৰতিচ্ছবিসমূহৰ সৈতে ডিভাইচটো পুনৰ ফ্লেশ্ব কৰক আৰু \'ডিভাইচ মচি পেলাওক\', \'বুটল’ডাৰ লক কৰক\' আৰু \'আটাইবোৰ বিভাজন বলপূৰ্বক ফ্লেশ্ব কৰক\' বাছনি কৰক।"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"১৬ কেবি পেজ-এগন’ষ্টিক ম’ড ব্যৱহাৰ কৰি থকা হৈছে"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ১৬ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি 4K ম’ডলৈ উভতি যাবই লাগিব আৰু তাৰ পাছত ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। অধিক পঢ়িবলৈ টিপক।"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ১৬ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি 4K ম’ডলৈ উভতি যাবই লাগিব আৰু তাৰ পাছত ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। ই ডিভাইচটো পুনৰ ফেক্টৰী ৰিছেট কৰিব আৰু সেইটোক উৎপাদন ছেটিঙলৈ পুনঃস্থাপন কৰিব। ডিভাইচটোৱে Androidত সফলতাৰে বুট কৰাৰ পাছত, বিকাশকৰ্তাৰ বিকল্পসমূহত OEM আনলক কৰাটো অক্ষম কৰক। যদি ডিভাইচটো Androidত বুট কৰিব পৰা নাযায় বা অস্থিৰ হয়, তেন্তে <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>ৰ পৰা শেহতীয়া ফেক্টৰী প্ৰতিচ্ছবিসমূহৰ সৈতে ডিভাইচটো পুনৰ ফ্লেশ্ব কৰক আৰু \'ডিভাইচ মচি পেলাওক\', \'বুটল’ডাৰ লক কৰক\' আৰু \'আটাইবোৰ বিভাজন বলপূৰ্বক ফ্লেশ্ব কৰক\' বাছনি কৰক।"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ১৬ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি ৪ কেবি ম’ডলৈ উভতি যাবই লাগিব আৰু তাৰ পাছত ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। অধিক পঢ়িবলৈ টিপক।"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"আপুনি পেজ-এগন’ষ্টিক ম’ডৰ ১৬ কেবি ম’ডত আছে। এই ম’ডত ছফ্টৱেৰৰ অখণ্ডতা নিশ্চিত কৰিব নোৱাৰি আৰু বুটল’ডাৰ আনলক হৈ থকাৰ সময়ত ফ’নত ষ্ট’ৰ কৰা যিকোনো ডেটাৰ ক্ষেত্ৰত বিপদাশংকা থাকিব পাৰে। এই ম’ডসমূহত কিছুমান সুবিধা অক্ষম কৰা হ’ব, গতিকে কিছুমান এপ্লিকেশ্বনে কাম নকৰিবও পাৰে। উৎপাদন ম’ডত পুনৰ প্ৰৱেশ কৰিবলৈ, আপুনি ৪ কেবি ম’ডলৈ উভতি যাবই লাগিব আৰু তাৰ পাছত ডিভাইচৰ বুটল’ডাৰ লক কৰিবই লাগিব। ই ডিভাইচটো পুনৰ ফেক্টৰী ৰিছেট কৰিব আৰু সেইটোক উৎপাদন ছেটিঙলৈ পুনঃস্থাপন কৰিব। ডিভাইচটোৱে Androidত সফলতাৰে বুট কৰাৰ পাছত, বিকাশকৰ্তাৰ বিকল্পসমূহত OEM আনলক কৰাটো অক্ষম কৰক। যদি ডিভাইচটো Androidত বুট কৰিব পৰা নাযায় বা অস্থিৰ হয়, তেন্তে <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>ৰ পৰা শেহতীয়া ফেক্টৰী প্ৰতিচ্ছবিসমূহৰ সৈতে ডিভাইচটো পুনৰ ফ্লেশ্ব কৰক আৰু \'ডিভাইচৰ ডেটা মচি পেলাওক\', \'বুটল’ডাৰ লক কৰক\' আৰু \'আটাইবোৰ বিভাজন বলপূৰ্বক ফ্লেশ্ব কৰক\' বাছনি কৰক।"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"১৬ কেবি পেজ-এগন’ষ্টিক ম’ড"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"অধিক পঢ়ক"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"বাগ ৰিপ’ৰ্ট নিয়ন্ত্ৰণ কৰোঁতা"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"এপ্ পিন কৰাৰ সুবিধাটো ব্যৱহাৰ কৰক"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"বিকাশকৰ্তাৰ বিকল্পসমূহ ব্যৱহাৰ কৰক"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"প্ৰিণ্ট সেৱা ব্যৱহাৰ কৰক"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"একাধিক ব্যৱহাৰকাৰীৰ অনুমতি দিয়ক"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ব্যৱহাৰকাৰী সলনি কৰাৰ অনুমতি দিয়ক"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"অনুমতি দিয়ক, একাধিক,ব্যৱহাৰকাৰী, অনুমতি, বহুত"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"একাধিক, ব্যৱহাৰকাৰী, প্ৰ’ফাইল, লোকসকল, একাউণ্ট, ছুইচ, বহুত"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ৱায়াৰলেচ ডি’বাগিং ব্যৱহাৰ কৰক"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"আপোনাৰ টেবলেটটো লক হৈ থাকিলে আপুনি সেইটোৰ স্ক্ৰীনত কি দেখা পাব সেয়া বাছনি কৰক। স্ক্ৰীন ছেভাৰ ব্যৱহাৰ কৰাৰ সময়ত আপোনাৰ ডিভাইচটোৱে হয়তো অধিক শক্তি ব্যৱহাৰ কৰিব।"</string>
<string name="customize_button_title" msgid="1110284655990203359">"কাষ্টমাইজ কৰক"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> কাষ্টমাইজ কৰক"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ফ্ৰীফৰ্ম সমৰ্থন সক্ষম কৰিবৰ বাবে ৰিবুটৰ প্ৰয়োজন।"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"গৌণ ডিছপ্লেত ডেস্কটপ ম’ড সক্ষম কৰিবৰ বাবে ৰিবুটৰ প্ৰয়োজন।"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"লিগেচী ফ্ৰীফৰ্ম ৱিণ্ড’ৱিং সমৰ্থন সক্ষম কৰিবলৈ এবাৰ ৰিবুট কৰাৰ আৱশ্যক।"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ফ্ৰীফৰ্ম ৱিণ্ড’ৱিঙৰ সমৰ্থন সলনি কৰিবলৈ এবাৰ ৰিবুট কৰাৰ আৱশ্যক।"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"গৌণ ডিছপ্লে’ত বলপূৰ্বকভাৱে ফ্ৰীফৰ্ম ৱিণ্ড’ৱিং কৰাৰ বাবে এবাৰ ৰিবুট কৰাৰ আৱশ্যক।"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"এতিয়াই ৰিবুট কৰক"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"পাছত ৰিবুট কৰক"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"প্ৰকৃত অভিজ্ঞতা প্ৰদান কৰা অডিঅ’"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"অন আছে"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"অফ আছে"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"অন আছে"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"অডিঅ’ %1$d%% বাওঁ, %2$d%% সোঁ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"অডিঅ’ %1$d%% সোঁ, %2$d%% বাওঁ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"আপোনাৰ ডিভাইচৰ নাম আপুনি ইনষ্টল কৰা এপত দেখা পোৱা যায়। আপুনি ব্লুটুথ ডিভাইচৰ সৈতে সংযোগ কৰিলে, ৱাই-ফাই নেটৱৰ্কৰ সৈতে সংযোগ কৰিলে অথবা ৱাই-ফাই হটস্পট ছেট আপ কৰিলে এইটো অন্য লোকেও দেখা পাব পাৰে।"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ব্যাকৰণ বিষয়ক লিংগ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ব্যাকৰণ বিষয়ক লিংগ বাছনি কৰক"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"সন্ধানৰ ছেটিংসমূহ"</string>
</resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 93d30f7..118e445 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Yuxu vaxtı"</item>
+ <item msgid="4152450357280759894">"Sürücülük"</item>
+ <item msgid="7096549258219399423">"İmmersiv"</item>
+ <item msgid="2760716776980432977">"İdarə edilən"</item>
+ <item msgid="601734478369121764">"Ulduz"</item>
+ <item msgid="6243809315432780521">"Təqvim"</item>
+ <item msgid="4913577903148415331">"Vaxt"</item>
+ <item msgid="3653377604690057780">"Teatr"</item>
+ <item msgid="3843711267408385410">"Çiçək"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 9d63c289..b7bc39f 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Cihaz ayrılsın?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Cihaz əlavə edin"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Sabah avtomatik aktiv edin"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Eşitmə cihazı ayarları"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Qısayol, eşitmə cihazı uyğunluğu"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Hazır ayar"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Audioloq tərəfindən proqramlaşdırılmış hazır ayar yoxdur"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Hazır ayar güncəllənmədi"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio çıxışı"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio çıxışı haqqında"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Deaktiv"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aktiv / # tətbiqin məkana girişi var}other{Aktiv / # tətbiqin məkana girişi var}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Yüklənir…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"\"Yaxınlıqdakı cihazlar\" icazəsi olan tətbiqlər qoşulmuş cihazların nisbi mövqeyini təyin edə bilər."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Yaxınlıqdakı cihazlar icazəsi olan tətbiqlər qoşulmuş cihazların nisbi mövqeyini təyin edə bilər."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Tətbiqlər və xidmətlər üçün məkan girişi deaktivdir. Təcili yardım nömrəsinə zəng etdikdə və ya mesaj göndərdikdə cihazınızın məkanı hələ də təcili yardım əməkdaşlarına göndərilə bilər."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Məkan ayarları haqqında ətraflı məlumat"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Dəyişmək üçün ChromeOS ayarları > Məxfilik və güvənlik > Məxfilik nizamlayıcıları > Məkana giriş bölməsinə keçin"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Üz və <xliff:g id="WATCH">%s</xliff:g> əlavə edilib"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Üz, barmaq izi və <xliff:g id="WATCH">%s</xliff:g> əlavə edilib"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Üz, barmaq izləri və <xliff:g id="WATCH">%s</xliff:g> əlavə edilib"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Kimlik yoxlanışı aktiv olduğu üçün lazımdır"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Uzaqdan doğrulayıcı kilidaçması"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Saat əlavə edildi"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Saatı ayarlayın"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saatla Kilidaçma haqqında ətraflı məlumat"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Saat əlavə edin"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Saatı silin"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Barmaq İzi və Üz ilə Kiliddən Açma"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Üz və barmaq izi ilə kiliddən çıxarma"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"İş üçün Üz və Barmaq izi ilə kiliddən çıxarma"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Ayarlamaq lazımdır"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Üz və barmaq izləri əlavə edildi"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Tətbiqlər quraşdırın"</b>\n"Sahənizdə məxfi saxlamaq istədiyiniz tətbiqləri quraşdırın"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Nəzərdə saxlayın"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Sahəni kilidlədikdə tətbiqlər dayanır"</b>\n"Sahəni kilidlədikdə sahədəki tətbiqlər dayandırılır və onlardan bildirişlər almayacaqsınız"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Şəxsi sahələr arxa fonda icra edilməli və ya tibbi tətbiqlər kimi kritik bildirişlər göndərməli olan tətbiqlər üçün uyğun deyil. Bunun səbəbi sahə kilidləndikdə bildirişlərin və arxa fon fəaliyyətinin dayandırılmasıdır.\n\nŞəxsi sahə kilidləndikdə şəxsi sahədəki tətbiqlər icazə menecerində, məxfilik panelində və digər ayarlarda görünməyəcək.\n\nŞəxsi sahə yeni cihaza köçürülə bilməz. Başqa cihazda istifadə etmək istəsəniz, başqa şəxsi sahə ayarlamalısınız.\n\nCihazı kompüterə qoşan və ya cihazda zərərli tətbiqlər quraşdıran istənilən şəxs şəxsi sahəyə daxil ola bilər."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Şəxsi sahələr arxa fonda icra edilməli və ya tibbi tətbiqlər kimi kritik bildirişlər göndərməli olan tətbiqlər üçün uyğun deyil. Bunun səbəbi sahə kilidləndikdə bildirişlərin və arxa fon fəaliyyətinin dayandırılmasıdır.\n\nŞəxsi sahə kilidləndikdə şəxsi sahədəki tətbiqlər icazə menecerində, məxfilik panelində və digər ayarlarda görünməyəcək.\n\nŞəxsi sahə yeni cihaza bərpa edilə bilməz. Başqa cihazda istifadə etmək istəsəniz, başqa sahə ayarlamalısınız.\n\nCihazı kompüterə qoşan və ya cihazınızda zərərli tətbiqlər quraşdıran istənilən şəxs şəxsi sahəyə daxil ola bilər."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Şəxsi sahə haqqında ətraflı məlumat"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Bir neçə dəqiqə çəkəcək"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Məxfi yer ayarlanır…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Cihaz yenidən başladılsın?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detallı NFC qeydi yalnız inkişaf məqsədləri üçün nəzərdə tutulub. Əlavə NFC məlumatları şəxsi məlumatları ehtiva edə bilən baq hesabatlarına daxil edilir. Bu ayarı dəyişmək üçün cihazı yenidən başladın."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Yenidən başladın"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"əksetdirmə, xarici displey, qoşulu displey, usb displey, ayırdetmə dəqiqliyi, fırlanma"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Fırlanma"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standart"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Ekran klaviaturası istifadə edin"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Fiziki klaviatura aktiv olanda görünsün"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Poynter doldurma üslubunu sarıya dəyişin"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Poynter doldurma üslubunu çəhrayıya dəyişin"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Poynter doldurma üslubunu maviyə dəyişin"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Poynterin vuruş tərzi"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Ağ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Qara"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Yoxdur"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"İstifadəçi seçib: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Nitq"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kursor sürəti"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Poynter miqyası"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Poynter miqyasını azaldın"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Poynter miqyasını artırın"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Oyun Kontrolleri"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibrasiyanı yenidən yönləndirin"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Qoşulduqda oyun nəzarətinə vibrasiya göndərin"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Yenə də davam edin"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Ləğv edin"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Böyütmə ayarları"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Bir barmaqla hərəkət"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 barmaq ilə böyüdücünü hərəkət etdirin"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Ekranda hərəkət üçün 1 barmağı sürüşdürün"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Bir barmaqla sürüşdürməklə böyütmə sahəsini hərəkət etdirin."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"İki barmaqla sürüşdürməklə böyütmə sahəsini hərəkət etdirin."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Yalnız ekranın bir hissəsini böyüdərkən əlçatan deyil"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Yaxınlaşdırmaq üçün düyməyə klikləyin"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Məzmunu böyütmək üçün ekranı sürətlə yaxınlaşdırın"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Yaxınlaşdırmaq üçün:</b><br/> {0,number,integer}. Böyütməyə başlamaq üçün qısayoldan istifadə edin<br/> {1,number,integer}. Ekrana toxunun<br/> {2,number,integer}. Ekranın ətrafında hərəkət etmək üçün 2 barmağınızı sürüşdürün<br/> {3,number,integer}. Miqyası tənzimləmək üçün 2 barmaqla yaxınlaşdırıb-uzaqlaşdırın<br/> {4,number,integer}. Böyütməni dayandırmaq üçün qısayoldan istifadə edin<br/><br/> <b>Müvəqqəti böyütmək üçün:</b><br/> {0,number,integer}. Böyütmə növünün tam ekrana ayarlandığına əmin olun<br/> {1,number,integer}. Böyütməyə başlamaq üçün qısayoldan istifadə edin<br/> {2,number,integer}. Ekranın istənilən yerinə toxunub saxlayın<br/> {3,number,integer}. Ekranın ətrafında hərəkət etmək üçün barmağınızı sürüşdürün<br/> {4,number,integer}. Böyütməni dayandırmaq üçün barmağınızı qaldırın"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Yaxınlaşdırmaq üçün:</b><br/> {0,number,integer}. Böyütməyə başlamaq üçün qısayoldan istifadə edin<br/> {1,number,integer}. Ekrana toxunun<br/> {2,number,integer}. Ekranda hərəkət etmək üçün 2 barmağı sürüşdürün<br/> {3,number,integer}. Miqyası tənzimləmək üçün 2 barmaqla yaxınlaşdırıb-uzaqlaşdırın<br/> {4,number,integer}. Böyütməni dayandırmaq üçün qısayoldan istifadə edin<br/><br/> Həmçinin müvəqqəti böyüdə və s. əməliyyatları edə bilərsiniz."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Yaxınlaşdırmaq üçün:</b><br/> {0,number,integer}. Böyütməyə başlamaq üçün qısayoldan istifadə edin<br/> {1,number,integer}. Ekrana toxunun<br/> {2,number,integer}. Ekranda hərəkət etmək üçün 1 və ya 2 barmağı sürüşdürün<br/> {3,number,integer}. Miqyası tənzimləmək üçün 2 barmaqla yaxınlaşdırıb-uzaqlaşdırın<br/> {4,number,integer}. Böyütməni dayandırmaq üçün qısayoldan istifadə edin<br/><br/> Həmçinin müvəqqəti böyüdə və s. əməliyyatları edə bilərsiniz."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Böyütmə aktiv edildikdə ekranda yaxınlaşdıra bilərsiniz.\n\n"<b>"Miqyası dəyişmək üçün"</b>" böyütməni başlatdıqdan sonra ekranda istənilən yerə toxunun.\n"<ul><li>"Sürüşdürmək üçün ən azı 2 barmağınızla çəkin"</li>\n<li>"Miqyası tənzimləmək üçün ən azı 2 barmağınızla sürüşdürərək yaxınlaşdırın"</li></ul>\n\n<b>"Miqyası müvəqqəti dəyişmək üçün"</b>" böyütməni başladıb ekranda istənilən yerə basın & saxlayın.\n"<ul><li>"Ekranda hərəkət etmək üçün çəkin"</li>\n<li>"Uzaqlaşdırmaq üçün barmağınızı qaldırın"</li></ul>\n\n"Klaviatura və ya naviqasiya panelində yaxınlaşdıra bilməzsiniz."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Səhifə <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Xüsusi imkanlar düyməsi qısayolu"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Heç biri}=1{1 cədvəl ayarlanıb}other{# cədvəl ayarlanıb}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Narahat etməyin"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritet rejimləri"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Rejim əlavə edin"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnız vacib şəxs və tətbiqlərdən bildiriş alın."</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Aktivləşdirmə növü seçin"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Vaxt"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Nümunə: \"09:30-17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Təqvim"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Nümunə: \"Şəxsi təqvim\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Rejim yaradın"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Fərdi"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kəsintiləri məhdudlaşdırın"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Narahat Etməyin\" rejimini aktiv edin"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Siqnallar və media səsləri narahat edə bilər"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Cədvəllər"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Rejimləri silin"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Silin"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Yenidən adlandırın"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Silin"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" rejimi silinsin?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Redaktə edin"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Cədvəllər"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Rejim"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Təqvim əlavə edin"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Təqvim istifadə edin"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Cədvəl"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Cədvəl ayarlayın"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Cədvəl"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> saat <xliff:g id="MINUTES">%2$d</xliff:g> dəq"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Avtomatik yandırın"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Rutin"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Müəyyən vaxtlarda telefonu səssiz edin"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\"Narahat etməyin\" qaydaları ayarlayın"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Səsli xəbərdarlıqlara icazə verin"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vizual fəsadları blok edin"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Görünən siqnallara icazə verin"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Sizə gələ biləcək bildirişlər"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Diqqətinizi cəmləyin"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Əlavə əməliyyatlar"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Sönülü}=1{Sönülü / 1 rejim avtomatik işə düşə bilər}other{Sönülü / # rejim avtomatik işə düşə bilər}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Displey ayarları"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Displey seçimləri"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Boz çalarlı"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"tünd temanı aktivləşdirin"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Qaranlıq arxa fonda açıq mətnə üstünlük vermək üçün ƏS və tətbiqləri dəyişin. Bu, gözləri daha az yora bilər və bəzi cihazlarda əhəmiyyətli enerji qənaəti təmin edir."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Displey dəyişikliyi yoxdur}=1{{effect_1}}=2{{effect_1} və {effect_2}}=3{{effect_1}, {effect_2} və {effect_3}}other{{effect_1}, {effect_2} və daha # effekt}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Kəsintiləri filtrləyin"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Kəsinti filtrlənməyib"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Filtrlənmiş bildirişlər üzrə seçimləri göstərin"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"\"Narahat Etməyin\" rejimi aktiv olduqda"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirişlər səssiz olsun"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"bildirişi açın"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Bildirişin ertələnməsinə icazə verin"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Tətbiq ikonunda bildiriş nöqtəsi"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Bildiriş paketləri"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Köpüklər"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Köpüklər"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Söhbət üzə çıxsın"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Bu tətbiq geniş ayarları dəstəkləmir"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Digər ayarlar"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Bu tətbiqdə başqa ayarlar da var"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Bildiriş səsinin azaldılması"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kateqoriyalar"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Digər"</string>
<string name="no_channels" msgid="4716199078612071915">"Bu tətbiq heç bir bildiriş paylaşmayıb"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"İstifadəsiz kateqoriyaları göstərin"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Tətbiqdə əlavə ayarlar"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"İstifadəsiz kateqoriyaları göstərin"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"İstifadəsiz kateqoriyaları gizlədin"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Mane ola biləcək tətbiqlər"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Seçilmiş tətbiqlər"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Heç biri"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Hamısı"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Daha çox tətbiq seçin"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Heç nə narahat edə bilməz"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Heç kim narahat edə bilməz"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Bəzi şəxslər narahat edə bilər"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Bütün şəxslər narahat edə bilər"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Təkrar zəng edənlər"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Təkrarlanan zənglərə icazə verin"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Yalnız bu vaxtadək bir saatlıq xəbərdarlıqlara dəyişin: {time}}other{Yalnız bu vaxtadək # saatlıq xəbərdarlıqlara dəyişin: {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Yalnız <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> vaxtınadək xəbərdarlıqları dəyişin"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Həmişə fasiləyə dəyişin"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Redaktə rejimi"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Rejim əlavə edin"</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="warning_button_text" msgid="1274234338874005639">"Xəbərdarlıq"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Bağlayın"</string>
<string name="device_feedback" msgid="5351614458411688608">"Bu cihaz haqqında fikrinizi bildirin"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Qutu"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batareya"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Ayarlar Paneli"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Masaüstü rejiminə keçid məcburi olsun"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Əlavə ekranlarda masaüstünün eksperimental rejiminə keçid məcburi olsun"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"İxtiyari formada pəncərələri aktivləşdirin"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"İxtiyari formada pəncərələr üçün dəstəyi aktivləşdirin."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"İkinci displeydə ixtiyari formada pəncərə imkanı"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"İxtiyari formada pəncərələri yalnız ikinci displeydə aktivləşdirin."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Dəyişməyən miqyas çoxpəncərəli rejimdə açılsın"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Miqyası dəyişməyən tətbiqləri çoxpəncərəli rejimdə açır"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"icbari qaranlıq rejim etibarsız edilsin"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB developer seçimindən istifadə etməzdən əvvəl bu cihazın data bölməsi ext4-ə çevrilməlidir. 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. 16 KB seçimini aktivləşdirmək üçün bundan sonra daha bir yenidən başlatma tələb ediləcək. Bu rejimdə bir dəfə yenidən başlatma ilə 4KB və 16KB rejimi arasında dəyişə bilərsiniz. Bu rejimlərdə bəzi funksiyalar deaktiv ediləcək, buna görə də bəzi proqramlar işləməyə bilər. Cihazı istehsal rejiminə qaytarmaq üçün 4KB rejiminə qaytarmalı və sonra yükləyicini kilidləməlisiniz ki, bu da cihazı zavod ayarlarına sıfırlayır. Cihaz Android-ə yükləndikdən sonra Developer seçimlərində OEM kiliddən çıxarılmasını deaktiv edin. Təsdiqdən sonra cihaz datası silinəcək və fayl sistemi ext4-ə dəyişdiriləcək. Bu tamamlandıqdan sonra 16KB-ni yenidən aktivləşdirmək üçün geri qayıdın."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Bütün datanı silin"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Data bölməsini yenidən formatlamaq və ext4-ə ayarlamaq alınmadı."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB rejimi üçün yükləyici kilidaçması tələb edilir"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Yükləyici kilidaçması tələb edilir"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Bu cihaz 16KB developer seçimindən istifadə etməzdən əvvəl yükləyicinin kilidini açmalıdır. 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. 16KB rejimi aktivləşdirildikdə bütün istifadəçi datası və ayarları silinəcək. Yükləyici kilidi açıldıqdan sonra 16KB seçimini aktivləşdirmək üçün iki dəfə yenidən başlatma tələb olunacaq. Bu rejimdə bir dəfə yenidən başlatma ilə 4KB və 16KB rejimi arasında dəyişə bilərsiniz. Bu rejimlərdə bəzi funksiyalar deaktiv ediləcək, buna görə də bəzi proqramlar işləməyə bilər. Cihazı istehsal rejiminə qaytarmaq üçün yenidən 4KB rejiminə keçməli və sonra cihazda OEM/yükləyici kilidləməsi (zavod ayarlarına sıfırlayır) icra etməlisiniz. Yükləyicini kiliddən çıxarın və yenidən cəhd edin. Təlimatlara burada baxa bilərsiniz: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB səhifə-aqnostik rejimindən istifadə"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Səhifə-aqnostik rejiminin 4KB 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 proqramlar işləməyə bilər. İstehsal rejiminə yenidən daxil olmaq üçün cihazın yükləyicisini kilidləməlisiniz. Toxunaraq ətraflı oxuyun."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Səhifə-aqnostik rejiminin 4KB 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 proqramlar işləməyə bilər. İstehsal rejiminə yenidən daxil olmaq üçün 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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> yaxud <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"16KB səhifə-aqnostik rejimindən istifadə"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Səhifə-aqnostik rejiminin 16KB 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 proqramlar işləməyə bilər. İstehsal rejiminə yenidən daxil olmaq üçün yenidən 4K rejiminə keçməli və sonra cihazın yükləyicisini kilidləməlisiniz. Toxunaraq ətraflı oxuyun."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Səhifə-aqnostik rejiminin 16KB 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 proqramlar işləməyə bilər. İstehsal rejiminə yenidən daxil olmaq üçün yenidən 4K 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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> yaxud <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Toxunaraq ətraflı oxuyun."</string>
+ <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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> yaxud <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Baq hesabatı idarəedicisi"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Tətbiq bərkidilməsi"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Developer seçimlərini işlədin"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Çap xidməti"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Bir neçə istifadəçiyə icazə verin"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"İstifadəçi keçiricisinə icazə verin"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"icazə, çox sayda, istifadəçi, icazə, çox"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"çoxsaylı, istifadəçilər, profillər, insanlar, hesablar, keçirici, çoxlu"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Wi-Fi vasitəsilə sazlayın"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Planşet doka yerləşdirildikdə ekranda nə görəcəyinizi seçin. Ekran qoruyucusu istifadə edildikdə cihazınız daha çox enerji sərf edə bilər."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Fərdiləşdirin"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Fərdiləşdirin: <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Sərbəst forma dəstəyini aktivləşdirmək üçün yenidən başlatma tələb olunur."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"İkinci dərəcəli displeylərdə masaüstü rejimini məcburi aktiv etmək üçün yenidən başlatma tələb olunur."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Köhnə ixtiyari formada pəncərə dəstəyini aktivləşdirmək üçün yenidən yükləmə tələb olunur."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"İxtiyari formada pəncərə dəstəyini dəyişmək üçün yenidən yükləmə tələb olunur."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"İkinci displeylərdə ixtiyari formada pəncərələri məcbur etmək üçün yenidən yükləmə tələb olunur."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"İndi yenidən başladın"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Sonra yeniden başladın"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Uzaysal Audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aktiv"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Deaktiv"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aktiv"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% sol, %2$d%% sağ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% sağ, %2$d%% sol"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Cihaz adı quraşdırdığınız tətbiqlərə görünür. Bluetooth cihazlarına, Wi-Fi şəbəkəsinə qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digər şəxslər də onu görə bilər."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Cins (qrammatika)"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Cins (qrammatika) seçin"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Axtarış Ayarları"</string>
</resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 6dea39e..b4da200 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Vreme za spavanje"</item>
+ <item msgid="4152450357280759894">"Vožnja"</item>
+ <item msgid="7096549258219399423">"Imerzivno"</item>
+ <item msgid="2760716776980432977">"Upravljano"</item>
+ <item msgid="601734478369121764">"Zvezda"</item>
+ <item msgid="6243809315432780521">"Kalendar"</item>
+ <item msgid="4913577903148415331">"Vreme"</item>
+ <item msgid="3653377604690057780">"Pozorište"</item>
+ <item msgid="3843711267408385410">"Cvet"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 000c565..8186090 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Prekidate vezu sa uređajem?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Podešavanja slušnog aparata"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Prečica, kompatibilnost sa slušnim aparatima"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Zadata podešavanja"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Ne postoje zadata podešavanja koja je programirao audiolog"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ažuriranje zadatih podešavanja nije uspelo"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio izlaz"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O audio izlazu"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Uključeno/# aplikacija ima pristup lokaciji}one{Uključeno/# aplikacija ima pristup lokaciji}few{Uključeno/# aplikacije imaju pristup lokaciji}other{Uključeno/# aplikacija ima pristup lokaciji}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Učitava se…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacije sa dozvolom za uređaje u blizini mogu da odrede približan položaj povezanih uređaja."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacije sa dozvolom za uređaje u blizini mogu da odrede približni položaj povezanih uređaja."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Pristup lokaciji je isključen za aplikacije i usluge. Lokacija uređaja može i dalje da se šalje ekipama hitnih službi kada pozovete broj za hitne slučajeve ili pošaljete SMS na njega."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saznajte više o podešavanjima lokacije"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Da biste to promenili, na ChromeOS-u otvorite Podešavanja > Bezbednost i privatnost > Kontrole privatnosti > Pristup lokaciji"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Dodati su lice i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Dodati su lice, otisak prsta i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Dodati su lice, otisci prstiju i <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"To je potrebno jer je uključena provera identiteta"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Otključavanje uz Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Sat je dodat"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Podesite sat"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saznajte više o otključavanju sata"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj sat"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Ukloni sat"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Otisak prsta i otključavanje licem"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Otključavanje licem i otiskom prsta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Otključavanje licem i otiskom prsta za posao"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Treba da podesite"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Lice i otisci prsta su dodati"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalirajte aplikacije"</b>\n"Aplikacije za koje želite da budu privatne instalirajte u prostoru"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Imajte na umu"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacije se zaustavljaju kada zaključate prostor"</b>\n"Kada zaključate prostor, aplikacije u njemu se zaustavljaju i ne šalju vam obaveštenja"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privatni prostori nisu pogodni za aplikacije koje treba da rade u pozadini ili šalju važna obaveštenja, poput medicinskih aplikacija. Razlog je to što se obaveštenja i aktivnosti u pozadini zaustavljaju kada je prostor zaključan.\n\nAplikacije u privatnom prostoru se neće prikazivati u menadžeru dozvola, na kontrolnoj tabli za privatnost ni u drugim podešavanjima kada je privatan prostor zaključan.\n\nPrivatan prostor ne možete da premestite na novi uređaj. Morate da podesite drugi privatan prostor ako želite da ga koristite na drugom uređaju.\n\nSvako ko vaš uređaj poveže sa računarom ili na njega instalira štetne aplikacije, moći će da pristupi vašem privatnom prostoru."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privatni prostori nisu pogodni za aplikacije koje treba da rade u pozadini ili šalju važna obaveštenja, poput medicinskih aplikacija. Razlog je to što se obaveštenja i aktivnosti u pozadini zaustavljaju kada je prostor zaključan.\n\nAplikacije u privatnom prostoru se neće prikazivati u menadžeru dozvola, na kontrolnoj tabli za privatnost ni u drugim podešavanjima kada je privatan prostor zaključan.\n\nPrivatan prostor ne možete da vratite na novi uređaj. Morate da podesite drugi prostor ako želite da ga koristite na drugom uređaju.\n\nSvako ko vaš uređaj poveže sa računarom ili na njega instalira zlonamerne aplikacije, moći će da pristupi vašem privatnom prostoru."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saznajte više o privatnom prostoru"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Potrajaće nekoliko trenutaka"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Podešava se privatni prostor…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Želite da restartujete uređaj?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC evidentiranje detalja je namenjeno samo u svrhe programiranja. Dodatni NFC podaci uvršteni su u izveštaje o greškama, koji mogu da sadrže privatne podatke. Restartujte uređaj da biste promenili ovo podešavanje."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restartuj"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"preslikati, spoljni ekran, povezani ekran, usb ekran, rezolucija, rotacija"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotacija"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardno"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Koristi tastaturu na ekranu"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Zadržava se na ekranu dok je fizička tastatura aktivna"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Promenite stil popune u žuto"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Promenite stil popune u roze"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Promenite stil popune u plavo"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stil poteza pokazivača"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Belo"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Crno"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ništa"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Izabrao je korisnik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Veličina pokazivača"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Smanjite veličinu pokazivača"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Povećajte veličinu pokazivača"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler za igre"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Preusmeri vibraciju"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Preusmeri vibraciju na kontroler za igre kada je povezan"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Ipak nastavi"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Otkaži"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Podešavanja uvećanja"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pomeranje jednim prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Pomerite lupu 1 prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Prevlačite 1 prst za kretanje po ekranu"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Pomerajte oblast za uvećanje prevlačenjem jednog prsta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Pomerajte oblast za uvećanje prevlačenjem dva prsta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nije dostupno kada se uvećava samo deo ekrana"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite dugme da biste zumirali"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Brzo uvećajte ekran da bi sadržaj bio veći"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Da biste uvećali:</b><br/> {0,number,integer}. Koristite prečicu da biste pokrenuli uvećanje<br/> {1,number,integer}. Dodirnite ekran<br/> {2,number,integer}. Prevlačite pomoću 2 prsta da biste se kretali po ekranu<br/> {3,number,integer}. Skupite 2 prsta da biste prilagodili zumiranje<br/> {4,number,integer}. Koristite prečicu da biste zaustavili uvećanje<br/><br/> <b>Da biste privremeno uvećali:</b><br/> {0,number,integer}. Uverite se da je tip uvećanja podešen na ceo ekran<br/> {1,number,integer}. Koristite prečicu da biste pokrenuli uvećanje<br/> {2,number,integer}. Dodirnite i zadržite bilo koji deo ekrana<br/> {3,number,integer}. Prevlačite prst da biste se kretali po ekranu<br/> {4,number,integer}. Podignite prst da biste zaustavili uvećanje"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Da biste uvećali:</b><br/> {0,number,integer}. Koristite prečicu da biste pokrenuli uvećanje<br/> {1,number,integer}. Dodirnite ekran<br/> {2,number,integer}. Prevlačite pomoću 2 prsta da biste se kretali po ekranu<br/> {3,number,integer}. Skupite 2 prsta da biste prilagodili zumiranje<br/> {4,number,integer}. Koristite prečicu da biste zaustavili uvećanje<br/><br/> Možete privremeno da zumirate i drugo."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Da biste uvećali:</b><br/> {0,number,integer}. Koristite prečicu da biste pokrenuli uvećanje<br/> {1,number,integer}. Dodirnite ekran<br/> {2,number,integer}. Prevlačite 1 ili 2 prsta da biste se kretali po ekranu <br/> {3,number,integer}. Skupite 2 prsta da biste prilagodili zumiranje<br/> {4,number,integer}. Koristite prečicu da biste zaustavili uvećanje<br/><br/> Možete privremeno da zumirate i drugo."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kada je uvećanje uključeno, možete da uvećate ekran.\n\n"<b>"Da biste zumirali"</b>", pokrenite uvećanje, pa dodirnite bilo koji deo ekrana.\n"<ul><li>"Prevlačite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" pokrenite uvećanje, pa dodirnite i zadržite bilo koji deo ekrana.\n"<ul><li>"Prevlačite da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate tastaturu ili traku za navigaciju."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. stranica od <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Prečica za dugme Pristupačnost"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{1 raspored je podešen}one{# raspored je podešen}few{# rasporeda su podešena}other{# rasporeda je podešeno}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritetni režimi"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Dodaj režim"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dobijajte obaveštenja samo od važnih osoba i aplikacija"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Izaberite tip aktiviranja"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Vreme"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Na primer „9:30–17:00“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Na primer „Lični kalendar“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Napravite režim"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Prilagođeno"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite prekide"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključite režim Ne uznemiravaj"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Zvukovi alarma i medija mogu da prekinu"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Rasporedi"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Izbriši rasporede"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Izbriši"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Preimenuj"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Izbriši"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Želite da izbrišete režim <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Izmeni"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Rasporedi"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Raspored"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Dodajte kalendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Koristite svoj kalendar"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Raspored"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Podesite raspored"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Raspored"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> s, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Automatski uključi"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Raspored"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Utišajte telefon u određeno vreme"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Podesite pravila za režim „Ne uznemiravaj“"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Omogućite prekide koji proizvode zvuk"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiraj vizuelna ometanja"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dozvoli vizuelne signale"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Obaveštenja koja dozvoljavate"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Budite prisutni"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Dodatne radnje"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Isključeno}=1{Isključeno/1 režim može da se uključuje automatski}one{Isključeno/# režim može da se uključuje automatski}few{Isključeno/# režima mogu da se uključuju automatski}other{Isključeno/# režima može da se uključuje automatski}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Podešavanja prikaza"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcije prikaza"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Sivilo"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"omogući tamnu temu"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Prebacite OS i aplikacije na svetao tekst na tamnoj pozadini. To može da bude lakše za oči i dovodi do znatne uštede baterije na nekim uređajima"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nema promena ekrana}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}one{{effect_1}, {effect_2} i još #}few{{effect_1}, {effect_2} i još #}other{{effect_1}, {effect_2} i još #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtriraj prekide"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nijedan prekid se ne filtrira"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcije prikaza za filtrirana obaveštenja"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kada je uključen režim Ne uznemiravaj"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bez zvučnog signala za obaveštenja"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otvaranje obaveštenja"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Omogući odlaganje obaveštenja"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Tačka za obaveštenja na ikoni aplikacije"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Skupovi obaveštenja"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Oblačići"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Oblačići"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Prikaži ovu konverzaciju u oblačiću"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ova aplikacija ne podržava poboljšana podešavanja"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Još podešavanja"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Dostupno je još podešavanja u aplikaciji"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Utišavanje obaveštenja"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorije"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Drugo"</string>
<string name="no_channels" msgid="4716199078612071915">"Ova aplikacija nije postavila nijedno obaveštenje"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Prikaži nekorišćene kategorije"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Dodatna podešavanja u aplikaciji"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Prikaži nekorišćene kategorije"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Sakrij nekorišćene kategorije"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacije koje mogu da prekinu funkciju Ne uznemiravaj"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Izabrane aplikacije"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nijedna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Sve"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Izaberite još aplikacija"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može da prekine"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može da prekine"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Neki ljudi mogu da prekinu"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Svi ljudi mogu da prekinu"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Ponovni pozivaoci"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Dozvoli ponovne pozivaoce"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Pređite samo na alarme na jedan sat sve do {time}}one{Pređite samo na alarme na # sat sve do {time}}few{Pređite samo na alarme na # sata sve do {time}}other{Pređite samo na alarme na # sati sve do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Prebacuje u režim samo sa alarmima do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Prebacuje u režim uvek prekidaj"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Izmenite režim"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Dodajte 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="warning_button_text" msgid="1274234338874005639">"Upozorenje"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zatvori"</string>
<string name="device_feedback" msgid="5351614458411688608">"Šalji povratne informacije o uređaju"</string>
@@ -4286,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Režim navigacije"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navigacija pomoću 2 dugmeta"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Da biste prešli sa jedne aplikacije na drugu, prevucite nagore na dugmetu Početak. Da biste videli sve aplikacije, ponovo prevucite nagore. Da biste se vratili, dodirnite dugme Nazad."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Bezbednost i hitni slučajevi"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Lična bezbednost i hitni slučajevi"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Hitna pomoć, medicinske informacije, obaveštenja"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navigacija pomoću pokreta"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Da biste otišli na početni ekran, prevucite nagore od dna ekrana. Da biste prešli sa jedne aplikacije na drugu, prevucite nagore od dna ekrana, zadržite, pa pustite. Da biste se vratili nazad, prevucite od leve ili desne ivice."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Futrola"</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="force_desktop_mode" msgid="1336913605091334238">"Nametni režim računara"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nameće eksperimentalni režim računara na sekundarnim ekranima"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogući prozore proizvoljnog formata"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Omogućava podršku za prozore proizvoljnog formata."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Omogući prozore proizvoljnog formata na 2. ekranu"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Omogućava prozore proizvoljnog formata samo na sekundarnom ekranu."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogući aplikacije nepromenjive veličine u više prozora"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućava da aplikacije nepromenjive veličine budu u više prozora"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Zameni funkciju nametanja tamne teme"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Da bi ovaj uređaj mogao da koristi opciju za programera od 16 kB, njegova particija podataka treba da se konvertuje u ext4. U ovom režimu ne može da se garantuje integritet softvera, pa podaci koji se čuvaju na telefonu dok je pokretački program otključan mogu da budu ugroženi. Aktiviranje opcije od 16 kB zahteva još jedno restartovanje. Kada budete u ovom režimu, moći ćete da prelazite sa režima od 4 kB na režim od 16 kB i obratno uz jedno restartovanje. Neke funkcije su onemogućene u ovim režimima, što znači da neke aplikacije možda neće raditi. Da biste uređaj vratili na proizvodni režim, treba da ga vratite na režim od 4 kB i zaključate pokretački program, čime će se uređaj resetovati na fabrička podešavanja. Kada se na uređaju uključi Android, onemogućite OEM otključavanje u Opcijama za programera. Uređaj će posle potvrde biti obrisan, a sistem fajlova promenjen na ext4. Kada se to završi, vratite se ovde da biste ponovo omogućili režim od 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Obriši sve podatke"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Reformatiranje i brisanje particije podataka na ext4 nije uspelo."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Treba da otključate pokretački program da biste koristili 16 KB režim"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Treba da otključate pokretački program"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Da bi ovaj uređaj mogao da koristi opciju za programera od 16 kB, na njemu treba da bude otključan pokretački program. 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. Kada se aktivira režim od 16 kB, svi podaci i podešavanja korisnika će biti izbrisani. Kada se pokretački program otključa, aktiviranje opcije od 16 kB zahteva dva restartovanja. Kada budete u ovom režimu, moći ćete da prelazite sa režima od 4 kB na režim od 16 kB i obratno uz jedno restartovanje. Neke funkcije su onemogućene u ovim režimima, što znači da neke aplikacije možda neće raditi. Da biste uređaj vratili na proizvodni režim, treba da ga vratite na režim od 4 kB i zaključate OEM ili pokretački program na uređaju (što će ga resetovati na fabrička podešavanja). Otključajte pokretački program i probajte ponovo. Uputstva kako to da uradite potražite na <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Koristite režim od 4 kB nezavisan od veličine stranice"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Koristite režim od 4 kB u okviru režima nezavisnog od veličine stranice. U ovom režimu ne može da se garantuje integritet softvera, pa podaci koji se čuvaju na telefonu dok je pokretački program otključan mogu da budu ugroženi. 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 zaključate pokretački program uređaja. Dodirnite da biste pročitali više."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Koristite režim od 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Možete i da koristite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i izaberete Obriši uređaj, Zaključaj pokretački program i Prinudno flešuj sve particije."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Koristite režim od 16 kB nezavisan od veličine stranice"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 podaci koji se čuvaju na telefonu dok je pokretački program otključan mogu da budu ugroženi. 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. Dodirnite da biste pročitali više."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 podaci koji se čuvaju na telefonu dok je pokretački program otključan mogu da budu ugroženi. 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Možete i da koristite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i izaberete Obriši uređaj, Zaključaj pokretački program i Prinudno flešuj sve particije."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Dodirnite da biste pročitali više."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Možete i da koristite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Obrađivač izveštaja o grešci"</string>
@@ -5010,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Koristi kačenje aplikacija"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Koristi opcije za programere"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Koristi uslugu štampanja"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Dozvoli više korisnika"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Omogućite promenu korisnika"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"omogućiti, više, korisnik, dozvoliti, mnogo"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"više, korisnici, profili, ljudi, nalozi, promena, veliki broj"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Koristi bežično otklanjanje grešaka"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Izaberite šta ćete videti na ekranu kada je tablet na baznoj stanici. Uređaj može da troši više energije kada se koristi čuvar ekrana."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Prilagodi"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Prilagodite <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Morate da restartujete da biste omogućili podršku za slobodan oblik."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Morate da restartujete da biste prinudno omogućili režim za računare na sekundarnim ekranima."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Morate da restartujete da biste omogućili podršku za zastarele prozore proizvoljnog formata."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Morate da restartujete da biste promenili podršku za prozore proizvoljnog formata."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Morate da restartujete da biste prinudno omogućili prozore proizvoljnog formata na sekundarnom ekranu."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Restartuj"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Restartuj kasnije"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Prostorni zvuk"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Uključeno"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Isključeno"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Uključeno"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Zvuk: %1$d%% levo, %2$d%% desno"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Zvuk: %1$d%% desno, %2$d%% levo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Aplikacije koje ste instalirali mogu da vide naziv uređaja. I drugi ljudi mogu da vide naziv uređaja kada se povežete sa Bluetooth uređajima ili WiFi mrežom ili podesite WiFi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatički rod"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Izaberite gramatički rod"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Podešavanja pretrage"</string>
</resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 2a7b529..6c8307a 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Час сну"</item>
+ <item msgid="4152450357280759894">"За рулём"</item>
+ <item msgid="7096549258219399423">"З эфектам прысутнасці"</item>
+ <item msgid="2760716776980432977">"Пад кіраваннем"</item>
+ <item msgid="601734478369121764">"Зорка"</item>
+ <item msgid="6243809315432780521">"Каляндар"</item>
+ <item msgid="4913577903148415331">"Час"</item>
+ <item msgid="3653377604690057780">"Тэатр"</item>
+ <item msgid="3843711267408385410">"Кветка"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 62776ab..522aec3 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Адключыць прыладу?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Спалучыць новую прыладу"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Аўтаматычна ўключыць заўтра"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Налады слыхавога апарата"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Хуткае ўключэнне спецыяльных магчымасцей, сумяшчальнасць са слыхавымі апаратамі"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Набор налад"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Ваш сурдолаг не запраграмаваў ніякіх набораў налад"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Не ўдалося абнавіць набор налад"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аўдыявыхад"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Пра аўдыявыхад"</string>
@@ -134,12 +134,12 @@
<string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth уключаны"</string>
<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_device_details_title" msgid="7618295136015480864">"Пяро"</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_connected_devices_title" msgid="2823967577941359812">"Стылус"</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>
<string name="proxy_clear_text" msgid="6529658759984031149">"Ачысціць"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Выкл."</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Уключана – # праграма мае доступ да даных месцазнаходжання}one{Уключана – # праграма мае доступ да даных месцазнаходжання}few{Уключана – # праграмы маюць доступ да даных месцазнаходжання}many{Уключана – # праграм маюць доступ да даных месцазнаходжання}other{Уключана – # праграмы маюць доступ да даных месцазнаходжання}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Ідзе загрузка…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Праграмы з дазволам на доступ да прылад паблізу могуць вызначаць прыблізнае месцазнаходжанне падключаных прылад."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Праграмы з дазволам на доступ да прылад паблізу могуць вызначаць прыблізнае месцазнаходжанне падключаных прылад"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Для праграм і сэрвісаў доступ да геаданых выключаны. Інфармацыя пра месцазнаходжанне вашай прылады можа адпраўляцца экстранным службам, калі вы робіце выклік на іх нумар ці адпраўляеце ім SMS."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Даведацца больш пра налады месцазнаходжання"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Каб змяніць, у ChromeOS перайдзіце ў раздзел \"Налады > Прыватнасць і бяспека > Налады прыватнасці > Доступ да даных геалакацыі\""</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Твар і гадзіннік \"<xliff:g id="WATCH">%s</xliff:g>\" дададзены"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Твар, адбітак пальца і гадзіннік \"<xliff:g id="WATCH">%s</xliff:g>\" дададзены"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Твар, адбіткі пальцаў і гадзіннік \"<xliff:g id="WATCH">%s</xliff:g>\" дададзены"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Гэта неабходна, паколькі ўключана функцыя праверкі асобы"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Разблакіраваць Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Гадзіннік дададзены"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Наладжванне гадзінніка"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Даведацца больш пра разблакіроўку гадзіннікам"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Дадаць гадзіннік"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Выдаліць гадзіннік"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Разблакіроўка тварам і адбіткам пальца"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Распазнаванне твару і разблакіроўка адбіткам пальца"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Разблакіроўка тварам і адбіткам пальца для працоўнага профілю"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Патрабуецца наладжванне"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Дададзены твар і адбіткі пальцаў"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Усталюйце праграмы"</b>\n"Усталюйце праграмы, якія будуць заставацца прыватнымі дзякуючы прасторы"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Што трэба мець на ўвазе"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Пры заблакіраваным доступе да прасторы дададзеныя ў яе праграмы перастаюць працаваць"</b>\n"Калі доступ да прасторы заблакіраваны, дададзеныя ў яе праграмы перастаюць працаваць і апавяшчэнні з іх не паказваюцца"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Не дадавайце ў прыватную прастору праграмы, якія працуюць у фонавым рэжыме або адпраўляюць крытычныя апавяшчэнні, напрыклад медыцынскія праграмы. Пры блакіраванні прыватнай прасторы адпраўка апавяшчэнняў і фонавая дзейнасць праграм спыняюцца.\n\nКалі доступ да прыватнай прасторы заблакіраваны, праграмы з яе не паказваюцца ў менеджары дазволаў і на панэлі кіравання доступам, а таксама ў іншых наладах.\n\nПрыватную прастору нельга перамясціць на іншую прыладу. Для кожнай прылады трэба будзе наладжваць асобную прыватную прастору.\n\nДоступ да прыватнай прасторы можа атрымаць чалавек, які ўсталюе на вашай прыладзе шкодныя праграмы або падключыць яе да камп’ютара."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Не дадавайце ў прыватную прастору праграмы, якія працуюць у фонавым рэжыме або адпраўляюць крытычныя апавяшчэнні, напрыклад медыцынскія праграмы. Пры блакіраванні прыватнай прасторы адпраўка апавяшчэнняў і фонавая дзейнасць праграм спыняюцца.\n\nКалі доступ да прыватнай прасторы заблакіраваны, праграмы з яе не паказваюцца ў менеджары дазволаў і на панэлі кіравання доступам, а таксама ў іншых наладах.\n\nПрыватную прастору нельга перамясціць на іншую прыладу. Для кожнай прылады трэба будзе наладжваць асобную прыватную прастору.\n\nДоступ да прыватнай прасторы можа атрымаць чалавек, які ўсталюе на вашай прыладзе шкодныя праграмы або падключыць яе да камп’ютара."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Даведацца больш пра прыватную прастору"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Гэты працэс зойме крыху часу"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Ідзе наладжванне прыватнай прасторы…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Перазапусціць прыладу?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Падрабязнае вядзенне журналаў NFC прызначана толькі для мэт распрацоўкі. У справаздачы пра памылкі ўключаюцца дадатковыя даныя NFC, якія могуць утрымліваць прыватную інфармацыю. Перазапусціце прыладу, каб змяніць гэту наладу."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Перазапусціць"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"дубліраваць, знешні дысплэй, падключаны дысплэй, usb-дысплэй, раздзяляльнасць, паварот"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Паварот"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандартна"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Выкарыстоўваць экранную клавіятуру"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Захоўваць яе на экране ў той час, калі фізічная клавіятура актыўная"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Змяніць стыль заліўкі на жоўты"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Змяніць стыль заліўкі на ружовы"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Змяніць стыль заліўкі на сіні"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Контур паказальніка"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Белы"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Чорны"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Няма"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Выбрана карыстальнікам: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Маўленне"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Хуткасць указальніка"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Памер паказальніка"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Паменшыць памер паказальніка"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Павялічыць памер паказальніка"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Прылада кiравання гульнёй"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Перанакіраванне вібрасігналу"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Адпраўляць вібрасігнал на гульнявы кантролер пры падключэнні."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Усё роўна працягнуць"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Скасаваць"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налады павелічэння"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Зрушэнне адным пальцам"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Перамяшчайце лупу адным пальцам"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Для перамяшчэння па экране перасоўвайце адзін палец"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Вобласць павелічэння перацягваецца адным пальцам."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Вобласць павелічэння перацягваецца двума пальцамі."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Недаступна, калі павялічваецца толькі частка экрана"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Дакраніцеся да кнопкі, каб павялічыць маштаб"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Хутка павялічвайце маштаб экрана"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Каб павялічыць маштаб:</b><br/> {0,number,integer}. Скарыстайце хуткі доступ для запуску функцыі павелічэння<br/> {1,number,integer}. Націсніце на экран<br/> {2,number,integer}. Каб перамясціць выяву, перацягніце яе двума пальцамі<br/> {3,number,integer}. Звядзіце ці развядзіце два пальцы для змены маштабу<br/> {4,number,integer}. Скарыстайце хуткі доступ, каб выключыць функцыю павелічэння<br/><br/><b>Каб часова павялічыць маштаб:</b><br/> {0,number,integer}. Упэўніцеся, што ў якасці тыпу павелічэння выбраны поўнаэкранны рэжым<br/> {1,number,integer}. Скарыстайце хуткі доступ для запуску функцыі павелічэння<br/> {2,number,integer}. Утрымлівайце палец націснутым у любым месцы экрана<br/> {3,number,integer}. Каб перамясціць выяву, перацягніце яе пальцам<br/> {4,number,integer}. Падніміце палец, каб спыніць функцыю павелічэння"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Каб павялічыць маштаб:</b><br/> {0,number,integer}. Скарыстайце хуткі доступ для запуску функцыі павелічэння<br/> {1,number,integer}. Націсніце на экран<br/> {2,number,integer}. Для перамяшчэння па экране перасоўвайце два пальцы<br/> {3,number,integer}. Звядзіце ці развядзіце два пальцы для змены маштабу<br/> {4,number,integer}. Скарыстайце хуткі доступ для выключэння функцыі павелічэння<br/><br/> Таксама вы можаце часова павялічыць маштаб і выканаць іншыя дзеянні."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Каб павялічыць маштаб:</b><br/> {0,number,integer}. Скарыстайце хуткі доступ для запуску функцыі павелічэння<br/> {1,number,integer}. Націсніце на экран<br/> {2,number,integer}. Для перамяшчэння па экране перасоўвайце адзін або два пальцы<br/> {3,number,integer}. Звядзіце ці развядзіце два пальцы для змены маштабу<br/> {4,number,integer}. Скарыстайце хуткі доступ для выключэння функцыі павелічэння<br/><br/> Таксама вы можаце часова павялічыць маштаб і выканаць іншыя дзеянні."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Калі ўключана функцыя павелічэння, вы можаце павялічыць маштаб на экране.\n\n"<b>"Для гэтага"</b>" запусціце функцыю павелічэння, а пасля націсніце ў любым месцы экрана.\n"<ul><li>"Каб прагартаць, перацягніце пальцамі (двума ці больш)."</li>\n<li>"Каб адрэгуляваць маштаб, звядзіце ці развядзіце пальцы (два ці больш)."</li></ul>\n\n<b>"Каб часова змяніць маштаб"</b>", запусціце функцыю павелічэння, потым утрымлівайце націснутым любое месца на экране.\n"<ul><li>"Перацягніце для навігацыі па экране."</li>\n<li>"Падыміце палец, каб паменшыць маштаб."</li></ul>\n\n"Павелічэнне маштабу клавіятуры ці панэлі навігацыі не прадугледжана."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Старонка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Хуткае ўключэнне: кнопка спецыяльных магчымасцей"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ніводнага}=1{Зададзены 1 расклад}one{Зададзены # расклад}few{Зададзена # расклады}many{Зададзена # раскладаў}other{Зададзена # раскладу}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбаваць"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Прыярытэтныя рэжымы"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Дадаць рэжым"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Атрымліваць апавяшчэнні толькі ад важных людзей і праграм"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Выбраць тып актывацыі"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Час"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Напрыклад: \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Каляндар"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Напрыклад: \"асабісты каляндар\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Стварыць рэжым"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Карыстальніцкі"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Абмежаванне колькасці непатрэбных апавяшчэнняў"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Уключэнне рэжыму \"Не турбаваць\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Гэты рэжым не распаўсюджваецца на сігналы будзільнікаў і гукі мультымедыя"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Расклады"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Выдаліць расклады"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Выдаліць"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Перайменаваць"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Выдаліць"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Выдаліць рэжым \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Змяніць"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Расклады"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Расклад"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Дадайце каляндар"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Перайсці да календара"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Па раскладзе"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Задаць расклад"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Расклад"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> гадз <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Уключаць аўтаматычна"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Расклад"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Выключаць гук тэлефона ў пэўны час"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Правілы рэжыму \"Не турбаваць\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Дазволіць гукавыя апавяшчэнні"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блакіроўка візуальных апавяшчэнняў"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дазволіць візуальныя сігналы"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Апавяшчэнні, якія будуць адлюстроўвацца"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Захоўвайце канцэнтрацыю"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Дадатковыя дзеянні"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Выключана}=1{Выключана / аўтаматычна можна ўключыць 1 рэжым}one{Выключана / аўтаматычна можна ўключыць # рэжым}few{Выключана / аўтаматычна можна ўключыць # рэжымы}many{Выключана / аўтаматычна можна ўключыць # рэжымаў}other{Выключана / аўтаматычна можна ўключыць # рэжыму}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Налады адлюстравання"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Параметры адлюстравання"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Адценні шэрага"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"уключыць цёмную тэму"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Пераключэнне АС і праграм на адлюстраванне светлага тэксту на цёмным фоне, што дазваляе знізіць нагрузку на зрок і на некаторых прыладах значна эканоміць зарад акумулятара"</string>
<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}}one{{effect_1}, {effect_2} і яшчэ #}few{{effect_1}, {effect_2} і яшчэ #}many{{effect_1}, {effect_2} і яшчэ #}other{{effect_1}, {effect_2} і яшчэ #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Адфільтроўваць апавяшчэнні"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Апавяшчэнні не адфільтроўваюцца"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"адкрыць апавяшчэнне"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Дазволіць адкладванне апавяшчэнняў"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Значок апавяшчэнняў на значку праграмы"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Групы апавяшчэнняў"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Усплывальныя чаты"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Усплывальныя чаты"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Паказваць гэту размову ў выглядзе ўсплывальных апавяшчэнняў"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Гэта праграма не падтрымлівае пашыраныя налады"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Дадатковыя налады"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Іншыя налады даступныя ўнутры гэтай праграмы"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Зніжэнне гучнасці апавяшчэнняў"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Прымяніць да працоўных профіляў"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Прымяняць да праграм працоўнага профілю"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Катэгорыі"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Іншае"</string>
<string name="no_channels" msgid="4716199078612071915">"Гэта праграма не размяшчала ніякіх апавяшчэнняў"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Паказаць катэгорыі, якія не выкарыстоўваюцца"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Дадатковыя налады ў праграме"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Паказаць неўжывальныя катэгорыі"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Схаваць неўжывальныя катэгорыі"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Гэты рэжым не распаўсюджваецца на наступныя праграмы"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Выбраныя праграмы"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ніякія"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Усе"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дазволіць праграмам перавызначаць"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Гэты рэжым не распаўсюджваецца на наступныя праграмы"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Выбраць іншыя праграмы"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Рэжым \"Не турбаваць\" распаўсюджваецца на ўсё без выключэння"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Гэты рэжым распаўсюджваецца на ўсіх людзей"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Гэты рэжым не распаўсюджваецца на некаторыя кантакты"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Гэты рэжым не распаўсюджваецца на людзей"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Паўторныя выклікі"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Дазволіць паўторныя выклікі"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Пераключэнне на рэжым \"Толькі будзільнікі\" на адну гадзіну да {time}}one{Пераключэнне на рэжым \"Толькі будзільнікі\" на # гадзіну да {time}}few{Пераключэнне на рэжым \"Толькі будзільнікі\" на # гадзіны да {time}}many{Пераключэнне на рэжым \"Толькі будзільнікі\" на # гадзін да {time}}other{Пераключэнне на рэжым \"Толькі будзільнікі\" на # гадзіны да {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Пераключыцца на рэжым «толькі будзільнікі» да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Уключыць усе апавяшчэнні"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Змяніць рэжым"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Дадаць рэжым"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Карыстальніцкі рэжым"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назва рэжыму"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Заўвага"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Закрыць"</string>
<string name="device_feedback" msgid="5351614458411688608">"Адправіць водгук пра гэту прыладу"</string>
@@ -4286,7 +4331,7 @@
<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">"Экстранны выклік, медыцынская інфармацыя, абвесткі"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Навігацыя жэстамі"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Каб вярнуцца на галоўную старонку, правядзіце па экране пальцам знізу ўверх. Каб пераключыцца на іншую праграму, правядзіце па экране пальцам знізу ўверх, затрымайцеся, а потым адпусціце. Каб вярнуцца назад, правядзіце па экране пальцам управа ці ўлева."</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Прымусова ўключаць рэжым працоўнага стала"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Прымусова ўключаць эксперыментальны рэжым працоўнага стала на дадатковых экранах"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Уключыць адвольную форму вокнаў"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Уключыць падтрымку адвольнай формы вокнаў."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Уключыць адвольную форму вокнаў на другасным дысплэі"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Уключыць адвольную форму вокнаў толькі на другасным дысплэі."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"У рэжыме некалькіх вокнаў уключыць нязменны памер"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Дазваляе выкарыстоўваць праграмы, якія маюць нязменны памер, у рэжыме некалькіх вокнаў"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Перавызначэнне ўключэння цёмнай тэмы"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Каб выкарыстоўваць рэжым 16 КБ у параметрах распрацоўшчыка, раздзел даных на гэтай прыладзе трэба пераўтварыць у ext4. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Для ўключэння параметра 16 КБ патрабуецца паўторная перазагрузка. Пасля таго як вы ўключыце гэты рэжым, пераключэнне паміж рэжымамі 4 КБ і 16 КБ будзе суправаджацца толькі адной перазагрузкай. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб вярнуць прыладу ў эксплуатацыйны рэжым, вам трэба пераключыцца ў рэжым 4 КБ і заблакіраваць загрузчык, што прывядзе да скіду прылады да заводскіх налад. Пасля загрузкі Android на прыладзе выключыце разблакіроўку OEM у Параметрах распрацоўшчыка. Усе даныя будуць выдалены з прылады, а файлавая сістэма пасля пацвярджэння будзе зменена на ext4. Пасля завяршэння вярніцеся, каб зноў уключыць рэжым 16 КБ."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Сцерці ўсе даныя"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Не ўдалося ачысціць раздзел даных і перафармаціраваць яго ў ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Для рэжыму 16 КБ патрабуецца разблакіроўка загрузчыка"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Патрабуецца разблакіроўка загрузчыка"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Каб выкарыстоўваць рэжым 16 КБ у параметрах распрацоўшчыка, трэба разблакіраваць загрузчык на прыладзе. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Калі рэжым 16 КБ уключыцца, усе даныя і налады карыстальніка будуць выдалены. Калі загрузчык будзе разблакіраваны, для ўключэння параметра 16 КБ спатрэбяцца дзве перазагрузкі. Пасля таго як вы ўключыце гэты рэжым, пераключэнне паміж рэжымамі 4 КБ і 16 КБ будзе суправаджацца толькі адной перазагрузкай. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб вярнуць прыладу ў эксплуатацыйны рэжым, вам трэба пераключыцца ў рэжым 4 КБ і заблакіраваць OEM ці загрузчык (што прывядзе да скіду прылады да заводскіх налад). Разблакіруйце загрузчык і паўтарыце спробу. Інструкцыі, як гэта зрабіць, глядзіце на старонцы <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Дзейнічае рэжым 4 КБ, які не залежыць ад памеру старонкі памяці"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 4 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, заблакіруйце загрузчык на прыладзе. Націсніце, каб чытаць далей."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 4 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, заблакіруйце загрузчык на прыладзе. Пасля гэтага адбудзецца яе паўторны скід да заводскіх налад. Пасля загрузкі Android на прыладзе выключыце разблакіроўку OEM у Параметрах распрацоўшчыка. Калі на прыладзе не ўдаецца запусціць АС Android ці яе праца нестабільная, перапрашыйце прыладу, выкарыстоўваючы апошнія версіі заводскіх вобразаў, якія можна спампаваць тут: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Або перайдзіце па спасылцы <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і выберыце \"Ачысціць прыладу\", \"Заблакіраваць загрузчык\" і \"Перапрашыць усе раздзелы\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Дзейнічае рэжым 16 КБ, які не залежыць ад памеру старонкі памяці"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, пераключыцеся на рэжым 4 КБ і заблакіруйце загрузчык на прыладзе. Націсніце, каб чытаць далей."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца. Існуе рызыка страціць даныя, якія былі захаваны на тэлефоне, калі загрузчык быў разблакіраваны. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, пераключыцеся на рэжым 4 КБ і заблакіруйце загрузчык на прыладзе. Пасля гэтага адбудзецца яе паўторны скід да заводскіх налад. Пасля загрузкі Android на прыладзе выключыце разблакіроўку OEM у Параметрах распрацоўшчыка. Калі на прыладзе не ўдаецца запусціць АС Android ці яе праца нестабільная, перапрашыйце прыладу, выкарыстоўваючы апошнія версіі заводскіх вобразаў, якія можна спампаваць тут: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Або перайдзіце па спасылцы <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і выберыце \"Ачысціць прыладу\", \"Заблакіраваць загрузчык\" і \"Перапрашыць усе раздзелы\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца і ёсць рызыка страціць даныя, якія захоўваюцца на тэлефоне пры разблакіраваным загрузчыку. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, пераключыцеся на рэжым 4 КБ і заблакіруйце загрузчык на прыладзе. Націсніце, каб чытаць далей."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"У вас уключаны рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ. У гэтым рэжыме цэласнасць праграмнага забеспячэння не гарантуецца і ёсць рызыка страціць даныя, якія захоўваюцца на тэлефоне пры разблакіраваным загрузчыку. Асобныя функцыі будуць адключаны ў гэтых рэжымах, з-за чаго некаторыя праграмы могуць не працаваць. Каб паўторна ўвайсці ў эксплуатацыйны рэжым, пераключыцеся на рэжым 4 КБ і заблакіруйце загрузчык на прыладзе. Пасля гэтага адбудзецца яе паўторны скід да заводскіх налад. Пасля загрузкі Android выключыце разблакіроўку OEM у Параметрах распрацоўшчыка. Калі на прыладзе не ўдаецца запусціць АС Android ці яе праца нестабільная, перапрашыйце прыладу, выкарыстоўваючы апошнія версіі заводскіх вобразаў, якія можна спампаваць тут: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Або перайдзіце па спасылцы <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і выберыце \"Ачысціць прыладу\", \"Заблакіраваць загрузчык\" і \"Перапрашыць усе раздзелы\"."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Рэжым, які не залежыць ад памеру старонкі памяці і працуе з ядром для старонак памяці памерам 16 КБ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Чытаць далей"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Апрацоўшчык справаздачы пра памылкі"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Выкарыстоўваць замацаванне праграмы"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Выкарыстоўваць параметры распрацоўшчыка"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Скарыстаць сэрвіс друку"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Дазволіць некалькі карыстальнікаў"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Дазволіць пераключэнне карыстальнікаў"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"дазволіць, некалькі, карыстальнік, дазволіць, шмат"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"некалькі, карыстальнікі, профілі, людзі, уліковыя запісы, пераключыць, многа"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Выкарыстоўваць адладку па Wi-Fi"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Выберыце змесціва, якое будзе паказвацца на экране, калі планшэт падключаны да док-станцыі. Пры выкарыстанні экраннай застаўкі прылада можа спажываць больш энергіі."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Наладзіць"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Наладзіць застаўку \"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>\""</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Каб уключыць падтрымку адвольнай формы, патрабуецца перазагрузка."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Каб прымусова ўключыць на дадатковых дысплэях рэжым працоўнага стала, патрабуецца перазагрузка."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Каб уключыць падтрымку адвольнай формы вокнаў (устарэлую наладу), патрабуецца перазагрузка."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Каб змяніць падтрымку адвольнай формы вокнаў, патрабуецца перазагрузка."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Каб прымусова ўключыць падтрымку адвольнай формы вокнаў (устарэлую наладу) на другасных дысплэях, патрабуецца перазагрузка."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Перазагрузіць зараз"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Перазагрузіць пазней"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Прасторавае гучанне"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Уключана"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Выключана"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Уключана"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Гук: %1$d%% злева, %2$d%% справа"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Гук: %1$d%% справа, %2$d%% злева"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Назва прылады даступная для ўсталяваных вамі праграм. Яе таксама могуць пабачыць іншыя людзі, калі вы падключыцеся да прылад з Bluetooth або да сеткі Wi-Fi ці наладзіце хот-спот Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Граматычны род"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Выберыце граматычны род"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Шукаць у наладах"</string>
</resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 7726731..4c1460a 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Време за сън"</item>
+ <item msgid="4152450357280759894">"Шофиране"</item>
+ <item msgid="7096549258219399423">"Реалистично"</item>
+ <item msgid="2760716776980432977">"Управлявано"</item>
+ <item msgid="601734478369121764">"Звезда"</item>
+ <item msgid="6243809315432780521">"Календар"</item>
+ <item msgid="4913577903148415331">"Време"</item>
+ <item msgid="3653377604690057780">"Театър"</item>
+ <item msgid="3843711267408385410">"Цвете"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6a545a5..36ecde3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Прекр. на връзката с у-вото?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Сдвояване на ново устройство"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматично включване утре"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Настройки за слуховия апарат"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Пряк път, съвместимост със слухови апарати"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Предварително зададено"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Няма предвар. зададени стойности, програмирани от аудиолога"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Предварително зададените настройки не бяха актуализирани"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиоизход"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Всичко за аудиоизхода"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Изкл."</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Включено/# приложение има достъп до местоположението}other{Включено/# приложения имат достъп до местоположението}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Зарежда се…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Приложенията с разрешението за устройства в близост могат да определят относителната позиция на свързаните устройства."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Приложенията с разрешението за устройства в близост могат да определят относителната позиция на свързаните устройства."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Достъпът до местоположението е изключен за приложенията и услугите. Местоположението на устройството ви пак може да се изпраща до органите за бързо реагиране, когато се обадите на номер за спешни случаи или изпратите SMS до такъв."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Научете повече за настройките за местоположението"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"За промяна отворете настройките на ChromeOS > „Поверителност и сигурност > Контроли за поверителност > Достъп до местоположението“"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Лицето и <xliff:g id="WATCH">%s</xliff:g> бяха добавени"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Лицето, отпечатъкът и <xliff:g id="WATCH">%s</xliff:g> бяха добавени"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Лицето, отпечатъците и <xliff:g id="WATCH">%s</xliff:g> бяха добавени"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Това е необходимо, тъй като функцията за проверка на самоличността е включена"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Отключване с Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Добавихте часовник"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Настройване на часовника ви"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Научете повече за „Отключване чрез часовника“"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Добавяне на часовник"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Премахване на часовника"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Отключване с лице и отпечатък"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Отключване с лице и отпечатък"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Отключване с лице и отпечатък за служебни цели"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Необходимо е настройване"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Добавени са лице и отпечатъци"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Инсталиране на приложения"</b>\n"Инсталирайте приложенията, които искате да запазите частни в пространството си"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Имайте предвид следното"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Спиране на приложенията при заключване на пространството ви"</b>\n"Когато заключите пространството си, приложенията в него се спират и няма да получавате известия от тях"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Частните пространства не са подходящи за приложения, които трябва да се изпълняват на заден план или да изпращат критично важни известия, като например медицински приложения. Това се дължи на факта, че известията и активността на заден план ще бъдат спрени, когато пространството ви е заключено.\n\nКогато частното ви пространство е заключено, приложенията в него няма да се показват в мениджъра за разрешенията, таблото за управление на поверителността и други настройки.\n\nЧастното ви пространство не може да бъде преместено на друго устройство. В такъв случай ще трябва да настроите друго частно пространство.\n\nВсеки, който свърже устройството ви с компютър или инсталира опасни приложения на него, би могъл да осъществи достъп до частното ви пространство."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Частните пространства не са подходящи за приложения, които трябва да се изпълняват на заден план или да изпращат критично важни известия, като например медицински приложения. Това се дължи на факта, че известията и активността на заден план ще бъдат спрени, когато пространството ви е заключено.\n\nКогато частното ви пространство е заключено, приложенията в него няма да се показват в мениджъра за разрешенията, таблото за управление на поверителността и други настройки.\n\nЧастното ви пространство не може да бъде възстановено на друго устройство. В такъв случай ще трябва да настроите друго пространство.\n\nВсеки, който свърже устройството ви с компютър или инсталира злонамерени приложения на него, би могъл да осъществи достъп до частното ви пространство."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Научете повече за частното пространство"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Това ще отнеме известно време"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Частното пространство се настройва…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Да се рестартира ли устройството?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Подробното записване в регистрационни файлове посредством NFC е предназначено само за програмни цели. В сигналите за програмни грешки, които може да съдържат лична информация, са включени допълнителни данни от NFC. За да промените тази настройка, рестартирайте устройството си."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Рестартиране"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"дублиране, външен екран, свързан екран, екран с usb, разделителна способност, завъртане"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Завъртане"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандартно"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Използване на екранната клавиатура"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Показва се на екрана, докато физическата клавиатура е активна"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Запълване на курсора в жълто"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Запълване на курсора в розово"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Запълване на курсора в синьо"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Стил на контура на курсора"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Бяло"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Черно"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Без"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Избрано от потребителя: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Скорост на курсора"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Мащаб на курсора"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Намаляване на мащаба на курсора"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Увеличаване на мащаба на курсора"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Контролер за игри"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Пренасочване на вибрирането"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Пренасочване на вибрирането към контролера за игри, когато е свързан"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Напред въпреки това"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Отказ"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки за увеличението"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Преместване с един пръст"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Преместете лупата с 1 пръст"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Плъзнете с пръст, за да се придвижвате на екрана."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Преместете областта за увеличаване, като плъзнете 1 пръст."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Преместете областта за увеличаване, като плъзнете 2 пръста."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Не е налице, когато се увеличава само част от екрана"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Променяйте мащаба с докосване на бутон"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Бързо увеличавайте мащаба на екрана, за да уголемите съдържанието"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>За да увеличите мащаба</b>:<br/> {0,number,integer}. Използвайте прекия път за стартиране на увеличението.<br/> {1,number,integer}. Докоснете екрана.<br/> {2,number,integer}. Плъзнете с 2 пръста, за да се придвижите по екрана.<br/> {3,number,integer}. Съберете 2 пръста, за да коригирате мащаба.<br/> {4,number,integer}. Използвайте прекия път за спиране на увеличението.<br/><br/> <b>За временно увеличаване на мащаба</b>:<br/> {0,number,integer}. За типа увеличение трябва да зададете „Цял екран“.<br/> {1,number,integer}. Използвайте прекия път за стартиране на увеличението.<br/> {2,number,integer}. Докоснете и задръжте произволно място на екрана.<br/> {3,number,integer}. Плъзнете пръст, за да се придвижите по екрана.<br/> {4,number,integer}. Вдигнете пръста си, за да спрете увеличението."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>За да увеличите мащаба</b>:<br/> {0,number,integer}. Използвайте прекия път за стартиране на увеличението.<br/> {1,number,integer}. Докоснете екрана.<br/> {2,number,integer}. Плъзнете с 2 пръста, за да се придвижите по екрана.<br/> {3,number,integer}. Съберете 2 пръста, за да коригирате мащаба.<br/> {4,number,integer}. Използвайте прекия път, за да спрете увеличението.<br/><br/> Можете също да приближавате временно и още много други неща."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>За да увеличите мащаба</b>:<br/> {0,number,integer}. Използвайте прекия път за стартиране на увеличението.<br/> {1,number,integer}. Докоснете екрана.<br/> {2,number,integer}. Плъзнете с 1 или 2 пръста, за да се придвижите по екрана.<br/> {3,number,integer}. Съберете 2 пръста, за да коригирате мащаба.<br/> {4,number,integer}. Използвайте прекия път, за да спрете увеличението.<br/><br/> Можете също да приближавате временно и още много други неща."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Когато функцията за увеличение е включена, можете да увеличавате мащаба на екрана.\n\n"<b>"За да промените мащаба"</b>", стартирайте функцията за увеличение, след което докоснете произволно място на екрана.\n"<ul><li>"Плъзнете 2 или повече пръсти, за да превъртите."</li>\n<li>"Съберете или разтворете 2 или повече пръсти, за да коригирате мащаба."</li></ul>\n\n<b>"За да промените временно мащаба"</b>", стартирайте функцията за увеличение, след което докоснете и задръжте произволно място на екрана.\n"<ul><li>"Плъзнете пръста си, за да се придвижите на екрана."</li>\n<li>"Вдигнете пръста си, за да намалите мащаба."</li></ul>\n\n"Не можете да увеличавате мащаба на клавиатурата или лентата за навигация."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> от <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Пряк път чрез бутона за достъпност"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нито един}=1{Зададен е 1 график}other{Зададени са # графика}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не безпокойте"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Приоритетни режими"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Добавяне на режим"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получаване на известия само от важни хора и приложения"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Изберете тип активиране"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Час"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Напр. „9:30 – 17:00 ч.“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календар"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Напр. „Личен календар“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Създаване на режим"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Персонализирано"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничаване на прекъсванията"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Включване на режима „Не безпокойте“"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Будилниците и звуците на мултимедийното съдържание могат да прекъсват режима"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Графици"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Изтриване на графиците"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Изтриване"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Преименуване"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Изтриване"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Да се изтрие ли режимът „<xliff:g id="MODE">%1$s</xliff:g>“?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Редактиране"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Графици"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"График"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Добавяне на календар"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Използване на календара ви"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"График"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Задаване на график"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"График"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ч и <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Автоматично включване"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"График"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Заглуш. на телефона в опр. моменти"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Правила за „Не безпокойте“"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Разрешаване на звуковите прекъсвания"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Виз. предупрежд.: Блокиране"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуални сигнали: Разрешаване"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Известия, които могат да достигнат до вас"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Концентрация"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Допълнителни действия"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Изкл.}=1{Изкл./1 режим може да се включва автоматично}other{Изкл./# режима могат да се включват автоматично}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Настройки за показване"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Опции за показване"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Сива скала"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"активиране на тъмната тема"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Превключете предпочитанията за операционната система и приложенията така, че да дадете предимство на светлия текст на тъмен фон. Това може да е по-щадящо за очите и да доведе до значителна икономия на батерията на някои устройства"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"Филтриране на прекъсванията"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Прекъсванията не се филтрират"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"отваряне на известието"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Разрешаване на отлагането на известията"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Точка за известия в иконата на прил."</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Групи известия"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Балончета"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Балончета"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Показване на балонче за този разговор"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Това приложение не поддържа подобрените настройки"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Още настройки"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Още настройки са налице в приложението"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Изчакване за известията"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Прилагане към служебните потребителски профили"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Прилагане за приложенията в служебния потребителски профил"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категории"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Други"</string>
<string name="no_channels" msgid="4716199078612071915">"Все още няма публикувани известия от това приложение"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Показване на неизползваните категории"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Допълнителни настройки в приложението"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Показване на неизползв. категории"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Скриване на неизползв. категории"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Приложения, които могат да прекъсват режима"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Избрани приложения"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Никои"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Всички"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешаване на приложения да отменят режима"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Приложения, които могат да прекъсват режима"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Избиране на още приложения"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Нищо не може да прекъсва режима"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Никой не може да прекъсва режима"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Някои хора могат да прекъсват режима"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Всички хора могат да прекъсват режима"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Повторно обаждащи се"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Разрешаване на повторно обаждащи се"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Активиране на режима „Само будилници“ за един час (до {time})}other{Активиране на режима „Само будилници“ за # часа (до {time})}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Активиране на режима „Само будилници“ до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Активиране на режима „Прекъсване винаги“"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Редактир. на режима"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Добавяне на режим"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Персонализиран режим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Име на режима"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Предупреждение"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Затваряне"</string>
<string name="device_feedback" msgid="5351614458411688608">"Отзиви за устройството"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Принудително задаване на настолен режим"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Принудително задаване на експерименталния настолен режим на алтернативни дисплеи"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Активиране на прозорците в свободна форма"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Активиране на поддръжката за прозорците в свободна форма."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Прозорци в свободна форма на втори дисплей: Актив."</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Активиране на прозорците в свободна форма само на вторичен дисплей."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Активиране на непреоразмерими елементи в „Няколко прозореца“"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Разрешава на приложенията, които не могат да се преоразмеряват, да бъдат в режим за няколко прозореца"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Отмяна на налагането на тъмен режим"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Делът с данни на това устройство трябва да се преобразува към ext4, преди да се използва опцията за програмисти 16 KB. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. За активирането на опцията 16 KB ще е необходимо още едно рестартиране след това. Когато сте в този режим, можете да превключвате между режимите 4 KB и 16 KB с едно рестартиране. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да върнете устройството в производствен режим, ще трябва да превключите обратно към режима 4 KB и след това да заключите програмата за първоначално зареждане, което ще възстанови фабричните настройки на устройството. След като то стартира Android, деактивирайте настройката за отключване чрез OEM от опциите за програмисти. Всички данни на устройството ще бъдат изчистени и след потвърждение файловата система ще се промени на ext4. След като процесът приключи, върнете се, за да активирате опцията 16 KB отново."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Изтриване на всички данни"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Изчистването на всички данни от дяла и преформатирането на ext4 не бе успешно."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"За режима 16 KB се изисква отключване на програмата за първоначално зареждане"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Изисква се отключване на програмата за първоначално зареждане"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Програмата за първоначално зареждане на това устройство трябва да е отключена, преди да се използва опцията за програмисти 16 KB. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Всички потребителски данни и настройки ще бъдат изчистени при активирането на режима 16 KB. След като програмата за първоначално зареждане бъде отключена, за активирането на опцията 16 KB ще са необходими две рестартирания. Когато сте в този режим, можете да превключвате между режимите 4 KB и 16 KB с едно рестартиране. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да върнете устройството в производствен режим, ще трябва да превключите обратно към режима 4 KB и след това да възстановите заключването чрез OEM или да заключите програмата за първоначално зареждане на устройството, което ще възстанови фабричните настройки. Моля, отключете програмата за първоначално зареждане и опитайте отново. За инструкции как да направите това, вижте <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"За режима за съвместимост със страниците се използва опцията 4 KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Използвате опцията 4 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да заключите програмата за първоначално зареждане на устройството. Докоснете, за да прочетете повече."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Използвате опцията 4 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да заключите програмата за първоначално зареждане на устройството. Това отново ще възстанови фабричните настройки на устройството, както и тези на производствения режим. След като то стартира Android, деактивирайте настройката за отключване чрез OEM от опциите за програмисти. Ако устройството не стартира Android или е нестабилно, преинсталирайте го посредством най-новите фабрични образи на адрес <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или използвайте <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете опцията за изчистване на всички данни от устройството, „Заключване на програмата за първоначално зареждане“ и опцията за принудително инсталиране на всички дялове."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"За режима за съвместимост със страниците се използва опцията 16 KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Използвате опцията 16 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да превключите обратно към режим 4 KB и след това да заключите програмата за първоначално зареждане на устройството. Докоснете, за да прочетете повече."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Използвате опцията 16 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да превключите обратно към режим 4 KB и след това да заключите програмата за първоначално зареждане на устройството. Това отново ще възстанови фабричните настройки на устройството, както и тези на производствения режим. След като то стартира Android, деактивирайте настройката за отключване чрез OEM от опциите за програмисти. Ако устройството не стартира Android или е нестабилно, преинсталирайте го посредством най-новите фабрични образи на адрес <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или използвайте <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете опцията за изчистване на всички данни от устройството, „Заключване на програмата за първоначално зареждане“ и опцията за принудително инсталиране на всички дялове."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Използвате опцията 16 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да превключите обратно към режим 4 KB и след това да заключите програмата за първоначално зареждане на устройството. Докоснете, за да прочетете повече."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Използвате опцията 16 KB за режима за съвместимост със страниците. Целостта на софтуера не може да се гарантира в този режим. Също така данните, съхранявани на телефона, може да са изложени на риск, докато програмата за първоначално зареждане е отключена. Определени функции ще бъдат деактивирани в тези режими, така че някои приложения може да не работят. За да активирате отново производствения режим, трябва да превключите обратно към режим 4 KB и след това да заключите програмата за първоначално зареждане на устройството. Това отново ще възстанови фабричните настройки на устройството, както и тези на производствения режим. След като то стартира Android, деактивирайте настройката за отключване чрез OEM от опциите за програмисти. Ако устройството не стартира Android или е нестабилно, преинсталирайте го посредством най-новите фабрични образи на адрес <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или използвайте <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете опцията за изчистване на всички данни от устройството, „Заключване на програмата за първоначално зареждане“ и опцията за принудително инсталиране на всички дялове."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим за съвместимост със страниците (16 KB)"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Прочетете още"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Манипулатор за сигналите за програмни грешки"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Използване на функцията за фиксиране на приложение"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Използване на опциите за програмисти"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Използване на услуга за отпечатване"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Разрешаване на използването от няколко потребители"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Разрешаване на превключването на потребителя"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"разрешаване, няколко, потребител, позволяване, много"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"няколко, потребители, потребителски профили, хора, профили, превключване, много"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Използване на безжичното отстраняване на грешки"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Изберете какво да се показва на екрана, когато таблетът ви е свързан с докинг станция. Устройството ви може да изразходва повече енергия при използването на скрийнсейвър."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Персонализиране"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Персонализиране на <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"За да се активира поддръжката в свободна форма, се изисква рестартиране."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"За да се зададе принудително настолният режим на алтернативни дисплеи, се изисква рестартиране."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"За да се активира поддръжката за наследените прозорци в свободна форма, се изисква рестартиране."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"За да се промени поддръжката за прозорците в свободна форма, се изисква рестартиране."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"За да се зададат принудително прозорците в свободна форма на вторични дисплеи, се изисква рестартиране."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Рестартиране сега"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Рестартиране по-късно"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Пространствено аудио"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Вкл."</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Изкл."</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Вкл."</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио: ляво %1$d%%, дясно %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио: дясно %1$d%%, ляво %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Името на устройството ви е видимо за инсталираните от вас приложения. То може да се вижда и от други хора, когато се свържете с устройства с Bluetooth или с Wi-Fi мрежа или настроите точка за достъп до Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Граматически род"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Изберете граматически род"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Настройки за търсенето"</string>
</resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index c88de1c..14da709 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"বেডটাইম"</item>
+ <item msgid="4152450357280759894">"ড্রাইভ করার সময়"</item>
+ <item msgid="7096549258219399423">"ইমারসিভ"</item>
+ <item msgid="2760716776980432977">"ম্যানেজ করা"</item>
+ <item msgid="601734478369121764">"স্টার"</item>
+ <item msgid="6243809315432780521">"ক্যালেন্ডার"</item>
+ <item msgid="4913577903148415331">"সময়"</item>
+ <item msgid="3653377604690057780">"থিয়েটার"</item>
+ <item msgid="3843711267408385410">"ফুল"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1571aaf..011f78a 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ডিভাইসের ডিসকানেক্ট করবেন?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"নতুন ডিভাইস পেয়ার করুন"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ব্লুটুথ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"আগামীকাল অটোমেটিক চালু হয়ে যাবে"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"হিয়ারিং ডিভাইস সংক্রান্ত সেটিংস"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"শর্টকাট, হিয়ারিং এড কম্প্যাটিবিলিটি"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"প্রিসেট"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"আপনার অডিওলজিস্ট কোনও প্রিসেট প্রোগ্রাম করে রাখেননি"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"প্রিসেট আপডেট করা যায়নি"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"অডিও আউটপুট"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"অডিও আউটপুট সম্পর্কে"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"বন্ধ আছে"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{চালু আছে / #টি অ্যাপ লোকেশন অ্যাক্সেস করতে পারবে}one{চালু আছে / #টি অ্যাপ লোকেশন অ্যাক্সেস করতে পারবে}other{চালু আছে / #টি অ্যাপ লোকেশন অ্যাক্সেস করতে পারবে}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"লোড হচ্ছে…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"আশেপাশের ডিভাইসের অনুমতি থাকা অ্যাপগুলি কানেক্ট করা ডিভাইসের আপেক্ষিক অবস্থান নির্ণয় করতে পারে।"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"কাছাকাছি ডিভাইসের অনুমতি থাকা অ্যাপ, কানেক্ট করা ডিভাইসের আপেক্ষিক অবস্থান নির্ণয় করতে পারে।"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"অ্যাপ ও পরিষেবার লোকেশন অ্যাক্সেস বন্ধ রয়েছে। জরুরি নম্বরে কল অথবা টেক্সট করলে সাহায্যকারীর কাছে আপনার ডিভাইসের লোকেশন এখনও পাঠানো হতে পারে।"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"\'লোকেশন সেটিংস\' সম্পর্কে আরও জানুন"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"পরিবর্তন করতে, \'ChromeOS সেটিংস > গোপনীয়তা ও সুরক্ষা > গোপনীয়তা নিয়ন্ত্রণ > লোকেশন অ্যাক্সেস\' বিকল্পে যান"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ফেস ও <xliff:g id="WATCH">%s</xliff:g> যোগ করা হয়েছে"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ফেস, ফিঙ্গারপ্রিন্ট এবং <xliff:g id="WATCH">%s</xliff:g> যোগ করা হয়েছে"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ফেস, ফিঙ্গারপ্রিন্ট এবং <xliff:g id="WATCH">%s</xliff:g> যোগ করা হয়েছে"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"এটি করতে হবে কারণ আইডেন্টিটি চেক চালু আছে"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"রিমোট Authenticator আনলক করুন"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"স্মার্টওয়াচ যোগ করা হয়েছে"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"আপনার ঘড়ি সেট-আপ করুন"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"\'ঘড়ি আনলক করুন\' ফিচার সম্পর্কে আরও জানুন"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ঘড়ি যোগ করুন"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ঘড়ি সরান"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ফিঙ্গারপ্রিন্ট ও ফেস আনলক"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ফেস ও ফিঙ্গারপ্রিন্ট আনলক"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"অফিস প্রোফালের জন্য \'ফেস ও ফিঙ্গারপ্রিন্ট আনলক\' ফিচার"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"সেট-আপ করতে হবে"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ফেস এবং আঙ্গুলের ছাপ যোগ করা হয়েছে"</string>
@@ -558,7 +559,7 @@
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"প্রাইভেট স্পেসের জন্য \'ফিঙ্গারপ্রিন্ট আনলক\'"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"প্রাইভেট স্পেসের জন্য \'ফেস আনলক\'"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"প্রাইভেট স্পেসের জন্য ফেস ও ফিঙ্গারপ্রিন্ট আনলক করার সুবিধা"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"প্রাইভেট স্পেসের জন্য ফিঙ্গারপ্রিন্ট আনলক সেট আপ করুন"</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"প্রাইভেট স্পেসের জন্য ফিঙ্গারপ্রিন্ট আনলক সেটআপ করুন"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"অ্যাপে সাইন-ইন বা কেনাকাটায় অনুমোদন করার মতোই ফিঙ্গারপ্রিন্ট ব্যবহার করে প্রাইভেট স্পেস আনলক বা নিজের পরিচয় যাচাই করুন"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"আপনি না চাইলেও, প্রাইভেট স্পেস আপনার আঙুলে ফোন ছুঁইয়ে অন্য কেউ আনলক করতে পারবেন।"</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"আপনার প্রাইভেট স্পেস আনলক করতে বা কেনাকাটা অনুমোদন করতে ফিঙ্গারপ্রিন্ট ব্যবহার করুন"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"অ্যাপ ইনস্টল করুন"</b>\n"আপনি নিজের স্পেসে যেসব অ্যাপ ব্যক্তিগত রাখতে চান সেগুলি ইনস্টল করুন"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"মনে রাখবেন"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"আপনি নিজের স্পেস লক করলে অ্যাপ বন্ধ হয়"</b>\n"আপনি নিজের স্পেস লক করলে, আপনার স্পেসে থাকা অ্যাপগুলি বন্ধ হয়ে যাবে এবং আপনি সেগুলি থেকে কোনও বিজ্ঞপ্তি পাবেন না"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"যেসব অ্যাপ ব্যাকগ্রাউন্ডে চালাতে হয় বা গুরুত্বপূর্ণ বিজ্ঞপ্তি পাঠায়, সেগুলির জন্য প্রাইভেট স্পেস ব্যবহার করা যাবে না। যেমন, চিকিৎসা সম্পর্কিত অ্যাপ। এর কারণ হল, স্পেস লক হলে বিজ্ঞপ্তি পাঠানোর সুবিধা ও ব্যাকগ্রাউন্ড অ্যাক্টিভিটি বন্ধ হয়ে যায়।\n\nপ্রাইভেট স্পেস লক থাকলে, প্রাইভেট স্পেসে থাকা অ্যাপ পার্মিশন ম্যানেজার, প্রাইভেসি ড্যাশবোর্ড এবং অন্যান্য সেটিংসে দেখা যাবে না।\n\nআপনার প্রাইভেট স্পেস নতুন ডিভাইসে সরানো যাবে না। আপনি অন্য ডিভাইসে প্রাইভেট স্পেস ব্যবহার করতে চাইলে, আপনাকে অন্য একটি প্রাইভেট স্পেস সেট-আপ করতে হবে।\n\nযদি কেউ আপনার ডিভাইস একটি কম্পিউটারের সাথে কানেক্ট করেন বা ডিভাইসে ক্ষতিকারক অ্যাপ ইনস্টল করেন, তাহলে তিনি আপনার প্রাইভেট স্পেস হয়ত অ্যাক্সেস করতে পারবেন।"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"যেসব অ্যাপ ব্যাকগ্রাউন্ডে চালাতে হয় বা গুরুত্বপূর্ণ বিজ্ঞপ্তি পাঠায়, সেগুলির জন্য প্রাইভেট স্পেস ব্যবহার করা যাবে না। যেমন, চিকিৎসা সম্পর্কিত অ্যাপ। এর কারণ হল, স্পেস লক হলে বিজ্ঞপ্তি পাঠানোর সুবিধা ও ব্যাকগ্রাউন্ড অ্যাক্টিভিটি বন্ধ হয়ে যায়।\n\nপ্রাইভেট স্পেস লক থাকলে, প্রাইভেট স্পেসে থাকা অ্যাপ পার্মিশন ম্যানেজার, প্রাইভেসি ড্যাশবোর্ড এবং অন্যান্য সেটিংসে দেখা যাবে না।\n\nআপনার প্রাইভেট স্পেস নতুন ডিভাইসে ফিরিয়ে আনা যাবে না। আপনি অন্য ডিভাইসে স্পেস ব্যবহার করতে চাইলে আপনাকে অন্য একটি স্পেস সেট-আপ করতে হবে।\n\nকেউ আপনার ডিভাইস কোনও কম্পিউটারের সাথে কানেক্ট করলে বা ডিভাইসে ক্ষতিকর অ্যাপ ইনস্টল করলে, তিনি হয়ত আপনার প্রাইভেট স্পেস অ্যাক্সেস করতে পারবেন।"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"প্রাইভেট স্পেস সম্পর্কে আরও জানুন"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"এর জন্য কিছুক্ষণ সময় লাগতে পারে"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"প্রাইভেট স্পেস সেট-আপ করা হচ্ছে…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ডিভাইস রিস্টার্ট করবেন?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"শুধুমাত্র উন্নতির উদ্দেশ্যে বিস্তারিত NFC লগিং করা হয়েছে। NFC সংক্রান্ত অতিরিক্ত ডেটা সমস্যার রিপোর্টে অন্তর্ভুক্ত করা হয়েছে, যার মধ্যে ব্যক্তিগত তথ্যও থাকতে পারে। এই সেটিং পরিবর্তন করতে, আপনার ডিভাইস রিস্টার্ট করুন।"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"রিস্টার্ট করুন"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"মিরর, এক্সটার্নাল ডিসপ্লে, কানেক্টেড ডিসপ্লে, USB ডিসপ্লে, রেজোলিউশন, রোটেশন"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"রোটেশন"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"স্ট্যান্ডার্ড"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"৯০°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"১৮০°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"২৭০°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"অন-স্ক্রিন কীবোর্ড ব্যবহার করুন"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ফিজিক্যাল কীবোর্ড সক্রিয় থাকার সময় এটিকে স্ক্রীনে রাখুন"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"পয়েন্টার ফিল স্টাইল বদলে হলুদ করুন"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"পয়েন্টার ফিল স্টাইল বদলে গোলাপি করুন"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"পয়েন্টার ফিল স্টাইল বদলে নীল করুন"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"পয়েন্টার স্ট্রোক স্টাইল"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"সাদা"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"কালো"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"কোনওটিই নয়"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ব্যবহারকারী বেছে নেওয়া হয়েছে: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"স্পিচ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"পয়েন্টারের গতি"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"পয়েন্টার স্কেল"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"পয়েন্টার স্কেল ছোট করুন"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"পয়েন্টার স্কেল বড় করুন"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"গেম নিয়ন্ত্রক"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ইনপুট ডিভাইসে ভাইব্রেশন হতে দিন"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"গেমের কন্ট্রোলার কানেক্ট করা থাকলে সেটিতে ভাইব্রেশন হতে দিন"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"তা সত্ত্বেও চালিয়ে যান"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"বাতিল করুন"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বড় করে দেখার সেটিংস"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"একটি আঙুল দিয়ে প্যান করা"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"১টি আঙুল দিয়ে ম্যাগনিফায়ার সরান"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"স্ক্রিনের মধ্যে যে কোনও জায়গায় সরাতে ১টি আঙুল দিয়ে টেনে আনুন"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"\'বড় করে দেখা\' এলাকা একটি আঙুল দিয়ে টেনে সরান।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"\'বড় করে দেখা\' এলাকা দুটি আঙুল দিয়ে টেনে সরান।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"শুধুমাত্র স্ক্রিনের বড় করে দেখানো অংশে উপলভ্য থাকে না"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"জুম করার জন্য বোতামে ট্যাপ করুন"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"কন্টেন্ট আরও বড় সাইজে দেখার জন্য, স্ক্রিনে দ্রুত জুম বাড়ান"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>জুম ইন করতে:</b><br/> {0,number,integer}. \'বড় করে দেখা\' ফিচার চালু করার জন্য শর্টকাট ব্যবহার করুন<br/> {1,number,integer}। স্ক্রিনে ট্যাপ করুন<br/> {2,number,integer}। স্ক্রিনের চারদিকে ঘোরাতে ২টি আঙুল দিয়ে টেনে আনুন<br/> {3,number,integer}। জুম অ্যাডজাস্ট করার জন্য ২টি আঙুল দিয়ে পিঞ্চ করুন<br/> {4,number,integer}। \'বড় করে দেখা\' ফিচার বন্ধ করার জন্য শর্টকাট ব্যবহার করুন<br/><br/> <b>সাময়িকভাবে জুম ইন করতে:</b><br/> {0,number,integer}। আপনার \'বড় করে দেখা\' ফিচারের ধরন ফুল স্ক্রিনে সেট হয়েছে কিনা ভাল করে দেখে নিন<br/> {1,number,integer}। \'বড় করে দেখা\' ফিচার চালু করতে শর্টকাট ব্যবহার করুন<br/> {2,number,integer}। স্ক্রিনের যেকোনও জায়গা টাচ করে ধরে থাকুন<br/> {3,number,integer}। স্ক্রিনের চারদিকে ঘোরাতে আঙুল দিয়ে টেনে আনুন<br/> {4,number,integer}। \'বড় করে দেখা\' ফিচার বন্ধ করতে স্ক্রিনের উপর থেকে আঙুল সরিয়ে নিন"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>জুম-ইন করতে:</b><br/> {0,number,integer}. \'বড় করে দেখা\' ফিচার চালু করতে শর্টকাট ব্যবহার করুন<br/> {1,number,integer}. স্ক্রিনে ট্যাপ করুন<br/> {2,number,integer}. স্ক্রিনের মধ্যে যে কোনও জায়গায় সরাতে ২টি আঙুল দিয়ে টেনে আনুন<br/> {3,number,integer}. জুম অ্যাডজাস্ট করার জন্য ২টি আঙুল দিয়ে পিঞ্চ করুন zoom<br/> {4,number,integer}. \'বড় করে দেখা\' ফিচার বন্ধ করতে শর্টকাট ব্যবহার করুন<br/><br/> এছাড়াও সাময়িকভাবে জুম-ইন এবং আরও অনেক কিছু করুন।"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>জুম-ইন করতে:</b><br/> {0,number,integer}. \'বড় করে দেখা\' ফিচার চালু করতে শর্টকাট ব্যবহার করুন<br/> {1,number,integer}. স্ক্রিনে ট্যাপ করুন<br/> {2,number,integer}. স্ক্রিনের মধ্যে যে কোনও জায়গায় সরাতে ১টি অথবা ২টি আঙুল দিয়ে টেনে আনুন<br/> {3,number,integer}. জুম অ্যাডজাস্ট করার জন্য ২টি আঙুল দিয়ে পিঞ্চ করুন zoom<br/> {4,number,integer}. \'বড় করে দেখা\' ফিচার বন্ধ করতে শর্টকাট ব্যবহার করুন<br/><br/> এছাড়াও সাময়িকভাবে জুম-ইন এবং আরও অনেক কিছু করুন।"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ম্যাগনিফিকেশন চালু করা থাকলে, আপনি স্ক্রিনে জুম বাড়াতে পারবেন।\n\n"<b>"জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"• স্ক্রল করতে ২ বা তার বেশি আঙ্গুল দিয়ে টানুন"</li>\n<li>"• জুম অ্যাডজাস্ট করতে ২ বা তার বেশি আঙ্গুল দিয়ে পিঞ্চ করুন"</li></ul>\n\n<b>"সাময়িকভাবে জুম করতে"</b>", ম্যাগনিফিকেশন চালু করে স্ক্রিনের যেকোনও জায়গায় টাচ করে ধরে থাকুন।\n"<ul><li>"• টেনে স্ক্রিনের বিভিন্ন জায়গায় সরান"</li>\n<li>"• জুম কমাতে স্ক্রিন থেকে আঙ্গুল তুলে নিন"</li></ul>\n\n"কীবোর্ড বা নেভিগেশন বারে আপনি জুম করতে পারবেন না।"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>টি মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"অ্যাক্সেসিবিলিটি বোতামের শর্টকার্ট"</string>
@@ -2944,7 +2969,7 @@
<string name="vpn_lockdown_config_error" msgid="1992071316416371316">"সর্বদা-চালু VPN এর সার্ভার্র এবং DNS উভয়েরই জন্য আইপি অ্যাড্রেস প্রয়োজন।"</string>
<string name="vpn_no_network" msgid="7187593680049843763">"কোনো নেটওয়ার্ক কানেকশন নেই। দয়া করে পরে আবার চেষ্টা করুন।"</string>
<string name="vpn_disconnected" msgid="7694522069957717501">"VPN থেকে ডিসকানেক্ট হয়েছে"</string>
- <string name="vpn_disconnected_summary" msgid="721699709491697712">"কোনো কিছুই নয়"</string>
+ <string name="vpn_disconnected_summary" msgid="721699709491697712">"কোনওটাই নয়"</string>
<string name="vpn_missing_cert" msgid="5397309964971068272">"একটি সার্টিফিকেট পাওয়া যাচ্ছে না। প্রোফাইলটি সম্পাদনা করুন।"</string>
<string name="trusted_credentials_system_tab" msgid="675362923690364722">"সিস্টেম"</string>
<string name="trusted_credentials_user_tab" msgid="4978365619630094339">"ব্যবহারকারী"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{একটিও নেই}=1{১টি শিডিউল সেট করা হয়েছে}one{#টি শিডিউল সেট করা হয়েছে}other{#টি শিডিউল সেট করা হয়েছে}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"বিরক্ত করবে না"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"অগ্রাধিকার মোড"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"মোড যোগ করুন"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"শুধু গুরুত্বপূর্ণ লোকজন এবং অ্যাপ থেকে বিজ্ঞপ্তি পান"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"অ্যাক্টিভেশনের ধরন বেছে নিন"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"সময়"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"যেমন, \"৯:৩০ – ৫:০০ PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ক্যালেন্ডার"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"যেমন, \"ব্যক্তিগত ক্যালেন্ডার\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"মোড তৈরি করুন"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"কাস্টম"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বিরক্তিকর কন্টেন্ট বন্ধ করা"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'বিরক্ত করবে না\' মোড চালু করুন"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"অ্যালার্ম ও মিডিয়া সাউন্ড বাধা দিতে পারবে"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"সময়সূচি"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"সময়সূচি মুছে দিন"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"মুছে দিন"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"নাম পরিবর্তন করুন"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"মুছুন"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" মোড মুছতে চান?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"এডিট করুন"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"সময়সূচি"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"সময়সূচি"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"একটি ক্যালেন্ডার যোগ করুন"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"আপনার ক্যালেন্ডার ব্যবহার করুন"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"শিডিউল করুন"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"একটি শিডিউল সেট করুন"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"শিডিউল করুন"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ঘণ্টা, <xliff:g id="MINUTES">%2$d</xliff:g> মিনিট"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"অটোমেটিক চালু করুন"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"সময়সূচি"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"নির্দিষ্ট সময়ে ফোন সাইলেন্ট করুন"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'বিরক্ত করবে না\' মোডের নিয়ম সেট-আপ করুন"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"যেসব বিজ্ঞপ্তি এলে আওয়াজ হয় সেগুলিকে অনুমতি দিন"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ভিজ্যুয়াল ব্যাঘাতগুলিকে ব্লক করুন"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ভিজুয়াল সঙ্কেতগুলি চালু করুন"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"আপনাকে দেখানো হবে এমন বিজ্ঞপ্তি"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"মনোযোগ বজায় রাখুন"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"অতিরিক্ত অ্যাকশন"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{বন্ধ আছে}=1{বন্ধ আছে / ১টি মোড অটোমেটিক চালু হতে পারে}one{বন্ধ আছে / #টি মোড অটোমেটিক চালু হতে পারে}other{বন্ধ আছে / #টি মোড অটোমেটিক চালু হতে পারে}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ডিসপ্লে সেটিংস"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ডিসপ্লে বিকল্প"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"গ্রেস্কেল"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ডার্ক থিম চালু করুন"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ডার্ক ব্যাকগ্রাউন্ডের উপর হালকা টেক্সট পড়তে OS ও অ্যাপের থিমে পরিবর্তন করুন, এটি চোখের পক্ষে আরামদায়ক হতে পারে এবং কিছু ডিভাইসে যথেষ্ট ব্যাটারি সাশ্রয় করতে পারে"</string>
<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}}one{{effect_1}, {effect_2} ও আরও #টি}other{{effect_1}, {effect_2} ও আরও #টি}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"ইন্টারাপশন ফিল্টার করুন"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"কোনও ইন্টারাপশন, ফিল্টার করা হয়নি"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"বিজ্ঞপ্তি খুলুন"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"বিজ্ঞপ্তি স্নুজ করার অনুমতি দিন"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"অ্যাপ আইকনে বিজ্ঞপ্তির ডট"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"বিজ্ঞপ্তির বান্ডেল"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"বাবল"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"বাবল"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"বাবল আইকন হিসেবে হোম স্ক্রিনে কথোপকথন যোগ করা"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"এই অ্যাপে উন্নত সেটিংস কাজ করে না"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"আরও সেটিংস"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"এই অ্যাপের মধ্যে আরও সেটিংস উপলভ্য আছে"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"বিজ্ঞপ্তির কুলডাউন"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"অফিস প্রোফাইলে প্রয়োগ করুন"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"অফিস প্রোফাইল অ্যাপে প্রয়োগ করুন"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"বিভাগগুলি"</string>
<string name="notification_channels_other" msgid="18159805343647908">"অন্যান্য"</string>
<string name="no_channels" msgid="4716199078612071915">"এই অ্যাপটি দ্বারা কোন বিজ্ঞপ্তি পোস্ট করা হয়নি"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"অব্যবহৃত বিভাগ দেখুন"</string>
<string name="app_settings_link" msgid="6725453466705333311">"অ্যাপের আরও সেটিংস"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"অব্যবহৃত বিভাগ দেখান"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"অব্যবহৃত বিভাগ লুকান"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"যেসব অ্যাপ বিরক্ত করবে না মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"বেছে নেওয়া অ্যাপ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"কোনওটিই নয়"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"সব"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"অ্যাপ ওভাররাইডের অনুমতি দিন"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"যে অ্যাপগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"আরও অ্যাপ বেছে নিন"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"কেউ বাধা দিতে পারবে না"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"কেউই বাধা দিতে পারবে না"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"কিছু লোকজন বাধা দিতে পারবে"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"সবাই বাধা দিতে পারবে"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"রিপিট কলার"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"রিপিট কলারদের অনুমতি দিন"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} পর্যন্ত এক ঘণ্টার জন্য অ্যালার্ম পরিবর্তন করুন}one{{time} পর্যন্ত # ঘণ্টার জন্য অ্যালার্ম পরিবর্তন করুন}other{{time} পর্যন্ত # ঘণ্টার জন্য অ্যালার্ম পরিবর্তন করুন}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"মোড এডিট করুন"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"মোড যোগ করুন"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"কাস্টম মোড"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"মোডের নাম"</string>
<string name="warning_button_text" msgid="1274234338874005639">"সতর্কতা"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"বন্ধ করুন"</string>
<string name="device_feedback" msgid="5351614458411688608">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ফোর্স ডেস্কটপ মোড"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"সেকেন্ডারি ডিসপ্লেতে ফোর্স এক্সপেরিমেন্টাল ডেস্কটপ মোড চালু করা আছে"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ফ্রিফর্ম উইন্ডো চালু করুন"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ফ্রিফর্ম উইন্ডোর জন্য সহায়তা চালু করুন।"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"সেকেন্ড ডিসপ্লেতে ফ্রিফর্ম উইন্ডো চালু করুন"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"শুধুমাত্র সেকেন্ডারি ডিসপ্লেতে ফ্রিফর্ম উইন্ডো চালু করুন।"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ছোট বড় করা যায় না এমন একাধিক উইন্ডো চালু করুন"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"একাধিক উইন্ডোয় ছোট বড় করা যায় না এমন অ্যাপের অনুমতি দিন"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ফোর্স-ডার্ক ফিচার ওভাররাইড করুন"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"১৬ কেবি ডেভেলপার বিকল্প ব্যবহার করার আগে, এই ডিভাইসের ডেটা পার্টিশন ext4-এ পরিবর্তন করতে হবে। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। ১৬ কেবি ডেভেলপার বিকল্প অ্যাক্টিভেট করে দিলে, এর পরে ডিভাইসটি আরও একবার রিবুট করতে হবে। আপনি এই মোড থাকলে, একবার রিবুট করার মাধ্যমে ৪ কেবি এবং ১৬ কেবি মোডের মধ্যে সুইচ করতে পারবেন। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। ডিভাইসটি প্রোডাকশন মোডে রাখতে, আপনাকে ৪ কেবি মোডে ফিরে আসতে হবে ও তারপরে বুটলোডার লক করতে হবে যেটি ডিভাইসকে ফ্যাক্টরি রিসেট করবে। ডিভাইসটি Android-এ বুট করা হয়ে গেলে, ডেভেলপার বিকল্পে OEM আনলক করা বন্ধ করুন। নিশ্চিত করার পরে ডিভাইস ওয়াইপ করা হবে এবং ফাইল সিস্টেম ext4-এ পরিবর্তিত হয়ে যাবে। এটি হয়ে যাওয়ার পরে, আবার ১৬ কেবি মোড চালু করুন।"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"সব ডেটা মুছুন"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ডেটা পার্টিশানকে ext4 ফর্ম্যাটে আবার ফর্ম্যাট করা ও ওয়াইপ করা যায়নি।"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"১৬ কেবি মোডের জন্য বুটলোডার আনলক করা প্রয়োজন"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"বুটলোডার আনলক করতে হবে"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"১৬ কেবি ডেভেলপার বিকল্প ব্যবহার করতে হলে, এই ডিভাইসের জন্য বুটলোডার আনলক করতে হবে। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। ১৬ কেবি মোড অ্যাক্টিভেট করে দিলে, ব্যবহারকারীর সব ডেটা ও সেটিংস ওয়াইপ হয়ে যাবে। বুটলোডার আনলক হয়ে গেলে, ১৬ কেবি মোড বিকল্প চালু করার জন্য ডিভাইস দুবার রিবুট করার প্রয়োজন হয়। আপনি এই মোড থাকলে, একবার রিবুট করার মাধ্যমে ৪ কেবি এবং ১৬ কেবি মোডের মধ্যে সুইচ করতে পারবেন। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। ডিভাইসটিকে আবার প্রোডাকশন মোডে রাখতে, আপনাকে ৪ কেবি মোডে ফিরে আসতে হবে ও তারপরে OEM/বুটলোডার লক করতে হবে (যেটি ডিভাইসকে ফ্যাক্টরি রিসেট করবে)। বুটলোডার আনলক করে আবার চেষ্টা করুন। বুটলোডার কীভাবে আনলক করবেন তার নির্দেশাবলী এখানে দেখতে পারেন <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"৪ কেবি পেজ-অ্যাগনোস্টিক মোড ব্যবহার করা হচ্ছে"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"আপনি পেজ-অ্যাগনোস্টিক মোডের ৪ কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, অবশ্যই ডিভাইসের বুটলোডার লক করতে হবে। আরও পড়তে ট্যাপ করুন।"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"আপনি পেজ-অ্যাগনোস্টিক মোডের ৪ কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, অবশ্যই ডিভাইসের বুটলোডার লক করতে হবে। এটি ডিভাইসটিকে আবার ফ্যাক্টরি রিসেট করবে এবং এটির প্রোডাকশন সেটিংস আগের মতো হয়ে যাবে। ডিভাইসটি Android-এ বুট করা হয়ে গেলে, ডেভেলপার বিকল্পে OEM আনলক করা বন্ধ করুন। ডিভাইসটি Android-এ বুট করা না গেলে বা স্থিতিশীল না হলে, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> সাম্প্রতিক ফ্যাক্টরি ইমেজের সাথে ডিভাইসটি আবার ফ্ল্যাশ করুন এবং \'ডিভাইস ওয়াইপ করুন\', \'বুটলোডার লক করুন\' ও \'সব পার্টিশন জোরপূর্বক ফ্ল্যাশ করুন\' বিকল্প বেছে নিন।"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"১৬ কেবি পেজ-অ্যাগনোস্টিক মোড ব্যবহার করা হচ্ছে"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"আপনি পেজ-অ্যাগনোস্টিক মোডের ১৬ কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, আপনাকে অবশ্যই ৪ কেবি মোডে ফিরে যেতে হবে ও তারপরে ডিভাইসের বুটলোডার লক করতে হবে। আরও পড়তে ট্যাপ করুন।"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"আপনি পেজ-অ্যাগনোস্টিক মোডের ১৬ কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারেন্টি দেওয়া যায় না এবং বুটলোডার আনলক থাকা অবস্থায় ফোনে স্টোর করে রাখা কোনও ডেটা সুরক্ষিত নাও থাকতে পারে। এইসব মোডে কিছু ফিচার বন্ধ করে দেওয়া হবে, তাই কিছু অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, আপনাকে অবশ্যই ৪ কেবি মোডে ফিরে যেতে হবে ও তারপরে ডিভাইসের বুটলোডার লক করতে হবে। এটি ডিভাইসটিকে আবার ফ্যাক্টরি রিসেট করবে এবং এটির প্রোডাকশন সেটিংস আগের মতো হয়ে যাবে। ডিভাইসটি Android-এ বুট করা হয়ে গেলে, ডেভেলপার বিকল্পে OEM আনলক করা বন্ধ করুন। ডিভাইসটি Android-এ বুট করা না গেলে বা স্থিতিশীল না হলে, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> সাম্প্রতিক ফ্যাক্টরি ইমেজের সাথে ডিভাইসটি আবার ফ্ল্যাশ করুন এবং \'ডিভাইস ওয়াইপ করুন\', \'বুটলোডার লক করুন\' ও \'সব পার্টিশন জোরপূর্বক ফ্ল্যাশ করুন\' বিকল্প বেছে নিন।"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"আপনি পেজ-অ্যাগনোস্টিক মোডের ১৬কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারান্টি দেওয়া যায় না এবং বুটলোডার আনলক করা অবস্থায় ফোনে সেভ করে রাখা ডেটা নিয়ে ঝুঁকি থাকতে পারে। এই মোডে কিছু ফিচার বন্ধ করা থাকে, তাই কোনও কোনও অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, আপনাকে অবশ্যই ৪কেবি মোডে ফিরে যেতে হবে ও তারপরে ডিভাইসের বুটলোডার লক করতে হবে। আরও পড়তে ট্যাপ করুন।"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"আপনি পেজ-অ্যাগনোস্টিক মোডের ১৬কেবি মোডে আছেন। এই মোডে সফ্টওয়্যার ইন্টিগ্রিটির গ্যারান্টি দেওয়া যায় না এবং বুটলোডার আনলক করা অবস্থায় ফোনে সেভ করে রাখা ডেটা নিয়ে ঝুঁকি থাকতে পারে। এই মোডে কিছু ফিচার বন্ধ করা থাকে, তাই কোনও কোনও অ্যাপ্লিকেশন কাজ নাও করতে পারে। প্রোডাকশন মোডে আবার যেতে চাইলে, আপনাকে অবশ্যই ৪কেবি মোডে ফিরে যেতে হবে ও তারপরে ডিভাইসের বুটলোডার লক করতে হবে। এটি ডিভাইসটিকে আবার ফ্যাক্টরি রিসেট করবে এবং এটির প্রোডাকশন সেটিংস আগের মতো হয়ে যাবে। ডিভাইস Android-এ বুট হয়ে গেলে, ডেভেলপার বিকল্প থেকে OEM আনলক বন্ধ করুন। ডিভাইসটি Android-এ বুট করা না গেলে বা স্থিতিশীল না হলে, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> থেকে সাম্প্রতিক ফ্যাক্টরি ইমেজের সাথে ডিভাইসটি আবার ফ্ল্যাশ করুন অথবা <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ব্যবহার করুন এবং \'ডিভাইস ওয়াইপ করুন\', \'বুটলোডার লক করুন\' ও \'সব পার্টিশন ফোর্স ফ্ল্যাশ করুন\' বিকল্প বেছে নিন।"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"১৬ কেবি পেজ-অ্যাগনোস্টিক মোড"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"আরও পড়ুন"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"সমস্যার রিপোর্টের পরিচালক"</string>
@@ -5009,14 +5056,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"অ্যাপ পিন বিকল্প ব্যবহার করুন"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ডেভেলপার বিকল্প ব্যবহার করুন"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"প্রিন্ট পরিষেবা ব্যবহার করুন"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"একাধিক ব্যবহারকারীকে অনুমতি দিন"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ব্যবহারকারী পরিবর্তনের অনুমতি দিন"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"অনুমতি, একাধিক, ব্যবহারকারী, অনুমতি, অনেক"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"একাধিক, ব্যবহারকারী, প্রোফাইল, লোকজন, অ্যাকাউন্ট, পরিবর্তন করুন, অনেক"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ওয়্যারলেস ডিবাগিং বিকল্প ব্যবহার করুন"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"গ্রাফিক্স ড্রাইভার বিকল্প ব্যবহার করুন"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"নাইট লাইট বিকল্প ব্যবহার করুন"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"NFC বিকল্প ব্যবহার করুন"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"\'পরিবেশের আলো অনুযায়ী উজ্জ্বলতা\' ব্যবহার করুন"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"পরিবেশের আলো অনুযায়ী উজ্জ্বলতা ব্যবহার করুন"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"Wi-Fi কলিং বিকল্প ব্যবহার করুন"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"সমস্ত অ্যাপ দেখুন"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"স্মার্ট ফরওয়ার্ডিং"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ট্যাবলেট ডক করা থাকলে, আপনি স্ক্রিনে কী কী দেখবেন তা বেছে নিন। স্ক্রিন সেভার ব্যবহার করার সময়, আপনার ডিভাইস ব্যাটারির চার্জ বেশি ব্যবহার করতে পারে।"</string>
<string name="customize_button_title" msgid="1110284655990203359">"কাস্টমাইজ করুন"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> কাস্টমাইজ করুন"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ফ্রিফর্ম সহায়তা চালু করার জন্য, ডিভাইস রিবুট করতে হবে।"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"সেকেন্ডারি ডিসপ্লেতে ডেস্কটপ মোড জোর করে চালানোর জন্য রিবুট করতে হবে।"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ফ্রিফর্ম উইন্ডো সহায়তার লিগ্যাসি মোড চালু করতে রিবুট করতে হবে।"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ফ্রিফর্ম উইন্ডো সহায়তা পরিবর্তন করতে রিবুট করতে হবে।"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"সেকেন্ডারি ডিসপ্লেতে ফ্রিফর্ম উইন্ডো জোর করে চালু করতে রিবুট করতে হবে।"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"এখনই রিবুট করুন"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"পরে রিবুট করুন"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"স্পেশিয়ল অডিও"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"চালু আছে"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"বন্ধ আছে"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"চালু আছে"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"অডিও %1$d%% বাঁদিক, %2$d%% ডানদিক"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"অডিও %1$d%% ডানদিক, %2$d%% বাঁদিক"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"আপনার ইনস্টল করা অ্যাপে আপনার ডিভাইসের নাম দেখা যাচ্ছে। আপনি ব্লুটুথ ডিভাইস বা কোনও ওয়াই-ফাই নেটওয়ার্কে কানেক্ট অথবা ওয়াই-ফাই হটস্পট সেট-আপ করলে অন্য লোকজনও এটি দেখতে পেতে পারেন।"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ব্যাকরণগতভাবে লিঙ্গ পরিচয়"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ব্যাকরণগতভাবে লিঙ্গ পরিচয় বেছে নিন"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"সেটিংস সার্চ করুন"</string>
</resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 93ee2fe..e3d2912 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Vrijeme za spavanje"</item>
+ <item msgid="4152450357280759894">"Vožnja"</item>
+ <item msgid="7096549258219399423">"Uvjerljivo"</item>
+ <item msgid="2760716776980432977">"Upravljano"</item>
+ <item msgid="601734478369121764">"Zvijezda"</item>
+ <item msgid="6243809315432780521">"Kalendar"</item>
+ <item msgid="4913577903148415331">"Vrijeme"</item>
+ <item msgid="3653377604690057780">"Pozorište"</item>
+ <item msgid="3843711267408385410">"Cvijet"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 84d8358..5b18845 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Želite li prekinuti vezu s uređajem?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Postavke slušnog aparata"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Prečica, kompatibilnost sa slušnim aparatom"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Zadana postavka"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Nema zadanih postavki koje je programirao vaš audiolog"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ažuriranje zadanih postavki nije uspjelo"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Izlaz zvuka"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informacije o izlazu zvuka"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Uključeno / # aplikacija ima pristup lokaciji}one{Uključeno / # aplikacija ima pristup lokaciji}few{Uključeno / # aplikacije imaju pristup lokaciji}other{Uključeno / # aplikacija ima pristup lokaciji}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Učitavanje…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacije s odobrenjem za Uređaje u blizini mogu otkriti relativan položaj povezanih uređaja."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacije s odobrenjem za uređaje u blizini mogu otkrivati relativan položaj povezanih uređaja."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Pristup lokaciji je isključen za aplikacije i usluge. Lokacija uređaja se i dalje može slati hitnim službama kada pozovete broj za hitne slučajeve ili pošaljete SMS na njega."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saznajte više o postavkama lokacije"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Da to promijenite, idite u Postavke ChromeOS-a > Privatnost i sigurnost > Kontrole privatnosti > Pristup lokaciji"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Dodani su lice i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Dodani su lice, otisak prsta i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Dodani su lice, otisci prstiju i <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Ovo je potrebno jer je provjera identiteta uključena"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Otključavanje udaljenog autentifikatora"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Sat je dodan"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Postavite sat"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saznajte više o Otključavanju pomoću sata"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj sat"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Uklanjanje sata"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Otključavanje otiskom prsta i licem"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Otključavanje licem i otiskom prsta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Otključavanje licem i otiskom prsta za radni profil"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Potrebno je postavljanje"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Lice i otisci prstiju su dodani"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalirajte aplikacije"</b>\n"Instalirajte aplikacije koje želite da budu privatne u vašem prostoru"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Imajte na umu"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacije se zaustavljaju kada zaključate prostor"</b>\n"Kada zaključate prostor, aplikacije u prostoru se zaustavljaju i od njih više nećete primati obavještenja"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privatni prostori nisu prikladni za aplikacije koje moraju raditi u pozadini ili koje šalju kritična obavještenja kao što su medicinske aplikacije. Ovo je zato što se obavještenja i aktivnost u pozadini zaustavljaju kada se prostor zaključa.\n\nAplikacije u privatnom prostoru se neće prikazivati na kontrolnoj tabli za privatnost ni u upravitelju odobrenja i drugim postavkama kada je privatni prostor zaključan.\n\nPrivatni prostor se ne može premjestiti na novi uređaj. Trebate postaviti drugi privatni prostor ako ga želite koristiti na drugom uređaju.\n\nSvako ko poveže vaš uređaj s računarom ili na njega instalira štetne aplikacije može pristupati vašem privatnom prostoru."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privatni prostori nisu prikladni za aplikacije koje moraju raditi u pozadini ili koje šalju kritična obavještenja kao što su medicinske aplikacije. Ovo je zato što se obavještenja i aktivnost u pozadini zaustavljaju kada se prostor zaključa.\n\nAplikacije u privatnom prostoru se neće prikazivati na kontrolnoj tabli za privatnost ni u upravitelju odobrenja i drugim postavkama kada je privatni prostor zaključan.\n\nPrivatni prostor se ne može vratiti na novi uređaj. Trebate postaviti drugi prostor ako ga želite koristiti na drugom uređaju.\n\nSvako ko poveže vaš uređaj s računarom ili na njega instalira zlonamjerne aplikacije može pristupati vašem privatnom prostoru."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saznajte više o privatnom prostoru"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Ovo će potrajati nekoliko trenutaka"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Postavljanje privatnog prostora…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Ponovo pokrenuti uređaj?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detaljno zapisivanje NFC podataka je namijenjeno samo za svrhe programiranja. Dodatni NFC podaci su uključeni u izvještaje o greškama, koji mogu sadržavati privatne podatke. Ponovo pokrenite uređaj da promijenite ovu postavku."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Ponovo pokreni"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"preslikati, vanjski ekran, povezani ekran, USB ekran, rezolucija, rotacija"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotacija"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardno"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Koristi tastaturu na ekranu"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Zadržava se na ekranu dok je fizička tastatura aktivna"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Promjena ispune pokazivača u žutu"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Promjena ispune pokazivača u ružičastu"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Promjena ispune pokazivača u plavu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stil poteza pokazivačem"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Bijela"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Crna"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ništa"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Korisnički odabrano: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Veličina pokazivača"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Smanjivanje veličine pokazivača"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Povećavanje veličine pokazivača"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler za igre"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Preusmjeravanje vibracije"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Pošalji vibraciju na kontroler za igre kada je povezan."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Ipak nastavi"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Otkaži"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke uvećavanja"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pomicanjem prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Premjestite povećalo s 1 prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Prevlačite s 1 prstom da se krećete na ekranu"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Pomaknite područje uvećanja prevlačenjem prstom."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Pomaknite područje uvećavanja prevlačenjem s dva prsta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nije dostupno dok se uvećava samo dio ekrana"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite dugme da zumirate"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Brzo uvećajte ekran da sadržaj postane veći"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Da uvećate:</b><br/> {0,number,integer}. Koristite prečicu da pokrenete uvećavanje.<br/> {1,number,integer}. Dodirnite ekran.<br/> {2,number,integer}. Prevlačite s 2 prsta da se krećete po ekranu.<br/> {3,number,integer}. Uhvatite s 2 prsta da podesite zumiranje.<br/> {4,number,integer}. Koristite prečicu da zaustavite uvećavanje.<br/><br/> <b>Da uvećate privremeno:</b><br/> {0,number,integer}. Provjerite je li vrsta uvećavanja postavljena na prikaz preko cijelog ekrana.<br/> {1,number,integer}. Koristite prečicu da pokrenete uvećavanje.<br/> {2,number,integer}. Dodirnite i zadržite bilo gdje na ekranu.<br/> {3,number,integer}. Prevlačite prstom da se krećete po ekranu.<br/> {4,number,integer}. Podignite prst da zaustavite uvećavanje."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Da uvećate:</b><br/> {0,number,integer}. Upotrijebite prečicu da pokrenete uvećavanje<br/> {1,number,integer}. Dodirnite ekran<br/> {2,number,integer}. Prevlačite s 2 prsta da se krećete na ekranu<br/> {3,number,integer}. Spojite 2 prsta da podesite zumiranje<br/> {4,number,integer}. Upotrijebite prečicu da zaustavite uvećavanje<br/><br/> Možete i privremeno uvećavati i drugo."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Da uvećate:</b><br/> {0,number,integer}. Upotrijebite prečicu da pokrenete uvećavanje<br/> {1,number,integer}. Dodirnite ekran<br/> {2,number,integer}. Prevlačite s 1 ili 2 prsta da se krećete na ekranu<br/> {3,number,integer}. Spojite 2 prsta da podesite zumiranje<br/> {4,number,integer}. Upotrijebite prečicu da zaustavite uvećavanje<br/><br/> Možete i privremeno uvećavati i drugo."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kada je uvećavanje uključeno, možete uvećavati sadržaj na ekranu.\n\n"<b>"Da zumirate"</b>", pokrenite uvećavanje, a zatim dodirnite ekran bilo gdje.\n"<ul><li>"Prevucite dva ili više prstiju za klizanje"</li>\n<li>"Uhvatite s dva ili više prstiju za podešavanje zumiranja"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" pokrenite uvećanje, a zatim dodirnite ekran bilo gdje i zadržite.\n"<ul><li>"Prevucite za kretanje po ekranu"</li>\n<li>"Podignite prst za umanjivanje"</li></ul>\n\n"Nije moguće uvećati na tastaturi ili traci za navigaciju."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Stranica <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> od <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Prečica dugmeta za pristupačnost"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nema}=1{Postavljen je 1 raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne ometaj"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritetni načini rada"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Dodajte način rada"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavještenja samo od važnih osoba i aplikacija"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Odaberite vrstu aktivacije"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Vrijeme"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Npr. \"9:30–17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Npr. \"Lični kalendar\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Kreirajte način rada"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Prilagođeno"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite ometanja"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključi način rada Ne ometaj"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Zvuci alarma i medija mogu prekinuti"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Rasporedi"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Izbrišite rasporede"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Izbriši"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Promijenite naziv"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Izbriši"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Izbrisati način rada \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Uredi"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Rasporedi"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Raspored"</string>
@@ -3339,7 +3378,8 @@
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Raspored"</string>
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Postavite raspored"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Raspored"</string>
- <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Automatski uključi"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Raspored"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Utišaj telefon u određeno vrijeme"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Postavite pravila za način rada Ne ometaj"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Dozvoli ometanja koja proizvode zvuk"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizuelnih ometanja"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dozvolite vizualnu signalizaciju"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Obavještenja koja vam se mogu prikazivati"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Budite fokusirani"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Dodatne radnje"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Isključeno}=1{Isključeno / 1 način rada se može automatski uključivati}one{Isključeno / # način rada se može automatski uključivati}few{Isključeno / # načina rada se mogu automatski uključivati}other{Isključeno / # načina rada se mogu automatski uključivati}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Postavke ekrana"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcije ekrana"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Nijanse sive"</string>
@@ -3365,7 +3406,9 @@
<string name="mode_dark_theme_title" msgid="8099007897943513209">"Omogući tamnu temu"</string>
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"omogući tamnu temu"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Postavite OS i aplikacije da preferiraju svijetli tekst na tamnoj pozadini jer to može biti lakše za oči, a na nekim uređajima omogućava i značajne uštede baterije"</string>
- <string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nema promjena ekrana}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}one{{effect_1}, {effect_2} i još #}few{{effect_1}, {effect_2} i još #}other{{effect_1}, {effect_2} i još #}}"</string>
+ <string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nema promjena prikaza}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}one{{effect_1}, {effect_2} i još #}few{{effect_1}, {effect_2} i još #}other{{effect_1}, {effect_2} i još #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtriraj prekide"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Prekidi se ne filtriraju"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcije prikaza filtriranih obavještenja"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kada je uključena funkcija Ne ometaj"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bez zvuka obavještenja"</string>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otvaranje obavještenja"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Dozvoli odgađanje obavještenja"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Tačka za obavještenja na ikoni aplikacije"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paketi obavještenja"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Oblačići"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Oblačići"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Prikaži ovaj razgovor u oblačiću"</string>
@@ -3610,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ova aplikacija ne podržava poboljšane postavke"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Više postavki"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Više postavki dostupno je unutar aplikacije"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Stišavanje obavještenja"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3662,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorije"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Ostalo"</string>
<string name="no_channels" msgid="4716199078612071915">"Ova aplikacija nije objavila nikakva obavještenja"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Prikaži kategorije koje se ne koriste"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Dodatne postavke u aplikaciji"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Prikaži kategorije koje se ne koriste"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Sakrij kategorije koje se ne koriste"</string>
@@ -3770,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacije koje vas mogu prekinuti"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Odabrane aplikacije"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nijedna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Sve"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Odaberite još aplikacija"</string>
@@ -3788,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekinuti"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može prekinuti"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekinuti"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekinuti"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Ponovni pozivaoci"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Dozvoli ponovne pozivaoce"</string>
@@ -3807,9 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Promjena na alarme samo na jedan sat do {time}}one{Promjena na alarme samo na # sat do {time}}few{Promjena na alarme samo na # sata do {time}}other{Promjena na alarme samo na # sati do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Pređi na postavku Samo alarmi do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Promijeniti u uvijek prekini"</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"Promijeni naziv"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"Promijeni ikonu"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"Promijenite ikonu"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Uredite način rada"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Dodajte 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="warning_button_text" msgid="1274234338874005639">"Upozorenje"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zatvori"</string>
<string name="device_feedback" msgid="5351614458411688608">"Slanje povratnih informacija o uređaju"</string>
@@ -4795,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Maska"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterija"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Ploča s postavkama"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Nametni način rada na računaru"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nametanje eksperimentalnog načina rada na računaru na sekundarnim ekranima"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogući prilagodljive prozore"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Omogućite podršku za prilagodljive prozore."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Omogući prilagodljive prozore na drugom ekranu"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Omogućite prilagodljive prozore samo na sekundarnom ekranu."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogući aplikacije nepromjenjive veličine u više prozora"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućava prikaz aplikacija nepromjenjive veličine u više prozora"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nadjačaj nametanje tamne teme"</string>
@@ -4855,23 +4908,23 @@
<string name="enable_16k_pages" msgid="8001470927566110689">"Pokreni uz veličinu stranice od 16 kB"</string>
<string name="enable_16k_pages_summary" msgid="1964363364670306912">"Pokrenite uređaj s jezgrom podržanom za str. od 16 kB"</string>
<string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"Pređite iz načina rada od 4 kB u način rada od 16 kB"</string>
- <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Nalazite se u načinu rada neovisnom o veličini stranice s jezgrom od 4 kB i prebacujete se u način rada od 16 kB. 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. To će ponovo pokrenuti uređaj. Neke funkcije će biti onemogućene u ovim načinima, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, trebate se vratiti u način rada od 4 kB i zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere."</string>
+ <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Nalazite se u načinu rada neovisnom o veličini stranice s jezgrom od 4 kB i prebacujete se u način rada od 16 kB. 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. To će ponovo pokrenuti uređaj. Neke funkcije će biti onemogućene u ovim načinima rada, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, trebate se vratiti u način rada od 4 kB i zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere."</string>
<string name="confirm_enable_4k_pages_title" msgid="3210360137887034659">"Promijenite iz načina rada od 16 kB u način rada od 4 kB"</string>
- <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Nalazite se u načinu rada neovisnom o veličini stranice s jezgrom od 16 kB i prebacujete se u način rada od 4 kB. 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. To će ponovo pokrenuti uređaj. Neke funkcije će biti onemogućene u ovim načinima, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, morate zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere."</string>
+ <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Nalazite se u načinu rada neovisnom o veličini stranice s jezgrom od 16 kB i prebacujete se u način rada od 4 kB. 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. To će ponovo pokrenuti uređaj. Neke funkcije će biti onemogućene u ovim načinima rada, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, morate zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere."</string>
<string name="toast_16k_update_failed_text" msgid="8888858987184345567">"Ažuriranje jezgre u jezgru kompatibilnu sa stranicama od 16 kB nije uspjelo."</string>
<string name="progress_16k_ota_title" msgid="2117218313875523741">"Primjena promjene"</string>
<string name="confirm_format_ext4_title" msgid="6696191800594435577">"Reformatirati uređaj na ext4? (potrebno je za način rada od 16 kB)"</string>
- <string name="confirm_format_ext4_text" msgid="7940372488624630214">"Particiju s podacima na uređaju treba konvertirati u ext4 prije korištenja opcije za programere sa 16 kB. 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. Aktiviranje opcije sa 16 kB zahtijevat će još jedno ponovno pokretanje nakon toga. Kada ste u ovom načinu rada, možete se prebacivati iz načina rada od 4 kB u način rada od 16 kB jednim ponovnim pokretanjem. Neke funkcije će biti onemogućene u ovim načinima, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, trebate se vratiti u način rada od 4 kB a zatim zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere. Podaci na uređaju će se uništiti, a sistem fajlova promijeniti u ext4 nakon potvrde. Nakon što se to završi, vratite se da ponovo omogućite 16 kB."</string>
+ <string name="confirm_format_ext4_text" msgid="7940372488624630214">"Particiju s podacima na uređaju treba konvertirati u ext4 prije korištenja opcije za programere sa 16 kB. 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. Aktiviranje opcije sa 16 kB zahtijevat će još jedno ponovno pokretanje nakon toga. Kada ste u ovom načinu rada, možete se prebacivati iz načina rada od 4 kB u način rada od 16 kB jednim ponovnim pokretanjem. Neke funkcije će biti onemogućene u ovim načinima rada, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, trebate se vratiti u način rada od 4 kB a zatim zaključati program za učitavanje operativnog sistema, čime se uređaj vraća na fabričke postavke. Nakon što se uređaj uspješno pokrene u Androidu, onemogućite OEM otključavanje u Opcijama za programere. Podaci na uređaju će se uništiti, a sistem fajlova promijeniti u ext4 nakon potvrde. Nakon što se to završi, vratite se da ponovo omogućite 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Potpuno izbriši sve podatke"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Reformatiranje i uništavanje podataka na particiji s podacima za ext4 nije uspjelo."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Potrebno je otključavanje programa za učitavanje operativnog sistema za način rada od 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Potrebno je otključavanje programa za učitavanje operativnog sistema"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Na ovom uređaju program za učitavanje operativnog sistema treba biti otključan prije korištenja opcije za programere sa 16 kB. 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. Svi korisnički podaci i postavke će biti izbrisani kada se aktivira način rada od 16 kB. Kada se program za učitavanje operativnog sistema otključa, aktiviranje opcije od 16 kB zahtijevat će dva ponovna pokretanja. Kada ste u ovom načinu rada, možete se prebacivati iz načina rada od 4 kB u način rada od 16 kB jednim ponovnim pokretanjem. Neke funkcije će biti onemogućene u ovim načinima rada, pa neke aplikacije možda neće funkcionirati. Da vratite uređaj u proizvodni način rada, trebate vratiti u način rada od 4 kB a zatim zaključati OEM/program za učitavanje operativnog sistema (čime se uređaj vraća na fabričke postavke). Otključajte program za učitavanje operativnog sistema i pokušajte ponovo. Uputstva za ovo potražite na <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Korištenje načina rada od 4 kB neovisnog o veličini stranice"</string>
- <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"U načinu ste rada od 4 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, pa neke aplikacije možda neće funkcionirati. Da ponovo uđete u proizvodni način rada, morate zaključati program za učitavanje operativnog sistema na uređaju. Dodirnite da pročitate više."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"U načinu ste rada od 4 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, pa neke aplikacije možda neće funkcionirati. Da ponovo uđete u proizvodni način rada, morate zaključ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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_4k_pages_text_short" msgid="2894243902906666242">"U načinu ste rada od 4 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 zaključati program za učitavanje operativnog sistema na uređaju. Dodirnite da pročitate više."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"U načinu ste rada od 4 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 zaključ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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Korištenje načina rada od 16 kB neovisnog o veličini stranice"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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, 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 zaključati program za učitavanje operativnog sistema na uređaju. Dodirnite da pročitate više."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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, 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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Dodirnite da pročitate više."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Obrađivač izvještaja o greškama"</string>
@@ -5004,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Koristi kačenje aplikacije"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Koristi opcije za programere"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Koristi uslugu štampanja"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Dozvoli više korisnika"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Dozvoli prebacivanje između korisnika"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"dozvoliti, višestruko, korisnik, dopustiti, mnogo"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"više, korisnici, profili, osobe, računi, promjena, mnogo"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Koristi bežično otklanjanje grešaka"</string>
@@ -5118,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Odaberite šta će se prikazivati na ekranu kada je tablet na priključnoj stanici. Uređaj može trošiti više energije kada se koristi čuvar ekrana."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Prilagodite"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Prilagodite <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Potrebno je ponovno pokretanje da se omogući podrška za slobodni oblik."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Potrebno je ponovno pokretanje da se nametne način rada računara na sekundarnim ekranima."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Potrebno je ponovno pokretanje da se omogući podrška za stare prilagodljive prozore."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Potrebno je ponovno pokretanje da se promijeni podrška za prilagodljive prozore."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Potrebno je ponovno pokretanje da se nametnu prilagodljivi prozori na sekundarnim ekranima."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Ponovo pokreni sada"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Ponovo pokreni kasnije"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Prostorni zvuk"</string>
@@ -5237,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Uključeno"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Isključeno"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Uključeno"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% lijevo, %2$d%% desno"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% desno, %2$d%% lijevo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Naziv uređaja je vidljiv aplikacijama koje ste instalirali. Također će ga moći vidjeti druge osobe prilikom povezivanja s Bluetooth uređajima i WiFi mrežom ili postavljanja WiFi pristupne tačke."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatički rod"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Odaberite gramatički rod"</string>
@@ -5348,4 +5404,5 @@
<string name="audio_streams_main_page_password_dialog_join_button" msgid="2967747276379153408">"Slušajte prijenos"</string>
<string name="audio_streams_main_page_qr_code_scanner_summary" msgid="5312980105735143360">"Skenirajte QR kôd prijenosa zvuka da slušate s uređaja <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="homepage_search" msgid="6759334912284663559">"Pretražite postavke"</string>
</resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 9b23023..baae348 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de dormir"</item>
+ <item msgid="4152450357280759894">"Conducció"</item>
+ <item msgid="7096549258219399423">"Immersiu"</item>
+ <item msgid="2760716776980432977">"Gestionat"</item>
+ <item msgid="601734478369121764">"Estrella"</item>
+ <item msgid="6243809315432780521">"Calendari"</item>
+ <item msgid="4913577903148415331">"Hora"</item>
+ <item msgid="3653377604690057780">"Teatre"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 538bb08..a96784d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Vols desconnectar el dispositiu?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincula un dispositiu nou"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activa automàticament demà"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Configuració de l\'audiòfon"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Drecera, compatibilitat amb audiòfons"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Valors predefinits"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"L\'audiòleg no ha programat cap valor predefinit"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"No s\'ha pogut actualitzar el valor predefinit"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortida d\'àudio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre la sortida d\'àudio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivat"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activada (# aplicació té accés a la ubicació)}other{Activada (# aplicacions tenen accés a la ubicació)}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Carregant…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Les aplicacions amb permís per trobar dispositius propers poden determinar la posició relativa dels dispositius connectats."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Les aplicacions que tenen el permís de dispositius propers poden determinar la posició relativa dels dispositius connectats."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"L\'accés a la ubicació està desactivat per a aplicacions i serveis. Tanmateix, la ubicació del dispositiu es pot continuar enviant als serveis d\'emergències quan truquis o enviïs un missatge de text a un número d\'emergència."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Més informació sobre la configuració d\'ubicació"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Per canviar-ho, ves a Configuració de ChromeOS > Privadesa i seguretat > Controls de privadesa > Accés a la ubicació"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Cara i <xliff:g id="WATCH">%s</xliff:g> afegits"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Cara, empremta digital i <xliff:g id="WATCH">%s</xliff:g> afegits"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Empremtes digitals, cara i <xliff:g id="WATCH">%s</xliff:g> afegits"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Aquesta acció és necessària perquè la comprovació de la identitat està activada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueig de Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Rellotge afegit"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configura el rellotge"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Més informació sobre Desbloqueig amb rellotge"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Afegeix un rellotge"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Suprimeix el rellotge"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Desbloqueig facial i amb empremta digital"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueig facial i amb empremta digital"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueig facial i amb empremta digital per a la feina"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Cal fer la configuració"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Cara i empremtes digitals afegides"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instal·la aplicacions"</b>\n"Instal·la aplicacions que vulguis mantenir privades a l\'espai"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Nota important"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Les aplicacions s\'aturen quan bloqueges l\'espai"</b>\n"Quan bloquegis l\'espai, les aplicacions de l\'espai s\'aturaran i no en rebràs notificacions"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Els espais privats no són adequats per a les aplicacions que necessiten executar-se en segon pla o enviar notificacions crítiques, com ara aplicacions de medicina. Això és perquè les notificacions i l\'activitat en segon pla s\'aturen quan l\'espai es bloqueja.\n\nLes aplicacions del teu espai privat no apareixeran al gestor de permisos, al tauler de privadesa ni en altres opcions de configuració quan l\'espai privat estigui bloquejat.\n\nL\'espai privat no es pot moure a un dispositiu nou. Caldrà que configuris un altre espai privat si el vols utilitzar en un altre dispositiu.\n\nQualsevol persona que connecti el teu dispositiu a un ordinador o instal·li aplicacions perjudicials al teu dispositiu podria accedir a l\'espai privat."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Els espais privats no són adequats per a les aplicacions que necessiten executar-se en segon pla o enviar notificacions crítiques, com ara aplicacions de medicina. Això és perquè les notificacions i l\'activitat en segon pla s\'aturen quan l\'espai es bloqueja.\n\nLes aplicacions del teu espai privat no apareixeran al gestor de permisos, al tauler de privadesa ni en altres opcions de configuració quan l\'espai privat estigui bloquejat.\n\nL\'espai privat no es pot restaurar en un dispositiu nou. Hauràs de configurar un altre espai si vols utilitzar-lo en un dispositiu diferent.\n\nÉs possible que qualsevol persona que connecti el teu dispositiu a un ordinador o que instal·li aplicacions malicioses al dispositiu pugui accedir a l\'espai privat."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Més informació sobre l\'espai privat"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Aquesta acció tardarà una estona"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"S\'està configurant l\'espai privat…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vols reiniciar el dispositiu?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"El registre detallat de l\'NFC només està indicat per a activitats de desenvolupament. Les dades de l\'NFC addicionals estan incloses als informes d\'errors, que poden contenir informació privada. Reinicia el dispositiu per canviar aquesta configuració."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reinicia"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"duplicar, pantalla externa, pantalla connectada, pantalla usb, resolució, rotació"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotació"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Estàndard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Utilitza el teclat en pantalla"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Mantén-lo en pantalla mentre el teclat físic està actiu"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Canvia emplenament del punter a groc"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Canvia emplenament del punter a rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Canvia emplenament del punter a blau"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estil de traç de punter"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Blanc"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Negre"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Cap"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Seleccionat per l\'usuari: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Parla"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocitat del punter"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Escala del punter"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Redueix l\'escala del punter"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Augmenta l\'escala del punter"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de joc"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirigeix la vibració"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Envia la vibració al controlador de joc quan estigui connectat"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continua igualment"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel·la"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuració de l\'ampliació"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Desplaçament amb un dit"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mou la lupa amb 1 dit"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arrossega 1 dit per moure\'t per la pantalla"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mou l\'àrea d\'ampliació arrossegant un dit."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mou l\'àrea d\'ampliació arrossegant dos dits."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"No està disponible mentre només s\'amplia una part de la pantalla"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botó per fer zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Amplia la pantalla ràpidament per engrandir el contingut"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Per ampliar</b>:<br/> {0,number,integer}. Utilitza la drecera per iniciar l\'ampliació.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrossega 2 dits per moure\'t per la pantalla.<br/> {3,number,integer}. Pinça amb 2 dits per ajustar el zoom.<br/> {4,number,integer}. Utilitza la drecera per aturar l\'ampliació.<br/><br/> <b>Per ampliar temporalment</b>:<br/> {0,number,integer}. Assegura\'t que el tipus d\'ampliació estigui definit com a pantalla completa.<br/> {1,number,integer}. Utilitza la drecera per iniciar l\'ampliació.<br/> {2,number,integer}. Mantén premut qualsevol punt de la pantalla.<br/> {3,number,integer}. Arrossega un dit per moure\'t per la pantalla.<br/> {4,number,integer}. Aixeca el dit per aturar l\'ampliació."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Per ampliar</b>:<br/> {0,number,integer}. Utilitza una drecera per iniciar l\'ampliació.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrossega 2 dits per moure\'t per la pantalla.<br/> {3,number,integer}. Pinça amb 2 dits per ajustar el zoom.<br/> {4,number,integer}. Utilitza la drecera per aturar l\'ampliació.<br/><br/> També pots ampliar temporalment i més."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Per ampliar</b>:<br/> {0,number,integer}. Utilitza una drecera per iniciar l\'ampliació.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrossega 1 o 2 dits per moure\'t per la pantalla.<br/> {3,number,integer}. Pinça amb 2 dits per ajustar el zoom.<br/> {4,number,integer}. Utilitza la drecera per aturar l\'ampliació.<br/><br/> També pots ampliar temporalment i més."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Quan l\'opció d\'ampliació està activada, pots ampliar la pantalla.\n\n"<b>"Per ampliar-la"</b>", activa l\'opció i toca qualsevol punt de la pantalla.\n"<ul><li>"Arrossega dos o més dits per desplaçar-te."</li>\n<li>"Pinça amb dos o més dits per ajustar el zoom."</li></ul>\n\n<b>"Per fer zoom temporalment"</b>", activa l\'ampliació i mantén premut qualsevol punt de la pantalla.\n"<ul><li>"Arrossega per moure\'t per la pantalla."</li>\n<li>"Aixeca el dit per allunyar la pantalla."</li></ul>\n\n"No es pot ampliar el teclat ni la barra de navegació."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Pàgina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Drecera del botó d\'accessibilitat"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Cap}=1{S\'ha definit 1 programació}other{S\'han definit # programacions}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"No molestis"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modes prioritaris"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Afegeix un mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Rep notificacions només de persones i aplicacions importants"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selecciona el tipus d\'activació"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Hora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Exemple: \"De 9:30 a 17 h\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendari"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Exemple: \"Calendari personal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crea un mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalitzat"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Restringeix les interrupcions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activa el mode No molestis"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Les alarmes i els sons multimèdia poden interrompre"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programacions"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Suprimeix les programacions"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Suprimeix"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Canvia el nom"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Suprimeix"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vols suprimir el mode <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edita"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programacions"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programació"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Afegeix un calendari"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Utilitza el calendari"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programació"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Defineix una programació"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programa"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activa automàticament"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programació"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silencia en hores concretes"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Defineix les regles de No molestis"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permet les interrupcions sonores"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloqueja interrupcions visuals"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permet senyals visuals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificacions que et poden arribar"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Concentra\'t"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Accions addicionals"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desactivat}=1{Desactivat / Es pot activar automàticament 1 mode}other{Desactivat / Es poden activar automàticament # modes}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Configuració de la pantalla"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcions de pantalla"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de grisos"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"activa el tema fosc"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Canvia l\'SO i les aplicacions perquè prioritzin el text clar sobre fons fosc, que pot ser millor per a la vista i suposa un estalvi de bateria important en alguns dispositius"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No hi ha cap canvi a la pantalla}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}other{{effect_1}, {effect_2} i # més}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtra interrupcions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No es filtra cap interrupció"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcions de pantalla per a les notificacions filtrades"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quan el mode No molestis estigui activat"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificacions sense so"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"obre la notificació"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permet posposar les notificacions"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Punt de notificació a la icona de l\'aplicació"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paquets de notificacions"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bombolles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bombolles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostra aquesta conversa com a bombolla"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Aquesta aplicació no és compatible amb la configuració avançada"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Més opcions de configuració"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Hi ha més opcions de configuració disponibles en aquesta aplicació"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Moderació de notificacions"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Altres"</string>
<string name="no_channels" msgid="4716199078612071915">"Aquesta aplicació no ha publicat cap notificació"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostra les categories no utilitzades"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Opcions de configuració addicionals a l\'aplicació"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostra les categories no utilitzades"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Amaga les categories no utilitzades"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplicacions que poden interrompre"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplicacions seleccionades"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Cap"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Tot"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selecciona més aplicacions"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Res no pot interrompre"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ningú no pot interrompre"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algunes persones poden interrompre"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Tothom pot interrompre"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Trucades repetides"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permet les trucades repetides"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Canvia al mode Només alarmes durant 1 hora fins a les {time}}other{Canvia al mode Només alarmes durant # hores fins a les {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Canvia al mode Només alarmes fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Canvia al mode Interromp sempre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Mode d\'edició"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Afegeix 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="warning_button_text" msgid="1274234338874005639">"Advertiment"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Tanca"</string>
<string name="device_feedback" msgid="5351614458411688608">"Envia suggeriments sobre el dispositiu"</string>
@@ -4286,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Mode de navegació"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navegació amb 2 botons"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Per canviar d\'aplicació, fes lliscar cap amunt el botó d\'inici. Per veure totes les aplicacions, torna a lliscar cap amunt. Per tornar enrere, toca el botó Enrere."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Seguretat i emergència"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Seguretat personal i emergència"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Emergència SOS, informació mèdica, alertes"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navegació amb gestos"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Per anar a l\'inici, llisca cap amunt des de la part inferior de la pantalla. Per canviar d\'aplicació, llisca cap amunt des de la part inferior, mantén premut i deixa anar. Per tornar enrere, llisca des de la vora esquerra o dreta."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Funda"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Tauler de configuració"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Força el mode d\'escriptori"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Força el mode d\'escriptori experimental en pantalles secundàries"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Activa les finestres de format lliure"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Activa la compatibilitat amb les finestres de format lliure."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activa finestres format lliure en pantalla secund."</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Activa les finestres de format lliure només a la pantalla secundària."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activa la mida no ajustable al mode multifinestra"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permet les aplicacions de mida no ajustable al mode multifinestra"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anul·la forçar el mode fosc"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partició de dades d\'aquest dispositiu s\'ha de convertir al format ext4 abans d\'utilitzar l\'opció per a desenvolupadors de 16 kB. 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. Per activar l\'opció de 16 kB, caldrà que el dispositiu es reiniciï una vegada més. Quan estiguis en aquest mode, podràs alternar entre el mode de 4 kB i el mode de 16 kB amb un sol reinici. Com que es desactivaran algunes funcions en aquests modes, és possible que algunes aplicacions no funcionin. Per fer que el dispositiu torni al mode de producció, hauràs de tornar al mode de 4 kB i, a continuació, bloquejar el bootloader, que restablirà les dades de fàbrica del dispositiu. Quan el dispositiu s\'iniciï a Android correctament, desactiva el desbloqueig OEM a Opcions per a desenvolupadors. Es netejaran les dades del dispositiu i el sistema de fitxers es canviarà al format ext4 després de la confirmació. Quan es completi aquesta acció, torna i activa el mode de 16 kB de nou."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Esborra totes les dades"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"No s\'ha pogut canviar el format a ext4 ni netejar-ne la partició de dades."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Es requereix el desbloqueig del bootloader per al mode de 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Es requereix el desbloqueig del bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Aquest dispositiu ha de tenir el bootloader desbloquejat abans d\'utilitzar l\'opció per a desenvolupadors de 16 kB. 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. En activar el mode de 16 kB, es netejaran totes les dades d\'usuari i opcions de configuració. Quan s\'hagi desbloquejat el bootloader, caldrà que el dispositiu es reiniciï dues vegades per activar l\'opció de 16 kB. Quan estiguis en aquest mode, podràs alternar entre el mode de 4 kB i el mode de 16 kB amb un sol reinici. Com que es desactivaran algunes funcions en aquests modes, és possible que algunes aplicacions no funcionin. Per fer que el dispositiu torni al mode de producció, hauràs de tornar al mode de 4 kB i, a continuació, bloquejar l\'OEM o el bootloader, que restablirà les dades de fàbrica del dispositiu. Desbloqueja el bootloader i torna-ho a provar. Pots consultar les instruccions per fer-ho a <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"S\'està utilitzant el mode independent de la pàgina de 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Estàs utilitzant l\'opció de 4 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 tornar a entrar al mode de producció, has de bloquejar el bootloader del dispositiu. Toca per obtenir més informació."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Estàs utilitzant l\'opció de 4 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 tornar a entrar al mode de producció, has de 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o utilitza <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i selecciona Neteja el dispositiu, Bloqueja el bootloader i Força la instal·lació de totes les particions."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"S\'està utilitzant el mode independent de la pàgina de 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Toca per obtenir més informació."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o utilitza <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i selecciona Neteja el dispositiu, Bloqueja el bootloader i Força la instal·lació de totes les particions."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Toca per obtenir més informació."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o utilitza <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Gestor d\'informes d\'errors"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utilitza la fixació d\'aplicacions"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Utilitza les opcions per a desenvolupadors"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Utilitza el servei d\'impressió"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permet diversos usuaris"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permet canviar d\'usuari"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"permet, múltiple, usuari, permís, diversos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"diversos, usuaris, perfils, persones, comptes, canviar, molts"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Utilitza la depuració sense fil"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Tria què vols veure a la pantalla quan la tauleta estigui acoblada. És possible que el dispositiu utilitzi més energia si es fa servir un estalvi de pantalla."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalitza"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalitza <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Cal reiniciar per activar la compatibilitat amb la forma lliure."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Cal reiniciar per forçar el mode d\'escriptori en pantalles secundàries."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Cal reiniciar per activar la compatibilitat amb les finestres de format lliure heretades."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Cal reiniciar per canviar la compatibilitat amb les finestres de format lliure."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Cal reiniciar per forçar les finestres de format lliure en pantalles secundàries."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reinicia ara"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reinicia més tard"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Àudio espacial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Activat"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desactivat"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Activat"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Àudio: %1$d%% esquerra, %2$d%% dreta"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Àudio %1$d%% dreta, %2$d%% esquerra"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"El nom del dispositiu és visible per a les aplicacions que has instal·lat. També el poden veure altres persones si el connectes a un dispositiu Bluetooth o a una xarxa Wi‑Fi, o si configures un punt d\'accés Wi‑Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gènere gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecciona el gènere gramatical"</string>
@@ -5353,4 +5403,5 @@
<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, primer desactiva la compartició d\'àudio."</string>
+ <string name="homepage_search" msgid="6759334912284663559">"Configuració de la cerca"</string>
</resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 5296677..990b636 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Večerka"</item>
+ <item msgid="4152450357280759894">"Jízda autem"</item>
+ <item msgid="7096549258219399423">"Pohlcující"</item>
+ <item msgid="2760716776980432977">"Spravováno"</item>
+ <item msgid="601734478369121764">"Hvězdička"</item>
+ <item msgid="6243809315432780521">"Kalendář"</item>
+ <item msgid="4913577903148415331">"Čas"</item>
+ <item msgid="3653377604690057780">"Divadlo"</item>
+ <item msgid="3843711267408385410">"Květina"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0de1058..2ae4a3e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Odpojit zařízení?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Spárovat nové zařízení"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Zítra automaticky zapnout"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Nastavení naslouchátek"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Zkratka, kompatibilita s naslouchátky"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Předvolba"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Váš audiolog žádné předvolby nenaprogramoval"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Předvolbu nelze aktualizovat"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvukový výstup"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informace o zvukovém výstupu"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuto"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Zapnuto / k poloze má přístup # aplikace}few{Zapnuto / k poloze mají přístup # aplikace}many{Zapnuto / k poloze má přístup # aplikace}other{Zapnuto / k poloze má přístup # aplikací}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Načítání…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikace s oprávněním pro přístup k zařízením v okolí mohou zjišťovat relativní polohu připojených zařízení."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikace s oprávněním k přístupu k zařízením v okolí mohou zjišťovat relativní polohu připojených zařízení."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Přístup aplikací a služeb k poloze je vypnutý. Poloha zařízení může být přesto odesílána záchranářům, když vytočíte číslo tísňového volání nebo na něj pošlete SMS."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Další informace o nastavení polohy"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Pokud chcete tuto možnost změnit, přejděte do nastavení systému ChromeOS > Ochrana soukromí a zabezpečení > Nastavení ochrany soukromí > Přístup k poloze"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Obličej a hodinky <xliff:g id="WATCH">%s</xliff:g> byly přidány"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Obličej, otisk prstu a hodinky <xliff:g id="WATCH">%s</xliff:g> byly přidány"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Obličej, otisky prstů a hodinky <xliff:g id="WATCH">%s</xliff:g> byly přidány"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Je to potřeba, protože je zapnutá kontrola identity"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Odemknutí pomocí nástroje Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Hodinky byly přidány"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Nastavení hodinek"</string>
@@ -424,7 +425,7 @@
<string name="security_settings_remoteauth_enroll_introduction_info_remove_watch" msgid="1888318677088986801">"Hodinky můžete z funkce odemknutí hodinkami kdykoli odstranit v Nastavení."</string>
<string name="security_settings_remoteauth_enroll_introduction_animation_tap_notification" msgid="1597397399097952974">"Klepnete na oznámení"</string>
<string name="security_settings_remoteauth_enroll_introduction_animation_swipe_up" msgid="2129230804324634653">"Přejedete po obrazovce uzamčení prstem nahoru"</string>
- <string name="security_settings_remoteauth_enroll_enrolling_title" msgid="313016997943607675">"Vyberte své hodinky"</string>
+ <string name="security_settings_remoteauth_enroll_enrolling_title" msgid="313016997943607675">"Vybrat hodinky"</string>
<string name="security_settings_remoteauth_enroll_enrolling_list_heading" msgid="8227585438932911013">"Dostupné hodinky"</string>
<string name="security_settings_remoteauth_enroll_enrolling_disagree" msgid="1670201454188049863">"Zrušit"</string>
<string name="security_settings_remoteauth_enroll_enrolling_agree" msgid="7048336252635730908">"Potvrdit"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Další informace o odemknutí pomocí hodinek"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Přidat hodinky"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Odstranit hodinky"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Odemknutí otiskem prstu nebo obličejem"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Odemknutí obličejem a otiskem prstu"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Odemknutí obličejem a otiskem prstu pro práci"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Nutné nastavení"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Byl přidán obličej a otisky prstů"</string>
@@ -575,7 +576,7 @@
<string name="private_space_new_lock_message" msgid="3117703578905489206">"Na další obrazovce budete muset zadat PIN, gesto nebo heslo zařízení"</string>
<string name="private_space_auto_lock_title" msgid="8663409382910601261">"Automaticky zamykat soukromý prostor"</string>
<string name="private_space_auto_lock_page_summary" msgid="8679844515655838654">"Pokud zařízení nějakou dobu nepoužijete, soukromý prostor se může automaticky zamknout"</string>
- <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Vždy, když se zařízení zamkne"</string>
+ <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Vždy, když se zamkne zařízení"</string>
<string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"5 minut po vypnutí obrazovky"</string>
<string name="private_space_auto_lock_after_device_restart" msgid="288755768725895029">"Pouze po restartu zařízení"</string>
<string name="private_space_hide_page_title" msgid="3364639176511877414">"Skrýt soukromý prostor"</string>
@@ -610,14 +611,12 @@
<string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Můžete si skrýt nebo uzamknout soukromé aplikace v odděleném prostoru. Vyhrazený účet Google zajistí lepší zabezpečení."</string>
<string name="private_space_setup_sub_header" msgid="550476876393954356">"Jak to funguje"</string>
<string name="private_space_separate_account_text" msgid="790319706810190320"><b>"Vytvořte si pro prostor účet Google"</b>\n"Když použijete vyhrazený účet, pomůže to předejít zobrazování synchronizovaných souborů, fotografií a e‑mailů mimo prostor"</string>
- <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Nastavte si zámek"</b>\n"Prostor můžete uzamknout, aby ho ostatní nemohli otevřít."</string>
+ <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Nastavte si zámek"</b>\n"Prostor můžete uzamknout, aby ho ostatní nemohli otevřít"</string>
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Nainstalujte aplikace"</b>\n"Nainstalujte aplikace, které chcete mít soukromé ve svém prostoru"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Upozornění"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Když prostor uzamknete, aplikace se zastaví"</b>\n"Když prostor uzamknete, aplikace v něm se zastaví a nebudete od nich dostávat oznámení"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Soukromé prostory nejsou vhodné pro aplikace, které potřebují běžet na pozadí nebo odesílat kritická upozornění, jako jsou lékařské aplikace. Oznámení a aktivita na pozadí se totiž při uzamčení prostoru zastaví.\n\nKdyž je soukromý prostor uzamčen, aplikace v soukromém prostoru se nezobrazují ve správci oprávnění, na panelu ochrany soukromí ani v dalších nastaveních.\n\nSoukromý prostor nelze přesunout do nového zařízení. Na novém zařízení bude nutné nastavit nový soukromý prostor.\n\nDo soukromého prostoru se může dostat kdokoli, kdo vaše zařízení připojí k počítači nebo nainstaluje škodlivé aplikace."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Soukromé prostory nejsou vhodné pro aplikace, které potřebují běžet na pozadí nebo odesílat kritická upozornění, jako jsou lékařské aplikace. Oznámení a aktivita na pozadí se totiž při uzamčení prostoru zastaví.\n\nKdyž je soukromý prostor uzamčen, aplikace v něm se nezobrazují ve správci oprávnění, na panelu ochrany soukromí ani v jiných nastaveních.\n\nSoukromý prostor nelze obnovit do nového zařízení. Pokud ho budete chtít používat na jiném zařízení, budete si na něm muset nastavit další prostor.\n\nDo soukromého prostoru se může dostat kdokoli, kdo zařízení připojí k počítači nebo do zařízení nainstaluje škodlivé aplikace."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Další informace o soukromém prostoru"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Bude to chvíli trvat"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavování soukromého prostoru…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restartovat zařízení?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Podrobné protokolování funkce NFC je určeno pouze pro účely vývoje. Další data funkce NFC budou zahrnuta ve zprávách o chybě, které mohou obsahovat soukromé informace. Pokud toto nastavení chcete změnit, restartujte zařízení."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restartovat"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"zrcadlení, externí displej, připojený displej, usb displej, rozlišení, otočení"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Otočení"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardní"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Použít softwarovou klávesnici"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Ponechat na obrazovce, když je aktivní fyzická klávesnice"</string>
<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="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="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ádat myš pomocí fyzické klávesnice."</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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Změnit vyplnění ukazatele na žluté"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Změnit vyplnění ukazatele na růžové"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Změnit vyplnění ukazatele na modré"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Styl tahu ukazatele"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Bílá"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Černá"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Žádné"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Vybrané uživatelem: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Řeč"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Rychlost kurzoru"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Měřítko ukazatele"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Snížit měřítko ukazatele"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Zvýšit měřítko ukazatele"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Herní ovladače"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibrace při přesměrování"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Odeslat vibrace do herního ovladače, je-li připojen"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Přesto pokračovat"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Zrušit"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavení zvětšení"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Posouvání jedním prstem"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Jedním prstem lupu posunete"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Přetažením prstu se můžete pohybovat po obrazovce"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Oblast zvětšení posunete přetažením jedním prstem."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Oblast zvětšení posunete přetažením dvěma prsty."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Při zvětšení pouze části obrazovky není k dispozici"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Přiblížení zobrazení klepnutím na tlačítko"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Obrazovku si můžete rychle přiblížit, aby byl obsah větší."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Přiblížení:</b><br/> {0,number,integer}. Zvětšení spusťte pomocí zkratky.<br/> {1,number,integer}. Klepněte na obrazovku.<br/> {2,number,integer}. Po obrazovce se pohybujte přetažením dvou prstů.<br/> {3,number,integer}. Přiblížení upravte stažením a roztažením dvou prstů.<br/> {4,number,integer}. Zvětšení ukončete pomocí zkratky.<br/><br/> <b>Dočasné přiblížení:</b><br/> {0,number,integer}. Zkontrolujte, zda je typ zvětšení nastaven na celou obrazovku.<br/> {1,number,integer}. Zvětšení spusťte pomocí zkratky.<br/> {2,number,integer}. Podržte jakékoli místo na obrazovce.<br/> {3,number,integer}. Po obrazovce se pohybujte přetažením prstu.<br/> {4,number,integer}. Zvětšení ukončete zvednutím prstu."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Přiblížení:</b><br/> {0,number,integer}. Použijte zkratku k zahájení zvětšování.<br/> {1,number,integer}. Klepněte na obrazovku.<br/> {2,number,integer}. Přetažením dvěma prsty se pohybujte po obrazovce.<br/> {3,number,integer}. Stažením a roztažením dvou prstů upravte přiblížení.<br/> {4,number,integer}. Pomocí zkratky zvětšení ukončete.<br/><br/> Můžete také obsah přiblížit dočasně a využít další funkce."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Přiblížení:</b><br/> {0,number,integer}. Použijte zkratku k zahájení zvětšování.<br/> {1,number,integer}. Klepněte na obrazovku.<br/> {2,number,integer}. Přetažením jedním nebo dvěma prsty se pohybujte po obrazovce.<br/> {3,number,integer}. Stažením a roztažením dvou prstů upravte přiblížení.<br/> {4,number,integer}. Pomocí zkratky zvětšení ukončete.<br/><br/> Můžete také obsah přiblížit dočasně a využít další funkce."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Když je zapnuté zvětšení, můžete přibližovat obsah na obrazovce.\n\n"<b>"Chcete-li obsah přiblížit"</b>", spusťte zvětšení a poté klepněte kamkoliv na obrazovku.\n"<ul><li>"Přetažením dvěma nebo více prsty můžete obsah posouvat."</li>\n<li>"Stažením nebo roztažením dvou či více prstů upravíte přiblížení."</li></ul>\n\n<b>"Chcete-li obsah přiblížit dočasně"</b>", spusťte zvětšení a poté se dotkněte libovolného místa na obrazovce a podržte ho.\n"<ul><li>"Přetažením se můžete pohybovat po obrazovce."</li>\n<li>"Zvednutím prstu zobrazení vrátíte do původního stavu."</li></ul>\n\n"Na klávesnici a navigačním panelu přiblížení není k dispozici."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Strana <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> z <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Zkratka tlačítka přístupnosti"</string>
@@ -3311,7 +3336,7 @@
<string name="emergency_tone_alert" msgid="1977698889522966589">"Zvuk"</string>
<string name="emergency_tone_vibrate" msgid="6282296789406984698">"Vibrace"</string>
<string name="boot_sounds_title" msgid="5033062848948884111">"Zvuky při spouštění"</string>
- <string name="live_caption_title" msgid="8617086825712756983">"Živý přepis"</string>
+ <string name="live_caption_title" msgid="8617086825712756983">"Okamžité titulky"</string>
<string name="live_caption_summary" msgid="2898451867595161809">"Automatické přepisy médií"</string>
<string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"Sluchátka s kabelem"</string>
<string name="spatial_audio_text" msgid="8201387855375146000">"Zvuk z kompatibilních médií bude realističtější"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žádný}=1{Nastaven 1 plán}few{Nastaveny # plány}many{Nastaveno # plánu}other{Nastaveno # plánů}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Nerušit"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Režim priority"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Přidat režim"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Přijímat pouze oznámení od důležitých lidí a z důležitých aplikací"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Vyberte typ aktivace"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Čas"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Příklad: 9:30–17:00"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendář"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Příklad: Osobní kalendář"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Vytvoření režimu"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Vlastní"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omezení vyrušení"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Zapněte funkci Nerušit"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Vyrušovat mohou budíky a zvuky médií"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Plány"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Smazat plány"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Smazat"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Přejmenovat"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Smazat"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Smazat režim <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Upravit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Plány"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Plán"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Přidejte kalendář"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Použít kalendář"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Plán"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Nastavení plánu"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Plán"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Zapnout automaticky"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Plán"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Ztlumit telefon v určitou dobu"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Nastavit pravidla režimu Nerušit"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Povolit vyrušení, která vydávají zvuk"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokovat vizuální vyrušení"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Povolit vizuální signály"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Oznámení, která se k vám mohou dostat"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Soustřeďte se"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Další akce"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Vypnuto}=1{Vypnuto / 1 režim se může automaticky zapnout}few{Vypnuto / # režimy se můžou automaticky zapnout}many{Vypnuto / # režimu se může automaticky zapnout}other{Vypnuto / # režimů se může automaticky zapnout}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Nastavení displeje"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Možnosti zobrazení"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Stupně šedi"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"zapnout tmavý motiv"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Přepněte operační systém a aplikace tak, aby upřednostňovaly světlý text na tmavém pozadí. Může to být příjemnější pro oči a na některých zařízeních to výrazně šetří baterii"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Žádné změny zobrazení}=1{{effect_1}}=2{{effect_1} a {effect_2}}=3{{effect_1}, {effect_2} a {effect_3}}few{{effect_1}, {effect_2} a ještě #}many{{effect_1}, {effect_2} a ještě #}other{{effect_1}, {effect_2} a ještě #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrovat přerušení"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Žádná přerušení se nefiltrují"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Možnosti zobrazení filtrovaných oznámení"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Když je zapnutý režim Nerušit"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Oznámení bez zvukového upozornění"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otevřít oznámení"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Povolit odložení oznámení"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Puntík s oznámením na ikoně aplikace"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Balíčky oznámení"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubliny"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubliny"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Zobrazovat tuto konverzaci jako bublinu"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Tato aplikace nepodporuje rozšířená nastavení"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Další nastavení"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Další nastavení jsou k dispozici uvnitř aplikace"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Zeslabení oznámení"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Použít na pracovní profily"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Použít pro aplikace v pracovním profilu"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorie"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Jiné"</string>
<string name="no_channels" msgid="4716199078612071915">"Tato aplikace neodeslala žádná oznámení"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Zobrazit nepoužívané kategorie"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Další nastavení v aplikaci"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Zobrazit nepoužívané kategorie"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Skrýt nepoužívané kategorie"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikace, které smí vyrušovat"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Vybrané aplikace"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nic"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Vše"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Vyrušovat nemohou žádné aplikace}=1{Vyrušovat může aplikace {app_1}}=2{Vyrušovat můžou aplikace {app_1} a {app_2}}=3{Vyrušovat můžou aplikace {app_1}, {app_2} a {app_3}}few{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}many{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}other{Vyrušovat můžou aplikace {app_1}, {app_2} a # dalších}}"</string>
+ <string name="zen_mode_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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Vybrat další aplikace"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nemůže vyrušovat"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nikdo nemůže vyrušovat"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Vyrušovat mohou někteří lidé"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Všichni lidé mohou vyrušovat"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Volající, kteří volají opakovaně"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Povolit opakovaná volání"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Na hodinu (tedy do {time}) přepnout do režimu Pouze budíky}few{Na # hodiny (tedy do {time}) přepnout do režimu Pouze budíky}many{Na # hodiny (tedy do {time}) přepnout do režimu Pouze budíky}other{Na # hodin (tedy do {time}) přepnout do režimu Pouze budíky}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Přepnout do režimu Pouze budíky až do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Přejít do režimu Vždy vyrušit"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Upravit režim"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Přidat režim"</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="warning_button_text" msgid="1274234338874005639">"Varování"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zavřít"</string>
<string name="device_feedback" msgid="5351614458411688608">"Odeslat zpětnou vazbu o tomto zařízení"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Hlavní díl"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterie"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel nastavení"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Vynutit režim počítače"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Na sekundárních displejích vynutí experimentální režim počítače"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktivovat okna s volným tvarem"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktivuje podporu oken s volným tvarem."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktivovat okna s volným tvarem na druhém displeji"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktivuje okna s volným tvarem pouze na sekundárním displeji."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivovat neměnnou velikost v režimu několika oken"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Povolí aplikace s neměnnou velikostí v režimu několika oken"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Přepsat vynucení tmavého režimu"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Před použitím 16KB možnosti pro vývojáře je potřeba převést datový oddíl tohoto zařízení na systém souborů ext4. 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. K aktivaci 16KB režimu pak bude potřeba zařízení restartovat ještě jednou. Po jeho aktivaci pak bude k přepnutí mezi 4KB a 16KB režimem stačit pouze jeden restart. Některé funkce budou v těchto režimech zakázány, takže některé aplikace nemusí fungovat. Pokud budete chtít zařízení vrátit do produkčního režimu, budete systém muset přepnout zpět do 4KB režimu a uzamknout bootloader, čímž zařízení resetujete do továrního nastavení. Až se systém Android v zařízení úspěšně spustí, vypněte v sekci Pro vývojáře možnost Odemknutí OEM. Po potvrzení se zařízení vymaže a systém souborů se změní na ext4. Po dokončení se vraťte a aktivujte 16KB režim znovu."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Vymazat všechna data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Přeformátování na ext4 a nevratné vymazání datového oddílu se nezdařilo."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB režim vyžaduje odemknutí bootloaderu"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Je vyžadováno odemknutí bootloaderu"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"K použití možnosti 16KB režimu pro vývojáře musí mít zařízení odemknutý bootloader. 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. Při aktivaci 16KB režimu se vymažou všechna uživatelská data a nastavení. Po odemknutí bootloaderu bude aktivace 16KB režimu vyžadovat dva restarty. Po jeho aktivaci pak bude k přepnutí mezi 4KB a 16KB režimem stačit pouze jeden restart. Některé funkce budou v těchto režimech zakázány, takže některé aplikace nemusí fungovat. Pokud budete chtít zařízení vrátit do produkčního režimu, budete systém muset přepnout zpět do 4KB režimu a pak v něm deaktivovat odemknutí OEM / uzamknout bootloader (čímž zařízení resetujete do továrního nastavení). Odemkněte bootloader a zkuste to znovu. Pokyny, jak to provést, najdete na stránce <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Používáte 4KB stránkově agnostický režim"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Používáte 4KB 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 uzamknout bootloader zařízení. Další informace zobrazíte klepnutím."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Používáte 4KB 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 uzamknout bootloader zařízení. Tím zařízení znovu resetujete do továrního nastavení 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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> nebo použijte nástroj <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Používáte 16KB stránkově agnostický režim"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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í. Další informace zobrazíte klepnutím."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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í 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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> nebo použijte nástroj <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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í. Další informace zobrazíte klepnutím."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> nebo použijte nástroj <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Nástroj pro zprávy o chybách"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Používat připnutí aplikace"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Používat nastavení pro vývojáře"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Používat tiskovou službu"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Povolit více uživatelů"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Povolit přepínání uživatelů"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"povolit, několik, uživatel, mnoho"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"několik, více, uživatelé, profily, lidé, účty, přepínání, mnoho"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Používat bezdrátové ladění"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Určete, co chcete vídat na obrazovce, když je tablet v doku. Při používání spořiče obrazovky může mít zařízení vyšší spotřebu energie."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Přizpůsobit"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Přizpůsobit <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"K zapnutí podpory plovoucích oken je vyžadován restart."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"K vynucení režimu plochy na sekundárních displejích je vyžadován restart."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"K aktivování podpory starších oken s volným tvarem je potřeba restart."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Ke změně podpory oken s volným tvarem je potřeba restart."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"K vynucení oken s volným tvarem na sekundárních displejích je potřeba restart."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Restartovat hned"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Restartovat později"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Prostorový zvuk"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Zapnuto"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Vypnuto"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Zapnuto"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Zvuk %1$d %% vlevo, %2$d %% vpravo"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Zvuk %1$d %% vpravo, %2$d %% vlevo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Název vašeho zařízení je viditelný pro nainstalované aplikace. Mohou ho vidět také ostatní uživatelé, když se připojíte k zařízení Bluetooth nebo síti Wi-Fi, případně když vytvoříte hotspot Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatický rod"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Vyberte mluvnický rod"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Vyhledávat v nastavení"</string>
</resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 0664775..39d41c2 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Sengetid"</item>
+ <item msgid="4152450357280759894">"Kørsel"</item>
+ <item msgid="7096549258219399423">"Opslugende"</item>
+ <item msgid="2760716776980432977">"Administreret"</item>
+ <item msgid="601734478369121764">"Stjerne"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Tidspunkt"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Blomst"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 53f6dd2..f17ffbe 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Afbryd forbindelse til enhed?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Par en ny enhed"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivér automatisk i morgen"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Indstillinger for høreapparat"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Genvej, høreapparatskompatibilitet"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Forindstilling"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Din audiolog har ingen forprogrammerede indstillinger"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Forindstillingen kunne ikke opdateres"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Lydudgang"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om lydudgang"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Fra"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Til/# app har adgang til din lokation}one{Til/# app har adgang til din lokation}other{Til/# apps har adgang til din lokation}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Indlæser…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps med tilladelse fra enheder i nærheden kan fastslå den relative placering af forbundne enheder."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps med tilladelse fra enheder i nærheden kan fastslå den relative positionering af forbundne enheder."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Adgangen til Lokation er deaktiveret for apps og tjenester. Din enhedslokation kan stadig blive sendt til udrykningsberedskab, hvis du ringer eller sender en sms til et alarmnummer."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Få flere oplysninger om lokationsindstillinger"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Du kan skifte ved at gå til Indstillinger for ChromeOS > Privatliv og sikkerhed > Privatlivsindstillinger > Lokationsadgang"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Ansigt og <xliff:g id="WATCH">%s</xliff:g> er tilføjet"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Ansigt, fingeraftryk og <xliff:g id="WATCH">%s</xliff:g> er tilføjet"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Ansigt, fingeraftryk og <xliff:g id="WATCH">%s</xliff:g> er tilføjet"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Dette er påkrævet, da identitetstjek er aktiveret"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Oplåsning af Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Uret er tilføjet"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Konfigurer dit ur"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Få flere oplysninger om uroplåsning"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Tilføj ur"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Fjern ur"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingeraftryk og ansigtsoplåsning"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Ansigtsoplåsning og fingeroplåsning"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ansigtsoplåsning og fingeroplåsning til arbejdsprofil"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Konfiguration er påkrævet"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Ansigt og fingeraftryk er tilføjet"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installer apps"</b>\n"Installer apps, du vil holde private i dit område"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Husk!"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps afbrydes, når du låser dit område"</b>\n"Hvis du låser dit område, afbrydes apps i området, og du modtager ikke notifikationer fra dem"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private områder er ikke egnet til apps, der skal køre i baggrunden eller sende kritiske notifikationer, f.eks. medicinske apps. Dette skyldes, at notifikationer og baggrundsaktivitet stoppes, når dit område er låst.\n\nApps i dit private område vises ikke i Tilladelsesadministrator, privatlivspanelet eller andre indstillinger, når dit private område er låst.\n\nDu kan ikke flytte dit private område til en ny enhed. Du skal konfigurere et andet privat område, hvis du vil bruge det på en anden enhed.\n\nPersoner, der forbinder din enhed til en computer eller installerer skadelige apps på enheden, kan muligvis tilgå dit private område."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private områder er ikke egnet til apps, der skal køre i baggrunden eller sende kritiske notifikationer, f.eks. medicinske apps. Dette skyldes, at notifikationer og baggrundsaktivitet stoppes, når dit område er låst.\n\nApps i dit private område vises ikke i Tilladelsesadministrator, privatlivspanelet eller andre indstillinger, når dit private område er låst.\n\nDu kan ikke gendanne dit private område på en ny enhed. Du skal konfigurere et andet område, hvis du vil bruge det på en anden enhed.\n\nPersoner, der forbinder din enhed til en computer eller installerer skadelige apps på enheden, kan muligvis tilgå dit private område."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Få flere oplysninger om privat område"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Det tager et øjeblik"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfigurerer et privat område…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vil du genstarte enheden?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detaljeret NFC-logging er kun beregnet til udvikling. Yderligere NFC-data inkluderes i fejlrapporter, som muligvis indeholder private oplysninger. Genstart enheden for at ændre denne indstilling."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Genstart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"spejl, ekstern skærm, forbundet skærm, usb-skærm, opløsning, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1189,10 +1203,11 @@
<string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlige"</string>
<string name="color_mode_option_boosted" msgid="4698797857766774289">"Forstærkede"</string>
<string name="color_mode_option_saturated" msgid="3413853820158447300">"Mættet"</string>
- <string name="color_mode_option_automatic" msgid="2281217686509980870">"Selvjusterende"</string>
+ <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptiv"</string>
<string name="brightness" msgid="6216871641021779698">"Lysstyrke"</string>
- <string name="auto_brightness_title" msgid="4239324728760986697">"Automatisk 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_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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Skærmens hvidbalance"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Brug skærmtastaturet"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Behold det på skærmen, mens det fysiske tastatur er aktivt"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Skift udfyldningsstil for markør til gul"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Skift udfyldningsstil for markør til lyserød"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Skift udfyldningsstil for markør til blå"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stregformat for markør"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Hvid"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Sort"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ingen"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Brugervalgt: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Tale"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Markørens hastighed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Markørstørrelse"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Reducer markørstørrelse"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Øg markørstørrelse"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Spillekontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Omdiriger vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration til spillecontroller, når den er tilsluttet"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Fortsæt alligevel"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Annuller"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Indstillinger for forstørrelse"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Panorering med én finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Flyt luppen med 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Naviger rundt på skærmen ved at trække med 1 finger"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Flyt forstørrelsesområdet ved at trække med én finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Flyt forstørrelsesområdet ved at trække med to fingre."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Utilgængelig, når kun en del af skærmen forstørres"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tryk på en knap for at zoome"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zoom hurtigt ind på skærmen for at forstørre indhold"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Sådan zoomer du ind:</b><br/> {0,number,integer}. Brug genvejen til at starte forstørrelse<br/> {1,number,integer}. Tryk på skærmen<br/> {2,number,integer}. Træk med to fingre for at navigere rundt på skærmen<br/> {3,number,integer}. Knib med to fingre for at zoome ind eller ud<br/> {4,number,integer}. Brug genvejen til at stoppe forstørrelse<br/><br/><b>Sådan zoomer du midlertidigt ind:</b><br/> {0,number,integer}. Sørg for, at forstørrelsestypen er indstillet til fuld skærm<br/> {1,number,integer}. Brug genvejen til at starte forstørrelse<br/> {2,number,integer}. Hold fingeren nede et vilkårligt sted på skærmen<br/> {3,number,integer}. Træk fingeren for at navigere rundt på skærmen<br/> {4,number,integer}. Løft fingeren for at stoppe forstørrelse"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Sådan zoomer du ind:</b><br/> {0,number,integer}. Brug genvejen til at starte forstørrelse<br/> {1,number,integer}. Tryk på skærmen<br/> {2,number,integer}. Naviger rundt på skærmen ved at trække med 2 fingre<br/> {3,number,integer}. Knib med 2 fingre for at justere zoom<br/> {4,number,integer}. Brug genvejen til at stoppe forstørrelse<br/><br/> Du kan også midlertidigt zoome ind m.m."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Sådan zoomer du ind:</b><br/> {0,number,integer}. Brug genvejen til at starte forstørrelse<br/> {1,number,integer}. Tryk på skærmen<br/> {2,number,integer}. Naviger rundt på skærmen ved at trække med 1 finger eller 2 fingre<br/> {3,number,integer}. Knib med 2 fingre for at justere zoom<br/> {4,number,integer}. Brug genvejen til at stoppe forstørrelse<br/><br/> Du kan også midlertidigt zoome ind m.m."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Når forstørrelse er aktiveret, kan du zoome ind på skærmen.\n\n"<b>"Hvis du vil zoome"</b>", skal du åbne forstørrelse og derefter trykke et vilkårligt sted på skærmen.\n"<ul><li>"Træk med to eller flere fingre for at rulle"</li>\n<li>"Knib sammen med to eller flere fingre for at justere zoomniveauet"</li></ul>\n\n<b>"Hvis du vil zoome midlertidigt"</b>", skal du åbne forstørrelse og holde fingeren nede et vilkårligt sted på skærmen.\n"<ul><li>"Træk for at udforske forskellige dele af skærmen"</li>\n<li>"Løft fingeren for at zoome ud"</li></ul>\n\n"Du kan ikke zoome ind på tastaturet eller navigationslinjen."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Side <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> af <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Genvej til knappen til hjælpefunktioner"</string>
@@ -2695,7 +2720,7 @@
<string name="vpn_settings_insecure_single" msgid="9012504179995045195">"Ikke sikker"</string>
<string name="vpn_settings_single_insecure_multiple_total" msgid="6107225844641301139">"<xliff:g id="VPN_COUNT">%d</xliff:g> er ikke sikker"</string>
<string name="vpn_settings_multiple_insecure_multiple_total" msgid="1706236062478680488">"<xliff:g id="VPN_COUNT">%d</xliff:g> er ikke sikker"</string>
- <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Selvjusterende forbindelse"</string>
+ <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptiv forbindelse"</string>
<string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Forlænger batteritiden og forbedrer enhedens ydeevne ved at administrere din netværksforbindelse automatisk"</string>
<string name="adaptive_connectivity_switch_on" msgid="3653067561620745493">"Til"</string>
<string name="adaptive_connectivity_switch_off" msgid="5076172560836115265">"Fra"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angivet}one{# tidsplan er angivet}other{# tidsplaner er angivet}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Forstyr ikke"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Tilstande med prioritet"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Tilføj en tilstand"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få kun notifikationer fra vigtige personer og apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Vælg aktiveringstype"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tidspunkt"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"F.eks. \"9.30 – 17.00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"F.eks. \"Personlig kalender\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Opret en tilstand"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Tilpasset"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begræns antallet af afbrydelser"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivér Forstyr ikke"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmer og medielyde kan afbryde"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Tidsplaner"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Slet tidsplaner"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Slet"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Omdøb"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Slet"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Skal tilstanden \"<xliff:g id="MODE">%1$s</xliff:g>\" slettes?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Rediger"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Tidsplaner"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Tidsplan"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Tilføj en kalender"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Brug din kalender"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Tidsplan"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Angiv en tidsplan"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Tidsplan"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> t. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Aktivér automatisk"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Planlæg"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Gør telefonen lydløs på bestemte tidspunkter"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Angiv regler for Forstyr ikke"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillad afbrydelser, der laver lyd"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloker visuelle forstyrrelser"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillad visuelle signaler"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifikationer, du kan modtage"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Hold fokus"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Yderligere handlinger"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Deaktiveret}=1{Deaktiveret / 1 tilstand kan aktiveres automatisk}one{Deaktiveret / # tilstand kan aktiveres automatisk}other{Deaktiveret / # tilstande kan aktiveres automatisk}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Indstillinger for visning"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Visningsmuligheder"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Gråtoner"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"aktivér mørkt tema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Indstil OS og apps til at foretrække lys tekst på en mørk baggrund, hvilket kan være mere behageligt for øjnene og medføre betydelig batteribesparelse på nogle enheder"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ingen ændringer af visningen}=1{{effect_1}}=2{{effect_1} og {effect_2}}=3{{effect_1}, {effect_2} og {effect_3}}one{{effect_1}, {effect_2} og # anden}other{{effect_1}, {effect_2} og # andre}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Bortfiltrér forstyrrelser"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ingen forstyrrelser bortfiltreres"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Visningsmuligheder for filtrerede notifikationer"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Når Forstyr ikke er aktiveret"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ingen lyd fra notifikationer"</string>
@@ -3465,9 +3505,9 @@
<string name="profile_section_header_for_advanced_privacy" msgid="8385775428904838579">"Arbejdsprofil"</string>
<string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Automatisk prioritetsniveau for notifikationer"</string>
<string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Angiv automatisk notifikationer med lavere prioritet som Diskret"</string>
- <string name="asst_capability_ranking_title" msgid="312998580233257581">"Automatisk rangering af notifikationer"</string>
+ <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptiv rangering af notifikationer"</string>
<string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger automatisk notifikationer efter relevans"</string>
- <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om tilpassede notifikationer"</string>
+ <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om adaptive notifikationer"</string>
<string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer af notifikationer, og vis en mulighed for at give feedback til systemet"</string>
<string name="asst_importance_reset_title" msgid="6191265591976440115">"Nulstil vigtigheden af notifikationer"</string>
<string name="asst_importance_reset_summary" msgid="684794589254282667">"Nulstil brugerangivne indstillinger for vigtighed, og tillad, at notifikationsassistenten prioriterer."</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"åbn notifikationen"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Tillad udsættelse af notifikationer"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notifikationsprik på appikon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notifikationspakker"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bobler"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bobler"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Lav denne samtale til en boble"</string>
@@ -3592,7 +3633,7 @@
<string name="nls_feature_read_summary" msgid="1064698238110273593">"Den kan læse dine notifikationer, herunder personlige oplysninger såsom kontakter, beskeder og billeder."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Svare på beskeder"</string>
<string name="nls_feature_reply_summary" msgid="4492543411395565556">"Den kan besvare beskeder og interagere med knapper i notifikationer, herunder udsættelse eller afvisning af notifikationer og besvarelse af opkald."</string>
- <string name="nls_feature_settings_title" msgid="8208164329853194414">"Skift indstillinger"</string>
+ <string name="nls_feature_settings_title" msgid="8208164329853194414">"Skifte indstillinger"</string>
<string name="nls_feature_settings_summary" msgid="3770028705648985689">"Den kan aktivere eller deaktivere Forstyr ikke og ændre relaterede indstillinger."</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Hvis du slår adgang til notifikationer fra for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, slås adgangen til Forstyr ikke muligvis også fra."</string>
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Slå fra"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Denne app understøtter ikke avancerede indstillinger"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Flere indstillinger"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Der er flere tilgængelige indstillinger inde i appen"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Dæmpning af notifikationer"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Andre"</string>
<string name="no_channels" msgid="4716199078612071915">"Denne app har ikke sendt nogen notifikationer"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Vis ikke-anvendte kategorier"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Flere indstillinger i appen"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Vis ikke-anvendte kategorier"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Skjul ikke-anvendte kategorier"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps, der kan afbryde"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Valgte apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ingen"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alle"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Ingen apps må forstyrre}=1{{app_1} må gerne forstyrre}=2{{app_1} og {app_2} må gerne forstyrre}=3{{app_1}, {app_2} og {app_3} må gerne forstyrre}one{{app_1}, {app_2} og # mere må gerne forstyrre}other{{app_1}, {app_2} og # andre må gerne 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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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 afbryde"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Vælg flere apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Intet kan afbryde"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan afbryde"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Nogle personer kan afbryde"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan afbryde"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Gentagne opkald"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Tillad gentagne opkald"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Skift til kun alarmer i én time (indtil {time})}one{Skift til kun alarmer i # time (indtil {time})}other{Skift til kun alarmer i # timer (indtil {time})}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Skift til Kun alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Skift til Afbryd altid"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Rediger tilstand"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Tilføj 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="warning_button_text" msgid="1274234338874005639">"Advarsel"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Luk"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback om denne enhed"</string>
@@ -4189,7 +4234,7 @@
<string name="battery_tips_card_dismiss_button" msgid="1885756985544936618">"OK"</string>
<string name="battery_tips_card_feedback_info" msgid="767117835675157298">"Er denne meddelelse nyttig?"</string>
<string name="battery_hints_warning_icon_a11y" msgid="5312542323401447620">"Advarselsikon med batteritips"</string>
- <string name="battery_tips_settings_summary_brightness" msgid="546145032616077783">"Aktivér automatisk lysstyrke for at forlænge batteritiden"</string>
+ <string name="battery_tips_settings_summary_brightness" msgid="546145032616077783">"Aktivér adaptiv lysstyrke for at forlænge batteritiden"</string>
<string name="battery_tips_settings_summary_screen_timeout" msgid="556801426050962077">"Reducer timeout for skærm for at forlænge batteritiden"</string>
<string name="battery_tips_apps_summary_always_high" msgid="6334519477067044920">"<xliff:g id="APP_LABEL">%1$s</xliff:g> brugte mere batteri"</string>
<string name="battery_tips_apps_summary_higher_than_usual" msgid="95676961671544628">"<xliff:g id="APP_LABEL">%1$s</xliff:g> brugte mere batteri end normalt"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Etui"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batteri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Indstillingspanel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Gennemtving skrivebordstilstand"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Gennemtving eksperimentel skrivebordstilstand på sekundære skærme"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktivér vinduer i frit format"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktivér understøttelse af vinduer i frit format."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktivér vinduer i frit format på en sekundær skærm"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktivér kun vinduer i frit format på en sekundær skærm."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivér app, hvis størrelse ikke kan justeres, i multivindue"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tillader, at apps, hvis størrelse ikke kan justeres, kan være i et multivindue"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tilsidesæt force-dark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Denne enheds datapartition skal konverteres til ext4, før du kan bruge udviklerindstillingen 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. Aktivering af indstillingen med 16 kB kræver én yderligere genstart efter dette. Når du er i denne tilstand, kan du skifte mellem tilstanden med 4 kB og tilstanden med 16 kB ved blot at genstarte en enkelt gang. Nogle funktioner deaktiveres i disse tilstande, så nogle apps fungerer muligvis ikke. Hvis du vil skifte tilbage til produktionstilstand på enheden, skal du skifte tilbage til tilstanden med 4 kB og derefter låse bootloaderen, hvilket vil gendanne enhedens fabriksindstillinger. Når enheden er startet i Android, skal du deaktivere OEM-oplåsning i Indstillinger for udviklere. Enheden ryddes, og filsystemet ændres til ext4 efter bekræftelse. Når dette er gjort, skal du vende tilbage for at aktivere 16 kB igen."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Ryd alle data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Datapartitionen kunne ikke omformateres og ryddes til ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Oplåsning af bootloader er påkrævet ved brug af tilstanden med 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Oplåsning af bootloader er påkrævet"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Bootloader skal være låst op på denne enhed, før du kan bruge udviklerindstillingen 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. Alle brugerdata og -indstillinger ryddes, når du aktiverer tilstanden med 16 kB. Når bootloaderen er låst op, forudsætter brug af indstillingen med 16 kB to genstarter. Når du er i denne tilstand, kan du skifte mellem tilstanden med 4 kB og tilstanden med 16 kB ved blot at genstarte en enkelt gang. Nogle funktioner deaktiveres i disse tilstande, så nogle apps fungerer muligvis ikke. Hvis du vil skifte tilbage til produktionstilstand på enheden, skal du skifte tilbage til tilstanden med 4 kB og derefter låse OEM/bootloaderen, hvilket gendanner enheden fabriksindstillinger. Lås bootloaderen op, og prøv igen. Du kan se, hvordan du gør dette, på <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Brug af den sideagnostiske tilstand med 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Du er i tilstanden med 4 kB i den sideagnostiske tilstand. 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 skifte tilbage til produktionstilstand, skal du låse bootloaderen på enheden. Tryk for at læse mere."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Du er i tilstanden med 4 kB i den sideagnostiske tilstand. 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 skifte tilbage til produktionstilstand, skal du 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 i 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruge <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> og vælge \"Ryd enhed\", \"Lås bootloader\" og \"Gennemtving flash af alle partitioner\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Brug af den sideagnostiske tilstand med 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Tryk for at læse mere."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 i 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruge <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> og vælge \"Ryd enhed\", \"Lås bootloader\" og \"Gennemtving flash af alle partitioner\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tryk for at læse mere."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruge <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Håndtering af fejlrapport"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Brug appfastgørelse"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Brug Indstillinger for udviklere"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Brug en udskrivningstjeneste"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Tillad flere brugere"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Tillad brugerskift"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"tillad, flere, brugere, mange"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"flere, brugere, profiler, personer, konti, skift, mange"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Brug trådløs fejlretning"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Vælg, hvad der skal vises på din skærm, når din tablet sidder i dockingstationen. Din enhed bruger muligvis mere batteri, når der anvendes en pauseskærm."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Tilpas"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Tilpas <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Du skal genstarte for at aktivere understøttelse af freeform."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Du skal genstarte for at gennemtvinge aktivering af computertilstand på sekundære skærme."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Du skal genstarte for at aktivere understøttelse af forældede vinduer i frit format."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Du skal genstarte for at ændre understøttelsen af vinduer i frit format"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Du skal genstarte for at gennemtvinge vinduer i frit format på sekundære skærme."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Genstart nu"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Genstart senere"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Rumlig lyd"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Til"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Fra"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Til"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Lyd %1$d%% venstre, %2$d%% højre"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Lyd %1$d%% højre, %2$d%% venstre"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Din enheds navn er synligt for apps, du har installeret. Det kan muligvis også ses af andre, når du opretter forbindelse til Bluetooth-enheder eller et Wi-Fi-netværk, eller når du konfigurerer et Wi-Fi-hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatisk køn"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Vælg grammatisk køn"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Søgeindstillinger"</string>
</resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index f5245a3..20b7e30 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Schlafenszeit"</item>
+ <item msgid="4152450357280759894">"Autofahren"</item>
+ <item msgid="7096549258219399423">"Immersiv"</item>
+ <item msgid="2760716776980432977">"Verwaltet"</item>
+ <item msgid="601734478369121764">"Stern"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Zeit"</item>
+ <item msgid="3653377604690057780">"Theater"</item>
+ <item msgid="3843711267408385410">"Blüte"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bc76709..bf0b3a5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Geräteverbindung trennen?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Neues Gerät koppeln"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Morgen automatisch aktivieren"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hörgeräteeinstellungen"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Verknüpfung, Kompatibilität mit Hörgeräten"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Voreinstellung"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Der Hörgeräteakustiker hat keine Voreinstellungen festgelegt"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Voreinstellung konnte nicht aktualisiert werden"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audioausgabe"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informationen zur Audioausgabe"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Aus"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aktiviert (# App hat Zugriff auf den Standort)}other{Aktiviert (# Apps haben Zugriff auf den Standort)}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Wird geladen…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps mit der Berechtigung zum Zugriff auf Geräte in der Nähe können die relative Position von verbundenen Geräten ermitteln."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps mit der Berechtigung zum Zugriff auf Geräte in der Nähe können die relative Positionierung von verbundenen Geräten ermitteln."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Standortzugriff ist für Apps und Dienste deaktiviert. Wenn du eine Notrufnummer wählst oder eine Nachricht an eine solche Nummer schickst, kann dein Standort dennoch an den Notdienst gesendet werden."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Weitere Informationen zu Standorteinstellungen"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Um Änderungen vorzunehmen, gehe zu den ChromeOS-Einstellungen > Datenschutz und Sicherheit > Datenschutzeinstellungen > Standortzugriff"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Gesicht und <xliff:g id="WATCH">%s</xliff:g> hinzugefügt"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Gesicht, Fingerabdruck und <xliff:g id="WATCH">%s</xliff:g> hinzugefügt"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Gesicht, Fingerabdrücke und <xliff:g id="WATCH">%s</xliff:g> hinzugefügt"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Dies ist erforderlich, da die Identitätsprüfung aktiviert ist"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Per Remote Authenticator entsperren"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Smartwatch hinzugefügt"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Smartwatch einrichten"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Weitere Informationen zu „Mit Smartwatch entsperren“"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Smartwatch hinzufügen"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Smartwatch entfernen"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Entsperrung per Gesichtserkennung und Fingerabdruck"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Entsperrung per Gesichtserkennung & Fingerabdruck"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Entsperrung per Gesichtserkennung & Fingerabdruck für die Arbeit"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Einrichtung erforderlich"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Gesicht und Fingerabdrücke hinzugefügt"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Apps installieren"</b>\n"Du kannst in deinem Profil Apps installieren, die privat bleiben sollen"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Wichtige Hinweise"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps werden beendet, wenn du dein Profil sperrst"</b>\n"Wenn du dein Profil sperrst, werden die Apps darin beendet und du erhältst von ihnen keine Benachrichtigungen"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Vertrauliche Profile eignen sich nicht für Apps, die im Hintergrund laufen oder wichtige Benachrichtigungen senden müssen, wie z. B. medizinische Apps. Das liegt daran, dass Benachrichtigungen und Hintergrundaktivitäten gestoppt werden, wenn dein Profil gesperrt ist.\n\nWenn dein vertrauliches Profil gesperrt ist, werden Apps darin nicht im Berechtigungsmanager, Privatsphäre-Dashboard und anderen Einstellungen angezeigt.\n\nDein vertrauliches Profil kann nicht auf ein neues Gerät übertragen werden. Du musst ein weiteres vertrauliches Profil einrichten, wenn du es auf einem anderen Gerät verwenden möchtest.\n\nJeder, der dein Gerät mit einem Computer verbindet oder auf dem Gerät schädliche Apps installiert, kann möglicherweise auf dein vertrauliches Profil zugreifen."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Vertrauliche Profile eignen sich nicht für Apps, die im Hintergrund laufen oder wichtige Benachrichtigungen senden müssen, wie z. B. medizinische Apps. Das liegt daran, dass Benachrichtigungen und Hintergrundaktivitäten gestoppt werden, wenn dein Profil gesperrt ist.\n\nWenn dein vertrauliches Profil gesperrt ist, werden Apps darin nicht im Berechtigungsmanager, Privatsphäre-Dashboard und anderen Einstellungen angezeigt.\n\nDein vertrauliches Profil kann nicht auf ein neues Gerät übertragen werden. Wenn du auf einem anderen Gerät ein vertrauliches Profil nutzen möchtest, musst du ein neues einrichten.\n\nPersonen, die dein Gerät mit einem Computer verbinden oder schädliche Apps auf deinem Gerät installieren, haben möglicherweise auch Zugriff auf dein vertrauliches Profil."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Informationen zum vertraulichen Profil"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Das kann einen Moment dauern"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Das vertrauliche Profil wird eingerichtet…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Gerät neu starten?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Die detaillierte NFC-Protokollierung wird nur zu Entwicklungszwecken verwendet. Dazu gehören auch zusätzliche NFC-Daten in Fehlerberichten, die private Informationen enthalten können. Starte dein Gerät neu, um diese Einstellung zu ändern."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Neu starten"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"spiegeln, externes Display, verbundenes Display, USB‑Display, Auflösung, Ausrichtung"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Ausrichtung"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Die Helligkeit des Displays passt sich automatisch an deine Umgebung und deine Aktivitäten an. Mit dem Schieberegler kannst du manuell nachjustieren und die Funktion „Automatische Helligkeit“ merkt sich deine Präferenz."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Weißabgleich des Bildschirms"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Bildschirmtastatur verwenden"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Bildschirmtastatur auch dann anzeigen, wenn physische Tastatur aktiv ist"</string>
<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="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="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">"Maustasten"</string>
+ <string name="mouse_keys_summary" msgid="2396247040177734245">"Du kannst die physische Tastatur verwenden, um die Maus zu steuern."</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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Zeigerfüllfarbe in Gelb ändern"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Zeigerfüllfarbe in Rosa ändern"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Zeigerfüllfarbe in Blau ändern"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stil des Zeigerstrichs"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Weiß"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Schwarz"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Keiner"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Nutzerauswahl: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Spracheingabe, -erkennung und -ausgabe"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Zeigergeschwindigkeit"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Größe des Mauszeigers"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Größe des Mauszeigers verringern"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Größe des Mauszeigers erhöhen"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Gamecontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibration weiterleiten"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Vibration an Gamecontroller senden, sofern eine Verbindung besteht"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Trotzdem fortfahren"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Abbrechen"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrößerungseinstellungen"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Schwenken mit einem Finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Lupe mit 1 Finger verschieben"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Ziehe 1 Finger auf dem Display"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Verschiebe den Vergrößerungsbereich mit einem Finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Verschiebe den Vergrößerungsbereich mit zwei Fingern."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nicht verfügbar, solange nur ein Teil des Bildschirms vergrößert wird"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zum Zoomen auf eine Schaltfläche tippen"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Du kannst auf dem Display schnell heranzoomen, um Inhalte zu vergrößern"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>So zoomst du heran:</b><br/> {0,number,integer}. Starte die Vergrößerung über den Kurzbefehl<br/> {1,number,integer}. Tippe auf das Display<br/> {2,number,integer}. Ziehe mit zwei Fingern, um den angezeigten Bildschirmausschnitt zu ändern<br/> {3,number,integer}. Ziehe zwei Finger auseinander oder zusammen, um den Zoom anzupassen<br/> {4,number,integer}. Beende die Vergrößerung über den Kurzbefehl<br/><br/> <b>So zoomst du vorübergehend heran:</b><br/> {0,number,integer}. Achte darauf, dass als Art der Vergrößerung „Vollbild“ ausgewählt ist<br/> {1,number,integer}. Starte die Vergrößerung über den Kurzbefehl<br/> {2,number,integer}. Halte eine beliebige Stelle auf dem Display gedrückt<br/> {3,number,integer}. Ziehe mit dem Finger, um den angezeigten Bildschirmausschnitt zu ändern<br/> {4,number,integer}. Hebe den Finger, um die Vergrößerung zu beenden"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>So zoomst du heran:</b><br/> {0,number,integer}. Starte die Vergrößerung über die Touch-Geste für Bedienungshilfen<br/> {1,number,integer}. Tippe auf das Display<br/> {2,number,integer}. Ziehe mit 2 Fingern, um den angezeigten Bildschirmausschnitt zu verschieben<br/> {3,number,integer}. Ziehe 2 Finger auseinander oder zusammen, um den Zoom anzupassen<br/> {4,number,integer}. Stoppe die Vergrößerung über die Touch-Geste für Bedienungshilfen<br/><br/> Du kannst auch vorübergehend heranzoomen und mehr."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>So zoomst du heran:</b><br/> {0,number,integer}. Starte die Vergrößerung über die Touch-Geste für Bedienungshilfen<br/> {1,number,integer}. Tippe auf das Display<br/> {2,number,integer}. Ziehe mit 1 oder 2 Fingern, um den angezeigten Bildschirmausschnitt zu verschieben<br/> {3,number,integer}. Ziehe 2 Finger auseinander oder zusammen, um den Zoom anzupassen<br/> {4,number,integer}. Stoppe die Vergrößerung über die Touch-Geste für Bedienungshilfen<br/><br/> Du kannst auch vorübergehend heranzoomen und mehr."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Wenn die Vergrößerung aktiviert ist, kannst du Elemente auf dem Bildschirm heranzoomen.\n\n"<b>"Wenn du zoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm.\n"<ul><li>"Zum Scrollen ziehe mit zwei oder mehr Fingern"</li>\n<li>"Zum Anpassen des Zooms ziehe zwei oder mehr Finger zusammen bzw. auseinander"</li></ul>\n\n<b>"Wenn du vorübergehend heranzoomen möchtest"</b>", starte die Vergrößerung und tippe dann auf eine beliebige Stelle auf dem Bildschirm und halte sie gedrückt.\n"<ul><li>"Wenn du den angezeigten Bildschirmausschnitt verschieben möchtest, ziehe den Bildschirm"</li>\n<li>"Zum Herauszoomen hebe den Finger"</li></ul>\n\n"In die Tastatur oder Navigationsleiste kann nicht hineingezoomt werden."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Seite <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> von <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Kurzbefehl: Schaltfläche „Bedienungshilfen“"</string>
@@ -2189,7 +2214,7 @@
<string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"Weitere Informationen zur Schaltfläche „Bedienungshilfen“ und zu Gesten"</string>
<string name="accessibility_button_intro" msgid="2601976470525277903">"Schaltfläche „Bedienungshilfen“ wird verwendet. Bei Bedienung über 3 Schaltflächen ist die Touch-Geste nicht verfügbar."</string>
<string name="accessibility_button_summary" msgid="8510939012631455831">"Schnell auf Bedienungshilfen zugreifen"</string>
- <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>So gehts</b><br/> {0,number,integer}. Gehe zu den Einstellungen für Bedienungshilfen<br/> {1,number,integer}. Wähle eine Bedienungshilfe aus und tippe auf den Kurzbefehl<br/> {2,number,integer}. Wähle aus, ob du eine Taste oder eine Touch-Geste für den Zugriff auf die Bedienungshilfe verwenden möchtest<br/>"</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>So gehts</b><br/> {0,number,integer}. Gehe zu den Einstellungen für Bedienungshilfen<br/> {1,number,integer}. Wähle eine Bedienungshilfe aus und tippe auf den Kurzbefehl<br/> {2,number,integer}. Wähle aus, ob du eine Schaltfläche oder eine Touch-Geste für den Zugriff auf die Bedienungshilfe verwenden möchtest<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>So gehts</b><br/> {0,number,integer}. Gehe zu den Einstellungen für Bedienungshilfen<br/> {1,number,integer}. Wähle eine Bedienungshilfe aus und tippe auf den Kurzbefehl<br/> {2,number,integer}. Wähle die Taste aus, die du für den Zugriff auf die Bedienungshilfe verwenden möchtest<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Schaltfläche oder Touch-Geste verwenden"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Ort"</string>
@@ -2403,7 +2428,7 @@
<string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"Zulassen"</string>
<string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"Ablehnen"</string>
<string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"Aus"</string>
- <string name="accessibility_dialog_button_cancel" msgid="8625997437316659966">"An belassen"</string>
+ <string name="accessibility_dialog_button_cancel" msgid="8625997437316659966">"An lassen"</string>
<string name="disable_service_title" msgid="8178020230162342801">"<xliff:g id="SERVICE">%1$s</xliff:g> deaktivieren?"</string>
<string name="accessibility_no_services_installed" msgid="3725569493860028593">"Keine Dienste installiert"</string>
<string name="accessibility_no_service_selected" msgid="1310596127128379897">"Kein Dienst ausgewählt"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Keine}=1{1 Zeitplan festgelegt}other{# Zeitpläne festgelegt}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Bitte nicht stören"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritätsmodi"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Modus hinzufügen"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Benachrichtigungen nur von wichtigen Personen und Apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Aktivierungstyp auswählen"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Uhrzeit"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Beispiel: „09:30 bis 17:00 Uhr“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Beispiel: „Persönlicher Kalender“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Modus erstellen"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Benutzerdefiniert"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Unterbrechungen einschränken"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"„Bitte nicht stören“ aktivieren"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Wecker und Medientöne können ihn unterbrechen"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Zeitpläne"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Zeitpläne löschen"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Löschen"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Umbenennen"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Löschen"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Den Modus „<xliff:g id="MODE">%1$s</xliff:g>“ löschen?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Bearbeiten"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Zeitpläne"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Zeitplan"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Kalender hinzufügen"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Kalender verwenden"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Zeitplan"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Zeitplan festlegen"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Zeitplan"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> Std. <xliff:g id="MINUTES">%2$d</xliff:g> Min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Automatisch aktivieren"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Zeitplan"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Smartphone zu bestimmten Zeiten stummschalten"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"„Bitte nicht stören“-Regeln einrichten"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Unterbrechungen mit Tönen zulassen"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Visuelle Störungen blockieren"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Visuelle Signale zulassen"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Benachrichtigungen, die dich erreichen können"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Mehr Konzentration"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Weitere Aktionen"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Deaktiviert}=1{Deaktiviert / 1 Modus kann automatisch aktiviert werden}other{Deaktiviert / # Modi können automatisch aktiviert werden}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Anzeigeeinstellungen"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Optionen anzeigen"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Graustufen"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"Dunkles Design aktivieren"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Stelle das Betriebssystem und die Apps so ein, dass vor einem dunklen Hintergrund heller Text bevorzugt wird. Das strengt die Augen weniger an und kann auf manchen Geräten die Akkulaufzeit erheblich verlängern."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Keine Änderungen der Anzeige}=1{{effect_1}}=2{{effect_1} und {effect_2}}=3{{effect_1}, {effect_2} und {effect_3}}other{{effect_1}, {effect_2} und # mehr}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Unterbrechungen filtern"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Es werden keine Unterbrechungen gefiltert"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Anzeigeoptionen für gefilterte Benachrichtigungen"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Wenn „Bitte nicht stören“ aktiviert ist"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Kein akustisches Signal bei Benachrichtigungen"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"Benachrichtigung öffnen"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Schlummerfunktion für Benachrichtigungen zulassen"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Benachrichtigungspunkt auf App-Symbol"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Benachrichtigungs-Sets"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Diese Unterhaltung als Bubble anzeigen"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Diese App unterstützt erweiterte Einstellungen nicht"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Weitere Einstellungen"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Weitere Einstellungen sind in dieser App verfügbar"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Verringern der Benachrichtigungslautstärke"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorien"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Andere"</string>
<string name="no_channels" msgid="4716199078612071915">"Für diese App gibt es keine Benachrichtigungen"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Ungenutzte Kategorien anzeigen"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Zusätzliche Einstellungen in der App"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Ungenutzte Kategorien anzeigen"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ungenutzte Kategorien ausblenden"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps, die unterbrechen dürfen"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Ausgewählte Apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Keine"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alle"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Keine App kann ihn unterbrechen}=1{{app_1} kann ihn unterbrechen}=2{{app_1} und {app_2} können ihn unterbrechen}=3{{app_1}, {app_2} und {app_3} können ihn unterbrechen}other{{app_1}, {app_2}, und # weitere können ihn 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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Weitere Apps auswählen"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nichts kann ihn unterbrechen"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kann ihn unterbrechen"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Einige Personen können ihn unterbrechen"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alle Personen können ihn unterbrechen"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Wiederholte Anrufer"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Wiederholte Anrufer zulassen"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Eine Stunde lang bis {time} zur Option „nur Weckrufe“ wechseln}other{# Stunden lang bis {time} zur Option „nur Weckrufe“ wechseln}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Bis <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> zur Option \"Nur Weckrufe\" wechseln"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Zur Option \"Immer unterbrechen\" wechseln"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modus bearbeiten"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Modus hinzufügen"</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="warning_button_text" msgid="1274234338874005639">"Warnung"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Schließen"</string>
<string name="device_feedback" msgid="5351614458411688608">"Feedback zu diesem Gerät senden"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Etui"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Akku"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Einstellungen"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Desktop-Modus erzwingen"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Experiementellen Desktop-Modus auf sekundären Bildschirmen erzwingen"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Freiform-Fenster zulassen"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Unterstützung für Freiform-Fenster aktivieren."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Freiform-Fenster auf sekundärem Display zulassen"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Freiform-Fenster nur auf sekundärem Display zulassen."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Mehrfenstermodus für nicht änderbare Größen aktivieren"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Erlaubt Mehrfenstermodus für Apps mit nicht änderbarer Größe"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Erzwingen des dunklen Modus außer Kraft setzen"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Bevor die 16‑KB-Entwickleroption verwendet werden kann, muss die Datenpartition des Geräts in ext4 umgewandelt werden. Beachte, dass bei entsperrtem Bootloader die Softwareintegrität nicht sichergestellt werden kann und alle auf dem Smartphone gespeicherten Daten gefährdet sind. Zum Aktivieren der 16‑KB-Option muss das Gerät danach noch einmal neu gestartet werden. Wenn du dann in diesem Modus bist, reicht für den Wechsel zwischen dem 4‑KB-Modus und dem 16‑KB-Modus ein einmaliger Neustart aus. Einige Funktionen werden in diesen Modi deaktiviert, weshalb bestimmte Anwendungen möglicherweise nicht funktionieren. Wenn du das Gerät in den Produktionsmodus zurückversetzen möchtest, musst du zurück in den 4‑KB-Modus wechseln und dann den Bootloader sperren. Dadurch wird das Gerät auf die Werkseinstellungen zurückgesetzt. Nachdem das Gerät hochgefahren und Android gestartet wurde, deaktiviere in den Entwickleroptionen die OEM-Entsperrung. Alle Daten auf dem Gerät werden gelöscht und das Dateisystem wird nach entsprechender Bestätigung in ext4 geändert. Nach Abschluss dieses Vorgangs kannst du hierher zurückkehren, um den 16‑KB-Modus zu aktivieren."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Alle Daten löschen"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Die Datenpartition konnte nicht gelöscht und mit ext4 neu formatiert werden."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Für den 16‑KB-Modus muss der Bootloader entsperrt werden"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Entsperrren des Bootloaders erforderlich"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Bevor auf diesem Gerät die 16‑KB-Entwickleroption verwendet werden kann, muss der Bootloader entsperrt werden. Beachte, dass bei entsperrtem Bootloader die Softwareintegrität nicht sichergestellt werden kann und alle auf dem Smartphone gespeicherten Daten gefährdet sind. Durch Aktivieren des 16‑KB-Modus werden alle Nutzerdaten und ‑einstellungen gelöscht. Nachdem der Bootloader entsperrt wurde, sind zur Aktivierung des 16‑KB-Modus zwei Neustarts erforderlich. Wenn du dann in diesem Modus bist, reicht für den Wechsel zwischen dem 4‑KB-Modus und dem 16‑KB-Modus ein einmaliger Neustart aus. Einige Funktionen werden in diesen Modi deaktiviert, weshalb bestimmte Anwendungen möglicherweise nicht funktionieren. Wenn du das Gerät in den Produktionsmodus zurückversetzen möchtest, musst du zurück in den 4‑KB-Modus wechseln und dann die OEM-/Bootloader-Sperre einrichten. Dadurch wird das Gerät auf die Werkseinstellungen zurückgesetzt. Bitte entsperre den Bootloader und versuch es noch einmal. Eine Anleitung hierzu findest du unter <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Speicherseitenunabhängigen 4‑KB-Modus verwenden"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Du befindest dich im 4‑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 den Bootloader des Geräts sperren. Wenn du mehr erfahren möchtest, tippe hier."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Du befindest dich im 4‑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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> oder verwende <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> und wähle „Gerätedaten löschen“, „Bootloader sperren“ und „Flashen aller Partitionen erzwingen“ aus."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Hinweis zu speicherseitenunabhängigem 16‑KB-Modus"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Wenn du mehr erfahren möchtest, tippe hier."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 läuft, flashe das aktuelle Factory Image unter <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> oder verwende <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> und wähle „Gerätedaten löschen“, „Bootloader sperren“ und „Flashen aller Partitionen erzwingen“ aus."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Wenn du mehr erfahren möchtest, tippe hier."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> oder verwende <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Fehlerbericht-Handler"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Bildschirmfixierung verwenden"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Entwickleroptionen verwenden"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Druckdienst verwenden"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Mehrere Nutzer zulassen"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Nutzerwechsel zulassen"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"zulassen, mehrere, Nutzer, Erlaubnis, viele"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"mehrere, Nutzer, Profile, Personen, Konten, wechseln, viele"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Debugging über WLAN verwenden"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Hier kannst du festlegen, was auf dem Display angezeigt werden soll, wenn das Tablet angedockt ist. Das Gerät verbraucht möglicherweise mehr Strom, wenn ein Bildschirmschoner verwendet wird."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Anpassen"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> anpassen"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Damit die Freiform-Unterstützung aktiviert wird, musst du das Gerät neu starten."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Damit der Desktop-Modus auf sekundären Bildschirmen erzwungen wird, musst du das Gerät neu starten."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Ein Neustart ist erforderlich, um die Unterstützung für Legacy-Freiform-Fenster zu aktivieren."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Ein Neustart ist erforderlich, um die Unterstützung für Freiform-Fenster zu ändern."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Ein Neustart ist erforderlich, um Freiform-Fenster auf sekundären Displays zu erzwingen."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Jetzt neu starten"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Später neu starten"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial Audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"An"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Aus"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"An"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% links, %2$d%% rechts"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% rechts, %2$d%% links"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Dein Gerätename ist für Apps, die du installiert hast, sichtbar. Wenn du dein Gerät mit Bluetooth-Geräten oder einem WLAN verbindest oder einen WLAN-Hotspot einrichtest, kann der Name möglicherweise auch von anderen Personen gesehen werden."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genus"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Genus auswählen"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"In Einstellungen suchen"</string>
</resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 23d07bd..d5db9b1 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Ώρα για ύπνο"</item>
+ <item msgid="4152450357280759894">"Οδήγηση"</item>
+ <item msgid="7096549258219399423">"Καθηλωτικό"</item>
+ <item msgid="2760716776980432977">"Διαχειριζόμενο"</item>
+ <item msgid="601734478369121764">"Αστέρι"</item>
+ <item msgid="6243809315432780521">"Ημερολόγιο"</item>
+ <item msgid="4913577903148415331">"Ώρα"</item>
+ <item msgid="3653377604690057780">"Θέατρο"</item>
+ <item msgid="3843711267408385410">"Λουλούδι"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e4d2923..15a8aac 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Αποσύνδεση συσκευής;"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Σύζευξη νέας συσκευής"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Αυτόματη ενεργοποίηση αύριο"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Ρυθμίσεις συσκευής ακοής"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Συντόμευση, συμβατότητα με βοηθήματα ακοής"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Προεπιλογή"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Ο ακοολόγος σας δεν έχει προγραμματίσει προεπιλογές"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Δεν ήταν δυνατή η ενημέρωση της προεπιλογής"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Έξοδος ήχου"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Σχετικά με την έξοδο ήχου"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Απενεργοποίηση"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ενεργή / # εφαρμογή έχει πρόσβαση στην τοποθεσία}other{Ενεργή / # εφαρμογές έχουν πρόσβαση στην τοποθεσία}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Φόρτωση…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Οι εφαρμογές με άδεια Συσκευές σε κοντινή απόσταση μπορούν να προσδιορίσουν τη σχετική θέση των συνδεδεμένων συσκευών."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Οι εφαρμογές που έχουν την άδεια Συσκευές σε κοντινή απόσταση μπορούν να προσδιορίσουν τη σχετική θέση των συνδεδεμένων συσκευών."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Η πρόσβαση στην τοποθεσία είναι απενεργοποιημένη για τις εφαρμογές και τις υπηρεσίες. Η τοποθεσία της συσκευής σας ενδέχεται ωστόσο να αποστέλλεται στους χειριστές των κέντρων εκτάκτων αναγκών, όταν καλείτε ή στέλνετε μήνυμα σε έναν αριθμό έκτακτης ανάγκης."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Μάθετε περισσότερα σχετικά με τις Ρυθμίσεις τοποθεσίας"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Για αλλαγή, μεταβείτε στις Ρυθμίσεις του ChromeOS > Απόρρητο και ασφάλεια > Στοιχεία ελέγχου απορρήτου > Πρόσβαση στην τοποθεσία"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Προστέθηκε το πρόσωπο και το <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Προστέθηκαν πρόσωπο, δακτυλικό αποτύπωμα και το <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Προστέθηκαν πρόσωπο, δακτυλικά αποτυπώματα και το <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Αυτό είναι απαραίτητο επειδή ο Έλεγχος ταυτότητας είναι ενεργοποιημένος"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Απομ. ξεκλ. Προγράμ. ελέγχου ταυτότητας"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Το ρολόι προστέθηκε"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Ρυθμίστε το ρολόι σας"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Μάθετε περισσότερα σχετικά με το Ξεκλείδωμα ρολογιού"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Προσθήκη ρολογιού"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Κατάργηση ρολογιού"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Ξεκλείδωμα με δακτυλικό αποτύπωμα και με το πρόσωπο"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Ξεκλείδωμα με πρόσωπο/δακτυλ. αποτύπωμα"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ξεκλείδωμα με πρόσωπο και δακτυλικό αποτύπωμα για την εργασία"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Απαιτείται ρύθμιση"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Προστέθηκε πρόσωπο και δακτυλικά αποτυπώματα"</string>
@@ -562,7 +563,7 @@
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε τον ιδιωτικό χώρο σας ή να επαληθεύετε την ταυτότητά σας, για παράδειγμα, όταν συνδέεστε σε εφαρμογές ή εγκρίνετε κάποια αγορά"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"Ο ιδιωτικός χώρος σας μπορεί να ξεκλειδωθεί άθελά σας, για παράδειγμα, εάν κάποιος τοποθετήσει το δάχτυλό σας στη συσκευή."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε τον ιδιωτικό χώρο σας ή για να εγκρίνετε αγορές"</string>
- <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"Ρύθμιση της λειτουργίας Ξεκλείδωμα με το πρόσωπο για ιδιωτικό χώρο"</string>
+ <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"Ρύθμιση λειτ. Ξεκλείδωμα με το πρόσωπο για ιδιωτικό χώρο"</string>
<string name="private_space_face_enroll_introduction_message" msgid="250239418499081821">"Χρησιμοποιήστε το πρόσωπό σας για να ξεκλειδώσετε τον ιδιωτικό χώρο σας ή για να επαληθεύσετε την ταυτότητά σας, για παράδειγμα κατά τη σύνδεση σε εφαρμογές ή την έγκριση μιας αγοράς"</string>
<string name="private_space_face_enroll_introduction_info_looking" msgid="5694757845303924042">"Ο ιδιωτικός χώρος μπορεί να ξεκλειδωθεί εάν κοιτάξετε το τηλέφωνό σας, ακόμη και άθελά σας. Ο ιδιωτικός χώρος σας μπορεί επίσης να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, τον δίδυμο αδελφό σας, ή σε περίπτωση που κάποιος πλησιάσει τη συσκευή στο πρόσωπό σας."</string>
<string name="private_space_face_enroll_introduction_info_less_secure" msgid="8460719783943533172">"Το ξεκλείδωμα του ιδιωτικού χώρου σας με τη χρήση του προσώπου σας ενδέχεται να είναι λιγότερο ασφαλές από τη χρήση ενός ισχυρού μοτίβου, ενός PIN ή ενός κωδικού πρόσβασης"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Εγκαταστήστε εφαρμογές"</b>\n"Εγκαταστήστε εφαρμογές που θέλετε να διατηρήσετε ιδιωτικές στον χώρο σας"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Να έχετε υπόψη τα εξής"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Η λειτουργία των εφαρμογών διακόπτεται όταν κλειδώνετε τον χώρο σας"</b>\n"Όταν κλειδώνετε τον χώρο σας, η λειτουργία των εφαρμογών στον χώρο σας διακόπτεται και παύετε να λαμβάνετε ειδοποιήσεις από αυτές"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Οι ιδιωτικοί χώροι δεν είναι κατάλληλοι για εφαρμογές που πρέπει να εκτελούνται στο παρασκήνιο ή να στέλνουν κρίσιμες ειδοποιήσεις, όπως οι ιατρικές εφαρμογές. Αυτό συμβαίνει επειδή οι ειδοποιήσεις και η δραστηριότητα στο παρασκήνιο διακόπτονται όταν ο χώρος κλειδώνεται.\n\nΟι εφαρμογές στον ιδιωτικό χώρο σας δεν εμφανίζονται στη Διαχείριση αδειών, στον πίνακα ελέγχου απορρήτου και σε άλλες ρυθμίσεις όταν ο ιδιωτικός χώρος είναι κλειδωμένος.\n\nΔεν είναι δυνατή η μετακίνηση του ιδιωτικού χώρου σας σε νέα συσκευή. Θα πρέπει να δημιουργήσετε άλλον ιδιωτικό χώρο αν επιθυμείτε να τον χρησιμοποιήσετε σε μια άλλη συσκευή.\n\nΕάν κάποιος συνδέσει τη συσκευή σας σε έναν υπολογιστή ή εγκαταστήσει επιβλαβείς εφαρμογές στη συσκευή σας, μπορεί να αποκτήσει πρόσβαση στον ιδιωτικό χώρο σας."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Οι ιδιωτικοί χώροι δεν είναι κατάλληλοι για εφαρμογές που πρέπει να εκτελούνται στο παρασκήνιο ή να στέλνουν κρίσιμες ειδοποιήσεις, όπως οι ιατρικές εφαρμογές. Αυτό συμβαίνει επειδή οι ειδοποιήσεις και η δραστηριότητα στο παρασκήνιο διακόπτονται όταν ο χώρος κλειδώνεται.\n\nΟι εφαρμογές στον ιδιωτικό χώρο σας δεν εμφανίζονται στη Διαχείριση αδειών, στον πίνακα ελέγχου απορρήτου και σε άλλες ρυθμίσεις όταν ο ιδιωτικός χώρος είναι κλειδωμένος.\n\nΔεν είναι δυνατή η επαναφορά του ιδιωτικού χώρου σας σε νέα συσκευή. Θα πρέπει να δημιουργήσετε έναν διαφορετικό χώρο αν επιθυμείτε να τον χρησιμοποιήσετε σε μια άλλη συσκευή.\n\nΕάν κάποιος συνδέσει τη συσκευή σας σε έναν υπολογιστή ή εγκαταστήσει κακόβουλες εφαρμογές στη συσκευή σας, μπορεί να αποκτήσει πρόσβαση στον ιδιωτικό χώρο σας."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Μάθετε περισσότερα για τον ιδιωτικό χώρο"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Η διαδικασία θα διαρκέσει λίγη ώρα"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Ρύθμιση ιδιωτικού χώρου…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Επανεκκίνηση συσκευής;"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Η καταγραφή των λεπτομερειών NFC προορίζεται μόνο για σκοπούς ανάπτυξης. Επιπλέον δεδομένα NFC περιλαμβάνονται στις αναφορές σφαλμάτων, οι οποίες ενδέχεται να περιέχουν ιδιωτικές πληροφορίες. Επανεκκινήστε τη συσκευή σας για να αλλάξετε αυτήν τη ρύθμιση."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Επανεκκίνηση"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"κατοπτρισμός, εξωτερική οθόνη, συνδεδεμένη οθόνη, οθόνη usb, ανάλυση, περιστροφή"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Περιστροφή"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Τυπική"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Χρήση πληκτρολογίου οθόνης"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Να παραμένει στην οθόνη όταν είναι ενεργό το φυσικό πληκτρολόγιο"</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> ms"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Αλλαγή στιλ γεμίσ. δείκ. σε κίτρινο"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Αλλαγή στιλ γεμίσματ. δείκτη σε ροζ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Αλλαγή στιλ γεμίσμ. δείκτη σε μπλε"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Στιλ πινελιάς δείκτη"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Λευκό"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Μαύρο"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Κανένα"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Επιλέχθηκε από τον χρήστη: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Ομιλία"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Ταχύτητα δείκτη"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Μέγεθος δείκτη"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Μείωση μεγέθους δείκτη"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Αύξηση μεγέθους δείκτη"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Χειριστήριο παιχνιδιού"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Ανακατεύθυνση δόνησης"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Αποστολή δόνησης στο χειριστήριο του παιχνιδιού κατά τη σύνδεση."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Συνέχεια ούτως ή άλλως"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Ακύρωση"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ρυθμίσεις μεγέθυνσης"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Μετακίνηση με ένα δάχτυλο"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Μετακινήστε τη Μεγέθυνση με το δάχτυλό σας"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Σύρετε το δάχτυλό σας για μετακίνηση στην οθόνη"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Μετακινήστε την περιοχή μεγιστοπ. σύροντας με ένα δάχτυλο."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Μετακινήστε την περιοχή μεγιστοπ. σύροντας με δύο δάχτυλα."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Μη διαθέσιμο όταν μεγιστοποιείται μόνο ένα τμήμα της οθόνης"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Πατήστε ένα κουμπί για εστίαση"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Μεγεθύνετε γρήγορα την οθόνη προκειμένου το περιεχόμενο να εμφανίζεται μεγαλύτερο"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Για μεγέθυνση:</b><br/> {0,number,integer}. Χρησιμοποιήστε τη συντόμευση για να ξεκινήσετε τη μεγιστοποίηση<br/> {1,number,integer}. Πατήστε την οθόνη<br/> {2,number,integer}. Σύρετε 2 δάχτυλα για να μετακινηθείτε στην οθόνη<br/> {3,number,integer}. Πλησιάστε δύο δάχτυλα μεταξύ τους για προσαρμογή της εστίασης<br/> {4,number,integer}. Χρησιμοποιήστε τη συντόμευση για να διακόψετε τη μεγιστοποίηση<br/><br/> <b>Για προσωρινή μεγέθυνση:</b><br/> {0,number,integer}. Βεβαιωθείτε ότι ο τύπος μεγέθυνσης έχει οριστεί σε πλήρη οθόνη<br/> {1,number,integer}. Χρησιμοποιήστε τη συντόμευση για να ξεκινήσετε τη μεγιστοποίηση<br/> {2,number,integer}. Αγγίξτε παρατεταμένα οπουδήποτε στην οθόνη<br/> {3,number,integer}. Σύρετε το δάχτυλό σας για να μετακινηθείτε στην οθόνη<br/> {4,number,integer}. Σηκώστε το δάχτυλό σας για διακοπή της μεγιστοποίησης"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Για μεγέθυνση:</b><br/> {0,number,integer}. Χρησιμοποιήστε τη συντόμευση για να ξεκινήσετε τη μεγιστοποίηση<br/> {1,number,integer}. Πατήστε την οθόνη<br/> {2,number,integer}. Σύρετε 2 δάχτυλα για να μετακινηθείτε στην οθόνη<br/> {3,number,integer}. Πλησιάστε 2 δάχτυλα μεταξύ τους για προσαρμογή της εστίασης<br/> {4,number,integer}. Χρησιμοποιήστε τη συντόμευση για να σταματήσετε τη μεγιστοποίηση<br/><br/> Μπορείτε επίσης να κάνετε προσωρινά μεγέθυνση και πολλά άλλα."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Για μεγέθυνση:</b><br/> {0,number,integer}. Χρησιμοποιήστε τη συντόμευση για να ξεκινήσετε τη μεγιστοποίηση<br/> {1,number,integer}. Πατήστε την οθόνη<br/> {2,number,integer}. Σύρετε 1 ή 2 δάχτυλα για να μετακινηθείτε στην οθόνη<br/> {3,number,integer}. Πλησιάστε 2 δάχτυλα μεταξύ τους για προσαρμογή της εστίασης<br/> {4,number,integer}. Χρησιμοποιήστε τη συντόμευση για να σταματήσετε τη μεγιστοποίηση<br/><br/> Μπορείτε επίσης να κάνετε προσωρινά μεγέθυνση και πολλά άλλα."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Όταν η μεγέθυνση είναι ενεργοποιημένη, μπορείτε να μεγεθύνετε την οθόνη σας.\n\n"<b>"Για εστίαση "</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, πατήστε οπουδήποτε στην οθόνη σας.\n"<ul><li>"Σύρετε 2 ή περισσότερα δάχτυλα για κύλιση"</li>\n<li>"Πλησιάστε 2 ή περισσότερα δάχτυλα για να προσαρμόσετε την εστίαση"</li></ul>\n\n<b>"Για προσωρινή εστίαση"</b>", ανοίξτε τη μεγέθυνση και, στη συνέχεια, αγγίξτε παρατεταμένα οπουδήποτε στην οθόνη.\n"<ul><li>"Σύρετε για να μετακινηθείτε στην οθόνη"</li>\n<li>"Ανασηκώστε το δάχτυλο για σμίκρυνση"</li></ul>\n\n"Δεν μπορείτε να κάνετε μεγέθυνση στο πληκτρολόγιο ή τη γραμμή πλοήγησης."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Σελίδα <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> από <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Συντόμευση κουμπιού προσβασιμότητας"</string>
@@ -2762,11 +2787,11 @@
<string name="include_app_data_title" msgid="2969603876620594523">"Συμπερίληψη δεδομ. εφαρμογής"</string>
<string name="auto_restore_title" msgid="4124345897936637561">"Αυτόματη επαναφορά"</string>
<string name="auto_restore_summary" msgid="6830198851045584001">"Σε νέα εγκατάσταση εφαρμογής, να γίνεται ανάκτηση ρυθμίσεων/δεδομένων από αντίγραφα ασφαλείας"</string>
- <string name="backup_inactive_title" msgid="6753265378043349277">"Η δημιουργία αντιγράφων ασφαλείας δεν είναι ενεργή"</string>
+ <string name="backup_inactive_title" msgid="6753265378043349277">"Η δημιουργία αντιγράφου ασφαλείας δεν είναι ενεργή"</string>
<string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Κανένας λογαριασμός δεν αποθηκεύει αντίγραφα ασφαλείας"</string>
<string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
- <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Θέλετε να διακοπεί η δημιουργία αντιγράφων ασφαλείας για τους κωδικούς πρόσβασης Wi-Fi, τους σελιδοδείκτες και τις άλλες ρυθμίσεις και τα δεδομένα εφαρμογών και να διαγραφούν όλα τα αντίτυπα από τους διακομιστές της Google;"</string>
- <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Να διακοπεί η δημιουργία αντιγράφων ασφαλείας για τα δεδομένα συσκευών (όπως είναι οι κωδικοί πρόσβασης Wi-Fi και το ιστορικό κλήσεων) και τα δεδομένα εφαρμογών (όπως είναι οι ρυθμίσεις και τα αρχεία που αποθηκεύουν οι εφαρμογές) και να διαγραφούν όλα τα αντίτυπα από τους απομακρυσμένους διακομιστές;"</string>
+ <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Θέλετε να διακοπεί η δημιουργία αντιγράφου ασφαλείας για τους κωδικούς πρόσβασης Wi-Fi, τους σελιδοδείκτες και τις άλλες ρυθμίσεις και τα δεδομένα εφαρμογών και να διαγραφούν όλα τα αντίτυπα από τους διακομιστές της Google;"</string>
+ <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Να διακοπεί η δημιουργία αντιγράφου ασφαλείας για τα δεδομένα συσκευών (όπως είναι οι κωδικοί πρόσβασης Wi-Fi και το ιστορικό κλήσεων) και τα δεδομένα εφαρμογών (όπως είναι οι ρυθμίσεις και τα αρχεία που αποθηκεύουν οι εφαρμογές) και να διαγραφούν όλα τα αντίτυπα από τους απομακρυσμένους διακομιστές;"</string>
<string name="fullbackup_data_summary" msgid="971587401251601473">"Δημιουργήστε αντίγραφα ασφαλείας για τα δεδομένα της συσκευής σας (όπως τους κωδικούς Wi-Fi και το ιστορικό κλήσεων) και τα δεδομένα εφαρμογών (όπως ρυθμίσεις και αρχεία που έχουν αποθηκευτεί από τις εφαρμογές) απομακρυσμένα και αυτόματα.\n\nΜε την ενεργοποίηση της αυτόματης δημιουργίας αντιγράφων ασφαλείας, τα δεδομένα της συσκευής και των εφαρμογών αποθηκεύονται απομακρυσμένα περιοδικά. Τα δεδομένα εφαρμογών μπορεί να είναι διαφόρων ειδών δεδομένα τα οποία έχουν αποθηκευτεί από κάποια εφαρμογή (ανάλογα με τις ρυθμίσεις του προγραμματιστή), συμπεριλαμβανομένων δυνητικά ευαίσθητων δεδομένων, όπως επαφών, μηνυμάτων και φωτογραφιών."</string>
<string name="device_admin_settings_title" msgid="31392408594557070">"Ρυθμίσεις διαχειριστή συσκευής"</string>
<string name="active_device_admin_msg" msgid="7744106305636543184">"Εφαρμογή διαχειριστή συσκευής"</string>
@@ -3171,7 +3196,7 @@
<string name="cloned_app_created_summary" msgid="7277912971544890710">"Αντιγράφηκε"</string>
<string name="cloned_app_creation_toast_summary" msgid="3854494347144867870">"Δημιουργείται κλώνος της εφαρμογής <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string>
<string name="cloned_app_created_toast_summary" msgid="755225403495544163">"Δημιουργήθηκε κλώνος της εφαρμογής <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string>
- <string name="system_dashboard_summary" msgid="7400745270362833832">"Γλώσσα, κινήσεις, ώρα, δημιουργία αντιγράφων ασφαλείας"</string>
+ <string name="system_dashboard_summary" msgid="7400745270362833832">"Γλώσσα, κινήσεις, ώρα, δημιουργία αντιγράφου ασφαλείας"</string>
<string name="languages_setting_summary" msgid="2650807397396180351">"Γλώσσες συστήματος, γλώσσες εφαρμογής, προτιμήσεις περιοχής, ομιλία"</string>
<string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wi fi"</string>
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"ειδοποίηση Wi‑Fi, ειδοποίηση wifi"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Κανένα}=1{Ορίστηκε ένα πρόγραμμα.}other{Ορίστηκαν # προγράμματα.}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Μην ενοχλείτε"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Λειτουργίες προτεραιότητας"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Προσθήκη λειτουργίας"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Λήψη ειδοποιήσεων μόνο από σημαντικά άτομα και εφαρμογές"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Επιλογή τύπου ενεργοποίησης"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ώρα"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Π.χ. \"9.30-5.00 μ.μ.\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Ημερολόγιο"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Π.χ. \"Προσωπικό ημερολόγιο\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Δημιουργία λειτουργίας"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Προσαρμοσμένο"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Περιορισμός διακοπών"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ενεργοποίηση λειτουργίας \"Μην ενοχλείτε\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Οι συναγερμοί και οι ήχοι των μέσων μπορούν να διακόπτουν."</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Προγράμματα"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Διαγραφή προγραμμάτων"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Διαγραφή"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Μετονομασία"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Διαγραφή"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Διαγραφή λειτουργίας <xliff:g id="MODE">%1$s</xliff:g>;"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Επεξεργασία"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Προγράμματα"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Πρόγραμμα"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Προσθήκη ημερολογίου"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Χρήση του ημερολογίου σας"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Πρόγραμμα"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Ορίστε ένα πρόγραμμα"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Πρόγραμμα"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ώ. <xliff:g id="MINUTES">%2$d</xliff:g> λ."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Αυτόματη ενεργοποίηση"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Πρόγραμμα"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Σίγαση τηλεφώνου ορισμένες ώρες"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Ρύθμιση κανόνων λειτουργίας \"Μην ενοχλείτε\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Να επιτρέπονται οι διακοπές που συνοδεύονται από ήχο"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Αποκλ. οπτικών αντιπ/σμών"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Να επιτρέπονται οπτικά σήματα"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Ειδοποιήσεις που μπορούν να προβληθούν"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Παραμείνετε συγκεντρωμένοι"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Επιπλέον ενέργειες"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Ανενεργή}=1{Ανενεργή / 1 λειτουργία μπορεί να ενεργοποιηθεί αυτόματα}other{Ανενεργή / # λειτουργίες μπορούν να ενεργοποιηθούν αυτόματα}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ρυθμίσεις προβολής"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Επιλογές προβολής"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Κλίμακα του γκρι"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ενεργοποίηση σκούρου θέματος"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Κάντε εναλλαγή του λειτουργικού συστήματος και των εφαρμογών για να προτιμάται φωτεινό κείμενο σε σκοτεινό φόντο, κάτι που μπορεί να είναι πιο ξεκούραστο για τα μάτια και να αποφέρει σημαντική εξοικονόμηση μπαταρίας σε ορισμένες συσκευές"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"Φιλτράρισμα διακοπών"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Δεν φιλτράρονται διακοπές"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"άνοιγμα ειδοποίησης"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Να επιτρέπεται η αναβολή των ειδοποιήσεων"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Κουκκίδα ειδοποίησης στο εικονίδιο εφαρμογής"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Πακέτα ειδοποιήσεων"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Συννεφάκια"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Συννεφάκια"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Εμφάνιση αυτής της συνομιλίας σε συννεφάκι"</string>
@@ -3576,7 +3617,7 @@
<string name="notifications_sent_daily" msgid="10274479224185437">"{count,plural, =1{Περίπου # ειδοποίηση την ημέρα}other{Περίπου # ειδοποιήσεις την ημέρα}}"</string>
<string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{Περίπου # ειδοποίηση την εβδομάδα}other{Περίπου # ειδοποιήσεις την εβδομάδα}}"</string>
<string name="notifications_sent_never" msgid="9081278709126812062">"Ποτέ"</string>
- <string name="manage_notification_access_title" msgid="4154723216570646451">"Στοιχείο ελέγχου ανάγνωσης και απάντησης σε ειδοποιήσεις"</string>
+ <string name="manage_notification_access_title" msgid="4154723216570646451">"Έλεγχος, ανάγνωση και απάντηση σε ειδοποιήσεις"</string>
<string name="manage_notification_access_summary" msgid="2907135226478903997">"Ελέγξτε ποιες εφαρμογές και συσκευές μπορούν να διαβάζουν ειδοποιήσεις"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Η πρόσβαση στις ειδοποιήσεις προφίλ εργασίας έχει αποκλειστεί"</string>
<string name="notification_assistant_title" msgid="5889201903272393099">"Βελτιωμένες ειδοποιήσεις"</string>
@@ -3591,7 +3632,7 @@
<string name="nls_feature_read_title" msgid="7629713268744220437">"Ανάγνωση των ειδοποιήσεών σας"</string>
<string name="nls_feature_read_summary" msgid="1064698238110273593">"Μπορεί να διαβάσει τις ειδοποιήσεις σας, συμπεριλαμβανομένων προσωπικών στοιχείων, όπως επαφές, μηνύματα και φωτογραφίες."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Απάντηση σε μηνύματα"</string>
- <string name="nls_feature_reply_summary" msgid="4492543411395565556">"Μπορεί να απαντήσει σε μηνύματα και να εκτελέσει ενέργειες σε κουμπιά ειδοποιήσεων, όπως να θέσει σε αναβολή ειδοποιήσεις και να απαντήσει σε κλήσεις."</string>
+ <string name="nls_feature_reply_summary" msgid="4492543411395565556">"Μπορεί να απαντήσει σε μηνύματα και να εκτελέσει ενέργειες σε κουμπιά ειδοποιήσεων, όπως να θέσει σε αναβολή ή να παραβλέψει ειδοποιήσεις και να απαντήσει σε κλήσεις."</string>
<string name="nls_feature_settings_title" msgid="8208164329853194414">"Αλλαγή ρυθμίσεων"</string>
<string name="nls_feature_settings_summary" msgid="3770028705648985689">"Μπορεί να ενεργοποιήσει ή να απενεργοποιήσει τη λειτουργία Μην ενοχλείτε και να αλλάξει σχετικές ρυθμίσεις."</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Εάν απενεργοποιήσετε την πρόσβαση σε ειδοποιήσεις για το <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, ενδεχομένως να απενεργοποιηθεί και η πρόσβασή του στη λειτουργία \"Μην ενοχλείτε\"."</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Αυτή η εφαρμογή δεν υποστηρίζει βελτιωμένες ρυθμίσεις"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Περισσότερες ρυθμίσεις"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Περισσότερες ρυθμίσεις είναι διαθέσιμες μέσα σε αυτή την εφαρμογή"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Περίοδος cooldown ειδοποιήσεων"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Εφαρμογή σε προφίλ εργασίας"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Εφαρμογή σε εφαρμογές με προφίλ εργασίας"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Κατηγορίες"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Άλλα"</string>
<string name="no_channels" msgid="4716199078612071915">"Αυτή η εφαρμογή δεν έχει δημοσιεύσει ειδοποιήσεις"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Εμφάνιση κατηγοριών που δεν χρησιμοποιούνται"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Επιπλέον ρυθμίσεις στην εφαρμογή"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Εμφάνιση μη χρησιμοπ. κατηγοριών"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Απόκρυψη μη χρησιμοπ. κατηγοριών"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Εφαρμογές που μπορούν να διακόπτουν"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Επιλεγμένες εφαρμογές"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Καμία"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Όλες"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Να επιτρέπεται στις εφαρμογές η παράκαμψη"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Εφαρμογές που μπορούν να διακόπτουν"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Επιλέξτε περισσότερες εφαρμογές"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Τίποτα δεν μπορεί να διακόπτει."</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Κανείς δεν μπορεί να διακόπτει."</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Ορισμένα άτομα μπορούν να διακόπτουν."</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Όλα τα άτομα μπορούν να διακόπτουν."</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Καλούντες κατ\' επανάληψη"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Να επιτρέπονται οι καλούντες κατ\' επανάληψη"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Αλλαγή σε λειτουργία Μόνο ξυπνητήρια για μία ώρα, έως {time}}other{Αλλαγή σε λειτουργία Μόνο ξυπνητήρια για # ώρες, έως {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Αλλαγή σε ξυπνητήρια μόνο έως τις <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Αλλαγή σε διακοπές πάντα"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Λειτουργία επεξεργασίας"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Λειτουργία προσθήκης"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Προσαρμοσμένη λειτουργία"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Όνομα λειτουργίας"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Ειδοποίηση"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Κλείσιμο"</string>
<string name="device_feedback" msgid="5351614458411688608">"Αποστολή σχολίων για τη συσκευή"</string>
@@ -4286,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Λειτουργία πλοήγησης"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Πλοήγηση με δύο κουμπιά"</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>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Αναγκαστική λειτουργία επιτραπέζιου υπολογιστή"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Αναγκαστική πειραματική λειτουργία επιτραπέζιου υπολογιστή σε δευτερεύουσες οθόνες"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Ενεργοποίηση παραθύρων ελεύθερης μορφής"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Ενεργοποίηση υποστήριξης για παράθυρα ελεύθερης μορφής."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Ενεργ. προσαρμ. παρ. ελεύθ. μορφής σε δευτ. οθόνη"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Ενεργοποίηση παραθύρων ελεύθερης μορφής μόνο στη δευτερεύουσα οθόνη."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ενεργ. εφαρμ. χωρίς δυνατ. αλλαγής μεγέθ. σε πολλαπλά παραθ."</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Επιτρέπει εφαρμογές χωρίς δυνατότητα αλλαγής μεγέθους σε λειτουργία πολλαπλών παραθύρων"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Παράκαμψη αναγκ. χρήσης σκούρου θέματος"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Το διαμέρισμα δεδομένων αυτής της συσκευής πρέπει να μετατραπεί σε ext4 πριν από τη χρήση της επιλογής 16 KB για προγραμματιστές. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Η ενεργοποίηση της επιλογής 16 KB απαιτεί μία ακόμα επανεκκίνηση μετά από αυτό. Όταν βρίσκεστε σε αυτή τη λειτουργία, μπορείτε να κάνετε εναλλαγή μεταξύ των λειτουργιών 4 KB και 16 KB με μία μόνο επανεκκίνηση. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να επιστρέψετε τη συσκευή στη λειτουργία παραγωγής, θα πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης, γεγονός που οδηγεί στην επαναφορά των εργοστασιακών ρυθμίσεων της συσκευής. Μετά την επιτυχημένη εκκίνηση της συσκευής στο Android, απενεργοποιήστε το OEM ξεκλείδωμα στις Επιλογές για προγραμματιστές. Θα γίνει εκκαθάριση της συσκευής και το σύστημα αρχείων θα αλλάξει σε ext4 κατόπιν επιβεβαίωσης. Αφού ολοκληρωθεί αυτή η διαδικασία, επιστρέψτε για να ενεργοποιήσετε ξανά τη λειτουργία 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Διαγραφή όλων των δεδομένων"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Απέτυχε η αλλαγή μορφής και η εκκαθάριση του διαμερίσματος δεδομένων σε ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Απαιτείται ξεκλείδωμα προγράμματος φόρτωσης εκκίνησης για τη λειτουργία 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Απαιτείται ξεκλείδωμα του προγράμματος φόρτωσης εκκίνησης"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Για να είναι δυνατή η χρήση της επιλογής 16 KB για προγραμματιστές, πρέπει να είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης σε αυτή τη συσκευή. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Όλα τα δεδομένα και οι ρυθμίσεις χρήστη θα εκκαθαριστούν κατά την ενεργοποίηση της λειτουργίας 16 KB. Μετά το ξεκλείδωμα του προγράμματος φόρτωσης εκκίνησης, η ενεργοποίηση της επιλογής 16 KB απαιτεί δύο επανεκκινήσεις. Όταν βρίσκεστε σε αυτή τη λειτουργία, μπορείτε να κάνετε εναλλαγή μεταξύ των λειτουργιών 4 KB και 16 KB με μία μόνο επανεκκίνηση. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να επιστρέψετε τη συσκευή στη λειτουργία παραγωγής, θα πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να εφαρμόσετε κλείδωμα OEM/προγράμματος φόρτωσης εκκίνησης (το οποίο οδηγεί στην επαναφορά των εργοστασιακών ρυθμίσεων) στη συσκευή. Ξεκλειδώστε το πρόγραμμα φόρτωσης εκκίνησης και δοκιμάστε ξανά. Μπορείτε να δείτε οδηγίες για την εκτέλεση αυτής της διαδικασίας στη διεύθυνση <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Χρήση της λειτουργίας 4 KB που δεν εξαρτάται από το μέγεθος σελίδας"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Βρίσκεστε στη λειτουργία 4 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Πατήστε για να διαβάσετε περισσότερα."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Βρίσκεστε στη λειτουργία 4 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Αυτή η ενέργεια θα είχε ως αποτέλεσμα την επαναφορά των εργοστασιακών ρυθμίσεων ξανά, καθώς και την επαναφορά της συσκευής στις ρυθμίσεις παραγωγής. Μετά την επιτυχημένη εκκίνηση της συσκευής στο Android, απενεργοποιήστε το OEM ξεκλείδωμα στις Επιλογές για προγραμματιστές. Αν η συσκευή δεν ολοκληρώσει την εκκίνηση στο Android με επιτυχία ή είναι ασταθής, εγκαταστήστε εκ νέου τις πιο πρόσφατες εργοστασιακές εικόνες στη συσκευή από τη διεύθυνση <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ή χρησιμοποιήστε <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> και επιλέξτε Εκκαθάριση συσκευής, Κλείδωμα προγράμματος φόρτωσης εκκίνησης και Αναγκαστικό flash όλων των διαμερισμάτων."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Χρήση της λειτουργίας 16 KB που δεν εξαρτάται από το μέγεθος σελίδας"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Βρίσκεστε στη λειτουργία 16 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Πατήστε για να διαβάσετε περισσότερα."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Βρίσκεστε στη λειτουργία 16 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Αυτή η ενέργεια θα είχε ως αποτέλεσμα την επαναφορά των εργοστασιακών ρυθμίσεων ξανά, καθώς και την επαναφορά της συσκευής στις ρυθμίσεις παραγωγής. Μετά την επιτυχημένη εκκίνηση της συσκευής στο Android, απενεργοποιήστε το OEM ξεκλείδωμα στις Επιλογές για προγραμματιστές. Αν η συσκευή δεν ολοκληρώσει την εκκίνηση στο Android με επιτυχία ή είναι ασταθής, εγκαταστήστε εκ νέου τις πιο πρόσφατες εργοστασιακές εικόνες στη συσκευή από τη διεύθυνση <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ή χρησιμοποιήστε <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> και επιλέξτε Εκκαθάριση συσκευής, Κλείδωμα προγράμματος φόρτωσης εκκίνησης και Αναγκαστικό flash όλων των διαμερισμάτων."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Βρίσκεστε στη λειτουργία 16 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Πατήστε για να διαβάσετε περισσότερα."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Βρίσκεστε στη λειτουργία 16 KB της λειτουργίας που δεν εξαρτάται από το μέγεθος σελίδας. Δεν είναι δυνατή η εγγύηση της ακεραιότητας του λογισμικού σε αυτή τη λειτουργία. Επίσης, τυχόν δεδομένα τα οποία αποθηκεύονται στο τηλέφωνο ενώ είναι ξεκλειδωμένο το πρόγραμμα φόρτωσης εκκίνησης ενδέχεται να κινδυνεύουν. Ορισμένες δυνατότητες θα απενεργοποιηθούν σε αυτές τις λειτουργίες, επομένως ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν. Για να εισέλθετε ξανά στη λειτουργία παραγωγής, πρέπει να μεταβείτε ξανά στη λειτουργία 4 KB και κατόπιν να κλειδώσετε το πρόγραμμα φόρτωσης εκκίνησης της συσκευής. Αυτή η ενέργεια θα είχε ως αποτέλεσμα την εκ νέου επαναφορά των εργοστασιακών ρυθμίσεων, καθώς και την επαναφορά της συσκευής στις ρυθμίσεις παραγωγής. Μετά την επιτυχημένη εκκίνηση της συσκευής στο Android, απενεργοποιήστε το OEM ξεκλείδωμα στις Επιλογές για προγραμματιστές. Αν η συσκευή δεν ολοκληρώσει την εκκίνηση στο Android με επιτυχία ή είναι ασταθής, εγκαταστήστε εκ νέου τις πιο πρόσφατες εργοστασιακές εικόνες στη συσκευή από τη διεύθυνση <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ή χρησιμοποιήστε το <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> και επιλέξτε Εκκαθάριση συσκευής, Κλείδωμα προγράμματος φόρτωσης εκκίνησης και Αναγκαστικό 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="bug_report_handler_title" msgid="713439959113250125">"Χειρισμός Αναφοράς σφάλματος"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Χρήση καρφιτσώματος εφαρμογής"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Χρήση επιλογών για προγραμματιστές"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Χρήση υπηρεσίας εκτύπωσης"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Να επιτρέπονται πολλαπλοί χρήστες"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Να επιτρέπεται η εναλλαγή χρήστη"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"επιτρέπεται, πολλαπλοί, χρήστες, άδεια, πολλοί"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"πολλά, χρήστες, προφίλ, άτομα, λογαριασμοί, αλλαγή, πολλοί"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Χρήση ασύρματου εντοπισμού σφαλμάτων"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Επιλέξτε τι θα εμφανίζεται στην οθόνη σας όταν το tablet είναι στη βάση σύνδεσης. Η συσκευή σας μπορεί να καταναλώνει περισσότερη ενέργεια όταν χρησιμοποιείται μια προφύλαξη οθόνης."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Προσαρμογή"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Προσαρμογή <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Απαιτείται επανεκκίνηση για την ενεργοποίηση της υποστήριξης ελεύθερης μορφής."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Απαιτείται επανεκκίνηση για την επιβολή χρήσης της λειτουργίας υπολογιστή σε δευτερεύουσες οθόνες."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Απαιτείται επανεκκίνηση για την ενεργοποίηση της υποστήριξης προσαρμογής σε παράθυρο ελεύθερης μορφής παλαιού τύπου."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Απαιτείται επανεκκίνηση για την αλλαγή της υποστήριξης προσαρμογής σε παράθυρο ελεύθερης μορφής."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Απαιτείται επανεκκίνηση για την επιβολή προσαρμογής σε παράθυρο ελεύθερης μορφής σε δευτερεύουσες οθόνες."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Επανεκκίνηση τώρα"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Επανεκκίνηση αργότερα"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Χωρικός ήχος"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Ενεργή"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Ανενεργή"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Ενεργή"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Ήχος %1$d%% αριστερά, %2$d%% δεξιά"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Ήχος %1$d%% δεξιά, %2$d%% αριστερά"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Το όνομα της συσκευής σας είναι ορατό στις εφαρμογές που εγκαθιστάτε. Ενδέχεται επίσης να είναι ορατό και σε άλλα άτομα, όταν συνδέεστε σε συσκευές Bluetooth, συνδέεστε σε ένα δίκτυο Wi-Fi ή ρυθμίζετε ένα σημείο πρόσβασης Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Γραμματικό γένος"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Επιλογή γραμματικού γένους"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Ρυθμίσεις αναζήτησης"</string>
</resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index ab87841..53f9b0a 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtime"</item>
+ <item msgid="4152450357280759894">"Driving"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Managed"</item>
+ <item msgid="601734478369121764">"Star"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Time"</item>
+ <item msgid="3653377604690057780">"Theatre"</item>
+ <item msgid="3843711267408385410">"Flower"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 87ce261..b7f71f0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Disconnect device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hearing device settings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, hearing aid compatibility"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"There are no presets programmed by your audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Couldn\'t update preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"About audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On/# app has access to location}other{On/# apps have access to location}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Learn more about location settings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"To change, go to ChromeOS Settings > Privacy and security > Privacy controls > Location access"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Face and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Face, fingerprint and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Face, fingerprints and <xliff:g id="WATCH">%s</xliff:g> added"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"This is needed since Identity Check is on"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote authenticator unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Watch added"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Set up your watch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Learn more about Watch Unlock"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Add watch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remove watch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingerprint and Face Unlock"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face and Fingerprint Unlock"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Face and Fingerprint Unlock for work"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Setup needed"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Install apps"</b>\n"Install apps that you want to keep private in your space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Bear in mind"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stop when you lock your space"</b>\n"When you lock your space, apps in your space are stopped and you won\'t receive notifications from them"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when private space is locked.\n\nYour private space can\'t be restored to a new device. You\'ll need to set up another space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs malicious apps on your device may be able to access your private space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Learn more about private space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"This will take a few moments"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setting up private space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restart device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detailed NFC logging is intended for development purposes only. Additional NFC data is included in bug reports, which may contain private information. Restart your device to change this setting."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</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="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="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="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 & tools"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Change pointer fill style to yellow"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Change pointer fill style to pink"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Change pointer fill style to blue"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pointer stroke style"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"White"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Black"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"None"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"User selected: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Pointer scale"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Decrease pointer scale"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Increase pointer scale"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirect vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continue anyway"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger panning"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Move magnifier with 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Drag 1 finger to move around the screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Move the magnification area by dragging one finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Move the magnification area by dragging two fingers."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Unavailable while only magnifying part of the screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag two fingers to move around screen<br/> {3,number,integer}. Pinch with two fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> {0,number,integer}. Make sure that your magnification type is set to full screen<br/> {1,number,integer}. Use shortcut to start magnification<br/> {2,number,integer}. Touch and hold anywhere on the screen<br/> {3,number,integer}. Drag finger to move around screen<br/> {4,number,integer}. Lift finger to stop magnification"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Accessibility button shortcut"</string>
@@ -3179,7 +3204,7 @@
<string name="keywords_time_format" msgid="5384803098766166820">"Use 24-hour format"</string>
<string name="keywords_app_default" msgid="8977706259156428770">"Open with"</string>
<string name="keywords_applications_settings" msgid="999926810912037792">"Applications"</string>
- <string name="keywords_time_zone" msgid="6402919157244589055">"time zone"</string>
+ <string name="keywords_time_zone" msgid="6402919157244589055">"timezone"</string>
<string name="keywords_draw_overlay" msgid="3170036145197260392">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="2133079265697578183">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, toggle, control"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Priority modes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Add a mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Select activation type"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Time"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"e.g. \'9.30 – 5.00 p.m.\'"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"e.g. \'Personal calendar\'"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Create a mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarms and media sounds can interrupt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Delete schedules"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Delete \'<xliff:g id="MODE">%1$s</xliff:g>\' mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Add a calendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use your calendar"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Schedule"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Set a schedule"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schedule"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>hr, <xliff:g id="MINUTES">%2$d</xliff:g>min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Turn on automatically"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set do not disturb rules"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications that can reach you"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Stay focused"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Additional actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off/1 mode can turn on automatically}other{Off/# modes can turn on automatically}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Display settings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Display options"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Greyscale"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"Enable Dark theme"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Switch the OS and apps to prefer light text on a dark background, which may be easier on the eyes and confers significant battery savings on some devices"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} and {effect_2}}=3{{effect_1}, {effect_2} and {effect_3}}other{{effect_1}, {effect_2} and # more}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No interruptions are filtered"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Display options for filtered notifications"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"When Do Not Disturb is on"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"open notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Allow notification snoozing"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot on app icon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notification bundles"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"This app doesn’t support enhanced settings"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"More settings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"More settings are available inside this app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Notification cooldown"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Other"</string>
<string name="no_channels" msgid="4716199078612071915">"This app has not posted any notifications"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Show unused categories"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Additional settings in the app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Show unused categories"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Hide unused categories"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps that can interrupt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Selected apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"None"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"All"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Select more apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Repeat callers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Allow repeat callers"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Change to alarms only for one hour until {time}}other{Change to alarms only for # hours until {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Change to always interrupt"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Add 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="warning_button_text" msgid="1274234338874005639">"Warning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Enable freeform windows"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Enable support for freeform windows."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Enable freeform windowing on second display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Enable freeform windows only on secondary display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"This device\'s data partition needs to be converted to ext4 before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Activating the 16 KB option will require one more reboot after this. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then lock the bootloader, which factory resets the device. Once the device successfully boots into Android, disable OEM unlocking in Developer options. The device will be wiped and the filesystem will be changed to ext4 after confirmation. Once this completes, please come back to enable 16 KB again."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Erase all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Failed to reformat and wipe the data partition to ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader unlock required for 16 KB mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader unlock required"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"This device needs to have the bootloader unlocked before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. All user data and settings will be wiped when activating 16 KB mode. Once the bootloader is unlocked, activating the 16 KB option will require two reboots. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then OEM/bootloader lock (which factory resets) the device. Please unlock the bootloader and try again. You can see instructions for how to do this at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Using 4 KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"You are in the 4 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 lock the bootloader of the device. Tap to read more."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"You are in the 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Using 16 KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Tap to read more."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tap to read more."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use Developer options"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Allow user switch"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Customise"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Customise <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"A reboot is required to enable legacy freeform windowing support."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"A reboot is required to change freeform windowing support."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"A reboot is required to force freeform windowing on secondary displays."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reboot later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% left, %2$d%% right"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% right, %2$d%% left"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatical gender"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Select grammatical gender"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Search settings"</string>
</resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 61ce5d2..3dee62f 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtime"</item>
+ <item msgid="4152450357280759894">"Driving"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Managed"</item>
+ <item msgid="601734478369121764">"Star"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Time"</item>
+ <item msgid="3653377604690057780">"Theater"</item>
+ <item msgid="3843711267408385410">"Flower"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 960344f..c10b235 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Disconnect device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hearing device settings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, hearing aid compatibility"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"There are no presets programmed by your audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Couldn’t update preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"About audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On / # app has access to location}other{On / # apps have access to location}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps with the nearby devices permission can determine the relative position of connected devices."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Learn more about Location settings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"To change go to ChromeOS Settings > Privacy and security > Privacy controls > Location access"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Face and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Face, fingerprint, and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Face, fingerprints, and <xliff:g id="WATCH">%s</xliff:g> added"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"This is needed since Identity Check is on"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator Unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Watch added"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Set up your watch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Learn more about Watch Unlock"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Add watch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remove watch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingerprint & Face Unlock"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face and Fingerprint Unlock"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Face and Fingerprint Unlock for work"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Setup needed"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Install apps"</b>\n"Install apps that you want to keep private in your space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Keep in mind"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stop when you lock your space"</b>\n"When you lock your space, apps in your space are stopped and you won’t receive notifications from them"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in permission manager, privacy dashboard, and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in permission manager, privacy dashboard, and other settings when private space is locked.\n\nYour private space can\'t be restored to a new device. You’ll need to set up another space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs malicious apps on your device may be able to access your private space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Learn more about private space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"This will take a few moments"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setting up private space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restart Device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detail NFC logging is intended for development purposes only. Additional NFC data is included in bug reports, which may contain private information. Restart your device to change this setting."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</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="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="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="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 & tools"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Change pointer fill style to yellow"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Change pointer fill style to pink"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Change pointer fill style to blue"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pointer stroke style"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"White"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Black"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"None"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"User selected: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Pointer scale"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Decrease pointer scale"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Increase pointer scale"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirect vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continue anyway"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger panning"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Move magnifier with 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Drag 1 finger to move around the screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Move the magnification area by dragging one finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Move the magnification area by dragging two fingers."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Unavailable while only magnifying part of the screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag two fingers to move around screen<br/> {3,number,integer}. Pinch with two fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> {0,number,integer}. Make sure your magnification type is set to full screen<br/> {1,number,integer}. Use shortcut to start magnification<br/> {2,number,integer}. Touch and hold anywhere on the screen<br/> {3,number,integer}. Drag finger to move around screen<br/> {4,number,integer}. Lift finger to stop magnification"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap the screen anywhere.\n"<ul><li>"Drag two or more fingers to scroll"</li>\n<li>"Pinch two or more fingers to adjust the zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold the screen anywhere.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can\'t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Accessibility button shortcut"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Priority Modes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Add a mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Select activation type"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Time"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Ex. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Ex. \"Personal calendar\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Create a mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarms and media sounds can interrupt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Delete schedules"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Delete \"<xliff:g id="MODE">%1$s</xliff:g>\" mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
@@ -3340,6 +3379,7 @@
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Set a schedule"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schedule"</string>
<string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> hr, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Turn on automatically"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set Do Not Disturb rules"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications that can reach you"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Stay focused"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Additional actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off / 1 mode can turn on automatically}other{Off / # modes can turn on automatically}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Display settings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Display options"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grayscale"</string>
@@ -3366,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"enable dark theme"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Switch the OS and apps to prefer light text on a dark background, which may be easier on the eyes and confers significant battery savings on some devices"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} and {effect_2}}=3{{effect_1}, {effect_2}, and {effect_3}}other{{effect_1}, {effect_2}, and # more}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No interruptions are filtered"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Display options for filtered notifications"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"When Do Not Disturb is on"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"open notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Allow notification snoozing"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot on app icon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notification bundles"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
@@ -3610,9 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"This app doesn’t support enhanced settings"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"More settings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"More settings are available inside this app"</string>
- <string name="notification_polite_title" msgid="4737150709382859870">"Adaptive Notifications"</string>
- <string name="notification_polite_main_control_title" msgid="7267191551379543859">"Use adaptive notifications"</string>
- <string name="notification_polite_description" msgid="7749280535620291610">"When you get many notifications within a short time, your phone will lower volume and minimize pop-ups on screen for up to two minutes. Calls, alarms, and priority conversations still vibrate, make a sound, or show up on the screen, and all notifications are easy to find when you pull down from the top of the screen."</string>
+ <string name="notification_polite_title" msgid="6121016426991791557">"Notification cooldown"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Use notification cooldown"</string>
+ <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="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
@@ -3659,6 +3703,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Other"</string>
<string name="no_channels" msgid="4716199078612071915">"This app has not posted any notifications"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Show unused categories"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Additional settings in the app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Show unused categories"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Hide unused categories"</string>
@@ -3767,7 +3812,10 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps that can interrupt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Selected apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"None"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"All"</string>
+ <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_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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Select more apps"</string>
@@ -3785,6 +3833,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Repeat callers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Allow repeat callers"</string>
@@ -3804,9 +3854,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Change to alarms only for one hour until {time}}other{Change to alarms only for # hours until {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Change to always interrupt"</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"Rename"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"Change icon"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"Change icon"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Add 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="warning_button_text" msgid="1274234338874005639">"Warning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
@@ -4792,8 +4843,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Enable freeform windows"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Enable support for freeform windows."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Enable freeform windowing on second display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Enable freeform windows only on secondary display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in multi window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in multi window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
@@ -4861,14 +4914,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"This device’s data partition needs to be converted to ext4 before using the 16KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Activating the 16KB option will require one more reboot after this. Once you are in this mode, you can switch back and forth between 4KB and 16KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to production mode, you would need to switch back to 4KB mode and then lock the bootloader, which factory resets the device. After the device successfully boots into Android, disable OEM unlocking in Developer options. The device will be wiped and the filesystem will be changed to ext4 after confirmation. After this completes, please come back to enable 16KB again."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Erase all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Failed to reformat and wipe the data partition to ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader Unlock Required for 16KB Mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader Unlock Required"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"This device needs to have the bootloader unlocked before using the 16KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. All user data and settings will be wiped when activating 16KB mode. Once the bootloader is unlocked, activating the 16KB option will require two reboots. Once you are in this mode, you can switch back and forth between 4KB and 16KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to production mode, you would need to switch back to 4KB mode and then OEM/bootloader lock (which factory resets) the device. Please unlock the bootloader and try again. You can see instructions for how to do this at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Using 4KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"You are in the 4KB 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 lock the bootloader of the device. Tap to read more."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"You are in the 4KB 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe Device\', \'Lock Bootloader\' and \'Force Flash all partitions\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Using 16KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 4K mode and then lock the bootloader of the device. Tap to read more."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe Device\', \'Lock Bootloader\' and \'Force Flash all partitions\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tap to read more."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
@@ -5000,7 +5053,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use developer options"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Allow user switch"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
@@ -5114,8 +5167,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Customize"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Customize <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"A reboot is required to enable legacy freeform windowing support."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"A reboot is required to change freeform windowing support."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"A reboot is required to force freeform windowing on secondary displays."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reboot later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial Audio"</string>
@@ -5233,6 +5287,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% left, %2$d%% right"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% right, %2$d%% left"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatical gender"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Select Grammatical gender"</string>
@@ -5344,4 +5400,5 @@
<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="homepage_search" msgid="6759334912284663559">"Search Settings"</string>
</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index ab87841..53f9b0a 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtime"</item>
+ <item msgid="4152450357280759894">"Driving"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Managed"</item>
+ <item msgid="601734478369121764">"Star"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Time"</item>
+ <item msgid="3653377604690057780">"Theatre"</item>
+ <item msgid="3843711267408385410">"Flower"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 482e870..4f109c3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Disconnect device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hearing device settings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, hearing aid compatibility"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"There are no presets programmed by your audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Couldn\'t update preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"About audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On/# app has access to location}other{On/# apps have access to location}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Learn more about location settings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"To change, go to ChromeOS Settings > Privacy and security > Privacy controls > Location access"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Face and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Face, fingerprint and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Face, fingerprints and <xliff:g id="WATCH">%s</xliff:g> added"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"This is needed since Identity Check is on"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote authenticator unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Watch added"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Set up your watch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Learn more about Watch Unlock"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Add watch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remove watch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingerprint and Face Unlock"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face and Fingerprint Unlock"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Face and Fingerprint Unlock for work"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Setup needed"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Install apps"</b>\n"Install apps that you want to keep private in your space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Bear in mind"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stop when you lock your space"</b>\n"When you lock your space, apps in your space are stopped and you won\'t receive notifications from them"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when private space is locked.\n\nYour private space can\'t be restored to a new device. You\'ll need to set up another space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs malicious apps on your device may be able to access your private space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Learn more about private space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"This will take a few moments"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setting up private space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restart device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detailed NFC logging is intended for development purposes only. Additional NFC data is included in bug reports, which may contain private information. Restart your device to change this setting."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</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="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="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="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 & tools"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Change pointer fill style to yellow"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Change pointer fill style to pink"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Change pointer fill style to blue"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pointer stroke style"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"White"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Black"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"None"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"User selected: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Pointer scale"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Decrease pointer scale"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Increase pointer scale"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirect vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continue anyway"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger panning"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Move magnifier with 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Drag 1 finger to move around the screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Move the magnification area by dragging one finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Move the magnification area by dragging two fingers."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Unavailable while only magnifying part of the screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag two fingers to move around screen<br/> {3,number,integer}. Pinch with two fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> {0,number,integer}. Make sure that your magnification type is set to full screen<br/> {1,number,integer}. Use shortcut to start magnification<br/> {2,number,integer}. Touch and hold anywhere on the screen<br/> {3,number,integer}. Drag finger to move around screen<br/> {4,number,integer}. Lift finger to stop magnification"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Accessibility button shortcut"</string>
@@ -3179,7 +3204,7 @@
<string name="keywords_time_format" msgid="5384803098766166820">"Use 24-hour format"</string>
<string name="keywords_app_default" msgid="8977706259156428770">"Open with"</string>
<string name="keywords_applications_settings" msgid="999926810912037792">"Applications"</string>
- <string name="keywords_time_zone" msgid="6402919157244589055">"time zone"</string>
+ <string name="keywords_time_zone" msgid="6402919157244589055">"timezone"</string>
<string name="keywords_draw_overlay" msgid="3170036145197260392">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="2133079265697578183">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, toggle, control"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Priority modes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Add a mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Select activation type"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Time"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"e.g. \'9.30 – 5.00 p.m.\'"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"e.g. \'Personal calendar\'"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Create a mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarms and media sounds can interrupt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Delete schedules"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Delete \'<xliff:g id="MODE">%1$s</xliff:g>\' mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Add a calendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use your calendar"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Schedule"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Set a schedule"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schedule"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>hr, <xliff:g id="MINUTES">%2$d</xliff:g>min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Turn on automatically"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set do not disturb rules"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications that can reach you"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Stay focused"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Additional actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off/1 mode can turn on automatically}other{Off/# modes can turn on automatically}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Display settings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Display options"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Greyscale"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"Enable Dark theme"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Switch the OS and apps to prefer light text on a dark background, which may be easier on the eyes and confers significant battery savings on some devices"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} and {effect_2}}=3{{effect_1}, {effect_2} and {effect_3}}other{{effect_1}, {effect_2} and # more}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No interruptions are filtered"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Display options for filtered notifications"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"When Do Not Disturb is on"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"open notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Allow notification snoozing"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot on app icon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notification bundles"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"This app doesn’t support enhanced settings"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"More settings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"More settings are available inside this app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Notification cooldown"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Other"</string>
<string name="no_channels" msgid="4716199078612071915">"This app has not posted any notifications"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Show unused categories"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Additional settings in the app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Show unused categories"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Hide unused categories"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps that can interrupt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Selected apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"None"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"All"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Select more apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Repeat callers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Allow repeat callers"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Change to alarms only for one hour until {time}}other{Change to alarms only for # hours until {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Change to always interrupt"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Add 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="warning_button_text" msgid="1274234338874005639">"Warning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Enable freeform windows"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Enable support for freeform windows."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Enable freeform windowing on second display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Enable freeform windows only on secondary display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"This device\'s data partition needs to be converted to ext4 before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Activating the 16 KB option will require one more reboot after this. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then lock the bootloader, which factory resets the device. Once the device successfully boots into Android, disable OEM unlocking in Developer options. The device will be wiped and the filesystem will be changed to ext4 after confirmation. Once this completes, please come back to enable 16 KB again."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Erase all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Failed to reformat and wipe the data partition to ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader unlock required for 16 KB mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader unlock required"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"This device needs to have the bootloader unlocked before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. All user data and settings will be wiped when activating 16 KB mode. Once the bootloader is unlocked, activating the 16 KB option will require two reboots. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then OEM/bootloader lock (which factory resets) the device. Please unlock the bootloader and try again. You can see instructions for how to do this at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Using 4 KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"You are in the 4 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 lock the bootloader of the device. Tap to read more."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"You are in the 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Using 16 KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Tap to read more."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tap to read more."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use Developer options"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Allow user switch"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Customise"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Customise <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"A reboot is required to enable legacy freeform windowing support."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"A reboot is required to change freeform windowing support."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"A reboot is required to force freeform windowing on secondary displays."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reboot later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% left, %2$d%% right"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% right, %2$d%% left"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatical gender"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Select grammatical gender"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Search settings"</string>
</resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index ab87841..53f9b0a 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtime"</item>
+ <item msgid="4152450357280759894">"Driving"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Managed"</item>
+ <item msgid="601734478369121764">"Star"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Time"</item>
+ <item msgid="3653377604690057780">"Theatre"</item>
+ <item msgid="3843711267408385410">"Flower"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c45d3e7..dcf843f 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Disconnect device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hearing device settings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, hearing aid compatibility"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"There are no presets programmed by your audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Couldn\'t update preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"About audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On/# app has access to location}other{On/# apps have access to location}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Learn more about location settings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"To change, go to ChromeOS Settings > Privacy and security > Privacy controls > Location access"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Face and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Face, fingerprint and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Face, fingerprints and <xliff:g id="WATCH">%s</xliff:g> added"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"This is needed since Identity Check is on"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote authenticator unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Watch added"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Set up your watch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Learn more about Watch Unlock"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Add watch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remove watch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingerprint and Face Unlock"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face and Fingerprint Unlock"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Face and Fingerprint Unlock for work"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Setup needed"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Install apps"</b>\n"Install apps that you want to keep private in your space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Bear in mind"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stop when you lock your space"</b>\n"When you lock your space, apps in your space are stopped and you won\'t receive notifications from them"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in Permission manager, privacy dashboard and other settings when private space is locked.\n\nYour private space can\'t be restored to a new device. You\'ll need to set up another space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs malicious apps on your device may be able to access your private space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Learn more about private space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"This will take a few moments"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setting up private space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restart device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detailed NFC logging is intended for development purposes only. Additional NFC data is included in bug reports, which may contain private information. Restart your device to change this setting."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</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="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="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="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 & tools"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Change pointer fill style to yellow"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Change pointer fill style to pink"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Change pointer fill style to blue"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pointer stroke style"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"White"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Black"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"None"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"User selected: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Pointer scale"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Decrease pointer scale"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Increase pointer scale"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirect vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continue anyway"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger panning"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Move magnifier with 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Drag 1 finger to move around the screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Move the magnification area by dragging one finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Move the magnification area by dragging two fingers."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Unavailable while only magnifying part of the screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag two fingers to move around screen<br/> {3,number,integer}. Pinch with two fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> {0,number,integer}. Make sure that your magnification type is set to full screen<br/> {1,number,integer}. Use shortcut to start magnification<br/> {2,number,integer}. Touch and hold anywhere on the screen<br/> {3,number,integer}. Drag finger to move around screen<br/> {4,number,integer}. Lift finger to stop magnification"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul><li>"Drag 2 or more fingers to scroll"</li>\n<li>"Pinch 2 or more fingers to adjust zoom"</li></ul>\n\n<b>"To zoom temporarily"</b>", start magnification, then touch and hold anywhere on the screen.\n"<ul><li>"Drag to move around the screen"</li>\n<li>"Lift finger to zoom out"</li></ul>\n\n"You can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Accessibility button shortcut"</string>
@@ -3179,7 +3204,7 @@
<string name="keywords_time_format" msgid="5384803098766166820">"Use 24-hour format"</string>
<string name="keywords_app_default" msgid="8977706259156428770">"Open with"</string>
<string name="keywords_applications_settings" msgid="999926810912037792">"Applications"</string>
- <string name="keywords_time_zone" msgid="6402919157244589055">"time zone"</string>
+ <string name="keywords_time_zone" msgid="6402919157244589055">"timezone"</string>
<string name="keywords_draw_overlay" msgid="3170036145197260392">"Chat head, system, alert, window, dialogue, display, on top other apps, draw"</string>
<string name="keywords_flashlight" msgid="2133079265697578183">"Flashlight, Light, Torch"</string>
<string name="keywords_change_wifi_state" msgid="7573039644328488165">"wifi, wi-fi, toggle, control"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Priority modes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Add a mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Select activation type"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Time"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"e.g. \'9.30 – 5.00 p.m.\'"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"e.g. \'Personal calendar\'"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Create a mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarms and media sounds can interrupt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Delete schedules"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Delete \'<xliff:g id="MODE">%1$s</xliff:g>\' mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Add a calendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use your calendar"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Schedule"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Set a schedule"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schedule"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>hr, <xliff:g id="MINUTES">%2$d</xliff:g>min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Turn on automatically"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set do not disturb rules"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications that can reach you"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Stay focused"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Additional actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off/1 mode can turn on automatically}other{Off/# modes can turn on automatically}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Display settings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Display options"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Greyscale"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"Enable Dark theme"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Switch the OS and apps to prefer light text on a dark background, which may be easier on the eyes and confers significant battery savings on some devices"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} and {effect_2}}=3{{effect_1}, {effect_2} and {effect_3}}other{{effect_1}, {effect_2} and # more}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No interruptions are filtered"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Display options for filtered notifications"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"When Do Not Disturb is on"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"open notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Allow notification snoozing"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot on app icon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notification bundles"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"This app doesn’t support enhanced settings"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"More settings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"More settings are available inside this app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Notification cooldown"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Other"</string>
<string name="no_channels" msgid="4716199078612071915">"This app has not posted any notifications"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Show unused categories"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Additional settings in the app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Show unused categories"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Hide unused categories"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps that can interrupt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Selected apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"None"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"All"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Select more apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Repeat callers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Allow repeat callers"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Change to alarms only for one hour until {time}}other{Change to alarms only for # hours until {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Change to always interrupt"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Add 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="warning_button_text" msgid="1274234338874005639">"Warning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Enable freeform windows"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Enable support for freeform windows."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Enable freeform windowing on second display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Enable freeform windows only on secondary display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in Multi-window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in Multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"This device\'s data partition needs to be converted to ext4 before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Activating the 16 KB option will require one more reboot after this. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then lock the bootloader, which factory resets the device. Once the device successfully boots into Android, disable OEM unlocking in Developer options. The device will be wiped and the filesystem will be changed to ext4 after confirmation. Once this completes, please come back to enable 16 KB again."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Erase all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Failed to reformat and wipe the data partition to ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader unlock required for 16 KB mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader unlock required"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"This device needs to have the bootloader unlocked before using the 16 KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. All user data and settings will be wiped when activating 16 KB mode. Once the bootloader is unlocked, activating the 16 KB option will require two reboots. Once you are in this mode, you can switch back and forth between 4 KB and 16 KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to Production mode, you would need to switch back to 4 KB mode and then OEM/bootloader lock (which factory resets) the device. Please unlock the bootloader and try again. You can see instructions for how to do this at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Using 4 KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"You are in the 4 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 lock the bootloader of the device. Tap to read more."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"You are in the 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Using 16 KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Tap to read more."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe device\', \'Lock bootloader\' and \'Force flash all partitions\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tap to read more."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use Developer options"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Allow user switch"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Customise"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Customise <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"A reboot is required to enable legacy freeform windowing support."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"A reboot is required to change freeform windowing support."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"A reboot is required to force freeform windowing on secondary displays."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reboot later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% left, %2$d%% right"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% right, %2$d%% left"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatical gender"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Select grammatical gender"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Search settings"</string>
</resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 2fed1f9..2fbc34c 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtime"</item>
+ <item msgid="4152450357280759894">"Driving"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Managed"</item>
+ <item msgid="601734478369121764">"Star"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Time"</item>
+ <item msgid="3653377604690057780">"Theater"</item>
+ <item msgid="3843711267408385410">"Flower"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 2df22db..3523375 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Disconnect device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Pair new device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatically turn on tomorrow"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hearing device settings"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, hearing aid compatibility"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"There are no presets programmed by your audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Couldn’t update preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"About audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On / # app has access to location}other{On / # apps have access to location}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Loading…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps with the Nearby devices permission can determine the relative position of connected devices."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps with the nearby devices permission can determine the relative position of connected devices."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Location access is off for apps and services. Your device location may still be sent to emergency responders when you call or text an emergency number."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Learn more about Location settings"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"To change go to ChromeOS Settings > Privacy and security > Privacy controls > Location access"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Face and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Face, fingerprint, and <xliff:g id="WATCH">%s</xliff:g> added"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Face, fingerprints, and <xliff:g id="WATCH">%s</xliff:g> added"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"This is needed since Identity Check is on"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator Unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Watch added"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Set up your watch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Learn more about Watch Unlock"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Add watch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remove watch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingerprint & Face Unlock"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Face & Fingerprint Unlock"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Face & Fingerprint Unlock for work"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Setup needed"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Face and fingerprints added"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830">""<b>"Install apps"</b>"\nInstall apps that you want to keep private in your space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Keep in mind"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169">""<b>"Apps stop when you lock your space"</b>"\nWhen you lock your space, apps in your space are stopped and you won’t receive notifications from them"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in permission manager, privacy dashboard, and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private spaces are not suitable for apps that need to run in the background or send critical notifications, such as medical apps. This is because notifications and background activity are stopped when your space is locked.\n\nApps in your private space won\'t appear in permission manager, privacy dashboard, and other settings when private space is locked.\n\nYour private space can\'t be restored to a new device. You’ll need to set up another space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs malicious apps on your device may be able to access your private space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Learn more about private space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"This will take a few moments"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setting up private space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Restart Device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detail NFC logging is intended for development purposes only. Additional NFC data is included in bug reports, which may contain private information. Restart your device to change this setting."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Use on-screen keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Keep it on screen while physical keyboard is active"</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="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="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="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 & tools"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Change pointer fill style to yellow"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Change pointer fill style to pink"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Change pointer fill style to blue"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pointer stroke style"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"White"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Black"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"None"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"User selected: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Speech"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pointer speed"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Pointer scale"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Decrease pointer scale"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Increase pointer scale"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirect vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continue anyway"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancel"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger panning"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Move magnifier with 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Drag 1 finger to move around the screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Move the magnification area by dragging one finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Move the magnification area by dragging two fingers."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Unavailable while only magnifying part of the screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tap a button to zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Quickly zoom in on the screen to make content larger"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> <b>To zoom in temporarily:</b><br/> {0,number,integer}. Make sure your magnification type is set to full screen<br/> {1,number,integer}. Use shortcut to start magnification<br/> {2,number,integer}. Touch & hold anywhere on the screen<br/> {3,number,integer}. Drag finger to move around screen<br/> {4,number,integer}. Lift finger to stop magnification"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>To zoom in:</b><br/> {0,number,integer}. Use shortcut to start magnification<br/> {1,number,integer}. Tap the screen<br/> {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/> {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/> {4,number,integer}. Use shortcut to stop magnification<br/><br/> You can also zoom in temporarily and more."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"To zoom"</b>", start magnification, then tap anywhere on the screen.\n"<ul>""<li>"Drag 2 or more fingers to scroll"</li>"\n"<li>"Pinch 2 or more fingers to adjust zoom"</li>""</ul>"\n\n"<b>"To zoom temporarily"</b>", start magnification, then touch & hold anywhere on the screen.\n"<ul>""<li>"Drag to move around the screen"</li>"\n"<li>"Lift finger to zoom out"</li>""</ul>"\n\nYou can’t zoom in on the keyboard or navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Accessibility button shortcut"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Priority Modes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Add a mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Select activation type"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Time"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Ex. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Ex. \"Personal calendar\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Create a mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Turn on Do Not Disturb"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarms and media sounds can interrupt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schedules"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Delete schedules"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Delete \"<xliff:g id="MODE">%1$s</xliff:g>\" mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schedules"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schedule"</string>
@@ -3340,6 +3379,7 @@
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Set a schedule"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schedule"</string>
<string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> hr, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Turn on automatically"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schedule"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silence phone at certain times"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Set Do Not Disturb rules"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Allow interruptions that make sound"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Block visual disturbances"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Allow visual signals"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications that can reach you"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Stay focused"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Additional actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off / 1 mode can turn on automatically}other{Off / # modes can turn on automatically}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Display settings"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Display options"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grayscale"</string>
@@ -3366,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"enable dark theme"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Switch the OS and apps to prefer light text on a dark background, which may be easier on the eyes and confers significant battery savings on some devices"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} and {effect_2}}=3{{effect_1}, {effect_2}, and {effect_3}}other{{effect_1}, {effect_2}, and # more}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No interruptions are filtered"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Display options for filtered notifications"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"When Do Not Disturb is on"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"No sound from notifications"</string>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"open notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Allow notification snoozing"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot on app icon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Notification bundles"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bubble this conversation"</string>
@@ -3610,9 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"This app doesn’t support enhanced settings"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"More settings"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"More settings are available inside this app"</string>
- <string name="notification_polite_title" msgid="4737150709382859870">"Adaptive Notifications"</string>
- <string name="notification_polite_main_control_title" msgid="7267191551379543859">"Use adaptive notifications"</string>
- <string name="notification_polite_description" msgid="7749280535620291610">"When you get many notifications within a short time, your phone will lower volume and minimize pop-ups on screen for up to two minutes. Calls, alarms, and priority conversations still vibrate, make a sound, or show up on the screen, and all notifications are easy to find when you pull down from the top of the screen."</string>
+ <string name="notification_polite_title" msgid="6121016426991791557">"Notification cooldown"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Use notification cooldown"</string>
+ <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="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
@@ -3659,6 +3703,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Other"</string>
<string name="no_channels" msgid="4716199078612071915">"This app has not posted any notifications"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Show unused categories"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Additional settings in the app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Show unused categories"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Hide unused categories"</string>
@@ -3767,7 +3812,10 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps that can interrupt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Selected apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"None"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"All"</string>
+ <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_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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Select more apps"</string>
@@ -3785,6 +3833,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Repeat callers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Allow repeat callers"</string>
@@ -3804,9 +3854,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Change to alarms only for one hour until {time}}other{Change to alarms only for # hours until {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Change to alarms only until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Change to always interrupt"</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"Rename"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"Change icon"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"Change icon"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Add 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="warning_button_text" msgid="1274234338874005639">"Warning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Close"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send feedback about this device"</string>
@@ -4792,8 +4843,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Battery"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Settings Panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode on secondary displays"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Enable freeform windows"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Enable support for freeform windows."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Enable freeform windowing on second display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Enable freeform windows only on secondary display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Enable non-resizable in multi window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Allows non-resizable apps to be in multi window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Override force-dark"</string>
@@ -4861,14 +4914,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"This device’s data partition needs to be converted to ext4 before using the 16KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. Activating the 16KB option will require one more reboot after this. Once you are in this mode, you can switch back and forth between 4KB and 16KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to production mode, you would need to switch back to 4KB mode and then lock the bootloader, which factory resets the device. After the device successfully boots into Android, disable OEM unlocking in Developer options. The device will be wiped and the filesystem will be changed to ext4 after confirmation. After this completes, please come back to enable 16KB again."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Erase all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Failed to reformat and wipe the data partition to ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader Unlock Required for 16KB Mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader Unlock Required"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"This device needs to have the bootloader unlocked before using the 16KB developer option. Software integrity cannot be guaranteed in this mode, and any data stored on the phone while the bootloader is unlocked may be at risk. All user data and settings will be wiped when activating 16KB mode. Once the bootloader is unlocked, activating the 16KB option will require two reboots. Once you are in this mode, you can switch back and forth between 4KB and 16KB mode with a single reboot. Some features will be disabled in these modes, so some applications may not work. To return the device to production mode, you would need to switch back to 4KB mode and then OEM/bootloader lock (which factory resets) the device. Please unlock the bootloader and try again. You can see instructions for how to do this at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Using 4KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"You are in the 4KB 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 lock the bootloader of the device. Tap to read more."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"You are in the 4KB 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe Device\', \'Lock Bootloader\' and \'Force Flash all partitions\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Using 16KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 4K mode and then lock the bootloader of the device. Tap to read more."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> and select \'Wipe Device\', \'Lock Bootloader\' and \'Force Flash all partitions\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tap to read more."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Bug report handler"</string>
@@ -5000,7 +5053,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Use app pinning"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Use developer options"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Use print service"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Allow multiple users"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Allow user switch"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Use wireless debugging"</string>
@@ -5114,8 +5167,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choose what you’ll see on your screen when your tablet is docked. Your device may use more energy when a screen saver is used."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Customize"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Customize <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A reboot is required to enable freeform support."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"A reboot is required to force desktop mode on secondary displays."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"A reboot is required to enable legacy freeform windowing support."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"A reboot is required to change freeform windowing support."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"A reboot is required to force freeform windowing on secondary displays."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reboot now"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reboot later"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial Audio"</string>
@@ -5233,6 +5287,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% left, %2$d%% right"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% right, %2$d%% left"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatical gender"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Select Grammatical gender"</string>
@@ -5344,4 +5400,5 @@
<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="homepage_search" msgid="6759334912284663559">"Search Settings"</string>
</resources>
diff --git a/res/values-es-feminine/strings.xml b/res/values-es-feminine/strings.xml
new file mode 100644
index 0000000..74422ea
--- /dev/null
+++ b/res/values-es-feminine/strings.xml
@@ -0,0 +1,22 @@
+<?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>
+</resources>
diff --git a/res/values-es-masculine/strings.xml b/res/values-es-masculine/strings.xml
new file mode 100644
index 0000000..c51039a
--- /dev/null
+++ b/res/values-es-masculine/strings.xml
@@ -0,0 +1,22 @@
+<?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>
+</resources>
diff --git a/res/values-es-neuter/strings.xml b/res/values-es-neuter/strings.xml
new file mode 100644
index 0000000..7d39b24
--- /dev/null
+++ b/res/values-es-neuter/strings.xml
@@ -0,0 +1,22 @@
+<?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>
+</resources>
diff --git a/res/values-es-rUS-feminine/strings.xml b/res/values-es-rUS-feminine/strings.xml
new file mode 100644
index 0000000..220e78c
--- /dev/null
+++ b/res/values-es-rUS-feminine/strings.xml
@@ -0,0 +1,26 @@
+<?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="guest_category_title" msgid="5562663588315329152">"Invitada (tú)"</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 0000000..dc69848
--- /dev/null
+++ b/res/values-es-rUS-masculine/strings.xml
@@ -0,0 +1,26 @@
+<?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="guest_category_title" msgid="5562663588315329152">"Invitado (tú)"</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 0000000..12d564c
--- /dev/null
+++ b/res/values-es-rUS-neuter/strings.xml
@@ -0,0 +1,26 @@
+<?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">"¡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 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="guest_category_title" msgid="5562663588315329152">"Invitado (tú)"</string>
+</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index d22996d..baae36a 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -372,10 +372,10 @@
<item msgid="2397017538263427575">"Manual"</item>
</string-array>
<string-array name="vpn_states">
- <item msgid="2262719249581510939">"Desconectado"</item>
+ <item msgid="2262719249581510939">"Desconectada"</item>
<item msgid="9141074028293812365">"Iniciando..."</item>
<item msgid="2234425878608626285">"Conectando..."</item>
- <item msgid="27547778933579155">"Conectado"</item>
+ <item msgid="27547778933579155">"Conectada"</item>
<item msgid="893506841727300393">"Tiempo de espera agotado"</item>
<item msgid="2974952010554140659">"Incorrecta"</item>
</string-array>
@@ -429,7 +429,7 @@
</string-array>
<string-array name="autofill_logging_level_entries">
<item msgid="2263571982739726576">"Desactivado"</item>
- <item msgid="4295717421282345505">"Depurado"</item>
+ <item msgid="4295717421282345505">"Depuración"</item>
<item msgid="8657797891533816070">"Detallado"</item>
</string-array>
<string-array name="cdma_system_select_choices">
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de dormir"</item>
+ <item msgid="4152450357280759894">"Mientras se conduce"</item>
+ <item msgid="7096549258219399423">"Inmersivo"</item>
+ <item msgid="2760716776980432977">"Administrado"</item>
+ <item msgid="601734478369121764">"Estrella"</item>
+ <item msgid="6243809315432780521">"Calendario"</item>
+ <item msgid="4913577903148415331">"Hora"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a7eda34..8a131c2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -24,9 +24,9 @@
<string name="confirmation_turn_on" msgid="2979094011928347665">"Activar"</string>
<string name="device_info_default" msgid="1406619232867343310">"Desconocido"</string>
<string name="device_info_protected_single_press" msgid="3810785480060743677">"Presiona para obtener más información"</string>
- <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_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">"¡Ya eres desarrollador!"</string>
- <string name="show_dev_already" msgid="7041756429707644630">"No es necesario, ya eres desarrollador."</string>
+ <string name="show_dev_already" msgid="7041756429707644630">"No es necesario. Ya eres desarrollador."</string>
<string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Primero habilita las opciones para programador."</string>
<string name="dev_settings_available_to_admin_only_warning" msgid="3408243404879083111">"Solo los usuarios administradores pueden acceder a la configuración para desarrolladores."</string>
<string name="header_category_system" msgid="1665516346845259058">"Sistema"</string>
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"¿Desconectar dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincular dispositivo nuevo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar automáticamente mañana"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Configuración de dispositivos auditivos"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Acceso directo, compatibilidad con audífonos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Ajuste predeterminado"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Tu audiólogo no programó ningún ajuste predeterminado"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"No se pudo actualizar el ajuste predeterminado"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Salida de audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Info. sobre salida de audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivada"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activada: # app tiene acceso a la ubicación}other{Activada: # apps tienen acceso a la ubicación}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Cargando…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Las apps que tienen el permiso de dispositivos cercanos pueden determinar la posición relativa de los dispositivos conectados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Las apps que tienen el permiso de dispositivos cercanos pueden determinar la posición relativa de los dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"El acceso a la ubicación está desactivado para las apps y los servicios. Todavía se puede enviar la ubicación del dispositivo a los servicios de emergencia cuando llamas o mandas un mensaje a un número de emergencia."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Más información sobre la configuración de la ubicación"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para cambiar, ve a la configuración de ChromeOS > Privacidad y seguridad > Controles de privacidad > Acceso a la ubicación"</string>
@@ -370,7 +370,7 @@
<string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa tus huellas dactilares"</string>
<string name="security_settings_fingerprint_settings_footer_learn_more" msgid="2508322993726483601">"Más información sobre Desbloqueo con huellas dactilares"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Tú tienes el control"</string>
- <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"Tanto tú como tu hijo tienen el control"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1" msgid="1122676690472680734">"Tanto tú como tu hijo o hija tienen el control"</string>
<string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Para tener en cuenta"</string>
<string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Usa tu huella dactilar para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella dactilar para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
@@ -399,7 +399,7 @@
<string name="biometric_settings_use_face_fingerprint_or_watch_preference_summary" msgid="188805113048792007">"Con rostro, huella dactilar o reloj"</string>
<string name="biometric_settings_use_watch_preference_summary" msgid="2311453276747908475">"Con reloj"</string>
<string name="security_settings_activeunlock_require_face_fingerprint_setup_title" msgid="8776904312629209685">"Primero configura Desbloqueo facial o con huellas dactilares"</string>
- <string name="security_settings_activeunlock_require_face_fingerprint_setup_message" msgid="1669326067732567911">"Puedes usar el reloj para desbloquear el dispositivo cuando no se reconozcan tu rostro ni tu huella dactilar."</string>
+ <string name="security_settings_activeunlock_require_face_fingerprint_setup_message" msgid="1669326067732567911">"Puedes desbloquear con el reloj cuando no se reconozcan tu rostro ni tu huella dactilar"</string>
<string name="security_settings_activeunlock_require_fingerprint_setup_title" msgid="6703703635881050623">"Primero configura Desbloqueo con huellas dactilares"</string>
<string name="security_settings_activeunlock_require_fingerprint_setup_message" msgid="4966813766409918392">"Puedes desbloquear con el reloj cuando no se reconozca tu huella dactilar"</string>
<string name="security_settings_activeunlock_require_face_setup_title" msgid="1428795376597739880">"Primero configura Desbloqueo facial"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Rostro y <xliff:g id="WATCH">%s</xliff:g> agregados"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Rostro, huella dactilar y <xliff:g id="WATCH">%s</xliff:g> agregados"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Rostro, huellas dactilares y <xliff:g id="WATCH">%s</xliff:g> agregados"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Esta acción es necesaria porque Identity Check está activada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Authenticator Unlock remoto"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Se agregó el reloj"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configura el reloj"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Más información sobre Desbloqueo del reloj"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Agregar reloj"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Quitar reloj"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Desbloqueo facial y con huellas dactilares"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueo facial y con huellas dactilares"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueo facial y con huellas dactilares para el trabajo"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Se requiere configuración"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Se agregaron huellas dactilares y el rostro"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instala apps"</b>\n"Instala apps que quieres mantener privadas en tu espacio"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Importante"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Las apps se detienen cuando bloqueas tu espacio"</b>\n"Cuando bloquees tu espacio, las apps en él se detendrán, y no recibirás notificaciones de ellas"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"No se recomienda el uso de espacios privados para apps que necesitan ejecutarse en segundo plano o enviar notificaciones críticas, como apps médicas. Esto se debe a que las notificaciones y la actividad en segundo plano se detienen cuando el espacio está bloqueado.\n\nLas apps del espacio privado no se mostrarán en el Administrador de permisos, el Panel de privacidad ni en otras secciones de configuración cuando el espacio privado esté bloqueado.\n\nNo se puede transferir el espacio privado a un dispositivo nuevo. Deberás configurar un espacio privado nuevo si quieres usar la función en otro dispositivo.\n\nCualquier persona que conecte tu dispositivo a una computadora o le instale apps dañinas podría acceder a tu espacio privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"No se recomienda el uso de espacios privados para apps que necesitan ejecutarse en segundo plano o enviar notificaciones críticas, como apps médicas. Esto se debe a que las notificaciones y la actividad en segundo plano se detienen cuando el espacio está bloqueado.\n\nLas apps del espacio privado no se mostrarán en el Administrador de permisos, el Panel de privacidad ni en otras secciones de configuración cuando el espacio privado esté bloqueado.\n\nNo se puede restablecer el espacio privado en un dispositivo nuevo. Deberás configurar otro espacio si quieres usarlo en otro dispositivo.\n\nCualquier persona que conecte tu dispositivo a una computadora o le instale apps maliciosas podría acceder a tu espacio privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Más información sobre el espacio privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"El proceso tardará unos minutos"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando espacio privado…"</string>
@@ -777,7 +776,7 @@
<string name="lock_last_pin_attempt_before_wipe_profile" msgid="7086428013814722436">"Si ingresas un PIN incorrecto en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
<string name="lock_last_password_attempt_before_wipe_profile" msgid="253673907244112643">"Si ingresas una contraseña incorrecta en el próximo intento, se borrarán tu perfil de trabajo y sus datos"</string>
<string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{Debe tener al menos # carácter}other{Debe tener al menos # caracteres}}"</string>
- <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Si solo se usan números, debe ser de al menos 1 dígito}other{Si solo se usan números, deben ser de al menos # dígitos}}"</string>
+ <string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Si solo se usan números, debe ser de al menos 1 dígito}other{Si solo se usan números, debe ser de al menos # dígitos}}"</string>
<string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{El PIN debe tener al menos # dígito}other{El PIN debe tener al menos # dígitos}}"</string>
<string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{El PIN debe tener al menos # dígito, pero se recomienda un PIN de {minAutoConfirmLen} dígitos para mayor seguridad}other{El PIN debe tener al menos # dígitos, pero se recomienda un PIN de {minAutoConfirmLen} dígitos para mayor seguridad}}"</string>
<string name="lockpassword_password_too_long" msgid="1940345313260498308">"{count,plural, =1{Debe tener menos de # carácter}other{Debe tener menos de # caracteres}}"</string>
@@ -790,7 +789,7 @@
<string name="lockpassword_password_requires_numeric" msgid="3886918493600507548">"{count,plural, =1{Debe tener al menos 1 dígito numérico}other{Debe tener al menos # dígitos numéricos}}"</string>
<string name="lockpassword_password_requires_symbols" msgid="2904870551002210131">"{count,plural, =1{Debe tener al menos 1 símbolo especial}other{Debe tener al menos # símbolos especiales}}"</string>
<string name="lockpassword_password_requires_nonletter" msgid="1185342065898300006">"{count,plural, =1{Debe tener al menos 1 carácter que no sea una letra}other{Debe tener al menos # caracteres que no sean letras}}"</string>
- <string name="lockpassword_password_requires_nonnumerical" msgid="389687423482993365">"{count,plural, =1{Debe tener al menos 1 carácter no numérico}other{Debe tener al menos # caracteres no numéricos}}"</string>
+ <string name="lockpassword_password_requires_nonnumerical" msgid="389687423482993365">"{count,plural, =1{Debe tener al menos 1 carácter no numérico}other{Debe tener al menos # de caracteres no numéricos}}"</string>
<string name="lockpassword_password_recently_used" msgid="5341218079730167191">"El administrador del dispositivo no permite el uso de contraseñas recientes"</string>
<string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No se permiten secuencias de dígitos ascendentes, descendentes ni repetidas"</string>
<string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"¿Quieres reiniciar el dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"El registro detallado de NFC está destinado únicamente a fines de desarrollo. Se incluyen datos de NFC adicionales en los informes de errores, que podrían contener información privada. Reinicia el dispositivo para cambiar la configuración."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"duplicar, pantalla externa, pantalla conectada, pantalla USB, resolución, rotación"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotación"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Estándar"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1187,11 +1201,12 @@
<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>
- <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
+ <string name="color_mode_option_boosted" msgid="4698797857766774289">"Potenciado"</string>
<string name="color_mode_option_saturated" msgid="3413853820158447300">"Saturados"</string>
<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>
@@ -1264,7 +1279,7 @@
<string name="screen_timeout_summary" msgid="5558778019594643427">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"No establecido"</string>
<string name="wallpaper_settings_title" msgid="5635129851136006383">"Fondo de pantalla"</string>
- <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Fondo de pantalla y estilo"</string>
+ <string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"Estilo y fondo de pantalla"</string>
<string name="wallpaper_dashboard_summary" msgid="2324472863981057118">"Pantalla principal, pantalla de bloqueo"</string>
<string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Cambiar fondo de pantalla"</string>
<string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Personalizar tu pantalla"</string>
@@ -1410,10 +1425,10 @@
<string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formateando dispositivo (<xliff:g id="NAME">^1</xliff:g>)…"</string>
<string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"No extraigas <xliff:g id="NAME">^1</xliff:g> durante el proceso de formateo."</string>
<string name="storage_wizard_ready_title" msgid="3631022511474086605">"Formateo de <xliff:g id="NAME">^1</xliff:g>"</string>
- <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g>"</string>
+ <string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g> y los datos relacionados al dispositivo <xliff:g id="NAME_0">^2</xliff:g> solo demorará un momento. Hasta que no se complete la transferencia, no podrás usar la aplicación. \n\nNo extraigas el dispositivo <xliff:g id="NAME_1">^2</xliff:g> durante el proceso."</string>
<string name="storage_wizard_move_unlock" msgid="14651384927767749">"Para transferir datos, debes desbloquear al usuario <xliff:g id="APP">^1</xliff:g>."</string>
- <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Transfiriendo la aplicación <xliff:g id="APP">^1</xliff:g>…"</string>
+ <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Transfiriendo <xliff:g id="APP">^1</xliff:g>…"</string>
<string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Durante el proceso, no extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> estará disponible en este dispositivo cuando se complete el proceso."</string>
<string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"¿Cómo usarás <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"O bien"</string>
@@ -1423,7 +1438,7 @@
<string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"Configurar más tarde"</string>
<string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"¿Quieres formatear <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"Debes formatear <xliff:g id="NAME_0">^1</xliff:g> para poder almacenar apps, archivos y contenido multimedia. \n\nEl formateo borrará todo el contenido existente en <xliff:g id="NAME_1">^2</xliff:g>. Para no perderlo, crea una copia de seguridad en otro dispositivo (como <xliff:g id="NAME_2">^3</xliff:g>)."</string>
- <string name="storage_wizard_format_confirm_v2_body_external" msgid="5810296966099830035">"Debe formatearse ste dispositivo (<xliff:g id="NAME_0">^1</xliff:g>) para almacenar fotos, videos, música y mucho más. \n\nCuando lo formatees, se borrará todo el contenido existente en <xliff:g id="NAME_1">^2</xliff:g>. Para no perder el contenido, crea una copia de seguridad en otro dispositivo (<xliff:g id="NAME_2">^3</xliff:g> u otros)."</string>
+ <string name="storage_wizard_format_confirm_v2_body_external" msgid="5810296966099830035">"Este dispositivo (<xliff:g id="NAME_0">^1</xliff:g>) debe formatearse para que pueda almacenar fotos, videos, música y mucho más. \n\nAl formatear, se borrará todo el contenido existente en la <xliff:g id="NAME_1">^2</xliff:g>. Para no perder el contenido, crea una copia de seguridad en una <xliff:g id="NAME_2">^3</xliff:g> distinta o en otro dispositivo."</string>
<string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"Formatear <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"¿Transferir el contenido a <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_migrate_v2_checklist" msgid="2618258869444553060">"Durante la transferencia:"</string>
@@ -1548,7 +1563,7 @@
<string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"USB, Bluetooth y Ethernet"</string>
<string name="tether_settings_summary_all" msgid="7565193614882005775">"Hotspot, USB, Bluetooth y Ethernet"</string>
<string name="tether_settings_summary_off" msgid="2526164899130351968">"No se comparte Internet con otros dispositivos"</string>
- <string name="tether_preference_summary_off" msgid="6266799346319794630">"Desactivados"</string>
+ <string name="tether_preference_summary_off" msgid="6266799346319794630">"No"</string>
<string name="usb_tethering_button_text" msgid="7364633823180913777">"Conexión mediante USB"</string>
<string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"Conexión Bluetooth"</string>
<string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión Ethernet"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Usar teclado en pantalla"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Mientras el teclado físico está activo"</string>
<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="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="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="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>
@@ -1920,7 +1935,7 @@
<string name="trackpad_touchpad_gesture_summary" msgid="6256074591395359124">"Personaliza los gestos de navegación del panel táctil"</string>
<string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"Invertir desplazamiento"</string>
<string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"El contenido sube cuando te desplazas hacia abajo"</string>
- <string name="trackpad_bottom_right_tap_title" msgid="6275428879042702880">"Toque en la parte inferior derecha"</string>
+ <string name="trackpad_bottom_right_tap_title" msgid="6275428879042702880">"Toque de la parte inferior derecha"</string>
<string name="trackpad_bottom_right_tap_summary" msgid="8734094086900680674">"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="pointer_fill_style" msgid="8413840032931637595">"Estilo de relleno del puntero"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Cambia estilo de relleno a amarillo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Cambia el estilo de relleno a rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Cambia el estilo de relleno a azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo de trazo del puntero"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Blanco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Negro"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ninguno"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Seleccionado por el usuario: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidad del puntero"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamaño del puntero"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Achicar el tamaño del puntero"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Agrandar el tamaño del puntero"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de juegos"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redireccionar vibración"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Enviar la vibración al controlador de juegos cuando esté conectado"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar de todos modos"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración de ampliación"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Desplazamiento con un dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mueve la lupa con 1 dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arrastra con 1 dedo para moverte por la pantalla"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Arrastrar un dedo para mover el área de ampliación."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Arrastrar dos dedos para mover el área de ampliación."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"No disponible mientras se amplía parte de la pantalla"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Presiona un botón para ampliar"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Acerca rápidamente la pantalla para que el contenido se muestre en un tamaño más grande"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para acercar, haz lo siguiente:</b><br/> {0,number,integer}. Usa la combinación para comenzar la ampliación.<br/> {1,number,integer}. Presiona la pantalla.<br/> {2,number,integer}. Arrastra 2 dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con 2 dedos para ajustar el zoom.<br/> {4,number,integer}. Usa la combinación para detener la ampliación.<br/><br/> <b>Para acercar de manera temporal, haz lo siguiente:</b><br/> {0,number,integer}. Asegúrate de que el tipo de ampliación esté configurado en pantalla completa.<br/> {1,number,integer}. Usa la combinación para comenzar la ampliación.<br/> {2,number,integer}. Mantén presionada cualquier parte de la pantalla.<br/> {3,number,integer}. Arrastra un dedo para moverte por la pantalla.<br/> {4,number,integer}. Levanta el dedo para detener la ampliación."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para acercar, haz lo siguiente:</b><br/> {0,number,integer}. Usa el atajo para comenzar la ampliación.<br/> {1,number,integer}. Presiona la pantalla.<br/> {2,number,integer}. Arrastra 2 dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con 2 dedos para ajustar el zoom.<br/> {4,number,integer}. Usa el atajo para detener la ampliación.<br/><br/> También puedes acercar temporalmente y realizar otras acciones."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para acercar, haz lo siguiente:</b><br/> {0,number,integer}. Usa el atajo para comenzar la ampliación.<br/> {1,number,integer}. Presiona la pantalla.<br/> {2,number,integer}. Arrastra con 1 o 2 dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con 2 dedos para ajustar el zoom.<br/> {4,number,integer}. Usa el atajo para detener la ampliación.<br/><br/> También puedes acercar temporalmente y realizar otras acciones."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Cuando la ampliación esté activada, podrás acercar el contenido en pantalla.\n\n"<b>"Para usar el zoom"</b>", inicia la ampliación y, luego, presiona cualquier parte de la pantalla.\n"<ul><li>"Arrastra 2 o más dedos para desplazarte."</li>\n<li>"Pellizca con 2 o más dedos para ajustar el zoom."</li></ul>\n\n<b>"Para hacer zoom de manera temporal"</b>", inicia la ampliación y, luego, mantén presionada cualquier parte de la pantalla.\n"<ul><li>"Arrastra el dedo para moverte por la pantalla."</li>\n<li>"Levanta el dedo para alejar el contenido."</li></ul>\n\n"No puedes acercar con el teclado ni en la barra de navegación."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Acceso directo al botón de accesibilidad"</string>
@@ -2307,7 +2332,7 @@
<string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"Vincula los audífonos"</string>
<string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"En la siguiente pantalla, presiona tus audífonos. Es posible que debas vincular el audífono izquierdo y el derecho por separado.\n\nAsegúrate de que los audífonos estén encendidos y listos para la vinculación."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> activo"</string>
- <string name="accessibility_hearingaid_left_side_device_summary" msgid="12349058624943107">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, solo izquierdo"</string>
+ <string name="accessibility_hearingaid_left_side_device_summary" msgid="12349058624943107">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, solo el izquierdo"</string>
<string name="accessibility_hearingaid_right_side_device_summary" msgid="8645789702686724188">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, solo derecho"</string>
<string name="accessibility_hearingaid_left_and_right_side_device_summary" msgid="3314103411842694197">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, izquierdo y derecho"</string>
<string name="accessibility_hearingaid_more_device_summary" msgid="8092641784056942546">"Más de 1 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
@@ -2567,7 +2592,7 @@
<string name="battery_usage_without_time" msgid="1346894834339420538"></string>
<string name="battery_usage_since_last_full_charge" msgid="3488425008925924769">"desde la última carga completa"</string>
<string name="battery_usage_system_apps" msgid="8659537819731575299">"Apps del sistema"</string>
- <string name="battery_usage_uninstalled_apps" msgid="8170405012552803662">"Apps desinstalada"</string>
+ <string name="battery_usage_uninstalled_apps" msgid="8170405012552803662">"Apps desinstaladas"</string>
<string name="battery_usage_others" msgid="311793281613609986">"Otros"</string>
<string name="estimated_time_left" msgid="948717045180211777">"Tiempo restante estimado"</string>
<string name="estimated_charging_time_left" msgid="2287135413363961246">"Para completar la carga"</string>
@@ -2920,8 +2945,8 @@
<string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar la VPN siempre activa?"</string>
<string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"Si activas esta opción de configuración, no tendrás conexión a Internet hasta que se conecte la VPN"</string>
<string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"Se reemplazará la VPN actual y no tendrás conexión a Internet hasta que se conecte la nueva VPN"</string>
- <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Ya estás conectado a una VPN siempre activa. Si te conectas a otra, se reemplazará la VPN actual y se desactivará el modo siempre activo."</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_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Ya estableciste conexión con una VPN siempre activa. Si te conectas a otra, se reemplazará la VPN actual y se desactivará el modo siempre activo."</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_turn_on" msgid="3568307071295211187">"Activar"</string>
<string name="vpn_cant_connect_title" msgid="5670787575925519386">"No se puede establecer conexión con <xliff:g id="VPN_NAME">%1$s</xliff:g>"</string>
<string name="vpn_cant_connect_message" msgid="2139148820719163694">"Esta app no es compatible con VPN siempre activada"</string>
@@ -2931,7 +2956,7 @@
<string name="vpn_menu_delete" msgid="4455966182219039928">"Borrar perfil"</string>
<string name="vpn_menu_lockdown" msgid="5284041663859541007">"VPN siempre activada"</string>
<string name="vpn_no_vpns_added" msgid="7387080769821533728">"No se agregó ninguna VPN"</string>
- <string name="vpn_always_on_summary" msgid="2171252372476858166">"Mantente siempre conectado a una VPN"</string>
+ <string name="vpn_always_on_summary" msgid="2171252372476858166">"Mantén siempre conexión a la VPN"</string>
<string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"La opción no es compatible con esta app"</string>
<string name="vpn_always_on_summary_active" msgid="175877594406330387">"Siempre activada"</string>
<string name="vpn_insecure_summary" msgid="4450920215186742859">"No es segura"</string>
@@ -2939,7 +2964,7 @@
<string name="vpn_require_connection_title" msgid="4186758487822779039">"¿Requerir una conexión VPN?"</string>
<string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"La VPN no es segura. Actualiza a una VPN IKEv2."</string>
<string name="vpn_start_unsupported" msgid="7139925503292269904">"No se pudo iniciar la VPN no compatible."</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="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="vpn_lockdown_none" msgid="455915403560910517">"Ninguna"</string>
<string name="vpn_lockdown_config_error" msgid="1992071316416371316">"La VPN siempre activada requiere una dirección IP tanto para el servidor como para el DNS."</string>
<string name="vpn_no_network" msgid="7187593680049843763">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
@@ -2975,8 +3000,8 @@
<string name="ssl_ca_cert_warning" msgid="3898387588657346106">"Es posible que la red esté supervisada"</string>
<string name="done_button" msgid="6269449526248267">"Listo"</string>
<string name="ssl_ca_cert_dialog_title" msgid="1032088078702042090">"{count,plural, =1{Confiar en el certificado o quitarlo}other{Confiar en los certificados o quitarlos}}"</string>
- <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} instaló una autoridad certificadora en tu dispositivo, lo que le permitirá supervisar la actividad de la red del dispositivo, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre este certificado, comunícate con tu administrador.}other{{orgName} instaló autoridades certificadoras en tu dispositivo, lo que le permitirá supervisar la actividad de la red del dispositivo, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre estos certificados, comunícate con tu administrador.}}"</string>
- <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} instaló una autoridad certificadora para tu perfil de trabajo, lo que le permitirá supervisar la actividad de la red laboral, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre este certificado, comunícate con tu administrador.}other{{orgName} instaló autoridades certificadoras para tu perfil de trabajo, lo que les permitirá supervisar la actividad de la red laboral, como los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre estos certificados, comunícate con tu administrador.}}"</string>
+ <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} instaló una autoridad certificadora en tu dispositivo, lo que le permitirá supervisar la actividad de red del dispositivo, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre este certificado, comunícate con tu administrador.}other{{orgName} instaló autoridades certificadoras en tu dispositivo, lo que le permitirá supervisar la actividad de red del dispositivo, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre estos certificados, comunícate con tu administrador.}}"</string>
+ <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} instaló una autoridad certificadora para tu perfil de trabajo, lo que le permitirá supervisar la actividad de red laboral, incluidos los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre este certificado, comunícate con tu administrador.}other{{orgName} instaló autoridades certificadoras para tu perfil de trabajo, lo que les permitirá supervisar la actividad de red laboral, como los correos electrónicos, las apps y los sitios web seguros.\n\nPara obtener más información sobre estos certificados, comunícate con tu administrador.}}"</string>
<string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tercero puede supervisar tu actividad en la red, incluido el correo electrónico, las aplicaciones y los sitios web seguros.\n\nEsto ocurre porque hay una credencial de confianza instalada en el dispositivo."</string>
<string name="ssl_ca_cert_settings_button" msgid="2044927302268394991">"{count,plural, =1{Revisar certificado}other{Revisar certificados}}"</string>
<string name="user_settings_title" msgid="9208831545558787202">"Usuarios"</string>
@@ -2991,11 +3016,11 @@
<string name="user_you" msgid="3070562015202859996">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
<string name="user_add_max_count" msgid="3328539978480663740">"No puedes agregar más usuarios. Quita alguno para agregar nuevos."</string>
<string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"Los perfiles restringidos no pueden agregar cuentas."</string>
- <string name="user_remove_user_menu" msgid="2183714948094429367">"Borrar a <xliff:g id="USER_NAME">%1$s</xliff:g> del disp."</string>
+ <string name="user_remove_user_menu" msgid="2183714948094429367">"Borrar a <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="user_lockscreen_settings" msgid="4596612658981942092">"Configuración de la pantalla de bloqueo"</string>
<string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Agregar usuarios desde la pantalla de bloqueo"</string>
<string name="switch_to_dock_user_when_docked" msgid="2324395443311905635">"Cambiar a usuario administrador cuando se conecte"</string>
- <string name="user_confirm_remove_self_title" msgid="926265330805361832">"¿Deseas borrarte a ti mismo?"</string>
+ <string name="user_confirm_remove_self_title" msgid="926265330805361832">"¿Quieres borrar tu perfil?"</string>
<string name="user_confirm_remove_title" msgid="3626559103278006002">"¿Borrar este usuario?"</string>
<string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"¿Eliminar este perfil?"</string>
<string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"¿Eliminar perfil de trabajo?"</string>
@@ -3320,16 +3345,30 @@
<string name="spatial_summary_on_two" msgid="4526919818832483883">"Sí (<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g> y <xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>)"</string>
<string name="spatial_audio_footer_title" msgid="8775010547623606088">"También puedes activar el audio espacial para dispositivos Bluetooth."</string>
<string name="spatial_audio_footer_learn_more_text" msgid="3826811708094366301">"Parámetros de configuración de dispositivos conectados"</string>
- <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{Se estableció 1 programa}other{Se establecieron # programas}}"</string>
+ <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{1 programa establecido}other{# programas establecidos}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"No interrumpir"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos de prioridad"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Agregar un modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Solo recibe notificaciones de las personas y apps que más te interesan"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Seleccionar tipo de activación"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Hora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"P. ej.: \"9:30 a.m.–5:00 p.m.\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendario"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"P. ej.: \"Calendario personal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crea un modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizado"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar las interrupciones"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar No interrumpir"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Los sonidos multimedia y las alarmas pueden interrumpir"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programaciones"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Borrar programas"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Borrar"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Cambiar nombre"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Borrar"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"¿Quieres borrar el modo \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programas"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programa"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Agrega un calendario"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Usa tu calendario"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programa"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Establecer un programa"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programa"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activar automáticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programa"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silenciar en ciertos momentos"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir reglas de No interrumpir"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Habilitar interrupciones con sonido"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear alteraciones visuales"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir señales visuales"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificaciones que puedes recibir"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Concéntrate"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Acciones adicionales"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desactivado}=1{Desactivado/se puede activar automáticamente 1 modo}other{Desactivado/se pueden activar automáticamente # modos}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Configuración de visualización"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opciones de visualización"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de grises"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"Habilitar el tema oscuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Cambia el SO y las apps para preferir el texto claro sobre un fondo oscuro, lo que puede ser más cómodo para los ojos y genera un ahorro de batería significativo en algunos dispositivos."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Sin cambios de visualización}=1{{effect_1}}=2{{effect_1} y {effect_2}}=3{{effect_1}, {effect_2} y {effect_3}}other{{effect_1}, {effect_2} y # más}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupciones"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No se filtran interrupciones"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opciones de visualización de notificaciones filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Cuando se activa No interrumpir"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificaciones sin sonido"</string>
@@ -3421,7 +3461,7 @@
<string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
<string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
<string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
- <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado/1 programa se puede activar automáticamente}other{Desactivado/# programas se pueden activar automáticamente}}"</string>
+ <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivada}=1{Desactivada/1 programa se puede activar automáticamente}other{Desactivada/# programas se pueden activar automáticamente}}"</string>
<string name="zen_category_behavior" msgid="3214056473947178507">"Pueden suspender el modo No interrumpir:"</string>
<string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
<string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"notificación abierta"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir posponer notificaciones"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Punto de notificación en ícono de app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paquetes de notificaciones"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbujas"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbujas"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostrar esta conversación en una burbuja"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Esta app no admite opciones de configuración mejoradas"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Más parámetros de configuración"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Puedes encontrar más parámetros de configuración disponibles dentro de esta app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Inactividad de notificaciones"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Otros"</string>
<string name="no_channels" msgid="4716199078612071915">"Esta app no publicó ninguna notificación"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorías sin usar"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Opciones de configuración adicionales de la app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorías sin usar"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorías sin usar"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps que pueden interrumpir"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Apps seleccionadas"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ninguna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todo"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Seleccionar más apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpir"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguna persona puede interrumpir"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpir"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Cualquier persona puede interrumpir"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Llamadas repetidas"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir llamadas repetidas de un mismo emisor"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Cambiar a solo alarmas durante una hora hasta la hora {time}}other{Cambiar a solo alarmas durante # horas hasta la hora {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambiar a solo alarmas hasta la(s) <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Cambiar a interrumpir siempre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Editar modo"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Agregar 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="warning_button_text" msgid="1274234338874005639">"Advertencia"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Cerrar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar comentarios sobre el dispositivo"</string>
@@ -3830,7 +3875,7 @@
<string name="app_pinning_intro" msgid="6409063008733004245">"Al fijar una app, esta se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue un juego específico."</string>
<string name="screen_pinning_description" msgid="5822120806426139396">"Si fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nPara usar la fijación de apps, haz lo siguiente: \n{0,number,integer}. Activa la fijación de apps. \n{1,number,integer}. Abre Recientes. \n{2,number,integer}. Presiona el ícono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
<string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"Si fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nSi quieres compartir tu dispositivo con alguien de forma segura, usa un perfil de invitado. \n\nPara usar la fijación de apps, haz lo siguiente: \n{0,number,integer}. Activa la fijación de apps. \n{1,number,integer}. Abre Recientes. \n{2,number,integer}. Presiona el ícono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
- <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Cuando fijas una app, puede ocurrir lo siguiente: \n\n• Esta podrá acceder a datos personales (como contactos y contenido de los correos electrónicos). \n• Es posible que las apps fijadas abran otras apps. \n\nUsa la función para fijar apps solo con personas de confianza.\n"</string>
+ <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Cuando fijas una app, puede ocurrir lo siguiente: \n\n• Esta podrá acceder a datos personales \n (como contactos y contenido de los correos electrónicos) \n• Es posible que la app fijada abra otras apps \n\nUsa la fijación de apps solo con personas de confianza."</string>
<string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Solicitar desbloqueo para quitar fijación"</string>
<string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Solicitar PIN para quitar fijación"</string>
<string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Solicitar contraseña para quitar fijación"</string>
@@ -4005,7 +4050,7 @@
<string name="free_memory" msgid="439783742246854785">"Libre(s)"</string>
<string name="memory_usage_apps" msgid="5776108502569850579">"Memoria que utilizan las aplicaciones"</string>
<string name="memory_usage_apps_summary" msgid="7168292864155527974">"{count,plural, =1{1 app usó la memoria en las últimas {time}}other{# apps usaron la memoria en las últimas {time}}}"</string>
- <string name="force_enable_pss_profiling_title" msgid="2253816522775341523">"Habilitar la gen. de per. de uso de mem."</string>
+ <string name="force_enable_pss_profiling_title" msgid="2253816522775341523">"Habilitar la generación de perfiles de uso de memoria"</string>
<string name="force_enable_pss_profiling_summary" msgid="7714294324548399136">"La generación de perfiles del uso de memoria requiere recursos de sistema adicionales."</string>
<string name="pss_profiling_disabled" msgid="1967278421143514850">"Se inhabilitó la generación de perfiles de memoria"</string>
<string name="running_frequency" msgid="7260225121706316639">"Frecuencia"</string>
@@ -4370,7 +4415,7 @@
<string name="enterprise_privacy_network_logs" msgid="3081744541193695887">"Registro de tráfico de red más reciente"</string>
<string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"Informe de errores más reciente"</string>
<string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Registro de seguridad más reciente"</string>
- <string name="enterprise_privacy_none" msgid="6026527690979756431">"Ninguno"</string>
+ <string name="enterprise_privacy_none" msgid="6026527690979756431">"Ninguna"</string>
<string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Apps instaladas"</string>
<string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"La cantidad de apps es aproximada. Es posible que no se cuenten las apps que no hayas instalado desde Play Store."</string>
<string name="enterprise_privacy_number_packages_lower_bound" msgid="5317634640873658149">"{count,plural, =1{Al menos # app}other{Al menos # apps}}"</string>
@@ -4696,7 +4741,7 @@
<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="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 estás conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</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>
<string name="see_more" msgid="7499355691042812723">"Ver más"</string>
<string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Quieres activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
<string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Quieres activar la SIM?"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Funda"</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="force_desktop_mode" msgid="1336913605091334238">"Forzar modo de escritorio"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Fuerza el modo de escritorio experimental en pantallas secundarias."</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Habilitar ventanas de formato libre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Habilitar la compatibilidad con las ventanas de formato libre"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Habilitar renderización libre en pant. secundaria"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Habilitar las ventanas de formato libre solo en la pantalla secundarias"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Habilitar apps que no cambian de tamaño en Multiventana"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que las apps que no cambian de tamaño aparezcan en Multiventana."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anular forzar el modo oscuro"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partición de datos del dispositivo debe convertirse a ext4 antes de usar la opción para desarrolladores de 16 KB. 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. Si activas la opción de 16 KB, deberás volver a reiniciar. Una vez que se habilite este modo, podrás cambiar entre los modos de 4 KB y 16 KB con un único reinicio. Algunas funciones quedan inhabilitadas en estos modos, así que algunas aplicaciones podrían no ejecutarse. Para revertir el dispositivo al modo de producción, debes volver al modo de 4 KB y bloquear el bootloader, lo que restablecerá la configuración del dispositivo. Una vez que el dispositivo se inicie correctamente ejecutando Android, inhabilita el desbloqueo para OEM en Opciones para desarrolladores. Después de la confirmación, se limpiará el dispositivo, y el sistema de archivos cambiará a ext4. Una vez que se complete el proceso, vuelve a habilitar nuevamente el modo de 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Borrar todos los datos"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"No se pudo volver a formatear el dispositivo y falló la limpieza de la partición de datos a ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Debes desbloquear el bootloader para usar el modo de 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Se requiere desbloquear el bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Este dispositivo debe tener el bootloader desbloqueado para poder usar la opción para desarrolladores de 16 KB. 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. Se limpiarán la configuración y los datos del usuario cuando se active el modo de 16 KB. Una vez que se desbloquee el bootloader, deberás reiniciar dos veces para activar la opción de 16 KB. Una vez que se habilite este modo, podrás cambiar entre los modos de 4 KB y 16 KB con un único reinicio. Algunas funciones quedan inhabilitadas en estos modos, así que algunas aplicaciones podrían no ejecutarse. Para revertir el dispositivo al modo de producción, debes volver al modo de 4 KB y bloquear el dispositivo con OEM/bootloader (lo que restablecerá la configuración de fábrica). Desbloquea el bootloader y vuelve a intentarlo. Puedes ver las instrucciones de este proceso en <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Modo independiente de la página de 4 KB en uso"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Estás en el modo de 4 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 bloquear el bootloader del dispositivo. Presiona para obtener más información."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Estás en el modo de 4 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 bloquear el bootloader del dispositivo. Se restablecerá la configuración de fábrica del dispositivo, que quedará en modo 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>, o bien usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Modo independiente de la página de 16 KB en uso"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Presiona para obtener más información."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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. Se restablecerá la configuración de fábrica del dispositivo, que quedará en modo 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>, o bien usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Presiona para obtener más información."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>, o bien usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Controlador de informes de errores"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar fijación de apps"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar opciones para desarrolladores"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar servicio de impresión"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir varios usuarios"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permite el cambio de usuario"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"permitir, varios, usuarios, habilitar, muchos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"múltiples, usuarios, perfiles, personas, cuentas, cambiar, muchos"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar depuración inalámbrica"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Elige lo que quieres ver en la pantalla cuando la tablet está conectada. Es posible que el dispositivo use más energía cuando se utiliza el protector de pantalla."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Se debe reiniciar para habilitar la asistencia de formato libre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Se debe reiniciar para forzar el modo de computadora en las pantallas secundarias."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Se debe reiniciar para habilitar la compatibilidad con la renderización heredada en ventanas de formato libre."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Se debe reiniciar para cambiar la compatibilidad de la renderización en ventanas de formato libre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Se debe reiniciar para forzar la renderización en ventanas de formato libre para pantallas secundarias."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar ahora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar más adelante"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio espacial"</string>
@@ -5197,7 +5245,7 @@
<string name="accessibility_fingerprint_label" msgid="5017431423168191733">"Sensor de huellas dactilares"</string>
<string name="flash_notifications_title" msgid="4490438861180492311">"Notificaciones con flash"</string>
<string name="flash_notifications_about_title" msgid="9004351252928121214">"Info. sobre notificaciones con flash"</string>
- <string name="flash_notifications_summary_off" msgid="6056282996770691461">"Desactivadas"</string>
+ <string name="flash_notifications_summary_off" msgid="6056282996770691461">"No"</string>
<string name="flash_notifications_summary_on_camera" msgid="3286405833586333730">"Activado / Flash de la cámara"</string>
<string name="flash_notifications_summary_on_screen" msgid="9040640799633336219">"Activadas: Flash de la pantalla"</string>
<string name="flash_notifications_summary_on_camera_and_screen" msgid="2326268141063768701">"Activadas: Flash de la cámara y pantalla"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Activadas"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desactivado"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Activado"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio: %1$d%% izquierda, %2$d%% derecha"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio: %1$d%% derecha, %2$d%% izquierda"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"El nombre de tu dispositivo es visible para las apps instaladas. Es posible que también lo vean otras personas cuando te conectes a dispositivos Bluetooth o a una red Wi-Fi, o cuando configures un hotspot de Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Género gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecciona un género gramatical"</string>
@@ -5272,7 +5322,7 @@
<string name="audio_sharing_stream_settings_title" msgid="1374391898689242036">"Configuración de la reproducción de audio"</string>
<string name="audio_sharing_stream_name_title" msgid="8156859441897180940">"Nombre"</string>
<string name="audio_sharing_stream_password_title" msgid="7026649168165764602">"Contraseña"</string>
- <string name="audio_sharing_stream_compatibility_title" msgid="5690947186724469918">"Mejorar la compatibilidad"</string>
+ <string name="audio_sharing_stream_compatibility_title" msgid="5690947186724469918">"Mejorar compatibilidad"</string>
<string name="audio_sharing_stream_compatibility_description" msgid="8170241188606110963">"Ayuda a algunos dispositivos, como audífonos, a conectarse reduciendo la calidad de audio"</string>
<string name="audio_sharing_stream_compatibility_disabled_description" msgid="2586408353546825682">"Desactiva el uso compartido de audio para configurar la compatibilidad"</string>
<string name="audio_sharing_nearby_audio_title" msgid="4795438407040677177">"Escucha audio cercano"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Buscar en Configuración"</string>
</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index d236131..186e414 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Descanso"</item>
+ <item msgid="4152450357280759894">"En coche"</item>
+ <item msgid="7096549258219399423">"Inmersivo"</item>
+ <item msgid="2760716776980432977">"Gestionado"</item>
+ <item msgid="601734478369121764">"Estrella"</item>
+ <item msgid="6243809315432780521">"Calendario"</item>
+ <item msgid="4913577903148415331">"Hora"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3fc067a..d0f7b8d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -25,7 +25,7 @@
<string name="device_info_default" msgid="1406619232867343310">"Desconocido"</string>
<string name="device_info_protected_single_press" msgid="3810785480060743677">"Toca para que se muestre la información"</string>
<string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{Te queda # paso para habilitar las opciones para desarrolladores.}other{Te quedan # pasos para habilitar las opciones para desarrolladores.}}"</string>
- <string name="show_dev_on" msgid="2840850085134853754">"¡Ahora están activadas las opciones para desarrolladores!"</string>
+ <string name="show_dev_on" msgid="2840850085134853754">"¡Ya eres desarrollador!"</string>
<string name="show_dev_already" msgid="7041756429707644630">"Las opciones para desarrolladores ya están activadas."</string>
<string name="dev_settings_disabled_warning" msgid="6971867026249671244">"Habilita primero las opciones para desarrolladores."</string>
<string name="dev_settings_available_to_admin_only_warning" msgid="3408243404879083111">"Solo los usuarios administradores pueden acceder a los ajustes para desarrolladores."</string>
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"¿Desconectar dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Emparejar nuevo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar automáticamente mañana"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Ajustes de audífonos"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Acceso directo, compatibilidad con audífonos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preajuste"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Tu audiólogo no ha programado ningún preajuste"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"No se ha podido actualizar el preajuste"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Salida de audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Acerca de la salida de audio"</string>
@@ -277,13 +277,13 @@
<string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> después de agotarse el tiempo de espera de la pantalla, salvo si <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mantiene el dispositivo desbloqueado"</string>
<string name="owner_info_settings_title" msgid="3555626140700093017">"Añadir texto a pantalla de bloqueo"</string>
<string name="owner_info_settings_summary" msgid="347238313388083297">"Ninguno"</string>
- <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"p. ej., Android de Juan"</string>
+ <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"P. ej., Android de Juan."</string>
<string name="location_settings_title" msgid="8375074508036087178">"Ubicación"</string>
<string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar ubicación"</string>
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivado"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activada: # aplicación tiene acceso a la ubicación}other{Activada: # aplicaciones tienen acceso a la ubicación}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Cargando…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Las aplicaciones que tengan permiso para detectar dispositivos cercanos pueden determinar la posición relativa de los dispositivos conectados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Las aplicaciones que tengan permiso para detectar dispositivos cercanos podrán determinar la posición relativa de los dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Las aplicaciones y los servicios no pueden acceder a la ubicación. Aun así, quizá se envíe la ubicación del dispositivo a los servicios de emergencia cuando llames o envíes mensajes a números de emergencia."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Más información sobre los ajustes de ubicación"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para cambiarlo, ve a Ajustes de ChromeOS > Privacidad y seguridad > Controles de privacidad > Acceso a la ubicación"</string>
@@ -382,7 +382,7 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Importante"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"Cómo funciona"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Desbloqueo con huella digital crea un modelo único de tu huella digital para verificar que eres tú. Para crear este modelo durante la configuración, se toman imágenes de tu huella en diferentes posiciones."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Desbloqueo con huella digital crea un modelo único de la huella digital de tu hijo/a para verificar que es él/ella. Para crear este modelo de huella digital durante la configuración, se toman imágenes de su huella desde diferentes posiciones."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"Desbloqueo con Huella Digital crea un modelo único de la huella digital de tu hijo/a para verificar su identidad. Para crear este modelo de huella digital durante la configuración, se toman imágenes de su huella desde diferentes posiciones."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"Para obtener mejores resultados, usa un protector de pantalla con certificado Made for Google. Con otros protectores de pantalla, puede que tu huella digital no funcione."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"Para obtener mejores resultados, usa un protector de pantalla con certificado Made for Google. Con otros protectores de pantalla, puede que la huella digital de tu hijo/a no funcione."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Cara y <xliff:g id="WATCH">%s</xliff:g> añadidos"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Cara, huella digital y <xliff:g id="WATCH">%s</xliff:g> añadidos"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Cara, huellas digitales y <xliff:g id="WATCH">%s</xliff:g> añadidos"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Es necesario hacerlo porque la comprobación de la identidad está activada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueo con Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Smartwatch añadido"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurar un reloj"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Más información sobre Desbloqueo con reloj"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Añadir reloj"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Quitar reloj"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Desbloqueo facial y con huella digital"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueo facial y con huella digital"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueo facial y con huella digital para el trabajo"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Hay que configurarlo"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Cara y huellas digitales añadidas"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instala aplicaciones"</b>\n"Instala en tu espacio las aplicaciones que quieras mantener en privado"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Importante"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Las aplicaciones se detienen cuando bloqueas tu espacio"</b>\n"Al bloquear tu espacio, las aplicaciones de tu espacio privado se detienen y no recibirás sus notificaciones"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Los espacios privados no son adecuados para aplicaciones que deban ejecutarse en segundo plano o enviar notificaciones críticas, como las aplicaciones médicas. Esto se debe a que las notificaciones y la actividad en segundo plano se detienen cuando tu espacio está bloqueado.\n\nLas aplicaciones de tu espacio privado no aparecerán en el Gestor de permisos, en el panel de privacidad ni en otros ajustes cuando tu espacio privado esté bloqueado.\n\nTu espacio privado no puede trasladarse a otro dispositivo. Deberás configurar otro espacio privado si quieres usarlo en otro dispositivo.\n\nCualquier persona que conecte tu dispositivo a un ordenador o instale aplicaciones dañinas en tu dispositivo podría acceder a tu espacio privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Los espacios privados no son adecuados para aplicaciones que deban ejecutarse en segundo plano o enviar notificaciones críticas, como las aplicaciones médicas. Esto se debe a que las notificaciones y la actividad en segundo plano se detienen cuando tu espacio está bloqueado.\n\nLas aplicaciones de tu espacio privado no aparecerán en el Gestor de permisos, en el panel de privacidad ni en otros ajustes cuando tu espacio privado esté bloqueado.\n\nTu espacio privado no se puede restaurar en otro dispositivo. Deberás configurar otro espacio si quieres usarlo en otro dispositivo.\n\nCualquier persona que conecte tu dispositivo a un ordenador o instale aplicaciones maliciosas en tu dispositivo podría acceder a tu espacio privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Más información sobre el espacio privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Tardará un momento"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando espacio privado…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"¿Reiniciar dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"El registro detallado de NFC solo se usa para fines de desarrollo. Además, se incluyen datos adicionales de NFC en los informes de errores, que pueden contener información privada. Reinicia tu dispositivo para cambiar este ajuste."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"proyectar, pantalla externa, pantallas conectadas, pantalla usb, resolución, rotación"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotación"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Estándar"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -975,7 +989,7 @@
<string name="wifi_dpp_scan_qr_code" msgid="3543923817779444434">"Escanea el código QR"</string>
<string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el código QR de abajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea el código QR para conectarte a la red Wi‑Fi"</string>
- <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
+ <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi-Fi"</string>
<string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
<string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, ponte en contacto con el fabricante del dispositivo"</string>
@@ -1187,11 +1201,12 @@
<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>
- <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
+ <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorado"</string>
<string name="color_mode_option_saturated" msgid="3413853820158447300">"Saturados"</string>
- <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptativos"</string>
+ <string name="color_mode_option_automatic" msgid="2281217686509980870">"Adaptativo"</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>
@@ -1853,7 +1868,7 @@
<string name="running_processes_header_cached_prefix" msgid="839132595831993521">"En caché"</string>
<string name="running_processes_header_ram" msgid="3014991380467004685">"<xliff:g id="RAM_0">%1$s</xliff:g> de RAM"</string>
<string name="runningservicedetails_settings_title" msgid="1057845389092757121">"Aplicación en ejecución"</string>
- <string name="no_services" msgid="3898812785511572899">"Inactivos"</string>
+ <string name="no_services" msgid="3898812785511572899">"Inactivo"</string>
<string name="runningservicedetails_services_title" msgid="11853795112787355">"Servicios"</string>
<string name="runningservicedetails_processes_title" msgid="5292271587797234038">"Procesos"</string>
<string name="service_stop" msgid="5712522600201308795">"Detener"</string>
@@ -1867,13 +1882,13 @@
<string name="process_provider_in_use_description" msgid="6730020083976048028">"Proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> en uso"</string>
<string name="runningservicedetails_stop_dlg_title" msgid="6201041461740445113">"¿Quieres detener el servicio del sistema?"</string>
<string name="language_input_gesture_title" msgid="3292455685728572960">"Idiomas, entrada de texto y gestos"</string>
- <string name="language_settings" msgid="8700174277543875046">"Idiomas e introducción de texto"</string>
+ <string name="language_settings" msgid="8700174277543875046">"Idiomas e introducción de texto"</string>
<string name="languages_settings" msgid="5784775502251770671">"Idiomas"</string>
<string name="keyboard_settings" msgid="184185708597386454">"Teclado"</string>
<string name="language_empty_list_user_restricted" msgid="8050367405839231863">"No tienes permiso para cambiar el idioma del dispositivo."</string>
<string name="language_keyboard_settings_title" msgid="7934844313233544557">"Idiomas e introd. de texto"</string>
<string name="input_assistance" msgid="3437568284144952104">"Herramientas"</string>
- <string name="keyboard_settings_category" msgid="5392847229300117064">"Teclado e introducción de texto"</string>
+ <string name="keyboard_settings_category" msgid="5392847229300117064">"Teclado y métodos de entrada"</string>
<string name="system_language" msgid="1146762166579643257">"Idiomas del sistema"</string>
<string name="phone_language" msgid="5986939176239963826">"Idiomas"</string>
<string name="phone_language_summary" msgid="863041222809685325"></string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Usar teclado en pantalla"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Mantenlo en pantalla mientras el teclado físico está activo"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Teclas de rebote"</string>
<string name="bounce_keys_summary" msgid="7347050868868080302">"El teclado ignora las pulsaciones repetidas de la misma tecla que se hayan hecho en <xliff:g id="BOUNCE_KEYS_THRESHOLD">%1$d</xliff:g> ms"</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="sticky_keys" msgid="7317317044898161747">"Teclas persistentes"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Pulsa una tecla para cada acceso directo en lugar de mantener pulsadas todas las teclas 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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Cambiar relleno a amarillo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Cambiar relleno del puntero a rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Cambiar relleno del puntero a azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo del trazo del puntero"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Blanco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Negro"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ninguno"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Seleccionado por el usuario: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidad del puntero del ratón"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamaño del cursor"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Reducir el tamaño del cursor"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumentar el tamaño del cursor"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Mandos de videojuegos"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirigir vibración"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Enviar vibración al mando para juegos cuando esté conectado"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar de todos modos"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ajustes de ampliación"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Desplazarse con un dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mover la lupa con 1 dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arrastra 1 dedo para moverte por la pantalla."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mueve la lupa de área arrastrándola con un dedo."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mueve la lupa de área arrastrándola con dos dedos."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"No disponible cuando se amplía solo parte de la pantalla"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botón para ampliar"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Amplía rápidamente la pantalla para que el contenido se vea más grande"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para ampliar:</b><br/> {0,number,integer}. Usa el acceso directo para iniciar la ampliación.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrastra dos dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con dos dedos para ajustar el zoom.<br/> {4,number,integer}. Usa el acceso directo para detener la ampliación.<br/><br/> <b>Para ampliar de forma temporal:</b><br/> {0,number,integer}. Asegúrate de que has configurado el tipo de ampliación como pantalla completa.<br/> {1,number,integer}. Usa el acceso directo para iniciar la ampliación.<br/> {2,number,integer}. Mantén pulsada cualquier parte de la pantalla.<br/> {3,number,integer}. Arrastra el dedo para moverte por la pantalla.<br/> {4,number,integer}. Levanta el dedo para detener la ampliación."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para ampliar:</b><br/> {0,number,integer}. Usa el acceso directo para iniciar la ampliación.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrastra 2 dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con 2 dedos para ajustar el zoom.<br/> {4,number,integer}. Usa este acceso directo para detener la ampliación.<br/><br/> También puedes ampliar temporalmente y más."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para ampliar:</b><br/> {0,number,integer}. Usa el acceso directo para iniciar la ampliación.<br/> {1,number,integer}. Toca la pantalla.<br/> {2,number,integer}. Arrastra 1 o 2 dedos para moverte por la pantalla.<br/> {3,number,integer}. Pellizca con 2 dedos para ajustar el zoom.<br/> {4,number,integer}. Usa este acceso directo para detener la ampliación.<br/><br/> También puedes ampliar temporalmente y más."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Si la ampliación está activada, puedes ampliar la pantalla.\n\n"<b>"Para ampliar"</b>", inicia la ampliación y toca la parte de la pantalla que quieras ampliar.\n"<ul><li>"Arrastra al menos dos dedos para desplazarte."</li>\n<li>"Pellizca la pantalla con al menos dos dedos para ajustar el zoom."</li></ul>\n\n<b>"Para ampliar elementos temporalmente"</b>", inicia la ampliación y mantén pulsada cualquier parte de la pantalla.\n"<ul><li>"Arrastra un dedo para desplazarte por la pantalla."</li>\n<li>"Levanta el dedo para reducir la imagen."</li></ul>\n\n"El teclado y la barra de navegación no se pueden ampliar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Acceso directo al botón de accesibilidad"</string>
@@ -2154,11 +2179,11 @@
<string name="accessibility_shortcut_edit_dialog_summary_software" msgid="8315934725362849788">"En la parte inferior de la pantalla, toca el botón de accesibilidad <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g>. Para cambiar de una función a otra, mantén pulsado el botón de accesibilidad."</string>
<string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Desde la parte inferior de la pantalla, desliza hacia arriba con dos dedos.\n\nPara cambiar de una función a otra, desliza hacia arriba con dos dedos y mantén pulsada la pantalla."</string>
<string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Desde la parte inferior de la pantalla, desliza tres dedos hacia arriba.\n\nPara cambiar de una función a otra, desliza tres dedos hacia arriba y mantén pulsada la pantalla."</string>
- <string name="accessibility_shortcut_edit_dialog_summary_gesture" msgid="2081123009255579884">"{count,plural, =1{Desliza hacia arriba desde la parte inferior de la pantalla. Para cambiar de una función a otra, desliza hacia arriba y mantén pulsada la pantalla.}other{Desliza hacia arriba con # dedos desde la parte inferior de la pantalla. Para cambiar de una función a otra, desliza hacia arriba con # dedos y mantén pulsada la pantalla.}}"</string>
+ <string name="accessibility_shortcut_edit_dialog_summary_gesture" msgid="2081123009255579884">"{count,plural, =1{Desliza hacia arriba desde la parte inferior de la pantalla. Para cambiar de una función a otra, desliza hacia arriba y mantén pulsado.}other{Desliza hacia arriba con # dedos desde la parte inferior de la pantalla. Para cambiar de una función a otra, desliza hacia arriba con # dedos y mantén pulsado.}}"</string>
<string name="accessibility_shortcut_edit_dialog_summary_software_floating" msgid="4459254227203203324"><annotation id="link">"Más opciones"</annotation></string>
<string name="footer_learn_more_content_description" msgid="8843798273152131341">"Más información sobre <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
<string name="accessibility_shortcut_edit_dialog_title_quick_settings" msgid="140959604014177304">"Ajustes rápidos"</string>
- <string name="accessibility_shortcut_edit_dialog_summary_quick_settings" msgid="739883998754165940">"{count,plural, =1{Desliza hacia abajo desde la parte superior de la pantalla.}other{Desliza hacia abajo con # dedos desde la parte superior de la pantalla.}}"</string>
+ <string name="accessibility_shortcut_edit_dialog_summary_quick_settings" msgid="739883998754165940">"{count,plural, =1{Desliza hacia abajo desde la parte superior de la pantalla}other{Desliza hacia abajo con # dedos desde la parte superior de la pantalla}}"</string>
<string name="accessibility_shortcut_edit_dialog_summary_quick_settings_suw" msgid="4216628328191609785">"{count,plural, =1{Desliza hacia abajo desde la parte superior de la pantalla. Este acceso directo estará disponible cuando termines de configurar el dispositivo.}other{Desliza hacia abajo con # dedos desde la parte superior de la pantalla. Este acceso directo estará disponible cuando termines de configurar el dispositivo.}}"</string>
<string name="accessibility_feature_shortcut_setting_summary_quick_settings" msgid="7006526933552889373">"Ajustes rápidos"</string>
<string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="844089763968552142">"Teclas de volumen"</string>
@@ -2230,10 +2255,10 @@
<string name="accessibility_control_timeout_preference_intro_text" msgid="1398116710556762245">"Elige durante cuánto tiempo quieres que se muestren los mensajes temporales que te piden que lleves a cabo una acción"</string>
<string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Retraso al mantener pulsado"</string>
<string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Invertir colores"</string>
- <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Usar Invertir colores"</string>
- <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Acceso directo a Invertir colores"</string>
- <string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"Invertir colores hace que las pantallas claras se vuelvan oscuras y que las pantallas oscuras se vuelvan claras."</string>
- <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"<b>Ten en cuenta lo siguiente:</b><br/> <ol> <li> Los colores cambiarán en el contenido multimedia y las imágenes.</li> <li> Invertir colores funciona en todas las aplicaciones.</li> <li> Si lo que quieres es que se muestre un fondo oscuro, prueba mejor a usar el tema oscuro.</li> </ol>"</string>
+ <string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Usar Inversión de colores"</string>
+ <string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Acceso directo a Inversión de colores"</string>
+ <string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"Inversión de colores hace que las pantallas claras se vuelvan oscuras y que las pantallas oscuras se vuelvan claras."</string>
+ <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"<b>Ten en cuenta lo siguiente:</b><br/> <ol> <li> Los colores cambiarán en el contenido multimedia y las imágenes.</li> <li> Inversión de colores funciona en todas las aplicaciones.</li> <li> Si lo que quieres es que se muestre un fondo oscuro, prueba mejor a usar el tema oscuro.</li> </ol>"</string>
<string name="accessibility_action_label_panel_slice" msgid="1313725957071602932">"acceder a Ajustes"</string>
<string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Clic automático (tiempo permanencia)"</string>
<string name="accessibility_autoclick_about_title" msgid="152923024405552594">"Clic automático (permanencia)"</string>
@@ -2284,8 +2309,8 @@
<string name="accessibility_daltonizer_shortcut_title" msgid="7480360363995502369">"Acceso directo a Corrección de color"</string>
<string name="accessibility_daltonizer_about_title" msgid="6063650804116981287">"Acerca de la corrección de color"</string>
<string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Más información sobre la corrección de color"</string>
- <string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"Acerca de invertir colores"</string>
- <string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"Más información sobre Invertir colores"</string>
+ <string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"Acerca de inversión de colores"</string>
+ <string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"Más información sobre Inversión de colores"</string>
<string name="accessibility_captioning_primary_switch_title" msgid="3663677340286206100">"Mostrar subtítulos"</string>
<string name="accessibility_captioning_primary_switch_summary" msgid="2544094070306830218">"Solo en aplicaciones compatibles"</string>
<string name="captioning_appearance_title" msgid="3128792092290011408">"Tamaño y estilo de los subtítulos"</string>
@@ -2530,7 +2555,7 @@
<string name="battery_tip_charge_to_full_button" msgid="9172893341338732733">"Invalidar"</string>
<string name="battery_tip_incompatible_charging_title" msgid="1567827436103364999">"Comprueba el accesorio de carga"</string>
<string name="battery_tip_incompatible_charging_content_description" msgid="355668467640367701">"Más información sobre la carga con adaptadores incompatibles"</string>
- <string name="smart_battery_manager_title" msgid="3677620516657920364">"Gestor de batería"</string>
+ <string name="smart_battery_manager_title" msgid="3677620516657920364">"Administrador de batería"</string>
<string name="smart_battery_title" msgid="9095903608520254254">"Gestionar aplicaciones automáticamente"</string>
<string name="smart_battery_footer" msgid="8407121907452993645">"Cuando el gestor de batería detecte que las aplicaciones consumen batería, podrás restringirlas, aunque es posible que no funcionen correctamente y las notificaciones se retrasen."</string>
<string name="restricted_app_title" msgid="6585080822121007436">"Aplicaciones restringidas"</string>
@@ -2730,10 +2755,10 @@
<string name="credentials_not_erased" msgid="3611058412683184031">"No se ha podido borrar el almacenamiento de credenciales."</string>
<string name="usage_access_title" msgid="1580006124578134850">"Apps con acceso de uso"</string>
<string name="ca_certificate" msgid="3076484307693855611">"Certificado AC"</string>
- <string name="user_certificate" msgid="6897024598058566466">"Certificado de usuario"</string>
+ <string name="user_certificate" msgid="6897024598058566466">"Certificado de usuario de VPN y aplicaciones"</string>
<string name="wifi_certificate" msgid="8461905432409380387">"Certificado de Wi‑Fi"</string>
<string name="ca_certificate_warning_title" msgid="7951148441028692619">"Tus datos no serán privados"</string>
- <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Con los certificados AC, los sitios web, las aplicaciones y las VPNs pueden cifrar datos. Instala solo certificados AC de organizaciones en las que confíes. \n\nSi instalas un certificado AC, su propietario podría acceder a tus datos, como contraseñas o información de tarjetas de crédito, de sitios web que visites o aplicaciones que uses, incluso si tus datos están cifrados."</string>
+ <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Con los certificados AC, los sitios web, las aplicaciones y las VPNs pueden cifrar datos. Instala solo certificados AC de organizaciones en las que confíes. \n\nSi instalas un certificado AC, su propietario podría acceder a datos que hayas introducido en los sitios web que visitas o las aplicaciones que usas, aunque estén cifrados. Por ejemplo, podría tener acceso a contraseñas o a la información de tarjetas de crédito."</string>
<string name="certificate_warning_dont_install" msgid="3794366420884560605">"No instalar"</string>
<string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar de todas formas"</string>
<string name="cert_not_installed" msgid="6725137773549974522">"No se ha instalado el certificado"</string>
@@ -2920,8 +2945,8 @@
<string name="vpn_set_vpn_title" msgid="1667539483005810682">"¿Configurar el modo de VPN siempre activada?"</string>
<string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"Si esta opción está activada, no tendrás acceso a Internet hasta que se conecte la red VPN"</string>
<string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"La nueva red VPN sustituirá a la actual y no tendrás acceso a Internet hasta que dicha VPN se conecte"</string>
- <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Ya estás conectado a una red VPN siempre activada. Si te conectas a otra, esta sustituirá a la VPN actual y se desactivará el modo de VPN siempre activada."</string>
- <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_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Ya te has conectado a una red VPN siempre activada. Si te conectas a otra, esta sustituirá a la VPN actual y se desactivará el modo de VPN siempre activada."</string>
+ <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_turn_on" msgid="3568307071295211187">"Activar"</string>
<string name="vpn_cant_connect_title" msgid="5670787575925519386">"No se puede conectar a <xliff:g id="VPN_NAME">%1$s</xliff:g>"</string>
<string name="vpn_cant_connect_message" msgid="2139148820719163694">"Esta aplicación no es compatible con el modo de VPN siempre activada"</string>
@@ -2939,11 +2964,11 @@
<string name="vpn_require_connection_title" msgid="4186758487822779039">"¿Requerir una conexión VPN?"</string>
<string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"No es segura. Cambia a una VPN IKEv2."</string>
<string name="vpn_start_unsupported" msgid="7139925503292269904">"No se ha podido iniciar la VPN no compatible."</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_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_lockdown_none" msgid="455915403560910517">"Ninguno"</string>
<string name="vpn_lockdown_config_error" msgid="1992071316416371316">"Las redes VPN activadas continuamente requieren una dirección IP para el servidor y el DNS."</string>
<string name="vpn_no_network" msgid="7187593680049843763">"No hay conexión de red. Inténtalo de nuevo más tarde."</string>
- <string name="vpn_disconnected" msgid="7694522069957717501">"Desconectado de la red VPN"</string>
+ <string name="vpn_disconnected" msgid="7694522069957717501">"Te has desconectado de la VPN"</string>
<string name="vpn_disconnected_summary" msgid="721699709491697712">"Ninguna"</string>
<string name="vpn_missing_cert" msgid="5397309964971068272">"Falta un certificado. Prueba a editar el perfil."</string>
<string name="trusted_credentials_system_tab" msgid="675362923690364722">"Sistema"</string>
@@ -2994,7 +3019,7 @@
<string name="user_remove_user_menu" msgid="2183714948094429367">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
<string name="user_lockscreen_settings" msgid="4596612658981942092">"Ajustes de pantalla de bloqueo"</string>
<string name="user_add_on_lockscreen_menu" msgid="2539059062034644966">"Añadir usuarios desde la pantalla de bloqueo"</string>
- <string name="switch_to_dock_user_when_docked" msgid="2324395443311905635">"Cambiar a administrador al ponerse en la base"</string>
+ <string name="switch_to_dock_user_when_docked" msgid="2324395443311905635">"Cambiar al usuario administrador al conectarse"</string>
<string name="user_confirm_remove_self_title" msgid="926265330805361832">"¿Eliminarte a ti mismo?"</string>
<string name="user_confirm_remove_title" msgid="3626559103278006002">"¿Eliminar este usuario?"</string>
<string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"¿Quitar este perfil?"</string>
@@ -3011,7 +3036,7 @@
<string name="user_category_title" msgid="4368580529662699083">"Usuarios"</string>
<string name="other_user_category_title" msgid="7089976887307643217">"Otros usuarios"</string>
<string name="remove_guest_on_exit" msgid="8202972371459611066">"Eliminar actividad de invitado"</string>
- <string name="remove_guest_on_exit_summary" msgid="3969962695703280353">"Elimina todas las aplicaciones y datos de la sesión de invitado al salir del modo Invitado"</string>
+ <string name="remove_guest_on_exit_summary" msgid="3969962695703280353">"Elimina todos los datos y aplicaciones de la sesión de invitado al salir del modo Invitado"</string>
<string name="remove_guest_on_exit_dialog_title" msgid="2310442892536079416">"¿Eliminar actividad de invitado?"</string>
<string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"Se eliminarán las aplicaciones y datos de esta sesión de invitado ahora, y toda la actividad futura correspondiente se borrará cada vez que salgas del modo Invitado"</string>
<string name="remove_guest_on_exit_keywords" msgid="4961310523576166193">"eliminar, invitado, actividad, retirar, datos, visitante, borrar"</string>
@@ -3021,9 +3046,9 @@
<string name="user_grant_admin" msgid="5942118263054572074">"Convertir a este usuario en administrador"</string>
<string name="user_remove_user" msgid="8468203789739693845">"Eliminar usuario"</string>
<string name="user_enable_calling_and_sms_confirm_title" msgid="4041510268838725520">"¿Activar llamadas y SMS?"</string>
- <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"El historial de SMS y de llamadas se compartirá con este usuario."</string>
+ <string name="user_enable_calling_and_sms_confirm_message" msgid="367792286597449922">"El historial de SMS y de llamadas se compartirán con este usuario."</string>
<string name="user_revoke_admin_confirm_title" msgid="3057842401861731863">"¿Quitar privilegios de administrador?"</string>
- <string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Si le quitas los privilegios de administrador a este usuario, tanto tú como otro administrador podéis devolvérselos más tarde."</string>
+ <string name="user_revoke_admin_confirm_message" msgid="9207187319308572958">"Si le quitas los privilegios de administrador a este usuario, tanto tú como otro administrador puede devolvérselos más tarde."</string>
<string name="emergency_info_title" msgid="8233682750953695582">"Información de emergencia"</string>
<string name="emergency_info_summary" msgid="8463622253016757697">"Información y contactos de <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="open_app_button" msgid="5025229765547191710">"Abrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
@@ -3198,7 +3223,7 @@
<string name="keywords_battery_adaptive_preferences" msgid="1774870663426502938">"preferencias de funciones inteligentes, batería inteligente"</string>
<string name="keywords_spell_checker" msgid="5148906820603481657">"ortografía, diccionarios, corrector ortográfico, autocorrección"</string>
<string name="keywords_voice_input" msgid="7534900094659358971">"herramienta de reconocimiento, entrada, conversión de texto a voz, hablar, idioma, manos libres, reconocimiento, ofensiva, palabra, audio, historial, auriculares bluetooth"</string>
- <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"valorar, idioma, predeterminado, hablar, conversión de texto a voz, accesibilidad, lector de pantalla, ciego"</string>
+ <string name="keywords_text_to_speech_output" msgid="6728080502619011668">"valorar, idioma, predeterminado, hablar, tts, accesibilidad, lector de pantalla, invidente"</string>
<string name="keywords_date_and_time" msgid="4402136313104901312">"reloj, militar"</string>
<string name="keywords_network_reset" msgid="4075670452112218042">"restablecer, restaurar, fábrica"</string>
<string name="keywords_factory_data_reset" msgid="4979623326958976773">"borrar, eliminar, restaurar, resetear, recuperar, restablecer estado de fábrica"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguna}=1{1 programación creada}other{# programaciones creadas}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"No molestar"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos prioritarios"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Añadir un modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recibe notificaciones solo de personas y aplicaciones importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selecciona un tipo de activación"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Hora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Por ejemplo, \"De 9:30 a 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendario"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Por ejemplo, \"Calendario personal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crear un modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizado"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupciones"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar No molestar"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Las alarmas y los sonidos multimedia pueden interrumpirte"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programaciones"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Eliminar programaciones"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Eliminar"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Cambiar nombre"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Eliminar"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"¿Eliminar modo <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programaciones"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programación"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Añade un calendario"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Usa el calendario"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programación"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Crea una programación"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programar"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activar automáticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programación"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silenciar teléfono en ciertos momentos"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir reglas de No molestar"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupciones que reproduzcan sonido"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear interrupciones visuales"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir señales visuales"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificaciones que pueden llegarte"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Concentración"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Acciones adicionales"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desactivado}=1{Desactivado / 1 modo puede activarlo automáticamente}other{Desactivado / # modos pueden activarlo automáticamente}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ajustes de la pantalla"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opciones de visualización"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de grises"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"habilitar tema oscuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Se prioriza que el SO y las aplicaciones usen un texto claro sobre fondo oscuro, lo que puede resultar más agradable a la vista y supone un importante ahorro de batería en algunos dispositivos"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No hay cambios en la pantalla}=1{{effect_1}}=2{{effect_1} y {effect_2}}=3{{effect_1}, {effect_2} y {effect_3}}other{{effect_1}, {effect_2}, y # más}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupciones"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"No se filtra ninguna interrupción"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opciones de visualización para las notificaciones filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Cuando el modo No molestar esté activado"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificaciones sin sonido"</string>
@@ -3419,7 +3459,7 @@
<string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
<string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Preguntar siempre"</string>
<string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
- <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+ <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
<string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
<string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado / 1 programación puede activarlo automáticamente}other{Desactivado / # programaciones pueden activarlo automáticamente}}"</string>
<string name="zen_category_behavior" msgid="3214056473947178507">"Qué puede interrumpirte durante el modo No molestar"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificación"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir que se pospongan las notificaciones"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Burbuja de notificación en el icono de la aplicación"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paquetes de notificaciones"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbujas"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbujas"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Convertir esta conversación en burbuja"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Esta aplicación no admite la configuración avanzada"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Más ajustes"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Hay más ajustes disponibles en la aplicación"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Bajar volumen de notificaciones"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Aplicar a perfiles de trabajo"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplicar a las aplicaciones del perfil de trabajo"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Otros"</string>
<string name="no_channels" msgid="4716199078612071915">"Esta aplicación no ha publicado ninguna notificación"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorías no usadas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Ajustes adicionales de la aplicación"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorías no usadas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorías no usadas"</string>
@@ -3731,7 +3772,7 @@
<string name="zen_mode_calls_list" msgid="5044730950895749093">"llamadas"</string>
<string name="zen_mode_calls_header" msgid="8379225445095856726">"Llamadas que pueden interrumpirte"</string>
<string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para asegurarte de que las llamadas permitidas suenan, comprueba que el dispositivo esté configurado para sonar"</string>
- <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Las llamadas entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otras personas puedan contactar contigo."</string>
+ <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Las llamadas entrantes se bloquean en la programación <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Cambia los ajustes para que tus amigos, familiares u otros puedan contactar contigo."</string>
<string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos destacados"</string>
<string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nadie}=1{{contact_1}}=2{{contact_1} y {contact_2}}=3{{contact_1}, {contact_2} y {contact_3}}other{{contact_1}, {contact_2} y # más}}"</string>
<string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sin nombre)"</string>
@@ -3740,7 +3781,7 @@
<string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensajes"</string>
<string name="zen_mode_messages_header" msgid="253721635061451577">"Mensajes que pueden interrumpirte"</string>
<string name="zen_mode_messages_footer" msgid="6002468050854126331">"Para asegurarte de que los mensajes permitidos suenan, comprueba que el dispositivo esté configurado para sonar"</string>
- <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Los mensajes entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otras personas puedan contactar contigo."</string>
+ <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Los mensajes entrantes se bloquean en la programación <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Cambia los ajustes para que tus amigos, familiares u otras personas puedan contactar contigo."</string>
<string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Todos los mensajes pueden interrumpirte"</string>
<string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Todas las llamadas pueden interrumpirte"</string>
<string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nadie}=1{1 contacto}other{# contactos}}"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplicaciones que pueden interrumpirte"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplicaciones seleccionadas"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ninguna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todas"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Seleccionar más aplicaciones"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpirme"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nadie puede interrumpirte"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpirte"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Todo el mundo puede interrumpirte"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Llamadas repetidas"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir llamadas repetidas"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Cambiar a Solo alarmas durante una hora hasta las {time}}other{Cambiar a Solo alarmas durante # horas hasta las {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambiar a Solo alarmas hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Cambiar a interrumpir siempre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modo de edición"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Añadir 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="warning_button_text" msgid="1274234338874005639">"Advertencia"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Cerrar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar comentarios sobre el dispositivo"</string>
@@ -3840,7 +3885,7 @@
<string name="memtag_title" msgid="5096176296797727201">"Protección memoria avanzada beta"</string>
<string name="memtag_toggle" msgid="8695028758462939212">"Protección de memoria avanzada"</string>
<string name="memtag_intro" msgid="579408691329568953">"Esta función beta te ayuda a proteger tu dispositivo de errores que pueden poner en riesgo tu seguridad."</string>
- <string name="memtag_on" msgid="824938319141503923">"Activado"</string>
+ <string name="memtag_on" msgid="824938319141503923">"Activada"</string>
<string name="memtag_off" msgid="4835589640091709019">"Desactivado"</string>
<string name="memtag_on_pending" msgid="1592053425431532361">"Se activará tras reiniciar"</string>
<string name="memtag_off_pending" msgid="1543177181383593726">"Se desactivará tras reiniciar"</string>
@@ -3881,7 +3926,7 @@
<string name="change_storage" msgid="8773820275624113401">"Cambiar almacenamiento"</string>
<string name="notifications_label" msgid="8471624476040164538">"Notificaciones"</string>
<string name="notifications_enabled" msgid="7743168481579361019">"Activadas"</string>
- <string name="notifications_enabled_with_info" msgid="1808946629277684308">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g>/<xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
+ <string name="notifications_enabled_with_info" msgid="1808946629277684308">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
<string name="notifications_disabled" msgid="5603160425378437143">"Desactivadas"</string>
<string name="notifications_categories_off" msgid="7712037485557237328">"{count,plural, =1{# categoría desactivada}other{# categorías desactivadas}}"</string>
<string name="runtime_permissions_additional_count" msgid="6071909675951786523">"{count,plural, =1{# permiso adicional}other{# permisos adicionales}}"</string>
@@ -3917,7 +3962,7 @@
<string name="app_link_open_always_summary" msgid="4524005594295855117">"{count,plural, =1{La aplicación quiere abrir # enlace}other{La aplicación quiere abrir # enlaces}}"</string>
<string name="open_supported_links_footer" msgid="3188808142432787933">"La aplicación quiere abrir los siguientes enlaces:"</string>
<string name="assist_and_voice_input_title" msgid="6317935163145135914">"Asistencia y entrada de voz"</string>
- <string name="default_assist_title" msgid="1182435129627493758">"Asistente digital"</string>
+ <string name="default_assist_title" msgid="1182435129627493758">"Aplicación de asistente digital"</string>
<string name="default_digital_assistant_title" msgid="5654663086385490838">"Aplicación de asistente digital predeterminada"</string>
<string name="assistant_security_warning_agree" msgid="9013334158753473359">"Aceptar"</string>
<string name="default_browser_title" msgid="8342074390782390458">"Aplicación de navegador"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Funda"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batería"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel de ajustes"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forzar modo Escritorio"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Fuerza el modo Escritorio experimental en pantallas secundarias"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Habilitar ventanas de forma libre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Habilita la compatibilidad con ventanas de forma libre."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activar ventana de forma libre en pant. secundaria"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Habilita ventanas de forma libre solo en pantallas secundarias."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Habilitar aplicaciones de tamaño no modificable en multiventana"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que las aplicaciones de tamaño no modificable se muestren en multiventana"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anular Forzar modo Oscuro"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partición de datos de este dispositivo debe convertirse a ext4 antes de usar la opción para desarrolladores de 16 KB. 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. Para activar la opción de 16 KB, se necesitará un reinicio más. Una vez que estés en este modo, podrás alternar entre el modo de 4 KB y de 16 KB con un solo reinicio. Algunas funciones se inhabilitarán en estos modos, por lo que es posible que algunas aplicaciones no funcionen. Para que el dispositivo vuelva al modo de producción, tendrás que volver al modo de 4 KB y luego bloquear el bootloader, lo que restablecerá el estado de fábrica del dispositivo. Una vez que el dispositivo se inicie correctamente en Android, inhabilita el desbloqueo de OEM en Opciones para desarrolladores. Tras confirmar, se borrarán los datos del dispositivo y el sistema de archivos cambiará a ext4. Cuando se complete esta operación, vuelve a habilitar la opción de 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Borrar todos los datos"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"No se ha podido borrar ni reformatear la partición de datos a ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Desbloqueo del bootloader necesario para el modo de 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Es necesario desbloquear el bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Para usar la opción para desarrolladores de 16 kB, este dispositivo debe tener el bootloader desbloqueado. 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. Al activar el modo de 16 kB, se borrarán todos los ajustes y datos del usuario. Una vez que el bootloader esté desbloqueado, harán falta dos reinicios para activar la opción de 16 kB. Una vez que estés en este modo, podrás alternar entre el modo de 4 kB y de 16 kB con un solo reinicio. Algunas funciones se inhabilitarán en estos modos, por lo que es posible que algunas aplicaciones no funcionen. Para que el dispositivo vuelva al modo de producción, tendrás que volver al modo de 4 kB y luego bloquear el OEM o el bootloader, lo que restablece el estado de fábrica del dispositivo. Desbloquea el bootloader e inténtalo de nuevo. Puedes consultar las instrucciones para hacerlo en <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Usando el modo independiente de la página de 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Estás en el modo de 4 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 bloquear el bootloader del dispositivo. Toca para ver más información."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Estás en el modo de 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Usando el modo independiente de la página de 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Toca para ver más información."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Toca para ver más información."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Controlador de informes de errores"</string>
@@ -4979,7 +5026,7 @@
<string name="wifi_scan_change" msgid="8438320311511852918">"Cambiar"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
- <string name="mobile_data_temp_connection_active" msgid="3430470299756236413">"Conectado temporalmente"</string>
+ <string name="mobile_data_temp_connection_active" msgid="3430470299756236413">"Conectada temporalmente"</string>
<string name="mobile_data_temp_using" msgid="5211002380149434155">"Usando <xliff:g id="SUBNAME">%1$s</xliff:g> temporalmente"</string>
<string name="mobile_data_no_connection" msgid="905897142426974030">"Sin conexión"</string>
<string name="mobile_data_off_summary" msgid="1884248776904165539">"Los datos móviles no se conectarán automáticamente"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar Fijar aplicaciones"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar Opciones para desarrolladores"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usa servicio de impresión"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir varios usuarios"</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, usuarios, habilitar, muchos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"múltiples, usuarios, perfiles, personas, cuentas, cambiar, muchos"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar depuración inalámbrica"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Elige lo que quieres ver en tu pantalla cuando tu tablet está conectada en la base. Es posible que el dispositivo gaste más batería si se usa un salvapantallas."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Debes reiniciar para habilitar el formato libre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Debes reiniciar para forzar el modo Escritorio en pantallas secundarias."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Debes reiniciar para habilitar la compatibilidad con ventanas de forma libre antiguas."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Debes reiniciar para cambiar la compatibilidad con ventanas de forma libre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Debes reiniciar para forzar las ventanas de forma libre en pantallas secundarias."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar ahora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar más tarde"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio espacial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Activado"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desactivado"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Activado"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio: %1$d%% izquierda, %2$d%% derecha"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio: %1$d%% derecha, %2$d%% izquierda"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Las aplicaciones que hayas instalado pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth, si te conectas a una red Wi-Fi o si configuras un punto de acceso Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Género gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecciona el género gramatical"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Configuración de búsqueda"</string>
</resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 687895d..a2bfb9c 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Uneaeg"</item>
+ <item msgid="4152450357280759894">"Sõitmine"</item>
+ <item msgid="7096549258219399423">"Kaasahaarav"</item>
+ <item msgid="2760716776980432977">"Hallatud"</item>
+ <item msgid="601734478369121764">"Tärn"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Kellaaeg"</item>
+ <item msgid="3653377604690057780">"Kinosaal"</item>
+ <item msgid="3843711267408385410">"Lill"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 081893c..e46a47f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Kas katkestada seadme ühendus?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uue seadme sidumine"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Lülita homme automaatselt 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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Kuuldeseade seaded"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Otsetee, ühilduvus kuuldeaparaatidega"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Eelseadistus"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Teie audioloog ei ole ühtegi eelseadistust programmeerinud"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Eelseadistust ei saanud värskendada"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Heliväljund"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Teave heliväljundi kohta"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Väljas"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Sees / # rakendusel on asukohale juurdepääs}other{Sees / # rakendusel on asukohale juurdepääs}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Laadimine …"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Rakendused, millel on luba läheduses olevatele seadmetele juurde pääseda, saavad määrata ühendatud seadmete suhtelise asukoha."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Rakendused, millel on luba läheduses olevatele seadmetele juurde pääseda, saavad määrata ühendatud seadmete suhtelise asukoha."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Juurdepääs asukohale on rakenduste ja teenuste jaoks välja lülitatud. Teie seadme asukoht võidakse siiski päästeteenistusele saata, kui helistate või saadate sõnumi hädaabinumbrile."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Lisateave asukohaseadete kohta"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Muutmiseks avage ChromeOS-i seaded > Privaatsus ja turvalisus > Privaatsuse seaded > Juurdepääs asukohale"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Nägu ja kell <xliff:g id="WATCH">%s</xliff:g> on lisatud"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Nägu, sõrmejälg ja kell <xliff:g id="WATCH">%s</xliff:g> on lisatud"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Nägu, sõrmejäljed ja kell <xliff:g id="WATCH">%s</xliff:g> on lisatud"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"See on vajalik, kuna identiteedi kontrollimine on sisse lülitatud"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Kaugautentija avamine"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Kell on lisatud"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Kella seadistamine"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Lisateave kellaga avamise kohta"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Lisa kell"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Kella eemaldamine"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Sõrmejälje ja näoga avamine"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Näo ja sõrmejäljega avamine"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Näo ja sõrmejäljega avamine töö jaoks"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Seadistamine on vajalik"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Nägu ja sõrmejäljed on lisatud"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installige rakendused"</b>\n"Installige rakendused, mille soovite oma ruumis privaatsena hoida"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Pidage meeles"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Ruumi lukustamisel peatatakse rakendused"</b>\n"Kui lukustate oma ruumi, peatatakse teie ruumis olevad rakendused ja te ei saa neilt märguandeid"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privaatsed ruumid ei ole sobilikud rakendustele, mis peavad töötama taustal või saatma kriitilisi märguandeid (nt meditsiinirakendused). Seda seetõttu, et märguanded ja taustategevused peatatakse, kui teie ruum on lukus.\n\nTeie privaatses ruumis olevaid rakendusi ei näidata lubade halduris, privaatsuse juhtpaneelis ja muudes seadetes, kui privaatne ruum on lukus.\n\nPrivaatset ruumi ei saa teisaldada uude seadmesse. Kui soovite seda mõnes teises seadmes kasutada, peate seadistama teise privaatse ruumi.\n\nKõik, kes ühendavad teie seadme arvutiga või installivad teie seadmesse kahjulikke rakendusi, võivad pääseda juurde teie privaatsele ruumile."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privaatsed ruumid ei ole sobilikud rakendustele, mis peavad töötama taustal või saatma kriitilisi märguandeid (nt meditsiinirakendused). Seda seetõttu, et märguanded ja taustategevused peatatakse, kui teie ruum on lukus.\n\nTeie privaatses ruumis olevaid rakendusi ei näidata lubade halduris, privaatsuse juhtpaneelis ja muudes seadetes, kui privaatne ruum on lukus.\n\nPrivaatset ruumi ei saa uues seadmes taastada. Kui soovite seda teises seadmes kasutada, peate seadistama teise ruumi.\n\nKõik, kes ühendavad teie seadme arvutiga või installivad teie seadmesse pahatahtlikke rakendusi, võivad pääseda juurde teie privaatsele ruumile."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Lisateave privaatsete ruumide kohta"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"See võtab mõne hetke"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Privaatse ruumi seadistamine …"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Kas taaskäivitada seade?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Üksikasjalik NFC logimine on mõeldud ainult arenduseks. Veaaruannetesse kaasatakse täiendavad NFC andmed, mis võivad sisaldada privaatset teavet. Selle seade muutmiseks taaskäivitage oma seade."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Taaskäivita"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"peegeldamine, väline ekraan, ühendatud ekraan, USB-ekraan, eraldusvõime, pööramine"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Pööramine"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Tavaline"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Kasuta ekraaniklaviatuuri"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Hoia seda ekraanil, kui füüsiline klaviatuur on aktiivne"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Ühekordse puudutusega klahvid"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Kursori sisu muutmine kollaseks"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Kursori sisu muutmine roosaks"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Kursori sisu muutmine siniseks"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Hiirekursori kriipsu stiil"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Valge"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Must"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Puudub"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Kasutaja valitud: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Kõne"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kursori kiirus"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Kursori suurus"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Vähenda kursorit"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Suurenda kursorit"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Mängukontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibreerimise ümbersuunamine"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Saadab vibreerimise mängukontrollerisse, kui see on ühendatud"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Jätka ikkagi"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Tühista"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurendamisseaded"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Ühe sõrmega paanimine"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Luubi liigutamine ühe sõrmega"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Kuval liikumiseks lohistage sõrme."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Suurendusala teisaldamiseks lohistage ühe sõrmega."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Suurendusala teisaldamiseks lohistage kahe sõrmega."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Pole saadaval, kui suurendatakse ainult osa ekraanist"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Suumimiseks puudutage nuppu"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Suumige ekraanil kiiresti sisse, et sisu suuremalt kuvada"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Sissesuumimiseks toimige järgmiselt.</b><br/> {0,number,integer}. Kasutage suurendamise alustamiseks otseteed.<br/> {1,number,integer}. Puudutage ekraani.<br/> {2,number,integer}. Ekraanikuval liikumiseks lohistage kahe sõrmega.<br/> {3,number,integer}. Suumi kohandamiseks liigutage ekraanil kaht sõrme kokku-lahku.<br/> {4,number,integer}. Kasutage suurendamise lõpetamiseks otseteed.<br/><br/> <b>Ajutiseks sissesuumimiseks toimige järgmiselt.</b><br/> {0,number,integer}. Veenduge, et suurendamise tüübiks oleks valitud täisekraan.<br/> {1,number,integer}. Kasutage suurendamise alustamiseks otseteed.<br/> {2,number,integer}. Hoidke sõrme kus tahes ekraanikuval.<br/> {3,number,integer}. Lohistage ekraanikuval liikumiseks sõrme.<br/> {4,number,integer}. Suurendamise lõpetamiseks tõstke sõrm ekraanikuvalt."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Sissesuumimiseks toimige järgmiselt.</b><br/> {0,number,integer}. Kasutage suurendamise alustamiseks otseteed.<br/> {1,number,integer}. Puudutage ekraani.<br/> {2,number,integer}. Ekraanikuval liikumiseks lohistage kahe sõrmega.<br/> {3,number,integer}. Suumi kohandamiseks liigutage ekraanil kaht sõrme kokku-lahku.<br/> {4,number,integer}. Kasutage suurenduse peatamiseks otseteed<br/><br/> Saate ka ajutiselt sisse suumida ja muud teha."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Sissesuumimiseks toimige järgmiselt.</b><br/> {0,number,integer}. Kasutage suurendamise alustamiseks otseteed.<br/> {1,number,integer}. Puudutage ekraani.<br/> {2,number,integer}. Ekraanikuval liikumiseks lohistage ühe või kahe sõrmega.<br/> {3,number,integer}. Suumi kohandamiseks liigutage ekraanil kaht sõrme kokku-lahku.<br/> {4,number,integer}. Kasutage suurenduse peatamiseks otseteed<br/><br/> Saate ka ajutiselt sisse suumida ja muud teha."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kui suurendusfunktsioon on sisse lülitatud, saate oma ekraanikuval sisse suumida.\n\n"<b>"Suumimiseks"</b>" käivitage suurendusfunktsioon ja puudutage siis ekraanikuval mis tahes kohta.\n"<ul><li>"Kerimiseks lohistage kahe või enama sõrmega."</li>\n<li>"Suumi kohandamiseks pigistage kahte või enamat sõrme kokku."</li></ul>\n\n<b>"Ajutiseks suumimiseks"</b>" käivitage suurendusfunktsioon ja puudutage siis ekraanikuval pikalt mis tahes kohta.\n"<ul><li>"Ekraanikuval teisaldamiseks lohistage sõrme."</li>\n<li>"Väljasuumimiseks tõstke sõrm ekraanilt."</li></ul>\n\n"Klaviatuuril ega navigeerimisribal ei saa sisse suumida."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. leht <xliff:g id="NUM_PAGES">%2$d</xliff:g>-st"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Juurdepääsetavuse nupu otsetee"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Puudub}=1{1 ajakava on määratud}other{# ajakava on määratud}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Mitte segada"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriteetsed režiimid"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Lisa režiim"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ainult oluliste inimeste ja rakendustega seotud märguanded"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Aktiveerimistüübi valimine"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Aeg"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Näide. „9:30 – 17:00”"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Näide. „Isiklik kalender”"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Mudeli loomine"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Kohandatud"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Katkestuste piiramine"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Valiku Mitte segada sisselülitamine"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmid ja meediahelid saavad katkestada"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Ajakavad"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Ajakavade kustutamine"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Kustuta"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Nimeta ümber"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Kustuta"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Kas kustutada režiim „<xliff:g id="MODE">%1$s</xliff:g>“?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Muuda"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Ajakavad"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ajakava"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Lisage kalender"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Kasutage oma kalendrit"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Ajastamine"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Ajakava määramine"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Ajakava"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Lülita automaatselt sisse"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ajastamine"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoni vaigistamine teatud ajal"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Režiimi Mitte segada reeglite määramine"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Helimärguandega katkestuste lubamine"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Visuaalsete häirimiste blok."</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Luba visuaalsed signaalid"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Teieni jõudvad märguanded"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Olge ümbritsevast teadlik"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Lisatoimingud"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Väljas}=1{Väljas / 1 režiimi saab automaatselt sisse lülitada}other{Väljas / # režiimi saab automaatselt sisse lülitada}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Kuvaseaded"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Kuvavalikud"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Halltoonid"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"tumeda teema lubamine"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Lülitage OS ja rakendused heleda teksti ja tumeda tausta eelistusele, mis võib hõlbustada teksti lugemist ning säästab teatud seadmetes oluliselt akut"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ekraanikuva muudatusi pole}=1{{effect_1}}=2{{effect_1} ja {effect_2}}=3{{effect_1}, {effect_2} ja {effect_3}}other{{effect_1}, {effect_2} ja veel #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Katkestuste filtreerimine"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Katkestusi ei filtreerita"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Filtreeritud märguannete kuvavalikud"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kui funktsioon Mitte segada on sisse lülitatud"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Hääletud märguanded"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ava märguanne"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Luba märguandeid edasi lükata"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Märguandetäpp rakenduse ikoonil"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Märguandekogumid"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Mullid"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Mullid"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Kuva see vestlus mullis"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"See rakendus ei toeta täiustatud seadeid"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Rohkem seadeid"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Selle rakenduse sees on saadaval rohkem seadeid"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Märguannete summutamine"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Tööprofiilidele rakendamine"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Rakendage tööprofiili rakendustele"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategooriad"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Muu"</string>
<string name="no_channels" msgid="4716199078612071915">"See rakendus pole postitanud ühtegi märguannet"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Kuva kasutamata kategooriad"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Lisaseaded rakenduses"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Kuva kasutamata kategooriad"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Peida kasutamata kategooriad"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Rakendused, mis saavad katkestada"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Valitud rakendused"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Puudub"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Kõik"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Valige rohkem rakendusi"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mitte miski ei saa katkestada"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Mitte keegi ei saa katkestada"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Mõned inimesed saavad katkestada"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Kõik inimesed saavad katkestada"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Korduvad helistajad"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Luba korduvad helistajad"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Muudetakse valikule Ainult äratused 1 tunniks kuni {time}}other{Muudetakse valikule Ainult äratused # tunniks kuni {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Muudetakse valikule Ainult alarmid kuni kella <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Muudetakse valikule Katkesta alati"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Muutmisrežiim"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Režiimi lisamine"</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="warning_button_text" msgid="1274234338874005639">"Hoiatus"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Sule"</string>
<string name="device_feedback" msgid="5351614458411688608">"Seadme kohta tagasiside saatmine"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Ümbris"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Aku"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Seadete paneel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Jõusta töölauarežiim"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Katselise töölauarežiimi jõustamine teisestel ekraanidel"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Luba vabas vormis aknad"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Luba vabas vormis akende tugi."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Luba vabas vormis akende kuvamine teisel ekraanil"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Luba vabas vormis aknad ainult teisesel ekraanil."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Luba fikseeritud suurus mitmes aknas"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Lubab fikseeritud suurusega rakenduste kuvamise mitmes aknas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Alista funktsioon Sunnitud tume"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Arendaja valiku 16 kB kasutamiseks peab seadme andmete sektsioon olema konverditud failisüsteemiks ext4. Selles režiimis ei saa garanteerida tarkvara terviklust ja andmed, mis salvestatakse telefoni, kui käivituslaadur on avatud, võivad olla ohus. Pärast valiku 16 kB aktiveerimist tuleb seade veel korra taaskäivitada. Selles režiimis saate 4 kB ja 16 kB režiimide vahel vahetada ühe taaskäivitamisega. Mõned funktsioonid on nendes režiimides keelatud, mistõttu ei pruugi kõik rakendused töötada Seadme tehaseseadetele lähtestamiseks ja tavarežiimi naasmiseks lülituge uuesti 4K režiimile ja avage seadme käivituslaadur. Pärast seda, kui seade on Androidi käivitanud, keelake arendaja valikutes OEM-tootjaluku avamine. Pärast kinnitamist seade tühjendatakse ja failisüsteemiks seatakse ext4. Kui need toimingud on lõpetatud, lubage taas režiim 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Kustuta kõik andmed"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Andmete sektsiooni ümbervormindamine failisüsteemiks ext4 ja seadme tühjendamine ebaõnnestus."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 kB režiimi jaoks on vaja käivituslaadur avada"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Käivituslaadur on vaja avada"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Arendaja valiku 16 kB kasutamiseks peab seadme käivituslaadur olema avatud. Selles režiimis ei saa garanteerida tarkvara terviklust ja andmed, mis salvestatakse telefoni, kui käivituslaadur on avatud, võivad olla ohus. Režiimi 16 kB aktiveerimisel tühjendatakse seade kõigist kasutaja andmetest ja seadetest. Kui käivituslaadur on avatud, on valiku 16 kB aktiveerimiseks vaja seade kaks korda taaskäivitada. Selles režiimis saate 4 kB ja 16 kB režiimide vahel vahetada ühe taaskäivitamisega. 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 lukustama OEM-i/käivituslaaduri. See lähtestab seadme tehaseseadetele. Avage käivituslaadur ja proovige uuesti. Juhiseid selle kohta vaadake aadressilt <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Lehest sõltumatu 4 kB režiimi kasutamine"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Olete lehest sõltumatus 4 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. Tavarežiimi naasmiseks peate avama seadme käivituslaaduri. Puudutage lisateabe vaatamiseks."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Olete lehest sõltumatus 4 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. Tavarežiimi naasmiseks peate avama seadme käivituslaaduri. See lähtestab seadme tehaseseadetele. 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, installige kogu operatsioonisüsteem ja püsivara uuesti, kasutades tehaseoleku süsteemikujutisi aadressilt <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> või kasutage tööriista aadressil <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ja valige „Tühjenda seade“, „Lukusta käivituslaadur“ ja „Installi kõik sektsioonid uuesti“."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Lehest sõltumatu 16 kB režiimi kasutamine"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 4K režiimile ja seejärel avama seadme käivituslaaduri. Puudutage lisateabe vaatamiseks."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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. Seadme tehaseseadetele lähtestamiseks ja tavarežiimi naasmiseks lülituge uuesti 4K režiimile ja avage seadme käivituslaadur. 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, installige kogu operatsioonisüsteem ja püsivara uuesti, kasutades tehaseoleku süsteemikujutisi aadressilt <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>, või kasutage tööriista aadressilt <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ja valige „Tühjenda seade“, „Lukusta käivituslaadur“ ja „Installi kõik sektsioonid uuesti“."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Puudutage lisateabe vaatamiseks."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>, 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="bug_report_handler_title" msgid="713439959113250125">"Veaaruannete töötleja"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Rakenduse kinnitamise kasutamine"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Kasuta arendaja valikuid"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Printimisteenuse kasutamine"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Luba mitu kasutajat"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Kasutaja lubamise lüliti"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"luba, lubamine, mitu, kasutaja, kasutajat"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"mitu, kasutajad, profiilid, inimesed, kontod, vahetamine, palju"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Juhtmevaba silumise kasutamine"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Valige, mida oma ekraanikuval näete, kui teie tahvelarvuti on dokitud. Kui kasutate ekraanisäästjat, võib teie seade rohkem energiat tarbida."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Kohanda"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Kohanda ekraanisäästjat <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Vabas vormis toe jaoks on vaja taaskäivitada."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Töölauarežiimi teisestele ekraanidele sundimiseks on vaja taaskäivitada."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Pärand vabas vormis akende kuvamise lubamiseks on vajalik taaskäivitamine."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Vabas vormis akende kuvamise toe muutmiseks on vajalik taaskäivitamine."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Teisestel ekraanidel vabas vormis akende kuvamise sundimiseks on vajalik taaskäivitamine."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Taaskäivita kohe"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Taaskäivita hiljem"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Ruumiline heli"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Sees"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Väljas"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Sees"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Heli: %1$d%% vasak, %2$d%% parem"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Heli: %1$d%% parem, %2$d%% vasak"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Teie seadme nimi on teie installitud rakendustele nähtav. Bluetooth-seadmetega või WiFi-võrguga ühenduse loomisel või WiFi-kuumkoha seadistamisel võivad seda näha ka teised inimesed."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatiline sugu"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Grammatilise soo valimine"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Otsinguseaded"</string>
</resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 221e2cd..edf8286 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -230,7 +230,7 @@
<item msgid="2702338156976571452">"hatz-marka digitala"</item>
<item msgid="7925495329948404955">"gorputz-sentsoreak"</item>
<item msgid="8163066895749904470">"irakurri sare mugikor bidezko igorpenak"</item>
- <item msgid="7621394050624063528">"imitate kokapena"</item>
+ <item msgid="7621394050624063528">"asmatutako kokapena"</item>
<item msgid="37519917674959757">"irakurri memoria"</item>
<item msgid="3868809525697401379">"idatzi memorian"</item>
<item msgid="2504191192460059817">"piztu pantaila"</item>
@@ -297,7 +297,7 @@
<item msgid="4480721672278100858">"Hatz-marka digitala"</item>
<item msgid="7883743426029759112">"Gorputz-sentsoreak"</item>
<item msgid="2546206711741159825">"Irakurri sare mugikor bidezko igorpenak"</item>
- <item msgid="2363460595607829243">"Imitatu kokapena"</item>
+ <item msgid="2363460595607829243">"Asmatutako kokapena"</item>
<item msgid="3778165903878569143">"Irakurri memoria"</item>
<item msgid="555939881912035315">"Idatzi memorian"</item>
<item msgid="4281352581602735717">"Piztu pantaila"</item>
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Lo egiteko garaia"</item>
+ <item msgid="4152450357280759894">"Gidatzea"</item>
+ <item msgid="7096549258219399423">"Murgiltzailea"</item>
+ <item msgid="2760716776980432977">"Kudeatua"</item>
+ <item msgid="601734478369121764">"Izarra"</item>
+ <item msgid="6243809315432780521">"Egutegia"</item>
+ <item msgid="4913577903148415331">"Ordua"</item>
+ <item msgid="3653377604690057780">"Antzerkia"</item>
+ <item msgid="3843711267408385410">"Lorea"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0d06e99..0ba2161 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Gailua deskonektatu nahi duzu?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parekatu beste gailu batekin"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetootha"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktibatu automatikoki bihar"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Entzumen-gailuen ezarpenak"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Lasterbidea eta audifonoekiko bateragarritasuna"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Aurrezarpena"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Zure audiologoak ez du aurrezarpenik programatu"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ezin izan da eguneratu aurrezarpena"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio-irteera"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio-irteerari buruz"</string>
@@ -151,7 +151,7 @@
<string name="proxy_error" msgid="3615905975598084126">"Abisua"</string>
<string name="proxy_error_dismiss" msgid="4207430265140873078">"Ados"</string>
<string name="proxy_error_invalid_host" msgid="3814412792702059247">"Idatzi duzun ostalari-izena ez da baliozkoa."</string>
- <string name="proxy_error_invalid_exclusion_list" msgid="6096353559936226599">"Idatzi duzun salbuespen-zerrendak ez du formatu egokia. Idatzi kanpo utzitako domeinuen zerrenda, komaz bereizita."</string>
+ <string name="proxy_error_invalid_exclusion_list" msgid="6096353559936226599">"Idatzi duzun bazterketa-zerrendak ez du formatu egokia. Idatzi baztertzeko domeinuen zerrenda, komaz bereizita."</string>
<string name="proxy_error_empty_port" msgid="4250295137005082992">"Atakaren eremua bete behar duzu."</string>
<string name="proxy_error_empty_host_set_port" msgid="8886572276450900049">"Ataka eremuak hutsik egon behar du Ostalaria eremua ere hutsik badago."</string>
<string name="proxy_error_invalid_port" msgid="2830054691770209166">"Idatzi duzun ataka ez da baliozkoa."</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desaktibatuta"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aktibatuta / # aplikaziok kokapena atzi dezake}other{Aktibatuta / # aplikaziok kokapena atzi dezakete}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Kargatzen…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikazioek inguruko gailuak erabiltzeko baimena badute, konektatutako gailuen posizio erlatiboa zehatz dezakete."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikazioek inguruko gailuak erabiltzeko baimena badute, konektatutako gailuen posizio erlatiboa zehatz dezakete."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Aplikazioek eta zerbitzuek ez dute kokapena atzitzeko baimenik. Hala ere, larrialdietarako zenbaki batera deitzen edo mezu bat bidaltzen baduzu, baliteke larrialdi-zerbitzuei gailuaren kokapena bidaltzea."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Lortu kokapen-ezarpenei buruzko informazio gehiago"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Aldatzeko, joan ChromeOS-en ezarpenak > Pribatutasuna eta segurtasuna > Pribatutasun-ezarpenak > Kokapena erabiltzeko baimena atalera"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Gehitu dira aurpegia eta <xliff:g id="WATCH">%s</xliff:g> erlojua"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Gehitu dira aurpegia, hatz-marka eta <xliff:g id="WATCH">%s</xliff:g> erlojua"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Gehitu dira aurpegia, hatz-markak eta <xliff:g id="WATCH">%s</xliff:g> erlojua"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Beharrezkoa da identitate-egiaztapena aktibatuta dagoelako"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator-en desblokeoa"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Gehitu da erlojua"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Konfiguratu erlojua"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Lortu Erloju bidez desblokeatzea eginbideari buruzko informazio gehiago"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Gehitu erloju bat"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Kendu erlojua"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Hatz-marka eta aurpegi bidez desblokeatzea"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Aurpegi eta hatz-marka bidez desblokeatzea"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Laneko profila aurpegi eta hatz-marka bidez desblokeatzea"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Konfiguratu gabe"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Aurpegia eta hatz-markak gehitu dira"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalatu aplikazioak"</b>\n"Instalatu zure eremuan eduki nahi dituzun aplikazio pribatuak"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Gogoratu"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikazioak gelditu egiten dira eremua blokeatzen duzunean"</b>\n"Eremua blokeatzen duzunean, bertan dauzkazun aplikazioak gelditu egiten dira, eta haien jakinarazpenak jasotzeari uzten diozu"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Eremu pribatuak ez dira egokiak atzeko planoan exekutatu behar diren edo funtsezko jakinarazpenak bidali behar dituzten aplikazioetarako (adibidez, medikuntza-aplikazioak). Izan ere, jakinarazpenak eta atzeko planoko jarduerak gelditu egiten dira eremua blokeatuta dagoenean.\n\nZure eremu pribatuko aplikazioak ez dira agertuko baimenen kudeatzailean, pribatutasun-panelean eta beste ezarpenetan eremu pribatua blokeatuta dagoenean.\n\nEremu pribatua ezin da eraman beste gailu batera. Eremu pribatua beste gailu batean erabili nahi baduzu, beste bat konfiguratu beharko duzu.\n\nBaliteke zure gailua ordenagailu batekin konektatzen duten edo gailuan aplikazio kaltegarriak instalatzen dituzten guztiek zure eremu pribatua atzitu ahal izatea."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Eremu pribatuak ez dira egokiak atzeko planoan exekutatu behar diren edo funtsezko jakinarazpenak bidali behar dituzten aplikazioetarako (adibidez, medikuntza-aplikazioak). Izan ere, jakinarazpenak eta atzeko planoko jarduerak gelditu egiten dira eremua blokeatuta dagoenean.\n\nZure eremu pribatuko aplikazioak ez dira agertuko baimenen kudeatzailean, pribatutasun-panelean eta beste ezarpenetan eremu pribatua blokeatuta dagoenean.\n\nEremu pribatua ezin da leheneratu beste gailu batean. Eremua beste gailu batean erabili nahi baduzu, beste bat konfiguratu beharko duzu.\n\nBaliteke zure gailua ordenagailu batekin konektatzen duten edo gailuan asmo txarreko aplikazioak instalatzen dituzten guztiek zure eremu pribatua atzitu ahal izatea."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Lortu eremu pribatuari buruzko informazio gehiago"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Une bat beharko da"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Eremu pribatua konfiguratzen…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Gailua berrabiarazi nahi duzu?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFCaren erregistro xehatuak garapen-helburuetarako soilik dira. NFCari buruzko datu gehigarriak daude akatsen txostenetan, eta baliteke haiek informazio pribatua izatea. Ezarpen hori aldatzeko, berrabiarazi gailua."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Berrabiarazi"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"islatu, kanpoko pantaila, konektatutako pantaila, usb bidezko pantaila, bereizmena, biratzea"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Biratzea"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Arrunta"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1337,7 +1352,7 @@
<string name="module_version" msgid="1787518340082046658">"Google Play-ren sistemaren eguneratzea"</string>
<string name="battery_info" msgid="7873528123969546728">"Bateriari buruzko informazioa"</string>
<string name="device_info_not_available" msgid="4804474466616712326">"Ez dago erabilgarri"</string>
- <string name="storage_settings" msgid="7472188817781592677">"Memoria"</string>
+ <string name="storage_settings" msgid="7472188817781592677">"Biltegiratzeko tokia"</string>
<string name="storage_settings_for_app" msgid="229425418984637483">"Memoria eta cachea"</string>
<string name="storage_settings_title" msgid="486118156723194815">"Memoriaren ezarpenak"</string>
<string name="status_eid" msgid="3588471107671992684">"EIDa"</string>
@@ -1563,7 +1578,7 @@
<string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Wifi-laguntzailea aldatu nahi duzu?"</string>
<string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Sareko konexioak kudeatzeko <xliff:g id="NEW_APP">%1$s</xliff:g> erabili nahi duzu, <xliff:g id="CURRENT_APP">%2$s</xliff:g> erabili beharrean?"</string>
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"<xliff:g id="NEW_APP">%s</xliff:g> erabili nahi duzu sareko konexioak kudeatzeko?"</string>
- <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Azken kokapen-eskaerak"</string>
+ <string name="location_category_recent_location_requests" msgid="2205900488782832082">"Azkenaldiko kokapen-eskaerak"</string>
<string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Laneko profilaren kokapena"</string>
<string name="private_profile_location_switch_title" msgid="4127119143109855789">"Eremu pribatuaren kokapena"</string>
<string name="location_app_level_permissions" msgid="907206607664629759">"Aplikazioen kokapen-baimenak"</string>
@@ -1659,7 +1674,7 @@
<string name="lockpassword_confirm_your_password_generic_profile" msgid="5918738487760814147">"Aurrera egiteko, idatzi laneko pasahitza"</string>
<string name="lockpassword_strong_auth_required_device_pattern" msgid="113817518413715557">"Segurtasuna bermatzeko, marraztu gailuaren eredua"</string>
<string name="lockpassword_strong_auth_required_device_pin" msgid="9163822166411129815">"Segurtasuna bermatzeko, idatzi gailuaren PINa"</string>
- <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"Segurtasuna bermatzeko, idatzi gailuaren pasahitza"</string>
+ <string name="lockpassword_strong_auth_required_device_password" msgid="8310047427464299337">"Segurtasuna bermatzeko, idatzi gailuko pasahitza"</string>
<string name="lockpassword_strong_auth_required_work_pattern" msgid="6803652050512161140">"Segurtasuna bermatzeko, marraztu laneko eredua"</string>
<string name="lockpassword_strong_auth_required_work_pin" msgid="4208510396448713500">"Segurtasuna bermatzeko, idatzi laneko PINa"</string>
<string name="lockpassword_strong_auth_required_work_password" msgid="6119482061429323090">"Segurtasuna bermatzeko, idatzi laneko pasahitza"</string>
@@ -1678,7 +1693,7 @@
<string name="lockpassword_confirm_repair_mode_password_header" msgid="3064676176428495228">"Egiaztatu pasahitza"</string>
<string name="lockpassword_confirm_repair_mode_pattern_details" msgid="6187536224419477465">"Aurrera egiteko, marraztu gailuaren eredua"</string>
<string name="lockpassword_confirm_repair_mode_pin_details" msgid="203022189107305807">"Aurrera egiteko, idatzi gailuaren PINa"</string>
- <string name="lockpassword_confirm_repair_mode_password_details" msgid="4860219600771003873">"Aurrera egiteko, idatzi gailuaren pasahitza"</string>
+ <string name="lockpassword_confirm_repair_mode_password_details" msgid="4860219600771003873">"Aurrera egiteko, idatzi gailuko pasahitza"</string>
<string name="lockpassword_invalid_pin" msgid="7530854476819820600">"PINa ez da zuzena"</string>
<string name="lockpassword_invalid_password" msgid="1588184930542221687">"Pasahitza ez da zuzena"</string>
<string name="lockpattern_need_to_unlock_wrong" msgid="8109305107409924083">"Eredua ez da zuzena"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Erabili pantailako teklatua"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Erakutsi pantailan teklatu fisikoa aktibo dagoen bitartean"</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>
<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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Aldatu erakusle-betetzearen estiloa horira"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Aldatu erakusle-betetzearen estiloa arrosara"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Aldatu erakusle-betetzearen estiloa urdinera"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Erakuslearen trazuaren estiloa"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Zuria"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Beltza"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Bat ere ez"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Erabiltzaileak hautatua: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Hizketa"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Erakuslearen abiadura"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Erakuslearen eskala"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Txikitu erakuslearen eskala"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Handitu erakuslearen eskala"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Bideo-jokoen kontrolagailua"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Birbideratu dardara"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Bidali dardara bideo-jokoen kontrolagailura hura konektatzean"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Egin aurrera, halere"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Utzi"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Luparen ezarpenak"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Hatz batekin mugitzea"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mugitu lupa hatz batekin"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arrastatu hatz 1 pantailatik mugitzeko."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mugitu luparen eremua hatz bat arrastatuta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mugitu luparen eremua bi hatz arrastatuta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ez dago erabilgarri pantailaren zati bat soilik handitzean"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zooma aplikatzeko, sakatu botoi bat"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Handitu pantaila bizkor edukia hobeto ikusteko"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Pantaila handitzeko:</b><br/> {0,number,integer}. Erabili lupa aktibatzeko lasterbidea.<br/> {1,number,integer}. Sakatu pantaila.<br/> {2,number,integer}. Arrastatu bi hatz pantailan zehar mugitzeko.<br/> {3,number,integer}. Atximurkatu pantaila bi hatz erabilita zooma doitzeko.<br/> {4,number,integer}. Erabili lupa desaktibatzeko lasterbidea.<br/><br/> <b>Pantaila une batez handitzeko:</b><br/> {0,number,integer}. Ziurtatu lupa mota pantaila oso gisa ezarrita dagoela.<br/> {1,number,integer}. Erabili lupa aktibatzeko lasterbidea.<br/> {2,number,integer}. Eduki sakatuta pantailako edozein puntu.<br/> {3,number,integer}. Arrastatu hatz bat pantailan zehar mugitzeko.<br/> {4,number,integer}. Jaso hatza lupa desaktibatzeko."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Pantaila handitzeko:</b><br/> {0,number,integer}. Erabili lupa aktibatzeko lasterbidea.<br/> {1,number,integer}. Sakatu pantaila.<br/> {2,number,integer}. Arrastatu 2 hatz pantailan zehar mugitzeko.<br/> {3,number,integer}. Atximurkatu 2 hatz zooma doitzeko.<br/> {4,number,integer}. Erabili lasterbidea luparen eginbidea gelditzeko.<br/><br/> Gainera, aldi baterako handi dezakezu, besteak beste."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Pantaila handitzeko:</b><br/> {0,number,integer}. Erabili lupa aktibatzeko lasterbidea.<br/> {1,number,integer}. Sakatu pantaila.<br/> {2,number,integer}. Arrastatu 1 edo 2 hatz pantailan barna mugitzeko.<br/> {3,number,integer}. Atximurkatu 2 hatz zooma doitzeko.<br/> {4,number,integer}. Erabili lasterbidea luparen eginbidea gelditzeko.<br/><br/> Gainera, aldi baterako handi dezakezu, besteak beste."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Zooma aktibatuta badago, pantailan aplika dezakezu.\n\n"<b>"Handitzeko"</b>", ireki zooma eta sakatu pantailako edozein puntu.\n"<ul><li>"Arrastatu bi hatz edo gehiago gora eta behera egiteko."</li>\n<li>"Atximurkatu pantaila bi hatz edo gehiago erabilita zooma doitzeko."</li></ul>\n\n<b>"Zooma unetxo batez aplikatzeko"</b>", ireki zooma eta eduki sakatuta pantailako edozein puntu.\n"<ul><li>"Arrastatu hatza toki batetik bestera joateko."</li>\n<li>"Altxatu hatza txikitzeko."</li></ul>\n\n"Ezin da aplikatu zooma teklatuan edo nabigazio-barran."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g> orria"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Erabilerraztasuna botoiaren lasterbidea"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Bat ere ez}=1{1 programazio ezarri da}other{# programazio ezarri dira}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ez molestatzeko modua"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Lehentasunezko moduak"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Gehitu modu bat"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Jaso jende eta aplikazio garrantzitsuen jakinarazpenak soilik"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Hautatu aktibazio mota"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ordua"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Adibidez, \"9:30-17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Egutegia"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Adibidez, \"Egutegi pertsonala\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Sortu modu bat"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Pertsonalizatua"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Mugatu etenaldiak"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktibatu ez molestatzeko modua"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmek eta multimedia-soinuek eten dezakete"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programazioak"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Ezabatu programazioak"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Ezabatu"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Aldatu izena"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Ezabatu"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" modua ezabatu nahi duzu?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editatu"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programazioak"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programazioa"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Gehitu egutegi bat"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Erabili zure egutegia"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programazioa"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Ezarri programazio bat"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programazioa"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h eta <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Aktibatu automatikoki"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programazioa"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Isilarazi telefonoa ordu jakinetan"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Ezarri ez molestatzeko moduaren arauak"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Baimendu soinua duten etenaldiak"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokeatu oztopo bisualak"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Baimendu seinale bisualak"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Hala eta guztiz ere jasoko dituzun jakinarazpenak"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Egon kontzentratuta"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Ekintza gehiago"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desaktibatuta}=1{Desaktibatuta / 1 modu aktiba daiteke automatikoki}other{Desaktibatuta / # modu aktiba daitezke automatikoki}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Bistaratze-ezarpenak"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Bistaratze-aukerak"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grisen eskala"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"gaitu gai iluna"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Aldatu sistema eragilearen eta aplikazioen ezarpenak atzeko plano ilun batean testu argia bistaratzea hobesteko. Hala, begiak ez dira horrenbeste behartzen eta bateria nabarmen aurrezten da gailu batzuetan."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ez da aldaketarik egin pantailan}=1{{effect_1}}=2{{effect_1} eta {effect_2}}=3{{effect_1}, {effect_2} eta {effect_3}}other{{effect_1}, {effect_2} eta beste #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Iragazi etenak"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ez da etenik iragazten"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Iragazitako jakinarazpenen bistaratze-aukerak"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Ez molestatzeko modua aktibatuta dagoenean"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ez egin soinurik jakinarazpenak jasotzean"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"jakinarazpena ireki"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Eman jakinarazpenak atzeratzeko baimena"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Jakinarazpen-biribiltxoa aplikazioaren ikonoan"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Jakinarazpen multzoak"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbuilak"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbuilak"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bistaratu elkarrizketa hau burbuila gisa"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Aplikazio honek ez ditu onartzen ezarpen hobetuak"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Ezarpen gehiago"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Aplikazioaren barruan dituzu ezarpen gehiago"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Jakinarazpenen bolumena jaisteko aldia"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Aplikatu laneko profiletan"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Aplikatu laneko profileko aplikazioetan"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategoriak"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Beste batzuk"</string>
<string name="no_channels" msgid="4716199078612071915">"Aplikazio honek ez du argitaratu jakinarazpenik"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Erakutsi erabili gabeko kategoriak"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Aplikazioaren ezarpen gehiago"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Erakutsi erabili gabeko kategoriak"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ezkutatu erabili gabeko kategoriak"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Eten dezaketen aplikazioak"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Hautatutako aplikazioak"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Bat ere ez"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Guztiak"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Hautatu aplikazio gehiago"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ez dago eten dezakeen ezer"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ez dago eten dezakeen pertsonarik"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Pertsona batzuek eten dezakete"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Edonork eten dezake"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Berriro deitzen dutenak"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Baimendu berriro deitzen dutenen deiak"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Aldatu alarmak soilik modura ordubetez {time} arte}other{Aldatu alarmak soilik modura # orduz {time} arte}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Aldatu \"Alarmak soilik\" modura <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> arte"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Aldatu \"Eten beti\" modura"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Editatu modua"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Gehitu 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="warning_button_text" msgid="1274234338874005639">"Abisua"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Itxi"</string>
<string name="device_feedback" msgid="5351614458411688608">"Bidali gailu honi buruzko oharrak"</string>
@@ -4127,7 +4172,7 @@
<string name="ota_disable_automatic_update_summary" msgid="7803279951533276841">"Aplikatu eguneratzeak gailua berrabiaraztean"</string>
<string name="usage" msgid="287782903846013936">"Erabilera"</string>
<string name="cellular_data_usage" msgid="5874156338825285334">"Datu-konexioaren erabilera"</string>
- <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioak erabilitako datuak"</string>
+ <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioen datu-erabilera"</string>
<string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-sareko datu-erabilera"</string>
<string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datuen erabilera"</string>
<string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-datuen erabilera"</string>
@@ -4286,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Nabigazio modua"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"2 botoiko nabigazioa"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Aplikazioa aldatzeko, pasatu hatza gora Hasiera botoian. Aplikazio guztiak ikusteko, pasatu hatza gora berriro. Atzera egiteko, sakatu Atzera botoia."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Segurtasuna eta larrialdiak"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Segurtasun fisikoa eta larrialdiak"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"SOS larrialdia, osasunari buruzko informazioa, alertak"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Keinu bidezko nabigazioa"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Orri nagusira joateko, pasatu hatza pantailaren behealdetik gora. Aplikazioa aldatzeko, pasatu hatza pantailaren behealdetik gora eta eduki sakatuta une batez, guztiz altxatu aurretik. Atzera egiteko, pasatu hatza pantailaren ezkerreko edo eskuineko ertzetik beste aldera."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Kutxa"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Ezarpenen panela"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Behartu ordenagailuetarako modua erabiltzera"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Behartu ordenagailuetarako modu esperimentala erabiltzera bigarren mailako pantailetan"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Gaitu estilo libreko leihoak"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Onartu estilo libreko leihoak."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Gaitu estilo libreko leihoak bigarren pantailan"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Gaitu estilo libreko leihoak bigarren mailako pantailan soilik."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Gaitu tamaina aldagarria ez duten aplikazioak leiho bat baino gehiagoko moduan"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tamaina aldagarria ez duten aplikazioak leiho bat baino gehiagoko moduan izateko aukera ematen du"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ez aplikatu gai iluna"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Gailu honen datuen partizioa ext4-ra bihurtu behar da 16 kB-ko garatzaileentzako aukera erabili baino lehen. Modu horretan ezin da bermatu softwarearen osotasuna, eta baliteke telefonoan gordetako datuak arriskuan egotea sistema eragilearen abiarazlea desblokeatuta dagoen bitartean. 16 kB-ko aukera aktibatzeko, berriro berrabiarazi beharko da berrabiarazte honen ondoren. Modu horretan zaudenean, 4 kB-ko eta 16 kB-ko moduen artean aldatu ahal izango duzu behin soilik berrabiarazita. Modu horietan, eginbide batzuk desgaituko dira; beraz, baliteke aplikazio batzuek ez funtzionatzea. Gailua jatorrizko modura itzultzeko, aldatu berriro 4 kB-ko modura eta blokeatu sistema eragilearen abiarazlea. Gailuaren jatorrizko datuak berrezarriko dira. Gailuak Android behar bezala abiarazten duenean, desgaitu OEMa desblokeatzeko aukera Garatzaileentzako aukerak atalean. Berretsi ondoren, gailua xahutuko da eta fitxategi-sistema ext4-ra aldatuko da. Prozesu hori osatu ondoren, itzuli hona 16 kB-ko modua berriro gaitzeko."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Ezabatu datu guztiak"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Ezin izan da formateatu eta xahutu datu-partizioa ext4-ra."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Sistema eragilearen abiarazlea desblokeatu behar da 16 kB-ko modua erabiltzeko"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Sistema eragilearen abiarazlea desblokeatu behar da"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 kB-ko garatzaileentzako aukera erabili baino lehen, gailuaren sistema eragilearen abiarazlea desblokeatu behar da. Modu horretan ezin da bermatu softwarearen osotasuna, eta baliteke telefonoan gordetako datuak arriskuan egotea sistema eragilearen abiarazlea desblokeatuta dagoen bitartean. 16 kB-ko modua aktibatzean, erabiltzaile-datu eta -ezarpen guztiak xahutuko dira. Sistema eragilearen abiarazlea desblokeatu ondoren, gailua 2 aldiz berrabiarazi beharko da 16 kB-ko moduaren aukera aktibatzeko. Modu horretan zaudenean, 4 kB-ko eta 16 kB-ko moduen artean aldatu ahal izango duzu behin soilik berrabiarazita. Modu horietan, eginbide batzuk desgaituko dira; beraz, baliteke aplikazio batzuek ez funtzionatzea. Gailua jatorrizko modura itzultzeko, aldatu berriro 4 kB-ko modura eta blokeatu gailuaren sistema eragilearen abiarazlea edo OEMa. Gailuaren jatorrizko datuak berrezarriko dira. Desblokeatu sistema eragilearen abiarazlea eta saiatu berriro. Hori egiteko argibideak jasotzeko, joan <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> helbidera."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Orri-tamaina guztiekin bateragarria den 4 kB-ko modua erabiltzen"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Orri-tamaina guztiekin bateragarria den moduko 4 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, blokeatu gailuaren sistema eragilearen abiarazlea. Informazio gehiago irakurtzeko, sakatu hau."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Orri-tamaina guztiekin bateragarria den moduko 4 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, 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 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> helbidetik) gailuan. Bestela, erabili <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Orri-tamaina guztiekin bateragarria den 16 kB-ko modua erabiltzen"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Orri-tamaina 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. Informazio gehiago irakurtzeko, sakatu hau."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Orri-tamaina 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 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> helbidetik) gailuan. Bestela, erabili <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Informazio gehiago irakurtzeko, sakatu hau."</string>
+ <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 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> helbidetik) gailuan. Bestela, erabili <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Akatsen txostenen kudeatzailea"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Erabili aplikazioak ainguratzeko eginbidea"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Erabili garatzaileentzako aukerak"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Erabili inprimatze-zerbitzua"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Baimendu erabiltzaile bat baino gehiago"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Eman erabiltzailea aldatzeko baimena"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"eman, baimena, onartu, hainbat, erabiltzaile, bat, baino, gehiago"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"hainbat, erabiltzaile, profil, pertsona, kontu, aldatu, asko"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Erabili hari gabeko arazketa"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Aukeratu zer ikusiko den pantailan tableta oinarrian dagoenean. Baliteke gailuak energia gehiago erabiltzea pantaila-babeslea erabiltzen denean."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Pertsonalizatu"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Pertsonalizatu <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Estilo librerako bateragarritasuna gaitzeko, gailua berrabiarazi egin behar da."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Mahaigaineko modua bigarren mailako pantailetan erabiltzera behartzeko, gailua berrabiarazi egin behar da."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Aurreko bertsioko estilo libreko leihoak onartu ahal izateko, gailua berrabiarazi egin behar da."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Estilo libreko leihoak onartzeko aukera aldatzeko, gailua berrabiarazi egin behar da."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Bigarren mailako pantailetan estilo libreko leihoak onartzera behartzeko, gailua berrabiarazi egin behar da."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Berrabiarazi"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Berrabiarazi geroago"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio espaziala"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aktibatuta"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desaktibatuta"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aktibatuta"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audioa: %1$d%% ezkerrean; %2$d%% eskuinean"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audioa: %1$d%% eskuinean; %2$d%% ezkerrean"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Instalatu dituzun aplikazioek gailuaren izena ikus dezakete. Baliteke jendeak ere ikustea Bluetooth bidezko gailuetara edo wifi-sare batera konektatzean, edo wifi-gune bat konfiguratzean."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genero gramatikala"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Hautatu genero gramatikala"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Bilatu ezarpenetan"</string>
</resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index cea3bff..6e283ef 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -207,9 +207,9 @@
<item msgid="3843484466100107397">"فوکوس صدا"</item>
<item msgid="617344340943430125">"میزان کنترل"</item>
<item msgid="1249691739381713634">"میزان صدا"</item>
- <item msgid="6485000384018554920">"حجم حلقه"</item>
+ <item msgid="6485000384018554920">"صدای زنگ"</item>
<item msgid="3378000878531336372">"میزان صدای رسانه"</item>
- <item msgid="5272927168355895681">"میزان صدای زنگ ساعت"</item>
+ <item msgid="5272927168355895681">"صدای زنگ هشدار"</item>
<item msgid="4422070755065530548">"میزان صدای اعلان"</item>
<item msgid="3250654589277825306">"میزان صدای بلوتوث"</item>
<item msgid="4212187233638382465">"بیدار باش"</item>
@@ -274,9 +274,9 @@
<item msgid="5651140069431283570">"فوکوس صدا"</item>
<item msgid="745291221457314879">"میزان صدای اصلی"</item>
<item msgid="4722479281326245754">"میزان صدای مکالمه"</item>
- <item msgid="6749550886745567276">"میزان صدای زنگ"</item>
+ <item msgid="6749550886745567276">"صدای زنگ"</item>
<item msgid="2218685029915863168">"میزان صدای رسانه"</item>
- <item msgid="4266577290496513640">"میزان صدای زنگ ساعت"</item>
+ <item msgid="4266577290496513640">"صدای زنگ هشدار"</item>
<item msgid="8608084169623998854">"میزان صدای اعلان"</item>
<item msgid="7948784184567841794">"میزان صدای بلوتوث"</item>
<item msgid="1148968792599973150">"بیدار باش"</item>
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"وقت خواب"</item>
+ <item msgid="4152450357280759894">"رانندگی"</item>
+ <item msgid="7096549258219399423">"فراگیر"</item>
+ <item msgid="2760716776980432977">"مدیریتشده"</item>
+ <item msgid="601734478369121764">"ستاره"</item>
+ <item msgid="6243809315432780521">"تقویم"</item>
+ <item msgid="4913577903148415331">"زمان"</item>
+ <item msgid="3653377604690057780">"تئاتر"</item>
+ <item msgid="3843711267408385410">"گل"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a7b2b66..b228437 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -23,7 +23,7 @@
<string name="deny" msgid="7326117222944479942">"اجازه ندادن"</string>
<string name="confirmation_turn_on" msgid="2979094011928347665">"روشن کردن"</string>
<string name="device_info_default" msgid="1406619232867343310">"ناشناس"</string>
- <string name="device_info_protected_single_press" msgid="3810785480060743677">"برای نمایش اطلاعات، ضربه بزنید"</string>
+ <string name="device_info_protected_single_press" msgid="3810785480060743677">"برای نمایش اطلاعات، تکضرب بزنید"</string>
<string name="show_dev_countdown" msgid="2936506773086395069">"{count,plural, =1{اکنون # گام تا توسعهدهنده شدن فاصله دارید.}one{اکنون # گام تا توسعهدهنده شدن فاصله دارید.}other{اکنون # گام تا توسعهدهنده شدن فاصله دارید.}}"</string>
<string name="show_dev_on" msgid="2840850085134853754">"شما اکنون یک برنامهنویس هستید!"</string>
<string name="show_dev_already" msgid="7041756429707644630">"نیازی نیست، شما در حال حاضر یک برنامهنویس هستید."</string>
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ارتباط دستگاه قطع شود؟"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"جفت کردن دستگاه جدید"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوتوث"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"فردا بهطور خودکار روشن شود"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"تنظیمات دستگاه سمعک"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"میانبر، سازگاری با سمعک"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"پیشتنظیم"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"متخصص شنواییسنجی شما هیچ پیشتنظیمی برنامهریزی نکرده است"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"پیشتنظیم بهروزرسانی نشد"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"خروجی صوتی"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"درباره خروجی صوتی"</string>
@@ -93,9 +93,9 @@
<string name="bluetooth_no_devices_found" msgid="7704539337219953182">"هیچ دستگاه بلوتوثی در این اطراف پیدا نشد."</string>
<string name="bluetooth_notif_ticker" msgid="209515545257862858">"درخواست مرتبطسازی"</string>
<string name="bluetooth_notif_title" msgid="1196532269131348647">"درخواست مرتبطسازی"</string>
- <string name="bluetooth_notif_message" msgid="5584717784198086653">"برای مرتبطسازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ضربه بزنید."</string>
+ <string name="bluetooth_notif_message" msgid="5584717784198086653">"برای مرتبطسازی با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> تکضرب بزنید."</string>
<string name="bluetooth_devices_card_off_title" msgid="1320149821945129127">"بلوتوث خاموش است"</string>
- <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"برای روشن کردن آن، ضربه بزنید"</string>
+ <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"برای روشن کردن آن، تکضرب بزنید"</string>
<string name="device_picker" msgid="2427027896389445414">"انتخاب دستگاه بلوتوث"</string>
<string name="bluetooth_ask_enablement" msgid="1529030199895339199">"<xliff:g id="APP_NAME">%1$s</xliff:g> میخواهد بلوتوث را روشن کند"</string>
<string name="bluetooth_ask_disablement" msgid="1879788777942714761">"<xliff:g id="APP_NAME">%1$s</xliff:g> میخواهد بلوتوث را خاموش کند"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"خاموش"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{روشن / # برنامه به مکان دسترسی دارد}one{روشن / # برنامه به مکان دسترسی دارد}other{روشن / # برنامه به مکان دسترسی دارند}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"درحال بارگیری…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"برنامههایی که اجازه «دستگاههای اطراف» را دارند میتوانند موقعیت نسبی دستگاههای متصل را مشخص کنند."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"برنامههایی که اجازه دستگاههای اطراف را دارند میتوانند موقعیت نسبی دستگاههای متصل را تشخیص دهند."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"دسترسی به مکان برای برنامهها و سرویسها خاموش است. وقتی با شماره تلفن اضطراری تماس میگیرید یا به آن پیامک ارسال میکنید، ممکن است مکان دستگاهتان همچنان برای مسئولان خدمات اضطراری ارسال شود."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"درباره «تنظیمات مکان» بیشتر بدانید"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"برای تغییر، به «تنظیمات ChromeOS < حریم خصوصی و امنیت < تنظیمات حریم خصوصی < دسترسی مکان» بروید"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"چهره و <xliff:g id="WATCH">%s</xliff:g> اضافه شد"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"چهره، اثر انگشت، و <xliff:g id="WATCH">%s</xliff:g> اضافه شد"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"چهره، اثر انگشت، و <xliff:g id="WATCH">%s</xliff:g> اضافه شد"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"این مورد الزامی است چون «بررسی هویت» روشن است"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"قفلگشایی برنامه اصالتسنجی از دور"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ساعت اضافه شد"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"راهاندازی ساعت"</string>
@@ -419,25 +420,25 @@
<string name="security_settings_remoteauth_enroll_introduction_more" msgid="1644105894631257595">"بیشتر"</string>
<string name="security_settings_remoteauth_enroll_introduction_how_title" msgid="6604152528267830349">"روش کار"</string>
<string name="security_settings_remoteauth_enroll_introduction_info_lock_open" msgid="8570511335628725116">"قفل ساعتتان باید باز باشد، ساعت روی مچ شما باشد، و به این تلفن نزدیک باشد. وقتی ساعت روی مچ شما است دیگر نیازی نیست قفل آن را باز کنید."</string>
- <string name="security_settings_remoteauth_enroll_introduction_info_notifications" msgid="4298855831154039694">"وقتی قفل این تلفن باز شود، اعلانی در ساعتتان دریافت میکنید. اگر قفل تلفن بدون اینکه شما خواسته باشید باز شد، روی اعلان ضربه بزنید تا تلفن دوباره قفل شود."</string>
+ <string name="security_settings_remoteauth_enroll_introduction_info_notifications" msgid="4298855831154039694">"وقتی قفل این تلفن باز شود، اعلانی در ساعتتان دریافت میکنید. اگر قفل تلفن بدون اینکه شما خواسته باشید باز شد، روی اعلان تکضرب بزنید تا تلفن دوباره قفل شود."</string>
<string name="security_settings_remoteauth_enroll_introduction_youre_in_control_title" msgid="7974976673323638524">"کنترل در دست شما است"</string>
<string name="security_settings_remoteauth_enroll_introduction_info_remove_watch" msgid="1888318677088986801">"همواره میتوانید در «تنظیمات» ساعتتان را از «قفلگشایی با ساعت» بردارید"</string>
- <string name="security_settings_remoteauth_enroll_introduction_animation_tap_notification" msgid="1597397399097952974">"روی اعلان ضربه بزنید"</string>
+ <string name="security_settings_remoteauth_enroll_introduction_animation_tap_notification" msgid="1597397399097952974">"روی اعلان تکضرب بزنید"</string>
<string name="security_settings_remoteauth_enroll_introduction_animation_swipe_up" msgid="2129230804324634653">"در صفحه قفل تند بهبالا بکشید"</string>
<string name="security_settings_remoteauth_enroll_enrolling_title" msgid="313016997943607675">"ساعت را انتخاب کنید"</string>
<string name="security_settings_remoteauth_enroll_enrolling_list_heading" msgid="8227585438932911013">"ساعتهای دردسترس"</string>
<string name="security_settings_remoteauth_enroll_enrolling_disagree" msgid="1670201454188049863">"لغو"</string>
<string name="security_settings_remoteauth_enroll_enrolling_agree" msgid="7048336252635730908">"تأیید"</string>
<string name="security_settings_remoteauth_enroll_finish_title" msgid="3807372930755413112">"همه چیز آماده است!"</string>
- <string name="security_settings_remoteauth_enroll_finish_description" msgid="4876209907275244653">"اکنون وقتی روی صفحه قفل به بالا میکشید یا روی اعلان ضربه میزنید، میتوانید از ساعتتان برای باز کردن قفل این تلفن استفاده کنید."</string>
+ <string name="security_settings_remoteauth_enroll_finish_description" msgid="4876209907275244653">"اکنون وقتی روی صفحه قفل به بالا میکشید یا روی اعلان تکضرب میزنید، میتوانید از ساعتتان برای باز کردن قفل این تلفن استفاده کنید."</string>
<string name="security_settings_remoteauth_enroll_finish_btn_next" msgid="8072138423143889592">"تمام"</string>
<string name="security_settings_remoteauth_settings_title" msgid="1564912618737165129">"قفلگشایی با ساعت"</string>
- <string name="security_settings_remoteauth_settings_description" msgid="2758239650119457964">"وقتی روی صفحه قفل به بالا میکشید یا روی اعلان ضربه میزنید، میتوانید از ساعتتان برای باز کردن قفل این تلفن استفاده کنید."</string>
+ <string name="security_settings_remoteauth_settings_description" msgid="2758239650119457964">"وقتی روی صفحه قفل به بالا میکشید یا روی اعلان تکضرب میزنید، میتوانید از ساعتتان برای باز کردن قفل این تلفن استفاده کنید."</string>
<string name="security_settings_remoteauth_settings_info_footer" msgid="795894033901478120">"برای استفاده از «قفلگشایی با ساعت»، قفل ساعت باید باز باشد، ساعت روی مچ دستتان باشد و به این تلفن متصل باشد. اگر اتصال قطع شد، برای اینکه بتوانید از «قفلگشایی با ساعت» استفاده کنید، باید قفل تلفن را باز کنید.\n\nبهخاطر داشته باشید:\nبهصورت همزمان فقط میتوانید یک ساعت را راهاندازی کنید. برای افزودن ساعتی دیگر، ابتدا ساعت فعلی را حذف کنید."</string>
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"درباره «قفلگشایی با ساعت» بیشتر بدانید"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"افزودن ساعت"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"برداشتن ساعت"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"قفلگشایی با اثر انگشت و چهره"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"قفلگشایی با چهره و اثر انگشت"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"«قفلگشایی با اثر انگشت و چهره» برای نمایه کاری"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"راهاندازی لازم است"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"چهره و چند اثر انگشت اضافه شده است"</string>
@@ -554,7 +555,7 @@
<string name="private_space_biometric_title" msgid="3934339826674553174">"قفلگشایی با اثر انگشت و چهره"</string>
<string name="private_space_fingerprint_title" msgid="5989254643211889931">"قفلگشایی با اثر انگشت"</string>
<string name="private_space_face_title" msgid="3290402865367663079">"قفلگشایی با چهره"</string>
- <string name="private_space_biometric_summary" msgid="4403837276018724581">"برای راهاندازی ضربه بزنید"</string>
+ <string name="private_space_biometric_summary" msgid="4403837276018724581">"برای راهاندازی تکضرب بزنید"</string>
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"قفلگشایی با اثر انگشت برای فضای خصوصی"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"قفلگشایی با چهره برای فضای خصوصی"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"قفلگشایی با اثر انگشت و چهره برای فضای خصوصی"</string>
@@ -583,7 +584,7 @@
<string name="private_space_hide_page_summary" msgid="6247773353685839242">"برای اینکه دیگران متوجه نشوند فضای خصوصی در دستگاهتان روشن است، میتوانید آن را از فهرست برنامهها پنهان کنید"</string>
<string name="private_space_access_header" msgid="1077082416567150819">"دسترسی به فضای خصوصی هنگام پنهان بودن"</string>
<string name="private_space_search_description" msgid="1538155187658429618">"در نوار جستجو، عبارت «فضای خصوصی» را وارد کنید"</string>
- <string name="private_space_tap_tile_description" msgid="6173556870938267361">"روی "<b>"فضای خصوصی"</b>" ضربه بزنید"</string>
+ <string name="private_space_tap_tile_description" msgid="6173556870938267361">"روی "<b>"فضای خصوصی"</b>" تکضرب بزنید"</string>
<string name="private_space_unlock_description" msgid="5527228922778630361">"باز کردن قفل فضای خصوصی"</string>
<string name="private_space_hide_off_summary" msgid="8565973976602078315">"خاموش"</string>
<string name="private_space_hide_on_summary" msgid="3450844101901438867">"روشن"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"نصب برنامه"</b>\n"برنامههایی را که میخواهید در فضایتان بهصورت خصوصی حفظ شود نصب کنید"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"بهخاطر داشته باشید"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"برنامهها هنگام قفل کردن فضا متوقف میشوند"</b>\n"وقتی فضای خود را قفل میکنید، برنامههای موجود در فضا متوقف میشوند و اعلانی از آنها دریافت نخواهید کرد"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"فضاهای خصوصی برای برنامههایی که لازم است در پسزمینه اجرا شوند یا اعلانهای مهم ارسال کنند (مانند برنامههای پزشکی) مناسب نیستند. زیرا وقتی فضای شما قفل باشد، اعلانها و فعالیت پسزمینه متوقف میشود.\n\nوقتی فضای خصوصی شما قفل است، برنامههای موجود در فضای خصوصی شما در مدیر اجازهها، داشبورد حریم خصوصی، و تنظیمات دیگر نشان داده نمیشود.\n\nفضای خصوصی را نمیتوان به دستگاه جدید منتقل کرد. اگر میخواهید از آن در دستگاه دیگری استفاده کنید، باید فضای خصوصی دیگری راهاندازی کنید.\n\nهر کسی که دستگاه شما را به رایانه متصل کند یا برنامههای مخرب در دستگاهتان نصب کند ممکن است بتواند به فضای خصوصی شما دسترسی داشته باشد."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"فضاهای خصوصی برای برنامههایی که لازم است در پسزمینه اجرا شوند یا اعلانهای مهم ارسال کنند (مانند برنامههای پزشکی) مناسب نیستند. زیرا وقتی فضای شما قفل باشد، اعلانها و فعالیت پسزمینه متوقف میشود.\n\nوقتی فضای خصوصی قفل است، برنامههای موجود در فضای خصوصی در مدیر اجازهها، داشبورد حریم خصوصی، و تنظیمات دیگر نشان داده نمیشود.\n\nفضای خصوصی را نمیتوان در دستگاه جدید بازیابی کرد. اگر میخواهید از فضای خصوصی در دستگاه دیگری استفاده کنید، باید فضای دیگری راهاندازی کنید.\n\nهر شخصی که دستگاه شما را به رایانه متصل کند یا برنامههای مخرب روی دستگاهتان نصب کند، ممکن است بتواند به فضای خصوصی شما دسترسی داشته باشد."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"درباره فضای خصوصی بیشتر بدانید"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"این کار چند لحظه طول میکشد"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"درحال راهاندازی فضای خصوصی…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"دستگاه بازراهاندازی شود؟"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"گزارشگیری NFC دقیق فقط برای اهداف توسعه درنظر گرفته شده است. دادههای NFC تکمیلی در گزارشهای اشکال لحاظ میشود که ممکن است حاوی اطلاعات خصوصی باشد. برای تغییر این تنظیم، دستگاهتان را بازراهاندازی کنید."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"بازراهاندازی"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"قرینهسازی, نمایشگر خارجی, نمایشگر متصل, نمایشگر usb, وضوح, چرخش"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"چرخش"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"استاندارد"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"۹۰°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"۱۸۰°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"۲۷۰°"</string>
+ <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="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>
@@ -887,7 +901,7 @@
<string name="android_beam_on_summary" msgid="6067720758437490896">"آماده برای انتقال محتوای برنامه از طریق NFC"</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="android_beam_explained" msgid="5684416131846701256">"اگر این ویژگی روشن باشد، میتوانید با نگهداشتن دستگاهها نزدیک به یکدیگر، محتوای برنامه را به دستگاه مجهز به NFC دیگری با پرتو ارسال کنید. مثلاً، میتوانید صفحات وب، ویدیوهای YouTube، مخاطبین و موارد دیگر را ازطریق پرتو ارسال کنید.\n\n کافی است دستگاهها را نزدیک هم بگذارید (معمولاً پشت به پشت) و سپس روی صفحه تکضرب بزنید. برنامه تعیین میکند که چه چیزی ازطریق پرتو ارسال شود."</string>
<string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
<string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"استفاده از Wi-Fi"</string>
<string name="wifi_settings_category" msgid="3523464780563778321">"تنظیمات Wi-Fi"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1206,7 +1221,7 @@
<string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"بالاترین نرخ بازآوری برای پاسخگویی بهبودیافته لمس و کیفیت پویانمایی. مصرف باتری را افزایش میدهد."</string>
<string name="adaptive_sleep_title" msgid="2987961991423539233">"توجه به صفحه"</string>
<string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"دسترسی به دوربین لازم است"</string>
- <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"ویژگی «توجه به صفحه» باید به دوربین دسترسی داشته باشد. برای مدیریت مجوزهای «خدمات شخصیسازی دستگاه» ضربه بزنید"</string>
+ <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"ویژگی «توجه به صفحه» باید به دوربین دسترسی داشته باشد. برای مدیریت مجوزهای «خدمات شخصیسازی دستگاه» تکضرب بزنید"</string>
<string name="adaptive_sleep_manage_permission_button" msgid="1404510197847664846">"مدیریت اجازهها"</string>
<string name="adaptive_sleep_description" msgid="1835321775327187860">"باعث میشود تازمانیکه فردی به صفحهنمایش نگاه میکند، صفحه خاموش نشود"</string>
<string name="adaptive_sleep_privacy" msgid="7664570136417980556">"«توجه به صفحه» با استفاده از دوربین جلو متوجه میشود که آیا فردی درحال تماشای صفحهنمایش است یا نه. این ویژگی در دستگاه کار میکند و تصاویر هرگز ذخیره نمیشوند و به Google فرستاده نمیشود."</string>
@@ -1216,7 +1231,7 @@
<string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"دوربین قفل است"</string>
<string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"برای «تشخیص چهره»، قفل دوربین باید باز باشد"</string>
<string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"قفل دوربین باید برای «توجه به صفحه» باز باشد"</string>
- <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"دسترسی به دوربین برای «تشخیص چهره» الزامی است. برای مدیریت اجازههای «خدمات شخصیسازی دستگاه» ضربه بزنید"</string>
+ <string name="auto_rotate_summary_no_permission" msgid="1025061139746254554">"دسترسی به دوربین برای «تشخیص چهره» الزامی است. برای مدیریت اجازههای «خدمات شخصیسازی دستگاه» تکضرب بزنید"</string>
<string name="auto_rotate_manage_permission_button" msgid="2591146085906382385">"مدیریت اجازهها"</string>
<string name="night_display_title" msgid="8532432776487216581">"نور شب"</string>
<string name="night_display_text" msgid="4789324042428095383">"«نور شب» تهرنگ کهربایی به صفحهنمایش شما میبخشد. این کار باعث میشود نگاه کردن به صفحه در نور کم آسانتر شود و ممکن است کمک کند آسانتر به خواب بروید."</string>
@@ -1861,7 +1876,7 @@
<string name="service_stop_description" msgid="6327742632400026677">"این سرویس توسط برنامهٔ خود سرویس راهاندازی شد. توقف آن ممکن است باعث شود برنامه کار نکند."</string>
<string name="heavy_weight_stop_description" msgid="3086419998820881290">"این برنامه را نمیتوان به صورت ایمن متوقف کرد. در صورت متوقف کردن آن، ممکن است برخی از کارهای اخیر خود را از دست بدهید."</string>
<string name="background_process_stop_description" msgid="4792038933517438037">"این یک فرآیند برنامه قدیمی است که در صورت نیاز دوباره به آن هنوز اجرا میشود. معمولاً دلیلی برای توقف آن وجود ندارد."</string>
- <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: هماکنون درحال استفاده است. برای کنترل آن روی تنظیمات ضربه بزنید."</string>
+ <string name="service_manage_description" msgid="6615788996428486121">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: هماکنون درحال استفاده است. برای کنترل آن روی تنظیمات تکضرب بزنید."</string>
<string name="main_running_process_description" msgid="6685973937935027773">"فرآیند اصلی در حال استفاده است."</string>
<string name="process_service_in_use_description" msgid="4210957264507014878">"سرویس <xliff:g id="COMP_NAME">%1$s</xliff:g> در حال استفاده است."</string>
<string name="process_provider_in_use_description" msgid="6730020083976048028">"ارائه دهنده <xliff:g id="COMP_NAME">%1$s</xliff:g> در حال استفاده است."</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"استفاده از صفحهکلید مجازی"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"وقتی صفحهکلید فیزیکی فعال است این ویرایشگر را روی صفحه نگهمیدارد"</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="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="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="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>
@@ -1915,13 +1930,13 @@
<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>
- <string name="trackpad_tap_dragging_summary" msgid="5276968646031591058">"برای جابهجایی عناصر، روی آنها ضربه بزنید و انگشتتان را روی صفحه لمسی بکشید"</string>
+ <string name="trackpad_tap_dragging_summary" msgid="5276968646031591058">"برای جابهجایی عناصر، روی آنها تکضرب بزنید و انگشتتان را روی صفحه لمسی بکشید"</string>
<string name="trackpad_touchpad_gesture_title" msgid="7568052847609914436">"اشارههای صفحه لمسی"</string>
<string name="trackpad_touchpad_gesture_summary" msgid="6256074591395359124">"سفارشی کردن هر یک از اشارههای پیمایش صفحه لمسی"</string>
<string name="trackpad_reverse_scrolling_title" msgid="422877284529360866">"پیمایش معکوس"</string>
<string name="trackpad_reverse_scrolling_summary" msgid="6048648562887499036">"وقتی بهپایین پیمایش کنید، محتوا بهبالا حرکت میکند"</string>
<string name="trackpad_bottom_right_tap_title" msgid="6275428879042702880">"ضربه به راست پایین"</string>
- <string name="trackpad_bottom_right_tap_summary" msgid="8734094086900680674">"برای گزینههای بیشتر، روی پایین گوشه چپ صفحه لمسی ضربه بزنید"</string>
+ <string name="trackpad_bottom_right_tap_summary" msgid="8734094086900680674">"برای گزینههای بیشتر، روی پایین گوشه چپ صفحه لمسی تکضرب بزنید"</string>
<string name="trackpad_pointer_speed" msgid="7786579408631352625">"سرعت اشارهگر"</string>
<string name="pointer_fill_style" msgid="8413840032931637595">"سبک رنگ نشانگر"</string>
<string name="pointer_fill_style_black_button" msgid="4540815366995820960">"تغییر سبک رنگ نشانگر به سیاه"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"تغییر سبک رنگ نشانگر به زرد"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"تغییر سبک رنگ نشانگر به صورتی"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"تغییر سبک رنگ نشانگر به آبی"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"سبک ضربه اشارهگر"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"سفید"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"سیاه"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"هیچکدام"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"انتخاب کاربر: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"گفتار"</string>
<string name="pointer_speed" msgid="7398649279282675718">"سرعت اشارهگر"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"مقیاس اشارهگر"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"کاهش مقیاس اشارهگر"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"افزایش مقیاس اشارهگر"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"دسته کنترل بازی"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"تغییر مسیر لرزش"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"وقتی متصل شد، لرزش به دسته کنترل بازی ارسال شود"</string>
@@ -1998,7 +2020,7 @@
<string name="user_dict_settings_edit_dialog_title" msgid="316493656442362284">"ویرایش کلمه"</string>
<string name="user_dict_settings_context_menu_edit_title" msgid="4909198741914531509">"ویرایش"</string>
<string name="user_dict_settings_context_menu_delete_title" msgid="651550824433043545">"حذف"</string>
- <string name="user_dict_settings_empty_text" msgid="86562873609647919">"واژهای در واژهنامه کاربر ندارید. برای افزودن واژه، روی دکمه افزودن (+) ضربه بزنید."</string>
+ <string name="user_dict_settings_empty_text" msgid="86562873609647919">"واژهای در واژهنامه کاربر ندارید. برای افزودن واژه، روی دکمه افزودن (+) تکضرب بزنید."</string>
<string name="user_dict_settings_all_languages" msgid="8563387437755363526">"برای همه زبانها"</string>
<string name="user_dict_settings_more_languages" msgid="5378870726809672319">"زبانهای بیشتر…"</string>
<string name="testing" msgid="6294172343766732037">"تست کردن"</string>
@@ -2060,7 +2082,7 @@
<string name="bt_hci_snoop_log_filtered_mode_disabled_summary" msgid="8824952559433361848">"برای تغییر این گزینه، حالت گزارش تجسس Bluetooth HCI را روی «فعال فیلترشده» تنظیم کنید"</string>
<string name="talkback_title" msgid="8756080454514251327">"Talkback"</string>
<string name="talkback_summary" msgid="5820927220378864281">"صفحهخوان در وهله اول برای افراد نابینا و کمبینا در نظر گرفته شده است"</string>
- <string name="select_to_speak_summary" msgid="1995285446766920925">"روی موارد موجود در صفحهتان ضربه بزنید تا بلند خوانده شوند"</string>
+ <string name="select_to_speak_summary" msgid="1995285446766920925">"روی موارد موجود در صفحهتان تکضرب بزنید تا بلند خوانده شوند"</string>
<string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویتهای زیرنویس ناشنوایان"</string>
<string name="accessibility_captioning_about_title" msgid="3542171637334191563">"درباره اولویتهای زیرنویس ناشنوایان"</string>
<string name="accessibility_captioning_footer_learn_more_content_description" msgid="5730040700677017706">"درباره اولویتهای زیرنویس ناشنوایان بیشتر بدانید"</string>
@@ -2072,7 +2094,7 @@
<string name="accessibility_screen_magnification_always_on_summary" msgid="306908451430863049">"حین تعویض برنامه، ذرهبین روشن میماند و زومپس میشود"</string>
<string name="accessibility_screen_magnification_always_on_unavailable_summary" msgid="3844732482037416038">"وقتی فقط بخشی از صفحه درشتنمایی میشود دردسترس نیست"</string>
<string name="accessibility_screen_magnification_joystick_title" msgid="1803769708582404964">"دسته کنترل"</string>
- <string name="accessibility_screen_magnification_joystick_summary" msgid="4640300148573982720">"ذرهبین را فعال کنید و آن را با دسته کنترل روی صفحه جابهجا کنید. ضربه بزنید و نگه دارید، سپس دسته کنترل را برای کنترل کردن ذرهبین بکشید. برای جابهجا کردن خود دسته کنترل، ضربه بزنید و بکشید."</string>
+ <string name="accessibility_screen_magnification_joystick_summary" msgid="4640300148573982720">"ذرهبین را فعال کنید و آن را با دسته کنترل روی صفحه جابهجا کنید. تکضرب بزنید و نگه دارید، سپس دسته کنترل را برای کنترل کردن ذرهبین بکشید. برای جابهجا کردن خود دسته کنترل، تکضرب بزنید و بکشید."</string>
<string name="accessibility_screen_magnification_about_title" msgid="8857919020223505415">"درباره درشتنمایی"</string>
<string name="accessibility_screen_magnification_footer_learn_more_content_description" msgid="924848332575978463">"درباره درشتنمایی بیشتر بدانید"</string>
<string name="accessibility_magnification_mode_title" msgid="8446475127807168063">"نوع درشتنمایی"</string>
@@ -2084,9 +2106,9 @@
<string name="accessibility_magnification_mode_dialog_option_full_screen" msgid="4892487869954032029">"درشتنمایی تمامصفحه"</string>
<string name="accessibility_magnification_mode_dialog_option_window" msgid="4492443201099153362">"درشتنمایی بخشی از صفحه"</string>
<string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"جابهجایی بین تمامصفحه و نیمصفحه"</string>
- <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"برای جابهجایی بین دو گزینه، روی دکمه جابهجایی ضربه بزنید"</string>
+ <string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"برای جابهجایی بین دو گزینه، روی دکمه جابهجایی تکضرب بزنید"</string>
<string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"به دکمه دسترسپذیری میروید؟"</string>
- <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"استفاده از سهضربه برای درشتنمایی بخشی از صفحه باعث میشود تایپ کردن و دیگر کنشها با تأخیر انجام شود.\n\nدکمه دسترسپذیری در صفحه بالای برنامههای دیگر شناور است. برای درشتنمایی، روی آن ضربه بزنید."</string>
+ <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"استفاده از سهضربه برای درشتنمایی بخشی از صفحه باعث میشود تایپ کردن و دیگر کنشها با تأخیر انجام شود.\n\nدکمه دسترسپذیری در صفحه بالای برنامههای دیگر شناور است. برای درشتنمایی، روی آن تکضرب بزنید."</string>
<string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"رفتن به دکمه دسترسپذیری"</string>
<string name="accessibility_magnification_switch_shortcut_negative_button" msgid="7115794462123071594">"استفاده از سهضربه"</string>
<string name="accessibility_magnification_triple_tap_warning_title" msgid="8484669851397296597">"این کار ممکن است باعث کند شدن صفحهکلید شود"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"درهرصورت ادامه داده شود"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"لغو"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"تنظیمات درشتنمایی"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"حرکت افقی با یک انگشت"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ذرهبین را با ۱ انگشت جابهجا کنید"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"برای حرکت در صفحه، ۱ انگشت را بکشید"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"با کشیدن یک انگشت، درشتنمایی را جابهجا کنید."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"با کشیدن دو انگشت، درشتنمایی را جابهجا کنید."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"وقتی فقط بخشی از صفحه درشتنمایی میشود دردسترس نیست"</string>
@@ -2114,11 +2137,13 @@
<string name="accessibility_text_reading_conversation_message_2" msgid="8112160435318635856">"داریم به ساحل میرویم. شما هم میآیید؟"</string>
<string name="accessibility_screen_option" msgid="8465307075278878145">"گزینهها"</string>
<string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"زومپیش روی صفحه"</string>
- <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"برای بزرگنمایی، ۳ بار ضربه بزنید"</string>
- <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"برای بزرگنمایی، روی دکمهای ضربه بزنید"</string>
+ <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"برای بزرگنمایی، ۳ بار تکضرب بزنید"</string>
+ <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"برای بزرگنمایی، روی دکمهای تکضرب بزنید"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"بهسرعت صفحه را بزرگ کنید تا محتوا درشتتر نمایش داده شود"</string>
- <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>برای زومپیش کردن:</b><br/> {0,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {1,number,integer}. روی صفحه ضربه بزنید<br/> {2,number,integer}. برای حرکت کردن در صفحه، ۲ انگشت را بکشید<br/> {3,number,integer}. برای تنظیم کردن زوم، ۲ انگشت را ازهم دور یا بههم نزدیک کنید<br/> {4,number,integer}. برای توقف درشتنمایی از میانبراستفاده کنید<br/><br/> <b>برای زومپیش موقت:</b><br/> {0,number,integer}. مطمئن شوید نوع درشتنمایی روی تمامصفحه تنظیم شده باشد<br/> {1,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {2,number,integer}. جایی از صفحه را لمس کنید و نگه دارید<br/> {3,number,integer}. برای حرکت کردن در صفحه، انگشت را بکشید<br/> {4,number,integer}. برای متوقف کردن درشتنمایی، انگشتتان را بردارید"</string>
- <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"با روشن کردن درشتنمایی، میتوانید روی صفحه زومپیش کنید.\n\n"<b>"برای زوم کردن"</b>"، درشتنمایی را روشن کنید و روی جایی از صفحه ضربه بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید "</li>\n<li>"برای تنظیم کردن زوم، دو یا چند انگشتتان را بههم نزدیک کنید"</li></ul>\n\n<b>"برای زوم موقت"</b>"، درشتنمایی را روشن کنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"برای حرکت در صفحه، انگشتتان را روی صفحه بکشید"</li>\n<li>"برای زومپس کردن، انگشتتان را بردارید"</li></ul>\n\n"نمیتوانید صفحهکلید یا نوار پیمایش را کوچک کنید."</string>
+ <string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>برای زومپیش کردن:</b><br/> {0,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {1,number,integer}. روی صفحه تکضرب بزنید<br/> {2,number,integer}. برای حرکت کردن در صفحه، ۲ انگشت را بکشید<br/> {3,number,integer}. برای تنظیم کردن زوم، ۲ انگشت را ازهم دور یا بههم نزدیک کنید<br/> {4,number,integer}. برای توقف درشتنمایی از میانبراستفاده کنید<br/><br/> <b>برای زومپیش موقت:</b><br/> {0,number,integer}. مطمئن شوید نوع درشتنمایی روی تمامصفحه تنظیم شده باشد<br/> {1,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {2,number,integer}. جایی از صفحه را لمس کنید و نگه دارید<br/> {3,number,integer}. برای حرکت کردن در صفحه، انگشت را بکشید<br/> {4,number,integer}. برای متوقف کردن درشتنمایی، انگشتتان را بردارید"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>برای زومپیش کردن:</b><br/> {0,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {1,number,integer}. روی صفحه تکضرب بزنید<br/> {2,number,integer}. برای حرکت کردن در صفحه، ۲ انگشت را بکشید<br/> {3,number,integer}. برای تنظیم بزرگنمایی، ۲ انگشت را ازهم دور یا بههم نزدیک کنید<br/> {4,number,integer}. از میانبر برای متوقف کردن درشتنمایی استفاده کنید<br/><br/> همچنین میتوانید موقتاً زومپیش کنید و کارهای دیگری انجام دهید."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>برای زومپیش کردن:</b><br/> {0,number,integer}. برای فعال کردن درشتنمایی، از میانبر استفاده کنید<br/> {1,number,integer}. روی صفحه تکضرب بزنید<br/> {2,number,integer}. برای حرکت کردن در صفحه، ۱ یا ۲ انگشت را بکشید<br/> {3,number,integer}. برای تنظیم بزرگنمایی، ۲ انگشت را ازهم دور یا بههم نزدیک کنید<br/> {4,number,integer}. از میانبر برای متوقف کردن درشتنمایی استفاده کنید<br/><br/> همچنین میتوانید موقتاً زومپیش کنید و کارهای دیگری انجام دهید."</string>
+ <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"با روشن کردن درشتنمایی، میتوانید روی صفحه زومپیش کنید.\n\n"<b>"برای زوم کردن"</b>"، درشتنمایی را روشن کنید و روی جایی از صفحه تکضرب بزنید.\n"<ul><li>"برای پیمایش، دو یا چند انگشتتان را روی صفحه بکشید "</li>\n<li>"برای تنظیم کردن زوم، دو یا چند انگشتتان را بههم نزدیک کنید"</li></ul>\n\n<b>"برای زوم موقت"</b>"، درشتنمایی را روشن کنید، سپس جایی از صفحه را لمس کنید و نگهدارید.\n"<ul><li>"برای حرکت در صفحه، انگشتتان را روی صفحه بکشید"</li>\n<li>"برای زومپس کردن، انگشتتان را بردارید"</li></ul>\n\n"نمیتوانید صفحهکلید یا نوار پیمایش را کوچک کنید."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"صفحه <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> از <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"میانبر دکمه دسترسپذیری"</string>
<string name="accessibility_tutorial_dialog_title_volume" msgid="1032323517963429981">"میانبر کلیدهای میزان صدا"</string>
@@ -2127,12 +2152,12 @@
<string name="accessibility_tutorial_dialog_title_quick_setting" msgid="2905083277641794558">"میانبر تنظیمات فوری"</string>
<string name="accessibility_tutorial_dialog_title_gesture" msgid="4541649734549409614">"میانبر اشاره دسترسپذیری"</string>
<string name="accessibility_tutorial_dialog_title_gesture_settings" msgid="6800684770875867559">"استفاده از اشاره دسترسپذیری"</string>
- <string name="accessibility_tutorial_dialog_message_button" msgid="8977286776192770246">"برای استفاده از این ویژگی، روی دکمه دسترسپذیری <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> در پایین صفحهنمایش ضربه بزنید.\n\nبرای جابهجایی بین ویژگیها، دکمه دسترسپذیری را لمس کنید و نگه دارید."</string>
- <string name="accessibility_tutorial_dialog_message_floating_button" msgid="6631371483819355514">"برای استفاده از این ویژگی، روی دکمه دسترسپذیری در صفحهنمایش ضربه بزنید"</string>
+ <string name="accessibility_tutorial_dialog_message_button" msgid="8977286776192770246">"برای استفاده از این ویژگی، روی دکمه دسترسپذیری <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> در پایین صفحهنمایش تکضرب بزنید.\n\nبرای جابهجایی بین ویژگیها، دکمه دسترسپذیری را لمس کنید و نگه دارید."</string>
+ <string name="accessibility_tutorial_dialog_message_floating_button" msgid="6631371483819355514">"برای استفاده از این ویژگی، روی دکمه دسترسپذیری در صفحهنمایش تکضرب بزنید"</string>
<string name="accessibility_tutorial_dialog_message_volume" msgid="3785791536286606664">"برای استفاده از این ویژگی، هر دو کلید میزان صدا را فشار دهید و نگه دارید"</string>
- <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"برای راهاندازی یا متوقف کردن درشتنمایی، روی جایی از صفحهنمایش سه ضربه بزنید."</string>
- <string name="accessibility_tutorial_dialog_tripletap_instruction" msgid="7549293553589934">"برای راهاندازی یا متوقف کردن درشتنمایی، سریع %1$d بار روی صفحهنمایش ضربه بزنید"</string>
- <string name="accessibility_tutorial_dialog_twofinger_doubletap_instruction" msgid="1007756360115974649">"برای راهاندازی یا متوقف کردن درشتنمایی، سریع با %1$d انگشت دوبار روی صفحهنمایش ضربه بزنید"</string>
+ <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"برای راهاندازی یا متوقف کردن درشتنمایی، روی جایی از صفحهنمایش سه تکضرب بزنید."</string>
+ <string name="accessibility_tutorial_dialog_tripletap_instruction" msgid="7549293553589934">"برای راهاندازی یا متوقف کردن درشتنمایی، سریع %1$d بار روی صفحهنمایش تکضرب بزنید"</string>
+ <string name="accessibility_tutorial_dialog_twofinger_doubletap_instruction" msgid="1007756360115974649">"برای راهاندازی یا متوقف کردن درشتنمایی، سریع با %1$d انگشت دوبار روی صفحهنمایش تکضرب بزنید"</string>
<string name="accessibility_tutorial_dialog_message_quick_setting" msgid="3715446725334547432">"{count,plural, =1{برای استفاده از این ویژگی، از بالای صفحهنمایش تند بهپایین بکشید. سپس، کاشی {featureName} را پیدا کنید.}one{برای استفاده از این ویژگی، با # انگشت از بالای صفحهنمایش تند بهپایین بکشید. سپس، کاشی {featureName} را پیدا کنید.}other{برای استفاده از این ویژگی، با # انگشت از بالای صفحهنمایش تند بهپایین بکشید. سپس، کاشی {featureName} را پیدا کنید.}}"</string>
<string name="accessibility_tutorial_dialog_shortcut_unavailable_in_suw" msgid="3847728530771929959">"این میانبر پساز تکمیل راهاندازی دستگاه دردسترس خواهد بود."</string>
<string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"برای استفاده از این ویژگی، با ۲ انگشت از پایین صفحه تند بهبالا بکشید.\n\nبرای جابهجایی بین ویژگیها، با ۲ انگشت تند بهبالا بکشید و نگه دارید."</string>
@@ -2149,9 +2174,9 @@
<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_summary_floating_button" msgid="6266489864614886247">"روی دکمه شناور ضربه بزنید"</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>
+ <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="8315934725362849788">"روی دکمه دسترسپذیری <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> در پایین صفحهنمایش تکضرب بزنید. برای جابهجایی بین ویژگیها، دکمه دسترسپذیری را لمس کنید و نگه دارید."</string>
<string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"با ۲ انگشت، از پایین صفحه تند بهبالا بکشید.\n\nبرای جابهجایی بین ویژگیها، با ۲ انگشت تند بهبالا بکشید و نگه دارید."</string>
<string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"با ۳ انگشت، از پایین صفحه تند بهبالا بکشید.\n\nبرای جابهجایی بین ویژگیها، با ۳ انگشت تند بهبالا بکشید و نگه دارید."</string>
<string name="accessibility_shortcut_edit_dialog_summary_gesture" msgid="2081123009255579884">"{count,plural, =1{از پایین صفحهنمایش تند بهبالا بکشید. برای جابهجایی بین ویژگیها، تند بهبالا بکشید و نگه دارید.}one{از پایین صفحهنمایش با # انگشت تند بهبالا بکشید. برای جابهجایی بین ویژگیها، با # انگشت تند بهبالا بکشید و نگه دارید.}other{از پایین صفحهنمایش با # انگشت تند بهبالا بکشید. برای جابهجایی بین ویژگیها، با # انگشت تند بهبالا بکشید و نگه دارید.}}"</string>
@@ -2166,14 +2191,14 @@
<string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"هردو کلید میزان صدا را فشار دهید و نگه دارید"</string>
<string name="accessibility_shortcut_edit_dialog_title_two_finger_double_tap" msgid="2271778556854020996">"با دو انگشت دوضربه روی صفحهنمایش بزنید"</string>
<string name="accessibility_shortcut_edit_screen_title_two_finger_double_tap" msgid="8952595692906527694">"دوضربه %1$d انگشتی"</string>
- <string name="accessibility_shortcut_edit_screen_summary_two_finger_double_tap" msgid="385404127425496362">"سریع با %1$d انگشت دوبار روی صفحهنمایش ضربه بزنید"</string>
+ <string name="accessibility_shortcut_edit_screen_summary_two_finger_double_tap" msgid="385404127425496362">"سریع با %1$d انگشت دوبار روی صفحهنمایش تکضرب بزنید"</string>
<string name="accessibility_shortcut_edit_screen_title_triple_tap" msgid="3314488747597058942">"سهضربه"</string>
- <string name="accessibility_shortcut_edit_screen_summary_triple_tap" msgid="4839204951599629871">"سریع %1$d بار روی صفحهنمایش ضربه بزنید. این کار ممکن است سرعت دستگاه را کاهش دهد."</string>
+ <string name="accessibility_shortcut_edit_screen_summary_triple_tap" msgid="4839204951599629871">"سریع %1$d بار روی صفحهنمایش تکضرب بزنید. این کار ممکن است سرعت دستگاه را کاهش دهد."</string>
<string name="accessibility_shortcut_two_finger_double_tap_keyword" msgid="6271718715836961167">"دوضربه %1$d انگشتی"</string>
- <string name="accessibility_shortcut_edit_dialog_summary_two_finger_double_tap" msgid="8262165091808318538">"با دو انگشت {0,number,integer} بار بهسرعت روی صفحه ضربه بزنید"</string>
+ <string name="accessibility_shortcut_edit_dialog_summary_two_finger_double_tap" msgid="8262165091808318538">"با دو انگشت {0,number,integer} بار بهسرعت روی صفحه تکضرب بزنید"</string>
<string name="accessibility_shortcut_edit_dialog_title_triple_tap" msgid="6672798007229795841">"روی صفحهنمایش سه ضربه سریع بزنید"</string>
<string name="accessibility_shortcut_triple_tap_keyword" msgid="5359347130888464334">"سهضربه"</string>
- <string name="accessibility_shortcut_edit_dialog_summary_triple_tap" msgid="2102327956423320536">"سریع روی صفحهنمایش {0,number,integer} بار ضربه بزنید. ممکن است این میانبر سرعت دستگاه را کاهش دهد"</string>
+ <string name="accessibility_shortcut_edit_dialog_summary_triple_tap" msgid="2102327956423320536">"سریع روی صفحهنمایش {0,number,integer} بار تکضرب بزنید. ممکن است این میانبر سرعت دستگاه را کاهش دهد"</string>
<string name="accessibility_shortcut_edit_dialog_title_advance" msgid="4567868630655591506">"پیشرفته"</string>
<string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="266736851606791552">"دکمه دسترسپذیری روی <xliff:g id="SERVICE">%1$s</xliff:g> تنظیم شده است. برای استفاده از درشتنمایی، دکمه دسترسپذیری را لمس کنید و نگهدارید، سپس درشتنمایی را انتخاب کنید."</string>
<string name="accessibility_screen_magnification_gesture_navigation_warning" msgid="991017769735632046">"اشاره دسترسپذیری روی <xliff:g id="SERVICE">%1$s</xliff:g> تنظیم شده است. برای استفاده از درشتنمایی، با دو انگشت از پایین صفحه بهبالا بکشید و نگه ارید. سپس درشتنمایی را انتخاب کنید."</string>
@@ -2189,8 +2214,8 @@
<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">"<b>برای شروع</b><br/> {0,number,integer}. به تنظیمات دسترسپذیری بروید<br/> {1,number,integer}. یک ویژگی را انتخاب کنید و روی میانبر ضربه بزنید<br/> {2,number,integer}. انتخاب کنید برای دسترسی به ویژگی میخواهید از دکمه استفاده کنید یا اشاره<br/>"</string>
- <string name="accessibility_button_description" msgid="7669538706120092399">"<b>برای شروع</b><br/> {0,number,integer}. به تنظیمات دسترسپذیری بروید<br/> {1,number,integer}. یک ویژگی را انتخاب کنید و روی میانبر ضربه بزنید<br/> {2,number,integer}. برای دسترسی به آن ویژگی، دکمه را انتخاب کنید<br/>"</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>برای شروع</b><br/> {0,number,integer}. به تنظیمات دسترسپذیری بروید<br/> {1,number,integer}. یک ویژگی را انتخاب کنید و روی میانبر تکضرب بزنید<br/> {2,number,integer}. انتخاب کنید برای دسترسی به ویژگی میخواهید از دکمه استفاده کنید یا اشاره<br/>"</string>
+ <string name="accessibility_button_description" msgid="7669538706120092399">"<b>برای شروع</b><br/> {0,number,integer}. به تنظیمات دسترسپذیری بروید<br/> {1,number,integer}. یک ویژگی را انتخاب کنید و روی میانبر تکضرب بزنید<br/> {2,number,integer}. برای دسترسی به آن ویژگی، دکمه را انتخاب کنید<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"استفاده از دکمه یا اشاره"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"مکان"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"اندازه"</string>
@@ -2305,7 +2330,7 @@
<string name="accessibility_hearingaid_not_connected_summary" msgid="7438018718889849521">"هیچ دستگاه کمکشنواییای متصل نشده است"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="999051610528600783">"افزودن سمعکها"</string>
<string name="accessibility_hearingaid_pair_instructions_title" msgid="2357706801112207624">"جفت کردن سمعک"</string>
- <string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"در صفحه بعدی، روی سمعک ضربه بزنید. شاید لازم باشد گوش چپ و راست را جداگانه مرتبط کنید.\n\nمطمئن شوید سمعک روشن و آماده مرتبطسازی باشد."</string>
+ <string name="accessibility_hearingaid_pair_instructions_message" msgid="581652489109350119">"در صفحه بعدی، روی سمعک تکضرب بزنید. شاید لازم باشد گوش چپ و راست را جداگانه مرتبط کنید.\n\nمطمئن شوید سمعک روشن و آماده مرتبطسازی باشد."</string>
<string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> فعال"</string>
<string name="accessibility_hearingaid_left_side_device_summary" msgid="12349058624943107">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> / فقط چپ"</string>
<string name="accessibility_hearingaid_right_side_device_summary" msgid="8645789702686724188">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> / فقط راست"</string>
@@ -2319,7 +2344,7 @@
<string name="accessibility_hac_mode_title" msgid="2037950424429555652">"سازگاری با سمعک"</string>
<string name="accessibility_hac_mode_summary" msgid="5198760061256669067">"سازگاری با تلهکویل را بهبود میبخشد و نوفه ناخواسته را کاهش میدهد"</string>
<string name="accessibility_hearing_device_about_title" msgid="7883758309646288250">"درباره دستگاههای کمکشنوایی"</string>
- <string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"برای پیدا کردن دیگر سمعکهایی که از «جاریسازی صوتی ویژه سمعکها» (ASHA) یا «صدای کممصرف» (LE Audio) پشتیبانی نمیکنند، روی "<b>"جفت کردن دستگاه جدید"</b>" > "<b>"دیدن دستگاههای بیشتر"</b>" ضربه بزنید"</string>
+ <string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"برای پیدا کردن دیگر سمعکهایی که از «جاریسازی صوتی ویژه سمعکها» (ASHA) یا «صدای کممصرف» (LE Audio) پشتیبانی نمیکنند، روی "<b>"جفت کردن دستگاه جدید"</b>" > "<b>"دیدن دستگاههای بیشتر"</b>" تکضرب بزنید"</string>
<string name="accessibility_hearing_device_pairing_page_title" msgid="6608901091770850295">"جفت کردن دستگاه کمکشنوایی"</string>
<string name="accessibility_hearing_device_pairing_intro" msgid="7022201665808166517">"میتوانید سمعکهای سازگار با «جاریسازی صوتی ویژه سمعکها» (ASHA) و «صدای کممصرف» را در این صفحه جفت کنید. مطمئن شوید سمعک روشن و برای جفت کردن آماده باشد."</string>
<string name="accessibility_found_hearing_devices" msgid="637407580358386553">"دستگاههای کمکشنوایی موجود"</string>
@@ -2333,7 +2358,7 @@
<string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"خاموش"</string>
<string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"روشن"</string>
<string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"خاموش"</string>
- <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"کار نمیکند. برای دریافت اطلاعات ضربه بزنید."</string>
+ <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"کار نمیکند. برای دریافت اطلاعات تکضرب بزنید."</string>
<string name="accessibility_description_state_stopped" msgid="5364752492861199133">"این سرویس درست کار نمیکند."</string>
<string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"میانبرهای دسترسپذیری"</string>
<string name="enable_quick_setting" msgid="6648073323202243604">"نمایش در تنظیمات سریع"</string>
@@ -2404,7 +2429,7 @@
<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>
+ <string name="disable_service_title" msgid="8178020230162342801">"«<xliff:g id="SERVICE">%1$s</xliff:g>» خاموش شود؟"</string>
<string name="accessibility_no_services_installed" msgid="3725569493860028593">"سرویسی نصب نشده است"</string>
<string name="accessibility_no_service_selected" msgid="1310596127128379897">"سرویسی انتخاب نشده است"</string>
<string name="accessibility_service_default_description" msgid="7801435825448138526">"شرحی ارائه نشده است."</string>
@@ -2544,7 +2569,7 @@
<string name="battery_manager_app_restricted" msgid="2583902700677009173">"{count,plural, =1{# برنامه محدود شده است}one{# برنامه محدود شده است}other{# برنامه محدود شده است}}"</string>
<string name="battery_missing_message" msgid="400958471814422770">"مشکلی در خواندن میزان باتری وجود دارد."</string>
<string name="battery_missing_link_message" msgid="6021565067124898074"></string>
- <string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"برای دریافت اطلاعات بیشتر درباره این خطا، ضربه بزنید"</string>
+ <string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"برای دریافت اطلاعات بیشتر درباره این خطا، تکضرب بزنید"</string>
<string name="power_screen" msgid="4596900105850963806">"صفحهنمایش"</string>
<string name="power_cpu" msgid="1820472721627148746">"CPU"</string>
<string name="power_flashlight" msgid="8993388636332573202">"چراغ قوه"</string>
@@ -2820,7 +2845,7 @@
<string name="settings_backup_summary" msgid="6803046376335724034">"پشتیبانگیری از تنظیمات من"</string>
<string name="sync_menu_sync_now" msgid="3948443642329221882">"اکنون همگامسازی شود"</string>
<string name="sync_menu_sync_cancel" msgid="2422994461106269813">"لغو همگامسازی"</string>
- <string name="sync_one_time_sync" msgid="8114337154112057462">"برای همگامسازی اکنون ضربه بزنید<xliff:g id="LAST_SYNC_TIME">
+ <string name="sync_one_time_sync" msgid="8114337154112057462">"برای همگامسازی اکنون تکضرب بزنید<xliff:g id="LAST_SYNC_TIME">
%1$s</xliff:g>"</string>
<string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
<string name="sync_calendar" msgid="4603704438090387251">"تقویم"</string>
@@ -3119,7 +3144,7 @@
<string name="regulatory_info_text" msgid="1154461023369976667"></string>
<string name="sim_settings_title" msgid="2254609719033946272">"سیمکارتها"</string>
<string name="sim_cellular_data_unavailable" msgid="4653591727755387534">"داده شبکه تلفن همراه دردسترس نیست"</string>
- <string name="sim_cellular_data_unavailable_summary" msgid="6505871722911347881">"برای انتخاب سیمکارت داده ضربه بزنید"</string>
+ <string name="sim_cellular_data_unavailable_summary" msgid="6505871722911347881">"برای انتخاب سیمکارت داده تکضرب بزنید"</string>
<string name="sim_calls_always_use" msgid="967857230039768111">"همیشه این سیم برای تماسها استفاده شود"</string>
<string name="select_sim_for_data" msgid="2642305487659432499">"سیمکارت برای داده تلفن همراه انتخاب کنید"</string>
<string name="select_sim_for_sms" msgid="5335510076282673497">"انتخاب سیمکارت برای پیامک"</string>
@@ -3136,7 +3161,7 @@
<string name="sim_status_title_sim_slot" msgid="4932996839194493313">"وضعیت سیمکارت (شیار سیمکارت %1$d)"</string>
<string name="sim_signal_strength" msgid="6351052821700294501">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
<string name="sim_notification_title" msgid="6839556577405929262">"سیمکارتها تغییر کرد"</string>
- <string name="sim_notification_summary" msgid="5593339846307029991">"برای راهاندازی ضربه بزنید"</string>
+ <string name="sim_notification_summary" msgid="5593339846307029991">"برای راهاندازی تکضرب بزنید"</string>
<string name="sim_calls_ask_first_prefs_title" msgid="3077694594349657933">"هر بار پرسیده شود"</string>
<string name="sim_selection_required_pref" msgid="231437651041498359">"انتخاب مورد نیاز است"</string>
<string name="sim_selection_channel_title" msgid="3193666315607572484">"انتخاب سیمکارت"</string>
@@ -3171,7 +3196,7 @@
<string name="cloned_app_created_summary" msgid="7277912971544890710">"همسانهسازی شد"</string>
<string name="cloned_app_creation_toast_summary" msgid="3854494347144867870">"درحال ایجاد همسانه <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string>
<string name="cloned_app_created_toast_summary" msgid="755225403495544163">"همسانه <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> ایجاد شد"</string>
- <string name="system_dashboard_summary" msgid="7400745270362833832">"زبانها، ژستها، زمان، پشتیبان"</string>
+ <string name="system_dashboard_summary" msgid="7400745270362833832">"زبانها، اشارهها، زمان، نسخه پشتیبان"</string>
<string name="languages_setting_summary" msgid="2650807397396180351">"زبانهای سیستم، زبانهای برنامه، اولویتهای منطقهای، گفتار"</string>
<string name="keywords_wifi" msgid="8156528242318351490">"wifi، Wi-Fi، اتصال شبکه، اینترنت، بیسیم، داده، wi fi"</string>
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"اعلان Wi-Fi، اعلان wifi"</string>
@@ -3282,9 +3307,9 @@
<string name="media_volume_option_title" msgid="5966569685119475630">"میزان صدای رسانه"</string>
<string name="remote_media_volume_option_title" msgid="8760846743943305764">"میزان صدای محتوای ارسالی"</string>
<string name="call_volume_option_title" msgid="1461105986437268924">"میزان صدای تماس"</string>
- <string name="alarm_volume_option_title" msgid="6398641749273697140">"میزان صدای زنگ ساعت"</string>
+ <string name="alarm_volume_option_title" msgid="6398641749273697140">"صدای زنگ هشدار"</string>
<string name="ring_volume_option_title" msgid="1520802026403038560">"میزان صدای زنگ و اعلان"</string>
- <string name="separate_ring_volume_option_title" msgid="2212910223857375951">"میزان صدای زنگ"</string>
+ <string name="separate_ring_volume_option_title" msgid="2212910223857375951">"صدای زنگ"</string>
<string name="notification_volume_option_title" msgid="4838818791683615978">"میزان صدای اعلان"</string>
<string name="ringer_content_description_silent_mode" msgid="1442257660889685934">"زنگ بیصدا"</string>
<string name="ringer_content_description_vibrate_mode" msgid="5946432791951870480">"زنگ لرزشی"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{هیچکدام}=1{۱ زمانبندی تنظیم شد}one{# زمانبندی تنظیم شده است}other{# زمانبندی تنظیم شده است}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"مزاحم نشوید"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"حالتهای اولویتدار"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"افزودن حالت"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"فقط از افراد و برنامههای مهم اعلان دریافت کنید"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"انتخاب نوع فعالسازی"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"زمان"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"برای مثال، «۹:۳۰ - ۵:۰۰ ب.ظ.»"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"تقویم"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"برای مثال، «تقویم شخصی»"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ایجاد حالت"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"سفارشی"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"محدود کردن وقفهها"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"روشن کردن «مزاحم نشوید»"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"صداهای رسانه و هشدارها میتوانند وقفه ایجاد کنند"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"زمانبندیها"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"حذف زمانبندیها"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"حذف"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"تغییر نام"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"حذف"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"حالت «<xliff:g id="MODE">%1$s</xliff:g>» حذف شود؟"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ویرایش"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"زمانبندیها"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"زمانبندی"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"افزودن تقویم"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"استفاده از تقویم"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"زمانبندی"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"تنظیم زمانبندی"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"زمانبندی"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ساعت، <xliff:g id="MINUTES">%2$d</xliff:g> دقیقه"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"روشن شدن خودکار"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"زمانبندی"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"بیصدا کردن تلفن در زمانهای خاصی"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"تنظیم قانونهای «مزاحم نشوید»"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"مجاز کردن وقفههایی که صدا ایجاد میکنند"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"مسدود کردن مزاحمتهای بصری"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"مجاز کردن همه سیگنالهای تصویری"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"اعلانهایی که میتواند برایتان ارسال شود"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"حفظ تمرکز"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"کنشهای بیشتر"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{خاموش}=1{خاموش / ۱ حالت میتواند بهطور خودکار روشن شود}one{خاموش / # حالت میتواند بهطور خودکار روشن شود}other{خاموش / # حالت میتواند بهطور خودکار روشن شود}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"تنظیمات نمایشگر"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"گزینههای نمایشگر"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"سیاهوسفید"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"فعال کردن زمینه تیره"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"سیستمعامل و برنامهها به حالتی میروند که در آن، نوشتار روشن روی پسزمینه تیره ارجحیت دارد. در این حالت، چشمها کمتر اذیت میشود و در برخی دستگاهها در مصرف باتری بهمیزان قابلتوجهی صرفهجویی میشود"</string>
<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}}one{{effect_1}، {effect_2}، و # مورد دیگر}other{{effect_1}، {effect_2}، و # مورد دیگر}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"فیلتر کردن وقفهها"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"هیچ وقفهای فیلتر نمیشود"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"باز کردن اعلان"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"مجاز کردن تعویق اعلان"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"نقطه اعلان روی نماد برنامهها"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"دستههای اعلان"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"حبابکها"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"حبابکها"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"نمایش مکالمه بهصورت حباب"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"این برنامه از تنظیمات پیشرفته پشتیبانی نمیکند"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"تنظیمات بیشتر"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"تنظیمات بیشتر داخل این برنامه دردسترس است"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"استراحت اعلانها"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"اعمال کردن بر نمایههای کاری"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"برای برنامههای نمایه کاری اعمال میشود"</string>
@@ -3654,7 +3694,7 @@
<string name="interact_across_profiles_number_of_connected_apps" msgid="4000424798291479207">"{count,plural, =1{# برنامه متصل شد}one{# برنامه متصل شد}other{# برنامه متصل شد}}"</string>
<string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"برای اتصال این برنامهها، <xliff:g id="NAME">%1$s</xliff:g> را در نمایه کاری نصب کنید"</string>
<string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"برای اتصال این برنامهها، <xliff:g id="NAME">%1$s</xliff:g> را در نمایه شخصی نصب کنید"</string>
- <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"برای دریافت برنامه، ضربه بزنید"</string>
+ <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"برای دریافت برنامه، تکضرب بزنید"</string>
<string name="manage_zen_access_title" msgid="1562322900340107269">"دسترسی به «مزاحم نشوید»"</string>
<string name="zen_access_detail_switch" msgid="4183681772666138993">"مجاز کردن «مزاحم نشوید»"</string>
<string name="zen_access_empty_text" msgid="3779921853282293080">"هیچ برنامه نصب شدهای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"دستهها"</string>
<string name="notification_channels_other" msgid="18159805343647908">"موارد دیگر"</string>
<string name="no_channels" msgid="4716199078612071915">"این برنامه هیچ اعلانی پست نکرده است"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"نمایش دستههای استفادهنشده"</string>
<string name="app_settings_link" msgid="6725453466705333311">"تنظیمات بیشتر در برنامه"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"نمایش دستههای استفادهنشده"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"پنهان کردن دستههای استفادهنشده"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"برنامههایی که میتوانند وقفه ایجاد کنند"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"برنامههای انتخابشده"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"هیچکدام"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"همه"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"مجاز کردن برنامهها برای لغو"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"برنامههایی که میتوانند وقفه ایجاد کنند"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"انتخاب برنامههای بیشتر"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"هیچ موردی نمیتواند وقفه ایجاد کند"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"هیچ فردی نمیتواند وقفه ایجاد کند"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"بعضی از افراد میتوانند وقفه ایجاد کنند"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"همه افراد میتوانند وقفه ایجاد کنند"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"تماسگیرندههای تکراری"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"اجازه دادن به تماسگیرندگان تکراری"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{تغییر به «فقط زنگ هشدار» بهمدت یک ساعت تا {time}}one{تغییر به «فقط زنگ هشدار» بهمدت # ساعت تا {time}}other{تغییر به «فقط زنگ هشدار» بهمدت # ساعت تا {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"تغییر به «فقط هشدارها» تا <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"تغییر در «همیشه وقفه»"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ویرایش حالت"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"افزودن حالت"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"حالت سفارشی"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"نام حالت"</string>
<string name="warning_button_text" msgid="1274234338874005639">"هشدار"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"بستن"</string>
<string name="device_feedback" msgid="5351614458411688608">"ارسال بازخورد درباره این دستگاه"</string>
@@ -3828,8 +3873,8 @@
<string name="screen_pinning_switch_off_text" msgid="5032105155623003875">"خاموش"</string>
<string name="screen_pinning_title" msgid="6927227272780208966">"سنجاق کردن برنامه"</string>
<string name="app_pinning_intro" msgid="6409063008733004245">"با سنجاق کردن برنامه میتوانید برنامه کنونی را تا زمان برداشتن سنجاق درمعرض دید نگه دارید. برای مثال، بااستفاده از این ویژگی میتوانید به دوست معتمدی اجازه دهید بازی خاصی را بازی کند."</string>
- <string name="screen_pinning_description" msgid="5822120806426139396">"وقتی برنامهای سنجاق شود، ممکن است برنامه سنجاقشده برنامههای دیگر را باز کند و دادههای شخصی دردسترس قرار گیرد. \n\nبرای استفاده از سنجاق کردن برنامه: ←\n{0,number,integer}. سنجاق کردن برنامه را روشن کنید ←\n{1,number,integer}. «نمای کلی» را باز کنید ←\n{2,number,integer}. روی نماد برنامه در بالای صفحهنمایش ضربه بزنید، سپس روی «سنجاق کردن» ضربه بزنید"</string>
- <string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"وقتی برنامهای سنجاق شود، ممکن است برنامه سنجاقشده برنامههای دیگر را باز کند و دادههای شخصی دردسترس قرار گیرد. \n\nاگر میخواهید دستگاهتان را بااطمینانخاطر دراختیار فرد دیگری قرار دهید، از کاربر مهمان استفاده کنید. \n\nبرای استفاده از سنجاق کردن برنامه: ←\n{0,number,integer}. سنجاق کردن برنامه را روشن کنید ←\n{1,number,integer}. «نمای کلی» را باز کنید ←\n{2,number,integer}. روی نماد برنامه در بالای صفحهنمایش ضربه بزنید، سپس روی «سنجاق کردن» ضربه بزنید"</string>
+ <string name="screen_pinning_description" msgid="5822120806426139396">"وقتی برنامهای سنجاق شود، ممکن است برنامه سنجاقشده برنامههای دیگر را باز کند و دادههای شخصی دردسترس قرار گیرد. \n\nبرای استفاده از سنجاق کردن برنامه: ←\n{0,number,integer}. سنجاق کردن برنامه را روشن کنید ←\n{1,number,integer}. «نمای کلی» را باز کنید ←\n{2,number,integer}. روی نماد برنامه در بالای صفحهنمایش تکضرب بزنید، سپس روی «سنجاق کردن» تکضرب بزنید"</string>
+ <string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"وقتی برنامهای سنجاق شود، ممکن است برنامه سنجاقشده برنامههای دیگر را باز کند و دادههای شخصی دردسترس قرار گیرد. \n\nاگر میخواهید دستگاهتان را بااطمینانخاطر دراختیار فرد دیگری قرار دهید، از کاربر مهمان استفاده کنید. \n\nبرای استفاده از سنجاق کردن برنامه: ←\n{0,number,integer}. سنجاق کردن برنامه را روشن کنید ←\n{1,number,integer}. «نمای کلی» را باز کنید ←\n{2,number,integer}. روی نماد برنامه در بالای صفحهنمایش تکضرب بزنید، سپس روی «سنجاق کردن» تکضرب بزنید"</string>
<string name="screen_pinning_dialog_message" msgid="8144925258679476654">"وقتی برنامه سنجاق میشود: \n\n• ممکن است دادههای شخصی (مانند مخاطبین و محتوای ایمیل) دردسترس قرار گیرد \n \n• ممکن است برنامه سنجاقشده برنامههای دیگر را باز کند \n\nفقط با افراد معتمد از سنجاق کردن برنامه استفاده کنید."</string>
<string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"درخواست الگوی بازگشایی قفل قبلاز برداشتن سنجاق"</string>
<string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"درخواست کد پین قبل از برداشتن پین"</string>
@@ -3906,7 +3951,7 @@
<string name="app_data_sharing_updates_title" msgid="1694297952320402788">"بهروزرسانیهای همرسانی داده برای مکان"</string>
<string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"برنامههایی که روش همرسانی دادههای مکان شما را تغییر دادهاند مرور کنید"</string>
<string name="tap_to_wake" msgid="3313433536261440068">"ضربه برای بیدار شدن"</string>
- <string name="tap_to_wake_summary" msgid="6641039858241611072">"برای بیدار کردن دستگاه روی قسمتی از صفحه دوبار ضربه بزنید"</string>
+ <string name="tap_to_wake_summary" msgid="6641039858241611072">"برای بیدار کردن دستگاه روی قسمتی از صفحه دوبار تکضرب بزنید"</string>
<string name="domain_urls_title" msgid="7012209752049678876">"باز کردن پیوندها"</string>
<string name="domain_urls_summary_none" msgid="1132578967643384733">"پیوندهای پشتیبانی شده باز نشود"</string>
<string name="domain_urls_summary_one" msgid="3312008753802762892">"باز کردن <xliff:g id="DOMAIN">%s</xliff:g>"</string>
@@ -4025,7 +4070,7 @@
<string name="draw_overlay" msgid="7902083260500573027">"نمایش روی سایر برنامهها"</string>
<string name="system_alert_window_settings" msgid="6458633954424862521">"نمایش روی سایر برنامهها"</string>
<string name="permit_draw_overlay" msgid="4468994037192804075">"مجاز کردن نمایش روی سایر برنامهها"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"به این برنامه اجازه میدهد روی برنامههای دیگری که درحال استفاده از آنها هستید نشان داده شود. این برنامه میتواند ببیند روی کجا ضربه میزنید یا آنچه را که روی صفحه نشان داده میشود میتواند تغییر دهد."</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"به این برنامه اجازه میدهد روی برنامههای دیگری که درحال استفاده از آنها هستید نشان داده شود. این برنامه میتواند ببیند روی کجا تکضرب میزنید یا آنچه را که روی صفحه نشان داده میشود میتواند تغییر دهد."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"تغییر دادن خروجی رسانه"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"اجازه دادن به برنامه برای عوض کردن خروجی رسانه"</string>
<string name="allow_media_routing_description" msgid="8343709701298051207">"به این برنامه اجازه داده میشود انتخاب کند کدام دستگاه متصل صدا یا ویدیو را از برنامههای دیگر پخش کند. اگر اجازه دهید، این برنامه میتواند به فهرست دستگاههای دردسترس، مثل هدفون و بلندگو دسترسی داشته باشد و انتخاب کند از کدام دستگاه خروجی برای جاریسازی یا پخش صدا یا ویدیو استفاده شود."</string>
@@ -4285,14 +4330,14 @@
<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">"پیمایش ۲ دکمهای"</string>
- <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"برای جابهجایی بین برنامهها، دکمه صفحه اصلی را تند بهبالا بکشید. برای دیدن همه برنامهها، دوباره تند بهبالا بکشید. برای برگشت، روی دکمه برگشت ضربه بزنید."</string>
+ <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"برای جابهجایی بین برنامهها، دکمه صفحه اصلی را تند بهبالا بکشید. برای دیدن همه برنامهها، دوباره تند بهبالا بکشید. برای برگشت، روی دکمه برگشت تکضرب بزنید."</string>
<string name="emergency_settings_preference_title" msgid="6183455153241187148">"ایمنی و شرایط اضطراری"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"درخواست کمک اضطراری، اطلاعات پزشکی، هشدارها"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"پیمایش اشارهای"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"برای رفتن به صفحه اصلی، از پایین صفحه تند بهبالا بکشید. برای جابهجایی بین برنامهها، از پایین صفحه تند بهبالا بکشید، نگه دارید، سپس رها کنید. برای برگشتن، از لبه راست یا چپ تند بکشید."</string>
<string name="legacy_navigation_title" msgid="7877402855994423727">"پیمایش ۳ دکمهای"</string>
<string name="legacy_navigation_summary" msgid="5905301067778326433">"برگشت، صفحه اصلی، و جابهجایی بین برنامهها با دکمههای پایین صفحه."</string>
- <string name="nav_tutorial_button_description" msgid="6880450051535137024">"شروع آموزش گامبهگام پیمایش اشارهای، دکمه. برای فعال کردن، دوضربه بزنید."</string>
+ <string name="nav_tutorial_button_description" msgid="6880450051535137024">"شروع آموزش گامبهگام پیمایش اشارهای، دکمه. برای فعال کردن، دو تکضرب بزنید."</string>
<string name="keywords_system_navigation" msgid="3131782378486554934">"پیمایش سیستمی، پیمایش ۲دکمهای، پیمایش ۳ دکمهای، پیمایش اشارهای، تند کشیدن"</string>
<string name="assistant_gesture_category_title" msgid="2478251256585807920">"دستیار دیجیتالی"</string>
<string name="assistant_corner_gesture_title" msgid="1895061522687002106">"تند کشیدن برای فراخواندن دستیار"</string>
@@ -4323,7 +4368,7 @@
<string name="one_handed_action_show_notification_summary" msgid="8281689861222000436">"اعلانها و تنظیمات نشان داده میشوند."</string>
<string name="ambient_display_summary" msgid="2650326740502690434">"برای بررسی زمان، اعلانها و اطلاعات دیگر، روی صفحهنمایش دو ضربه سریع بزنید."</string>
<string name="ambient_display_wake_screen_title" msgid="7637678749035378085">"روشن کردن نمایشگر"</string>
- <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلانها و اطلاعات دیگر، روی صفحهنمایش ضربه بزنید."</string>
+ <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلانها و اطلاعات دیگر، روی صفحهنمایش تکضرب بزنید."</string>
<string name="emergency_gesture_screen_title" msgid="3280543310204360902">"کمک اضطراری"</string>
<string name="emergency_gesture_switchbar_title" msgid="7421353963329899514">"استفاده از «درخواست کمک اضطراری»"</string>
<string name="emergency_gesture_screen_summary" msgid="6640521030845132507">"برای شروع اقدامات زیر، دکمه روشن/خاموش را سریع ۵ بار یا بیشتر فشار دهید"</string>
@@ -4332,7 +4377,7 @@
<string name="emergency_gesture_category_call_for_help_title" msgid="1680040129478289510">"اطلاعرسانی برای دریافت کمک"</string>
<string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"تماس برای کمک"</string>
<string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"شماره تماس برای دریافت کمک"</string>
- <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. برای تغییر ضربه بزنید"</string>
+ <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. برای تغییر تکضرب بزنید"</string>
<string name="emergency_gesture_number_override_notes" msgid="233018570696200402">"اگر شماره تلفن غیراضطراری وارد کنید:\n • برای استفاده از «درخواست کمک اضطراری»، قفل دستگاهتان باید باز باشد\n • ممکن است تماستان پاسخ داده نشود"</string>
<string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تند کشیدن اثر انگشت برای اعلانها"</string>
<string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تند کشیدن اثر انگشت"</string>
@@ -4656,7 +4701,7 @@
<string name="mobile_network_use_sim_on" msgid="5333182776279917886">"استفاده از این سیمکارت"</string>
<string name="mobile_network_use_sim_off" msgid="6303281166199670639">"خاموش"</string>
<string name="mobile_network_disable_sim_explanation" msgid="7182341033728911879">"برای خاموش کردن این سیمکارت، آن را خارج کنید"</string>
- <string name="mobile_network_tap_to_activate" msgid="5280456487243915465">"برای فعال کردن سیمکارت <xliff:g id="CARRIER">%1$s</xliff:g>، ضربه بزنید"</string>
+ <string name="mobile_network_tap_to_activate" msgid="5280456487243915465">"برای فعال کردن سیمکارت <xliff:g id="CARRIER">%1$s</xliff:g>، تکضرب بزنید"</string>
<string name="mobile_network_erase_sim" msgid="5387971155494245850">"پاکسازی سیمکارت داخلی"</string>
<string name="preferred_network_mode_title" msgid="3083431168988535628">"نوع شبکه ترجیحی"</string>
<string name="preferred_network_mode_summary" msgid="537577807865497546">"تغییر حالت عملکرد شبکه"</string>
@@ -4720,7 +4765,7 @@
<string name="privileged_action_disable_fail_title" msgid="1808735136395980905">"سیمکارت خاموش نشد"</string>
<string name="privileged_action_disable_fail_text" msgid="6236231745255527458">"مشکلی پیش آمد و سیمکارتتان خاموش نشد."</string>
<string name="sim_action_enable_dsds_title" msgid="226508711751577169">"از ۲ سیمکارت استفاده میکنید؟"</string>
- <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"این دستگاه میتواند همزمان ۲ سیمکارت فعال داشته باشد. برای ادامه استفاده از ۱ سیمکارت در هربار، روی «نه متشکرم» ضربه بزنید."</string>
+ <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"این دستگاه میتواند همزمان ۲ سیمکارت فعال داشته باشد. برای ادامه استفاده از ۱ سیمکارت در هربار، روی «نه متشکرم» تکضرب بزنید."</string>
<string name="sim_action_restart_title" msgid="7054617569121993825">"دستگاه بازراهاندازی شود؟"</string>
<string name="sim_action_yes" msgid="8076556020131395515">"بله"</string>
<string name="sim_action_reboot" msgid="3508948833333441538">"بازراهاندازی"</string>
@@ -4761,7 +4806,7 @@
<string name="sim_setup_channel_id" msgid="8797972565087458515">"فعالسازی شبکه"</string>
<string name="sim_switch_channel_id" msgid="4927038626791837861">"تغییر شرکت مخابراتی"</string>
<string name="post_dsds_reboot_notification_title_with_carrier" msgid="975447139749692794">"سیمکارت <xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال شد"</string>
- <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"برای بهروزرسانی تنظیمات سیمکارت ضربه بزنید"</string>
+ <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"برای بهروزرسانی تنظیمات سیمکارت تکضرب بزنید"</string>
<string name="switch_to_removable_notification" msgid="7640342063449806296">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> جابهجا شدید"</string>
<string name="switch_to_removable_notification_no_carrier_name" msgid="7384856964036215338">"به شرکت مخابراتی دیگری جابهجا شدید"</string>
<string name="network_changed_notification_text" msgid="2407908598496951243">"شبکه تلفن همراهتان تغییر کرده است"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"اجرای اجباری حالت دسکتاپ"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"اجرای اجباری حالت دسکتاپ آزمایشی در نمایشگرهای ثانوی"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"فعال کردن پنجرههای با قالب آزاد"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"پشتیبانی از پنجرههای با قالب آزاد فعال میشود."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"فعال کردن پنجرههای با قالب آزاد در نمایشگر دوم"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"پنجرههای با قالب آزاد فقط در نمایشگر دوم فعال میشود."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"فعال کردن اندازه غیرقابلتغییر در چندپنجره"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"مجاز کردن برنامههای با اندازه غیرقابلتغییر برای قرارگیری در چندپنجره"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"لغو اجبار حالت تاریک"</string>
@@ -4850,10 +4897,10 @@
<string name="wifi_calling_summary" msgid="8566648389959032967">"برای بهبود کیفیت تماسها، از Wi‑Fi استفاده کنید"</string>
<string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"پیام فراپیام ورودی"</string>
<string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"پیام فراپیام ارسال نشد"</string>
- <string name="enable_mms_notification_summary" msgid="6432752438276672500">"برای مجاز کردن ارسال پیام فراپیام در <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> وقتی داده تلفن همراه خاموش است، ضربه بزنید"</string>
+ <string name="enable_mms_notification_summary" msgid="6432752438276672500">"برای مجاز کردن ارسال پیام فراپیام در <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> وقتی داده تلفن همراه خاموش است، تکضرب بزنید"</string>
<string name="enable_mms_notification_channel_title" msgid="1798206332620642108">"پیام فراپیام"</string>
<string name="sim_combination_warning_notification_title" msgid="1365401631492986487">"مشکلی در ترکیب سیمکارت وجود دارد"</string>
- <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"استفاده از <xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> ممکن است عملکرد را محدود کند. برای اطلاعات بیشتر ضربه بزنید."</string>
+ <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"استفاده از <xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> ممکن است عملکرد را محدود کند. برای اطلاعات بیشتر تکضرب بزنید."</string>
<string name="dual_cdma_sim_warning_notification_channel_title" msgid="1049161096896074364">"ترکیب سیمکارت"</string>
<string name="work_policy_privacy_settings" msgid="2702644843505242596">"اطلاعات خطمشی کار شما"</string>
<string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"تنظیمات مدیریتشده توسط سرپرست فناوری اطلاعات شما"</string>
@@ -4868,16 +4915,16 @@
<string name="progress_16k_ota_title" msgid="2117218313875523741">"اعمال تغییرات"</string>
<string name="confirm_format_ext4_title" msgid="6696191800594435577">"دستگاه مجدداً به ext4 قالببندی شود؟ (الزامی برای حالت ۱۶ کیلوبایتی)"</string>
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"پیشاز استفاده از گزینه توسعهدهنده ۱۶ کیلوبایتی، پارتیشن دادههای این دستگاه باید به ext4 تبدیل شود. در این حالت تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. فعال کردن گزینه ۱۶ کیلوبایتی به بازراهاندازی دیگری بعداز این بازراهاندازی نیاز خواهد داشت. بعداز رفتن به این حالت، میتوانید با یک بار بازراهاندازی بین حالتهای ۴ کیلوبایتی و ۱۶ کیلوبایتی جابجا شوید. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای برگرداندن دستگاه به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader را قفل کنید که با این کار، دستگاه بازنشانی کارخانهای میشود. پساز آنکه دستگاه باموفقیت با سیستمعامل Android راهاندازی شد، «باز کردن قفل سازنده اصلی محصول» را در «گزینههای توسعهدهندگان» غیرفعال کنید. دادههای دستگاه محو میشود و سیستم فایل به ext4 تغییر میکند. بعداز تکمیل کار، لطفاً به اینجا برگردید تا دوباره حالت ۱۶ کیلوبایتی را فعال کنید."</string>
- <string name="confirm_ext4_button_text" msgid="6045501984773738407">"پاک کردن تمام دادهها"</string>
+ <string name="confirm_ext4_button_text" msgid="6045501984773738407">"پاک کردن همه دادهها"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"محو کردن داده و قالببندی مجدد پارتیشن داده به ext4 انجام نشد."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"باز کردن قفل bootloader برای حالت ۱۶ کیلوبایتی الزامی است"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"قفل Bootloader باید باز شود"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"پیشاز استفاده از گزینه توسعهدهنده ۱۶ کیلوبایتی، قفل bootloader باید در این دستگاه باز شود. نمیتوان تمامیت نرمافزار را در این حالت تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. با فعال کردن حالت ۱۶ کیلوبایتی، همه تنظیمات و دادههای کاربر محو خواهند شد. بعداز باز کردن قفل bootloader، گزینه ۱۶ کیلوبایتی به انجام دو بازراهاندازی نیاز دارد. بعداز رفتن به این حالت، میتوانید با یک بار بازراهاندازی بین حالتهای ۴ کیلوبایتی و ۱۶ کیلوبایتی جابجا شوید. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای برگرداندن دستگاه به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس سازنده اصلی محصول/ bootloader دستگاه را قفل کنید (که با این کار، دستگاه بازنشانی کارخانهای میشود). لطفاً قفل bootloader را باز و دوباره امتحان کنید. میتوانید دستورالعملهای نحوه انجام این کار را از اینجا دریافت کنید: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"درحال استفاده از حالت مستقل با صفحه ۴ کیلوبایتی"</string>
- <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"در حالت ۴ کیلوبایتی حالت مستقل از صفحه هستید. در این حالت، تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید bootloader دستگاه را قفل کنید. برای مطالعه بیشتر، ضربه بزنید."</string>
+ <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"در حالت ۴ کیلوبایتی حالت مستقل از صفحه هستید. در این حالت، تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید bootloader دستگاه را قفل کنید. برای مطالعه بیشتر، تکضرب بزنید."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"در حالت ۴ کیلوبایتی حالت مستقل از صفحه هستید. در این حالت تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید bootloader دستگاه را قفل کنید. با این کار، دستگاه دوباره بازنشانی کارخانهای میشود و به تنظیمات تولید بازگردانده میشود. پساز آنکه دستگاه باموفقیت با سیستمعامل Android راهاندازی شد، «باز کردن قفل سازنده اصلی محصول» را در «گزینههای توسعهدهندگان» غیرفعال کنید. اگر دستگاه نتوانست باموفقیت با سیستمعامل Android راهاندازی شود یا ناپایدار بود، دستگاه را با جدیدترین تصویر تنظیمات کارخانه از <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> دوباره فلاش کنید و «محو کردن دادههای دستگاه»، «قفل کردن bootloader»، و «فلاش کردن اجباری همه پارتیشنها» را انتخاب کنید."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"درحال استفاده از حالت مستقل از صفحه ۱۶ کیلوبایتی"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"در حالت ۱۶ کیلوبایتی حالت مستقل از صفحه هستید. در این حالت تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader دستگاه را قفل کنید. برای مطالعه بیشتر، ضربه بزنید."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"در حالت ۱۶ کیلوبایتی حالت مستقل از صفحه هستید. در این حالت تمامیت نرمافزار را نمیتوان تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند در معرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader دستگاه را قفل کنید. با این کار، دستگاه دوباره بازنشانی کارخانهای میشود و به تنظیمات تولید بازگردانده میشود. پساز آنکه دستگاه باموفقیت با سیستمعامل Android راهاندازی شد، «باز کردن قفل سازنده اصلی محصول» را در «گزینههای توسعهدهندگان» غیرفعال کنید. اگر دستگاه نتوانست باموفقیت با سیستمعامل Android راهاندازی شود یا ناپایدار بود، دستگاه را با جدیدترین تصویر تنظیمات کارخانه از <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> دوباره فلاش کنید و «محو کردن دادههای دستگاه»، «قفل کردن bootloader»، و «فلاش کردن اجباری همه پارتیشنها» را انتخاب کنید."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"در حالت ۱۶ کیلوبایتی حالت مستقل از صفحه هستید. نمیتوان تمامیت نرمافزار را در این حالت تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند درمعرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader دستگاه را قفل کنید. برای مطالعه بیشتر، تکضرب بزنید."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"در حالت ۱۶ کیلوبایتی حالت مستقل از صفحه هستید. نمیتوان تمامیت نرمافزار را در این حالت تضمین کرد و هرگونه دادهای که درمدت باز بودن قفل bootloader در تلفن ذخیره میشود میتواند درمعرض خطر باشد. برخیاز ویژگیها در این حالتها غیرفعال میشوند بنابراین ممکن است بعضیاز برنامهها کار نکنند. برای ورود دوباره به حالت تولید، باید به حالت ۴ کیلوبایتی برگردید و سپس bootloader دستگاه را قفل کنید. با این کار، دستگاه دوباره بازنشانی کارخانهای میشود و به تنظیمات تولید بازگردانده میشود. پساز آنکه دستگاه باموفقیت با سیستمعامل Android راهاندازی شد، «باز کردن قفل سازنده اصلی محصول» را در «گزینههای توسعهدهندگان» غیرفعال کنید. اگر دستگاه نتوانست باموفقیت با سیستمعامل Android راهاندازی شود یا ناپایدار بود، دستگاه را با جدیدترین تصویر تنظیمات کارخانه از <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> دوباره فلاش کنید و «محو کردن دادههای دستگاه»، «قفل کردن Bootloader»، و «فلاش کردن اجباری همه پارتیشنها» را انتخاب کنید."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"حالت مستقل از صفحه ۱۶ کیلوبایتی"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"بیشتر بخوانید"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"کنترلکننده گزارش اشکال"</string>
@@ -4990,10 +5037,10 @@
<string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"دردسترس نیست زیرا «حالت وقت خواب» روشن است"</string>
<string name="reset_importance_completed" msgid="3595536767426097205">"بازنشاندن اهمیت اعلان تکمیل شد."</string>
<string name="apps_dashboard_title" msgid="3269953499954393706">"برنامهها"</string>
- <string name="bluetooth_message_access_notification_content" msgid="5111712860712823893">"دستگاهی میخواهد به پیامهایتان دسترسی داشته باشد. برای جزئیات ضربه بزنید."</string>
+ <string name="bluetooth_message_access_notification_content" msgid="5111712860712823893">"دستگاهی میخواهد به پیامهایتان دسترسی داشته باشد. برای جزئیات تکضرب بزنید."</string>
<string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"دسترسی به پیامها مجاز شود؟"</string>
<string name="bluetooth_message_access_dialog_content" msgid="7186694737578788487">"دستگاه بلوتوثی (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) میخواهد به پیامهایتان دسترسی داشته باشد.\n\nقبلاً به <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> متصل نشدهاید."</string>
- <string name="bluetooth_phonebook_access_notification_content" msgid="9175220052703433637">"دستگاهی میخواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. برای جزئیات ضربه بزنید."</string>
+ <string name="bluetooth_phonebook_access_notification_content" msgid="9175220052703433637">"دستگاهی میخواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. برای جزئیات تکضرب بزنید."</string>
<string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"دسترسی به مخاطبین و گزارش تماس مجاز شود؟"</string>
<string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"دستگاه بلوتوثی (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) میخواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. این شامل دادههای مربوط به تماسهای ورودی و خروجی میشود.\n\nتاکنون به <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> متصل نشدهاید."</string>
<string name="category_name_brightness" msgid="8520372392029305084">"روشنایی"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"استفاده از سنجاق کردن برنامه"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"استفاده از گزینههای توسعهدهنده"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"استفاده از سرویس چاپ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"مجاز کردن چند کاربر"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"مجاز کردن تغییر کاربر"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"مجاز کردن، چندین، کاربر، اجازه، زیاد"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"چندگانه، کاربران، نمایهها، افراد، حسابها، عوض کردن، زیاد"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"استفاده از اشکالزدایی بیسیم"</string>
@@ -5057,11 +5104,11 @@
<string name="next_page_content_description" msgid="1641835099813416294">"بعدی"</string>
<string name="colors_viewpager_content_description" msgid="2591751086138259565">"پیشدید رنگ"</string>
<string name="bluetooth_sim_card_access_notification_title" msgid="7351015416346359536">"درخواست دسترسی به سیمکارت"</string>
- <string name="bluetooth_sim_card_access_notification_content" msgid="8685623260103018309">"دستگاهی میخواهد به سیمکارتتان دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
+ <string name="bluetooth_sim_card_access_notification_content" msgid="8685623260103018309">"دستگاهی میخواهد به سیمکارتتان دسترسی داشته باشد. برای دیدن جزئیات، تکضرب بزنید."</string>
<string name="bluetooth_sim_card_access_dialog_title" msgid="5616323725563125179">"دسترسی به سیمکارت مجاز است؟"</string>
<string name="bluetooth_sim_card_access_dialog_content" msgid="6281997628405909566">"دستگاه بلوتوثی (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) میخواهد به دادههای سیمکارتتان دسترسی داشته باشد. این دادهها شامل مخاطبین شما میشود.\n\nوقتی متصل باشد، <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> همه تماسهایی را که با <xliff:g id="PHONE_NUMBER">%3$s</xliff:g> برقرار میشود دریافت خواهد کرد."</string>
<string name="bluetooth_connect_access_notification_title" msgid="2573547043170883947">"دستگاه بلوتوث دردسترس است"</string>
- <string name="bluetooth_connect_access_notification_content" msgid="1328465545685433304">"دستگاهی میخواهد متصل شود. برای دیدن جزئیات، ضربه بزنید."</string>
+ <string name="bluetooth_connect_access_notification_content" msgid="1328465545685433304">"دستگاهی میخواهد متصل شود. برای دیدن جزئیات، تکضرب بزنید."</string>
<string name="bluetooth_connect_access_dialog_title" msgid="1948056782712451381">"به دستگاه بلوتوث متصل میشوید؟"</string>
<string name="bluetooth_connect_access_dialog_content" msgid="4336436466468405850">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> میخواهد به این تلفن متصل شود.\n\nقبلاً به <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> متصل نشدهاید."</string>
<string name="bluetooth_connect_access_dialog_negative" msgid="4944672755226375059">"متصل نشود"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"انتخاب کنید وقتی رایانه لوحی روی پایه قرار میگیرد چه چیزی روی صفحهنمایش نشان داده شود. هنگام استفاده از محافظ صفحه، دستگاه ممکن است انرژی بیشتری مصرف کند."</string>
<string name="customize_button_title" msgid="1110284655990203359">"سفارشی کردن"</string>
<string name="customize_button_description" msgid="7440248477266126231">"سفارشی کردن <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"برای فعال کردن پشتیبانی قالب آزاد، راهاندازی مجدد الزامی است."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"برای رفتن به حالت میز کار در نمایشگرهای ثانویه، بازراهاندازی الزامی است."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"برای فعال کردن پشتیبانی از پنجرههای با قالب آزاد قدیمی، به بازراهاندازی نیاز است."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"برای تغییر دادن پشتیبانی از پنجرههای با قالب آزاد، به بازراهاندازی نیاز است."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"برای اجباری کردن پنجرههای با قالب آزاد در نمایشگرهای دوم، به بازراهاندازی نیاز است."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"اکنون بازراهاندازی شود"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"بعداً بازراهاندازی شود"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"صدای فضایی"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"روشن"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"خاموش"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"روشن"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"صدا %1$d%% چپ، %2$d%% راست"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"صدا %1$d%% راست، %2$d%% چپ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"نام دستگاه شما برای برنامههایی که نصب کردهاید قابلمشاهده است. همچنین ممکن است هنگام اتصال به دستگاههای بلوتوث، اتصال به شبکه Wi-Fi، یا راهاندازی نقطه اتصال Wi-Fi، برای افراد دیگر قابلمشاهده باشد."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"جنسیت دستوری"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"انتخاب جنسیت دستوری"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"جستجو در «تنظیمات»"</string>
</resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 3e9acde..d8befc6 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Nukkuma-aika"</item>
+ <item msgid="4152450357280759894">"Ajaminen"</item>
+ <item msgid="7096549258219399423">"Immersiivinen"</item>
+ <item msgid="2760716776980432977">"Hallinnoidut"</item>
+ <item msgid="601734478369121764">"Tähti"</item>
+ <item msgid="6243809315432780521">"Kalenteri"</item>
+ <item msgid="4913577903148415331">"Aika"</item>
+ <item msgid="3653377604690057780">"Teatteri"</item>
+ <item msgid="3843711267408385410">"Kukka"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0f00deb..e308a99 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Katkaistaanko laitteen yhteys?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Muodosta uusi laitepari"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Laita automaattisesti 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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Kuulolaiteasetukset"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Pikanäppäin, kuulolaiteyhteensopivuus"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Esiasetus"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Audiologi ei ole ohjelmoinut esiasetuksia"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Esiasetusta ei voitu muuttaa"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audion toistotapa"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Tietoa audion toistotavasta"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Pois päältä"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Päällä / # sovelluksella on pääsyoikeus sijaintiin}other{Päällä / # sovelluksella on pääsyoikeus sijaintiin}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Ladataan…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Sovellukset, joilla on lähellä olevien laitteiden lupa, voivat määrittää yhdistettyjen laitteiden suhteellisen sijainnin."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Sovellukset, joilla on lähellä olevien laitteiden lupa, voivat määrittää yhdistettyjen laitteiden suhteellisen sijainnin."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Sovelluksilla ja palveluilla ei ole sijaintilupaa. Tiedot laitteesi sijainnista voidaan silti lähettää pelastustyöntekijöille, kun soitat tai lähetät tekstiviestin hätänumeroon."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Lue lisää sijaintiasetuksista"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Voit vaihtaa valintaa avaamalla ChromeOS:n asetukset > Yksityisyys ja turvallisuus > Yksityisyysasetukset > Pääsy sijaintiin"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Kasvot ja <xliff:g id="WATCH">%s</xliff:g> lisätty"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Kasvot, sormenjälki ja <xliff:g id="WATCH">%s</xliff:g> lisätty"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Kasvot, sormenjäljet ja <xliff:g id="WATCH">%s</xliff:g> lisätty"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Tätä tarvitaan, koska henkilöllisyyden tunnistaminen on päällä"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticatorin lukituksen avaus"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Kello lisätty"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Kellon käyttöönotto"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Lue lisää kellon avauksesta"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Lisää kello"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Poista kello"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Sormenjälki- ja kasvojentunnistusavaus"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Kasvojentunnistus- ja sormenjälkiavaus"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Kasvojentunnistus- ja sormenjälkiavaus työkäyttöön"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Edellyttää käyttöönottoa"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Kasvot ja sormenjäljet lisättiin"</string>
@@ -541,7 +542,7 @@
<string name="security_advanced_settings_no_work_profile_settings_summary" msgid="345336447137417638">"Salaus, kirjautumistiedot ja muuta"</string>
<string name="security_advanced_settings_keywords" msgid="5294945170370974974">"tietoturva, lisää tietoturva-asetuksia, lisää asetuksia, tietoturvan lisäasetukset"</string>
<string name="privacy_advanced_settings" msgid="8828215456566937719">"Lisää yksityisyysasetuksia"</string>
- <string name="more_security_privacy_settings" msgid="123465614090328851">"Lisää suojaus‑ ja yksityisyysasetuksia"</string>
+ <string name="more_security_privacy_settings" msgid="123465614090328851">"Lisää turvallisuus‑ ja yksityisyysasetuksia"</string>
<string name="security_header" msgid="961514795852103424">"Suojaus"</string>
<string name="privacy_header" msgid="5526002421324257007">"Yksityisyys"</string>
<string name="work_profile_category_header" msgid="85707750968948517">"Työprofiili"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Asenna sovelluksia"</b>\n"Asenna sovelluksia, jotka haluat pitää yksityisessä tilassa"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Muistettavaa"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Sovellukset pysäytetään, kun lukitset tilan"</b>\n"Kun lukitset tilan, siinä olevat sovellukset pysäytetään etkä saa niiltä ilmoituksia"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Yksityisiä tiloja ei voi käyttää sellaisten sovellusten kanssa, joiden täytyy olla käynnissä taustalla tai lähettää tärkeitä ilmoituksia (esim. lääketieteelliset sovellukset). Tämä johtuu siitä, että ilmoitukset ja taustatoiminta keskeytetään, kun tila on lukittu.\n\nYksityisessä tilassa olevat sovellukset eivät näy Lupienhallinnassa, yksityisyydenhallintapaneelissa tai muissa asetuksissa, kun yksityinen tila on lukittu.\n\nYksityistä tilaa ei voi siirtää uudelle laitteelle. Sinun täytyy ottaa käyttöön uusi yksityinen tila, jos haluat käyttää sitä toisella laitteella.\n\nKuka tahansa, joka yhdistää laitteesi tietokoneeseen tai asentaa laitteelle haitallisia sovelluksia, voi saada pääsyn yksityiseen tilaan."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Yksityisiä tiloja ei voi käyttää sellaisten sovellusten kanssa, joiden täytyy olla käynnissä taustalla tai lähettää tärkeitä ilmoituksia (esim. lääketieteelliset sovellukset). Tämä johtuu siitä, että ilmoitukset ja taustatoiminta keskeytetään, kun tila on lukittu.\n\nYksityisessä tilassa olevat sovellukset eivät näy Lupienhallinnassa, yksityisyydenhallintapaneelissa tai muissa asetuksissa, kun yksityinen tila on lukittu.\n\nYksityistä tilaa ei voi palauttaa uudella laitteella. Sinun täytyy ottaa käyttöön uusi yksityinen tila, jos haluat käyttää sitä toisella laitteella.\n\nKuka tahansa, joka yhdistää laitteesi tietokoneeseen tai asentaa laitteelle haitallisia sovelluksia, voi saada pääsyn yksityiseen tilaan."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Lue lisää yksityisestä tilasta"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Tässä menee hetki"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Yksityistä tilaa otetaan käyttöön…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Käynnistetäänkö laite uudelleen?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC-tietojen kirjaaminen on tarkoitettu vain kehittäjäkäyttöön. Virheraportit sisältävät muuta NFC-dataa, joka voi sisältää yksityisiä tietoja. Muuta asetusta käynnistämällä laite uudelleen."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Käynnistä uudelleen"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"peilaus, ulkoinen näyttö, resoluutio"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Kierto"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Tavallinen"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Käytä näyttönäppäimistöä"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Pidä näytöllä, kun fyysinen näppäimistö on aktiivinen"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Keltainen osoittimen täytön tyyli"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Pinkki osoittimen täytön tyyli"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Sininen osoittimen täytön tyyli"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Osoittimen viivauksen tyyli"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Valkoinen"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Musta"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ei mitään"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Käyttäjän valitsema: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Puhe"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Osoittimen nopeus"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Osoittimen kokoasteikko"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Pienennä osoittimen kokoa"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Suurenna osoittimen kokoa"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Peliohjaimet"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Uudelleenohjaa värinä"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Ohjaa värinä peliohjaimeen, jos se on kytketty."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Jatka silti"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Peru"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurennusasetukset"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Yhden sormen panorointi"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Siirrä suurennusta yhdellä sormella"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Siirry näytöllä vetämällä yhtä sormea"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Siirrä suurennusaluetta vetämällä yhdellä sormella."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Siirrää suurennusaluetta vetämällä kahdella sormella."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ei käytettävissä, kun vain osaa näytöstä suurennetaan"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zoomaa napauttamalla painiketta."</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Lähennä näyttöä nopeasti, niin näet sisällön suurempana"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Näin voit lähentää näyttöä:</b><br/> {0,number,integer}. Aloita suurennus käyttämällä pikanäppäintä<br/> {1,number,integer}. Napauta näyttöä<br/> {2,number,integer}. Siirry näytöllä vetämällä kahdella sormella<br/> {3,number,integer}. Säädä zoomausta nipistämällä kahdella sormella<br/> {4,number,integer}. Lopeta suurennus käyttämällä pikanäppäintä<br/><br/><b>Väliaikainen lähentäminen:</b><br/> {0,number,integer}. Varmista, että suurennustapa on asetettu koko näytölle <br/> {1,number,integer}. Aloita suurennus käyttämällä pikanäppäintä<br/> {2,number,integer}. Kosketa näyttöä mistä tahansa pitkään<br/> {3,number,integer}. Siirry näytöllä vetämällä kahdella sormella<br/> {4,number,integer}. Lopeta suurennus nostamalla sormi näytöltä"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Näin voit lähentää näyttöä:</b><br/> {0,number,integer}. Aloita suurennus käyttämällä pikakomentoa<br/> {1,number,integer}. Napauta näyttöä<br/> {2,number,integer}. Siirry näytöllä vetämällä kahdella sormella<br/> {3,number,integer}. Säädä zoomausta nipistämällä kahdella sormella<br/> {4,number,integer}. Lopeta suurennus käyttämällä pikakomentoa<br/><br/> Voit myös esimerkiksi lähentää tilapäisesti."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Näin voit lähentää näyttöä:</b><br/> {0,number,integer}. Aloita suurennus käyttämällä pikakomentoa<br/> {1,number,integer}. Napauta näyttöä<br/> {2,number,integer}. Siirry näytöllä vetämällä yhdellä tai kahdella sormella<br/> {3,number,integer}. Säädä zoomausta nipistämällä kahdella sormella<br/> {4,number,integer}. Lopeta suurennus käyttämällä pikakomentoa<br/><br/> Voit myös esimerkiksi lähentää tilapäisesti."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kun suurennus on käytössä, voit suurentaa näytöllä olevia kohteita.\n\n"<b>"Zoomaa:"</b>" käynnistä suurennus ja napauta sitten haluamaasi kohtaa näytöllä\n"<ul><li>"Vieritä: vedä vähintään kahta sormea näytön poikki"</li>\n<li>"Säädä zoomausta: nipistä vähintään kaksi sormea yhteen tai levitä ne erilleen"</li></ul>\n\n<b>"Zoomaa väliaikaisesti:"</b>" käynnistä suurennus ja paina pitkään missä tahansa näytöllä\n"<ul><li>"Liiku näytöllä: vedä sormea eri suuntiin"</li>\n<li>"Loitonna: nosta sormi"</li></ul>\n\n"Suurennus ei toimi näppäimistöllä tai siirtymispalkissa."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Sivu <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Saavutettavuuspainikkeen pikakomento"</string>
@@ -3172,7 +3197,7 @@
<string name="cloned_app_creation_toast_summary" msgid="3854494347144867870">"Luodaan kloonia (<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>)"</string>
<string name="cloned_app_created_toast_summary" msgid="755225403495544163">"Klooni luotu (<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>)"</string>
<string name="system_dashboard_summary" msgid="7400745270362833832">"Kielet, eleet, aika, varmuuskopiointi"</string>
- <string name="languages_setting_summary" msgid="2650807397396180351">"Järjestelmän kielet, sovelluksen kielet, alueelliset valinnat, puhe"</string>
+ <string name="languages_setting_summary" msgid="2650807397396180351">"Järjestelmän kielet, sovellusten kielet, alueelliset valinnat, puhe"</string>
<string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, verkkoyhteys, internet, langaton, data, wi fi"</string>
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi ilmoitus, wifi ilmoitus"</string>
<string name="keywords_wifi_data_usage" msgid="4718555409695862085">"datan käyttö"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ei yhtään}=1{1 aikataulu luotu}other{# aikataulua luotu}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Älä häiritse"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriteettitilat"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Lisää tila"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Salli ilmoitukset vain tärkeiltä ihmisiltä ja sovelluksilta"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Valitse aktivointityyppi"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Aika"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Esim. \"Klo 9.30–17.00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalenteri"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Esim. \"Henkilökohtainen kalenteri\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Tilan luominen"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Oma"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Keskeytysten rajoittaminen"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Laita Älä häiritse ‑tila päälle"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Hälytykset ja median äänet voivat keskeyttää"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Aikataulut"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Poista aikataulut"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Poista"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Nimeä uudelleen"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Poista"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Poistetaanko tila (<xliff:g id="MODE">%1$s</xliff:g>)?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Muokkaa"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Aikataulut"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Aikataulu"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Kalenterin lisääminen"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Käytä kalenteria"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Aikataulu"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Luo aikataulu"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Aikataulu"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ota käyttöön automaattisesti"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Aikataulu"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Hiljennä puhelin tiettyinä aikoina"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Määritä Älä häiritse ‑säännöt"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Salli keskeytykset äänen kanssa"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Estä näkyvät häiriötekijät"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Salli visuaaliset signaalit"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Ilmoitukset, joita et saa"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Keskity"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Lisätoiminnot"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Pois päältä}=1{Pois päältä / 1 tila voi mennä päälle automaattisesti}other{Pois päältä / # tilaa voi mennä päälle automaattisesti}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Näyttöasetukset"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Näyttöasetukset"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Harmaasävy"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ota tumma teema käyttöön"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Vaihda käyttöjärjestelmään ja sovelluksiin vaalea teksti tummalla taustalla, mikä voi rasittaa silmiä vähemmän ja säästää akkua merkittävästi joillakin laitteilla"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ei muutoksia näyttöön}=1{{effect_1}}=2{{effect_1} ja {effect_2}}=3{{effect_1}, {effect_2} ja {effect_3}}other{{effect_1}, {effect_2} ja # muuta}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Suodata häiritöt"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Häiriöitä ei suodateta"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Suodatettujen ilmoitusten näyttövalinnat"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kun Älä häiritse -tila on käytössä"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ei ilmoitusääniä"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"avaa ilmoitus"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Salli ilmoitusten torkuttaminen"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Sovelluskuvakkeen pistemerkki"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Ilmoitusniput"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Kuplat"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Kuplat"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Lisää tämä keskustelu kuplaksi"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Tämä sovellus ei tue tehostettuja asetuksia"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Lisää asetuksia"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Lisää asetuksia on saatavilla sovelluksen sisällä"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Ilmoitusten hiljentäminen"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Luokat"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Muut"</string>
<string name="no_channels" msgid="4716199078612071915">"Tämä sovellus ei ole lähettänyt ilmoituksia"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Näytä käyttämättömät kategoriat"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Lisäasetukset sovelluksessa"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Näytä käyttämättömät kategoriat"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Piilota käyttämättömät kategoriat"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Sovellukset, jotka saavat keskeyttää"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Valitut sovellukset"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ei mitään"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Kaikki"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Valitse lisää sovelluksia"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mikään ei voi keskeyttää"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Kukaan ei voi keskeyttää"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Jotkut voivat keskeyttää"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Kaikki käyttäjät voivat keskeyttää"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Toistuvasti soittavat"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Salli usein soittavat"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Muuta hälytyksiä tunnilla tähän asti: {time}}other{Muuta hälytyksiä # tunnilla tähän asti: {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Salli keskeytykset aina."</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Muokkaustila"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Lisää 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="warning_button_text" msgid="1274234338874005639">"Varoitus"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Sulje"</string>
<string name="device_feedback" msgid="5351614458411688608">"Lähetä palautetta tästä laitteesta"</string>
@@ -4694,7 +4739,7 @@
<string name="more_about_satellite_messaging" msgid="3385673133561348509">"Tietoa satelliittiviestinnästä"</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="mobile_network_apn_title" msgid="5582995550142073054">"Tukiasemien nimet"</string>
+ <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>
<string name="see_more" msgid="7499355691042812723">"Lisää"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Kotelo"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Akku"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Asetuspaneeli"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Pakota työpöytätila"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Pakota kokeellinen työpöytätila toissijaisille näytöille"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Ota vapaamuotoiset ikkunat käyttöön"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Ota käyttöön tuki vapaamuotoisille ikkunoille."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Ota 2. näytön vapaamuotoinen ikkunointi käyttöön"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Ota vapaamuotoiset ikkunat käyttöön vain toissijaisella näytöllä."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ota käyttöön kiinteän kokoiset usean ikkunan tilassa"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Sallii kiinteän kokoiset sovellukset usean ikkunan tilassa"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ohita SmartDarkin pakottaminen päälle"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Tämän laitteen dataosio on muunnettava ext4-muotoon ennen 16 kt:n kehittäjäasetuksen käyttämistä. Ohjelmiston eheyttä ei voida taata tässä tilassa. Kaikki tälle puhelimelle tallennettu data voi olla vaarassa, kun käynnistysohjelman lukitus on auki. 16 kt:n tilan aktivoiminen edellyttää tämän jälkeen vielä yhtä uudelleenkäynnistystä. Kun olet tässä tilassa, voit vaihtaa 4 kt:n ja 16 kt:n tilan välillä yhdellä uudelleenkäynnistyksellä. Jotkin ominaisuudet on poistettu käytöstä näissä tiloissa, eivätkä kaikki sovellukset välttämättä toimi. Jos haluat palauttaa laitteen tuotantotilaan, sinun on vaihdettava takaisin 4 kt:n tilaan ja lukittava käynnistysohjelma. Tämä palauttaa laitteen tehdasasetukset. Kun laite käynnistyy Androidissa, poista OEM-avaus käytöstä kehittäjäasetuksista. Laite pyyhitään ja tiedostojärjestelmä vaihdetaan ext4-muotoon vahvistuksen jälkeen. Kun tämä on valmis, palaa ottamaan 16 kt:n tila uudelleen käyttöön."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Poista kaikki data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Dataosion tyhjentäminen ja uudelleenformatointi ext4-muotoon epäonnistui."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 kt:n tila edellyttää käynnistysohjelman lukituksen avausta"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Edellyttää käynnistysohjelman avaamista"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Tämän laitteen käynnistysohjelma on avattava ennen 16 kt:n kehittäjäasetuksen käyttämistä. Ohjelmiston eheyttä ei voida taata tässä tilassa. Kaikki tälle puhelimelle tallennettu data voi olla vaarassa, kun käynnistysohjelman lukitus on auki. Kaikki käyttäjädata ja asetukset pyyhitään, kun 16 kt:n tila aktivoidaan. Kun käynnistysohjelman lukitus on avattu, 16 kt:n tilan aktivointi edellyttää kahta uudelleenkäynnistystä. Kun olet tässä tilassa, voit vaihtaa 4 kt:n ja 16 kt:n tilan välillä yhdellä uudelleenkäynnistyksellä. Jotkin ominaisuudet on poistettu käytöstä näissä tiloissa, eivätkä kaikki sovellukset välttämättä toimi. Jos haluat palauttaa laitteen tuotantotilaan, sinun on vaihdettava takaisin 4 kt:n tilaan ja tehtävä käynnistysohjelman tai OEM:n lukitus. Tämä palauttaa laitteen tehdasasetukset. Avaa käynnistysohjelman lukitus ja yritä uudelleen. Voit katsoa ohjeet tämän tekemiseen osoitteesta <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Käytetään 4 kt:n sivusta riippumatonta tilaa"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Olet sivusta riippumattoman tilan 4 kt:n tilassa. Ohjelmiston eheyttä ei voida taata tässä tilassa. Kaikki tälle puhelimelle tallennettu data voi olla vaarassa, kun käynnistysohjelman lukitus on auki. 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 lukittava käynnistysohjelma. Lue lisää napauttamalla."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Olet sivusta riippumattoman tilan 4 kt:n tilassa. Ohjelmiston eheyttä ei voida taata tässä tilassa. Kaikki tälle puhelimelle tallennettu data voi olla vaarassa, kun käynnistysohjelman lukitus on auki. 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> tai käytä <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ja valitse \"Pyyhi laite\", \"Lukitse käynnistysohjelma\" tai \"Pakota Flash kaikille osioille\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Käytetään 16 kt:n sivusta riippumatonta tilaa"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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äynnistysohjelman lukitus on auki. 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. Lue lisää napauttamalla."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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äynnistysohjelman lukitus on auki. 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, asenna Flash uudelleen viimeisimmillä tehdasasetusten näköistiedostoilla osoitteesta <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> tai käytä <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ja valitse \"Pyyhi laite\", \"Lukitse käynnistysohjelma\" ja \"Pakota Flash kaikille osioille\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Lue lisää napauttamalla."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> tai käytä <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Virheraportin käsittelijä"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Käytä sovelluksen kiinnitystä"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Käytä kehittäjäasetuksia"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Käytä tulostuspalvelua"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Salli useat käyttäjät"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Salli käyttäjien välillä vaihtaminen"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"salli, useita, käyttäjä, lupa, monta"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"monta, käyttäjää, profiilia, henkilöä, tiliä, vaihda, useita"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Käytä langatonta virheenkorjausta"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Valitse, mitä näytölläsi näkyy, kun tabletti on telineessä. Laitteesi saattaa käyttää enemmän virtaa, kun näytönsäästäjä on käytössä."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Yksilöi"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Muokkaa <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Vapaamuotoisen tilan käyttöönotto edellyttää uudelleenkäynnistystä."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Työpöytätilan pakottaminen toissijaisille näytöille edellyttää uudelleenkäynnistystä."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Vanhan vapaamuotoisen ikkunoinnin tuen käyttöönotto edellyttää, että käynnistät laitteen uudelleen."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Vapaamuotoisen ikkunoinnin tuen muutos edellyttää, että käynnistät laitteen uudelleen."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Vapaamuotoisen ikkunoinnin pakottaminen toissijaisilla näytöillä edellyttää, että käynnistät laitteen uudelleen."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Käynnistä uudelleen nyt"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Käynnistä uudelleen myöhemmin"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Tila-audio"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Päällä"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Pois päältä"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Päällä"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d %% vasen, %2$d %% oikea"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d %% oikea, %2$d %% vasen"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Laitteesi nimi näkyy asentamillesi sovelluksille. Myös muut käyttäjät voivat nähdä nimen, kun muodostat Bluetooth-yhteyden laitteisiin, yhteyden Wi-Fi-verkkoon tai aktivoit Wi-Fi-hotspotin."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Kieliopillinen suku"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Valitse kieliopillinen suku"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Hae asetuksia"</string>
</resources>
diff --git a/res/values-fr-feminine/strings.xml b/res/values-fr-feminine/strings.xml
index 9d7b864..c35ac2f 100644
--- a/res/values-fr-feminine/strings.xml
+++ b/res/values-fr-feminine/strings.xml
@@ -19,6 +19,7 @@
<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>
@@ -26,6 +27,7 @@
<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="mode_interruption_filter_title" msgid="3343846700214702347">"Restez concentrée"</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>
diff --git a/res/values-fr-masculine/strings.xml b/res/values-fr-masculine/strings.xml
index 57e733e..0a969f9 100644
--- a/res/values-fr-masculine/strings.xml
+++ b/res/values-fr-masculine/strings.xml
@@ -19,6 +19,7 @@
<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>
@@ -26,6 +27,7 @@
<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="mode_interruption_filter_title" msgid="3343846700214702347">"Restez concentré"</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>
diff --git a/res/values-fr-neuter/strings.xml b/res/values-fr-neuter/strings.xml
index ca3db60..f4a6893 100644
--- a/res/values-fr-neuter/strings.xml
+++ b/res/values-fr-neuter/strings.xml
@@ -19,6 +19,7 @@
<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>
@@ -26,6 +27,7 @@
<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="mode_interruption_filter_title" msgid="3343846700214702347">"Restez concentré·e"</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>
diff --git a/res/values-fr-rCA-feminine/strings.xml b/res/values-fr-rCA-feminine/strings.xml
new file mode 100644
index 0000000..5cb71f6
--- /dev/null
+++ b/res/values-fr-rCA-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="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 0000000..1a0d252
--- /dev/null
+++ b/res/values-fr-rCA-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="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 0000000..07dd7e6
--- /dev/null
+++ b/res/values-fr-rCA-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="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 e34b5fb..450e4de 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -98,7 +98,7 @@
<item msgid="6702740528496186521">"5"</item>
</string-array>
<string-array name="bluetooth_audio_routing_titles">
- <item msgid="3488687531285795335">"Utiliser la valeur par défaut de l\'application"</item>
+ <item msgid="3488687531285795335">"Utiliser la valeur par défaut de l\'appli"</item>
<item msgid="5112879855377353813">"Faire jouer sur l\'appareil auditif"</item>
<item msgid="4853360663119482646">"Faire jouer sur le haut-parleur du téléphone"</item>
</string-array>
@@ -348,7 +348,7 @@
<item msgid="3237802033158517495">"100 %"</item>
</string-array>
<string-array name="captioning_preset_selector_titles">
- <item msgid="3880932435325583041">"Défini par l\'application"</item>
+ <item msgid="3880932435325583041">"Défini par l\'appli"</item>
<item msgid="8719204526359229387">"Texte blanc sur fond noir"</item>
<item msgid="5410164687403735103">"Texte noir sur fond blanc"</item>
<item msgid="1119043472912497241">"Texte jaune sur fond noir"</item>
@@ -484,7 +484,7 @@
<!-- no translation found for rtt_setting_mode:3 (7725394146877517088) -->
<string-array name="nfc_payment_favor">
<item msgid="9104058551372383947">"Toujours"</item>
- <item msgid="5283665583617307336">"Sauf si une autre application de paiement est ouverte"</item>
+ <item msgid="5283665583617307336">"Sauf si une autre appli de paiement est ouverte"</item>
</string-array>
<string-array name="nfc_payment_favor_values">
<item msgid="2373999996715432397">"0"</item>
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Heure du coucher"</item>
+ <item msgid="4152450357280759894">"En conduite"</item>
+ <item msgid="7096549258219399423">"Immersif"</item>
+ <item msgid="2760716776980432977">"Gérée"</item>
+ <item msgid="601734478369121764">"Étoile"</item>
+ <item msgid="6243809315432780521">"Agenda"</item>
+ <item msgid="4913577903148415331">"Heure"</item>
+ <item msgid="3653377604690057780">"Théâtre"</item>
+ <item msgid="3843711267408385410">"Fleur"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f4c65ad..a2708d6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -46,7 +46,7 @@
<string name="stay_awake_on_fold_title" msgid="6590454679898134221">"Toujours"</string>
<string name="stay_awake_on_fold_summary" msgid="1939963751585954262">"L\'écran frontal s\'allume lorsque vous pliez votre appareil"</string>
<string name="selective_stay_awake_title" msgid="7887645333447645168">"Seulement pour les jeux, les vidéos et plus"</string>
- <string name="selective_stay_awake_summary" msgid="9055967322921984543">"L\'écran frontal s\'allume pour les applications qui empêchent la mise en veille de votre écran"</string>
+ <string name="selective_stay_awake_summary" msgid="9055967322921984543">"L\'écran frontal s\'allume pour les applis qui empêchent la mise en veille de votre écran"</string>
<string name="stay_awake_on_lockscreen_title" msgid="8088456642083051068">"Balayer vers le haut pour continuer"</string>
<string name="stay_awake_on_lockscreen_summary" msgid="8825321939913726566">"Pliez votre téléphone et balayez l\'écran frontal vers le haut pour continuer à utiliser l\'appli, ou attendez quelques secondes pour que l\'écran se verrouille. Les applis de jeux et de vidéos resteront ouvertes automatiquement."</string>
<string name="sleep_on_fold_title" msgid="7626123024330501411">"Jamais"</string>
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Déconnecter l\'appareil?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un autre appareil"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"L\'activer automatiquement demain"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Paramètres de l\'appareil auditif"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Raccourci, compatibilité avec les prothèses auditives"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Préréglage"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Aucun préréglage n\'a été programmé par votre audiologiste"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Impossible de mettre à jour le préréglage"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortie audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"À propos de la sortie audio"</string>
@@ -86,7 +86,7 @@
<string name="bluetooth_call_title" msgid="6851464952021874072">"Sortie audio des appels"</string>
<string name="bluetooth_media_title" msgid="2878373577382067290">"Sons des médias et du système"</string>
<string name="bluetooth_notification_title" msgid="8708962394926222039">"Notifications"</string>
- <string name="bluetooth_audio_routing_footer_summary" msgid="410260713589309293">"Par défaut, la sortie audio est définie par les différentes applications"</string>
+ <string name="bluetooth_audio_routing_footer_summary" msgid="410260713589309293">"Par défaut, la sortie audio est définie par les différentes applis"</string>
<string name="bluetooth_audio_codec_default_selection" msgid="4753278792700664175">"Utiliser la sélection du système (par défaut)"</string>
<string name="bluetooth_device" msgid="2217973503732544291">"Appareil Bluetooth sans nom"</string>
<string name="progress_scanning" msgid="2564746192843011826">"Recherche en cours…"</string>
@@ -99,8 +99,8 @@
<string name="device_picker" msgid="2427027896389445414">"Sélectionner un appareil Bluetooth"</string>
<string name="bluetooth_ask_enablement" msgid="1529030199895339199">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer le Bluetooth"</string>
<string name="bluetooth_ask_disablement" msgid="1879788777942714761">"<xliff:g id="APP_NAME">%1$s</xliff:g> souhaite désactiver le Bluetooth"</string>
- <string name="bluetooth_ask_enablement_no_name" msgid="5091401961637405417">"Une application souhaite activer le Bluetooth."</string>
- <string name="bluetooth_ask_disablement_no_name" msgid="382299750909188822">"Une application souhaite désactiver le Bluetooth"</string>
+ <string name="bluetooth_ask_enablement_no_name" msgid="5091401961637405417">"Une appli souhaite activer le Bluetooth."</string>
+ <string name="bluetooth_ask_disablement_no_name" msgid="382299750909188822">"Une appli souhaite désactiver le Bluetooth"</string>
<string name="bluetooth_turning_on" msgid="3842613808709024730">"Activation du Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="7406309124247701148">"Désactivation du Bluetooth..."</string>
<string name="bluetooth_connection_permission_request" msgid="8793131019383198861">"Demande de connexion Bluetooth"</string>
@@ -155,7 +155,7 @@
<string name="proxy_error_empty_port" msgid="4250295137005082992">"Le champ « Port » est obligatoire."</string>
<string name="proxy_error_empty_host_set_port" msgid="8886572276450900049">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
<string name="proxy_error_invalid_port" msgid="2830054691770209166">"Le port indiqué n\'est pas valide."</string>
- <string name="proxy_warning_limited_support" msgid="3277104160797351942">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
+ <string name="proxy_warning_limited_support" msgid="3277104160797351942">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applis."</string>
<string name="proxy_url_title" msgid="3502625766036404073">"URL config. auto mand. : "</string>
<string name="radio_info_ping_hostname_v4" msgid="4790577760885127088">"Faire un ping de l\'IPv4 du nom d\'hôte (www.google.com) :"</string>
<string name="radio_info_http_client_test" msgid="5673975677271544085">"Test du client HTTP :"</string>
@@ -169,30 +169,30 @@
<string name="add_a_language" msgid="2126220398077503271">"Ajouter une langue"</string>
<string name="app_locale_preference_title" msgid="5513627099300360232">"Langue"</string>
<string name="locale_picker_category_title" msgid="6212064706962721255">"Langue favorite"</string>
- <string name="app_locales_picker_menu_title" msgid="7617427959223831373">"Langues des applications"</string>
- <string name="app_locale_picker_summary" msgid="6742557329924446252">"Configurez la langue pour chaque application"</string>
- <string name="app_locale_picker_title" msgid="2431448962911301366">"Langue de l\'application"</string>
+ <string name="app_locales_picker_menu_title" msgid="7617427959223831373">"Langues des applis"</string>
+ <string name="app_locale_picker_summary" msgid="6742557329924446252">"Configurez la langue pour chaque appli"</string>
+ <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="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 application n\'est pas accessible à partir des paramètres."</string>
- <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"La langue peut différer des langues offertes dans l\'application. Certaines applications peuvent ne pas prendre en charge ce paramètre."</string>
- <string name="desc_app_locale_selection_supported" msgid="6744909281573556379">"Configurez la langue pour chaque application."</string>
- <string name="desc_introduction_of_language_picker" msgid="1038423471887102449">"Le système, les applications et les sites Web utilisent la première langue prise en charge parmi vos langues préférées."</string>
- <string name="desc_notice_of_language_picker" msgid="3449290526457925447">"Pour sélectionner une langue pour chaque application, consultez les paramètres de langue des applications."</string>
- <string name="desc_locale_helper_footer_general" msgid="6112153921151780303">"En savoir plus sur les langues des applications"</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>
+ <string name="desc_app_locale_disclaimer" msgid="5295933110644789052">"La langue peut différer des langues offertes dans l\'appli. Certaines applis peuvent ne pas prendre en charge ce paramètre."</string>
+ <string name="desc_app_locale_selection_supported" msgid="6744909281573556379">"Configurez la langue pour chaque appli."</string>
+ <string name="desc_introduction_of_language_picker" msgid="1038423471887102449">"Le système, les applis et les sites Web utilisent la première langue prise en charge parmi vos langues préférées."</string>
+ <string name="desc_notice_of_language_picker" msgid="3449290526457925447">"Pour sélectionner une langue pour chaque appli, consultez les paramètres de langue des applis."</string>
+ <string name="desc_locale_helper_footer_general" msgid="6112153921151780303">"En savoir plus sur les langues des applis"</string>
<string name="title_change_system_locale" msgid="8589844586256566951">"Sélectionner %s comme langue du système?"</string>
<string name="title_system_locale_addition" msgid="8218683660751479466">"Ajouter %s aux langues préférées?"</string>
<string name="desc_system_locale_addition" msgid="3409917362651596070">"Cela permet aux applis et aux sites Web de savoir que vous préférez aussi cette langue."</string>
<string name="desc_notice_device_locale_settings_change" msgid="8311132485850714160">"Vos préférences régionales et les paramètres de votre appareil seront modifiés."</string>
<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 applications et aux sites Web qu\'il s\'agissait de votre préférence."</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="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 applications 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 applications utiliseront vos préférences régionales quand c\'est possible."</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="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>
@@ -206,12 +206,12 @@
<string name="thursday_first_day_of_week" msgid="3035885630945594833">"Jeudi"</string>
<string name="friday_first_day_of_week" msgid="7074795061812083541">"Vendredi"</string>
<string name="saturday_first_day_of_week" msgid="3702282590450322727">"Samedi"</string>
- <string name="title_regional_pref_footer" msgid="7450438024324794380">"Si une application ne prend pas en charge les préférences régionales, elle utilisera ses paramètres régionaux par défaut."</string>
+ <string name="title_regional_pref_footer" msgid="7450438024324794380">"Si une appli ne prend pas en charge les préférences régionales, elle utilisera ses paramètres régionaux par défaut."</string>
<string name="desc_regional_pref_footer_learn_more" msgid="4401708653329230081">"Apprenez-en plus sur les préférences linguistiques."</string>
<string name="category_title_terms_of_address" msgid="4309422700380895278">"Autres préférences"</string>
<string name="terms_of_address_title" msgid="7338630812197476808">"Choisissez la façon dont on s\'adresse à vous"</string>
<string name="terms_of_address_summary" msgid="7802443422612600620">"Votre appareil peut personnaliser la façon dont on s\'adresse à vous"</string>
- <string name="terms_of_address_intro_title" msgid="1533951542181569335">"Ce paramètre permet à la plupart des applications système de personnaliser la façon dont on s\'adresse à vous. Il n\'est pas utilisé par les applications que vous installez."</string>
+ <string name="terms_of_address_intro_title" msgid="1533951542181569335">"Ce paramètre permet à la plupart des applis système de personnaliser la façon dont on s\'adresse à vous. Il n\'est pas utilisé par les applis que vous installez."</string>
<string name="terms_of_address_not_specified" msgid="4439257779351251973">"Non précisé"</string>
<string name="terms_of_address_feminine" msgid="1743479869695539283">"Féminin"</string>
<string name="terms_of_address_masculine" msgid="983106046135098856">"Masculin"</string>
@@ -275,16 +275,16 @@
<string name="lock_after_timeout_summary" msgid="4869265514658147304">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> après la mise en veille"</string>
<string name="lock_immediately_summary_with_exception" msgid="40819611828339044">"Immédiatement après la mise en veille, sauf lorsque l\'appareil est maintenu déverrouillé par <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
<string name="lock_after_timeout_summary_with_exception" msgid="3441806647509073124">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> après la mise en veille, sauf lorsque l\'appareil est maintenu déverrouillé par <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
- <string name="owner_info_settings_title" msgid="3555626140700093017">"Ajouter texte sur écr. de verr."</string>
+ <string name="owner_info_settings_title" msgid="3555626140700093017">"Ajouter du texte sur l\'écran"</string>
<string name="owner_info_settings_summary" msgid="347238313388083297">"Aucun"</string>
- <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"Par exemple : Android de Jonathan"</string>
- <string name="location_settings_title" msgid="8375074508036087178">"Position"</string>
+ <string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"Par exemple : Android de Jonathan."</string>
+ <string name="location_settings_title" msgid="8375074508036087178">"Localisation"</string>
<string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
- <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activée / # application a accès à la position}one{Activée / # application a accès à la position}other{Activée / # applications ont accès à la position}}"</string>
+ <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activée / # appli a accès à la position}one{Activée / # appli a accès à la position}other{Activée / # applis ont accès à la position}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement en cours…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Les applications qui disposent de l\'autorisation de détection des appareils à proximité peuvent déterminer la position relative des appareils connectés."</string>
- <string name="location_settings_footer_location_off" msgid="8568995909147566720">"L\'accès à la position est désactivé pour les applications et les services. La position de votre appareil pourrait quand même être envoyée aux intervenants d\'urgence lorsque vous appelez ou textez un numéro d\'urgence."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Les applis qui possèdent l\'autorisation de détection des appareils à proximité peuvent déterminer la position relative des appareils connectés."</string>
+ <string name="location_settings_footer_location_off" msgid="8568995909147566720">"L\'accès à la position est désactivé pour les applis et les services. La position de votre appareil pourrait quand même être envoyée aux intervenants d\'urgence lorsque vous appelez ou textez un numéro d\'urgence."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"En savoir plus sur les paramètres de localisation"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Pour modifier cela, accédez à Paramètres ChromeOS > Confidentialité et sécurité > Paramètres de confidentialité > Accès à la localisation"</string>
<string name="account_settings_title" msgid="9138880127246241885">"Comptes"</string>
@@ -294,7 +294,7 @@
<string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"Éléments affichés"</string>
<string name="disabled_by_administrator_summary" msgid="5424846182313851124">"Non accessible"</string>
<string name="security_status_title" msgid="6958004275337618656">"État de la sécurité"</string>
- <string name="security_dashboard_summary" msgid="7571035662779425918">"Verrouillage d\'écran, Localiser mon appareil, sécurité des applications"</string>
+ <string name="security_dashboard_summary" msgid="7571035662779425918">"Verrouillage d\'écran, Localiser mon appareil, sécurité des applis"</string>
<string name="safety_center_title" msgid="7732397372178774777">"Sécurité et confidentialité"</string>
<string name="safety_center_summary" msgid="3554867379951053869">"Sécurité applis, verrouillage appareil, autorisations"</string>
<string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
@@ -302,7 +302,7 @@
<string name="security_settings_face_preference_title" msgid="2126625155005348417">"Déverr. par reconn. faciale"</string>
<string name="security_settings_face_profile_preference_title" msgid="7519527436266375005">"Déverrouillage reconnaissance faciale pour travail"</string>
<string name="security_settings_face_enroll_education_title" msgid="6448806884597691208">"Configurer le déverrouillage par reconn. faciale"</string>
- <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"Configurer le Déverrouillage par reconn. faciale"</string>
+ <string name="security_settings_face_enroll_education_title_accessibility" msgid="3701874093226957891">"Configurer le Déverrouillage par reconnaissance faciale"</string>
<string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utiliser son visage pour s\'authentifier"</string>
<string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
<string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Commencer"</string>
@@ -320,7 +320,7 @@
<string name="security_settings_face_enroll_consent_introduction_title" msgid="3942331854413767814">"Autoriser le déverr. par reconn. faciale"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="5903924766168353113">"Utiliser son visage pour s\'authentifier"</string>
<string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="5841976283789481311">"Utilisez votre visage pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre visage pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
- <string name="security_settings_face_enroll_introduction_message_setup" msgid="765965418187421753">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications"</string>
+ <string name="security_settings_face_enroll_introduction_message_setup" msgid="765965418187421753">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applis"</string>
<string name="security_settings_face_enroll_introduction_info_title" msgid="7120796118179406944"></string>
<string name="security_settings_face_enroll_introduction_info_glasses" msgid="2733870453868907471"></string>
<string name="security_settings_face_enroll_introduction_info_consent_glasses" msgid="6303917184145586880"></string>
@@ -353,9 +353,9 @@
<string name="security_settings_face_settings_remove_face_model" msgid="812920481303980846">"Supprimer le modèle facial"</string>
<string name="security_settings_face_settings_enroll" msgid="3726313826693825029">"Config. le Déverr. par reconn. faciale"</string>
<string name="security_settings_face_settings_remove_dialog_title" msgid="2899669764446232715">"Supprimer le modèle facial?"</string>
- <string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"Votre modèle facial sera supprimé définitivement de façon sécurisée.\n\nVous devrez ensuite utiliser votre NIP, votre schéma ou votre mot de passe pour déverrouiller votre téléphone ou pour vous authentifier dans les applications."</string>
+ <string name="security_settings_face_settings_remove_dialog_details" msgid="916131485988121592">"Votre modèle facial sera supprimé définitivement de façon sécurisée.\n\nVous devrez ensuite utiliser votre NIP, votre schéma ou votre mot de passe pour déverrouiller votre téléphone ou pour vous authentifier dans les applis."</string>
<string name="security_settings_face_settings_remove_dialog_details_convenience" msgid="475568135197468990">"Votre modèle facial sera supprimé de façon permanente et sécurisée.\n\nPour déverrouiller votre téléphone, vous aurez ensuite besoin de ce qui suit : NIP, schéma ou mot de passe."</string>
- <string name="security_settings_face_remove_dialog_details_fingerprint" msgid="7609582230650860974">"Votre modèle facial sera supprimé définitivement de façon sécurisée.\n\nVous devrez ensuite utiliser votre empreinte digitale, votre NIP, votre schéma ou votre mot de passe pour déverrouiller votre téléphone ou pour vous authentifier dans les applications."</string>
+ <string name="security_settings_face_remove_dialog_details_fingerprint" msgid="7609582230650860974">"Votre modèle facial sera supprimé définitivement de façon sécurisée.\n\nVous devrez ensuite utiliser votre empreinte digitale, votre NIP, votre schéma ou votre mot de passe pour déverrouiller votre téléphone ou pour vous authentifier dans les applis."</string>
<string name="security_settings_face_remove_dialog_details_fingerprint_conv" msgid="2627374706274503259">"Votre modèle facial sera supprimé de façon permanente et sécurisée.\n\nVous devrez ensuite utiliser votre empreinte digitale, votre NIP, votre schéma ou votre mot de passe pour déverrouiller votre téléphone."</string>
<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>
@@ -378,7 +378,7 @@
<string name="security_settings_fingerprint_enroll_introduction_agree" msgid="4068276083536421828">"J\'accepte"</string>
<string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ignorer la configuration?"</string>
<string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"La configuration de l\'empreinte digitale ne prend qu\'une minute ou deux. Si vous ignorez cette étape, vous pourrez ajouter votre empreinte digitale plus tard dans les paramètres."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"Si vous voyez cette icône, utilisez votre empreinte pour vous authentifier (comme pour vous connecter à des applications ou approuver un achat)"</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_message_setup" msgid="6255210343107484206">"Si vous voyez cette icône, utilisez votre empreinte pour vous authentifier (comme pour vous connecter à des applis ou approuver un achat)"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_1" msgid="4360262371633254407">"Gardez à l\'esprit"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"Fonctionnement"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"Le Déverrouillage par empreinte digitale crée un modèle unique de votre empreinte digitale pour vérifier qu\'il s\'agit bien de vous. Pour créer ce modèle durant la configuration, l\'appareil vous demandera de capturer des images de votre empreinte digitale dans différentes positions."</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"<xliff:g id="WATCH">%s</xliff:g> et visage ajoutés"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Empreinte digitale, <xliff:g id="WATCH">%s</xliff:g> et visage ajoutés"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Empreintes digitales, <xliff:g id="WATCH">%s</xliff:g> et visage ajoutés"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Ces données sont nécessaires comme la vérification de l\'identité est activée"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Déverrouiller Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Montre ajoutée"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurer votre montre"</string>
@@ -437,8 +438,8 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"En savoir plus sur le Déverrouillage à l\'aide d\'une montre"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Ajouter une montre"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Retirer une montre"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Déverrouillage empreinte digitale et reconnaissance faciale"</string>
- <string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Déverr. par reconn. faciale et empreinte digitale pour le travail"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Déverr. par reconn. faciale et empreinte digitale"</string>
+ <string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Déverrouillage par recon. faciale et emp. digitale pour le travail"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configuration requise"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Empreintes digitales et visage ajoutés"</string>
<string name="security_settings_biometric_preference_summary_both_fp_single" msgid="684409535278676426">"Empreinte digitale et visage ajoutés"</string>
@@ -446,7 +447,7 @@
<string name="biometric_settings_category_ways_to_unlock" msgid="3384767901580915266">"Méthodes de déverrouillage"</string>
<string name="biometric_settings_category_use_face_fingerprint" msgid="4377659744376863913">"Utiliser le visage ou l\'empreinte digitale pour"</string>
<string name="biometric_settings_use_biometric_unlock_phone" msgid="8180914579885804358">"Déverrouiller votre téléphone"</string>
- <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Vérifier votre identité dans les applications"</string>
+ <string name="biometric_settings_use_biometric_for_apps" msgid="6201168728906364189">"Vérifier votre identité dans les applis"</string>
<string name="biometric_settings_use_face_preference_summary" msgid="1821648836899408477">"Utilisation du visage"</string>
<string name="biometric_settings_use_fingerprint_preference_summary" msgid="6077762097826050165">"Utilisation de l\'empreinte digitale"</string>
<string name="biometric_settings_use_face_or_fingerprint_preference_summary" msgid="3029102492674234728">"Utilisation du visage ou de l\'empreinte digitale"</string>
@@ -532,7 +533,7 @@
<string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Ajouter une empreinte"</string>
<string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Suivant"</string>
<string name="security_fingerprint_disclaimer_lockscreen_disabled_1" msgid="294529888220959309">"L\'option de verrouillage de l\'écran est désactivée. Pour en savoir plus, communiquez avec l\'administrateur de votre organisation."</string>
- <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Vous pouvez toujours utiliser votre empreinte digitale pour autoriser des achats et accéder à des applications."</string>
+ <string name="security_fingerprint_disclaimer_lockscreen_disabled_2" msgid="8070829069640846543">"Vous pouvez toujours utiliser votre empreinte digitale pour autoriser des achats et accéder à des applis."</string>
<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>
@@ -546,7 +547,7 @@
<string name="privacy_header" msgid="5526002421324257007">"Confidentialité"</string>
<string name="work_profile_category_header" msgid="85707750968948517">"Profil professionnel"</string>
<string name="private_space_title" msgid="1752064212078238723">"Espace privé"</string>
- <string name="private_space_summary" msgid="2274405892301976238">"Verrouiller et cacher les applications privées"</string>
+ <string name="private_space_summary" msgid="2274405892301976238">"Verrouiller et cacher les applis privées"</string>
<string name="private_space_description" msgid="4059594203775816136">"Conservez les applis privées dans un espace séparé que vous pouvez masquer ou verrouiller"</string>
<string name="private_space_lock_title" msgid="7230836881433350526">"Verrouillage de l\'espace privé"</string>
<string name="private_space_one_lock_summary" msgid="2106513606571219068">"Vous pouvez déverrouiller votre Espace privé de la même manière que votre appareil ou choisir un autre type de verrouillage"</string>
@@ -573,14 +574,14 @@
<string name="private_space_screen_lock_summary" msgid="394837965365561070">"Identique au verrouillage de l\'écran de l\'appareil"</string>
<string name="private_space_new_lock_title" msgid="9056139964133004094">"Choisir un nouveau verrou pour l\'Espace privé?"</string>
<string name="private_space_new_lock_message" msgid="3117703578905489206">"Vous devrez saisir le NIP, le schéma ou le mot de passe de votre appareil sur l\'écran suivant"</string>
- <string name="private_space_auto_lock_title" msgid="8663409382910601261">"Verrouiller automatiquement l\'Espace privé"</string>
+ <string name="private_space_auto_lock_title" msgid="8663409382910601261">"Verrouiller automatiquement l\'espace privé"</string>
<string name="private_space_auto_lock_page_summary" msgid="8679844515655838654">"Vous pouvez verrouiller automatiquement votre Espace privé si vous n\'avez pas utilisé votre appareil pendant un certain temps"</string>
<string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Chaque fois que l\'appareil se verrouille"</string>
<string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"5 min. après la mise veille de l\'écran"</string>
<string name="private_space_auto_lock_after_device_restart" msgid="288755768725895029">"Seul. après le redémarrage de l\'appareil"</string>
<string name="private_space_hide_page_title" msgid="3364639176511877414">"Masquer l\'espace privé"</string>
<string name="private_space_hide_when_locked" msgid="6219472348124151797">"Masquer l\'espace privé lorsqu\'il est verrouillé"</string>
- <string name="private_space_hide_page_summary" msgid="6247773353685839242">"Pour empêcher les autres personnes de savoir que vous avez un Espace privé sur votre appareil, vous pouvez le masquer à partir de votre liste d\'applications"</string>
+ <string name="private_space_hide_page_summary" msgid="6247773353685839242">"Pour empêcher les autres personnes de savoir que vous avez un Espace privé sur votre appareil, vous pouvez le masquer à partir de votre liste d\'applis"</string>
<string name="private_space_access_header" msgid="1077082416567150819">"Accéder à l\'Espace privé lorsqu\'il est masqué"</string>
<string name="private_space_search_description" msgid="1538155187658429618">"Dans la barre de recherche, saisissez « Espace privé »"</string>
<string name="private_space_tap_tile_description" msgid="6173556870938267361">"Touchez "<b>"Espace privé"</b></string>
@@ -607,18 +608,16 @@
<string name="private_space_cancel_label" msgid="379259667396956886">"Annuler"</string>
<string name="private_space_setup_button_label" msgid="2094882154623560585">"Configuration"</string>
<string name="private_space_setup_title" msgid="2272968244329821450">"Espace privé"</string>
- <string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Masquez ou verrouillez les applications privées dans un espace à part. Utilisez un compte Google dédié pour plus de sécurité."</string>
+ <string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Masquez ou verrouillez les applis privées dans un espace à part. Utilisez un compte Google dédié pour plus de sécurité."</string>
<string name="private_space_setup_sub_header" msgid="550476876393954356">"Fonctionnement"</string>
<string name="private_space_separate_account_text" msgid="790319706810190320"><b>"Créer un compte Google pour votre espace"</b>\n"Si vous utilisez un compte dédié, cela permet d\'éviter que des fichiers, des photos et des courriels synchronisés se retrouvent en dehors de votre espace"</string>
- <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Configurez un verrouillage"</b>\n"Verrouillez votre espace pour empêcher d\'autres personnes d\'y accéder"</string>
+ <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Configurer un verrouillage"</b>\n"Verrouillez votre espace pour empêcher d\'autres personnes d\'y accéder"</string>
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installer les applis"</b>\n"Installez les applis que vous voulez garder privées dans votre espace"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Garder à l\'esprit"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Les applis s\'arrêtent lorsque vous verrouillez votre espace"</b>\n"Lorsque vous verrouillez votre espace, les applis qui s\'y trouvent sont arrêtées, et vous ne recevez aucune notification de leur part"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
- <string name="private_space_learn_more_text" msgid="5314198983263277586">"En savoir plus sur l\'Espace privé"</string>
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Les espaces privés ne conviennent pas aux applis qui doivent être exécutées en arrière-plan ou qui doivent envoyer des notifications critiques, comme les applis médicales. En effet, les notifications et les activités en arrière-plan sont interrompues lorsque votre espace est verrouillé.\n\nLes applis contenues dans votre espace privé n\'apparaîtront pas dans le gestionnaire des autorisations, sur le tableau de bord de confidentialité ni dans les autres paramètres quand l\'espace privé est verrouillé.\n\nVotre espace privé ne peut être déplacé vers un autre appareil. Vous devrez créer un autre espace privé si vous souhaitez l\'utiliser sur un autre appareil.\n\nToute personne qui connecte votre appareil à un ordinateur ou installe des applis nuisibles sur votre appareil peut être en mesure d\'accéder à votre espace privé."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Les espaces privés ne conviennent pas aux applis qui doivent être exécutées en arrière-plan ou qui doivent envoyer des notifications critiques, comme les applis médicales. En effet, les notifications et les activités en arrière-plan sont interrompues lorsque votre espace est verrouillé.\n\nLes applis contenues dans votre espace privé n\'apparaîtront pas dans le gestionnaire des autorisations, sur le tableau de bord de confidentialité ni dans les autres paramètres quand l\'espace privé est verrouillé.\n\nVotre espace privé ne peut être restauré sur un autre appareil. Vous devrez créer un autre espace si vous souhaitez l\'utiliser sur un autre appareil.\n\nToute personne qui connecte votre appareil à un ordinateur ou installe des applis malveillantes sur votre appareil peut être en mesure d\'accéder à votre espace privé."</string>
+ <string name="private_space_learn_more_text" msgid="5314198983263277586">"En savoir plus sur l\'espace privé"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"L\'opération prendra quelques instants"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configuration de l\'Espace privé en cours…"</string>
<string name="private_space_error_screen_title" msgid="739381738044418346">"Impossible de configurer un Espace privé"</string>
@@ -629,7 +628,7 @@
<string name="private_space_set_lock_label" msgid="1790408277477408475">"Sélectionner un nouveau verrouillage"</string>
<string name="private_space_wait_screen_title" msgid="1535431437075585381">"Un instant…"</string>
<string name="private_space_success_title" msgid="4351904015352046118">"Tout est prêt!"</string>
- <string name="private_space_access_text" msgid="4433988836344567888">"Pour accéder à votre Espace privé, accédez à votre liste d\'applications, puis faites défiler vers le bas"</string>
+ <string name="private_space_access_text" msgid="4433988836344567888">"Pour accéder à votre Espace privé, accédez à votre liste d\'applis, puis faites défiler vers le bas"</string>
<string name="private_space_done_label" msgid="1020482651595246071">"Terminé"</string>
<string name="private_space_scrolldown_to_access" msgid="4820954877349434545">"Faites défiler l\'écran vers le bas pour trouver l\'Espace privé"</string>
<string name="private_space_retry_signin_title" msgid="8090276618867918844">"Se connecter"</string>
@@ -647,7 +646,7 @@
<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>
<string name="fingerprint_delete_title" msgid="5412123164503407098">"Supprimer « <xliff:g id="FINGERPRINT_ID">%1$s</xliff:g> »"</string>
- <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre profil professionnel, autoriser vos achats ni vous connecter à des applications professionnelles."</string>
+ <string name="fingerprint_last_delete_message_profile_challenge" msgid="4104208067277655068">"Vous ne pourrez pas utiliser votre empreinte digitale pour déverrouiller votre profil professionnel, autoriser vos achats ni vous connecter à des applis professionnelles."</string>
<string name="encryption_settings_title" msgid="2848716008695618360">"Chiffrement"</string>
<string name="encrypted_summary" msgid="545623487587251207">"Chiffrement activé"</string>
<string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Configurer le verrouillage de l\'écran"</string>
@@ -703,68 +702,68 @@
<string name="unlock_disable_frp_warning_content_pattern" msgid="6246242612158828147">"Un schéma protège votre téléphone en cas de perte ou de vol"</string>
<string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="2259825377085781801">"Un schéma protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_pattern_face" msgid="4699508435412336378">"Un schéma protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applications."</string>
+</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_pattern_face_fingerprint" msgid="7049706229344804972">"Un schéma protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_pin" msgid="122154942944422284">"Un NIP protège votre téléphone en cas de perte ou de vol"</string>
<string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="983373874470746066">"Un NIP protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_pin_face" msgid="5607150515413131761">"Un NIP protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applications."</string>
+</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_pin_face_fingerprint" msgid="1821792325159866312">"Un NIP protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_password" msgid="6422723907917376210">"Un mot de passe protège votre téléphone en cas de perte ou de vol"</string>
<string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="8899452884016354856">"Un mot de passe protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_password_face" msgid="1811067332335964495">"Un mot de passe protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applications."</string>
+</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_password_face_fingerprint" msgid="7063649456205159491">"Un mot de passe protège votre téléphone en cas de perte ou de vol.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_unknown" msgid="8903568674104115231">"Les fonctionnalités de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
<string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6542744110902941189">"Les fonctionnalités de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime également le modèle d\'empreinte digitale stocké sur votre appareil. Vous ne pourrez pas utiliser votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_unknown_face" msgid="4559917661432267841">"Les fonctionnalités de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
-</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applications."</string>
+</xliff:g>Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_unknown_face_fingerprint" msgid="3779582301453677644">"Les fonctionnalités de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
-</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applications."</string>
+</xliff:g>Cette fonctionnalité supprime le modèle d\'empreinte digitale stocké sur votre appareil. Votre modèle facial sera également supprimé définitivement de façon sécurisée. Vous ne pourrez pas utiliser votre visage ni votre empreinte digitale pour vous authentifier dans les applis."</string>
<string name="unlock_disable_frp_warning_content_authbound_keys" msgid="6397327696248819663">"Le verrouillage de l\'écran sera retiré.<xliff:g id="EMPTY_LINE_0">
</xliff:g>Le Paiement sans contact ne sera pas accessible.<xliff:g id="EMPTY_LINE_1">
-</xliff:g>Le Portefeuille, le paiement et d\'autres applications nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
+</xliff:g>Le Portefeuille, le paiement et d\'autres applis nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
<string name="unlock_disable_frp_warning_content_fingerprint_authbound_keys" msgid="7158076544627335461">"Le verrouillage de l\'écran et le Déverrouillage par empreinte digitale seront retirés.<xliff:g id="EMPTY_LINE_0">
</xliff:g>Le Paiement sans contact ne sera pas accessible.<xliff:g id="EMPTY_LINE_1">
-</xliff:g>Le Portefeuille, le paiement et d\'autres applications nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
+</xliff:g>Le Portefeuille, le paiement et d\'autres applis nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
<string name="unlock_disable_frp_warning_content_face_authbound_keys" msgid="8120786951217029818">"Le verrouillage de l\'écran et le Déverrouillage par reconnaissance faciale seront retirés.<xliff:g id="EMPTY_LINE_0">
</xliff:g>Le Paiement sans contact ne sera pas accessible.<xliff:g id="EMPTY_LINE_1">
-</xliff:g>Le Portefeuille, le paiement et d\'autres applications nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
+</xliff:g>Le Portefeuille, le paiement et d\'autres applis nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
<string name="unlock_disable_frp_warning_content_face_fingerprint_authbound_keys" msgid="1574263040292024543">"Le verrouillage de l\'écran et le Déverrouillage par reconnaissance faciale et par empreinte digitale seront retirés.<xliff:g id="EMPTY_LINE_0">
</xliff:g>Le Paiement sans contact ne sera pas accessible.<xliff:g id="EMPTY_LINE_1">
-</xliff:g>Le Portefeuille, le paiement et d\'autres applications nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
+</xliff:g>Le Portefeuille, le paiement et d\'autres applis nécessitant une authentification pourraient ne pas fonctionner correctement."</string>
<string name="unlock_disable_frp_warning_ok" msgid="6173427638951230842">"Supprimer"</string>
<string name="unlock_footer_high_complexity_requested" msgid="4471274783909915352">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommande d\'utiliser un NIP ou un mot de passe robuste et risque de ne pas fonctionner comme prévu si vous n\'en définissez pas un"</string>
<string name="unlock_footer_medium_complexity_requested" msgid="5515870066751600640">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommande d\'utiliser un nouveau NIP ou mot de passe et risque de ne pas fonctionner comme prévu si vous n\'en définissez pas un"</string>
<string name="unlock_footer_low_complexity_requested" msgid="2517656037576567971">"<xliff:g id="APP_NAME">%1$s</xliff:g> recommande d\'utiliser un nouveau schéma, NIP ou mot de passe et risque de ne pas fonctionner comme prévu si vous n\'en définissez pas un"</string>
- <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> vous recommande d\'utiliser un nouveau mode de verrouillage de l\'écran"</string>
+ <string name="unlock_footer_none_complexity_requested" msgid="8534900170428140529">"L\'appli <xliff:g id="APP_NAME">%1$s</xliff:g> vous recommande d\'utiliser un nouveau mode de verrouillage de l\'écran"</string>
<string name="lock_failed_attempts_before_wipe" msgid="6874652886647631418">"Réessayez. Tentative <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> sur <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
<string name="lock_last_attempt_before_wipe_warning_title" msgid="7450322567217745999">"Vos données seront supprimées"</string>
<string name="lock_last_pattern_attempt_before_wipe_device" msgid="5816668400104558952">"Si vous entrez un schéma incorrect à la prochaine tentative, les données de cet appareil seront supprimées."</string>
@@ -798,9 +797,9 @@
<string name="lockpassword_credential_changed" msgid="5934778179732392028">"Le verrouillage d\'écran a déjà été modifié. Réessayez avec le nouveau verrouillage d\'écran."</string>
<string name="lockpattern_tutorial_cancel_label" msgid="775215267818384016">"Annuler"</string>
<string name="lockpattern_tutorial_continue_label" msgid="1329049481210689408">"Suivant"</string>
- <string name="manage_device_admin" msgid="1044620606203916275">"Applications d\'administration d\'appareils"</string>
- <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune application active"</string>
- <string name="number_of_device_admins" msgid="3402909995362162876">"{count,plural, =1{# application active}one{# application active}other{# applications actives}}"</string>
+ <string name="manage_device_admin" msgid="1044620606203916275">"Applis d\'administration d\'appareils"</string>
+ <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune appli active"</string>
+ <string name="number_of_device_admins" msgid="3402909995362162876">"{count,plural, =1{# appli active}one{# appli active}other{# applis actives}}"</string>
<string name="manage_trust_agents" msgid="6410149930029992356">"Agents de confiance"</string>
<string name="disabled_because_no_backup_security" msgid="4998095356607488854">"Pour l\'utiliser, définissez d\'abord un écran de verrouillage"</string>
<string name="manage_trust_agents_summary" msgid="6423843123607674286">"Aucun"</string>
@@ -828,8 +827,8 @@
<string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Associer et connecter"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="7326727272747345476">"Si la fonctionnalité Bluetooth est activée, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité"</string>
<string name="bluetooth_empty_list_bluetooth_off_auto_on_available" msgid="3430864468105204282">"Si le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité. Les fonctionnalités comme Partage rapide et Localiser mon appareil utilisent le Bluetooth."</string>
- <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"Lorsque le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité.\n\nPour améliorer l\'expérience d\'utilisation de l\'appareil, les applications et les services peuvent continuer de rechercher les appareils à proximité en tout temps, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services reposant sur la localisation. Vous pouvez modifier cette option dans les paramètres de recherche Bluetooth."</string>
- <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="7792443293031247638">"Si le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité. Les fonctionnalités comme Partage rapide et Localiser mon appareil utilisent le Bluetooth.\n\nLes applications et les services peuvent continuer de rechercher les appareils à proximité en tout temps, même si le Bluetooth est désactivé. Cela peut permettre, par exemple, d\'améliorer les fonctionnalités et les services reposant sur la localisation. Vous pouvez modifier cette option dans les paramètres de recherche d\'appareils Bluetooth."</string>
+ <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"Lorsque le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité.\n\nPour améliorer l\'expérience d\'utilisation de l\'appareil, les applis et les services peuvent continuer de rechercher les appareils à proximité en tout temps, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services reposant sur la localisation. Vous pouvez modifier cette option dans les paramètres de recherche Bluetooth."</string>
+ <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="7792443293031247638">"Si le Bluetooth est activé, votre appareil peut communiquer avec d\'autres appareils Bluetooth à proximité. Les fonctionnalités comme Partage rapide et Localiser mon appareil utilisent le Bluetooth.\n\nLes applis et les services peuvent continuer de rechercher les appareils à proximité en tout temps, même si le Bluetooth est désactivé. Cela peut permettre, par exemple, d\'améliorer les fonctionnalités et les services reposant sur la localisation. Vous pouvez modifier cette option dans les paramètres de recherche d\'appareils Bluetooth."</string>
<string name="bluetooth_scan_change" msgid="1744636222637390367">"Modifier"</string>
<string name="device_details_title" msgid="1155622417516195481">"Détails de l\'appareil"</string>
<string name="bluetooth_device_keyboard_settings_preference_title" msgid="3411693160917620519">"Paramètres du clavier"</string>
@@ -837,11 +836,11 @@
<string name="bluetooth_multuple_devices_mac_address" msgid="4974301550897923376">"Adresse Bluetooth de l\'appareil :\n<xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_unpair_dialog_title" msgid="6943633443716052995">"Oublier l\'appareil?"</string>
<string name="remove_association_button" msgid="5004208145998061135">"Retirer l\'association"</string>
- <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Déconnecter l\'application?"</string>
- <string name="bluetooth_companion_app_body" msgid="8442643629075687761">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> ne se connectera plus à votre <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
+ <string name="bluetooth_companion_app_remove_association_dialog_title" msgid="1344518601377991897">"Déconnecter l\'appli?"</string>
+ <string name="bluetooth_companion_app_body" msgid="8442643629075687761">"L\'appli <xliff:g id="APP_NAME">%1$s</xliff:g> ne se connectera plus à votre <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string>
<string name="device_details_leaudio_toggle_summary" msgid="7684848254433230809">"Expérimental. Améliore l\'audio."</string>
<string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"Oublier l\'appareil"</string>
- <string name="bluetooth_companion_app_remove_association_confirm_button" msgid="76323555527926915">"Déconnecter l\'application"</string>
+ <string name="bluetooth_companion_app_remove_association_confirm_button" msgid="76323555527926915">"Déconnecter l\'appli"</string>
<string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Maximum d\'appareils audio Bluetooth connectés"</string>
<string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Sélectionnez le nombre maximal d\'appareils Bluetooth connectés"</string>
<string name="nfc_verbose_vendor_log_title" msgid="5554505631122964628">"Journal de débogage détaillé des fournisseurs CCP"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Redémarrer l\'appareil?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Les détails de la journalisation CCP sont enregistrés à des fins de développement uniquement. Des données CCP supplémentaires sont comprises dans les rapports de bogue, qui peuvent contenir des renseignements confidentiels. Redémarrez votre appareil pour modifier ce paramètre."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Redémarrer"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"duplication, écran externe, écran connecté, écran usb, résolution, rotation"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -876,7 +890,7 @@
<string name="wifi_ask_enable" msgid="6860056048266810769">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite activer le Wi-Fi"</string>
<string name="wifi_ask_disable" msgid="1663208096020309639">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite désactiver le Wi-Fi"</string>
<string name="art_verifier_for_debuggable_title" msgid="1926445785190030479">"Vérif. code à octets des applis déboguables"</string>
- <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"Autoriser ART à vérifier le code à octets pour les applications débogables"</string>
+ <string name="art_verifier_for_debuggable_summary" msgid="4802875841862652879">"Autoriser ART à vérifier le code à octets pour les applis débogables"</string>
<string name="show_refresh_rate" msgid="5742688821872354973">"Afficher le taux d\'actualisation"</string>
<string name="show_refresh_rate_summary" msgid="3558118122374609663">"Affichez le taux d\'actualisation actuel"</string>
<string name="show_hdr_sdr_ratio" msgid="4188007289024955585">"Afficher le rapport HDR/SDR"</string>
@@ -884,10 +898,10 @@
<string name="nfc_quick_toggle_title" msgid="3607620705230351666">"CCP"</string>
<string name="nfc_secure_settings_title" msgid="4906958426927741485">"Déverrouillage de l\'appareil requis pour utiliser la technologie CCP"</string>
<string name="android_beam_settings_title" msgid="2797963824490671295">"Android Beam"</string>
- <string name="android_beam_on_summary" msgid="6067720758437490896">"Prêt à partager le contenu de l\'application par CCP"</string>
+ <string name="android_beam_on_summary" msgid="6067720758437490896">"Prêt à partager le contenu de l\'appli par CCP"</string>
<string name="android_beam_off_summary" msgid="5693961375631325042">"Désactivé"</string>
<string name="nfc_disabled_summary" msgid="8737797364522502351">"Non accessible, car la CCP est désactivée"</string>
- <string name="android_beam_explained" msgid="5684416131846701256">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible CCP en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant généralement dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
+ <string name="android_beam_explained" msgid="5684416131846701256">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une appli avec un appareil compatible CCP en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant généralement dos à dos), puis de toucher votre écran. L\'appli détermine le contenu à transférer."</string>
<string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
<string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utiliser le Wi-Fi"</string>
<string name="wifi_settings_category" msgid="3523464780563778321">"Paramètres Wi-Fi"</string>
@@ -906,7 +920,7 @@
<string name="wifi_wakeup_summary" msgid="5778059083790221465">"Le Wi‑Fi se réactivera automatiquement à proximité des réseaux de haute qualité qui sont enregistrés, comme celui de votre domicile"</string>
<string name="wifi_wakeup_summary_no_location" msgid="681323616606485096">"Cette fonction n\'est pas accessible, car le service de localisation est désactivé. Activez la "<annotation id="link">"localisation"</annotation>"."</string>
<string name="wifi_install_credentials" msgid="5192903644606839972">"Installer des certificats"</string>
- <string name="wifi_scan_notify_text" msgid="7163137260385995873">"Pour améliorer la précision de la localisation, les applications et les services peuvent quand même rechercher des réseaux Wi‑Fi en tout temps, même lorsque le Wi‑Fi est désactivé. Cela pourrait être utilisé, par exemple, pour améliorer les fonctionnalités et les services qui utilisent la localisation. Vous pouvez modifier vos préférences dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche de réseaux Wi-Fi<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="wifi_scan_notify_text" msgid="7163137260385995873">"Pour améliorer la précision de la localisation, les applis et les services peuvent quand même rechercher des réseaux Wi‑Fi en tout temps, même lorsque le Wi‑Fi est désactivé. Cela pourrait être utilisé, par exemple, pour améliorer les fonctionnalités et les services qui utilisent la localisation. Vous pouvez modifier vos préférences dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche de réseaux Wi-Fi<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="7439201783168213149">"Pour améliorer la précision de la localisation, activez la recherche de réseaux Wi-Fi dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche de réseaux Wi-Fi<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Passer automatiquement au réseau cellulaire"</string>
<string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Utiliser le réseau de données cellulaires lorsque le réseau Wi-Fi n\'a pas accès à Internet. Des frais d\'utilisation de données peuvent s\'appliquer."</string>
@@ -920,11 +934,11 @@
<string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Vous n\'avez pas l\'autorisation de modifier le réseau Wi‑Fi."</string>
<string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Activer la Recherche de réseaux Wi-Fi?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"Pour activer automatiquement le Wi-Fi, vous devez d\'abord activer la Recherche de réseaux Wi-Fi."</string>
- <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"La Recherche de réseaux Wi-Fi permet aux applications et aux services de rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi 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="wifi_settings_scanning_required_info" msgid="1473411566072565789">"La Recherche de réseaux Wi-Fi permet aux applis et aux services de rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi 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="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Activer"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"La recherche de réseaux Wi-Fi est activée"</string>
<string name="wifi_settings_warning_wep_network" msgid="7032462362300663466">"Ce réseau utilise un protocole de sécurité plus ancien appelé WEP, qui est moins sécuritaire"</string>
- <string name="wifi_settings_wep_networks_blocked_title" msgid="8337700496544833669">"L\'application <xliff:g id="NAME">%1$s</xliff:g> est bloquée"</string>
+ <string name="wifi_settings_wep_networks_blocked_title" msgid="8337700496544833669">"L\'appli <xliff:g id="NAME">%1$s</xliff:g> est bloquée"</string>
<string name="wifi_settings_wep_networks_summary_toggle_off" msgid="1113138364046142949">"Ce réseau utilise un protocole de sécurité plus ancien et moins sécuritaire appelé WEP. Pour vous connecter quand même, vous pouvez autoriser les réseaux WEP."</string>
<string name="wifi_settings_wep_networks_summary_blocked_by_carrier" msgid="5891581925109256871">"Votre opérateur ne vous permet pas de vous connecter à ce réseau, car il utilise un protocole de sécurité plus ancien appelé WEP, qui est moins sécuritaire"</string>
<string name="wifi_settings_wep_networks_button_allow" msgid="2807926329019873706">"Autoriser WEP"</string>
@@ -1007,7 +1021,7 @@
<string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utilisez un code QR pour ajouter un appareil à ce réseau"</string>
<string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Le format du code QR est incorrect"</string>
<string name="retry" msgid="7542103800274026915">"Réessayer"</string>
- <string name="wifi_shared" msgid="8850748923537589782">"Partager avec d\'autres utilisateurs d\'appareils"</string>
+ <string name="wifi_shared" msgid="8850748923537589782">"Partager avec d\'autres utilisateurs de l\'appareil"</string>
<string name="wifi_unchanged" msgid="8026045290856150191">"(aucune modification)"</string>
<string name="wifi_unspecified" msgid="4561964943472312208">"Veuillez choisir"</string>
<string name="wifi_multiple_cert_added" msgid="2151019652853383776">"(Certificats multiples ajoutés)"</string>
@@ -1017,11 +1031,11 @@
<string name="wifi_ssid_too_long" msgid="5961719058705013875">"Le nom du réseau est trop long."</string>
<string name="wifi_no_domain_warning" msgid="1452133316532366772">"Vous devez spécifier un domaine."</string>
<string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificat obligatoire."</string>
- <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
+ <string name="wifi_scan_always_turnon_message" msgid="2165909441512029921">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applis souhaitant activer la recherche de réseaux?"</string>
<string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Pour améliorer la précision de la position, une appli inconnue souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nAutoriser toutes les applis qui le demandent?"</string>
<string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Autoriser"</string>
<string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Refuser"</string>
- <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès à Internet. Voulez-vous quand même l\'utiliser?"</string>
+ <string name="no_internet_access_text" msgid="3611993143350310936">"Ce réseau ne dispose d\'aucun accès Internet. Voulez-vous quand même l\'utiliser?"</string>
<string name="partial_connectivity_text" msgid="8874614799723694554">"Connectivité limitée : certains services et applis pourraient ne pas fonctionner. Utiliser quand même?"</string>
<string name="no_internet_access_remember" msgid="5113610157731269258">"Ne plus me demander pour ce réseau"</string>
<string name="lost_internet_access_title" msgid="9032463989950384698">"Le Wi‑Fi n\'est pas connecté à Internet"</string>
@@ -1183,7 +1197,7 @@
<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 applications."</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>
<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>
@@ -1192,12 +1206,13 @@
<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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Afficher la balance des blancs"</string>
<string name="display_white_balance_summary" msgid="7625456704950209050"></string>
- <string name="fold_lock_behavior_title" msgid="786228803694268449">"Continuer à utiliser les applications lorsque l\'appareil est plié"</string>
+ <string name="fold_lock_behavior_title" msgid="786228803694268449">"Continuer à utiliser les applis lorsque l\'appareil est plié"</string>
<string name="disable_game_default_frame_rate_title" msgid="3712908601744143753">"Désactiver la fréquence d\'images par défaut des jeux"</string>
<string name="disable_game_default_frame_rate_summary" msgid="4436762704707434225">"Désactivez la limitation de la fréquence d\'images maximale pour les jeux à <xliff:g id="FRAME_RATE">%1$d</xliff:g> Hz."</string>
<string name="peak_refresh_rate_title" msgid="2056355754210341011">"Affichage fluide"</string>
@@ -1320,7 +1335,7 @@
<string name="enable_auto_data_switch_dialog_message" msgid="5777287241521946883">"Autorisez votre téléphone à passer automatiquement à <xliff:g id="BACKUP_CARRIER">%1$s</xliff:g> pour les données cellulaires en cas de meilleure disponibilité."</string>
<string name="auto_data_switch_dialog_managed_profile_warning" msgid="6839438290079866605">\n\n"Les appels, les messages et le trafic réseau peuvent être visibles pour votre organisation."</string>
<string name="wrong_pin_code_pukked" msgid="3414172752791445033">"NIP de carte SIM incorrect. Vous devez maintenant communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
- <string name="wrong_pin_code" msgid="8124222991071607958">"{count,plural, =1{NIP de la carte SIM incorrect. Il vous reste # tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil.}one{NIP de la carte SIM incorrect. Il vous reste # tentative.}other{NIP de la carte SIM incorrect. Il vous reste # tentatives.}}"</string>
+ <string name="wrong_pin_code" msgid="8124222991071607958">"{count,plural, =1{NIP de la carte SIM incorrect. Il vous reste # tentative. Après cela, vous devrez communiquer avec votre opérateur pour déverrouiller votre appareil.}one{NIP de la carte SIM incorrect. Il vous reste # tentative.}other{NIP de la carte SIM incorrect. Il vous reste # tentatives.}}"</string>
<string name="wrong_pin_code_one" msgid="6924852214263071441">"NIP de module SIM incorrect. Il vous reste une tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
<string name="pin_failed" msgid="3726505565797352255">"Le déverrouillage par NIP de carte SIM a échoué."</string>
<string name="system_update_settings_list_item_title" msgid="3398346836439366350">"Mises à jour du système"</string>
@@ -1397,24 +1412,24 @@
<string name="storage_unmount_failure" msgid="3796912279003790607">"Impossible d\'éjecter <xliff:g id="NAME">%1$s</xliff:g> en toute sécurité"</string>
<string name="storage_rename_title" msgid="5911285992205282312">"Renommer le stockage"</string>
<string name="storage_dialog_unmountable" msgid="1761107904296941687">"La mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> » est corrompue. \n\nPour utiliser la mémoire « <xliff:g id="NAME_1">^1</xliff:g> », vous devez d\'abord la configurer."</string>
- <string name="storage_internal_format_details" msgid="2399034372813686846">"Vous pouvez formater cette carte SD pour y stocker des photos, des vidéos, de la musique et plus encore. Vous pouvez aussi y accéder à partir d\'autres appareils. \n\n"<b>"Toutes les données de cette carte SD seront supprimées."</b>" \n\n"<b>"Avant le formatage"</b>" \n\n"<b>"Sauvegardez les photos et les autres contenus multimédias"</b>" \nDéplacez vos fichiers multimédias vers un autre support de stockage sur cet appareil, ou transférez-les sur un ordinateur au moyen d\'un câble USB. \n\n"<b>"Sauvegardez vos applications"</b>" \nToutes les applications stockées sur cette <xliff:g id="NAME">^1</xliff:g> seront désinstallées, et leurs données seront supprimées. Pour conserver ces applications, déplacez-les vers un autre support de stockage sur cet appareil."</string>
- <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Lorsque vous éjectez la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> », les applications qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus accessibles jusqu\'à ce que vous la réinsériez de nouveau."</b>\n\n"La mémoire de stockage « <xliff:g id="NAME_1">^1</xliff:g> » a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
- <string name="storage_internal_forget_details" msgid="5606507270046186691">"Pour utiliser les applications, les photos ou les données que la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » contient, insérez de nouveau celle-ci. \n\nVous pouvez également la supprimer de la liste des mémoires de stockage si elle n\'est pas disponible. \n\nSi vous la supprimez, toutes les données qu\'elle contient seront définitivement effacées. \n\nVous pouvez réinstaller les applications plus tard, mais les données correspondantes enregistrées sur cette mémoire seront perdues."</string>
+ <string name="storage_internal_format_details" msgid="2399034372813686846">"Vous pouvez formater cette carte SD pour y stocker des photos, des vidéos, de la musique et plus encore. Vous pouvez aussi y accéder à partir d\'autres appareils. \n\n"<b>"Toutes les données de cette carte SD seront supprimées."</b>" \n\n"<b>"Avant le formatage"</b>" \n\n"<b>"Sauvegardez les photos et les autres contenus multimédias"</b>" \nDéplacez vos fichiers multimédias vers un autre support de stockage sur cet appareil, ou transférez-les sur un ordinateur au moyen d\'un câble USB. \n\n"<b>"Sauvegardez vos applis"</b>" \nToutes les applis stockées sur cette <xliff:g id="NAME">^1</xliff:g> seront désinstallées, et leurs données seront supprimées. Pour conserver ces applis, déplacez-les vers un autre support de stockage sur cet appareil."</string>
+ <string name="storage_internal_unmount_details" msgid="487689543322907311"><b>"Lorsque vous éjectez la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> », les applis qui y sont enregistrées cessent de fonctionner, et les fichiers qu\'elle contient ne sont plus accessibles jusqu\'à ce que vous la réinsériez de nouveau."</b>\n\n"La mémoire de stockage « <xliff:g id="NAME_1">^1</xliff:g> » a été configurée pour ne fonctionner que sur cet appareil. Vous ne pouvez pas l\'utiliser sur d\'autres appareils."</string>
+ <string name="storage_internal_forget_details" msgid="5606507270046186691">"Pour utiliser les applis, les photos ou les données que la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » contient, insérez de nouveau celle-ci. \n\nVous pouvez également la supprimer de la liste des mémoires de stockage si elle n\'est pas disponible. \n\nSi vous la supprimez, toutes les données qu\'elle contient seront définitivement effacées. \n\nVous pouvez réinstaller les applis plus tard, mais les données correspondantes enregistrées sur cette mémoire seront perdues."</string>
<string name="storage_internal_forget_confirm_title" msgid="379238668153099015">"Oublier « <xliff:g id="NAME">^1</xliff:g> »?"</string>
- <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Toutes les applications, photos et données enregistrées sur la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » seront perdues définitivement."</string>
+ <string name="storage_internal_forget_confirm" msgid="5752634604952674123">"Toutes les applis, photos et données enregistrées sur la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » seront perdues définitivement."</string>
<string name="storage_detail_dialog_system" msgid="7461009051858709479">"Le répertoire Système comprend des fichiers utilisés pour faire fonctionner Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="storage_os_detail_dialog_system" msgid="1423073052313067844">"Cela comprend votre système d\'exploitation et les fichiers nécessaires au bon fonctionnement de votre téléphone. Pour protéger leur intégrité, ces fichiers ne sont pas accessibles."</string>
<string name="storage_other_files_detail_dialog_system" msgid="8241153880150866635">"Cela comprend la mémoire cache et d\'autres fichiers temporaires nécessaires à votre système d\'exploitation. Vous pouvez constater des changements dans la quantité d\'espace de stockage utilisée au fil du temps."</string>
<string name="storage_system_label" msgid="8320948583086758295">"Système"</string>
- <string name="storage_wizard_guest" msgid="5813419895687733649">"En mode Invité, on ne peut formater de cartes SD"</string>
+ <string name="storage_wizard_guest" msgid="5813419895687733649">"En mode Invité, on ne peut pas formater de cartes SD"</string>
<string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formatage de « <xliff:g id="NAME">^1</xliff:g> » en cours..."</string>
<string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"Ne retirez pas <xliff:g id="NAME">^1</xliff:g> durant le formatage."</string>
<string name="storage_wizard_ready_title" msgid="3631022511474086605">"<xliff:g id="NAME">^1</xliff:g> formatée"</string>
<string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
- <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Le déplacement de l\'application « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application tant que l\'opération n\'est pas terminée. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
+ <string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Le déplacement de l\'appli « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'appli tant que l\'opération n\'est pas terminée. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
<string name="storage_wizard_move_unlock" msgid="14651384927767749">"Pour déplacer des données, vous devez déverrouiller l\'utilisateur <xliff:g id="APP">^1</xliff:g>."</string>
<string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Déplacement de <xliff:g id="APP">^1</xliff:g> en cours..."</string>
- <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » pendant le déplacement. \n\nL\'application « <xliff:g id="APP">^2</xliff:g> » ne sera pas disponible tant que l\'opération n\'est pas terminée."</string>
+ <string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » pendant le déplacement. \n\nL\'appli « <xliff:g id="APP">^2</xliff:g> » ne sera pas disponible tant que l\'opération n\'est pas terminée."</string>
<string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"Comment utiliserez-vous ce périphérique <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"ou"</string>
<string name="storage_wizard_init_v2_external_title" msgid="2786416384217054112">"Formater la carte SD en tant que mémoire externe"</string>
@@ -1422,18 +1437,18 @@
<string name="storage_wizard_init_v2_external_action" msgid="6140058734875839081">"Formater"</string>
<string name="storage_wizard_init_v2_later" msgid="5366815913892609285">"Configurer plus tard"</string>
<string name="storage_wizard_format_confirm_v2_title" msgid="6294104100437326067">"Formater cette <xliff:g id="NAME">^1</xliff:g>?"</string>
- <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"Cette <xliff:g id="NAME_0">^1</xliff:g> doit être formatée pour stocker des applications et des fichiers. \n\nLe formatage effacera le contenu existant de la <xliff:g id="NAME_1">^2</xliff:g>. Pour éviter de perdre votre contenu, sauvegardez-le sur une autre <xliff:g id="NAME_2">^3</xliff:g> ou un autre appareil."</string>
+ <string name="storage_wizard_format_confirm_v2_body" msgid="635958708974709506">"Cette <xliff:g id="NAME_0">^1</xliff:g> doit être formatée pour stocker des applis et des fichiers. \n\nLe formatage effacera le contenu existant de la <xliff:g id="NAME_1">^2</xliff:g>. Pour éviter de perdre votre contenu, sauvegardez-le sur une autre <xliff:g id="NAME_2">^3</xliff:g> ou un autre appareil."</string>
<string name="storage_wizard_format_confirm_v2_body_external" msgid="5810296966099830035">"Vous devez formater cette <xliff:g id="NAME_0">^1</xliff:g> pour pouvoir y stocker des photos, des vidéos, de la musique, et plus encore. \n\nLe formatage supprimera le contenu existant de la <xliff:g id="NAME_1">^2</xliff:g>. Pour éviter de perdre votre contenu, sauvegardez-le sur une autre <xliff:g id="NAME_2">^3</xliff:g> ou un autre appareil."</string>
<string name="storage_wizard_format_confirm_v2_action" msgid="5718254101386377126">"Formater <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_migrate_v2_title" msgid="3471564531564756698">"Déplacer le contenu vers <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_migrate_v2_checklist" msgid="2618258869444553060">"Pendant le déplacement :"</string>
<string name="storage_wizard_migrate_v2_checklist_media" msgid="5867134681730723744">"Ne retirez pas le périphérique <xliff:g id="NAME">^1</xliff:g>"</string>
- <string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"Certaines applications ne fonctionneront pas"</string>
+ <string name="storage_wizard_migrate_v2_checklist_apps" msgid="1882077445750580783">"Certaines applis ne fonctionneront pas"</string>
<string name="storage_wizard_migrate_v2_now" msgid="3341460117088026966">"Déplacer le contenu"</string>
<string name="storage_wizard_migrate_v2_later" msgid="6067756122853315642">"Déplacer le contenu plus tard"</string>
<string name="storage_wizard_migrate_progress_v2_title" msgid="8791318509516968103">"Déplacement du contenu en cours…"</string>
<string name="storage_wizard_slow_v2_title" msgid="3760766921170980221">"Périphérique <xliff:g id="NAME">^1</xliff:g> lent"</string>
- <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"Vous pouvez toujours utiliser le périphérique <xliff:g id="NAME_0">^1</xliff:g>, mais il peut être lent. \n\nLes applications stockées sur le périphérique <xliff:g id="NAME_1">^2</xliff:g> peuvent ne pas fonctionner correctement et les transferts de contenu peuvent prendre beaucoup de temps. \n\nEssayez d\'utiliser un autre périphérique <xliff:g id="NAME_2">^3</xliff:g>, ou utilisez plutôt le périphérique <xliff:g id="NAME_3">^4</xliff:g> comme mémoire de stockage externe."</string>
+ <string name="storage_wizard_slow_v2_body" msgid="7604252106419016929">"Vous pouvez toujours utiliser le périphérique <xliff:g id="NAME_0">^1</xliff:g>, mais il peut être lent. \n\nLes applis stockées sur le périphérique <xliff:g id="NAME_1">^2</xliff:g> peuvent ne pas fonctionner correctement et les transferts de contenu peuvent prendre beaucoup de temps. \n\nEssayez d\'utiliser un autre périphérique <xliff:g id="NAME_2">^3</xliff:g>, ou utilisez plutôt le périphérique <xliff:g id="NAME_3">^4</xliff:g> comme mémoire de stockage externe."</string>
<string name="storage_wizard_slow_v2_start_over" msgid="1806852287668077536">"Recommencer"</string>
<string name="storage_wizard_slow_v2_continue" msgid="7469713755893007901">"Continuer"</string>
<string name="storage_wizard_ready_v2_external_body" msgid="7688457485389886923">"Vous pouvez commencer à utiliser votre <xliff:g id="NAME">^1</xliff:g>"</string>
@@ -1515,8 +1530,8 @@
<string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données de l\'utilisateur"</li></string>
<string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Modules eSIM"</li></string>
<string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
- <string name="main_clear_final_desc" msgid="5800877928569039580">"Tous vos renseignements personnels et les applications téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
- <string name="main_clear_final_desc_esim" msgid="6592404057237813989">"Tous vos renseignements personnels, y compris les applications et les cartes eSIM téléchargées, seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+ <string name="main_clear_final_desc" msgid="5800877928569039580">"Tous vos renseignements personnels et les applis téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+ <string name="main_clear_final_desc_esim" msgid="6592404057237813989">"Tous vos renseignements personnels, y compris les applis et les cartes eSIM téléchargées, seront supprimés. Vous ne pouvez pas annuler cette action."</string>
<string name="main_clear_confirm_title" msgid="6577071819657853713">"Effacer toutes les données?"</string>
<string name="main_clear_not_available" msgid="3433795327146684827">"La réinitialisation aux paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
<string name="main_clear_progress_title" msgid="7239741132015617719">"Suppression en cours…"</string>
@@ -1552,14 +1567,14 @@
<string name="usb_tethering_button_text" msgid="7364633823180913777">"Partage de connexion par USB"</string>
<string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"Partage de connexion par Bluetooth"</string>
<string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Partage de connexion par Ethernet"</string>
- <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès sans fil et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Des applications peuvent aussi créer un point d\'accès sans fil pour partager du contenu avec d\'autres appareils à proximité."</string>
- <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès sans fil et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion Wi-Fi ou de données cellulaires. Des applications peuvent aussi créer un point d\'accès sans fil pour partager du contenu avec d\'autres appareils à proximité."</string>
+ <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès sans fil et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Des applis peuvent aussi créer un point d\'accès sans fil pour partager du contenu avec d\'autres appareils à proximité."</string>
+ <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès sans fil et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion Wi-Fi ou de données cellulaires. Des applis peuvent aussi créer un point d\'accès sans fil pour partager du contenu avec d\'autres appareils à proximité."</string>
<string name="tethering_help_button_text" msgid="2823655011510912001">"Aide"</string>
<string name="network_settings_title" msgid="4663717899931613176">"Réseau cellulaire"</string>
- <string name="sms_application_title" msgid="4791107002724108809">"Application de messagerie texte"</string>
- <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Modifier l\'application de messagerie texte?"</string>
- <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de messagerie texte?"</string>
- <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de messagerie texte?"</string>
+ <string name="sms_application_title" msgid="4791107002724108809">"Appli de messagerie texte"</string>
+ <string name="sms_change_default_dialog_title" msgid="2343439998715457307">"Modifier l\'appli de messagerie texte?"</string>
+ <string name="sms_change_default_dialog_text" msgid="8777606240342982531">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme appli de messagerie texte?"</string>
+ <string name="sms_change_default_no_previous_dialog_text" msgid="6215622785087181275">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme appli de messagerie texte?"</string>
<string name="network_scorer_change_active_dialog_title" msgid="7005220310238618141">"Changer d\'assistant Wi‑Fi?"</string>
<string name="network_scorer_change_active_dialog_text" msgid="7006057749370850706">"Utilisez <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> pour gérer vos connexions réseau?"</string>
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> pour gérer vos connexions réseau?"</string>
@@ -1568,18 +1583,18 @@
<string name="private_profile_location_switch_title" msgid="4127119143109855789">"Emplacement de l\'Espace privé"</string>
<string name="location_app_level_permissions" msgid="907206607664629759">"Autor. localisation des applis"</string>
<string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
- <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# application sur {total} a accès à la position}one{# application sur {total} a accès à la position}other{# applications sur {total} ont accès à la position}}"</string>
+ <string name="location_app_permission_summary_location_on" msgid="7552095451731948984">"{count,plural, =1{# appli sur {total} a accès à la position}one{# appli sur {total} a accès à la position}other{# applis sur {total} ont accès à la position}}"</string>
<string name="location_category_recent_location_access" msgid="2558063524482178146">"Accès récents"</string>
<string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Tout afficher"</string>
<string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Afficher les détails"</string>
- <string name="location_no_recent_apps" msgid="6814206631456177033">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
- <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune application n\'a récemment accédé à la position"</string>
+ <string name="location_no_recent_apps" msgid="6814206631456177033">"Aucune appli n\'a récemment demandé l\'accès à votre position"</string>
+ <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune appli n\'a récemment accédé à la position"</string>
<string name="location_high_battery_use" msgid="4277318891200626524">"Forte utilisation de la pile"</string>
<string name="location_low_battery_use" msgid="5218950289737996431">"Faible utilisation de la pile"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Recherche de réseaux Wi-Fi"</string>
- <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applications et les services à rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi 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_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applis et les services à rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi 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_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche d\'appareils Bluetooth"</string>
- <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
+ <string name="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>
@@ -1711,7 +1726,7 @@
<string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Modifier le schéma"</string>
<string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Comment dessiner un schéma de déverrouillage :"</string>
<string name="lockpattern_too_many_failed_confirmation_attempts" msgid="7891484005551794824">"Trop de tentatives incorrectes. Réessayez dans <xliff:g id="NUMBER">%d</xliff:g> secondes."</string>
- <string name="activity_not_found" msgid="5464331414465894254">"L\'application n\'est pas installée sur votre téléphone."</string>
+ <string name="activity_not_found" msgid="5464331414465894254">"L\'appli n\'est pas installée sur votre téléphone."</string>
<string name="lock_settings_profile_title" msgid="103605580492566086">"Sécurité du profil professionnel"</string>
<string name="lock_settings_profile_screen_lock_title" msgid="3776275029218681815">"Verrouillage de l\'écran du profil professionnel"</string>
<string name="lock_settings_profile_unification_title" msgid="5777961097706546513">"Utiliser un seul mode de verrouillage"</string>
@@ -1722,18 +1737,18 @@
<string name="lock_settings_profile_unification_dialog_confirm" msgid="6276915393736137843">"Utiliser un seul mode de verrouillage"</string>
<string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="8509287115116369677">"Utiliser un seul mode de verrouillage"</string>
<string name="lock_settings_profile_unified_summary" msgid="777095092175037385">"Identique au verrouillage de l\'écran de l\'appareil"</string>
- <string name="manageapplications_settings_title" msgid="9198876415524237657">"Gérer les applications"</string>
- <string name="applications_settings" msgid="1941993743933425622">"Détails de l\'application"</string>
- <string name="applications_settings_header" msgid="3154670675856048015">"Paramètres de l\'application"</string>
+ <string name="manageapplications_settings_title" msgid="9198876415524237657">"Gérer les applis"</string>
+ <string name="applications_settings" msgid="1941993743933425622">"Détails de l\'appli"</string>
+ <string name="applications_settings_header" msgid="3154670675856048015">"Paramètres de l\'appli"</string>
<string name="install_applications" msgid="3921609656584369901">"Sources inconnues"</string>
<string name="install_applications_title" msgid="7890233747559108106">"Autoriser toutes sources appli"</string>
- <string name="recent_app_category_title" msgid="189758417804427533">"Applications récemment ouvertes"</string>
- <string name="see_all_apps_title" msgid="1650653853942381797">"{count,plural, =1{Afficher l\'unique application}one{Afficher l\'unique (#) application}other{Afficher les # applications}}"</string>
+ <string name="recent_app_category_title" msgid="189758417804427533">"Applis récemment ouvertes"</string>
+ <string name="see_all_apps_title" msgid="1650653853942381797">"{count,plural, =1{Afficher l\'unique appli}one{Afficher l\'unique (#) appli}other{Afficher les # applis}}"</string>
<string name="forgot_password_title" msgid="3967873480875239885">"Contacter l\'administrateur informatique"</string>
<string name="forgot_password_text" msgid="2583194470767613163">"Il peut vous aider à réinitialiser votre NIP, votre schéma ou votre mot de passe"</string>
<string name="advanced_settings" msgid="2368905204839169094">"Paramètres avancés"</string>
<string name="advanced_settings_summary" msgid="1823765348195530035">"Activer d\'autres paramètres"</string>
- <string name="application_info_label" msgid="1015706497694165866">"Détails de l\'application"</string>
+ <string name="application_info_label" msgid="1015706497694165866">"Détails de l\'appli"</string>
<string name="storage_label" msgid="2522307545547515733">"Stockage"</string>
<string name="auto_launch_label" msgid="4069860409309364872">"Ouvrir par défaut"</string>
<string name="auto_launch_label_generic" msgid="5033137408273064599">"Valeurs par défaut"</string>
@@ -1753,8 +1768,8 @@
<string name="restoring_step_three" msgid="3712883580876329811">"Restauration en cours.."</string>
<string name="restoring_step_four" msgid="8966846882470446209">"Restauration en cours..."</string>
<string name="total_size_label" msgid="2052185048749658866">"Total"</string>
- <string name="application_size_label" msgid="6407051020651716729">"Taille de l\'application"</string>
- <string name="external_code_size_label" msgid="7375146402660973743">"Application sur USB"</string>
+ <string name="application_size_label" msgid="6407051020651716729">"Taille de l\'appli"</string>
+ <string name="external_code_size_label" msgid="7375146402660973743">"Appli sur USB"</string>
<string name="data_size_label" msgid="7814478940141255234">"Données de l\'utilisateur"</string>
<string name="uninstall_text" msgid="315764653029060126">"Désinstaller"</string>
<string name="uninstall_all_users_text" msgid="5924715251087176474">"Uninstall for all users"</string>
@@ -1764,13 +1779,13 @@
<string name="clear_user_data_text" msgid="6773186434260397947">"Effacer l\'espace de stockage"</string>
<string name="app_factory_reset" msgid="8974044931667015201">"Désinstaller mises à jour"</string>
<string name="app_restricted_settings_lockscreen_title" msgid="5993061278264872648">"Autoriser les paramètres restreints"</string>
- <string name="auto_launch_enable_text" msgid="8912714475823807798">"Certaines activités que vous avez sélectionnées s\'ouvrent dans cette application par défaut."</string>
- <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
+ <string name="auto_launch_enable_text" msgid="8912714475823807798">"Certaines activités que vous avez sélectionnées s\'ouvrent dans cette appli par défaut."</string>
+ <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Vous avez choisi de permettre à cette appli de créer des widgets et d\'accéder à leurs données."</string>
<string name="auto_launch_disable_text" msgid="502648841250936209">"Aucun paramètre par défaut défini"</string>
<string name="clear_activities" msgid="488089228657585700">"Effacer les préférences par défaut"</string>
- <string name="screen_compatibility_text" msgid="5915767835411020274">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
+ <string name="screen_compatibility_text" msgid="5915767835411020274">"Cette appli n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
<string name="ask_compatibility" msgid="8388397595148476565">"Demander au moment du lancement"</string>
- <string name="enable_compatibility" msgid="1163387233622859712">"Mettre l\'application à l\'échelle"</string>
+ <string name="enable_compatibility" msgid="1163387233622859712">"Mettre l\'appli à l\'échelle"</string>
<string name="unknown" msgid="8192160131923461175">"Inconnu"</string>
<string name="sort_order_alpha" msgid="3400680865280266582">"Trier par nom"</string>
<string name="sort_order_size" msgid="7731928486199737223">"Trier par taille"</string>
@@ -1778,29 +1793,29 @@
<string name="sort_order_frequent_notification" msgid="4063700985742284794">"Les plus fréquentes"</string>
<string name="show_running_services" msgid="8666008279959853318">"Afficher les services en cours"</string>
<string name="show_background_processes" msgid="5682856012453562151">"Afficher processus en cache"</string>
- <string name="default_emergency_app" msgid="1929974800666613803">"Application d\'urgence"</string>
+ <string name="default_emergency_app" msgid="1929974800666613803">"Appli d\'urgence"</string>
<string name="reset_app_preferences" msgid="8861758340732716573">"Réinitialiser préférences applis"</string>
<string name="reset_app_preferences_title" msgid="8935136792316050759">"Réinitialiser les préférences relatives aux applis?"</string>
- <string name="reset_app_preferences_desc" msgid="8550782670650158299">"Les préférences relatives aux éléments suivants seront réinitialisées :\n\n"<li>"Applications désactivées"</li>\n<li>"Notifications des applications désactivées"</li>\n<li>"Applications par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applications"</li>\n<li>"Toutes les restrictions d\'autorisations"</li>\n<li>"Paramètres d\'utilisation de la pile"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
+ <string name="reset_app_preferences_desc" msgid="8550782670650158299">"Les préférences relatives aux éléments suivants seront réinitialisées :\n\n"<li>"Applis désactivées"</li>\n<li>"Notifications des applis désactivées"</li>\n<li>"Applis par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applis"</li>\n<li>"Toutes les restrictions d\'autorisations"</li>\n<li>"Paramètres d\'utilisation de la pile"</li>\n\n"Vous ne perdrez aucune donnée liée aux applis."</string>
<string name="reset_app_preferences_button" msgid="2591318711372850058">"Réinitialiser applis"</string>
<string name="filter" msgid="9039576690686251462">"Filtre"</string>
<string name="filter_dlg_title" msgid="3086282431958601338">"Sélectionner les options du filtre"</string>
- <string name="filter_apps_all" msgid="5705421199299914620">"Toutes les applications"</string>
- <string name="filter_apps_disabled" msgid="5068011814871004105">"Applications désactivées"</string>
+ <string name="filter_apps_all" msgid="5705421199299914620">"Toutes les applis"</string>
+ <string name="filter_apps_disabled" msgid="5068011814871004105">"Applis désactivées"</string>
<string name="filter_apps_third_party" msgid="9049447784849114843">"Téléchargée"</string>
<string name="filter_apps_running" msgid="535465683273284141">"Diffusion en cours"</string>
- <string name="not_installed" msgid="5074606858798519449">"Non installé pour cet utilisateur"</string>
+ <string name="not_installed" msgid="5074606858798519449">"Pas installée pour cet utilisateur"</string>
<string name="installed" msgid="2837449358488825884">"Installée"</string>
- <string name="no_applications" msgid="985069304755391640">"Aucune application"</string>
+ <string name="no_applications" msgid="985069304755391640">"Aucune appli"</string>
<string name="internal_storage" msgid="999496851424448809">"Mémoire de stockage interne"</string>
<string name="recompute_size" msgid="1098091228370999128">"Calcul de la taille..."</string>
- <string name="clear_data_dlg_title" msgid="180446967743732410">"Supprimer les données de l\'application?"</string>
- <string name="clear_data_dlg_text" msgid="3440011276559762619">"Les données de cette application, y compris les fichiers et les paramètres, seront supprimées de cet appareil"</string>
+ <string name="clear_data_dlg_title" msgid="180446967743732410">"Supprimer les données de l\'appli?"</string>
+ <string name="clear_data_dlg_text" msgid="3440011276559762619">"Les données de cette appli, y compris les fichiers et les paramètres, seront supprimées de cet appareil"</string>
<string name="dlg_ok" msgid="1421350367857960997">"OK"</string>
<string name="dlg_cancel" msgid="5164705061530774899">"Annuler"</string>
<string name="dlg_delete" msgid="1790919205039397659">"Supprimer"</string>
- <string name="app_not_found_dlg_text" msgid="8634675268730513704">"L\'application ne figure pas dans la liste des applications installées."</string>
- <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Impossible de supprimer l\'espace de stockage pour l\'application."</string>
+ <string name="app_not_found_dlg_text" msgid="8634675268730513704">"L\'appli ne figure pas dans la liste des applis installées."</string>
+ <string name="clear_failed_dlg_text" msgid="6866741916836125732">"Impossible de supprimer l\'espace de stockage pour l\'appli."</string>
<string name="computing_size" msgid="4915310659841174866">"Traitement..."</string>
<string name="invalid_size_value" msgid="7017371543563259201">"Impossible de calculer la taille du package."</string>
<string name="version_text" msgid="7628938665256107608">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
@@ -1811,17 +1826,17 @@
<string name="restoring_in_progress" msgid="7787443682651146115">"Restauration de <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> en cours…"</string>
<string name="another_migration_already_in_progress" msgid="6550546307856052261">"Un autre transfert est déjà en cours."</string>
<string name="insufficient_storage" msgid="8115088042669030558">"Espace de stockage insuffisant."</string>
- <string name="does_not_exist" msgid="6499163879348776120">"L\'application n\'existe pas."</string>
+ <string name="does_not_exist" msgid="6499163879348776120">"L\'appli n\'existe pas."</string>
<string name="invalid_location" msgid="8013853455355520557">"L\'emplacement d\'installation n\'est pas valide."</string>
<string name="system_package" msgid="7559476279008519360">"Les mises à jour du système ne peuvent pas être installées sur des supports externes."</string>
- <string name="move_error_device_admin" msgid="1561502976834303626">"Les applications d\'administration d\'appareils ne peuvent pas être installées sur un support externe"</string>
+ <string name="move_error_device_admin" msgid="1561502976834303626">"Les applis d\'administration d\'appareils ne peuvent pas être installées sur un support externe"</string>
<string name="force_stop_dlg_title" msgid="86745852555490146">"Forcer l\'arrêt?"</string>
- <string name="force_stop_dlg_text" msgid="1527286468544457368">"Si vous forcez l\'arrêt d\'une application, son fonctionnement peut en être affecté."</string>
- <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Désactiver l\'application"</string>
- <string name="app_disable_dlg_text" msgid="2449382902751908916">"Si vous désactivez cette application, Android et d\'autres applications risquent de ne plus fonctionner correctement. Gardez à l\'esprit que vous ne pouvez pas supprimer cette application, étant donné qu\'elle était préinstallée sur votre appareil. En la désactivant, elle ne sera plus active et elle sera masquée sur votre appareil."</string>
- <string name="app_install_details_group_title" msgid="1172114479073704677">"Boutique d\'applications"</string>
- <string name="app_install_details_title" msgid="7783556181897142187">"Détails de l\'application"</string>
- <string name="app_install_details_summary" msgid="2013043219249992373">"Source de l\'application : <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+ <string name="force_stop_dlg_text" msgid="1527286468544457368">"Si vous forcez l\'arrêt d\'une appli, son fonctionnement peut en être affecté."</string>
+ <string name="app_disable_dlg_positive" msgid="1414218905322009505">"Désactiver l\'appli"</string>
+ <string name="app_disable_dlg_text" msgid="2449382902751908916">"Si vous désactivez cette appli, Android et d\'autres applis risquent de ne plus fonctionner correctement. Gardez à l\'esprit que vous ne pouvez pas supprimer cette appli, étant donné qu\'elle était préinstallée sur votre appareil. En la désactivant, elle ne sera plus active et elle sera masquée sur votre appareil."</string>
+ <string name="app_install_details_group_title" msgid="1172114479073704677">"Boutique d\'applis"</string>
+ <string name="app_install_details_title" msgid="7783556181897142187">"Détails de l\'appli"</string>
+ <string name="app_install_details_summary" msgid="2013043219249992373">"Source de l\'appli : <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
<string name="app_install_details_different_initiating_package_summary" msgid="6093306593167176688">"Appli installée à partir de <xliff:g id="APP_STORE1">%1$s</xliff:g> (par le biais de <xliff:g id="APP_STORE2">%2$s</xliff:g>)"</string>
<string name="instant_app_details_summary" msgid="417197491598208216">"Plus d\'information sur <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
<string name="app_ops_running" msgid="6127474473137428721">"En cours d\'exécution"</string>
@@ -1830,7 +1845,7 @@
<string name="service_restarting" msgid="5104563288155809226">"Redémarrage"</string>
<string name="cached" msgid="5379485147573438201">"Processus d\'arrière-plan en cache"</string>
<string name="no_running_services" msgid="9079738069349859373">"Aucun service en cours"</string>
- <string name="service_started_by_app" msgid="6845028506417670179">"Démarré par l\'application"</string>
+ <string name="service_started_by_app" msgid="6845028506417670179">"Démarré par l\'appli"</string>
<!-- no translation found for service_client_name (2210898622981598861) -->
<skip />
<string name="service_background_processes" msgid="2800539421534521948">"Libre: <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
@@ -1839,28 +1854,28 @@
<!-- no translation found for service_process_name (7827318358399776412) -->
<skip />
<string name="running_process_item_user_label" msgid="1444898861984132133">"Utilisateur : <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="running_process_item_removed_user_label" msgid="4812732296696662613">"Utilisateur supprimé"</string>
+ <string name="running_process_item_removed_user_label" msgid="4812732296696662613">"Utilisateur retiré"</string>
<string name="running_processes_item_description_s_s" msgid="6835918861352501671">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
<string name="running_processes_item_description_s_p" msgid="1209371773353932361">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
<string name="running_processes_item_description_p_s" msgid="8957061449107822282">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> service"</string>
<string name="running_processes_item_description_p_p" msgid="3292999232897469679">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> processus et <xliff:g id="NUMSERVICES">%2$d</xliff:g> services"</string>
<string name="running_processes_header_title" msgid="558961782589967366">"Mémoire de l\'appareil"</string>
- <string name="running_processes_header_footer" msgid="2726092156680487584">"Utilisation de la mémoire vive par l\'application"</string>
+ <string name="running_processes_header_footer" msgid="2726092156680487584">"Utilisation de la mémoire vive par l\'appli"</string>
<string name="running_processes_header_system_prefix" msgid="8819527769608555124">"Système"</string>
- <string name="running_processes_header_apps_prefix" msgid="4151874328324238133">"Applications"</string>
+ <string name="running_processes_header_apps_prefix" msgid="4151874328324238133">"Applis"</string>
<string name="running_processes_header_free_prefix" msgid="4271100378295864738">"Disponible"</string>
<string name="running_processes_header_used_prefix" msgid="5205762402234243007">"Utilisée"</string>
<string name="running_processes_header_cached_prefix" msgid="839132595831993521">"En cache"</string>
<string name="running_processes_header_ram" msgid="3014991380467004685">"<xliff:g id="RAM_0">%1$s</xliff:g> de mémoire vive"</string>
- <string name="runningservicedetails_settings_title" msgid="1057845389092757121">"Application en cours d\'exécution"</string>
+ <string name="runningservicedetails_settings_title" msgid="1057845389092757121">"Appli en cours d\'exécution"</string>
<string name="no_services" msgid="3898812785511572899">"Inactif"</string>
<string name="runningservicedetails_services_title" msgid="11853795112787355">"Services"</string>
<string name="runningservicedetails_processes_title" msgid="5292271587797234038">"Processus"</string>
<string name="service_stop" msgid="5712522600201308795">"Arrêter"</string>
<string name="service_manage" msgid="3896322986828332075">"Paramètres"</string>
- <string name="service_stop_description" msgid="6327742632400026677">"Ce service a été démarré par son application. L\'application peut échouer si vous l\'arrêtez."</string>
- <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Impossible d\'arrêter cette application en toute sécurité. Si vous l\'arrêtez, vous risquez de perdre une partie du travail en cours."</string>
- <string name="background_process_stop_description" msgid="4792038933517438037">"Ceci est un ancien processus d\'application qui peut toujours être exécuté en cas de besoin. Il n\'existe généralement aucune raison de l\'arrêter."</string>
+ <string name="service_stop_description" msgid="6327742632400026677">"Ce service a été démarré par son appli. L\'appli peut échouer si vous l\'arrêtez."</string>
+ <string name="heavy_weight_stop_description" msgid="3086419998820881290">"Impossible d\'arrêter cette appli en toute sécurité. Si vous l\'arrêtez, vous risquez de perdre une partie du travail en cours."</string>
+ <string name="background_process_stop_description" msgid="4792038933517438037">"Ceci est un ancien processus d\'appli qui peut toujours être exécuté en cas de besoin. Il n\'existe généralement aucune raison de l\'arrêter."</string>
<string name="service_manage_description" msgid="6615788996428486121">"En cours d\'utilisation : <xliff:g id="CLIENT_NAME">%1$s</xliff:g>. Touchez Paramètres pour contrôler ce client."</string>
<string name="main_running_process_description" msgid="6685973937935027773">"Processus principal en cours d\'utilisation."</string>
<string name="process_service_in_use_description" msgid="4210957264507014878">"Le service <xliff:g id="COMP_NAME">%1$s</xliff:g> est actuellement utilisé."</string>
@@ -1886,7 +1901,7 @@
<string name="auto_punctuate_summary" msgid="3549190848611386748">"Appuyez deux fois sur la touche Espace pour insérer « . »"</string>
<string name="show_password" msgid="7101900779571040117">"Afficher les mots de passe"</string>
<string name="show_password_summary" msgid="9025960283785111619">"Les caractères s\'affichent brièvement pendant la saisie"</string>
- <string name="spellchecker_security_warning" msgid="2016059050608271820">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'application <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique?"</string>
+ <string name="spellchecker_security_warning" msgid="2016059050608271820">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'appli <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique?"</string>
<string name="spellchecker_quick_settings" msgid="6449414356743946577">"Paramètres"</string>
<string name="spellchecker_language" msgid="8905487366580285282">"Langue"</string>
<string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"Claviers"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Utiliser le clavier à l\'écran"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Afficher lorsque le clavier physique est activé"</string>
<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="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="sticky_keys" msgid="7317317044898161747">"Touches rémanentes"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Appuyer 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">"Utilisez le clavier physique pour contrôler la souris."</string>
<string name="keyboard_shortcuts_helper" msgid="2553221039203165344">"Raccourcis clavier"</string>
<string name="keyboard_shortcuts_helper_summary" msgid="5979507677602559203">"Afficher la liste de raccourcis"</string>
<string name="language_and_input_for_work_category_title" msgid="2546950919124199743">"Claviers et outils pour le profil professionnel"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Changez style du pointeur à jaune"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Changez le style du pointeur à rose"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Changez le style du pointeur à bleu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Style de trait du pointeur"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Blanc"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Noir"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Aucun"</string>
<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>
@@ -1936,11 +1955,11 @@
<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>
<string name="gesture_summary_go_back" msgid="4981604277892236888">"Balayez l\'écran à gauche ou à droite avec trois doigts"</string>
- <string name="gesture_title_recent_apps" msgid="6082688963233208761">"Afficher les applications récentes"</string>
+ <string name="gesture_title_recent_apps" msgid="6082688963233208761">"Afficher les applis récentes"</string>
<string name="gesture_summary_recent_apps" msgid="6643179135202417509">"Balayez vers le haut avec trois doigts, maintenez et relâchez"</string>
<string name="gesture_title_notifications" msgid="791717222472350194">"Afficher notif. et param. rapides"</string>
<string name="gesture_summary_notifications" msgid="8419514601638387255">"Balayez votre écran d\'accueil vers le bas avec trois doigts"</string>
- <string name="gesture_title_switch_apps" msgid="5840994412037872157">"Changer d\'application"</string>
+ <string name="gesture_title_switch_apps" msgid="5840994412037872157">"Changer d\'appli"</string>
<string name="gesture_summary_switch_apps" msgid="6842648062151413042">"Balayez vers la gauche ou vers la droite avec quatre doigts"</string>
<string name="gesture_button_skip" msgid="5174842083451193213">"Ignorer"</string>
<string name="gesture_button_next" msgid="695288092704187356">"Suivant"</string>
@@ -1950,11 +1969,11 @@
<string name="trackpad_go_back_summary" msgid="4201901101085902768">"Balayez vers la gauche ou vers la droite avec trois doigts"</string>
<string name="trackpad_go_home_title" msgid="2146525662148291552">"Retour à la page d\'accueil"</string>
<string name="trackpad_go_home_summary" msgid="2222744701528360887">"Balayez l\'écran vers le haut avec trois doigts"</string>
- <string name="trackpad_recent_apps_title" msgid="8195970908411585445">"Applications récentes"</string>
+ <string name="trackpad_recent_apps_title" msgid="8195970908411585445">"Applis récentes"</string>
<string name="trackpad_recent_apps_summary" msgid="2685092851677573794">"Balayez vers le haut avec trois doigts, puis maintenez-les"</string>
<string name="trackpad_notifications_title" msgid="3521663305043747880">"Notifications"</string>
<string name="trackpad_notifications_summary" msgid="7663647367648690040">"Balayez l\'écran vers le bas avec trois doigts"</string>
- <string name="trackpad_switch_apps_title" msgid="7342032935377284039">"Changer d\'application"</string>
+ <string name="trackpad_switch_apps_title" msgid="7342032935377284039">"Changer d\'appli"</string>
<string name="trackpad_switch_apps_summary" msgid="9193942041912927440">"Balayez vers la gauche ou vers la droite avec quatre doigts"</string>
<string name="modifier_keys_settings" msgid="2537108435032034683">"Touches de modification"</string>
<string name="modifier_keys_settings_summary" msgid="6933143361657444436">"Modifier le comportement des touches"</string>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Utilisateur sélectionné : <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Parole"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Vitesse du pointeur"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Échelle du pointeur"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuer l\'échelle du pointeur"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Augmenter l\'échelle du pointeur"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Manette de jeu"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Rediriger les vibrations"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger les vibrations vers la manette de jeu lorsqu\'elle est connectée"</string>
@@ -1983,7 +2005,7 @@
<string name="keyboard_layout_picker_category_title" msgid="2369473692906329772">"Dispositions du clavier physique"</string>
<string name="user_dict_settings_title" msgid="680410651924276991">"Dictionnaire personnel"</string>
<string name="user_dict_settings_for_work_title" msgid="1245315720684961770">"Dictionnaire personnel pour le travail"</string>
- <string name="user_dict_settings_summary" msgid="4939694372338975081">"Ajoutez des mots à utiliser dans des applications comme un correcteur orthographique"</string>
+ <string name="user_dict_settings_summary" msgid="4939694372338975081">"Ajoutez des mots à utiliser dans des applis comme un correcteur orthographique"</string>
<string name="user_dict_settings_add_menu_title" msgid="8046882347281382968">"Add"</string>
<string name="user_dict_settings_add_dialog_title" msgid="3485845465134083084">"Ajouter au dictionnaire"</string>
<string name="user_dict_settings_add_screen_title" msgid="1866408024073475379">"Expression"</string>
@@ -2009,12 +2031,12 @@
<string name="gadget_picker_title" msgid="7615902510050731400">"Choisir un gadget"</string>
<string name="widget_picker_title" msgid="7641298325488989676">"Choisir un widget"</string>
<string name="allow_bind_app_widget_activity_allow_bind_title" msgid="3537968409832846255">"Créer un widget et autoriser l\'accès?"</string>
- <string name="allow_bind_app_widget_activity_allow_bind" msgid="5825298768068148804">"Une fois le widget créé, l\'application peut accéder à tout ce qui est affiché.\n\nApplication : <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\nWidget : <xliff:g id="WIDGET_LABEL">%2$s</xliff:g>\n"</string>
+ <string name="allow_bind_app_widget_activity_allow_bind" msgid="5825298768068148804">"Une fois le widget créé, l\'appli peut accéder à tout ce qui est affiché.\n\nAppli : <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>\nWidget : <xliff:g id="WIDGET_LABEL">%2$s</xliff:g>\n"</string>
<string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7268758525344468364">"Toujours autoriser <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> à créer des widgets et accéder à leurs données"</string>
<string name="testing_usage_stats" msgid="4660643799010906365">"Données statistiques"</string>
<string name="usage_stats_sort_by_usage_time" msgid="2927310334119998301">"Trier par temps d\'utilisation"</string>
<string name="usage_stats_sort_by_last_time_used" msgid="7039213339779884017">"Trier par dernière utilisation"</string>
- <string name="usage_stats_sort_by_app_name" msgid="4463833145514850478">"Trier par nom d\'application"</string>
+ <string name="usage_stats_sort_by_app_name" msgid="4463833145514850478">"Trier par nom d\'appli"</string>
<string name="last_time_used_label" msgid="7589377271406011659">"Dernière utilisation"</string>
<string name="last_time_used_never" msgid="2936073559267990034">"jamais"</string>
<string name="usage_time_label" msgid="9105343335151559883">"Temps d\'utilisation"</string>
@@ -2046,7 +2068,7 @@
<string name="interaction_control_category_title" msgid="2696474616743882372">"Commandes d\'interaction"</string>
<string name="accessibility_tap_assistance_title" msgid="1058913033421048284">"Commandes du minutage"</string>
<string name="accessibility_system_controls_title" msgid="6403287349518987624">"Commandes du système"</string>
- <string name="user_installed_services_category_title" msgid="2639470729311439731">"Applications téléchargées"</string>
+ <string name="user_installed_services_category_title" msgid="2639470729311439731">"Applis téléchargées"</string>
<string name="experimental_category_title" msgid="898904396646344152">"Fonctions expérimentales"</string>
<string name="feature_flags_dashboard_title" msgid="348990373716658289">"Indicateurs de fonctionnalité"</string>
<string name="bt_stack_log_level" msgid="6527899271926969296">"Activer le journal de la pile du Bluetooth"</string>
@@ -2086,7 +2108,7 @@
<string name="accessibility_magnification_mode_dialog_option_switch" msgid="561043521011229424">"Passer du mode plein écran au mode écran partiel"</string>
<string name="accessibility_magnification_area_settings_mode_switch_summary" msgid="2885238806099080966">"Touchez le bouton du commutateur pour passer d\'une option à l\'autre"</string>
<string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton d\'accessibilité?"</string>
- <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"L\'utilisation du triple toucher pour agrandir une partie de l\'écran a pour effet de retarder l\'entrée et les autres actions.\n\nLe bouton d\'accessibilité flotte sur votre écran par-dessus les autres applications. Touchez-le pour l\'agrandir."</string>
+ <string name="accessibility_magnification_switch_shortcut_message" msgid="7718653917415163833">"L\'utilisation du triple toucher pour agrandir une partie de l\'écran a pour effet de retarder l\'entrée et les autres actions.\n\nLe bouton d\'accessibilité flotte sur votre écran par-dessus les autres applis. Touchez-le pour l\'agrandir."</string>
<string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton d\'accessibilité"</string>
<string name="accessibility_magnification_switch_shortcut_negative_button" msgid="7115794462123071594">"Utiliser le triple toucher"</string>
<string name="accessibility_magnification_triple_tap_warning_title" msgid="8484669851397296597">"Cela peut ralentir votre clavier"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuer quand même"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Annuler"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Effectuez un panoramique avec un doigt"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Bouger la Loupe avec un doigt"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Glissez un doigt pour vous déplacer sur l\'écran"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Déplacez la zone d\'agrand. en faisant glisser un doigt."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Déplacez la zone d\'agrand. en faisant glisser deux doigts."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Non disponible lorsque vous agrandissez seulement une partie de l\'écran"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Touchez un bouton pour zoomer"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zoomez rapidement pour agrandir le contenu"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Pour zoomer :</b><br/> {0,number,integer}. Utilisez le raccourci pour commencer l\'agrandissement<br/> {1,number,integer}. Touchez l\'écran<br/> {2,number,integer}. Faites glisser deux doigts pour naviguer dans l\'écran<br/> {3,number,integer}. Pincez l\'écran avec deux doigts pour ajuster le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter l\'agrandissement<br/><br/><b>Pour zoomer temporairement :</b><br/> {0,number,integer}. Assurez-vous que le type d\'agrandissement est défini à plein écran<br/> {1,number,integer}. Utilisez le raccourci pour commencer l\'agrandissement<br/> {2,number,integer}. Maintenez le doigt sur une zone de l\'écran<br/> {3,number,integer}. Faites glisser un doigt pour naviguer dans l\'écran<br/> {4,number,integer}. Levez le doigt pour arrêter l\'agrandissement"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Pour zoomer, procédez comme suit :</b><br/> {0,number,integer} Utilisez le raccourci pour commencer l\'agrandissement<br/> {1,number,integer}. Touchez l\'écran<br/> {2,number,integer}. Faites glisser deux doigts pour naviguer dans l\'écran<br/> {3,number,integer}. Pincez l\'écran avec deux doigts pour ajuster le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter l\'aggrandissement<br/><br/> Vous pouvez aussi zoomer temporairement et plus."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Pour zoomer, procédez comme suit :</b><br/> {0,number,integer} Utilisez le raccourci pour commencer l\'agrandissement<br/> {1,number,integer}. Touchez l\'écran<br/> {2,number,integer}. Faites glisser un ou deux doigts pour naviguer dans l\'écran<br/> {3,number,integer}. Pincez l\'écran avec deux doigts pour ajuster le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter l\'aggrandissement<br/><br/> Vous pouvez aussi zoomer temporairement et plus."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"When magnification is turned on, you can zoom in on your screen.\n\n"<b>"Pour effectuer un zoom,"</b>", activez cette fonction, puis touchez une zone de l\'écran.\n"<ul><li>"Glissez deux doigts ou plus sur l\'écran pour le faire défiler"</li>\n<li>"Pincez deux doigts ou plus pour ajuster le zoom"</li></ul>\n\n<b>"Pour zoomer temporairement l\'écran"</b>", touchez le bouton d\'accessibilité, puis maintenez le doigt sur ailleurs sur l\'écran.\n"<ul><li>"Glissez votre doigt sur l\'écran à l\'endroit désiré"</li>\n<li>"Relevez le doigt pour zoomer vers l\'arrière"</li></ul>\n\n"On ne peut pas zoomer sur le clavier ou la barre de navigation."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Raccourci du bouton d\'accessibilité"</string>
@@ -2189,13 +2214,13 @@
<string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"En savoir plus sur le bouton d\'accessibilité et les gestes"</string>
<string name="accessibility_button_intro" msgid="2601976470525277903">"Utilisez le bouton d\'accessibilité. Le geste n\'est pas proposé avec la navigation à trois boutons."</string>
<string name="accessibility_button_summary" msgid="8510939012631455831">"Accès rapide aux fonctionnalités d\'accessibilité"</string>
- <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>Pour commencer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité<br/> {1,number,integer}. Sélectionnez une fonctionnalité et touchez le raccourci<br/> {2,number,integer}. Choisissez si vous voulez utiliser un bouton ou un geste pour accéder à la fonctionnalité<br/>"</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>Pour commencer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité.<br/> {1,number,integer}. Sélectionnez une fonctionnalité et touchez le raccourci.<br/> {2,number,integer}. Choisissez si vous voulez utiliser un bouton ou un geste pour accéder à la fonctionnalité.<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>Pour commencer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité<br/> {1,number,integer}. Sélectionnez une fonctionnalité et touchez le raccourci<br/> {2,number,integer}. Choisissez le bouton pour accéder à la fonctionnalité<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Utiliser le bouton ou le geste"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Position"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Taille"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"Disparaît s\'il n\'est pas utilisé"</string>
- <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Disparaît après quelques secondes, l\'écran devient donc plus facile à voir"</string>
+ <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Disparaît après quelques secondes pour que vous puissiez mieux voir l\'écran"</string>
<string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Transparent s\'il n\'est pas utilisé"</string>
<string name="accessibility_button_low_label" msgid="4193015407828927741">"Transparent"</string>
<string name="accessibility_button_high_label" msgid="9138077512008190896">"Opaque"</string>
@@ -2226,14 +2251,14 @@
<string name="accessibility_control_timeout_about_title" msgid="813588002683460837">"À propos du délai pour effectuer une action (accessibilité)"</string>
<string name="accessibility_control_timeout_footer_learn_more_content_description" msgid="8118584413220542193">"En savoir plus sur le délai pour effectuer une action (accessibilité)"</string>
<string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Temps pour réagir"</string>
- <string name="accessibility_control_timeout_preference_summary" msgid="4037051091059316310">"Cette préférence du temps d\'affichage n\'est pas prise en charge par toutes les applications"</string>
+ <string name="accessibility_control_timeout_preference_summary" msgid="4037051091059316310">"Cette préférence du temps d\'affichage n\'est pas prise en charge par toutes les applis"</string>
<string name="accessibility_control_timeout_preference_intro_text" msgid="1398116710556762245">"Choisissez la durée d\'affichage des messages temporaires qui vous demandent d\'effectuer une action"</string>
<string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Délai de pression"</string>
<string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Inversion des couleurs"</string>
<string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Utiliser l\'inversion des couleurs"</string>
<string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Raccourci de l\'inversion des couleurs"</string>
<string name="accessibility_display_inversion_preference_intro_text" msgid="1159663288481145318">"L\'inversion des couleurs assombrit les écrans lumineux. Elle illumine également les écrans sombres."</string>
- <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"<b>N\'oubliez pas</b><br/> <ol> <li> Les couleurs changeront dans les fichiers multimédias et les images.</li> <li> L\'inversion des couleurs fonctionne sur toutes les applications.</li> <li> Le thème sombre peut être utilisé pour afficher un arrière-plan sombre.</li> </ol>"</string>
+ <string name="accessibility_display_inversion_preference_subtitle" msgid="4494767676482389509">"<b>N\'oubliez pas</b><br/> <ol> <li> Les couleurs changeront dans les fichiers multimédias et les images.</li> <li> L\'inversion des couleurs fonctionne sur toutes les applis.</li> <li> Le thème sombre peut être utilisé pour afficher un arrière-plan sombre.</li> </ol>"</string>
<string name="accessibility_action_label_panel_slice" msgid="1313725957071602932">"accéder aux paramètres"</string>
<string name="accessibility_autoclick_preference_title" msgid="2703143361605555752">"Clic automatique (temps d\'arrêt)"</string>
<string name="accessibility_autoclick_about_title" msgid="152923024405552594">"Clic automatique (temps d\'arrêt)"</string>
@@ -2268,7 +2293,7 @@
<string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Retour tactile"</string>
<string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
<string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_service_auto_added_qs_tooltip_content" msgid="2941824314912928072">"L\'application <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> a été ajoutée aux Paramètres rapides. Balayez vers le bas pour l\'activer ou la désactiver à tout moment."</string>
+ <string name="accessibility_service_auto_added_qs_tooltip_content" msgid="2941824314912928072">"L\'appli <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> a été ajoutée aux Paramètres rapides. Balayez vers le bas pour l\'activer ou la désactiver à tout moment."</string>
<string name="accessibility_service_qs_tooltip_content" msgid="6002493441414967868">"Vous pouvez également ajouter <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> aux Paramètres rapides à partir du haut de votre écran"</string>
<string name="accessibility_color_correction_auto_added_qs_tooltip_content" msgid="9092661358437404374">"La fonctionnalité de correction des couleurs a été ajoutée aux Paramètres rapides. Balayez vers le bas pour l\'activer ou la désactiver à tout moment."</string>
<string name="accessibility_color_correction_qs_tooltip_content" msgid="3258628434235475205">"Vous pouvez également ajouter la fonctionnalité de correction des couleurs aux Paramètres rapides à partir du haut de votre écran"</string>
@@ -2287,12 +2312,12 @@
<string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"À propos de l\'inversion des couleurs"</string>
<string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"En savoir plus sur l\'inversion des couleurs"</string>
<string name="accessibility_captioning_primary_switch_title" msgid="3663677340286206100">"Afficher les sous-titres"</string>
- <string name="accessibility_captioning_primary_switch_summary" msgid="2544094070306830218">"Pour l\'application prise en charge seulement"</string>
+ <string name="accessibility_captioning_primary_switch_summary" msgid="2544094070306830218">"Pour l\'appli prise en charge seulement"</string>
<string name="captioning_appearance_title" msgid="3128792092290011408">"Taille et style des sous-titres"</string>
<string name="captioning_appearance_summary" msgid="4620682807315588019">"Taille du texte : <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
<string name="captioning_more_options_title" msgid="3484496882942539652">"Plus d\'options"</string>
<string name="accessibility_captioning_preference_intro" msgid="8995427146374031134">"Personnalisez la taille et le style des sous-titres pour les rendre plus faciles à lire"</string>
- <string name="accessibility_captioning_preference_summary" msgid="8335768472978374255">"Ces préférences de sous-titres ne sont pas prises en charge par toutes les applications multimédias"</string>
+ <string name="accessibility_captioning_preference_summary" msgid="8335768472978374255">"Ces préférences de sous-titres ne sont pas prises en charge par toutes les applis multimédias"</string>
<string name="accessibility_shortcut_type_software" msgid="2552732582767687515">"bouton d\'accessibilité"</string>
<string name="accessibility_shortcut_type_software_gesture" msgid="5608959693931019059">"Balayer l\'écran du bas vers le haut avec deux doigts"</string>
<string name="accessibility_shortcut_type_hardware" msgid="4834144210432451916">"Maintenir enfoncées les touches de volume"</string>
@@ -2393,13 +2418,13 @@
<string name="color_magenta" msgid="8943538189219528423">"Magenta"</string>
<string name="enable_service_title" msgid="7231533866953706788">"Permettre au service <xliff:g id="SERVICE">%1$s</xliff:g> de contrôler complètement votre appareil?"</string>
<string name="capabilities_list_title" msgid="1225853611983394386">"<xliff:g id="SERVICE">%1$s</xliff:g> doit pouvoir :"</string>
- <string name="touch_filtered_warning" msgid="4225815157460318241">"Une application obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
- <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> demande l\'autorisation de contrôler cet appareil. Le service peut lire l\'écran et agir pour les utilisateurs qui font appels aux fonctions d\'accessibilité. Ce niveau de contrôle ne convient pas à la majorité des applications."</string>
- <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Le contrôle total convient aux applications qui répondent à vos besoins d\'accessibilité. Il ne convient pas à la plupart des applications."</string>
+ <string name="touch_filtered_warning" msgid="4225815157460318241">"Une appli obscurcit une demande d\'autorisation, alors Paramètres ne peut pas vérifier votre réponse."</string>
+ <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g> demande l\'autorisation de contrôler cet appareil. Le service peut lire l\'écran et agir pour les utilisateurs qui font appels aux fonctions d\'accessibilité. Ce niveau de contrôle ne convient pas à la majorité des applis."</string>
+ <string name="accessibility_service_warning_description" msgid="6573203795976134751">"Le contrôle total convient aux applis qui répondent à vos besoins d\'accessibilité. Il ne convient pas à la plupart des applis."</string>
<string name="accessibility_service_screen_control_title" msgid="324795030658109870">"Afficher et contrôler l\'écran"</string>
- <string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"Cette fonctionnalité peut lire tout le contenu à l\'écran et afficher du contenu par-dessus d\'autres applications."</string>
+ <string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"Cette fonctionnalité peut lire tout le contenu à l\'écran et afficher du contenu par-dessus d\'autres applis."</string>
<string name="accessibility_service_action_perform_title" msgid="1449360056585337833">"Afficher et effectuer des actions"</string>
- <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"Cette fonctionnalité peut faire le suivi de vos interactions avec une application ou un capteur matériel et interagir avec des applications en votre nom."</string>
+ <string name="accessibility_service_action_perform_description" msgid="7807832069800034738">"Cette fonctionnalité peut faire le suivi de vos interactions avec une appli ou un capteur matériel et interagir avec des applis en votre nom."</string>
<string name="accessibility_dialog_button_allow" msgid="8274918676473216697">"Autoriser"</string>
<string name="accessibility_dialog_button_deny" msgid="2037249860078259284">"Refuser"</string>
<string name="accessibility_dialog_button_stop" msgid="7584815613743292151">"Désactiver"</string>
@@ -2413,7 +2438,7 @@
<string name="keywords_accessibility" msgid="8593989878379366798">"vision, audition, aveugle, sourd, motricité, dextérité, fonctionnel, assistance, facilité d\'utilisation, facilité d\'accès, main, aide"</string>
<string name="keywords_magnification" msgid="3908145308269840862">"Agrandisseur d\'écran, zoom, agrandissement, vision faible, agrandir, rendre plus gros"</string>
<string name="keywords_talkback" msgid="2816435437095102527"></string>
- <string name="keywords_live_caption" msgid="1667203998080567556">"Sous-titres, sous-titrage, CC, sous-titres instantanés, malentendant, perte auditive, transcription en temps réel assistée par ordinateur, synthèse textuelle, sous-titrer"</string>
+ <string name="keywords_live_caption" msgid="1667203998080567556">"Sous-titres, sous-titrage, CC, Transcription instantanée, malentendant, perte auditive, la traduction en temps réel des communications (CART), synthèse textuelle, sous-titrer"</string>
<string name="keywords_live_transcribe" msgid="3226990195174890997"></string>
<string name="keywords_sound_notifications" msgid="8183107485754075413"></string>
<string name="keywords_sound_amplifier" msgid="939404835256246663"></string>
@@ -2468,9 +2493,9 @@
<string name="power_usage_detail_screen_time" msgid="6027274749498485283">"Le temps d\'utilisation des écrans"</string>
<string name="power_usage_detail_background_time" msgid="3661437083554322691">"Le temps d\'utilisation en arrière-plan"</string>
<string name="low_battery_summary" msgid="4458925347316501953">"Pile faible"</string>
- <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à fonctionner en arrière-plan"</string>
+ <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'appli à fonctionner en arrière-plan"</string>
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan?"</string>
- <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
+ <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une appli, cela peut provoquer un fonctionnement instable"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
<string name="manager_battery_usage_category_title" msgid="1493303237531629961">"Gérer l\'utilisation de la pile"</string>
<string name="manager_battery_usage_allow_background_usage_settings_title" msgid="8150026934645052635">"Autoriser l\'utilisation en arrière-plan"</string>
@@ -2480,10 +2505,10 @@
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"Optimisée"</string>
<string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"Limitée"</string>
<string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"Autoriser l\'utilisation de la pile en arrière-plan sans restrictions. Cela pourrait solliciter davantage la pile."</string>
- <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimiser en fonction de votre usage. Ce réglage est recommandé pour la plupart des applications."</string>
- <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Restreindre l\'utilisation de la pile lors du fonctionnement en arrière-plan. L\'application pourrait ne pas fonctionner comme prévu. Les notifications pourraient être retardées."</string>
- <string name="manager_battery_usage_footer" msgid="2635906573922553766">"La modification de la manière dont une application utilise la pile peut avoir une incidence sur ses performances."</string>
- <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"Cette application nécessite une utilisation <xliff:g id="STATE">%1$s</xliff:g> de la pile."</string>
+ <string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"Optimiser en fonction de votre usage. Ce réglage est recommandé pour la plupart des applis."</string>
+ <string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"Restreindre l\'utilisation de la pile lors du fonctionnement en arrière-plan. L\'appli pourrait ne pas fonctionner comme prévu. Les notifications pourraient être retardées."</string>
+ <string name="manager_battery_usage_footer" msgid="2635906573922553766">"La modification de la manière dont une appli utilise la pile peut avoir une incidence sur ses performances."</string>
+ <string name="manager_battery_usage_footer_limited" msgid="5180776148877306780">"Cette appli nécessite une utilisation <xliff:g id="STATE">%1$s</xliff:g> de la pile."</string>
<string name="manager_battery_usage_unrestricted_only" msgid="3646162131339418216">"sans restriction"</string>
<string name="manager_battery_usage_optimized_only" msgid="7121785281913056432">"optimisée"</string>
<string name="manager_battery_usage_link_a11y" msgid="374918091821438564">"En savoir plus à propos des options d\'utilisation de la pile"</string>
@@ -2493,11 +2518,11 @@
<string name="advanced_battery_preference_title" msgid="3790901207877260883">"Utilisation de la pile"</string>
<string name="advanced_battery_preference_summary_with_hours" msgid="954091349133320955">"Voir utilisation des dernières 24 heures"</string>
<string name="advanced_battery_preference_summary" msgid="2372763700477268393">"Utilisation depuis la charge complète"</string>
- <string name="battery_details_title" msgid="3289680399291090588">"Utilisation de la pile par les applications"</string>
+ <string name="battery_details_title" msgid="3289680399291090588">"Utilisation de la pile par les applis"</string>
<string name="details_subtitle" msgid="2550872569652785527">"Détails d\'utilisation"</string>
<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 fonctionnent normalement"</string>
+ <string name="battery_tip_summary_title" msgid="321127485145626939">"Les applis fonctionnent normalement"</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>
@@ -2508,40 +2533,40 @@
<string name="battery_saver_link_a11y" msgid="6613079613524512257">"En savoir plus à propos de l\'Économiseur de pile"</string>
<string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Certaines fonctionnalités pourraient être limitées"</string>
<string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Utilisation plus élevée de la pile"</string>
- <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Affichez les applications qui utilisent le plus d\'énergie"</string>
+ <string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Affichez les applis qui utilisent le plus d\'énergie"</string>
<string name="battery_tip_limited_temporarily_title" msgid="6258554134146272311">"La recharge est optimisée afin de protéger votre pile"</string>
<string name="battery_tip_limited_temporarily_summary" msgid="5107379280241187562">"La recharge est optimisée afin de prolonger la durée de vie de votre pile"</string>
<string name="battery_tip_limited_temporarily_sec_button_content_description" msgid="5648444926736883551">"En savoir sur l\'interruption de la recharge"</string>
<string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Reprendre la charge"</string>
<string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclut les activités énergivores en arrière-plan"</string>
- <string name="battery_tip_restrict_title" msgid="4537101947310626753">"{count,plural, =1{Limiter # application}one{Limiter # application}other{Limiter # applications}}"</string>
- <string name="battery_tip_restrict_handled_title" msgid="7142074986508706853">"{count,plural, =1{{label} récemment limitée}one{# application récemment limitée}other{# applications récemment limitées}}"</string>
- <string name="battery_tip_restrict_summary" msgid="7539469590829235277">"{count,plural, =1{{label} consomme beaucoup d\'énergie en arrière-plan}one{# application consomme beaucoup d\'énergie en arrière-plan}other{# applications consomment beaucoup d\'énergie en arrière-plan}}"</string>
- <string name="battery_tip_restrict_handled_summary" msgid="3535697154547199190">"{count,plural, =1{Cette application ne peut pas fonctionner en arrière-plan}one{Cette application ne peut pas fonctionner en arrière-plan}other{Ces applications ne peuvent pas fonctionner en arrière-plan}}"</string>
- <string name="battery_tip_restrict_app_dialog_title" msgid="1649476357343160240">"{count,plural, =1{Limiter l\'application?}one{Limiter # application?}other{Limiter # applications?}}"</string>
- <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la pile, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Il se peut que cette application ne fonctionne pas correctement et que les notifications soient retardées."</string>
- <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Pour économiser la pile, empêchez ces applications de l\'utiliser en arrière-plan. Il se peut que les applications restreintes ne fonctionnent pas correctement et que les notifications soient retardées.\n\nApplications :"</string>
- <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="4546838397423565138">"Pour économiser la pile, empêchez ces applications de l\'utiliser en arrière-plan. Il se peut que les applications restreintes ne fonctionnent pas correctement et que les notifications soient retardées.\n\nApplications :\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
+ <string name="battery_tip_restrict_title" msgid="4537101947310626753">"{count,plural, =1{Limiter # appli}one{Limiter # appli}other{Limiter # applis}}"</string>
+ <string name="battery_tip_restrict_handled_title" msgid="7142074986508706853">"{count,plural, =1{{label} récemment limitée}one{# appli récemment limitée}other{# applis récemment limitées}}"</string>
+ <string name="battery_tip_restrict_summary" msgid="7539469590829235277">"{count,plural, =1{{label} consomme beaucoup d\'énergie en arrière-plan}one{# appli consomme beaucoup d\'énergie en arrière-plan}other{# applis consomment beaucoup d\'énergie en arrière-plan}}"</string>
+ <string name="battery_tip_restrict_handled_summary" msgid="3535697154547199190">"{count,plural, =1{Cette appli ne peut pas fonctionner en arrière-plan}one{Cette appli ne peut pas fonctionner en arrière-plan}other{Ces applis ne peuvent pas fonctionner en arrière-plan}}"</string>
+ <string name="battery_tip_restrict_app_dialog_title" msgid="1649476357343160240">"{count,plural, =1{Limiter l\'appli?}one{Limiter # appli?}other{Limiter # applis?}}"</string>
+ <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la pile, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Il se peut que cette appli ne fonctionne pas correctement et que les notifications soient retardées."</string>
+ <string name="battery_tip_restrict_apps_less_than_5_dialog_message" msgid="5894648804112181324">"Pour économiser la pile, empêchez ces applis de l\'utiliser en arrière-plan. Il se peut que les applis restreintes ne fonctionnent pas correctement et que les notifications soient retardées.\n\nApplis :"</string>
+ <string name="battery_tip_restrict_apps_more_than_5_dialog_message" msgid="4546838397423565138">"Pour économiser la pile, empêchez ces applis de l\'utiliser en arrière-plan. Il se peut que les applis restreintes ne fonctionnent pas correctement et que les notifications soient retardées.\n\nApplis :\n<xliff:g id="APP_LIST">%1$s</xliff:g>."</string>
<string name="battery_tip_restrict_app_dialog_ok" msgid="7025027696689301916">"Restreindre"</string>
<string name="battery_tip_unrestrict_app_dialog_title" msgid="5501997201160532301">"Supprimer la restriction?"</string>
- <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Cette application pourra utiliser la pile en arrière-plan. Cela pourrait épuiser la pile plus rapidement."</string>
+ <string name="battery_tip_unrestrict_app_dialog_message" msgid="215449637818582819">"Cette appli pourra utiliser la pile en arrière-plan. Cela pourrait épuiser la pile plus rapidement."</string>
<string name="battery_tip_unrestrict_app_dialog_ok" msgid="7940183167721998470">"Supprimer"</string>
<string name="battery_tip_unrestrict_app_dialog_cancel" msgid="4968135709160207507">"Annuler"</string>
<string name="battery_tip_charge_to_full_button" msgid="9172893341338732733">"Ignorer"</string>
<string name="battery_tip_incompatible_charging_title" msgid="1567827436103364999">"Vérifier l\'accessoire de recharge"</string>
<string name="battery_tip_incompatible_charging_content_description" msgid="355668467640367701">"En savoir plus sur les chargeurs incompatibles"</string>
<string name="smart_battery_manager_title" msgid="3677620516657920364">"Gestionnaire de pile"</string>
- <string name="smart_battery_title" msgid="9095903608520254254">"Gérer les applications automatiquement"</string>
- <string name="smart_battery_footer" msgid="8407121907452993645">"Lorsque le gestionnaire de pile détecte que des applications drainent la pile, il vous offrira la possibilité de les restreindre. Il se peut que les applications restreintes ne fonctionnent pas correctement et que les notifications soient retardées."</string>
- <string name="restricted_app_title" msgid="6585080822121007436">"Applications restreintes"</string>
- <string name="restricted_app_summary" msgid="1022307922754893997">"{count,plural, =1{L\'utilisation de la pile est limitée pour # application}one{L\'utilisation de la pile est limitée pour # application}other{L\'utilisation de la pile est limitée pour # applications}}"</string>
- <string name="restricted_app_time_summary" msgid="3097721884155913252">"Application restreinte : <xliff:g id="TIME">%1$s</xliff:g>"</string>
- <string name="restricted_app_detail_footer" msgid="3495725286882138803">"Ces applications sont limitées à l\'utilisation de la pile en arrière-plan. Il se peut qu\'elles ne fonctionnent pas comme prévu et que les notifications soient retardées."</string>
+ <string name="smart_battery_title" msgid="9095903608520254254">"Gérer les applis automatiquement"</string>
+ <string name="smart_battery_footer" msgid="8407121907452993645">"Lorsque le gestionnaire de pile détecte que des applis drainent la pile, il vous offrira la possibilité de les restreindre. Il se peut que les applis restreintes ne fonctionnent pas correctement et que les notifications soient retardées."</string>
+ <string name="restricted_app_title" msgid="6585080822121007436">"Applis restreintes"</string>
+ <string name="restricted_app_summary" msgid="1022307922754893997">"{count,plural, =1{L\'utilisation de la pile est limitée pour # appli}one{L\'utilisation de la pile est limitée pour # appli}other{L\'utilisation de la pile est limitée pour # applis}}"</string>
+ <string name="restricted_app_time_summary" msgid="3097721884155913252">"Appli restreinte : <xliff:g id="TIME">%1$s</xliff:g>"</string>
+ <string name="restricted_app_detail_footer" msgid="3495725286882138803">"Ces applis sont limitées à l\'utilisation de la pile en arrière-plan. Il se peut qu\'elles ne fonctionnent pas comme prévu et que les notifications soient retardées."</string>
<string name="battery_auto_restriction_title" msgid="827206218118093357">"Utiliser le gestionnaire de pile"</string>
- <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Détecter quand les applications drainent la pile"</string>
- <string name="battery_manager_summary" msgid="255708681438809287">"Détecter quand les applications sollicitent beaucoup la pile"</string>
- <string name="battery_manager_summary_unsupported" msgid="7334173707292807964">"Détecter quand les applications sollicitent beaucoup la pile"</string>
- <string name="battery_manager_app_restricted" msgid="2583902700677009173">"{count,plural, =1{# application limitée}one{# application limitée}other{# applications limitées}}"</string>
+ <string name="battery_auto_restriction_summary" msgid="2140896101984815711">"Détecter quand les applis drainent la pile"</string>
+ <string name="battery_manager_summary" msgid="255708681438809287">"Détecter quand les applis sollicitent beaucoup la pile"</string>
+ <string name="battery_manager_summary_unsupported" msgid="7334173707292807964">"Détecter quand les applis sollicitent beaucoup la pile"</string>
+ <string name="battery_manager_app_restricted" msgid="2583902700677009173">"{count,plural, =1{# appli limitée}one{# appli limitée}other{# applis limitées}}"</string>
<string name="battery_missing_message" msgid="400958471814422770">"Un problème est survenu lors de la lecture du niveau de charge de la pile."</string>
<string name="battery_missing_link_message" msgid="6021565067124898074"></string>
<string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"Touchez pour en savoir plus à propos de cette erreur"</string>
@@ -2566,16 +2591,16 @@
<string name="battery_not_usage_24hr" msgid="8397519536160741248">"Aucune utilisation au cours des dernières 24 heures"</string>
<string name="battery_usage_without_time" msgid="1346894834339420538"></string>
<string name="battery_usage_since_last_full_charge" msgid="3488425008925924769">"depuis la dernière recharge complète"</string>
- <string name="battery_usage_system_apps" msgid="8659537819731575299">"Applications système"</string>
- <string name="battery_usage_uninstalled_apps" msgid="8170405012552803662">"Applications désinstallées"</string>
+ <string name="battery_usage_system_apps" msgid="8659537819731575299">"Applis système"</string>
+ <string name="battery_usage_uninstalled_apps" msgid="8170405012552803662">"Applis désinstallées"</string>
<string name="battery_usage_others" msgid="311793281613609986">"Autres"</string>
<string name="estimated_time_left" msgid="948717045180211777">"Temps restant estimé"</string>
<string name="estimated_charging_time_left" msgid="2287135413363961246">"Jusqu\'à la charge complète"</string>
<string name="estimated_time_description" msgid="211058785418596009">"La durée estimée peut changer en fonction de l\'utilisation"</string>
<string name="process_mediaserver_label" msgid="6135260215912215092">"Serveur multimédia"</string>
- <string name="process_dex2oat_label" msgid="1190208677726583153">"Optimisation des applications"</string>
+ <string name="process_dex2oat_label" msgid="1190208677726583153">"Optimisation des applis"</string>
<string name="process_network_tethering" msgid="6822671758152900766">"Partage de connexion"</string>
- <string name="process_removed_apps" msgid="6544406592678476902">"Applications retirées"</string>
+ <string name="process_removed_apps" msgid="6544406592678476902">"Applis retirées"</string>
<string name="battery_saver" msgid="7737147344510595864">"Économiseur de pile"</string>
<string name="battery_saver_auto_title" msgid="6789753787070176144">"Activer automatiquement"</string>
<string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Aucun horaire"</string>
@@ -2600,14 +2625,14 @@
<string name="battery_percentage_description" msgid="2321465139126125541">"Afficher le pourcentage de charge de la pile dans la barre d\'état"</string>
<string name="battery_usage_chart_graph_hint_last_full_charge" msgid="6570336408060566877">"Niveau de la pile depuis la dernière recharge complète"</string>
<string name="battery_usage_chart_graph_hint" msgid="9182079098173323005">"Niveau de la pile, dernières 24 h"</string>
- <string name="battery_app_usage" msgid="8976453608783133770">"Utilisation des applications depuis la dernière charge complète"</string>
- <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"Utilisation par application, dernières 24 h"</string>
+ <string name="battery_app_usage" msgid="8976453608783133770">"Utilisation des applis depuis la dernière charge complète"</string>
+ <string name="battery_app_usage_for_past_24" msgid="1234770810563940656">"Utilisation par appli, dernières 24 h"</string>
<string name="battery_system_usage" msgid="1395943945140097585">"Utilisation du système depuis la dernière recharge complète"</string>
<string name="battery_system_usage_for_past_24" msgid="3341520273114616263">"Utilisation par le système, dernières 24 h"</string>
<string name="battery_system_usage_for" msgid="3248552137819897140">"Utilisation par le système : <xliff:g id="SLOT">%s</xliff:g>"</string>
- <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilisation par l\'application : <xliff:g id="SLOT">%s</xliff:g>"</string>
+ <string name="battery_app_usage_for" msgid="7309909074935858949">"Utilisation par l\'appli : <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="battery_system_usage_since_last_full_charge_to" msgid="4196795733829841971">"Utilisation du système depuis la dernière recharge complète jusqu\'à <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
- <string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Utilisation des applications depuis la dernière recharge complète jusqu\'à <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
+ <string name="battery_app_usage_since_last_full_charge_to" msgid="4339201995118102114">"Utilisation des applis depuis la dernière recharge complète jusqu\'à <xliff:g id="SLOT_TIMESTAMP">%s</xliff:g>"</string>
<string name="battery_usage_total_less_than_one_minute" msgid="951460680288855780">"Total : moins d\'une minute"</string>
<string name="battery_usage_background_less_than_one_minute" msgid="267133882897827276">"Arrière-plan : moins d\'une minute"</string>
<string name="battery_usage_screen_time_less_than_one_minute" msgid="578511021578427369">"Temps d\'utilisation des écrans : moins d\'une minute"</string>
@@ -2629,7 +2654,7 @@
<string name="battery_usage_breakdown_title_for_slot" msgid="4823179483667671406">"Utilisation de la pile : <xliff:g id="SLOT">%s</xliff:g>"</string>
<string name="screen_time_category_last_full_charge" msgid="8856908320256057753">"Temps d\'utilisation des écrans depuis la dernière recharge complète"</string>
<string name="screen_time_category_for_slot" msgid="8287722270554654959">"Temps d\'utilisation des écrans pour <xliff:g id="SLOT">%s</xliff:g>"</string>
- <string name="battery_usage_spinner_view_by_apps" msgid="8769276544072098082">"Afficher par application"</string>
+ <string name="battery_usage_spinner_view_by_apps" msgid="8769276544072098082">"Afficher par appli"</string>
<string name="battery_usage_spinner_view_by_systems" msgid="7904104223212160541">"Afficher par système"</string>
<string name="battery_usage_less_than_percent" msgid="5873099028895001082">"< <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_usage_less_than_percent_content_description" msgid="6265933174815461493">"moins de <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
@@ -2675,7 +2700,7 @@
<string name="voice_service_preference_section_title" msgid="4807795449147187497">"Services d\'entrée vocale"</string>
<string name="voice_interactor_preference_summary" msgid="3942881638813452880">"Détection de mot clé et interaction totales"</string>
<string name="voice_recognizer_preference_summary" msgid="9195427725367463336">"Synthèse vocale simple"</string>
- <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Ce service d\'entrée vocale pourra contrôler en permanence les fonctionnalités vocales et utiliser en votre nom les applications commandées par la voix. Il provient de l\'application <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Autoriser l\'utilisation de ce service?"</string>
+ <string name="voice_interaction_security_warning" msgid="7962884055885987671">"Ce service d\'entrée vocale pourra contrôler en permanence les fonctionnalités vocales et utiliser en votre nom les applis commandées par la voix. Il provient de l\'appli <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Autoriser l\'utilisation de ce service?"</string>
<string name="on_device_recognition_settings" msgid="6503160369314598069">"Paramètres de reconnaissance sur l\'appareil"</string>
<string name="on_device_recognition_settings_title" msgid="7137599722039096545">"Reconnaissance sur l\'appareil"</string>
<string name="on_device_recognition_settings_summary" msgid="3292736423223499348">"Reconnaissance vocale sur l\'appareil"</string>
@@ -2686,8 +2711,8 @@
<string name="tts_install_voice_title" msgid="5133545696447933812">"Voix"</string>
<string name="tts_spoken_language" msgid="4652894245474520872">"Langue parlée"</string>
<string name="tts_install_voices_title" msgid="6505257816336165782">"installer des voix"</string>
- <string name="tts_install_voices_text" msgid="902408506519246362">"Continuer vers l\'application <xliff:g id="TTS_APP_NAME">%s</xliff:g> pour installer des voix"</string>
- <string name="tts_install_voices_open" msgid="919034855418197668">"Ouvrir l\'application"</string>
+ <string name="tts_install_voices_text" msgid="902408506519246362">"Continuer vers l\'appli <xliff:g id="TTS_APP_NAME">%s</xliff:g> pour installer des voix"</string>
+ <string name="tts_install_voices_open" msgid="919034855418197668">"Ouvrir l\'appli"</string>
<string name="tts_install_voices_cancel" msgid="5179154684379560628">"Annuler"</string>
<string name="tts_reset" msgid="9047681050813970031">"Réinitialiser"</string>
<string name="tts_play" msgid="2945513377250757221">"Lire"</string>
@@ -2716,11 +2741,11 @@
<string name="credentials_reset_summary" msgid="5400585520572874255">"Supprimer tous les certificats"</string>
<string name="trusted_credentials" msgid="2522784976058244683">"Certificats de confiance"</string>
<string name="trusted_credentials_summary" msgid="345822338358409468">"Afficher les certificats d\'autorité de confiance"</string>
- <string name="user_credentials" msgid="4044405430790970775">"Authentifiants d\'utilisateur"</string>
+ <string name="user_credentials" msgid="4044405430790970775">"Authentifiant d\'utilisateur"</string>
<string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les authentifiants stockés"</string>
<string name="advanced_security_title" msgid="7117581975877192652">"Paramètres avancés"</string>
<string name="credentials_settings_not_available" msgid="7433088409177429600">"Les authentifiants ne sont pas accessibles pour cet utilisateur"</string>
- <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applications"</string>
+ <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applis"</string>
<string name="credential_for_wifi" msgid="2286560570630763556">"Installé pour le Wi-Fi"</string>
<string name="credential_installed_for_wifi" msgid="2206050464844710099">"Installé pour <xliff:g id="SSID">%s</xliff:g>"</string>
<string name="credential_using_for_wifi" msgid="6134471366188592845">"Utiliser pour <xliff:g id="SSID">%s</xliff:g>"</string>
@@ -2733,22 +2758,22 @@
<string name="user_certificate" msgid="6897024598058566466">"Certif. RPV et d\'appli de l\'util."</string>
<string name="wifi_certificate" msgid="8461905432409380387">"Certificat Wi‑Fi"</string>
<string name="ca_certificate_warning_title" msgid="7951148441028692619">"Vos données ne seront pas privées"</string>
- <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Les certificats CA sont employés par les sites Web, les applications et les RPV pour assurer le chiffrement. Installez uniquement les certificats CA provenant d\'organisations en qui vous avez confiance. \n\nSi vous installez un certificat CA, son propriétaire pourrait accéder à vos données, comme vos mots de passe ou vos renseignements de cartes de crédit, provenant de sites Web que vous visitez ou d\'applications que vous utilisez, même si ces données sont chiffrées."</string>
+ <string name="ca_certificate_warning_description" msgid="8409850109551028774">"Les certificats CA sont employés par les sites Web, les applis et les RPV pour assurer le chiffrement. Installez uniquement les certificats CA provenant d\'organisations en qui vous avez confiance. \n\nSi vous installez un certificat CA, son propriétaire pourrait accéder à vos données, comme vos mots de passe ou vos renseignements de cartes de crédit, provenant de sites Web que vous visitez ou d\'applis que vous utilisez, même si ces données sont chiffrées."</string>
<string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne pas installer"</string>
<string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installer quand même"</string>
<string name="cert_not_installed" msgid="6725137773549974522">"Certificat non installé"</string>
<string name="request_manage_credentials_title" msgid="596805634568013413">"Autoriser "<b>"<xliff:g id="APP_NAME">^1</xliff:g>"</b>" à installer des certificats sur cet appareil?"</string>
- <string name="request_manage_credentials_description" msgid="8044839857171509619">"Ces certificats vous vérifieront en partageant l\'identifiant unique de votre appareil avec les applications et les URL ci-dessous"</string>
+ <string name="request_manage_credentials_description" msgid="8044839857171509619">"Ces certificats vous vérifieront en partageant l\'identifiant unique de votre appareil avec les applis et les URL ci-dessous"</string>
<string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ne pas autoriser"</string>
<string name="request_manage_credentials_allow" msgid="4910940118408348245">"Autoriser"</string>
<string name="request_manage_credentials_more" msgid="6101210283534101582">"Afficher plus d\'options"</string>
<string name="certificate_management_app" msgid="8086699498358080826">"Appli de gest. de certificats"</string>
<string name="no_certificate_management_app" msgid="3025739370424406717">"Aucune"</string>
- <string name="certificate_management_app_description" msgid="8507306554200869005">"Des certificats vous vérifieront lorsque vous utiliserez les applications et les URL ci-dessous"</string>
+ <string name="certificate_management_app_description" msgid="8507306554200869005">"Des certificats vous vérifieront lorsque vous utiliserez les applis et les URL ci-dessous"</string>
<string name="uninstall_certs_credential_management_app" msgid="4945883254446077354">"Désinstaller les certificats"</string>
- <string name="remove_credential_management_app" msgid="6089291496976812786">"Retirer l\'application"</string>
- <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Retirer cette application?"</string>
- <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Cette application ne gérera pas les certificats, mais elle restera sur votre appareil. Tout certificat installé par l\'application sera désinstallé."</string>
+ <string name="remove_credential_management_app" msgid="6089291496976812786">"Retirer l\'appli"</string>
+ <string name="remove_credential_management_app_dialog_title" msgid="5713525435104706772">"Retirer cette appli?"</string>
+ <string name="remove_credential_management_app_dialog_message" msgid="7739474298063646935">"Cette appli ne gérera pas les certificats, mais elle restera sur votre appareil. Tout certificat installé par l\'appli sera désinstallé."</string>
<string name="number_of_urls" msgid="1128699121050872188">"{count,plural, =1{# URL}one{# URL}other{# URL}}"</string>
<string name="emergency_tone_title" msgid="6673118505206685168">"Signal de composition d\'urgence"</string>
<string name="emergency_tone_summary" msgid="2519776254708767388">"Définir le comportement en cas d\'appel d\'urgence"</string>
@@ -2756,35 +2781,35 @@
<string name="backup_section_title" msgid="6539706829848457794">"Sauvegarde et restauration"</string>
<string name="personal_data_section_title" msgid="6368610168625722682">"Données personnelles"</string>
<string name="backup_data_title" msgid="507663517227498525">"Sauvegarder mes données"</string>
- <string name="backup_data_summary" msgid="8054551085241427531">"Sauvegarder les données d\'applications, les mots de passe Wi-Fi et d\'autres paramètres sur les serveurs Google"</string>
+ <string name="backup_data_summary" msgid="8054551085241427531">"Sauvegarder les données d\'applis, les mots de passe Wi-Fi et d\'autres paramètres sur les serveurs Google"</string>
<string name="backup_configure_account_title" msgid="8574055186903658842">"Compte de sauvegarde"</string>
<string name="backup_data_management_title" msgid="6596830198441939702">"Gérer le compte de sauvegarde"</string>
- <string name="include_app_data_title" msgid="2969603876620594523">"Inclure données applications"</string>
+ <string name="include_app_data_title" msgid="2969603876620594523">"Inclure données applis"</string>
<string name="auto_restore_title" msgid="4124345897936637561">"Restauration automatique"</string>
- <string name="auto_restore_summary" msgid="6830198851045584001">"Lors de la réinstallation d\'une application, restaurer les paramètres et les données sauvegardées"</string>
+ <string name="auto_restore_summary" msgid="6830198851045584001">"Lors de la réinstallation d\'une appli, restaurer les paramètres et les données sauvegardées"</string>
<string name="backup_inactive_title" msgid="6753265378043349277">"Le service de sauvegarde n\'est pas actif"</string>
<string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Actuellement, aucun compte n\'enregistre de données de sauvegarde"</string>
<string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
- <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris, ainsi que d\'autres paramètres et données d\'applications, et en effacer toutes les copies des serveurs Google?"</string>
- <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Voulez-vous vraiment arrêter de sauvegarder les données de l\'appareil (comme les mots de passe Wi-Fi et l\'historique des appels) et celles des applications (telles que les paramètres et les fichiers enregistrés par ces applications), et en effacer toutes les copies sur les serveurs distants?"</string>
- <string name="fullbackup_data_summary" msgid="971587401251601473">"Sauvegardez automatiquement les données de l\'appareil (comme les mots de passe Wi-Fi et l\'historique des appels) et celles des applications (telles que les paramètres et les fichiers enregistrés par ces applications) à distance.\n\nLorsque vous activez la sauvegarde automatique, les données de l\'appareil et des applications sont enregistrées régulièrement à distance. Les données d\'applications correspondent à toutes les données enregistrées par une application (en fonction des paramètres que le développeur définit), y compris les données potentiellement confidentielles comme les contacts, les messages et les photos."</string>
+ <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris, ainsi que d\'autres paramètres et données d\'applis, et en effacer toutes les copies des serveurs Google?"</string>
+ <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Voulez-vous vraiment arrêter de sauvegarder les données de l\'appareil (comme les mots de passe Wi-Fi et l\'historique des appels) et celles des applis (telles que les paramètres et les fichiers enregistrés par ces applis), et en effacer toutes les copies sur les serveurs distants?"</string>
+ <string name="fullbackup_data_summary" msgid="971587401251601473">"Sauvegardez automatiquement les données de l\'appareil (comme les mots de passe Wi-Fi et l\'historique des appels) et celles des applis (telles que les paramètres et les fichiers enregistrés par ces applis) à distance.\n\nLorsque vous activez la sauvegarde automatique, les données de l\'appareil et des applis sont enregistrées régulièrement à distance. Les données d\'applis correspondent à toutes les données enregistrées par une appli (en fonction des paramètres que le développeur définit), y compris les données potentiellement confidentielles comme les contacts, les messages et les photos."</string>
<string name="device_admin_settings_title" msgid="31392408594557070">"Paramètres d\'administration de l\'appareil"</string>
<string name="active_device_admin_msg" msgid="7744106305636543184">"Appli d\'administration de l\'appareil"</string>
- <string name="remove_device_admin" msgid="3143059558744287259">"Désactiver cette application d\'administration d\'appareil"</string>
- <string name="uninstall_device_admin" msgid="4481095209503956916">"Désinstaller l\'application"</string>
+ <string name="remove_device_admin" msgid="3143059558744287259">"Désactiver cette appli d\'administration d\'appareil"</string>
+ <string name="uninstall_device_admin" msgid="4481095209503956916">"Désinstaller l\'appli"</string>
<string name="remove_and_uninstall_device_admin" msgid="707912012681691559">"Désactiver et désinstaller"</string>
- <string name="select_device_admin_msg" msgid="5501360309040114486">"Applications d\'administration d\'appareils"</string>
- <string name="no_device_admins" msgid="8888779888103079854">"Il n\'y a aucune application d\'administration d\'appareil"</string>
+ <string name="select_device_admin_msg" msgid="5501360309040114486">"Applis d\'administration d\'appareils"</string>
+ <string name="no_device_admins" msgid="8888779888103079854">"Il n\'y a aucune appli d\'administration d\'appareil"</string>
<string name="no_trust_agents" msgid="8659098725864191600">"Aucun agent de confiance disponible"</string>
<string name="add_device_admin_msg" msgid="7730006568970042119">"Activer l\'appli d\'admin de l\'appareil?"</string>
- <string name="add_device_admin" msgid="6252128813507932519">"Activer l\'application d\'administration de l\'appareil"</string>
+ <string name="add_device_admin" msgid="6252128813507932519">"Activer l\'appli d\'administration de l\'appareil"</string>
<string name="device_admin_add_title" msgid="6087481040932322289">"Administrateur de l\'appareil"</string>
- <string name="device_admin_warning" msgid="1889160106787280321">"L\'activation de cette application d\'administration permettra à <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
+ <string name="device_admin_warning" msgid="1889160106787280321">"L\'activation de cette appli d\'administration permettra à <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
<string name="device_admin_warning_simplified" msgid="2715756519899116115">"Cet appareil sera géré et surveillé par <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
- <string name="device_admin_status" msgid="6332571781623084064">"Cette application d\'administration est active et permet à l\'application <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
+ <string name="device_admin_status" msgid="6332571781623084064">"Cette appli d\'administration est active et permet à l\'appli <xliff:g id="APP_NAME">%1$s</xliff:g> d\'effectuer les opérations suivantes :"</string>
<string name="profile_owner_add_title" msgid="2774489881662331549">"Activer le gestionnaire de profil?"</string>
<string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"Autoriser la supervision?"</string>
- <string name="adding_profile_owner_warning" msgid="6868275476058020513">"En continuant, votre utilisateur sera géré par votre administrateur, qui pourra aussi stocker des données associées en plus de vos données personnelles.\n\nVotre administrateur peut surveiller et gérer les paramètres, l\'accès, les applications et les données associées à cet utilisateur, y compris l\'activité réseau et les données de localisation de votre appareil."</string>
+ <string name="adding_profile_owner_warning" msgid="6868275476058020513">"En continuant, votre utilisateur sera géré par votre administrateur, qui pourra aussi stocker des données associées en plus de vos données personnelles.\n\nVotre administrateur peut surveiller et gérer les paramètres, l\'accès, les applis et les données associées à cet utilisateur, y compris l\'activité réseau et les données de localisation de votre appareil."</string>
<string name="admin_disabled_other_options" msgid="8122039047419172139">"D\'autres options sont désactivées par votre administrateur"</string>
<string name="admin_more_details" msgid="4928985331640193758">"En savoir plus"</string>
<string name="notification_log_title" msgid="2812594935014664891">"Journal des notifications"</string>
@@ -2805,12 +2830,12 @@
<string name="sync_is_failing" msgid="6738004111400633331">"La synchronisation rencontre actuellement des problèmes. Elle sera rétablie sous peu."</string>
<string name="add_account_label" msgid="7134707140831385869">"Ajouter un compte"</string>
<string name="managed_profile_not_available_label" msgid="7500578232182547365">"Le profil professionnel n\'est pas encore disponible"</string>
- <string name="work_mode_label" msgid="4687734487641548872">"Applications professionnelles"</string>
+ <string name="work_mode_label" msgid="4687734487641548872">"Applis professionnelles"</string>
<string name="remove_managed_profile_label" msgid="1294933737673830431">"Retirer le profil professionnel"</string>
<string name="background_data" msgid="321903213000101158">"Données en arrière-plan"</string>
<string name="background_data_summary" msgid="6572245922513522466">"Synchronisation, envoi et réception de données à tout moment"</string>
<string name="background_data_dialog_title" msgid="1692005302993229867">"Dés. données arr.-plan?"</string>
- <string name="background_data_dialog_message" msgid="7760280837612824670">"La désactivation des données en arrière-plan économise la batterie et réduit l\'utilisation des données. Certaines applications peuvent continuer d\'utiliser la connexion Internet en arrière-plan."</string>
+ <string name="background_data_dialog_message" msgid="7760280837612824670">"La désactivation des données en arrière-plan économise la batterie et réduit l\'utilisation des données. Certaines applis peuvent continuer d\'utiliser la connexion Internet en arrière-plan."</string>
<string name="sync_enabled" msgid="5794103781356455043">"Synchronisation activée"</string>
<string name="sync_disabled" msgid="1636223106968593391">"Synchronisation désactivée"</string>
<string name="sync_error" msgid="846923369794727644">"Erreur de synchronisation"</string>
@@ -2825,7 +2850,7 @@
<string name="sync_gmail" msgid="228561698646018808">"Gmail"</string>
<string name="sync_calendar" msgid="4603704438090387251">"# CALENDAR:"</string>
<string name="sync_contacts" msgid="2376465611511325472">"Contacts"</string>
- <string name="header_application_sync_settings" msgid="7427706834875419243">"Paramètres de synchronisation de l\'application"</string>
+ <string name="header_application_sync_settings" msgid="7427706834875419243">"Paramètres de synchronisation de l\'appli"</string>
<string name="header_data_and_synchronization" msgid="453920312552838939">"Données et synchronisation"</string>
<string name="preference_change_password_title" msgid="5465821666939825972">"Modifier le mot de passe"</string>
<string name="header_account_settings" msgid="1189339410278750008">"Paramètres de compte"</string>
@@ -2844,7 +2869,7 @@
<string name="account_settings_menu_auto_sync_private" msgid="2315144351530596228">"Sync. auto des données privées"</string>
<string name="data_usage_change_cycle" msgid="4501026427365283899">"Changer le cycle..."</string>
<string name="data_usage_pick_cycle_day" msgid="3548922497494790123">"Jour du mois de réinitialisation du cycle utilisation données :"</string>
- <string name="data_usage_empty" msgid="5619908658853726866">"Aucune donnée utilisée par les applications pendant cette période."</string>
+ <string name="data_usage_empty" msgid="5619908658853726866">"Aucune donnée utilisée par les applis pendant cette période."</string>
<string name="data_usage_label_foreground" msgid="8782117644558473624">"Avant-plan"</string>
<string name="data_usage_label_background" msgid="8862781660427421859">"Arrière-plan"</string>
<string name="data_usage_app_restricted" msgid="312065316274378518">"limitée"</string>
@@ -2866,12 +2891,12 @@
<string name="data_roaming_enable_mobile" msgid="5745287603577995977">"Itinérance"</string>
<string name="data_usage_forground_label" msgid="5762048187044975428">"Premier plan :"</string>
<string name="data_usage_background_label" msgid="5363718469293175279">"Arrière-plan :"</string>
- <string name="data_usage_app_settings" msgid="5693524672522122485">"Paramètres de l\'application"</string>
+ <string name="data_usage_app_settings" msgid="5693524672522122485">"Paramètres de l\'appli"</string>
<string name="data_usage_app_restrict_background" msgid="5728840276368097276">"Données en arrière-plan"</string>
<string name="data_usage_app_restrict_background_summary" msgid="2997942775999602794">"Activer l\'utilisation de données cellulaires en arrière-plan"</string>
<string name="data_usage_app_restrict_background_summary_disabled" msgid="8213268097024597864">"Pour restreindre les données en arrière-plan, définissez un quota de données cellulaires."</string>
<string name="data_usage_app_restrict_dialog_title" msgid="5383874438677899255">"Limiter les données en arrière-plan?"</string>
- <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
+ <string name="data_usage_app_restrict_dialog" msgid="5534272311979978297">"Cette fonctionnalité peut empêcher certaines applis de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'appli."</string>
<string name="data_usage_restrict_denied_dialog" msgid="8599940395497268584">"La limitation des données en arrière-plan n\'est possible que si vous avez défini un plafond d\'utilisation pour les données cellulaires."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2048411447974361181">"Activer synchro auto données?"</string>
<string name="data_usage_auto_sync_off_dialog_title" msgid="1783917145440587470">"Désactiver synchro auto données?"</string>
@@ -2884,8 +2909,8 @@
<string name="data_usage_limit_dialog_title" msgid="2053134451707801439">"Limitation de la consommation de données cellulaires"</string>
<string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"alerte"</font></string>
<string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
- <string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Applications supprimées"</string>
- <string name="data_usage_uninstalled_apps_users" msgid="1262228664057122983">"Applications et utilisateurs supprimés"</string>
+ <string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Applis supprimées"</string>
+ <string name="data_usage_uninstalled_apps_users" msgid="1262228664057122983">"Applis et utilisateurs retirés"</string>
<string name="wifi_metered_title" msgid="6623732965268033931">"Utilisation du réseau"</string>
<string name="data_usage_metered_yes" msgid="4262598072030135223">"Facturé à l\'usage"</string>
<string name="vpn_name" msgid="3806456074909253262">"Nom"</string>
@@ -2920,11 +2945,11 @@
<string name="vpn_set_vpn_title" msgid="1667539483005810682">"Définir le RPV permanent?"</string>
<string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"Si vous activez ce paramètre, vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
<string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"Votre RPV existant sera remplacé, et vous ne disposerez d\'aucune connexion Internet jusqu\'à ce que le RPV parvienne à se connecter"</string>
- <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Vous êtes déjà connecté à un RPV permanent. Si vous vous connectez à un autre RPV, le RPV actuel sera remplacé et le mode permanent sera désactivé."</string>
+ <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Votre appareil est déjà connecté à un RPV permanent. Si vous vous connectez à un autre RPV, le RPV 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 RPV. Si vous vous connectez à un RPV différent, votre RPV actuel sera remplacé."</string>
<string name="vpn_turn_on" msgid="3568307071295211187">"Activer"</string>
<string name="vpn_cant_connect_title" msgid="5670787575925519386">"<xliff:g id="VPN_NAME">%1$s</xliff:g> n\'est pas en mesure de se connecter"</string>
- <string name="vpn_cant_connect_message" msgid="2139148820719163694">"Cette application ne prend pas en charge le RPV permanent"</string>
+ <string name="vpn_cant_connect_message" msgid="2139148820719163694">"Cette appli ne prend pas en charge le RPV permanent"</string>
<string name="vpn_title" msgid="3068868814145870274">"RPV"</string>
<string name="vpn_create" msgid="7546073242936894638">"Ajouter un profil RPV"</string>
<string name="vpn_menu_edit" msgid="5100387853773792379">"Modifier le profil"</string>
@@ -2932,14 +2957,14 @@
<string name="vpn_menu_lockdown" msgid="5284041663859541007">"RPV permanent"</string>
<string name="vpn_no_vpns_added" msgid="7387080769821533728">"Aucun RPV ajouté"</string>
<string name="vpn_always_on_summary" msgid="2171252372476858166">"Rester connecté au RPV en permanence"</string>
- <string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"Non compatible avec cette application"</string>
+ <string name="vpn_always_on_summary_not_supported" msgid="9084872130449368437">"Non compatible avec cette appli"</string>
<string name="vpn_always_on_summary_active" msgid="175877594406330387">"Toujours activé"</string>
<string name="vpn_insecure_summary" msgid="4450920215186742859">"Non sécurisé"</string>
<string name="vpn_require_connection" msgid="1027347404470060998">"Bloquer les connexions sans RPV"</string>
<string name="vpn_require_connection_title" msgid="4186758487822779039">"Exiger une connexion RPV?"</string>
<string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"Pas sécuritaire. Passez à un RPV de type IKEv2"</string>
<string name="vpn_start_unsupported" msgid="7139925503292269904">"Échec du démarrage d\'un RPV non pris en charge."</string>
- <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil RPV auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce RPV."</string>
+ <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Sélectionnez un profil RPV auquel l\'appareil restera connecté en permanence. Le trafic réseau sera autorisé seulement lorsque votre appareil sera connecté à ce RPV."</string>
<string name="vpn_lockdown_none" msgid="455915403560910517">"Aucun"</string>
<string name="vpn_lockdown_config_error" msgid="1992071316416371316">"Le RPV permanent nécessite une adresse IP pour le serveur et le DNS."</string>
<string name="vpn_no_network" msgid="7187593680049843763">"Aucune connexion réseau. Veuillez réessayer plus tard."</string>
@@ -2957,10 +2982,10 @@
<string name="trusted_credentials_remove_confirmation" msgid="3420345440353248381">"Supprimer définitivement le certificat d\'autorité utilisateur?"</string>
<string name="credential_being_used_by" msgid="3682869943025283499">"En cours d\'utilisation par"</string>
<string name="credential_contains" msgid="3146519680449595771">"Cette entrée contient"</string>
- <string name="one_userkey" msgid="6363426728683951234">"Une clé utilisateur"</string>
+ <string name="one_userkey" msgid="6363426728683951234">"1 clé d\'utilisateur"</string>
<string name="one_usercrt" msgid="2097644070227688983">"Un certificat utilisateur"</string>
<string name="one_cacrt" msgid="982242103604501559">"Un certificat CA"</string>
- <string name="n_cacrts" msgid="5886462550192731627">"%d certificats CA"</string>
+ <string name="n_cacrts" msgid="5886462550192731627">"%d certificats CA"</string>
<string name="user_credential_title" msgid="4686178602575567298">"Détails de l\'authentifiant"</string>
<string name="user_credential_removed" msgid="4087675887725394743">"L\'identifiant suivant a été supprimé : <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
<string name="user_credential_none_installed" msgid="918620912366836994">"Aucun authentifiant d\'utilisateur installé"</string>
@@ -2975,9 +3000,9 @@
<string name="ssl_ca_cert_warning" msgid="3898387588657346106">"Le réseau peut être surveillé"</string>
<string name="done_button" msgid="6269449526248267">"Terminé"</string>
<string name="ssl_ca_cert_dialog_title" msgid="1032088078702042090">"{count,plural, =1{Faire confiance au certificat ou le retirer}one{Faire confiance au certificat ou le retirer}other{Faire confiance aux certificats ou les retirer}}"</string>
- <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} a installé une autorité de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}one{{orgName} a installé une autorité de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}other{{orgName} a installé des autorités de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.}}"</string>
- <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} a installé une autorité de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}one{{orgName} a installé une autorité de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}other{{orgName} a installé des autorités de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.}}"</string>
- <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tiers peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés. \n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
+ <string name="ssl_ca_cert_info_message_device_owner" msgid="7528581447864707873">"{numberOfCertificates,plural, =1{{orgName} a installé une autorité de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}one{{orgName} a installé une autorité de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}other{{orgName} a installé des autorités de certification sur votre appareil, ce qui peut lui permettre de surveiller l\'activité de votre appareil sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}}"</string>
+ <string name="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} a installé une autorité de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}one{{orgName} a installé une autorité de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}other{{orgName} a installé des autorités de certification pour votre profil professionnel, ce qui peut lui permettre de surveiller l\'activité professionnelle sur le réseau, y compris les courriels, les applis et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.}}"</string>
+ <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tiers peut surveiller votre activité réseau, y compris les courriels, les applis et les sites Web sécurisés. \n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
<string name="ssl_ca_cert_settings_button" msgid="2044927302268394991">"{count,plural, =1{Vérifier le certificat}one{Vérifier le certificat}other{Vérifier les certificats}}"</string>
<string name="user_settings_title" msgid="9208831545558787202">"Utilisateurs"</string>
<string name="user_list_title" msgid="1387379079186123404">"Utilisateurs et profils"</string>
@@ -2987,7 +3012,7 @@
<string name="user_summary_restricted_not_set_up" msgid="1658946988920104613">"Non configuré : profil limité"</string>
<string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configuré : profil professionnel"</string>
<string name="user_owner" msgid="2079206733011361994">"Propriétaire"</string>
- <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
+ <string name="user_admin" msgid="4024553191395768119">"Administrateur"</string>
<string name="user_you" msgid="3070562015202859996">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
<string name="user_add_max_count" msgid="3328539978480663740">"Vous ne pouvez plus ajouter d’utilisateurs. Retirez un utilisateur pour en ajouter un nouveau."</string>
<string name="user_cannot_add_accounts_message" msgid="2351326078338805337">"Les profils limités ne peuvent pas ajouter de compte."</string>
@@ -2999,21 +3024,21 @@
<string name="user_confirm_remove_title" msgid="3626559103278006002">"Supprimer cet utilisateur?"</string>
<string name="user_profile_confirm_remove_title" msgid="3131574314149375354">"Supprimer ce profil?"</string>
<string name="work_profile_confirm_remove_title" msgid="6229618888167176036">"Retirer le profil professionnel?"</string>
- <string name="user_confirm_remove_message" msgid="362545924965977597">"L\'ensemble des applications et des données seront supprimées."</string>
- <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"Toutes les applications et les données de ce profil seront supprimées si vous continuez."</string>
- <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"L\'ensemble des applications et des données seront supprimées."</string>
- <string name="user_adding_new_user" msgid="7439602720177181412">"Ajout de l\'utilisateur…"</string>
+ <string name="user_confirm_remove_message" msgid="362545924965977597">"L\'ensemble des applis et des données seront supprimées."</string>
+ <string name="work_profile_confirm_remove_message" msgid="1037294114103024478">"Toutes les applis et les données de ce profil seront supprimées si vous continuez."</string>
+ <string name="user_profile_confirm_remove_message" msgid="3641289528179850718">"L\'ensemble des applis et des données seront supprimées."</string>
+ <string name="user_adding_new_user" msgid="7439602720177181412">"Ajout de l\'utilisateur en cours…"</string>
<string name="user_delete_user_description" msgid="7764153465503821011">"Supprimer l\'utilisateur"</string>
<string name="user_delete_button" msgid="3833498650182594653">"Supprimer"</string>
- <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Toutes les applications et les données de cette session seront supprimées."</string>
+ <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Toutes les applis et les données de cette session seront supprimées."</string>
<string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Supprimer"</string>
<string name="guest_category_title" msgid="5562663588315329152">"Invité (vous)"</string>
<string name="user_category_title" msgid="4368580529662699083">"Utilisateurs"</string>
<string name="other_user_category_title" msgid="7089976887307643217">"Autres utilisateurs"</string>
<string name="remove_guest_on_exit" msgid="8202972371459611066">"Supprimer l\'activité d\'invité"</string>
- <string name="remove_guest_on_exit_summary" msgid="3969962695703280353">"Supprimez toutes les applications et données d\'invité en quittant le mode Invité"</string>
+ <string name="remove_guest_on_exit_summary" msgid="3969962695703280353">"Supprimez toutes les applis et données d\'invité en quittant le mode Invité"</string>
<string name="remove_guest_on_exit_dialog_title" msgid="2310442892536079416">"Supprimer l\'activité d\'invité?"</string>
- <string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"Les applications et les données de cette session d\'invité seront supprimées maintenant, et toutes les activités d\'invité futures seront supprimées chaque fois que vous quitterez le mode Invité"</string>
+ <string name="remove_guest_on_exit_dialog_message" msgid="8112409834021851883">"Les applis et les données de cette session d\'invité seront supprimées maintenant, et toutes les activités d\'invité futures seront supprimées chaque fois que vous quitterez le mode Invité"</string>
<string name="remove_guest_on_exit_keywords" msgid="4961310523576166193">"supprimer, invité, activité, retirer, données, visiteur, effacer"</string>
<string name="enable_guest_calling" msgid="4620657197834392094">"Permettre à l\'invité de passer des appels téléphoniques"</string>
<string name="enable_guest_calling_summary" msgid="4748224917641204782">"L\'historique des appels sera partagé avec l\'utilisateur invité"</string>
@@ -3027,14 +3052,14 @@
<string name="emergency_info_title" msgid="8233682750953695582">"Coordonnées d\'urgence"</string>
<string name="emergency_info_summary" msgid="8463622253016757697">"Information et contacts pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="open_app_button" msgid="5025229765547191710">"Ouvrir <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="application_restrictions" msgid="276179173572729205">"Autoriser des applications et des contenus"</string>
- <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Applications avec restrictions"</string>
+ <string name="application_restrictions" msgid="276179173572729205">"Autoriser des applis et des contenus"</string>
+ <string name="apps_with_restrictions_header" msgid="5277698582872267931">"Applis avec restrictions"</string>
<string name="apps_with_restrictions_settings_button" msgid="2648355133416902221">"Développer paramètres applis"</string>
- <string name="user_choose_copy_apps_to_another_user" msgid="5914037067347012870">"Choisir les applications à installer"</string>
+ <string name="user_choose_copy_apps_to_another_user" msgid="5914037067347012870">"Choisir les applis à installer"</string>
<string name="user_copy_apps_menu_title" msgid="5354300105759670300">"Installer les applis proposées"</string>
<string name="nfc_payment_settings_title" msgid="2043139180030485500">"Paiements sans contact"</string>
- <string name="nfc_default_payment_settings_title" msgid="2150504446774382261">"Application de paiement par défaut"</string>
- <string name="nfc_default_payment_footer" msgid="978535088340021360">"Pour effectuer un paiement à l\'aide d\'une application, approchez l\'arrière de votre appareil du terminal"</string>
+ <string name="nfc_default_payment_settings_title" msgid="2150504446774382261">"Appli de paiement par défaut"</string>
+ <string name="nfc_default_payment_footer" msgid="978535088340021360">"Pour effectuer un paiement à l\'aide d\'une appli, approchez l\'arrière de votre appareil du terminal"</string>
<string name="nfc_more_details" msgid="1700713533074275233">"En savoir plus"</string>
<string name="nfc_default_payment_workapp_confirmation_title" msgid="746921251872504687">"Appli pro par défaut pour les paiements?"</string>
<string name="nfc_default_payment_workapp_confirmation_message_title" msgid="1533022606333010329">"Pour les paiements avec une appli pro :"</string>
@@ -3045,19 +3070,19 @@
<string name="nfc_payment_default" msgid="3769788268378614608">"Mode de paiement par défaut"</string>
<string name="nfc_payment_default_not_set" msgid="6471905683119084622">"Non défini"</string>
<string name="nfc_payment_app_and_desc" msgid="2607417639227030398">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
- <string name="nfc_payment_use_default" msgid="6127665705799658860">"Utiliser l\'application de paiement par défaut"</string>
+ <string name="nfc_payment_use_default" msgid="6127665705799658860">"Utiliser l\'appli de paiement par défaut"</string>
<string name="nfc_payment_use_default_dialog" msgid="8556328090777785383">"Utiliser l\'appli de paiement par défaut"</string>
<string name="nfc_payment_favor_default" msgid="4508491832174644772">"Toujours"</string>
- <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Sauf si une autre application de paiement est ouverte"</string>
+ <string name="nfc_payment_favor_open" msgid="8554643344050373346">"Sauf si une autre appli de paiement est ouverte"</string>
<string name="nfc_payment_pay_with" msgid="3001320460566523453">"À un terminal sans contact, payer avec :"</string>
<string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paiement à un terminal"</string>
- <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une application de paiement. Il suffit ensuite de poser l\'arrière de votre téléphone sur n\'importe quel terminal disposant du symbole Sans contact."</string>
+ <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une appli de paiement. Il suffit ensuite de poser l\'arrière de votre téléphone sur n\'importe quel terminal disposant du symbole Sans contact."</string>
<string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
<string name="nfc_more_title" msgid="1041094244767216498">"Plus…"</string>
- <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définissez l\'application de paiement par défaut"</string>
- <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Mettez à jour l\'application de paiement par défaut"</string>
+ <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définissez l\'appli de paiement par défaut"</string>
+ <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Mettez à jour l\'appli de paiement par défaut"</string>
<string name="nfc_payment_set_default" msgid="4101484767872365195">"À un terminal sans contact, payer avec <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"À un terminal sans contact, payer avec <xliff:g id="APP_0">%1$s</xliff:g>.\n\nCette application remplace <xliff:g id="APP_1">%2$s</xliff:g> comme application de paiement par défaut."</string>
+ <string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"À un terminal sans contact, payer avec <xliff:g id="APP_0">%1$s</xliff:g>.\n\nCette appli remplace <xliff:g id="APP_1">%2$s</xliff:g> comme appli de paiement par défaut."</string>
<string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"Définir par défaut"</string>
<string name="nfc_payment_btn_text_update" msgid="5159700960497443832">"Mettre à jour"</string>
<string name="nfc_work_text" msgid="2496515165821504077">"Travail"</string>
@@ -3101,20 +3126,20 @@
<string name="auto_data_switch_title" msgid="5862200603753603464">"Basculer entre les données cellulaires automatiquement"</string>
<string name="auto_data_switch_summary" msgid="1934340931995429057">"Utilisez ce réseau en cas de meilleure disponibilité"</string>
<string name="work_sim_title" msgid="8999872928646924429">"Carte SIM professionnelle"</string>
- <string name="user_restrictions_title" msgid="4068914244980335993">"Accès aux applications et au contenu"</string>
+ <string name="user_restrictions_title" msgid="4068914244980335993">"Accès aux applis et au contenu"</string>
<string name="user_rename" msgid="8735940847878484249">"RENOMMER"</string>
<string name="app_restrictions_custom_label" msgid="6949268049087435132">"Définir des restrictions d\'applis"</string>
<string name="user_restrictions_controlled_by" msgid="2821526006742851624">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Cette application peut accéder à vos comptes."</string>
- <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
+ <string name="app_sees_restricted_accounts" msgid="3526008344222566318">"Cette appli peut accéder à vos comptes."</string>
+ <string name="app_sees_restricted_accounts_and_controlled_by" msgid="8338520379923447143">"Cette appli peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
<string name="restriction_wifi_config_title" msgid="2630656989926554685">"Wi‑Fi et données cellulaires"</string>
<string name="restriction_wifi_config_summary" msgid="920419010472168694">"Autoriser les modifications des paramètres du Wi‑Fi et des données cellulaires"</string>
<string name="restriction_bluetooth_config_title" msgid="220586273589093821">"Bluetooth"</string>
<string name="restriction_bluetooth_config_summary" msgid="7558879931011271603">"Autoriser les modifications des associations et des paramètres Bluetooth"</string>
<string name="restriction_location_enable_title" msgid="4872281754836538066">"Position"</string>
- <string name="restriction_location_enable_summary" msgid="7139292323897390221">"Autoriser les applications à utiliser vos données de localisation"</string>
+ <string name="restriction_location_enable_summary" msgid="7139292323897390221">"Autoriser les applis à utiliser vos données de localisation"</string>
<string name="wizard_back" msgid="8257697435061870191">"Précédent"</string>
- <string name="wizard_next" msgid="3884832431439072471">"SUIVANT"</string>
+ <string name="wizard_next" msgid="3884832431439072471">"Suivant"</string>
<string name="wizard_back_adoptable" msgid="1447814356855134183">"Formater autrement"</string>
<string name="regulatory_info_text" msgid="1154461023369976667"></string>
<string name="sim_settings_title" msgid="2254609719033946272">"Cartes SIM"</string>
@@ -3155,15 +3180,15 @@
<string name="connected_devices_dashboard_android_auto_no_driving_mode_summary" msgid="6426996842202276640">"Bluetooth, Android Auto, CCP"</string>
<string name="connected_devices_dashboard_android_auto_no_nfc_no_driving_mode" msgid="1672426693308438634">"Bluetooth, Android Auto"</string>
<string name="nfc_and_payment_settings_payment_off_nfc_off_summary" msgid="7132040463607801625">"Non accessible parce que la technologie CCP est désactivée"</string>
- <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Pour utiliser la fonctionnalité, installez d\'abord une application de paiement"</string>
- <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Applications récentes, applications par défaut"</string>
- <string name="notification_settings_work_profile" msgid="6076211850526353975">"Les applications du profil professionnel n\'ont pas accès aux notifications."</string>
+ <string name="nfc_and_payment_settings_no_payment_installed_summary" msgid="4879818114908207465">"Pour utiliser la fonctionnalité, installez d\'abord une appli de paiement"</string>
+ <string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"Applis récentes, applis par défaut"</string>
+ <string name="notification_settings_work_profile" msgid="6076211850526353975">"Les applis du profil professionnel n\'ont pas accès aux notifications."</string>
<string name="account_dashboard_title" msgid="8228773251948253914">"Mots de passe et comptes"</string>
<string name="account_dashboard_default_summary" msgid="7976899924144356939">"Suggestions pour la connexion et le remplissage automatique"</string>
- <string name="app_default_dashboard_title" msgid="4071015747629103216">"Applications par défaut"</string>
- <string name="cloned_apps_dashboard_title" msgid="5542076801222950921">"Applications clonées"</string>
- <string name="desc_cloned_apps_intro_text" msgid="1369621522882622476">"Créez une deuxième instance d\'une application afin de pouvoir utiliser deux comptes en même temps."</string>
- <string name="desc_cloneable_app_list_text" msgid="3354586725814708688">"Applications qui peuvent être clonées."</string>
+ <string name="app_default_dashboard_title" msgid="4071015747629103216">"Applis par défaut"</string>
+ <string name="cloned_apps_dashboard_title" msgid="5542076801222950921">"Applis clonées"</string>
+ <string name="desc_cloned_apps_intro_text" msgid="1369621522882622476">"Créez une deuxième instance d\'une appli afin de pouvoir utiliser deux comptes en même temps."</string>
+ <string name="desc_cloneable_app_list_text" msgid="3354586725814708688">"Applis qui peuvent être clonées."</string>
<string name="cloned_apps_summary" msgid="8805362440770795709">"<xliff:g id="CLONED_APPS_COUNT">%1$s</xliff:g> clonée(s), <xliff:g id="ALLOWED_APPS_COUNT">%2$d</xliff:g> disponible(s) pour le clonage"</string>
<string name="delete_all_app_clones" msgid="3489053361980624999">"Supprimer tous les clones d\'applis"</string>
<string name="delete_all_app_clones_failure" msgid="6821033414547132335">"Supprimer les clones d\'applis (échec)"</string>
@@ -3172,13 +3197,13 @@
<string name="cloned_app_creation_toast_summary" msgid="3854494347144867870">"Création d\'un clone de <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> en cours…"</string>
<string name="cloned_app_created_toast_summary" msgid="755225403495544163">"Clone de <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> créé"</string>
<string name="system_dashboard_summary" msgid="7400745270362833832">"Langues, gestes, heure, sauvegarde"</string>
- <string name="languages_setting_summary" msgid="2650807397396180351">"Langues du système, langues des applications, préférences régionales, reconnaissance vocale"</string>
+ <string name="languages_setting_summary" msgid="2650807397396180351">"Langues du système, langues des applis, préférences régionales, reconnaissance vocale"</string>
<string name="keywords_wifi" msgid="8156528242318351490">"wifi, wi-fi, connexion réseau, internet, sans fil, données, wi fi"</string>
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"notification Wi‑Fi, notification wifi"</string>
<string name="keywords_wifi_data_usage" msgid="4718555409695862085">"utilisation de données"</string>
<string name="keywords_time_format" msgid="5384803098766166820">"Utiliser le format 24 heures"</string>
<string name="keywords_app_default" msgid="8977706259156428770">"Ouvrir avec"</string>
- <string name="keywords_applications_settings" msgid="999926810912037792">"Applications"</string>
+ <string name="keywords_applications_settings" msgid="999926810912037792">"Applis"</string>
<string name="keywords_time_zone" msgid="6402919157244589055">"fuseau horaire"</string>
<string name="keywords_draw_overlay" msgid="3170036145197260392">"Bulle de clavardage, système, alerte, fenêtre, boîte de dialogue, écran, superposition autres applis, dessin"</string>
<string name="keywords_flashlight" msgid="2133079265697578183">"Lampe de poche, lumière"</string>
@@ -3211,10 +3236,10 @@
<string name="keywords_users" msgid="3497517660077620843">"restriction, restreindre, restreint"</string>
<string name="keywords_keyboard_and_ime" msgid="4741098648730042570">"correction de texte, corriger, son, vibreur, automatique, langue, geste, suggérer, suggestion, thème, choquant, mot, type, emoji, international"</string>
<string name="keywords_reset_apps" msgid="8254315757754930862">"réinitialiser, préférences, par défaut"</string>
- <string name="keywords_all_apps" msgid="9016323378609007166">"applis, télécharger, applications, système"</string>
- <string name="keywords_app_permissions" msgid="2061773665663541610">"applications, autorisations, sécurité"</string>
- <string name="keywords_default_apps" msgid="4601664230800605416">"applications, par défaut"</string>
- <string name="keywords_ignore_optimizations" msgid="8967142288569785145">"ignorer les optimisations, mise en veille, mode veille des application"</string>
+ <string name="keywords_all_apps" msgid="9016323378609007166">"applis, télécharger, applis, système"</string>
+ <string name="keywords_app_permissions" msgid="2061773665663541610">"applis, autorisations, sécurité"</string>
+ <string name="keywords_default_apps" msgid="4601664230800605416">"applis, par défaut"</string>
+ <string name="keywords_ignore_optimizations" msgid="8967142288569785145">"ignorer les optimisations, mise en veille, mode veille des appli"</string>
<string name="keywords_color_mode" msgid="1193896024705705826">"vibrantes, rvb, srvb, couleurs, naturelles, standard"</string>
<string name="keywords_screen_resolution" msgid="6652125115386722875">"FHD, QHD, résolution, 1080p, 1440p"</string>
<string name="keywords_color_temperature" msgid="8159539138837118453">"température, couleur, D65, D73, blanc, jaune, bleu, chaud, froid"</string>
@@ -3293,7 +3318,7 @@
<string name="notification_volume_disabled_summary" msgid="8679988555852056079">"Inaccessible parce que la sonnerie est désactivée"</string>
<string name="ringtone_title" msgid="3271453110387368088">"Sonnerie du téléphone"</string>
<string name="notification_ringtone_title" msgid="6924501621312095512">"Son de notification par défaut"</string>
- <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Son fourni par l\'application"</string>
+ <string name="notification_unknown_sound_title" msgid="1319708450698738980">"Son fourni par l\'appli"</string>
<string name="notification_sound_default" msgid="8630353701915294299">"Son de notification par défaut"</string>
<string name="alarm_ringtone_title" msgid="6680761007731764726">"Son de l\'alarme par défaut"</string>
<string name="vibrate_when_ringing_option_ramping_ringer" msgid="2798848945803840348">"Vibrer en premier, puis sonnerie graduelle"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucun}=1{1 horaire programmé}one{# horaire programmé}other{# horaires programmés}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modes prioritaires"</string>
- <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et des applications importantes"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Ajouter un mode"</string>
+ <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et des applis importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Sélectionner le type d\'activation"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Heure"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"P. ex. « De 9 h 30 à 17 h »"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Agenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"P. ex. « Agenda personnel »"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Créer un mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personnalisé"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activer le mode Ne pas déranger"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Les alarmes et les sons des éléments multimédias peuvent provoquer des interruptions"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Horaires"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Supprimer les horaires"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Supprimer"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Renommer"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Supprimer"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Supprimer le mode « <xliff:g id="MODE">%1$s</xliff:g> »?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Modifier"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Horaires"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Horaire"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Ajoutez un agenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Utiliser votre agenda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programme"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Définissez un horaire"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programmer"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activer automatiquement"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Horaire"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Tél. en silence à certains moments"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Créer des règles pour le mode Ne pas déranger"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Autoriser les interruptions qui émettent des sons"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquer dérangements visuels"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Autoriser les signaux visuels"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Des notifications qui peuvent vous parvenir"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Rester concentré"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Actions supplémentaires"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Désactivé}=1{Désactivé : 1 mode peut s\'activer automatiquement}one{Désactivé : # mode peut s\'activer automatiquement}other{Désactivé : # modes peuvent s\'activer automatiquement}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Paramètres d\'affichage"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Options d\'affichage"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Nuances de gris"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"activer le thème sombre"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Faire en sorte que le SE et les applis utilisent plutôt une écriture pâle sur un fond foncé, ce qui peut être plus doux pour les yeux et permettre une économie considérable de la pile sur certains appareils"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Aucune modification apportée à l\'affichage}=1{{effect_1}}=2{{effect_1} et {effect_2}}=3{{effect_1}, {effect_2} et {effect_3}}one{{effect_1}, {effect_2} et # autre}other{{effect_1}, {effect_2} et # autres}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrer les interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Aucune interruption n\'est filtrée"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Afficher les options pour les notifications filtrées"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quand le mode Ne pas déranger est activé"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aucun son des notifications"</string>
@@ -3391,7 +3431,7 @@
<string name="zen_mode_block_effect_light" msgid="1997222991427784993">"Ne pas faire clignoter la lumière"</string>
<string name="zen_mode_block_effect_peek" msgid="2525844009475266022">"Ne pas afficher de notifications à l\'écran"</string>
<string name="zen_mode_block_effect_status" msgid="5765965061064691918">"Masquer les icônes de la barre d\'état dans le haut de l\'écran"</string>
- <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Masquer les points de notification sur les icônes d\'application"</string>
+ <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Masquer les points de notification sur les icônes d\'appli"</string>
<string name="zen_mode_block_effect_ambient" msgid="1247740599476031543">"Ne pas réactiver pour les notifications"</string>
<string name="zen_mode_block_effect_list" msgid="7549367848660137118">"Masquer du volet déroulant"</string>
<string name="zen_mode_block_effect_summary_none" msgid="6688519142395714659">"Jamais"</string>
@@ -3410,7 +3450,7 @@
<string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"Le mode Ne pas déranger est activé jusqu\'à <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
<string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"Le mode Ne pas déranger restera actif jusqu\'à ce que vous le désactiviez"</string>
<string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"Le mode Ne pas déranger a été activé automatiquement par un horaire (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
- <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"Le mode Ne pas déranger a été activé par une application (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
+ <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"Le mode Ne pas déranger a été activé par une appli (<xliff:g id="APP_NAME">%s</xliff:g>)"</string>
<string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"Le mode Ne pas déranger est activé <xliff:g id="RULE_NAMES">%s</xliff:g>, avec des paramètres personnalisés."</string>
<string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="8255159194653341835">" "<annotation id="link">"Afficher les paramètres personnalisés"</annotation></string>
<string name="zen_interruption_level_priority" msgid="4854123502362861192">"Prioritaires seulement"</string>
@@ -3424,7 +3464,7 @@
<string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Désactivé}=1{Désactivé : 1 horaire peut s\'activer automatiquement}one{Désactivé : # horaire peut s\'activer automatiquement}other{Désactivé : # horaires peuvent s\'activer automatiquement}}"</string>
<string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
<string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
- <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
+ <string name="zen_category_apps" msgid="1167374545618451925">"Applis"</string>
<string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes et autres interruptions"</string>
<string name="zen_category_schedule" msgid="2003707171924226212">"Horaires"</string>
<string name="zen_category_duration" msgid="7515850842082631460">"Durée des paramètres rapides"</string>
@@ -3484,17 +3524,18 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ouvrir la notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Autoriser le report des notifications"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Pastille de notification sur l\'icône de l\'appli"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Groupes de notifications"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bulles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bulles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Afficher cette conversation sous forme de bulles"</string>
- <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"Afficher une icône flottante par-dessus les applications"</string>
+ <string name="bubbles_conversation_toggle_summary" msgid="720229032254323578">"Afficher une icône flottante par-dessus les applis"</string>
<string name="bubbles_feature_disabled_dialog_title" msgid="1794193899792284007">"Activer les bulles à l\'échelle de l\'appareil?"</string>
- <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"L\'activation des bulles pour cette application activera aussi les bulles pour votre appareil.\n\nCela a un impact sur les autres applications ou les conversations qui peuvent s\'afficher en bulles."</string>
+ <string name="bubbles_feature_disabled_dialog_text" msgid="5275666953364031055">"L\'activation des bulles pour cette appli activera aussi les bulles pour votre appareil.\n\nCela a un impact sur les autres applis ou les conversations qui peuvent s\'afficher en bulles."</string>
<string name="bubbles_feature_disabled_button_approve" msgid="2042628067101419871">"Activer"</string>
<string name="bubbles_feature_disabled_button_cancel" msgid="8963409459448350600">"Annuler"</string>
<string name="notifications_bubble_setting_on_summary" msgid="4641572377430901196">"Activées : les conversations peuvent s\'afficher sous forme d\'icônes flottantes"</string>
- <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Autoriser les applications à afficher des bulles"</string>
- <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Certaines conversations s\'afficheront sous forme d\'icônes flottantes superposées aux autres applications"</string>
+ <string name="notifications_bubble_setting_title" msgid="8287649393774855268">"Autoriser les applis à afficher des bulles"</string>
+ <string name="notifications_bubble_setting_description" msgid="7336770088735025981">"Certaines conversations s\'afficheront sous forme d\'icônes flottantes superposées aux autres applis"</string>
<string name="bubble_app_setting_all" msgid="312524752846978277">"Toutes les conversations peuvent s\'afficher dans des bulles"</string>
<string name="bubble_app_setting_selected" msgid="4324386074198040675">"Les conversations sélectionnées peuvent s\'afficher dans des bulles"</string>
<string name="bubble_app_setting_none" msgid="8643594711863996418">"Aucune bulle n\'est autorisée"</string>
@@ -3511,7 +3552,7 @@
<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="unseen_notifs_lock_screen" msgid="6910701117021324612">"Afficher seul. les nouv. notif. sur l\'écran de verrouillage"</string>
+ <string name="unseen_notifs_lock_screen" msgid="6910701117021324612">"Afficher seul. les nouvelles notifi. sur l\'écran de verrou."</string>
<string name="unseen_notifs_lock_screen_summary" msgid="5996722793868021391">"Retirez automatiquement les notifications consultées de l\'écran de verrouillage"</string>
<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>
@@ -3537,7 +3578,7 @@
<string name="notification_importance_title" msgid="1545158655988342703">"Comportement"</string>
<string name="conversations_category_title" msgid="5586541340846847798">"Conversations"</string>
<string name="conversation_section_switch_title" msgid="3332885377659473775">"Section des conversations"</string>
- <string name="conversation_section_switch_summary" msgid="6123587625929439674">"Autoriser l\'application à utiliser la section des conversations"</string>
+ <string name="conversation_section_switch_summary" msgid="6123587625929439674">"Autoriser l\'appli à utiliser la section des conversations"</string>
<string name="demote_conversation_title" msgid="6355383023376508485">"Ce n\'est pas une conversation"</string>
<string name="demote_conversation_summary" msgid="4319929331165604112">"Supprimer de la section des conversations"</string>
<string name="promote_conversation_title" msgid="4731148769888238722">"C\'est une conversation"</string>
@@ -3562,7 +3603,7 @@
<string name="notification_silence_title" msgid="4085829874452944989">"Mode silencieux"</string>
<string name="notification_alert_title" msgid="1632401211722199217">"Par défaut"</string>
<string name="allow_interruption" msgid="5237201780159482716">"Autoriser les interruptions"</string>
- <string name="allow_interruption_summary" msgid="9044131663518112543">"Autoriser l\'application à émettre des sons, à vibrer et à afficher des notifications à l\'écran"</string>
+ <string name="allow_interruption_summary" msgid="9044131663518112543">"Autoriser l\'appli à émettre des sons, à vibrer et à afficher des notifications à l\'écran"</string>
<string name="notification_priority_title" msgid="5554834239080425229">"Prioritaire"</string>
<string name="notification_channel_summary_priority" msgid="7225362351439076913">"S\'affiche en haut de la section des conversations sous forme de bulle flottante et affiche la photo du profil sur l\'écran de verrouillage"</string>
<string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> ne prend pas en charge la majorité des fonctionnalités de conversations. Vous ne pouvez pas définir une conversation comme prioritaire, et les conversations ne s\'afficheront pas comme bulles flottantes."</string>
@@ -3576,18 +3617,18 @@
<string name="notifications_sent_daily" msgid="10274479224185437">"{count,plural, =1{Environ # notification par jour}one{Environ # notification par jour}other{Environ # notifications par jour}}"</string>
<string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{Environ # notification par semaine}one{Environ # notification par semaine}other{Environ # notifications par semaine}}"</string>
<string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
- <string name="manage_notification_access_title" msgid="4154723216570646451">"Lecture et contrôle des notifications, réponses à celles-ci"</string>
+ <string name="manage_notification_access_title" msgid="4154723216570646451">"Notifications : lecture, réponse et contrôle"</string>
<string name="manage_notification_access_summary" msgid="2907135226478903997">"Contrôler quelles applis et quels appareils peuvent lire les notifications"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"L\'accès aux notifications du profil professionnel est bloqué"</string>
<string name="notification_assistant_title" msgid="5889201903272393099">"Notifications améliorées"</string>
<string name="notification_assistant_summary" msgid="1957783114840908887">"Recevoir des suggestions d\'actions, de réponses et plus encore"</string>
<string name="no_notification_assistant" msgid="2533323397091834096">"Aucune"</string>
- <string name="no_notification_listeners" msgid="2839354157349636000">"Aucune demande d\'accès aux notifications n\'a été envoyée pour les applications installées."</string>
+ <string name="no_notification_listeners" msgid="2839354157349636000">"Aucune demande d\'accès aux notifications n\'a été envoyée pour les applis installées."</string>
<string name="notification_access_detail_switch" msgid="46386786409608330">"Autoriser l\'accès aux notifications"</string>
- <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Les notifications améliorées ont remplacé les notifications adaptatives Android sous Android 12. Cette fonctionnalité vous présente des suggestions d\'actions et de réponses, et organise vos notifications. \n\nLes notifications améliorées peuvent accéder au contenu de toutes les notifications, y compris les renseignements personnels comme le nom des contacts et les messages. Cette fonctionnalité peut aussi fermer des notifications ou interagir avec elles, comme répondre aux appels téléphoniques et gérer le mode Ne pas déranger."</string>
+ <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Les notifications améliorées ont remplacé les notifications adaptatives Android sous Android 12. Cette fonctionnalité vous suggère des actions et des réponses, et organise vos notifications. \n\nLes notifications améliorées peuvent accéder au contenu de toutes les notifications, y compris les renseignements personnels comme le nom des contacts et les messages. Cette fonctionnalité peut aussi fermer des notifications ou interagir avec elles, comme répondre aux appels téléphoniques et gérer le mode Ne pas déranger."</string>
<string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder aux notifications?"</string>
- <string name="notification_listener_security_warning_summary" msgid="1131986567509818121">"L\'application <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications, y compris les renseignements personnels tels que les noms des contacts, les photos et le texte des messages que vous recevez. Cette application pourra également répéter ou fermer des notifications, ou effectuer des actions sur des boutons dans les notifications, y compris répondre à des appels téléphoniques. \n\nCette action permettra également à l\'application d\'activer et de désactiver la fonctionnalité Ne pas déranger et de modifier les paramètres connexes."</string>
- <string name="nls_warning_prompt" msgid="1486887096703743841">"L\'application <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra effectuer les actions suivantes :"</string>
+ <string name="notification_listener_security_warning_summary" msgid="1131986567509818121">"L\'appli <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications, y compris les renseignements personnels tels que les noms des contacts, les photos et le texte des messages que vous recevez. Cette appli pourra également répéter ou fermer des notifications, ou effectuer des actions sur des boutons dans les notifications, y compris répondre à des appels téléphoniques. \n\nCette action permettra également à l\'appli d\'activer et de désactiver la fonctionnalité Ne pas déranger et de modifier les paramètres connexes."</string>
+ <string name="nls_warning_prompt" msgid="1486887096703743841">"L\'appli <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra effectuer les actions suivantes :"</string>
<string name="nls_feature_read_title" msgid="7629713268744220437">"Lire vos notifications"</string>
<string name="nls_feature_read_summary" msgid="1064698238110273593">"Elle peut lire vos notifications, y compris les renseignements personnels, comme les contacts, les messages et les photos."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Répondre aux messages"</string>
@@ -3609,62 +3650,62 @@
<string name="notification_listener_not_allowed" msgid="3352962779597846538">"Non autorisées"</string>
<string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Afficher toutes les applis"</string>
<string name="notif_listener_excluded_app_summary" msgid="2914567678047195396">"Modifier les paramètres pour chaque appli qui envoie des notifications"</string>
- <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Applications affichées sur l\'appareil"</string>
- <string name="notif_listener_not_migrated" msgid="6265206376374278226">"Cette application ne prend pas en charge les paramètres améliorés"</string>
+ <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Applis affichées sur l\'appareil"</string>
+ <string name="notif_listener_not_migrated" msgid="6265206376374278226">"Cette appli ne prend pas en charge les paramètres améliorés"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Plus de paramètres"</string>
- <string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Plus de paramètres sont accessibles dans cette application"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Plus de paramètres sont accessibles dans cette appli"</string>
+ <string name="notification_polite_title" msgid="6121016426991791557">"Période de stabil. des notif."</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Appliquer aux profils professionnels"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"L\'appliquer aux applis du profil professionnel"</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 applications installées."</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>
- <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"L\'écouteur <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> pourra être exécuté lorsque vous utiliserez des applications en mode Réalité virtuelle."</string>
+ <string name="vr_listener_security_warning_summary" msgid="1888843557687017791">"L\'écouteur <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> pourra être exécuté lorsque vous utiliserez des applis en mode Réalité virtuelle."</string>
<string name="display_vr_pref_title" msgid="4850474436291113569">"Lorsque l\'appareil est en mode RV"</string>
<string name="display_vr_pref_low_persistence" msgid="7039841277157739871">"Réduire le flou (recommandé)"</string>
<string name="display_vr_pref_off" msgid="4008841566387432721">"Réduire le scintillement"</string>
<string name="picture_in_picture_title" msgid="9001594281840542493">"Incrustation d\'image"</string>
- <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Aucune application installée n\'est compatible avec le mode d\'image incrusté"</string>
+ <string name="picture_in_picture_empty_text" msgid="9123600661268731579">"Aucune appli installée n\'est compatible avec le mode d\'image incrusté"</string>
<string name="picture_in_picture_keywords" msgid="3605379820551656253">"image incrustée, image dans image"</string>
<string name="picture_in_picture_app_detail_title" msgid="4442235098255164650">"Incrustation d\'image"</string>
<string name="picture_in_picture_app_detail_switch" msgid="8544190716075624017">"Autoriser l\'incrustation d\'image"</string>
- <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Autorisez cette application à créer une fenêtre d\'incrustation d\'image lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applications en cours d\'utilisation."</string>
+ <string name="picture_in_picture_app_detail_summary" msgid="2503211101305358849">"Autorisez cette appli à créer une fenêtre d\'incrustation d\'image lorsqu\'elle est ouverte ou après l\'avoir quittée (par exemple, pour continuer de regarder une vidéo). Cette fenêtre se superpose aux autres applis en cours d\'utilisation."</string>
<string name="interact_across_profiles_title" msgid="7285906999927669971">"Applis professionnelles et personnelles associées"</string>
<string name="interact_across_profiles_summary_allowed" msgid="1365881452153799092">"Associées"</string>
<string name="interact_across_profiles_summary_not_allowed" msgid="5802674212788171790">"Non associées"</string>
- <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"Aucune application connectée"</string>
- <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"application associée profil personnel et professionnel"</string>
+ <string name="interact_across_profiles_empty_text" msgid="419061031064397168">"Aucune appli connectée"</string>
+ <string name="interact_across_profiles_keywords" msgid="5996472773111665049">"appli associée profil personnel et professionnel"</string>
<string name="interact_across_profiles_switch_enabled" msgid="7294719120282287495">"Associées"</string>
- <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"Associer ces applications"</string>
- <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"Les applications associées partagent leurs autorisations, et chacune peut accéder aux données de l\'autre."</string>
- <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"Associez seulement des applications si vous avez confiance qu\'elles ne partageront pas de données personnelles avec votre administrateur informatique."</string>
- <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"Vous pouvez dissocier des applications en tout temps dans les paramètres de confidentialité de votre appareil."</string>
- <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"Autoriser l\'application professionnelle <xliff:g id="NAME">%1$s</xliff:g> à accéder à vos données personnelles?"</string>
- <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"Associez seulement des applications si vous avez confiance qu\'elles ne partageront pas de données personnelles avec votre administrateur informatique."</string>
- <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"Données de l\'application"</string>
- <string name="interact_across_profiles_consent_dialog_app_data_summary" msgid="6057019384328088311">"Cette application peut accéder aux données de votre application personnelle <xliff:g id="NAME">%1$s</xliff:g>."</string>
+ <string name="interact_across_profiles_switch_disabled" msgid="4312196170211463988">"Associer ces applis"</string>
+ <string name="interact_across_profiles_summary_1" msgid="6093976896137600231">"Les applis associées partagent leurs autorisations, et chacune peut accéder aux données de l\'autre."</string>
+ <string name="interact_across_profiles_summary_2" msgid="505748305453633885">"Associez seulement des applis si vous avez confiance qu\'elles ne partageront pas de données personnelles avec votre administrateur informatique."</string>
+ <string name="interact_across_profiles_summary_3" msgid="444428694843299854">"Vous pouvez dissocier des applis en tout temps dans les paramètres de confidentialité de votre appareil."</string>
+ <string name="interact_across_profiles_consent_dialog_title" msgid="8530621211216508681">"Autoriser l\'appli professionnelle <xliff:g id="NAME">%1$s</xliff:g> à accéder à vos données personnelles?"</string>
+ <string name="interact_across_profiles_consent_dialog_summary" msgid="3949870271562055048">"Associez seulement des applis si vous avez confiance qu\'elles ne partageront pas de données personnelles avec votre administrateur informatique."</string>
+ <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"Données de l\'appli"</string>
+ <string name="interact_across_profiles_consent_dialog_app_data_summary" msgid="6057019384328088311">"Cette appli peut accéder aux données de votre appli personnelle <xliff:g id="NAME">%1$s</xliff:g>."</string>
<string name="interact_across_profiles_consent_dialog_permissions_title" msgid="2316852600280487055">"Autorisations"</string>
- <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Cette application peut utiliser les autorisations de votre application personnelle <xliff:g id="NAME">%1$s</xliff:g>, comme l\'accès à votre position, à votre espace de stockage ou à vos contacts."</string>
- <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune application associée"</string>
- <string name="interact_across_profiles_number_of_connected_apps" msgid="4000424798291479207">"{count,plural, =1{# application associée}one{# application associée}other{# applications associées}}"</string>
- <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
- <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil personnel"</string>
- <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"Touchez pour télécharger l\'application"</string>
+ <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Cette appli peut utiliser les autorisations de votre appli personnelle <xliff:g id="NAME">%1$s</xliff:g>, comme l\'accès à votre position, à votre espace de stockage ou à vos contacts."</string>
+ <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune appli associée"</string>
+ <string name="interact_across_profiles_number_of_connected_apps" msgid="4000424798291479207">"{count,plural, =1{# appli associée}one{# appli associée}other{# applis associées}}"</string>
+ <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applis, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
+ <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Pour connecter ces applis, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil personnel"</string>
+ <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"Touchez pour télécharger l\'appli"</string>
<string name="manage_zen_access_title" msgid="1562322900340107269">"Accès à Ne pas déranger"</string>
<string name="zen_access_detail_switch" msgid="4183681772666138993">"Autoriser le mode Ne pas déranger"</string>
- <string name="zen_access_empty_text" msgid="3779921853282293080">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
- <string name="app_notifications_off_desc" msgid="2484843759466874201">"Vous n\'avez pas autorisé les notifications de cette application"</string>
+ <string name="zen_access_empty_text" msgid="3779921853282293080">"Aune appli installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
+ <string name="app_notifications_off_desc" msgid="2484843759466874201">"Vous n\'avez pas autorisé les notifications de cette appli"</string>
<string name="channel_notifications_off_desc" msgid="6202042207121633488">"À votre demande, Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
<string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"À votre demande, Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
- <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Cette application n\'envoie pas de notifications"</string>
+ <string name="app_notifications_not_send_desc" msgid="5683060986735070528">"Cette appli n\'envoie pas de notifications"</string>
<string name="notification_channels" msgid="1502969522886493799">"Catégories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Autre"</string>
<string name="no_channels" msgid="4716199078612071915">"Cette appli n\'a publié aucune notification"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Afficher les catégories inutilisées"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Paramètres supplémentaires dans l\'appli"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Afficher les catégories inutilisées"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Masquer les catégories inutilisées"</string>
@@ -3694,8 +3735,8 @@
<string name="zen_mode_choose_rule_type" msgid="7656308563653982975">"Choisir le type d\'horaire"</string>
<string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"Supprimer la règle « <xliff:g id="RULE">%1$s</xliff:g> »?"</string>
<string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"Supprimer"</string>
- <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Ces paramètres ne peuvent pas être modifiés pour le moment. Une application (<xliff:g id="APP_NAME">%1$s</xliff:g>) a activé un mode Ne pas déranger personnalisé."</string>
- <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Ces paramètres ne peuvent pas être modifiés pour le moment. Une application a activé un mode Ne pas déranger personnalisé."</string>
+ <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Ces paramètres ne peuvent pas être modifiés pour le moment. Une appli (<xliff:g id="APP_NAME">%1$s</xliff:g>) a activé un mode Ne pas déranger personnalisé."</string>
+ <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Ces paramètres ne peuvent pas être modifiés pour le moment. Une appli a activé un mode Ne pas déranger personnalisé."</string>
<string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"Ces paramètres ne peuvent pas être modifiés pour le moment. Un mode Ne pas déranger personnalisé a été activé manuellement."</string>
<string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"Heure"</string>
<string name="zen_event_rule_type_name" msgid="1921166617081971754">"Événement"</string>
@@ -3725,7 +3766,7 @@
<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_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 applications 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_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>
<string name="zen_mode_calls" msgid="7653245854493631095">"Appels"</string>
<string name="zen_mode_calls_list" msgid="5044730950895749093">"appels"</string>
@@ -3773,24 +3814,30 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Applis qui peuvent provoquer des interruptions"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Applis sélectionnées"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Aucune"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Tout"</string>
- <string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Autoriser les applications à ignorer le mode Ne pas déranger"</string>
- <string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Applications qui peuvent provoquer des interruptions"</string>
- <string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Sélectionner plus d\'applications"</string>
- <string name="zen_mode_bypassing_apps_none" msgid="7944221631721778096">"Aucune application sélectionnée"</string>
- <string name="zen_mode_bypassing_apps_subtext_none" msgid="5128770411598722200">"Aucune application ne peut provoquer d\'interruption"</string>
- <string name="zen_mode_bypassing_apps_add" msgid="5031919618521327102">"Ajouter des applications"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
+ <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>
+ <string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Sélectionner plus d\'applis"</string>
+ <string name="zen_mode_bypassing_apps_none" msgid="7944221631721778096">"Aucune appli sélectionnée"</string>
+ <string name="zen_mode_bypassing_apps_subtext_none" msgid="5128770411598722200">"Aucune appli ne peut provoquer d\'interruption"</string>
+ <string name="zen_mode_bypassing_apps_add" msgid="5031919618521327102">"Ajouter des applis"</string>
<string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toutes les notifications"</string>
<string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Quelques notifications"</string>
- <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent toujours vous joindre, même si vous n\'autorisez pas les applications à provoquer des interruptions"</string>
- <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Aucune application ne peut provoquer d\'interruption}=1{{app_1} peut provoquer des interruptions}=2{{app_1} et {app_2} peuvent provoquer des interruptions}=3{{app_1}, {app_2} et {app_3} peuvent provoquer des interruptions}one{{app_1}, {app_2} et # autre application peuvent provoquer des interruptions}other{{app_1}, {app_2} et # autres applications peuvent provoquer des interruptions}}"</string>
- <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Applications"</string>
+ <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent toujours vous joindre, même si vous n\'autorisez pas les applis à provoquer des interruptions"</string>
+ <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{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_bypassing_apps_title" msgid="371050263563164059">"Applis"</string>
<string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications qui peuvent provoquer des interruptions"</string>
<string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
- <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut provoquer d\'interruption}=1{{sound_category_1} peut provoquer des interruptions}=2{{sound_category_1} et {sound_category_2} peuvent provoquer des interruptions}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent provoquer des interruptions}one{{sound_category_1}, {sound_category_2} et # autre application peuvent provoquer des interruptions}other{{sound_category_1}, {sound_category_2} et # autres applications peuvent provoquer des interruptions}}"</string>
+ <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut provoquer d\'interruption}=1{{sound_category_1} peut provoquer des interruptions}=2{{sound_category_1} et {sound_category_2} peuvent provoquer des interruptions}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent provoquer des interruptions}one{{sound_category_1}, {sound_category_2} et # autre appli peuvent provoquer des interruptions}other{{sound_category_1}, {sound_category_2} et # autres applis peuvent provoquer des interruptions}}"</string>
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut provoquer d\'interruption"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut provoquer d\'interruption"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent provoquer des interruptions"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Tout le monde peut provoquer des interruptions"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Appelants fréquents"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Autoriser les appels répétés"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ne recevoir que les alarmes pendant une heure jusqu\'à {time}}one{Ne recevoir que les alarmes pendant # heure jusqu\'à {time}}other{Ne recevoir que les alarmes pendant # heures jusqu\'à {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Activer le mode Toujours interrompre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modifier le mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Ajouter 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="warning_button_text" msgid="1274234338874005639">"Mise en garde"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Fermer"</string>
<string name="device_feedback" msgid="5351614458411688608">"Commentaires sur cet appareil"</string>
@@ -3826,11 +3871,11 @@
<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>
- <string name="screen_pinning_title" msgid="6927227272780208966">"Épinglage d\'application"</string>
- <string name="app_pinning_intro" msgid="6409063008733004245">"L\'épinglage d\'application vous permet de garder l\'application actuelle en vue jusqu\'à ce que vous annuliez l\'épinglage. Cette fonctionnalité peut être utilisée, par exemple, pour laisser un ami de confiance jouer à un certain jeu."</string>
- <string name="screen_pinning_description" msgid="5822120806426139396">"Lorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nPour utiliser Épinglage d\'application : \n{0,number,integer}. Activez Épinglage d\'application \n{1,number,integer}. Ouvrez Aperçu \n{2,number,integer}. Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
- <string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"Lorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nSi vous souhaitez partager votre appareil de manière sécuritaire, essayez d\'utiliser un profil d\'utilisateur invité à la place. \n\nPour utiliser Épinglage d\'application : \n{0,number,integer}. Activez Épinglage d\'application \n{1,number,integer}. Ouvrez Aperçu \n{2,number,integer}. Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
- <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Lorsqu\'une application est épinglée : \n\n• Certaines données personnelles pourraient être accessibles \n (comme les contacts et le contenu des courriels) \n• L\'application épinglée peut ouvrir d\'autres applications \n\nUtilisez l\'épinglage d\'application uniquement avec les gens en qui vous avez confiance."</string>
+ <string name="screen_pinning_title" msgid="6927227272780208966">"Épinglage d\'appli"</string>
+ <string name="app_pinning_intro" msgid="6409063008733004245">"L\'épinglage d\'appli vous permet de garder l\'appli actuelle en vue jusqu\'à ce que vous annuliez l\'épinglage. Cette fonctionnalité peut être utilisée, par exemple, pour laisser un ami de confiance jouer à un certain jeu."</string>
+ <string name="screen_pinning_description" msgid="5822120806426139396">"Lorsqu\'une appli est épinglée, elle peut ouvrir d\'autres applis, et certaines données personnelles pourraient être accessibles. \n\nPour utiliser Épinglage d\'appli : \n{0,number,integer}. Activez Épinglage d\'appli \n{1,number,integer}. Ouvrez Aperçu \n{2,number,integer}. Touchez l\'icône de l\'appli dans le haut de l\'écran, puis touchez Épingler"</string>
+ <string name="screen_pinning_guest_user_description" msgid="2307270321127139579">"Lorsqu\'une appli est épinglée, elle peut ouvrir d\'autres applis, et certaines données personnelles pourraient être accessibles. \n\nSi vous souhaitez partager votre appareil de manière sécuritaire, essayez d\'utiliser un profil d\'utilisateur invité à la place. \n\nPour utiliser Épinglage d\'appli : \n{0,number,integer}. Activez Épinglage d\'appli \n{1,number,integer}. Ouvrez Aperçu \n{2,number,integer}. Touchez l\'icône de l\'appli dans le haut de l\'écran, puis touchez Épingler"</string>
+ <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Lorsqu\'une appli est épinglée : \n\n• Certaines données personnelles pourraient être accessibles \n (comme les contacts et le contenu des courriels) \n• L\'appli épinglée peut ouvrir d\'autres applis \n\nUtilisez l\'épinglage d\'appli uniquement avec les gens en qui vous avez confiance."</string>
<string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
<string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Demander le NIP avant d\'annuler l\'épinglage"</string>
<string name="screen_pinning_unlock_password" msgid="4957969621904790573">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
@@ -3857,14 +3902,14 @@
<string name="managing_admin" msgid="2633920317425356619">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
<string name="launch_by_default" msgid="892824422067985734">"Ouvrir par défaut"</string>
<string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Ouvrir les liens compatibles"</string>
- <string name="app_launch_top_intro_message" msgid="137370923637482459">"Permettre aux liens Web de s\'ouvrir dans cette application"</string>
- <string name="app_launch_links_category" msgid="2380467163878760037">"Liens à ouvrir dans cette application"</string>
+ <string name="app_launch_top_intro_message" msgid="137370923637482459">"Permettre aux liens Web de s\'ouvrir dans cette appli"</string>
+ <string name="app_launch_links_category" msgid="2380467163878760037">"Liens à ouvrir dans cette appli"</string>
<string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Liens compatibles"</string>
<string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Autres préférences par défaut"</string>
<string name="app_launch_add_link" msgid="8622558044530305811">"Ajouter un lien"</string>
- <string name="app_launch_footer" msgid="4521865035105622557">"Une application peut vérifier les liens pour les ouvrir automatiquement dans l\'application."</string>
+ <string name="app_launch_footer" msgid="4521865035105622557">"Une appli peut vérifier les liens pour les ouvrir automatiquement dans l\'appli."</string>
<string name="app_launch_verified_links_title" msgid="621908751569155356">"{count,plural, =1{# lien vérifié}one{# lien vérifié}other{# liens vérifiés}}"</string>
- <string name="app_launch_verified_links_message" msgid="190871133877476176">"{count,plural, =1{Ce lien a été vérifié et s\'ouvre automatiquement dans cette application.}one{Ce lien a été vérifié et s\'ouvre automatiquement dans cette application.}other{Ces liens ont été vérifiés et s\'ouvrent automatiquement dans cette application.}}"</string>
+ <string name="app_launch_verified_links_message" msgid="190871133877476176">"{count,plural, =1{Ce lien a été vérifié et s\'ouvre automatiquement dans cette appli.}one{Ce lien a été vérifié et s\'ouvre automatiquement dans cette appli.}other{Ces liens ont été vérifiés et s\'ouvrent automatiquement dans cette appli.}}"</string>
<string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
<string name="app_launch_verified_links_info_description" msgid="7514750232467132117">"Afficher la liste des liens vérifiés"</string>
<string name="app_launch_checking_links_title" msgid="6119228853554114201">"Vérification des liens pris en charge en cours…"</string>
@@ -3887,47 +3932,47 @@
<string name="runtime_permissions_additional_count" msgid="6071909675951786523">"{count,plural, =1{# autorisation supplémentaire}one{# autorisation supplémentaire}other{# autorisations supplémentaires}}"</string>
<string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Aucune autorisation accordée"</string>
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7174876170116073356">"Aucune autorisation demandée"</string>
- <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"Gérez l\'accès des applications à vos données"</string>
+ <string name="runtime_permissions_summary_control_app_access" msgid="3744591396348990500">"Gérez l\'accès des applis à vos données"</string>
<string name="permissions_usage_title" msgid="2942741460679049132">"Tableau de bord de confidentialité"</string>
- <string name="permissions_usage_summary" msgid="6784310472062516454">"Affichez les applications qui ont récemment utilisé les autorisations"</string>
- <string name="unused_apps" msgid="4566272194756830656">"Applications non utilisées"</string>
- <string name="unused_apps_summary" msgid="4236371818881973021">"{count,plural, =1{# application non utilisée}one{# application non utilisée}other{# applications non utilisées}}"</string>
- <string name="unused_apps_category" msgid="8954930958175500851">"Paramètres des applications inutilisées"</string>
+ <string name="permissions_usage_summary" msgid="6784310472062516454">"Affichez les applis qui ont récemment utilisé les autorisations"</string>
+ <string name="unused_apps" msgid="4566272194756830656">"Applis non utilisées"</string>
+ <string name="unused_apps_summary" msgid="4236371818881973021">"{count,plural, =1{# appli non utilisée}one{# appli non utilisée}other{# applis non utilisées}}"</string>
+ <string name="unused_apps_category" msgid="8954930958175500851">"Paramètres des applis inutilisées"</string>
<string name="unused_apps_switch" msgid="7595419855882245772">"Suspendre l\'activité appli si inutilisée"</string>
<string name="unused_apps_switch_summary" msgid="2171098908014596802">"Retirer les autorisations, supprimer les fichiers temporaires et arrêter les notifications"</string>
- <string name="unused_apps_switch_v2" msgid="7464060328451454469">"Gérer l\'application si inutilisée"</string>
- <string name="unused_apps_switch_summary_v2" msgid="3182898279622036805">"Retirez les autorisations, supprimez les fichiers temporaires, arrêtez les notifications et archivez l\'application"</string>
- <string name="filter_all_apps" msgid="6645539744080251371">"Toutes les applications"</string>
- <string name="filter_enabled_apps" msgid="8868356616126759124">"Applications installées"</string>
- <string name="filter_instant_apps" msgid="2292108467020380068">"Applications instantanées"</string>
+ <string name="unused_apps_switch_v2" msgid="7464060328451454469">"Gérer l\'appli si inutilisée"</string>
+ <string name="unused_apps_switch_summary_v2" msgid="3182898279622036805">"Retirez les autorisations, supprimez les fichiers temporaires, arrêtez les notifications et archivez l\'appli"</string>
+ <string name="filter_all_apps" msgid="6645539744080251371">"Toutes les applis"</string>
+ <string name="filter_enabled_apps" msgid="8868356616126759124">"Applis installées"</string>
+ <string name="filter_instant_apps" msgid="2292108467020380068">"Applis instantanées"</string>
<string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Désactivées"</string>
<string name="advanced_apps" msgid="7643010673326578815">"Paramètres avancés"</string>
<string name="app_permissions" msgid="8666537659217653626">"Gestionnaire des autorisations"</string>
<string name="app_data_sharing_updates_title" msgid="1694297952320402788">"Mises à jour des pratiques de partage des données pour la localisation"</string>
- <string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"Passez en revue les applications qui ont changé la façon dont elles peuvent partager vos données de localisation"</string>
+ <string name="app_data_sharing_updates_summary" msgid="4465929918457739443">"Passez en revue les applis qui ont changé la façon dont elles peuvent partager vos données de localisation"</string>
<string name="tap_to_wake" msgid="3313433536261440068">"Toucher pour réveiller"</string>
<string name="tap_to_wake_summary" msgid="6641039858241611072">"Double-touchez l\'écran pour réveiller l\'appareil"</string>
<string name="domain_urls_title" msgid="7012209752049678876">"Ouverture des liens"</string>
<string name="domain_urls_summary_none" msgid="1132578967643384733">"Ne pas ouvrir les liens compatibles"</string>
<string name="domain_urls_summary_one" msgid="3312008753802762892">"Ouvrir « <xliff:g id="DOMAIN">%s</xliff:g> »"</string>
<string name="domain_urls_summary_some" msgid="1197692164421314523">"Ouvrir <xliff:g id="DOMAIN">%s</xliff:g> et d\'autres URL"</string>
- <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'application à gérer les liens pris en charge"</string>
+ <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'appli à gérer les liens pris en charge"</string>
<string name="app_link_open_ask" msgid="2422450109908936371">"Toujours demander"</string>
- <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'application à ouvrir les liens"</string>
- <string name="app_link_open_always_summary" msgid="4524005594295855117">"{count,plural, =1{L\'application prétend cibler # lien}one{L\'application prétend cibler # lien}other{L\'application prétend cibler # liens}}"</string>
- <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'application réclame les liens suivants :"</string>
+ <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'appli à ouvrir les liens"</string>
+ <string name="app_link_open_always_summary" msgid="4524005594295855117">"{count,plural, =1{L\'appli prétend cibler # lien}one{L\'appli prétend cibler # lien}other{L\'appli prétend cibler # liens}}"</string>
+ <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'appli réclame les liens suivants :"</string>
<string name="assist_and_voice_input_title" msgid="6317935163145135914">"Assist. et entrée vocale"</string>
<string name="default_assist_title" msgid="1182435129627493758">"Appli d\'assistant numérique"</string>
<string name="default_digital_assistant_title" msgid="5654663086385490838">"Assistant numérique par défaut"</string>
<string name="assistant_security_warning_agree" msgid="9013334158753473359">"J\'accepte"</string>
<string name="default_browser_title" msgid="8342074390782390458">"Appli de navigateur"</string>
- <string name="default_phone_title" msgid="7616730756650803827">"Application de téléphonie"</string>
+ <string name="default_phone_title" msgid="7616730756650803827">"Appli de téléphonie"</string>
<string name="system_app" msgid="1863291702508355041">"(Système)"</string>
- <string name="apps_storage" msgid="643866814746927111">"Stockage des applications"</string>
+ <string name="apps_storage" msgid="643866814746927111">"Stockage des applis"</string>
<string name="usage_access" msgid="5487993885373893282">"Accès aux données d\'utilisation"</string>
<string name="permit_usage_access" msgid="179630895262172674">"Autoriser l\'accès aux données d\'utilisation"</string>
<string name="time_spent_in_app_pref_title" msgid="25327097913383330">"Temps d\'utilisation des écrans"</string>
- <string name="usage_access_description" msgid="8547716253713890707">"L\'accès aux données d\'utilisation permet à une application d\'effectuer le suivi des applications que vous utilisez, de la fréquence d\'utilisation, du fournisseur de services, des paramètres de langue et d\'autres détails."</string>
+ <string name="usage_access_description" msgid="8547716253713890707">"L\'accès aux données d\'utilisation permet à une appli d\'effectuer le suivi des applis que vous utilisez, de la fréquence d\'utilisation, du fournisseur de services, des paramètres de langue et d\'autres détails."</string>
<string name="memory_settings_title" msgid="6582588646363308430">"Mémoire"</string>
<string name="always_running" msgid="9012705720688200252">"Toujours en cours d\'exécution (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
<string name="sometimes_running" msgid="7954947311082655448">"Parfois en cours d\'exécution (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3938,14 +3983,14 @@
<string name="high_power_on" msgid="8778058701270819268">"Non optimisée"</string>
<string name="high_power_off" msgid="317000444619279018">"L\'utilisation de la pile est optimisée"</string>
<string name="high_power_system" msgid="3966701453644915787">"L\'optimisation de la pile n\'est pas disponible"</string>
- <string name="high_power_prompt_title" msgid="2574478825228409124">"Autoriser l\'application à toujours fonctionner en arrière-plan?"</string>
- <string name="high_power_prompt_body" msgid="6029266540782139941">"Si vous autorisez l\'exécution en arrière-plan systématique de l\'application <xliff:g id="APP_NAME">%1$s</xliff:g>, vous risquez de réduire l\'autonomie de la pile. \n\nVous pouvez modifier ce choix plus tard dans Paramètres > Applications."</string>
+ <string name="high_power_prompt_title" msgid="2574478825228409124">"Autoriser l\'appli à toujours fonctionner en arrière-plan?"</string>
+ <string name="high_power_prompt_body" msgid="6029266540782139941">"Si vous autorisez l\'exécution en arrière-plan systématique de l\'appli <xliff:g id="APP_NAME">%1$s</xliff:g>, vous risquez de réduire l\'autonomie de la pile. \n\nVous pouvez modifier ce choix plus tard dans Paramètres > Applis."</string>
<string name="battery_summary" msgid="2491764359695671207">"Usage depuis la dernière charge complète : <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_summary_24hr" msgid="7656033283282656551">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> d\'utilisation au cours des 24 dernières heures"</string>
<string name="no_battery_summary" msgid="5769159953384122003">"Aucune utilisation de la pile depuis la dernière charge complète"</string>
<string name="share_remote_bugreport_dialog_title" msgid="1575283098565582433">"Partager le rapport de bogue?"</string>
- <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"Votre administrateur informatique a demandé un rapport de bogue pour l\'aider à dépanner cet appareil. Les applications et les données peuvent être partagées."</string>
- <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"Votre administrateur informatique a demandé un rapport de bogue pour l\'aider à dépanner cet appareil. Les applications et les données peuvent être partagées. Cela pourrait temporairement ralentir votre appareil."</string>
+ <string name="share_remote_bugreport_dialog_message_finished" msgid="4869053468609007680">"Votre administrateur informatique a demandé un rapport de bogue pour l\'aider à dépanner cet appareil. Les applis et les données peuvent être partagées."</string>
+ <string name="share_remote_bugreport_dialog_message" msgid="8714439220818865391">"Votre administrateur informatique a demandé un rapport de bogue pour l\'aider à dépanner cet appareil. Les applis et les données peuvent être partagées. Cela pourrait temporairement ralentir votre appareil."</string>
<string name="sharing_remote_bugreport_dialog_message" msgid="3523877008096439251">"Ce rapport de bogue est partagé avec votre administrateur informatique. Pour en savoir plus, communiquez avec lui."</string>
<string name="share_remote_bugreport_action" msgid="7173093464692893276">"Partager"</string>
<string name="decline_remote_bugreport_action" msgid="1276509879613158895">"Refuser"</string>
@@ -3984,16 +4029,16 @@
<string name="usb_summary_UVC_power" msgid="226810354412154061">"Caméra Web et alimentation"</string>
<string name="background_check_pref" msgid="5304564658578987535">"Vérification en arrière-plan"</string>
<string name="assist_access_context_title" msgid="5201495523514096201">"Utiliser le texte affiché à l\'écran"</string>
- <string name="assist_access_context_summary" msgid="6951814413185646275">"Autorisez l\'application d\'assistance à accéder au contenu affiché à l\'écran sous forme de texte"</string>
+ <string name="assist_access_context_summary" msgid="6951814413185646275">"Autorisez l\'appli d\'assistance à accéder au contenu affiché à l\'écran sous forme de texte"</string>
<string name="assist_access_screenshot_title" msgid="4395902231753643633">"Utiliser la capture d\'écran"</string>
- <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Autorisez l\'application d\'assistance à accéder au contenu affiché à l\'écran sous forme d\'image"</string>
+ <string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Autorisez l\'appli d\'assistance à accéder au contenu affiché à l\'écran sous forme d\'image"</string>
<string name="assist_flash_title" msgid="5449512572885550108">"Faire clignoter l\'écran"</string>
- <string name="assist_flash_summary" msgid="3032289860177784594">"Faites clignoter les bordures de l\'écran lorsque l\'application d\'assistance accède à du texte à partir de l\'écran ou d\'une capture d\'écran"</string>
- <string name="assist_footer" msgid="8248015363806299068">"Les applications d\'assistance peuvent vous aider en fonction de l\'information affichée à l\'écran. Certaines applications sont compatibles à la fois avec le lanceur d\'applications et les services d\'entrée vocale, vous permettant de bénéficier d\'une assistance intégrée."</string>
+ <string name="assist_flash_summary" msgid="3032289860177784594">"Faites clignoter les bordures de l\'écran lorsque l\'appli d\'assistance accède à du texte à partir de l\'écran ou d\'une capture d\'écran"</string>
+ <string name="assist_footer" msgid="8248015363806299068">"Les applis d\'assistance peuvent vous aider en fonction de l\'information affichée à l\'écran. Certaines applis sont compatibles à la fois avec le lanceur d\'applis et les services d\'entrée vocale, vous permettant de bénéficier d\'une assistance intégrée."</string>
<string name="average_memory_use" msgid="717313706368825388">"Utilisation moyenne de la mémoire"</string>
<string name="maximum_memory_use" msgid="2171779724001152933">"Utilisation max. de la mémoire"</string>
<string name="memory_usage" msgid="5594133403819880617">"Utilisation de la mémoire"</string>
- <string name="app_list_memory_use" msgid="3178720339027577869">"Utilisation de l\'application"</string>
+ <string name="app_list_memory_use" msgid="3178720339027577869">"Utilisation de l\'appli"</string>
<string name="memory_details" msgid="6133226869214421347">"Détails"</string>
<string name="memory_use_summary" msgid="3915964794146424142">"Moyenne de mémoire utilisée au cours des trois dernières heures : <xliff:g id="SIZE">%1$s</xliff:g>"</string>
<string name="no_memory_use_summary" msgid="6708111974923274436">"Aucune mémoire utilisée au cours des trois dernières heures"</string>
@@ -4003,8 +4048,8 @@
<string name="total_memory" msgid="5244174393008910567">"Mémoire totale"</string>
<string name="average_used" msgid="690235917394070169">"Utilisation moyenne (%)"</string>
<string name="free_memory" msgid="439783742246854785">"Libre"</string>
- <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applications"</string>
- <string name="memory_usage_apps_summary" msgid="7168292864155527974">"{count,plural, =1{1 application a utilisé la mémoire depuis {time}}one{# application a utilisé la mémoire depuis {time}}other{# applications ont utilisé la mémoire depuis {time}}}"</string>
+ <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applis"</string>
+ <string name="memory_usage_apps_summary" msgid="7168292864155527974">"{count,plural, =1{1 appli a utilisé la mémoire depuis {time}}one{# appli a utilisé la mémoire depuis {time}}other{# applis ont utilisé la mémoire depuis {time}}}"</string>
<string name="force_enable_pss_profiling_title" msgid="2253816522775341523">"Activer le profilage d\'util. de la mém."</string>
<string name="force_enable_pss_profiling_summary" msgid="7714294324548399136">"Le profilage d\'utilisation de la mémoire nécessite des ressources système additionnelles."</string>
<string name="pss_profiling_disabled" msgid="1967278421143514850">"Profilage de la mémoire désactivé"</string>
@@ -4012,51 +4057,51 @@
<string name="memory_maximum_usage" msgid="2047013391595835607">"Utilisation maximale"</string>
<string name="no_data_usage" msgid="4665617440434654132">"Aucune donnée utilisée"</string>
<string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"Autoriser l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"L\'application disposera d\'une autorisation d\'activation ou de désactivation du mode Ne pas déranger et de modification des paramètres associés."</string>
+ <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"L\'appli disposera d\'une autorisation d\'activation ou de désactivation du mode Ne pas déranger et de modification des paramètres associés."</string>
<string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Cette fonction doit rester activée, car l\'accès aux notifications est activé"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Révoquer l\'accès au mode Ne pas déranger pour <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Toutes les règles Ne pas déranger créées par cette application seront supprimées."</string>
+ <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Toutes les règles Ne pas déranger créées par cette appli seront supprimées."</string>
<string name="ignore_optimizations_on" msgid="6865583039303804932">"Ne pas optimiser"</string>
<string name="ignore_optimizations_off" msgid="9186557038453586295">"Optimiser"</string>
- <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Cela peut épuiser la pile de votre appareil plus rapidement. L\'application pourra maintenant utiliser la pile en arrière-plan."</string>
+ <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Cela peut épuiser la pile de votre appareil plus rapidement. L\'appli pourra maintenant utiliser la pile en arrière-plan."</string>
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Recommandé pour une meilleure autonomie de la pile"</string>
<string name="app_list_preference_none" msgid="1635406344616653756">"Aucune"</string>
- <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Désactiver l\'accès aux données d\'utilisation pour cette application n\'empêchera pas votre administrateur d\'effectuer le suivi de la consommation des données pour les applications de votre profil professionnel"</string>
+ <string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Désactiver l\'accès aux données d\'utilisation pour cette appli n\'empêchera pas votre administrateur d\'effectuer le suivi de la consommation des données pour les applis de votre profil professionnel"</string>
<string name="draw_overlay" msgid="7902083260500573027">"Afficher par-dessus autres applis"</string>
- <string name="system_alert_window_settings" msgid="6458633954424862521">"Afficher par-dessus les autres applications"</string>
- <string name="permit_draw_overlay" msgid="4468994037192804075">"Autoriser la superposition d\'applications"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"Autorisez cette application à s\'afficher par-dessus les autres que vous utilisez. Cette application pourra voir où vous touchez et modifier ce qui est affiché sur l\'écran."</string>
+ <string name="system_alert_window_settings" msgid="6458633954424862521">"Afficher par-dessus les autres applis"</string>
+ <string name="permit_draw_overlay" msgid="4468994037192804075">"Autoriser la superposition d\'applis"</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"Autorisez cette appli à s\'afficher par-dessus les autres que vous utilisez. Cette appli pourra voir où vous touchez et modifier ce qui est affiché sur l\'écran."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"Modifier la sortie multimédia"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"Autoriser l\'appli à changer la sortie média"</string>
- <string name="allow_media_routing_description" msgid="8343709701298051207">"Autorisez cette application à choisir l\'appareil connecté qui lit les fichiers audio ou vidéo provenant d\'autres applications. Si elle est autorisée, cette application peut accéder à une liste de périphériques disponibles, tels que des écouteurs et des haut-parleurs, et choisir le périphérique de sortie utilisé pour diffuser du contenu audio ou vidéo."</string>
+ <string name="allow_media_routing_description" msgid="8343709701298051207">"Autorisez cette appli à choisir l\'appareil connecté qui lit les fichiers audio ou vidéo provenant d\'autres applis. Si elle est autorisée, cette appli peut accéder à une liste de périphériques disponibles, tels que des écouteurs et des haut-parleurs, et choisir le périphérique de sortie utilisé pour diffuser du contenu audio ou vidéo."</string>
<string name="manage_external_storage_title" msgid="8024521099838816100">"Accès à tous les fichiers"</string>
<string name="permit_manage_external_storage" msgid="6928847280689401761">"Autorisez l\'accès pour gérer tous les fichiers"</string>
- <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Autoriser cette application à lire, à modifier et à supprimer tous les fichiers qui se trouvent sur cet appareil ou sur des volumes de stockage connectés. Si vous accordez cette autorisation, l\'application pourra accéder à des fichiers sans que vous le sachiez."</string>
+ <string name="allow_manage_external_storage_description" msgid="5707948153603253225">"Autoriser cette appli à lire, à modifier et à supprimer tous les fichiers qui se trouvent sur cet appareil ou sur des volumes de stockage connectés. Si vous accordez cette autorisation, l\'appli pourra accéder à des fichiers sans que vous le sachiez."</string>
<string name="filter_manage_external_storage" msgid="6751640571715343804">"Peuvent accéder à tous les fichiers"</string>
<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="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 application peut modifier ou supprimer des fichiers multimédias créés à l\'aide d\'autres applications sans vous le demander. L\'application doit avoir l\'autorisation d\'accéder aux fichiers et aux fichiers multimédias."</string>
- <string name="keywords_media_management_apps" msgid="7499959607583088690">"éléments multimédias, fichier, gestion, gestionnaire, gérer, modifier, éditeur, appli, application, programme"</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>
+ <string name="keywords_media_management_apps" msgid="7499959607583088690">"éléments multimédias, fichier, gestion, gestionnaire, gérer, modifier, éditeur, appli, appli, programme"</string>
<string name="keywords_vr_listener" msgid="902737490270081131">"vr réalité virtuelle écouteur service de soutien stéréo"</string>
<string name="overlay_settings" msgid="2030836934139139469">"Afficher par-dessus autres applis"</string>
- <string name="filter_overlay_apps" msgid="2483998217116789206">"Applications dotées de l\'autorisation"</string>
- <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Autorisées"</string>
- <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Non autorisé"</string>
- <string name="keywords_install_other_apps" msgid="563895867658775580">"installer des applications provenant de sources inconnues"</string>
+ <string name="filter_overlay_apps" msgid="2483998217116789206">"Applis dotées de l\'autorisation"</string>
+ <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Autorisée"</string>
+ <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Non autorisée"</string>
+ <string name="keywords_install_other_apps" msgid="563895867658775580">"installer des applis provenant de sources inconnues"</string>
<string name="write_settings" msgid="6864794401614425894">"Modifier paramètres système"</string>
<string name="keywords_write_settings" msgid="6908708078855507813">"écrire des modifications aux paramètres du système"</string>
- <string name="filter_install_sources_apps" msgid="6930762738519588431">"Peut installer d\'autres applications"</string>
+ <string name="filter_install_sources_apps" msgid="6930762738519588431">"Peut installer d\'autres applis"</string>
<string name="filter_write_settings_apps" msgid="4754994984909024093">"Peut modifier les paramètres du système"</string>
<string name="write_settings_title" msgid="3011034187823288557">"Peut modifier les paramètres du système"</string>
<string name="write_system_settings" msgid="5555707701419757421">"Modifier paramètres système"</string>
<string name="permit_write_settings" msgid="3113056800709924871">"Autoriser la modification des paramètres du système"</string>
- <string name="write_settings_description" msgid="1474881759793261146">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
+ <string name="write_settings_description" msgid="1474881759793261146">"Cette autorisation permet à une appli de modifier les paramètres du système."</string>
<string name="external_source_switch_title" msgid="101571983954849473">"Autoriser à partir de cette source"</string>
<string name="camera_gesture_title" msgid="5559439253128696180">"Pivot. poignet deux fois pour app. photo"</string>
- <string name="camera_gesture_desc" msgid="7557645057320805328">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
+ <string name="camera_gesture_desc" msgid="7557645057320805328">"Ouvrez l\'appli de l\'appareil photo en pivotant votre poignet deux fois"</string>
<string name="screen_zoom_title" msgid="6928045302654960559">"Taille d\'affichage"</string>
<string name="screen_zoom_short_summary" msgid="756254364808639194">"Rendez tout plus grand ou plus petit"</string>
<string name="screen_zoom_keywords" msgid="5964023524422386592">"densité d\'affichage, zoom de l\'écran, échelle, mise à l\'échelle"</string>
@@ -4065,7 +4110,7 @@
<string name="screen_zoom_make_larger_desc" msgid="7268794713428853139">"Agrandir"</string>
<string name="disconnected" msgid="3469373726996129247">"Non connecté"</string>
<string name="keyboard_disconnected" msgid="796053864561894531">"Non connecté"</string>
- <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> applications installées"</string>
+ <string name="apps_summary" msgid="4007416751775414252">"<xliff:g id="COUNT">%1$d</xliff:g> applis installées"</string>
<string name="storage_summary" msgid="5903562203143572768">"Utilisé : <xliff:g id="PERCENTAGE">%1$s</xliff:g>; libre : <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="1599453894989339454">"Thème sombre, taille de la police, luminosité"</string>
<string name="memory_summary" msgid="8221954450951651735">"Mémoire utilisée en moyenne : <xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
@@ -4078,17 +4123,17 @@
<string name="disabled_by_policy_title_sms" msgid="8951840850778406831">"Impossible d\'envoyer des messages texte"</string>
<string name="disabled_by_policy_title_camera" msgid="6616508876399613773">"Impossible d\'utiliser l\'appareil photo"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="6085100101044105811">"Impossible de faire des captures d\'écran"</string>
- <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossible d\'ouvrir cette application"</string>
+ <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossible d\'ouvrir cette appli"</string>
<string name="disabled_by_policy_title_financed_device" msgid="2328740314082888228">"Bloqué par votre fournisseur de crédit"</string>
<string name="disabled_by_policy_title_biometric_parental_consent" msgid="2463673997797134678">"Consentement parental requis"</string>
<string name="disabled_by_policy_content_biometric_parental_consent" msgid="7124116806784305206">"Remettez le téléphone à votre parent pour commencer la configuration de ce paramètre"</string>
<string name="disabled_by_policy_parental_consent" msgid="9166060049019018978">"Remettez le téléphone à votre parent pour qu\'il autorise la modification de ce paramètre."</string>
<string name="default_admin_support_msg" msgid="8816296554831532033">"Pour en savoir plus, communiquez avec votre administrateur informatique"</string>
<string name="admin_support_more_info" msgid="8407433155725898290">"Détails supplémentaires"</string>
- <string name="admin_profile_owner_message" msgid="8860709969532649195">"Votre administrateur peut surveiller et gérer les applications et les données associées à votre profil professionnel, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
- <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Votre administrateur peut surveiller et gérer les applications et les données associées à cet utilisateur, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
- <string name="admin_device_owner_message" msgid="5503131744126520590">"Votre administrateur peut surveiller et gérer les applications et les données associées à cet appareil, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
- <string name="admin_financed_message" msgid="1156197630834947884">"Votre administrateur d\'appareil pourrait être en mesure d\'accéder aux données associées à cet appareil, de modifier ses paramètres et de gérer des applications."</string>
+ <string name="admin_profile_owner_message" msgid="8860709969532649195">"Votre administrateur peut surveiller et gérer les applis et les données associées à votre profil professionnel, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
+ <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Votre administrateur peut surveiller et gérer les applis et les données associées à cet utilisateur, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
+ <string name="admin_device_owner_message" msgid="5503131744126520590">"Votre administrateur peut surveiller et gérer les applis et les données associées à cet appareil, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
+ <string name="admin_financed_message" msgid="1156197630834947884">"Votre administrateur d\'appareil pourrait être en mesure d\'accéder aux données associées à cet appareil, de modifier ses paramètres et de gérer des applis."</string>
<string name="condition_turn_off" msgid="402707350778441939">"Désactiver"</string>
<string name="condition_turn_on" msgid="3911077299444314791">"Activer"</string>
<string name="condition_expand_show" msgid="1501084007540953213">"Afficher"</string>
@@ -4106,7 +4151,7 @@
<string name="condition_bg_data_title" msgid="2719263664589753094">"Économiseur de données"</string>
<string name="condition_bg_data_summary" msgid="1736255283216193834">"Fonctionnalités restreintes"</string>
<string name="condition_work_title" msgid="174326145616998813">"Profil professionnel désactivé"</string>
- <string name="condition_work_summary" msgid="7113473121312772398">"Pour les applications et les notifications"</string>
+ <string name="condition_work_summary" msgid="7113473121312772398">"Pour les applis et les notifications"</string>
<string name="condition_device_muted_action_turn_on_sound" msgid="4078406807327674934">"Activer le son"</string>
<string name="condition_device_muted_title" msgid="2446306263428466378">"Sonnerie désactivée"</string>
<string name="condition_device_muted_summary" msgid="3772178424510397327">"Pour les appels et les notifications"</string>
@@ -4127,7 +4172,7 @@
<string name="ota_disable_automatic_update_summary" msgid="7803279951533276841">"Appliquer les mises à jour au redémarrage de l\'appareil"</string>
<string name="usage" msgid="287782903846013936">"Utilisation"</string>
<string name="cellular_data_usage" msgid="5874156338825285334">"Utilisation de données cellulaires"</string>
- <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilisation des données des applications"</string>
+ <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilisation des données des applis"</string>
<string name="wifi_data_usage" msgid="6868503699134605707">"Utilisation des données Wi-Fi"</string>
<string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilisation de données sur un réseau non cellulaire"</string>
<string name="ethernet_data_usage" msgid="4552227880905679761">"Utilisation de données Ethernet"</string>
@@ -4149,9 +4194,9 @@
<string name="data_warning_footnote" msgid="5991901765915710592">"C\'est votre appareil qui mesure l\'utilisation des données pour les limites et les avertissements. Ces mesures peuvent différer de celles de votre fournisseur de services."</string>
<string name="set_data_limit" msgid="9010326815874642680">"Définir limite consomm. données"</string>
<string name="data_limit" msgid="8731731657513652363">"Limite de données"</string>
- <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés pour la période : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+ <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> utilisées pour la période suivante : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="configure" msgid="1499586749829665889">"Configurer"</string>
- <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applications incluses dans l\'utilisation"</string>
+ <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applis incluses dans l\'utilisation"</string>
<string name="data_saver_unrestricted_summary" msgid="559673440849071149">"{count,plural, =1{1 appli est autorisée à utiliser les données cellulaires sans restrictions lorsque la fonction Économiseur de données est activée}one{# appli est autorisée à utiliser les données cellulaires sans restrictions lorsque la fonction Économiseur de données est activée}other{# applis sont autorisées à utiliser les données cellulaires sans restrictions lorsque la fonction Économiseur de données est activée}}"</string>
<string name="data_usage_title" msgid="4039024073687469094">"Données primaires"</string>
<string name="data_usage_wifi_title" msgid="1060495519280456926">"Données Wi-Fi"</string>
@@ -4176,7 +4221,7 @@
<string name="data_saver_switch_title" msgid="7111538580123722959">"Utiliser l\'Économiseur de données"</string>
<string name="unrestricted_app_title" msgid="8531936851059106374">"Utilisation de données cellulaires sans restrictions"</string>
<string name="unrestricted_app_summary" msgid="8320813971858627624">"Autoriser l\'accès aux données cellulaires sans restrictions lorsque l\'Économiseur de données est activé"</string>
- <string name="home_app" msgid="6056850504746902747">"Application d\'accueil"</string>
+ <string name="home_app" msgid="6056850504746902747">"Appli d\'accueil"</string>
<string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Ajouter une empreinte digitale"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Déverrouiller avec un autre doigt"</string>
<string name="battery_saver_on_summary" msgid="4605146593966255848">"Activée"</string>
@@ -4233,7 +4278,7 @@
<string name="notification_log_details_ranking_null" msgid="6607596177723101524">"L\'objet de classement est manquant."</string>
<string name="notification_log_details_ranking_none" msgid="2484105338466675261">"L\'objet de classement ne contient pas cette touche."</string>
<string name="display_cutout_emulation" msgid="1421648375408281244">"Encoche de l\'écran"</string>
- <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"découpe d\'affichage, encoche"</string>
+ <string name="display_cutout_emulation_keywords" msgid="4506580703807358127">"encoche de l\'écran, encoche"</string>
<string name="overlay_option_device_default" msgid="7986355499809313848">"Valeurs par défaut de l\'appareil"</string>
<string name="overlay_toast_failed_to_apply" msgid="4839587811338164960">"Impossible d\'appliquer la superposition"</string>
<string name="special_access" msgid="1767980727423395147">"Accès spécial des applis"</string>
@@ -4241,7 +4286,7 @@
<string name="long_background_tasks_label" msgid="3169590134850226687">"Longues tâches en arrière-plan"</string>
<string name="long_background_tasks_switch_title" msgid="2491623894899492543">"Autoriser les longues tâches en arrière-plan"</string>
<string name="long_background_tasks_title" msgid="3272230637974707490">"Longues tâches en arrière-plan"</string>
- <string name="long_background_tasks_footer_title" msgid="9117342254914743097">"Autoriser cette application à exécuter de longues tâches en arrière-plan. Ceci permet à cette application d\'exécuter des tâches qui pourraient prendre plus que quelques minutes, comme des téléchargements ou des téléversements. \n\nSi cette autorisation est refusée, le système va limiter le temps pendant lequel l\'application peut effectuer ces tâches en arrière-plan."</string>
+ <string name="long_background_tasks_footer_title" msgid="9117342254914743097">"Autoriser cette appli à exécuter de longues tâches en arrière-plan. Ceci permet à cette appli d\'exécuter des tâches qui pourraient prendre plus que quelques minutes, comme des téléchargements ou des téléversements. \n\nSi cette autorisation est refusée, le système va limiter le temps pendant lequel l\'appli peut effectuer ces tâches en arrière-plan."</string>
<string name="keywords_long_background_tasks" msgid="5788956269136054574">"longues tâches, transfert de données, tâches en arrière-plan"</string>
<string name="reset_shortcut_manager_throttling" msgid="2183940254903144298">"Réinitialiser la limitation de fréquence ShortcutManager"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"La limitation de fréquence ShortcutManager a été réinitialisée"</string>
@@ -4250,7 +4295,7 @@
<string name="page_tab_title_support" msgid="3235725053332345773">"Astuces et assistance"</string>
<string name="developer_smallest_width" msgid="632354817870920911">"La plus petite largeur"</string>
<string name="premium_sms_none" msgid="4718916765158062108">"Aucune appli installée n\'a demandé l\'accès aux messages texte payants"</string>
- <string name="premium_sms_warning" msgid="2192300872411073324">"Les textos de cette catégorie peuvent être payants et s\'ajouter aux factures mensuelles de votre fournisseur de services. Si vous activez l\'autorisation pour une application, vous serez en mesure d\'envoyer des textos payants à l\'aide de cette dernière."</string>
+ <string name="premium_sms_warning" msgid="2192300872411073324">"Les textos de cette catégorie peuvent être payants et s\'ajouter aux factures mensuelles de votre fournisseur de services. Si vous activez l\'autorisation pour une appli, vous serez en mesure d\'envoyer des textos payants à l\'aide de cette dernière."</string>
<string name="premium_sms_access" msgid="8487315743197916530">"Messages texte payants"</string>
<string name="bluetooth_disabled" msgid="835838280837359514">"Désactivé"</string>
<string name="bluetooth_connected_summary" msgid="8043167194934315712">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -4265,14 +4310,14 @@
<string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Contribue à prolonger l\'autonomie de la pile"</string>
<string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Paramètres rapides, tuiles de développeur"</string>
<string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Désactiver le délai d\'expiration des autorisations adb"</string>
- <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Désactivez le retrait automatique des autorisations adb pour des systèmes qui ne se sont pas connectés ou qui n\'ont pas été configurés par l\'utilisateur dans le délai d\'expiration par défaut (respectivement, sept jours et un jour minimum)."</string>
+ <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Désactiver le retrait automatique des autorisations adb pour des systèmes qui ne se sont pas connectés ou qui n\'ont pas été configurés par l\'utilisateur dans le délai d\'expiration par défaut (respectivement, sept jours et un jour minimum)."</string>
<string name="sensors_off_quick_settings_title" msgid="8472151847125917167">"Capteurs désactivés"</string>
<string name="managed_profile_settings_title" msgid="3400923723423564217">"Paramètres du profil professionnel"</string>
- <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"Laissez les applications personnelles déterminer les contacts à l\'aide de l\'annuaire professionnel"</string>
+ <string name="managed_profile_contact_search_title" msgid="6562061740814513737">"Laissez les applis personnelles déterminer les contacts à l\'aide de l\'annuaire professionnel"</string>
<string name="managed_profile_contact_search_summary" msgid="4974727886709219105">"Les recherches et les appels entrants peuvent être visibles pour votre administrateur informatique"</string>
<string name="cross_profile_calendar_title" msgid="7570277841490216947">"Agenda multi-profil"</string>
<string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Afficher les événements professionnels dans l\'agenda personnel"</string>
- <string name="managed_profile_settings_footer" msgid="996500759305118103">"Lorsque les applications professionnelles sont désactivées, elles sont mises en pause et ne peuvent ni être consultées ni envoyer de notifications"</string>
+ <string name="managed_profile_settings_footer" msgid="996500759305118103">"Lorsque les applis professionnelles sont désactivées, elles sont mises en pause et ne peuvent ni être consultées ni envoyer de notifications"</string>
<string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gérer l\'espace de stockage"</string>
<string name="automatic_storage_manager_text" msgid="6900593059927987273">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
<string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Supprimer les photos et les vidéos"</string>
@@ -4285,7 +4330,7 @@
<string name="double_twist_for_camera_mode_summary" msgid="592503740044744951"></string>
<string name="system_navigation_title" msgid="4890381153527184636">"Mode de navigation"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navigation à deux boutons"</string>
- <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Pour changer d\'application, balayez un doigt vers le haut sur la touche d\'accueil. Pour voir toutes les applications, balayez vers le haut de nouveau. Pour revenir, touchez le bouton Précédent."</string>
+ <string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Pour changer d\'appli, balayez un doigt vers le haut sur la touche d\'accueil. Pour voir toutes les applis, balayez vers le haut de nouveau. Pour revenir, touchez le bouton Précédent."</string>
<string name="emergency_settings_preference_title" msgid="6183455153241187148">"Sécurité et urgence"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Appel d\'urgence, infos médicales, alertes"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navigation par gestes"</string>
@@ -4298,7 +4343,7 @@
<string name="assistant_corner_gesture_title" msgid="1895061522687002106">"Balayer l\'écran pour appeler l\'assistant"</string>
<string name="assistant_corner_gesture_summary" msgid="5012534700233017955">"Pour lancer l\'appli de l\'assistant numérique, balayez l\'écran vers le haut à partir d\'un coin inférieur"</string>
<string name="assistant_long_press_home_gesture_title" msgid="4865972278738178753">"Maintenir le doigt sur Accueil pour utiliser l\'Assistant"</string>
- <string name="assistant_long_press_home_gesture_summary" msgid="592882226105081447">"Maintenez la touche d\'accueil enfoncée pour invoquer l\'application d\'assistant numérique."</string>
+ <string name="assistant_long_press_home_gesture_summary" msgid="592882226105081447">"Maintenez la touche d\'accueil enfoncée pour invoquer l\'appli d\'assistant numérique."</string>
<string name="low_label" msgid="6525629096999711220">"Faible"</string>
<string name="high_label" msgid="357503396626018487">"Élevée"</string>
<string name="left_edge" msgid="1513576842959071849">"Bord gauche"</string>
@@ -4344,15 +4389,15 @@
<string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="168124660162907358">"Non disp. sur les appareils verrouillés par un f. de services"</string>
<string name="oem_lock_info_message" msgid="8843145669619429197">"Veuillez redémarrer l\'appareil pour activer la fonction de protection d\'appareil."</string>
<string name="automatic_storage_manager_freed_bytes" msgid="706230592123831676">"<xliff:g id="SIZE">%1$s</xliff:g> libéré(s) au total\n\n Dernière exécution : <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="web_action_enable_title" msgid="6654581786741216382">"Applications instantanées"</string>
- <string name="web_action_enable_summary" msgid="2658930257777545990">"Ouvrir les liens dans les applications, même si elles ne sont pas installées"</string>
- <string name="web_action_section_title" msgid="994717569424234098">"Applications instantanées"</string>
+ <string name="web_action_enable_title" msgid="6654581786741216382">"Applis instantanées"</string>
+ <string name="web_action_enable_summary" msgid="2658930257777545990">"Ouvrir les liens dans les applis, même si elles ne sont pas installées"</string>
+ <string name="web_action_section_title" msgid="994717569424234098">"Applis instantanées"</string>
<string name="instant_apps_settings" msgid="4280942494969957858">"Préf. applis instantanées"</string>
- <string name="domain_url_section_title" msgid="9028890472923474958">"Applications installées"</string>
+ <string name="domain_url_section_title" msgid="9028890472923474958">"Applis installées"</string>
<string name="automatic_storage_manager_activation_warning" msgid="170508173207142665">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
<string name="account_for_section_header" msgid="7466759342105251096">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="auto_sync_account_title" msgid="1070908045600374254">"Synchroniser automatiquement les données des applications"</string>
- <string name="auto_sync_account_summary" msgid="7580352130028957346">"Autoriser les applications à actualiser les données automatiquement"</string>
+ <string name="auto_sync_account_title" msgid="1070908045600374254">"Synchroniser automatiquement les données des applis"</string>
+ <string name="auto_sync_account_summary" msgid="7580352130028957346">"Autoriser les applis à actualiser les données automatiquement"</string>
<string name="account_sync_title" msgid="7036067017433297574">"Synchro du compte"</string>
<string name="account_sync_summary_some_on" msgid="911460286297968724">"La synchronisation est activée pour <xliff:g id="ID_1">%1$d</xliff:g> élément(s) sur <xliff:g id="ID_2">%2$d</xliff:g>"</string>
<string name="account_sync_summary_all_on" msgid="2953682111836599841">"La synchronisation est activée pour tous les éléments"</string>
@@ -4365,20 +4410,20 @@
<string name="enterprise_privacy_exposure_changes_category" msgid="5459989751333816587">"Modifications apportées par l\'administrateur de votre organisation"</string>
<string name="enterprise_privacy_device_access_category" msgid="140157499478630004">"Votre accès à cet appareil"</string>
<string name="enterprise_privacy_enterprise_data" msgid="3963070078195245028">"Les données associées à votre compte professionnel, comme les courriels et l\'agenda"</string>
- <string name="enterprise_privacy_installed_packages" msgid="6707006112254572820">"Liste des applications installées sur votre appareil"</string>
- <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Temps passé et quantité de données utilisée pour chaque application"</string>
+ <string name="enterprise_privacy_installed_packages" msgid="6707006112254572820">"Liste des applis installées sur votre appareil"</string>
+ <string name="enterprise_privacy_usage_stats" msgid="6328506963853465534">"Temps passé et quantité de données utilisée pour chaque appli"</string>
<string name="enterprise_privacy_network_logs" msgid="3081744541193695887">"Journal de trafic réseau le plus récent"</string>
<string name="enterprise_privacy_bug_reports" msgid="2635897583413134123">"Rapport de bogue le plus récent"</string>
<string name="enterprise_privacy_security_logs" msgid="8494681624247959075">"Journal de sécurité le plus récent"</string>
<string name="enterprise_privacy_none" msgid="6026527690979756431">"Aucune"</string>
- <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Applications installées"</string>
- <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applications est estimé. Il peut exclure les applications installées à partir d\'une source autre que la boutique Google Play Store."</string>
- <string name="enterprise_privacy_number_packages_lower_bound" msgid="5317634640873658149">"{count,plural, =1{Minimum de # application}one{Minimum de # application}other{Minimum de # applications}}"</string>
+ <string name="enterprise_privacy_enterprise_installed_packages" msgid="9114143640515900082">"Applis installées"</string>
+ <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applis est estimé. Il peut exclure les applis installées à partir d\'une source autre que la boutique Google Play Store."</string>
+ <string name="enterprise_privacy_number_packages_lower_bound" msgid="5317634640873658149">"{count,plural, =1{Minimum de # appli}one{Minimum de # appli}other{Minimum de # applis}}"</string>
<string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorisations de localisation"</string>
<string name="enterprise_privacy_microphone_access" msgid="7242958026470143653">"Autorisations du microphone"</string>
<string name="enterprise_privacy_camera_access" msgid="7685460535880069016">"Autorisations de l\'appareil photo"</string>
- <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applications par défaut"</string>
- <string name="enterprise_privacy_number_packages" msgid="5294444005035188274">"{count,plural, =1{# application}one{# application}other{# applications}}"</string>
+ <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applis par défaut"</string>
+ <string name="enterprise_privacy_number_packages" msgid="5294444005035188274">"{count,plural, =1{# appli}one{# appli}other{# applis}}"</string>
<string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Clavier par défaut"</string>
<string name="enterprise_privacy_input_method_name" msgid="2974859490559054584">"Valeur définie : <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
<string name="enterprise_privacy_always_on_vpn_device" msgid="1735829327405126695">"Le RPV permanent est activé"</string>
@@ -4404,7 +4449,7 @@
<string name="financed_privacy_settings" msgid="2575114436197204145">"Renseignements sur l\'appareil financé"</string>
<string name="financed_privacy_intro" msgid="7836497475568741579">"Votre fournisseur de crédit peut modifier des paramètres et installer des logiciels sur cet appareil pendant la configuration.\n\nSi vous manquez un paiement, votre fournisseur de crédit peut verrouiller votre appareil et en modifier les paramètres.\n\nPour en savoir plus, communiquez avec votre fournisseur de crédit."</string>
<string name="financed_privacy_restrictions_category" msgid="2472659467919651602">"Si votre appareil est financé, vous ne pouvez pas :"</string>
- <string name="financed_privacy_install_apps" msgid="7381718005710210851">"Installer des applications ne provenant pas de Play Store"</string>
+ <string name="financed_privacy_install_apps" msgid="7381718005710210851">"Installer des applis ne provenant pas de Play Store"</string>
<string name="financed_privacy_safe_mode" msgid="5362149445732602578">"Redémarrer votre appareil en mode sans échec"</string>
<string name="financed_privacy_multi_users" msgid="1727194928477613081">"Ajouter plusieurs utilisateurs à votre appareil"</string>
<string name="financed_privacy_config_date_time" msgid="8567370445374984365">"Modifier la date, l\'heure et les fuseaux horaires"</string>
@@ -4417,17 +4462,17 @@
<string name="financed_privacy_system_info" msgid="4158031444108708927">"Afficher les données système telles que la date, l\'heure, l\'état du réseau et l\'état de la pile"</string>
<string name="financed_privacy_turn_on_off_device" msgid="3331566753152790571">"Activer ou désactiver votre appareil"</string>
<string name="financed_privacy_notifications" msgid="5932303271274089968">"Afficher les notifications et les messages texte"</string>
- <string name="financed_privacy_allowlisted_apps" msgid="8333040812194879963">"Accéder aux applications autorisées par le fournisseur de crédit"</string>
+ <string name="financed_privacy_allowlisted_apps" msgid="8333040812194879963">"Accéder aux applis autorisées par le fournisseur de crédit"</string>
<string name="financed_privacy_fully_paid_category" msgid="9221763928564246923">"Une fois que vous avez payé le montant total :"</string>
<string name="financed_privacy_restrictions_removed" msgid="3182636815294595072">"Toutes les restrictions sont retirées de l\'appareil"</string>
<string name="financed_privacy_uninstall_creditor_app" msgid="6339004120497310705">"Vous pouvez désinstaller l\'appli du fournisseur de crédit"</string>
<string name="financed_device_info" msgid="3871860346697308342">"Renseignements sur l\'appareil financé"</string>
- <string name="default_camera_app_title" msgid="6546248868519965998">"{count,plural, =1{Application Appareil photo}one{Application Appareil photo}other{Applications Appareil photo}}"</string>
- <string name="default_calendar_app_title" msgid="1870095225089706093">"Application d\'agenda"</string>
- <string name="default_contacts_app_title" msgid="7740028900741944569">"Application de contacts"</string>
- <string name="default_email_app_title" msgid="5411280873093244250">"{count,plural, =1{Application de client de messagerie}one{Application de client de messagerie}other{Applications de client de messagerie}}"</string>
- <string name="default_map_app_title" msgid="7569231732944853320">"Application de carte"</string>
- <string name="default_phone_app_title" msgid="795025972645464135">"{count,plural, =1{Application Téléphone}one{Application Téléphone}other{Applications Téléphone}}"</string>
+ <string name="default_camera_app_title" msgid="6546248868519965998">"{count,plural, =1{Appli Appareil photo}one{Appli Appareil photo}other{Applis Appareil photo}}"</string>
+ <string name="default_calendar_app_title" msgid="1870095225089706093">"Appli d\'agenda"</string>
+ <string name="default_contacts_app_title" msgid="7740028900741944569">"Appli de contacts"</string>
+ <string name="default_email_app_title" msgid="5411280873093244250">"{count,plural, =1{Appli de client de messagerie}one{Appli de client de messagerie}other{Applis de client de messagerie}}"</string>
+ <string name="default_map_app_title" msgid="7569231732944853320">"Appli de carte"</string>
+ <string name="default_phone_app_title" msgid="795025972645464135">"{count,plural, =1{Appli Téléphone}one{Appli Téléphone}other{Applis Téléphone}}"</string>
<string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g> et <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
<string name="app_names_concatenation_template_3" msgid="7019703249717854148">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g> et <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
<string name="storage_default_internal_storage" msgid="4055660218818688131">"Cet appareil"</string>
@@ -4438,7 +4483,7 @@
<string name="storage_audio" msgid="5994664984472140386">"Audio"</string>
<string name="storage_documents" msgid="7873134307844320096">"Documents"</string>
<string name="storage_other" msgid="7922190148479988838">"Autre"</string>
- <string name="storage_apps" msgid="3564291603258795216">"Applications"</string>
+ <string name="storage_apps" msgid="3564291603258795216">"Applis"</string>
<string name="storage_system" msgid="8472410119822911844">"Système"</string>
<string name="storage_os_name" msgid="4637680493234672410">"Android <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="storage_temporary_files" msgid="8254109904032452219">"Fichiers système temporaires"</string>
@@ -4449,13 +4494,13 @@
<string name="storage_trash_dialog_confirm" msgid="1707723334982760436">"Vider la corbeille"</string>
<string name="storage_usage_summary" msgid="4591121727356723463">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g> utilisés"</string>
<string name="storage_total_summary" msgid="7163360249534964272">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g> au total"</string>
- <string name="clear_instant_app_data" msgid="5951258323364386357">"Effacer les données de l\'application"</string>
- <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Voulez-vous supprimer cette application instantanée?"</string>
+ <string name="clear_instant_app_data" msgid="5951258323364386357">"Effacer les données de l\'appli"</string>
+ <string name="clear_instant_app_confirmation" msgid="3964731334459209482">"Voulez-vous supprimer cette appli instantanée?"</string>
<string name="launch_instant_app" msgid="8503927414339606561">"Ouvrir"</string>
<string name="game_storage_settings" msgid="2521393115726178837">"Jeux"</string>
<string name="app_info_storage_title" msgid="4076977173803093808">"Espace utilisé"</string>
<string name="webview_uninstalled_for_user" msgid="627352948986275488">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
- <string name="webview_disabled_for_user" msgid="5809886172032644498">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
+ <string name="webview_disabled_for_user" msgid="5809886172032644498">"(désactivé pour <xliff:g id="USER">%s</xliff:g>)"</string>
<string name="autofill_app" msgid="7595308061826307921">"Service de remplissage auto"</string>
<string name="default_autofill_app" msgid="372234803718251606">"Service de remplissage automatique par défaut"</string>
<string name="autofill_passwords" msgid="6708057251459761083">"Mots de passe"</string>
@@ -4468,7 +4513,7 @@
<string name="credman_button_change" msgid="4072629639218503790">"Modifier"</string>
<string name="credman_button_open" msgid="7519871964170816850">"Ouvrir"</string>
<string name="credman_app_list_preference_none" msgid="2509646651254971448">"Aucun élément sélectionné"</string>
- <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assurez-vous de faire confiance à cette application</b> <br/> <br/> <xliff:g id=app_name example=Google Remplissage automatique>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
+ <string name="autofill_confirmation_message" msgid="4888767934273494272">"<b>Assurez-vous de faire confiance à cette appli</b> <br/> <br/> <xliff:g id=app_name example=Google Remplissage automatique>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
<string name="credman_autofill_confirmation_message" msgid="843829628024668466">"<b>Use <xliff:g id=app_name example=Provider>%1$s</xliff:g>?</b> <br/> <br/> Les nouveaux mots de passe, clés d\'accès et autres renseignements seront désormais enregistrés ici. <xliff:g id=app_name example=Provider>%1$s</xliff:g> peut utiliser ce qui se trouve à l\'écran pour déterminer les données qui peuvent être remplies automatiquement."</string>
<string name="credman_picker_title" msgid="8442086614222006564">"Fourn. de serv. préf. pour mots de passe, clés d\'accès et remp. aut."</string>
<string name="credman_confirmation_message_title" msgid="8847900085593880729">"Désactiver %1$s?"</string>
@@ -4505,21 +4550,21 @@
<string name="default_theme" msgid="4815428567082263639">"Par défaut"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"Nom du réseau"</string>
<string name="show_operator_name_summary" msgid="5352696579216501773">"Afficher le nom du réseau dans la barre d\'état"</string>
- <string name="install_type_instant" msgid="7685381859060486009">"Application instantanée"</string>
+ <string name="install_type_instant" msgid="7685381859060486009">"Appli instantanée"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"Désactiver le gestionnaire de stockage?"</string>
<string name="zen_suggestion_title" msgid="4555260320474465668">"Mettre à jour les paramètres du mode Ne pas déranger"</string>
<string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentré"</string>
<string name="disabled_feature" msgid="7151433782819744211">"Cette fonctionnalité n\'est pas accessible"</string>
<string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Cette fonctionnalité a été désactivée, car elle ralentit votre téléphone"</string>
<string name="show_first_crash_dialog" msgid="1696584857732637389">"Toujours afficher la fenêtre de plantage"</string>
- <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Afficher la fenêtre chaque fois qu\'une application plante"</string>
- <string name="angle_enabled_app" msgid="6044941043384239076">"Sélectionnez l\'application compatible avec ANGLE"</string>
- <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"Aucune application compatible avec ANGLE n\'a été définie"</string>
- <string name="angle_enabled_app_set" msgid="7811829383833353021">"Application compatible avec ANGLE : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+ <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Afficher la fenêtre chaque fois qu\'une appli plante"</string>
+ <string name="angle_enabled_app" msgid="6044941043384239076">"Sélectionnez l\'appli compatible avec ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="4472572224881726067">"Aucune appli compatible avec ANGLE n\'a été définie"</string>
+ <string name="angle_enabled_app_set" msgid="7811829383833353021">"Appli compatible avec ANGLE : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="graphics_driver_dashboard_title" msgid="5661084817492587796">"Préférences du pilote graphique"</string>
<string name="graphics_driver_dashboard_summary" msgid="6348759885315793654">"Modifiez les paramètres du pilote graphique"</string>
- <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Lorsqu\'il y a de nombreux pilotes graphiques, vous pouvez choisir d\'utiliser le pilote graphique à jour pour les applications installées sur l\'appareil."</string>
- <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
+ <string name="graphics_driver_footer_text" msgid="5123754522284046790">"Lorsqu\'il y a de nombreux pilotes graphiques, vous pouvez choisir d\'utiliser le pilote graphique à jour pour les applis installées sur l\'appareil."</string>
+ <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applis"</string>
<string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
<string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
<string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote du jeu"</string>
@@ -4533,13 +4578,13 @@
<!-- no translation found for graphics_driver_app_preference_values:2 (5391218026495225599) -->
<!-- no translation found for graphics_driver_app_preference_values:3 (2586045835780389650) -->
<string name="enable_angle_as_system_driver" msgid="4648827560023949786">"Expérimental : Activer ANGLE"</string>
- <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"Avertissement : Activer ANGLE en tant que pilote OpenGL ES par défaut. Cette fonctionnalité est en cours de test et peut ne pas être compatible avec certaines applications vidéo et d\'appareils photo."</string>
+ <string name="enable_angle_as_system_driver_summary" msgid="2170215556348477481">"Avertissement : Activer ANGLE en tant que pilote OpenGL ES par défaut. Cette fonctionnalité est en cours de test et peut ne pas être compatible avec certaines applis vidéo et d\'appareils photo."</string>
<string name="reboot_dialog_enable_angle_as_system_driver" msgid="2619263039763150810">"Un redémarrage est nécessaire pour modifier le pilote OpenGL ES du système"</string>
<string name="platform_compat_dashboard_title" msgid="1323980546791790236">"Changements dans la compatibilité des applis"</string>
<string name="platform_compat_dashboard_summary" msgid="4036546607938791337">"Basculez les changements de compatibilité des applis"</string>
<string name="platform_compat_default_enabled_title" msgid="8973137337738388024">"Changements activés par défaut"</string>
<string name="platform_compat_default_disabled_title" msgid="3975847180953793602">"Changements désactivés par défaut"</string>
- <string name="platform_compat_dialog_text_no_apps" msgid="5715226015751055812">"Les modifications de compatibilité des applications peuvent uniquement être modifiées pour les applications débogables. Installez une application débogable, puis réessayez."</string>
+ <string name="platform_compat_dialog_text_no_apps" msgid="5715226015751055812">"Les modifications de compatibilité des applis peuvent uniquement être modifiées pour les applis débogables. Installez une appli débogable, puis réessayez."</string>
<string name="disabled_dependent_setting_summary" msgid="4508635725315852504">"Dépend d\'un autre paramètre"</string>
<string name="my_device_info_account_preference_title" msgid="9197139254007133175">"Compte"</string>
<string name="my_device_info_account_preference_summary" msgid="3510582677937510545">"%d comptes"</string>
@@ -4549,11 +4594,11 @@
<string name="my_device_info_device_details_category_title" msgid="4848438695638348680">"Détails de l\'appareil"</string>
<string name="my_device_info_device_identifiers_category_title" msgid="2197063484127704153">"Identifiants de l\'appareil"</string>
<string name="change_wifi_state_title" msgid="5629648102837821525">"Gestion du Wi-Fi"</string>
- <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Autoriser l\'application à gérer le Wi-Fi"</string>
- <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Autorisez cette application à activer ou à désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter et à supprimer des réseaux ou à créer un point d\'accès local uniquement"</string>
+ <string name="change_wifi_state_app_detail_switch" msgid="1385358508267180745">"Autoriser l\'appli à gérer le Wi-Fi"</string>
+ <string name="change_wifi_state_app_detail_summary" msgid="8230854855584217111">"Autorisez cette appli à activer ou à désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter et à supprimer des réseaux ou à créer un point d\'accès local uniquement"</string>
<string name="change_nfc_tag_apps_title" msgid="91514009058149617">"Lancer au moyen de la CCP"</string>
- <string name="change_nfc_tag_apps_detail_switch" msgid="240286205725043561">"Autoriser le lancement d\'applications lorsqu\'une balise CCP est détectée"</string>
- <string name="change_nfc_tag_apps_detail_summary" msgid="3338220223868942195">"Autorisez cette application à se lancer lorsqu\'une balise CCP est détectée.\nSi cette autorisation est activée, l\'application sera affichée comme option chaque fois qu\'une balise est détectée."</string>
+ <string name="change_nfc_tag_apps_detail_switch" msgid="240286205725043561">"Autoriser le lancement d\'applis lorsqu\'une balise CCP est détectée"</string>
+ <string name="change_nfc_tag_apps_detail_summary" msgid="3338220223868942195">"Autorisez cette appli à se lancer lorsqu\'une balise CCP est détectée.\nSi cette autorisation est activée, l\'appli sera affichée comme option chaque fois qu\'une balise est détectée."</string>
<string name="media_output_title" msgid="8283629315159510680">"Faire jouer les contenus multimédias sur"</string>
<string name="media_output_label_title" msgid="4139048973886819148">"Faire jouer <xliff:g id="LABEL">%s</xliff:g> sur"</string>
<string name="media_output_title_without_playing" msgid="3339321669132875821">"L\'audio jouera sur"</string>
@@ -4787,10 +4832,10 @@
<string name="wifi_warning_continue_button" msgid="8171574741789688214">"Effacer quand même"</string>
<string name="wifi_warning_return_button" msgid="6226063181583906340">"OK"</string>
<string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Se connecter à l’appareil"</string>
- <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour se connecter à votre appareil"</string>
+ <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'appli <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour se connecter à votre appareil"</string>
<string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Aucun appareil trouvé. Assurez-vous que l\'appareil est allumé et prêt à se connecter."</string>
<string name="network_connection_timeout_dialog_ok" msgid="6022675321823723755">"Réessayer"</string>
- <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Une erreur s\'est produite. L\'application a annulé la demande de sélection d\'un appareil."</string>
+ <string name="network_connection_errorstate_dialog_message" msgid="3360714322047603239">"Une erreur s\'est produite. L\'appli a annulé la demande de sélection d\'un appareil."</string>
<string name="network_connection_connect_successful" msgid="2587314077675642476">"Connexion réussie"</string>
<string name="network_connection_connect_failure" msgid="6803313816657494319">"Échec de connexion"</string>
<string name="network_connection_request_dialog_showall" msgid="6392059758456994944">"Tout afficher"</string>
@@ -4801,10 +4846,12 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Étui"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Pile"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panneau Paramètres"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forcer le mode bureau"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forcer le mode bureau expérimental sur les écrans secondaires"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Activer les fenêtres de forme libre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Activer la prise en charge des fenêtres de forme libre."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activer fenêtres de forme libre sur deuxième écran"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Activer les fenêtres de forme libre uniquement sur un écran secondaire."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activer éléments non redimensionnables en mode multi-fenêtre"</string>
- <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Activer les applications non redimensionnables en mode multi-fenêtre"</string>
+ <string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Activer les applis non redimensionnables en mode multi-fenêtre"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Forcer l\'activation du thème sombre forcé"</string>
<string name="hwui_force_dark_summary" msgid="6515748781487952769">"Forcer la fonctionnalité de thème sombre forcé à rester active"</string>
<string name="privacy_dashboard_title" msgid="6845403825611829558">"Confidentialité"</string>
@@ -4819,18 +4866,18 @@
<string name="copyable_slice_toast" msgid="1008251852798990606">"<xliff:g id="COPY_CONTENT">%1$s</xliff:g> copié dans le presse-papiers"</string>
<string name="search_bar_account_avatar_content_description" msgid="880523277036898350"></string>
<string name="accessibility_usage_title" msgid="9190967143518779145">"Usage des fonctions d\'accessibilité"</string>
- <string name="accessibility_usage_summary" msgid="4348285359995227813">"{count,plural, =1{1 application dispose d\'un accès complet à votre appareil}one{# application dispose d\'un accès complet à votre appareil}other{# applications disposent d\'un accès complet à votre appareil}}"</string>
+ <string name="accessibility_usage_summary" msgid="4348285359995227813">"{count,plural, =1{1 appli dispose d\'un accès complet à votre appareil}one{# appli dispose d\'un accès complet à votre appareil}other{# applis disposent d\'un accès complet à votre appareil}}"</string>
<string name="wfc_disclaimer_title_text" msgid="4617195934203523503">"Renseignements importants"</string>
<string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"CONTINUER"</string>
<string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"NON MERCI"</string>
<string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Lieu"</string>
<string name="wfc_disclaimer_location_desc_text" msgid="1417004513415772582">"Votre fournisseur de services peut collecter les données relatives à votre position lorsque vous utilisez ce service en lien avec les appels d\'urgence.\n\nConsultez la politique de confidentialité de votre fournisseur de services pour obtenir plus de détails."</string>
<string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"Vous risquez de perdre l\'accès au temps ou aux données restants. Communiquez avec votre fournisseur de services avant de procéder au retrait."</string>
- <string name="content_capture" msgid="868372905432812238">"Contenu de l\'application"</string>
- <string name="content_capture_summary" msgid="49720773699715531">"Autorisez les applications à envoyer du contenu au système Android"</string>
+ <string name="content_capture" msgid="868372905432812238">"Contenu de l\'appli"</string>
+ <string name="content_capture_summary" msgid="49720773699715531">"Autorisez les applis à envoyer du contenu au système Android"</string>
<string name="capture_system_heap_dump_title" msgid="9210974110606886455">"Capturer l\'empreinte de mémoire système"</string>
<string name="development_memtag_page_title" msgid="3546667618748029188">"Memory Tagging Extension"</string>
- <string name="development_memtag_intro" msgid="8032596625527637164">"L\'extension MTE (Memory Tagging Extension) facilite la détection des problèmes de sécurité de la mémoire dans votre application et rend plus sécuritaire son code natif."</string>
+ <string name="development_memtag_intro" msgid="8032596625527637164">"L\'extension MTE (Memory Tagging Extension) facilite la détection des problèmes de sécurité de la mémoire dans votre appli et rend plus sécuritaire son code natif."</string>
<string name="development_memtag_footer" msgid="5681925148773626562">"L\'activation de l\'extension MTE peut entraîner un ralentissement des performances de l\'appareil."</string>
<string name="development_memtag_learn_more" msgid="8961984806973926704">"En savoir plus sur l\'extension MTE"</string>
<string name="development_memtag_toggle" msgid="2474420239518386894">"Activer l\'extension MTE jusqu\'à ce que vous la désactiviez"</string>
@@ -4861,29 +4908,29 @@
<string name="enable_16k_pages" msgid="8001470927566110689">"Démarrer avec des pages de 16 Ko"</string>
<string name="enable_16k_pages_summary" msgid="1964363364670306912">"Démarrage par noyau compatible avec pages de 16 Ko"</string>
<string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"Passer du mode 4 ko au mode 16 ko"</string>
- <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Vous utilisez le mode agnostique de page qui exécute un noyau de 4 ko et vous passez au mode 16 ko. 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. Cette opération redémarrera l\'appareil. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applications peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez ensuite retourner en mode 4 ko et verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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."</string>
+ <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"Vous utilisez le mode agnostique de page qui exécute un noyau de 4 ko et vous passez au mode 16 ko. 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. Cette opération redémarrera l\'appareil. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applis peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez ensuite retourner en mode 4 ko et verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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."</string>
<string name="confirm_enable_4k_pages_title" msgid="3210360137887034659">"Passer du mode 16 Ko au mode 4 Ko"</string>
- <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Vous utilisez le mode agnostique de page qui exécute un noyau de 16 Ko et vous passez au mode 4 Ko. 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. Cette opération redémarrera l\'appareil. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applications peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez ensuite verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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."</string>
+ <string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"Vous utilisez le mode agnostique de page qui exécute un noyau de 16 Ko et vous passez au mode 4 Ko. 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. Cette opération redémarrera l\'appareil. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applis peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez ensuite verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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."</string>
<string name="toast_16k_update_failed_text" msgid="8888858987184345567">"Échec de la mise à jour vers un noyau compatible avec les pages de 16 Ko."</string>
<string name="progress_16k_ota_title" msgid="2117218313875523741">"Appliquer les modifications"</string>
<string name="confirm_format_ext4_title" msgid="6696191800594435577">"Reformater l\'appareil vers le système de fichiers ext4? (requis pour le mode 16 Ko)"</string>
- <string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partition de données de cet appareil doit être convertie en système de fichiers ext4 avant d\'utiliser l\'option de 16 Ko pour les développeurs. 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. L\'activation de l\'option de 16 Ko nécessitera ensuite un autre redémarrage. Une fois que vous êtes dans ce mode, vous pouvez basculer entre le mode 4 Ko et le mode 16 Ko avec un seul redémarrage. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applications peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez revenir en mode 4 Ko et ensuite verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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. L\'appareil sera nettoyé et le système de fichiers sera remplacé par le système de fichiers ext4 après la confirmation. Une fois cette opération terminée, revenez pour activer à nouveau l\'option de 16 Ko."</string>
+ <string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partition de données de cet appareil doit être convertie en système de fichiers ext4 avant d\'utiliser l\'option de 16 Ko pour les développeurs. 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. L\'activation de l\'option de 16 Ko nécessitera ensuite un autre redémarrage. Une fois que vous êtes dans ce mode, vous pouvez basculer entre le mode 4 Ko et le mode 16 Ko avec un seul redémarrage. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applis peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez revenir en mode 4 Ko et ensuite verrouiller le programme d\'amorçage, ce qui réinitialise l\'appareil à 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. L\'appareil sera nettoyé et le système de fichiers sera remplacé par le système de fichiers ext4 après la confirmation. Une fois cette opération terminée, revenez pour activer à nouveau l\'option de 16 Ko."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Effacer toutes les données"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Échec du reformatage de la partition vers le système de fichiers ext4 et du nettoyage de ses données."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Déverrouillage du programme d\'amorçage requis pour le mode 16 Ko"</string>
- <string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Cet appareil doit avoir le programme d\'amorçage déverrouillé avant d\'utiliser l\'option 16 Ko pour les développeurs. 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. Toutes les données et tous les paramètres de l\'utilisateur seront nettoyés lors de l\'activation du mode 16 Ko. Une fois le programme d\'amorçage déverrouillé, l\'activation de l\'option de 16 Ko nécessitera deux redémarrages. Une fois que vous êtes dans ce mode, vous pouvez basculer entre le mode 4 Ko et le mode 16 Ko avec un seul redémarrage. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applications peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez revenir en mode 4 Ko et ensuite activer le verrouillage par le fabricant d\'équipement d\'origine et verrouiller le programme d\'amorçage de l\'appareil (ce qui le réinitialise à ses paramètres par défaut). Veuillez déverrouiller le programme d\'amorçage et réessayer. Vous trouverez des instructions à ce sujet à la page <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Déverrouillage du programme d\'amorçage requis"</string>
+ <string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Cet appareil doit avoir le programme d\'amorçage déverrouillé avant d\'utiliser l\'option 16 Ko pour les développeurs. 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. Toutes les données et tous les paramètres de l\'utilisateur seront nettoyés lors de l\'activation du mode 16 Ko. Une fois le programme d\'amorçage déverrouillé, l\'activation de l\'option de 16 Ko nécessitera deux redémarrages. Une fois que vous êtes dans ce mode, vous pouvez basculer entre le mode 4 Ko et le mode 16 Ko avec un seul redémarrage. Certaines fonctionnalités seront désactivées dans ces modes, de sorte que certaines applis peuvent ne pas fonctionner. Pour remettre l\'appareil en mode production, vous devrez revenir en mode 4 Ko et ensuite activer le verrouillage par le fabricant d\'équipement d\'origine et verrouiller le programme d\'amorçage de l\'appareil (ce qui le réinitialise à ses paramètres par défaut). Veuillez déverrouiller le programme d\'amorçage et réessayer. Vous trouverez des instructions à ce sujet à la page <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Utilisation du mode agnostique de page 4 Ko"</string>
- <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Vous êtes dans le mode 4 Ko du mode agnostique de 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 verrouiller le programme d\'amorçage de l\'appareil. Touchez l\'écran pour en savoir plus."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Vous êtes dans le mode 4 Ko du mode agnostique de 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez la page <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_4k_pages_text_short" msgid="2894243902906666242">"Vous êtes dans le mode 4 Ko du mode agnostique de 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 applis peuvent ne pas fonctionner. Pour repasser en mode production, vous devez verrouiller le programme d\'amorçage de l\'appareil. Touchez l\'écran pour en savoir plus."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Vous êtes dans le mode 4 Ko du mode agnostique de 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 applis peuvent ne pas fonctionner. Pour repasser en mode production, vous devez 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez la page <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Utilisation du mode agnostique de page 16 Ko"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Vous êtes dans le mode 16 Ko du mode agnostique de 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. Touchez l\'écran pour en savoir plus."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Vous êtes dans le mode 16 Ko du mode agnostique de 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez la page <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Touchez l\'écran pour en savoir plus."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez la page <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="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 application gère le raccourci de rapport de bogue sur votre appareil."</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>
- <string name="work_profile_app_subtext" msgid="5043419461440127879">"Travail"</string>
+ <string name="work_profile_app_subtext" msgid="5043419461440127879">"Profil professionnel"</string>
<string name="system_default_app_subtext" msgid="5212055189703164839">"Paramètres par défaut"</string>
<string name="default_app_none" msgid="5420632042222036264">"Aucune"</string>
<string name="select_invalid_bug_report_handler_toast_text" msgid="8857326334015386692">"Ce choix n\'est plus valide. Réessayez."</string>
@@ -4920,8 +4967,8 @@
<string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
<string name="rtt_settings_always_visible" msgid="2364173070088756238"></string>
<string name="volte_5G_limited_title" msgid="5908052268836750629">"Désactiver la connexion VoLTE?"</string>
- <string name="volte_5G_limited_text" msgid="7150583768725182345">"Cela désactive aussi votre connexion 5G.\nDurant un appel vocal, vous ne pourrez pas utiliser la connexion Internet et certaines applications pourraient ne pas fonctionner."</string>
- <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspendre l\'exécution pour les applications en cache"</string>
+ <string name="volte_5G_limited_text" msgid="7150583768725182345">"Cela désactive aussi votre connexion 5G.\nDurant un appel vocal, vous ne pourrez pas utiliser la connexion Internet et certaines applis pourraient ne pas fonctionner."</string>
+ <string name="cached_apps_freezer" msgid="1057519579761550350">"Suspendre l\'exécution pour les applis en cache"</string>
<string name="blob_never_expires_text" msgid="7293376386620106623">"N\'expire jamais."</string>
<string name="accessor_never_expires_text" msgid="4647624492147788340">"Le bail n\'expire jamais."</string>
<string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser les superpos. d\'écran pour les paramètres"</string>
@@ -4989,7 +5036,7 @@
<string name="not_allowed_by_ent" msgid="1958611623122304411">"Non autorisé par votre organisation"</string>
<string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Cette fonctionnalité n\'est pas accessible parce que le mode Nuit est activé"</string>
<string name="reset_importance_completed" msgid="3595536767426097205">"L\'importance de la notification a bien été réinitialisée."</string>
- <string name="apps_dashboard_title" msgid="3269953499954393706">"Applications"</string>
+ <string name="apps_dashboard_title" msgid="3269953499954393706">"Applis"</string>
<string name="bluetooth_message_access_notification_content" msgid="5111712860712823893">"Un appareil souhaite accéder à vos messages. Touchez l\'écran pour en savoir plus."</string>
<string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Autoriser l\'accès aux messages?"</string>
<string name="bluetooth_message_access_dialog_content" msgid="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>
@@ -5006,10 +5053,10 @@
<string name="bluetooth_main_switch_title" msgid="8409835540311309632">"Utiliser le Bluetooth"</string>
<string name="prevent_ringing_main_switch_title" msgid="4726252811262086643">"Utiliser le blocage de la sonnerie"</string>
<string name="use_wifi_hotsopt_main_switch_title" msgid="3909731167290690539">"Utiliser le point d\'accès Wi-Fi"</string>
- <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utiliser l\'Épinglage d\'application"</string>
+ <string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utiliser l\'Épinglage d\'appli"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Utiliser les options pour les développeurs"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Utiliser le service d\'impression"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Autoriser plusieurs utilisateurs"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permettre le changement d\'utilisateur"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"autoriser, plusieurs, utilisateur, permettre, beaucoup"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiples, utilisateurs, profils, personnes, comptes, commutateur, plusieurs"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Utiliser le débogage sans fil"</string>
@@ -5038,7 +5085,7 @@
<string name="require_cellular_encryption_summary" msgid="6090569065420631457">"Cette option est plus sûre, mais peut limiter votre connexion au réseau cellulaire dans certains endroits. Les appels d\'urgence sont toujours autorisés."</string>
<string name="app_info_all_services_label" msgid="1487070364839071105">"Tous les services"</string>
<string name="show_clip_access_notification" msgid="7782300987639778542">"Afficher l\'accès au presse-papiers"</string>
- <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Un message s\'affiche lorsque les applications accèdent à du texte, à des images ou à d\'autres contenus que vous avez copiés"</string>
+ <string name="show_clip_access_notification_summary" msgid="474090757777203207">"Un message s\'affiche lorsque les applis accèdent à du texte, à des images ou à d\'autres contenus que vous avez copiés"</string>
<string name="all_apps" msgid="3054120149509114789">"Toutes les applis"</string>
<string name="request_manage_bluetooth_permission_dont_allow" msgid="8798061333407581300">"Ne pas autoriser"</string>
<string name="uwb_settings_title" msgid="8578498712312002231">"Bande ultralarge (BUL)"</string>
@@ -5051,8 +5098,8 @@
<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>
- <string name="perm_toggle_description" msgid="5754629581767319022">"Pour les applications et les services"</string>
- <string name="mic_toggle_description" msgid="484139688645092237">"Pour les applications et les services. Si ce paramètre est désactivé, il est possible que les données du microphone soient partagées lorsque vous appelez un numéro d\'urgence."</string>
+ <string name="perm_toggle_description" msgid="5754629581767319022">"Pour les applis et les services"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Pour les applis et les services. Si ce paramètre est désactivé, il est possible que les données du microphone soient partagées lorsque vous appelez un numéro d\'urgence."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Précédent"</string>
<string name="next_page_content_description" msgid="1641835099813416294">"Suivant"</string>
<string name="colors_viewpager_content_description" msgid="2591751086138259565">"Aperçu de la couleur"</string>
@@ -5083,7 +5130,7 @@
<string name="tare_rewards_instantaneous" msgid="8358683519945340874">"Récompenses par événement individuel"</string>
<string name="tare_rewards_ongoing" msgid="7657030286658143416">"Récomp. par seconde de durée de l\'évén."</string>
<string name="tare_rewards_max" msgid="5283055625642837010">"Maximum de récompenses par jour"</string>
- <string name="tare_app_install" msgid="7955806910408116882">"Installation d\'applications"</string>
+ <string name="tare_app_install" msgid="7955806910408116882">"Installation d\'applis"</string>
<string name="tare_top_activity" msgid="7266560655483385757">"Activité principale"</string>
<string name="tare_notification_seen" msgid="7829963536020087742">"Notification vue"</string>
<string name="tare_notification_seen_15_min" msgid="832174185809497764">"Notification vue dans les 15 minutes"</string>
@@ -5102,9 +5149,9 @@
<string name="tare_job_min_running" msgid="6167128996320622604">"Tâche à priorité minimale en cours…"</string>
<string name="tare_job_timeout_penalty" msgid="7644332836795492506">"Pénalité expiration du délai de la tâche"</string>
<string name="tare_min_balance_exempted" msgid="6693710075762973485">"Solde minimal avec une charge complète (exemptée)"</string>
- <string name="tare_min_balance_headless_app" msgid="6906353766678577244">"Solde minimal avec une charge complète (application système sans interface)"</string>
- <string name="tare_min_balance_other_app" msgid="3404774196832506476">"Solde minimal avec une charge complète (applications restantes)"</string>
- <string name="tare_min_balance_addition_app_updater" msgid="5391956072471201269">"Ajout de solde minimal avec une charge complète (outil de mise à jour de l\'application)"</string>
+ <string name="tare_min_balance_headless_app" msgid="6906353766678577244">"Solde minimal avec une charge complète (appli système sans interface)"</string>
+ <string name="tare_min_balance_other_app" msgid="3404774196832506476">"Solde minimal avec une charge complète (applis restantes)"</string>
+ <string name="tare_min_balance_addition_app_updater" msgid="5391956072471201269">"Ajout de solde minimal avec une charge complète (outil de mise à jour de l\'appli)"</string>
<string-array name="tare_modifiers_subfactors">
<item msgid="3325940509857535498">"Recharge"</item>
<item msgid="658627268149681677">"Sieste"</item>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choisissez ce que vous voyez à l\'écran lorsque votre tablette est ancrée. Votre appareil peut consommer plus d\'énergie lorsqu\'un écran de veille est utilisé."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personnaliser"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personnaliser <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Vous devez redémarrer l\'appareil pour activer la prise en charge des fenêtres de forme libre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Vous devez redémarrer l\'appareil pour forcer le mode Bureau sur des écrans secondaires."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Un redémarrage est requis pour activer la prise en charge des fenêtres de forme libre patrimoniales."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Un redémarrage est requis pour modifier la prise en charge des fenêtres de forme libre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Un redémarrage est requis pour forcer les fenêtres de forme libre sur les écrans secondaires."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Redémarrer maintenant"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Redémarrer plus tard"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Son spatial"</string>
@@ -5132,7 +5180,7 @@
<string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"Suivi de la tête"</string>
<string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"Le son est modifié en fonction des mouvements de votre tête pour produire un son plus naturel"</string>
<string name="bluetooth_details_permissions_sync_title" msgid="7277580382321003521">"Synchroniser les autorisations du téléphone"</string>
- <string name="bluetooth_details_permissions_sync_summary" msgid="8125037984381432059">"Accordez à votre montre les mêmes autorisations de l\'application que celles que vous avez accordées sur ce téléphone"</string>
+ <string name="bluetooth_details_permissions_sync_summary" msgid="8125037984381432059">"Accordez à votre montre les mêmes autorisations de l\'appli que celles que vous avez accordées sur ce téléphone"</string>
<string name="bluetooth_details_audio_device_types_title" msgid="1889644189800180316">"Type d\'appareil audio"</string>
<string name="bluetooth_details_audio_device_type_unknown" msgid="5299284975435974206">"Non défini"</string>
<string name="bluetooth_details_audio_device_type_speaker" msgid="3706227767994792124">"Haut-parleur"</string>
@@ -5145,7 +5193,7 @@
<string name="ingress_rate_limit_dialog_title" msgid="5359461052422633789">"Configurer la limitation du taux de téléchargement sur le réseau"</string>
<string name="ingress_rate_limit_no_limit_entry" msgid="8741098826008012163">"Aucune limite"</string>
<string name="disable_phantom_process_monitor_title" msgid="8348108346706188771">"Désactiver les restrict. pour les processus enfant"</string>
- <string name="disable_phantom_process_monitor_summary" msgid="3044464635550256985">"Désactivez les restrictions sur l\'utilisation des ressources système pour les processus d\'application relatifs aux profils pour enfants"</string>
+ <string name="disable_phantom_process_monitor_summary" msgid="3044464635550256985">"Désactivez les restrictions sur l\'utilisation des ressources système pour les processus d\'appli relatifs aux profils pour enfants"</string>
<string name="enable_notes_role_title" msgid="7662702013496114763">"Forcer l\'activation de la fonction Notes"</string>
<string name="enable_notes_role_summary" msgid="5495721409392395089">"Activez les intégrations de systèmes de prise de notes par le biais de la fonction Notes. Si la fonction Notes est déjà activée, aucune action n\'est nécessaire. Nécessite un redémarrage."</string>
<string name="bluetooth_broadcast_dialog_title" msgid="9172775308463135884">"Diffusion"</string>
@@ -5165,21 +5213,21 @@
<string name="bt_le_audio_qr_code_is_not_valid_format" msgid="7821837654128137901">"Le format du code QR est incorrect"</string>
<string name="convert_to_esim_title" msgid="71037864129009206">"Convertir à une carte eSIM"</string>
<string name="transfer_esim_to_another_device_title" msgid="5286117866086383192">"Transférer la carte eSIM à un autre appareil"</string>
- <string name="background_install_preference_summary" msgid="3065219346519340364">"{count,plural, =1{# application}one{# application}other{# applications}}"</string>
- <string name="background_install_title" msgid="607913515188276168">"Applications installées en arrière-plan"</string>
- <string name="background_install_summary" msgid="3890296129543309666">"Le fabricant de votre appareil peut installer des applications sur votre appareil en arrière-plan, ou autoriser votre fournisseur de services et d\'autres partenaires à le faire.\n\nLes applications répertoriées ici ne sont pas nécessaires au fonctionnement normal de votre appareil. Vous pouvez désinstaller les applications que vous ne voulez pas."</string>
- <string name="background_install_feature_list_no_entry" msgid="2071343281272266154">"Aucune application installée en arrière-plan"</string>
- <string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Désinstaller l\'application"</string>
- <string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Applications installées au cours du dernier mois}one{Applications installées au cours du dernier (#) mois}other{Applications installées au cours des # derniers mois}}"</string>
- <string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Applications installées il y a plus de # mois}one{Applications installées il y a plus de # mois}other{Applications installées il y a plus de # mois}}"</string>
+ <string name="background_install_preference_summary" msgid="3065219346519340364">"{count,plural, =1{# appli}one{# appli}other{# applis}}"</string>
+ <string name="background_install_title" msgid="607913515188276168">"Applis installées en arrière-plan"</string>
+ <string name="background_install_summary" msgid="3890296129543309666">"Le fabricant de votre appareil peut installer des applis sur votre appareil en arrière-plan, ou autoriser votre fournisseur de services et d\'autres partenaires à le faire.\n\nLes applis répertoriées ici ne sont pas nécessaires au fonctionnement normal de votre appareil. Vous pouvez désinstaller les applis que vous ne voulez pas."</string>
+ <string name="background_install_feature_list_no_entry" msgid="2071343281272266154">"Aucune appli installée en arrière-plan"</string>
+ <string name="background_install_uninstall_button_description" msgid="1189649052911501249">"Désinstaller l\'appli"</string>
+ <string name="background_install_before" msgid="8608614957688912715">"{count,plural, =1{Applis installées au cours du dernier mois}one{Applis installées au cours du dernier (#) mois}other{Applis installées au cours des # derniers mois}}"</string>
+ <string name="background_install_after" msgid="7983488897570908149">"{count,plural, =1{Applis installées il y a plus de # mois}one{Applis installées il y a plus de # mois}other{Applis installées il y a plus de # mois}}"</string>
<string name="aspect_ratio_title" msgid="2451826875939676101">"Proportions"</string>
- <string name="aspect_ratio_summary" msgid="4056406351663726494">"Essayez d\'autres proportions pour afficher cette application si elle n\'a pas été conçue pour s\'adapter à votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="aspect_ratio_main_summary" msgid="4141964559612756940">"Essayez d\'autres proportions pour afficher cette application 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 applications ne soient pas optimisées pour certaines proportions."</string>
- <string name="aspect_ratio_summary_text" msgid="4737461467467220325">"Essayez d\'autres proportions pour afficher une application si elle n\'a pas été conçue pour s\'adapter à votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="aspect_ratio_main_summary_text" msgid="5544816872094235840">"Essayez d\'autres proportions pour afficher une application 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 applications ne soient pas optimisées pour certaines proportions."</string>
+ <string name="aspect_ratio_summary" msgid="4056406351663726494">"Essayez d\'autres proportions pour afficher cette appli si elle n\'a pas été conçue pour s\'adapter à votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="aspect_ratio_main_summary" msgid="4141964559612756940">"Essayez d\'autres proportions pour afficher cette 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="aspect_ratio_summary_text" msgid="4737461467467220325">"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>"</string>
+ <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">"Application par défaut"</string>
+ <string name="user_aspect_ratio_app_default" msgid="270065763307617837">"Appli par défaut"</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>
@@ -5187,7 +5235,7 @@
<string name="user_aspect_ratio_3_2" msgid="199262962518318932">"3:2"</string>
<string name="user_aspect_ratio_4_3" msgid="5196232982878982220">"4:3"</string>
<string name="user_aspect_ratio_option_a11y" msgid="1235801996029095219">"<xliff:g id="NUMERATOR">%1$s</xliff:g> par <xliff:g id="DENOMINATOR">%2$s</xliff:g>"</string>
- <string name="app_aspect_ratio_footer" msgid="4029509301182067475">"L\'application redémarrera lorsque vous aurez modifié les proportions. Vous pourriez perdre les modifications non enregistrées. Il se peut que certaines applications ne soient pas optimisées pour certaines proportions."</string>
+ <string name="app_aspect_ratio_footer" msgid="4029509301182067475">"L\'appli redémarrera lorsque vous aurez modifié les proportions. Vous pourriez perdre les modifications non enregistrées. Il se peut que certaines applis ne soient pas optimisées pour certaines proportions."</string>
<string name="aspect_ratio_experimental_title" msgid="9088785421062044831">"Proportions (expérimental)"</string>
<string name="aspect_ratio_experiment_title" msgid="128614319422121040">"Proportions (test)"</string>
<string name="aspect_ratio_labs_title" msgid="6733893837442759383">"Proportions (labos)"</string>
@@ -5226,7 +5274,7 @@
<string name="contrast_default" msgid="8918545965525226966">"Par défaut"</string>
<string name="contrast_medium" msgid="384414510709285811">"Moyen"</string>
<string name="contrast_high" msgid="3988567609694797696">"Élevé"</string>
- <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Cette application ne peut être ouverte que dans une seule fenêtre."</string>
+ <string name="dock_multi_instances_not_supported_text" msgid="3513493664467667084">"Cette appli ne peut être ouverte que dans une seule fenêtre."</string>
<string name="generic_accessibility_service_on" msgid="4466229372357726824">"Activé"</string>
<string name="generic_accessibility_service_off" msgid="4759859497651675724">"Désactivé"</string>
<string name="generic_accessibility_feature_shortcut_off" msgid="4022872394514077907">"Désactivé"</string>
@@ -5236,19 +5284,21 @@
<string name="color_inversion_state_on" msgid="1160969033636440368">"Activée"</string>
<string name="color_inversion_state_off" msgid="6925638668080451724">"Désactivée"</string>
<string name="color_inversion_feature_summary" msgid="1199876648549627647">"Les écrans clairs deviennent sombres et vice-versa"</string>
- <string name="magnification_feature_summary" msgid="2053971569640663564">"Zoomer sur l\'écran"</string>
+ <string name="magnification_feature_summary" msgid="2053971569640663564">"Zoome sur l\'écran"</string>
<string name="autoclick_disabled" msgid="3213396804955002120">"Désactivée"</string>
<string name="show_captions_disabled" msgid="690650956523818755">"Désactivés"</string>
<string name="show_captions_enabled" msgid="7089043007924626">"Activés"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Désactivée"</string>
- <string name="live_caption_enabled" msgid="5269360946200718949">"Activée"</string>
- <string name="about_phone_device_name_warning" msgid="3243226572404472381">"Le nom de votre appareil est visible aux applications que vous avez installées. Il est également possible que d\'autres personnes voient le nom de votre appareil lorsque vous vous connectez à des appareils Bluetooth ou à un réseau Wi-Fi, ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
+ <string name="live_caption_enabled" msgid="5269360946200718949">"Activés"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Son %1$d%% à gauche, %2$d%% à droite"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Son %1$d%% à droite, %2$d%% à gauche"</string>
+ <string name="about_phone_device_name_warning" msgid="3243226572404472381">"Le nom de votre appareil est visible aux applis que vous avez installées. Il est également possible que d\'autres personnes voient le nom de votre appareil lorsque vous vous connectez à des appareils Bluetooth ou à un réseau Wi-Fi, ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genre grammatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Sélectionnez un genre grammatical"</string>
<string name="content_protection_preference_title" msgid="5069260032659193074">"Analyse d\'applis trompeuses"</string>
- <string name="content_protection_preference_summary" msgid="2252393849408445391">"Vérifiez l\'activité des applications pour détecter les tentatives d\'hameçonnage"</string>
+ <string name="content_protection_preference_summary" msgid="2252393849408445391">"Vérifiez l\'activité des applis pour détecter les tentatives d\'hameçonnage"</string>
<string name="content_protection_preference_user_consent_switch_title" msgid="1797782616799594426">"Utiliser l\'analyse des applis trompeuses"</string>
- <string name="content_protection_preference_user_consent_work_profile_switch_title" msgid="3004347470520916069">"Utiliser l\'analyse des applications trompeuses pour le travail"</string>
+ <string name="content_protection_preference_user_consent_work_profile_switch_title" msgid="3004347470520916069">"Utiliser l\'analyse des applis trompeuses pour le travail"</string>
<string name="content_protection_preference_subpage_summary" msgid="3595621220981703364"></string>
<string name="content_protection_preference_subpage_info" msgid="6890886357653365489"></string>
<string name="accessibility_setup_password_complete" msgid="6358749253318369077">"Le mot de passe a été configuré"</string>
@@ -5353,4 +5403,5 @@
<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 votre <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="homepage_search" msgid="6759334912284663559">"Paramètres de recherche"</string>
</resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3f2dabb..9e9fd5f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Coucher"</item>
+ <item msgid="4152450357280759894">"Conduite"</item>
+ <item msgid="7096549258219399423">"Immersif"</item>
+ <item msgid="2760716776980432977">"Géré"</item>
+ <item msgid="601734478369121764">"Étoile"</item>
+ <item msgid="6243809315432780521">"Calendrier"</item>
+ <item msgid="4913577903148415331">"Durée"</item>
+ <item msgid="3653377604690057780">"Cinéma"</item>
+ <item msgid="3843711267408385410">"Fleur"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7d43b53..8a8e0a8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Déconnecter l\'appareil ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Associer un appareil"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activer automatiquement demain"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Paramètres de l\'appareil auditif"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Raccourci, compatibilité avec les appareils auditifs"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Préréglages"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Votre spécialiste de l\'audition n\'a configuré aucun préréglage"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Impossible de mettre à jour les préréglages"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Sortie audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"À propos de la sortie audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activée/# appli a accès à la position}one{Activée/# appli a accès à la position}other{Activée/# applis ont accès à la position}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Les applis ayant l\'autorisation de détecter les appareils à proximité peuvent déterminer la position relative des appareils connectés."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Les applis ayant l\'autorisation de détecter les appareils à proximité peuvent déterminer la position relative des appareils connectés."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"L\'accès à la position est désactivé pour les applis et les services. La position de votre appareil peut toujours être envoyée aux services d\'urgence lorsque vous les contactez par téléphone ou SMS."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"En savoir plus sur les paramètres de localisation."</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Pour apporter des modifications, rendez-vous dans Paramètres de ChromeOS > Confidentialité et sécurité > Paramètres de confidentialité > Accès à la position"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Déverrouillage par reconnaissance faciale et la <xliff:g id="WATCH">%s</xliff:g> ajouté"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Visage, empreinte digitale et <xliff:g id="WATCH">%s</xliff:g> ajoutés"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Visage, empreintes digitales et <xliff:g id="WATCH">%s</xliff:g> ajoutés"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Cette action est nécessaire, car la vérification de l\'identité est activée"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Déblocage de l\'authentificateur distant"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Montre ajoutée"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurer votre montre"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"En savoir plus sur le Déverrouillage par une montre"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Ajouter une montre"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Retirer la montre"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Déverrouillage par empreinte digitale et reconnaissance faciale"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Déverrouillage par reconnaissance faciale et empreinte digitale"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Déverrouillage par reco. faciale et empreinte pour le travail"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configuration requise"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Visage et empreintes digitales ajoutés"</string>
@@ -558,7 +559,7 @@
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"Déverrouillage de l\'espace privé par empreinte digitale"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"Déverrouillage de l\'espace privé par reconnaissance faciale"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"Déverrouillage de l\'espace privé par reco. faciale/digitale"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurer le déverrouillage de l\'espace privé par empreinte digitale"</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurer le déverr. de l\'espace privé par empreinte digitale"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Utilisez votre empreinte digitale pour déverrouiller votre espace privé ou confirmer votre identité, par exemple pour vous connecter à des applis ou approuver un achat"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"Vous pouvez déverrouiller votre espace privé sans le vouloir, par exemple si quelqu\'un approche votre téléphone de votre doigt."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Utilisez votre empreinte digitale pour déverrouiller votre espace privé ou approuver des achats"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Applis installées"</b>\n"Les applis installées que vous souhaitez garder privées dans votre espace"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"À noter"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Les applis s\'arrêtent lorsque vous verrouillez votre espace"</b>\n"Lorsque vous verrouillez votre espace, les applis qui s\'y trouvent s\'arrêtent et vous ne recevez plus de notifications de leur part"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Les espaces privés ne sont pas adaptés aux applis qui doivent s\'exécuter en arrière-plan ou envoyer des notifications critiques, comme les applis médicales. En effet, les notifications et les activités en arrière-plan sont interrompues lorsque votre espace est verrouillé.\n\nLes applis contenues dans votre espace privé n\'apparaissent pas dans le gestionnaire d\'autorisations, dans le tableau de bord Confidentialité ni dans d\'autres paramètres quand votre espace privé est verrouillé.\n\nVotre espace privé ne peut pas être transféré vers un nouvel appareil. Si vous souhaitez l\'utiliser sur un autre appareil, vous devrez configurer un nouvel espace privé.\n\nQuiconque connecte votre appareil à un ordinateur ou y installe des applis malveillantes peut avoir accès à votre espace privé."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Les espaces privés ne sont pas adaptés aux applis qui doivent s\'exécuter en arrière-plan ou envoyer des notifications critiques, comme les applis médicales. En effet, les notifications et les activités en arrière-plan sont interrompues lorsque votre espace est verrouillé.\n\nLes applis contenues dans votre espace privé n\'apparaissent pas dans le gestionnaire d\'autorisations, dans le tableau de bord Confidentialité ni dans d\'autres paramètres quand votre espace privé est verrouillé.\n\nVotre espace privé ne peut pas être restauré sur un nouvel appareil. Si vous souhaitez l\'utiliser sur un autre appareil, vous devrez configurer un nouvel espace.\n\nQuiconque connecte votre appareil à un ordinateur ou y installe des applis malveillantes peut avoir accès à votre espace privé."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"En savoir plus sur l\'espace privé"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Cela peut prendre quelques instants"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configuration de l\'espace privé…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Redémarrer l\'appareil ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"La journalisation des détails NFC est destinée exclusivement au développement. Des données NFC supplémentaires sont incluses dans les rapports de bug. Ils peuvent contenir des informations privées. Redémarrez votre appareil pour modifier ce paramètre."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Redémarrer"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"dupliquer, écran externe, écran connecté, écran usb, résolution, rotation"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_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 l\'appareil à apprendre vos préférences."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Balance des blancs de l\'écran"</string>
@@ -1247,7 +1262,7 @@
<string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"S\'active à l\'heure choisie"</string>
<string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"S\'active à l\'heure du coucher"</string>
<string name="dark_ui_status_title" msgid="3505119141437774329">"État"</string>
- <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'activera jamais automatiquement"</string>
+ <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Ne s\'active jamais automatiquement"</string>
<string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"S\'active automatiquement au coucher du soleil"</string>
<string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"S\'active automatiquement à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"S\'active automatiquement à l\'heure du coucher"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Utiliser le clavier à l\'écran"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Afficher le clavier virtuel même lorsque le clavier physique est actif"</string>
<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="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="sticky_keys" msgid="7317317044898161747">"Touches persistantes"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Pour les raccourcis, appuyez 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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Définir rempl. pointeur sur jaune"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Définir rempl. pointeur sur rose"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Définir rempl. pointeur sur bleu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Style de trait du pointeur"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Blanc"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Noir"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Aucun"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Utilisateur sélectionné : <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voix"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Vitesse du pointeur"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Échelle du pointeur"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuer l\'échelle du pointeur"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Augmenter l\'échelle du pointeur"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Manette de jeu"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibreur pour la redirection"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rediriger le vibreur vers la manette de jeu lorsque vous êtes connecté"</string>
@@ -2022,7 +2044,7 @@
<string name="accessibility_settings_title" msgid="6739115703615065716">"Paramètres d\'accessibilité"</string>
<string name="accessibility_settings_summary" msgid="2366627644570558503">"Affichage, interaction, audio"</string>
<string name="vision_settings_title" msgid="8919983801864103069">"Paramètres visuels"</string>
- <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
+ <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité par la suite dans les paramètres."</string>
<string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modifier la taille de la police"</string>
<string name="screen_reader_category_title" msgid="5825700839731107803">"Lecteur d\'écran"</string>
<string name="keyboard_category_title" msgid="6841712758039893220">"Options du clavier physique"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuer"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Annuler"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Défilement panoramique à un doigt"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Déplacer la loupe avec un doigt"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Faites glisser un doigt pour vous déplacer sur l\'écran."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Déplacez la zone d\'agrandissement en faisant glisser un doigt sur cette dernière."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Déplacez la zone d\'agrandissement en faisant glisser deux doigts sur cette dernière."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Indisponible lors de l\'agrandissement d\'une partie de l\'écran uniquement"</string>
@@ -2113,11 +2136,13 @@
<string name="accessibility_text_reading_conversation_message_1" msgid="7883952203831957831">"Des projets pour le week-end ?"</string>
<string name="accessibility_text_reading_conversation_message_2" msgid="8112160435318635856">"Je vais à la plage. Tu veux venir ?"</string>
<string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
- <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom avant sur l\'écran"</string>
+ <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoomez sur l\'écran"</string>
<string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Appuyer trois fois pour zoomer"</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Appuyer sur un bouton pour zoomer"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Faites un zoom avant rapide sur l\'écran pour agrandir le contenu"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Pour faire un zoom avant :</b><br/> {0,number,integer}. Utilisez le raccourci pour démarrer l\'agrandissement<br/> {1,number,integer}. Appuyez sur l\'écran<br/> {2,number,integer}. Faites glisser deux doigts pour vous déplacer sur l\'écran<br/> {3,number,integer}. Pincez avec deux doigts pour régler le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter l\'agrandissement<br/><br/> <b>Pour faire un zoom avant temporaire :</b><br/> {0,number,integer}. Assurez-vous que le type d\'agrandissement est défini sur plein écran<br/> {1,number,integer}. Utilisez le raccourci pour démarrer l\'agrandissement<br/> {2,number,integer}. Appuyez de manière prolongée n\'importe où sur l\'écran<br/> {3,number,integer}. Faites glisser un doigt pour vous déplacer sur l\'écran<br/> {4,number,integer}. Relevez le doigt pour arrêter l\'agrandissement"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Pour faire un zoom avant :</b><br/> {0,number,integer}. Utilisez le raccourci pour agrandir<br/> {1,number,integer}. Appuyez sur l\'écran<br/> {2,number,integer}. Faites glisser deux doigts pour vous déplacer sur l\'écran<br/> {3,number,integer}. Pincez avec les deux doigts pour régler le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter de zoomer<br/><br/> Vous pouvez également faire un zoom avant temporaire, et plus encore."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Pour faire un zoom avant :</b><br/> {0,number,integer}. Utilisez le raccourci pour agrandir<br/> {1,number,integer}. Appuyez sur l\'écran<br/> {2,number,integer}. Faites glisser un ou deux doigts pour vous déplacer sur l\'écran<br/> {3,number,integer}. Pincez avec les deux doigts pour régler le zoom<br/> {4,number,integer}. Utilisez le raccourci pour arrêter de zoomer<br/><br/> Vous pouvez également faire un zoom avant temporaire, et plus encore."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Lorsque l\'option \"Agrandissement\" est activée, vous pouvez effectuer un zoom avant sur votre écran.\n\n"<b>"Pour zoomer"</b>", activez l\'option \"Agrandissement\", puis appuyez n\'importe où sur l\'écran.\n"<ul><li>"Pour faire défiler l\'écran, faites glisser deux doigts ou plus dessus."</li>\n<li>"Pour régler le niveau de zoom, pincez l\'écran avec deux doigts ou plus."</li></ul>\n\n<b>"Pour faire un zoom temporaire"</b>", lancez l\'option \"Agrandissement\", puis appuyez de manière prolongée n\'importe où sur l\'écran.\n"<ul><li>"Pour vous déplacer sur l\'écran, faites glisser un doigt dessus."</li>\n<li>"Pour faire un zoom arrière, relevez le doigt."</li></ul>\n\n"Il est impossible de faire un zoom avant sur le clavier ni sur la barre de navigation."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Raccourci du bouton Accessibilité"</string>
@@ -2189,14 +2214,14 @@
<string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"En savoir plus sur le bouton et le geste d\'accessibilité"</string>
<string name="accessibility_button_intro" msgid="2601976470525277903">"Utilisation du bouton Accessibilité. Geste indisponible avec la navigation à trois boutons."</string>
<string name="accessibility_button_summary" msgid="8510939012631455831">"Accès rapide aux fonctionnalités d\'accessibilité"</string>
- <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>Pour démarrer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité<br/> {1,number,integer}. Sélectionnez une fonctionnalité et appuyez sur le raccourci<br/> {2,number,integer}. Précisez si vous souhaitez utiliser un bouton ou un geste pour accéder au paramètre<br/>."</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>Pour démarrer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité<br/> {1,number,integer}. Sélectionnez une fonctionnalité et appuyez sur le raccourci<br/> {2,number,integer}. Précisez si vous souhaitez utiliser un bouton ou un geste pour accéder au paramètre<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>Pour démarrer</b><br/> {0,number,integer}. Accédez aux paramètres d\'accessibilité<br/> {1,number,integer}. Sélectionnez une fonctionnalité et appuyez sur le raccourci<br/> {2,number,integer}. Choisissez le bouton pour accéder à cette fonctionnalité<br/>."</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Utiliser bouton ou geste"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Position"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Taille"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"Disparaît s\'il n\'est pas utilisé"</string>
<string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Disparaît après quelques secondes pour que vous puissiez mieux voir l\'écran"</string>
- <string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Transparent s\'il n\'est pas utilisé"</string>
+ <string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Transparence quand il n\'est pas utilisé"</string>
<string name="accessibility_button_low_label" msgid="4193015407828927741">"Transparent"</string>
<string name="accessibility_button_high_label" msgid="9138077512008190896">"Opaque"</string>
<string name="accessibility_toggle_high_text_contrast_preference_title" msgid="1830189632458752698">"Texte avec contraste élevé"</string>
@@ -2883,7 +2908,7 @@
<string name="data_usage_limit_editor_title" msgid="8826855902435008518">"Définir la limite de consommation des données"</string>
<string name="data_usage_limit_dialog_title" msgid="2053134451707801439">"Limitation de la conso des données"</string>
<string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">" <xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avert."</font></string>
- <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"plafond"</font></string>
+ <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">" <xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"plafond"</font></string>
<string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Applications supprimées"</string>
<string name="data_usage_uninstalled_apps_users" msgid="1262228664057122983">"Applications et utilisateurs supprimés"</string>
<string name="wifi_metered_title" msgid="6623732965268033931">"Utilisation du réseau"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucun}=1{1 programme défini}one{# programme défini}other{# programmes définis}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modes Prioritaires"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Ajouter un mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et applications importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Sélectionner le type d\'activation"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Durée"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Exemple : \"9h30 – 17h\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Agenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Exemple : \"Agenda personnel\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Créer un mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personnalisé"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activer le mode Ne pas déranger"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Les alarmes et les sons des contenus multimédias peuvent interrompre le mode Ne pas déranger"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programmes"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Supprimer des programmes"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Supprimer"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Renommer"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Supprimer"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Supprimer le mode <xliff:g id="MODE">%1$s</xliff:g> ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Modifier"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programmes"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programme"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Ajouter un agenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Utiliser votre agenda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programmer"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Définir une programmation"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programmation"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activer automatiquement"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programme"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Tél. en silence à certains moments"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Définir les règles du mode Ne pas déranger"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Autoriser les interruptions sonores"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquer nuisances visuelles"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Autoriser les signaux visuels"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifications qui peuvent vous parvenir"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Restez concentré"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Autres actions"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Désactivé}=1{Désactivé/1 mode peut s\'activer automatiquement}one{Désactivé/# mode peut s\'activer automatiquement}other{Désactivé/# modes peuvent s\'activer automatiquement}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Paramètres d\'affichage"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Options d\'affichage"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Nuances de gris"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"activer le thème sombre"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Passer le système d\'exploitation et les applis en texte clair sur fond sombre, ce qui peut faciliter la lecture et permet d\'économiser considérablement la batterie sur certains appareils"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Aucun changement appliqué à l\'affichage}=1{{effect_1}}=2{{effect_1} et {effect_2}}=3{{effect_1}, {effect_2} et {effect_3}}one{{effect_1}, {effect_2} et # autre}other{{effect_1}, {effect_2} et # autres}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrer les interruptions"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Aucune interruption filtrée"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Options d\'affichage des notifications filtrées"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Lorsque Ne pas déranger est activé"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aucune notification sonore"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"Ouvrir la notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Autoriser la mise en attente des notifications"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Pastille de notification sur l\'icône de l\'application"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Groupes de notifications"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bulles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bulles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Afficher cette conversation sous forme de bulle"</string>
@@ -3598,7 +3639,7 @@
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Désactiver"</string>
<string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annuler"</string>
<string name="notif_type_ongoing" msgid="135675014223627555">"En temps réel"</string>
- <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Communication continue (depuis applications actives, navigation, appels téléphoniques, etc.)"</string>
+ <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Communication continue depuis : applis actives, navigation, appels téléphoniques, etc."</string>
<string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
<string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, messages texte et autres communications"</string>
<string name="notif_type_alerting" msgid="4713073696855718576">"Notifications"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Cette appli n\'est pas compatible avec les paramètres avancés"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Autres paramètres"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"D\'autres paramètres sont disponibles dans l\'appli"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Limitation des notifications"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Appliquer aux profils professionnels"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Appliquer aux applis du profil professionnel"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Catégories"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Autres"</string>
<string name="no_channels" msgid="4716199078612071915">"Cette application n\'a publié aucune notification"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Afficher les catégories inutilisées"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Paramètres supplémentaires dans l\'application"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Afficher les catégories inutilisées"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Masquer les catégories inutilisées"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Applis qui peuvent interrompre"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Applis sélectionnées"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Aucune"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Toutes"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Sélectionnez plus d\'applications"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut l\'interrompre"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut interrompre le mode Ne pas déranger"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent l\'interrompre"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Toutes les personnes peuvent interrompre le mode Ne pas déranger"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Appels répétés"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Autoriser les appels répétés"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ne recevoir que les alarmes pendant 1 heure jusqu\'à {time}}one{Ne recevoir que les alarmes pendant # heure jusqu\'à {time}}other{Ne recevoir que les alarmes pendant # heures jusqu\'à {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Toujours interrompre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modifier le mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Ajouter 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="warning_button_text" msgid="1274234338874005639">"Avertissement"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Fermer"</string>
<string name="device_feedback" msgid="5351614458411688608">"Envoyer commentaires sur l\'appareil"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Étui de transport"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batterie"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panneau des paramètres"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forcer le mode ordinateur"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forcer le mode ordinateur expérimental sur les écrans secondaires"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Activer les fenêtres de forme libre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Permet d\'activer la compatibilité avec les fenêtres de forme libre."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activer le fenêtrage de forme libre sur l\'écran secondaire"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Permet d\'activer les fenêtres de forme libre sur l\'écran secondaire uniquement."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activer les applis non redimensionnables en mode multifenêtre"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Autoriser le mode multifenêtre pour les applis non redimensionnables"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Forcer l\'activation du thème sombre"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partition des données de cet appareil doit être convertie en ext4 avant d\'utiliser l\'option 16 kB pour les développeurs. 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. L\'activation du mode 16 kB nécessitera un ou plusieurs redémarrages après cette opération. Une fois que vous êtes dans ce mode, vous pouvez passer du mode 4 kB au mode 16 kB et inversement par le biais d\'un seul redémarrage. 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, il vous faut repasser en mode 4 kB, puis verrouiller le bootloader, ce qui rétablit la configuration d\'usine de l\'appareil. Une fois que l\'appareil a bien démarré sous Android, désactivez le déverrouillage OEM dans les Options pour les développeurs. Après confirmation, l\'appareil sera nettoyé et le système de fichiers sera remplacé par ext4. Une fois cette opération terminée, revenez pour repasser en mode 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Effacer les données"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Échec du reformatage et de l\'effacement de la partition de données vers ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Déverrouillage du bootloader requis pour le mode 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Nécessite le déverrouillage du bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Le bootloader de cet appareil doit être déverrouillé pour pouvoir utiliser l\'option 16 kB pour les développeurs. 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. L\'ensemble des données et paramètres de l\'utilisateur seront effacés après l\'activation du mode 16 kB. Une fois le bootloader déverrouillé, l\'activation du mode 16 kB nécessitera deux redémarrages. Une fois que vous êtes dans ce mode, vous pouvez passer du mode 4 kB au mode 16 kB et inversement par le biais d\'un seul redémarrage. 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, il vous faut repasser en mode 4 kB, puis verrouiller l\'OEM/le bootloader (ce qui rétablit la configuration d\'usine de l\'appareil). Verrouillez le bootloader, puis réessayez. Vous trouverez des instructions pour vous aider à réaliser cette opération à l\'adresse <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Utilisation du mode agnostique de page mémoire 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Vous utilisez le mode 4 kB 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 repasser en mode Production, vous devez verrouiller le bootloader de l\'appareil. Appuyez ici pour en savoir plus."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Vous utilisez le mode 4 kB 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 repasser en mode Production, vous devez 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> et sélectionnez \"Nettoyer l\'appareil\", \"Verrouiller le bootloader\", puis \"Forcer le flash de l\'ensemble des partitions\"."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Vous utilisez le mode 4 kB 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, il se peut donc que certaines applications ne fonctionnent pas. Pour repasser en mode Production, vous devez verrouiller le bootloader de l\'appareil. Cela permet de rétablir la configuration d\'usine de l\'appareil 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 avec les dernières images d\'usine disponibles à l\'adresse <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> et sélectionnez \"Effacer les données de l\'appareil\", \"Verrouiller le bootloader\", puis \"Forcer le flash de toutes les partitions\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Utilisation du mode agnostique de page mémoire 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Vous utilisez le mode 16 kB 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 kB, puis verrouiller le bootloader de l\'appareil. Appuyez ici pour en savoir plus."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Vous utilisez le mode 16 kB 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 kB, 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> et sélectionnez \"Nettoyer l\'appareil\", \"Verrouiller le bootloader\", puis \"Forcer le flash de l\'ensemble des partitions\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Appuyez ici pour en savoir plus."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou utilisez <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Gestionnaire de rapport de bug"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Utiliser l\'épinglage d\'application"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Utiliser les options pour les développeurs"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Utiliser le service d\'impression"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Autoriser plusieurs utilisateurs"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Autoriser le changement d\'utilisateur"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"autoriser, plusieurs, utilisateur, permettre, beaucoup"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multiples, utilisateurs, profils, personnes, comptes, transfert, nombreux"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Utiliser le débogage sans fil"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Choisissez le contenu à afficher à l\'écran quand la tablette est sur la station d\'accueil. Votre appareil peut consommer plus d\'énergie quand un économiseur d\'écran est utilisé."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personnaliser"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personnaliser <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Un redémarrage est nécessaire pour activer la prise en charge du format libre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Un redémarrage est nécessaire pour forcer le mode bureau sur les écrans secondaires."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Un redémarrage est nécessaire pour activer la prise en charge de l\'ancienne fonctionnalité de fenêtrage de forme libre."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Un redémarrage est nécessaire pour modifier la prise en charge du fenêtrage de forme libre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Un redémarrage est nécessaire pour forcer le fenêtrage de forme libre sur les écrans secondaires."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Redémarrer maintenant"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Redémarrer plus tard"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Son spatial"</string>
@@ -5242,6 +5290,12 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Activé"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Désactivés"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Activés"</string>
+ <!-- String.format failed for translation -->
+ <!-- no translation found for audio_seek_bar_state_left_first (8814986910920838972) -->
+ <skip />
+ <!-- String.format failed for translation -->
+ <!-- no translation found for audio_seek_bar_state_right_first (1999368979633398876) -->
+ <skip />
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Les applis que vous avez installées ont accès au nom de votre appareil. D\'autres personnes peuvent aussi le voir lorsque vous vous connectez à des appareils Bluetooth ou à un réseau Wi-Fi, ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genre grammatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Sélectionner le genre grammatical"</string>
@@ -5296,7 +5350,7 @@
<string name="audio_sharing_pair_button_label" msgid="7987236990273083588">"Associer un nouvel appareil"</string>
<string name="audio_sharing_qrcode_button_label" msgid="3207039106555097659">"Afficher le code QR"</string>
<string name="audio_sharing_notification_title" msgid="1204798942946033005">"Vous partagez le contenu audio"</string>
- <string name="audio_sharing_notification_content" msgid="1577180829878785642">"Les personnes qui écoutent peuvent entendre vos contenus multimédias. Ils n\'entendront pas les appels."</string>
+ <string name="audio_sharing_notification_content" msgid="1577180829878785642">"Les personnes qui écoutent peuvent entendre vos contenus multimédias. Elles n\'entendront pas les appels."</string>
<string name="audio_sharing_stop_button_label" msgid="8770519671470608849">"Arrêter le partage"</string>
<string name="audio_sharing_settings_button_label" msgid="8574808650318270491">"Paramètres"</string>
<string name="audio_sharing_disconnect_dialog_title" msgid="2192751727237748602">"Choisir un appareil à déconnecter"</string>
@@ -5342,7 +5396,7 @@
<string name="audio_streams_detail_page_title" msgid="7884132061275273766">"Détails du flux audio"</string>
<string name="audio_streams_qr_code_page_title" msgid="9169570362469544641">"Code QR du flux audio"</string>
<string name="audio_streams_qr_code_page_password" msgid="7268475614131297060">"Mot de passe : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
- <string name="audio_streams_qr_code_page_description" msgid="1317961663706630428">"Pour écouter <xliff:g id="STREAM_NAME">%1$s</xliff:g>, d\'autres personnes peuvent connecter un casque compatible à leur appareil Android. Ils peuvent ensuite scanner ce code QR."</string>
+ <string name="audio_streams_qr_code_page_description" msgid="1317961663706630428">"Pour écouter <xliff:g id="STREAM_NAME">%1$s</xliff:g>, d\'autres personnes peuvent connecter un casque compatible à leur appareil Android. Elles peuvent ensuite scanner ce code QR."</string>
<string name="audio_streams_main_page_title" msgid="1838380471076527639">"Trouver un flux audio"</string>
<string name="audio_streams_main_page_subtitle" msgid="3251995732921981539">"Écouter un appareil qui partage de l\'audio ou un broadcast Auracast à proximité"</string>
<string name="audio_streams_main_page_device_title" msgid="2635744035523908253">"Votre appareil audio"</string>
@@ -5353,4 +5407,5 @@
<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="homepage_search" msgid="6759334912284663559">"Rechercher un paramètre"</string>
</resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 1f4fe3f..ab0cc39 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de durmir"</item>
+ <item msgid="4152450357280759894">"Condución"</item>
+ <item msgid="7096549258219399423">"Envolvente"</item>
+ <item msgid="2760716776980432977">"Xestionado"</item>
+ <item msgid="601734478369121764">"Estrela"</item>
+ <item msgid="6243809315432780521">"Calendario"</item>
+ <item msgid="4913577903148415331">"Hora"</item>
+ <item msgid="3653377604690057780">"Cine"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5e001f7..3fbc865 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Desconectar dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Vincular novo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activar mañá automaticamente"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Configuración dos dispositivos auditivos"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Atallo, compatibilidade con audiófonos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Configuración predeterminada"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"O audiólogo non fixo ningunha configuración predeterminada"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Non se puido actualizar a configuración predeterminada"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Acerca da saída de audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivada"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Opción activada: # aplicación ten acceso á localización}other{Opción activada: # aplicacións teñen acceso á localización}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Cargando…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"As aplicacións con permiso para buscar dispositivos próximos poden determinar a posición relativa dos dispositivos conectados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"As aplicacións con permiso para buscar dispositivos próximos poden determinar a posición relativa dos dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acceso á localización está desactivado para as aplicacións e os dispositivos. Con todo, é posible que a localización do dispositivo se envíe aos servizos de emerxencias cando chames a un número de emerxencias ou lle envíes unha mensaxe."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Máis información sobre a configuración de localización"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para facer o cambio, vai á configuración de ChromeOS > Privacidade e seguranza > Controis de privacidade > Acceso á localización"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Engadíronse o recoñecemento facial e o dispositivo (<xliff:g id="WATCH">%s</xliff:g>)"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Engadíronse o recoñecemento facial, a impresión dixital e o dispositivo (<xliff:g id="WATCH">%s</xliff:g>)"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Engadíronse o recoñecemento facial, as impresións dixitais e o dispositivo (<xliff:g id="WATCH">%s</xliff:g>)"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Esta acción é necesaria porque está activada a comprobación de identidade"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueo de Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Engadiuse o reloxo"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurar o teu reloxo"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Máis información sobre a función Desbloqueo mediante reloxo"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Engadir reloxo"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Quitar reloxo"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Impresión dixital e desbloqueo facial"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueo facial e dactilar"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueo dactilar e facial para o traballo"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Cómpre realizar o proceso de configuración"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Engadíronse a cara e as impresións dixitais"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instala aplicacións"</b>\n"Instala as aplicacións que queiras manter no teu espazo privado"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Importante"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"As aplicacións desactívanse ao bloquear o espazo privado"</b>\n"Cando bloqueas o espazo, as aplicacións que están nel detéñense, polo que non che enviarán notificacións"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Os espazos privados non son axeitados para as aplicacións que deben executarse en segundo plano ou enviar notificacións esenciais, como as aplicacións médicas. A razón é que se deteñen as notificacións e a actividade en segundo plano cando bloqueas o espazo.\n\nUnha vez bloqueado, as aplicacións do espazo privado non aparecerán no xestor de permisos, no panel de privacidade nin noutras opcións de configuración\n\nEste espazo non se pode mover a outro dispositivo. Terás que configurar un novo espazo privado se queres usalo noutro aparello.\n\nCalquera usuario que instale aplicacións daniñas no teu dispositivo ou o conecte a un ordenador poderá acceder ao teu espazo privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Os espazos privados non son axeitados para as aplicacións que deben executarse en segundo plano ou enviar notificacións esenciais, como as aplicacións médicas. A razón é que se deteñen as notificacións e a actividade en segundo plano cando bloqueas o espazo.\n\nUnha vez bloqueado, as aplicacións do espazo privado non aparecerán no xestor de permisos, no panel de privacidade nin noutras opcións de configuración\n\nEste espazo non se pode restaurar noutro dispositivo. Terás que configurar un novo se queres usalo noutro aparello.\n\nCalquera usuario que instale aplicacións maliciosas no teu dispositivo ou o conecte a un ordenador podería acceder ao teu espazo privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Máis información sobre o espazo privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Esta acción tardará uns intres"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando espazo privado…"</string>
@@ -851,7 +850,22 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Queres reiniciar o dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"O rexistro detallado de NFC só se utiliza para fins de programación. Os datos de NFC adicionais inclúense nos informes de erros, que poden conter información privada. Reinicia o dispositivo para cambiar esta opción de configuración."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
- <string name="wifi_display_settings_title" msgid="6451625615274960175">"Emisión"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"proxectar, pantalla externa, conectada, pantalla usb, resolución, rotación"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Ángulo"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Estándar"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
<string name="wifi_display_no_devices_found" msgid="7904877793677102805">"Non hai dispositivos cerca."</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Utilizar teclado en pantalla"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Móstrase na pantalla mentres o teclado físico estea activo"</string>
<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="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="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 para o rato"</string>
+ <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa o teclado físico para controlar o 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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Cambiar recheo punteiro a amarelo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Cambiar recheo do punteiro a rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Cambiar recheo do punteiro a azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo do trazo de punteiro"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Branco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Negro"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ningún"</string>
<string name="trackpad_touch_gesture" msgid="8641725062131922497">"Descubrir xestos no 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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Selección do usuario: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidade do punteiro"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamaño do punteiro"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Reducir o tamaño do punteiro"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumentar o tamaño do punteiro"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Mando do xogo"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirixir vibración"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Envía vibración ao mando de xogos se está conectado"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar igualmente"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración da ampliación"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Desprazamento cun dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mover a lupa cun dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arrastra un dedo para moverte pola pantalla"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Arrastra un dedo para mover a área de ampliación."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Arrastra dous dedos para mover a área de ampliación."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Non dispoñible cando só se amplíe unha parte da pantalla"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toca un botón para achegar o zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Se queres ampliar o contido, achégao rapidamente na pantalla usando o zoom"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Se queres achegar o contido usando o zoom, sigue estes pasos:</b><br/> {0,number,integer}. Utiliza o atallo cando queiras iniciar a ampliación<br/> {1,number,integer}. Toca a pantalla<br/> {2,number,integer}. Para moverte pola pantalla, arrastra dous dedos<br/> {3,number,integer}. Cando queiras axustar o zoom, belisca a pantalla con dous dedos<br/> {4,number,integer}. Utiliza o atallo para deter a ampliación<br/><br/> <b>Para achegar o contido temporalmente usando o zoom, sigue estes pasos:</b><br/> {0,number,integer}. Asegúrate de que o tipo de ampliación estea configurado a pantalla completa<br/> {1,number,integer}. Utiliza o atallo cando queiras iniciar a ampliación<br/> {2,number,integer}. Mantén premido calquera punto da pantalla<br/> {3,number,integer}. Para moverte pola pantalla, arrastra o dedo<br/> {4,number,integer}. Levanta o dedo para deter a ampliación"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Se queres achegar o contido usando o zoom, sigue estes pasos:</b><br/> {0,number,integer}. Utiliza o atallo cando queiras iniciar a ampliación<br/> {1,number,integer}. Toca a pantalla<br/> {2,number,integer}. Para moverte pola pantalla, arrastra dous dedos<br/> {3,number,integer}. Cando queiras axustar o zoom, belisca a pantalla con dous dedos<br/> {4,number,integer}. Usa o atallo para deter a ampliación<br/><br/> Tamén podes achegar a imaxe temporalmente, entre outras cousas."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Se queres achegar o contido usando o zoom, sigue estes pasos:</b><br/> {0,number,integer}. Utiliza o atallo cando queiras iniciar a ampliación<br/> {1,number,integer}. Toca a pantalla<br/> {2,number,integer}. Para moverte pola pantalla, arrastra un ou dous dedos<br/> {3,number,integer}. Cando queiras axustar o zoom, belisca a pantalla con dous dedos<br/> {4,number,integer}. Usa o atallo para deter a ampliación<br/><br/> Tamén podes achegar a imaxe temporalmente, entre outras cousas."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Ao activar a ampliación, podes achegar o contido da pantalla.\n\n"<b>"Para utilizar o zoom"</b>", inicia a ampliación e toca calquera parte da pantalla.\n"<ul><li>"Arrastra 2 ou máis dedos para desprazarte."</li>\n<li>"Belisca con 2 ou máis dedos para axustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom de forma temporal"</b>", inicia a ampliación e mantén premida calquera parte da pantalla.\n"<ul><li>"Arrastra o dedo para moverte pola pantalla."</li>\n<li>"Levanta o dedo para afastar a imaxe ou o texto."</li></ul>\n\n"Ten en conta que non se pode ampliar o teclado nin a barra de navegación."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Páxina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Atallo do botón Accesibilidade"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ningunha planificación}=1{Definiuse 1 planificación}other{Definíronse # planificacións}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Non molestar"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos de prioridade"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Engadir un modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Só se reciben notificacións de aplicacións e persoas importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Seleccionar tipo de activación"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Hora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Por exemplo: \"9:30-17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendario"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Por exemplo: \"calendario persoal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crear un modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizado"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar as interrupcións"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activar modo Non molestar"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"As alarmas e os sons multimedia poden interromper o modo Non molestar"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Planificacións"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Eliminar planificacións"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Eliminar"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Cambiar de nome"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Eliminar"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Queres eliminar o modo <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Planificacións"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Planificación"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Engadir un calendario"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Usar o teu calendario"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programar"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Definir un horario"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programar"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h e <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activar automaticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Planificación"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silencia o teléfono en horas concretas"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir normas de Non molestar"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupcións que emitan son"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear ruído visual"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificacións que podes recibir"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Non te distraias"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Accións adicionais"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desactivado}=1{Desactivado: 1 modo pode activarse automaticamente}other{Opción desactivada: # modos poden activarse automaticamente}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Configuración de visualización"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcións de visualización"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de grises"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"activar tema escuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Cambia o sistema operativo e as aplicacións para daren preferencia a un texto claro sobre un fondo escuro, que é unha opción que pode ser máis agradable para a vista, ademais de supoñer un aforro de batería significativo nalgúns dispositivos"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Non hai ningún cambio na visualización}=1{{effect_1}}=2{{effect_1} e {effect_2}}=3{{effect_1}, {effect_2} e {effect_3}}other{{effect_1}, {effect_2} e # máis}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupcións"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Non hai ningunha interrupción filtrada"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcións de visualización das notificacións filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Cando está activado o modo Non molestar"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notificacións sen son"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"abre a notificación"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir adiar notificacións"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Punto de notificacións nas iconas"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paquetes de notificacións"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbullas"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbullas"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostrar esta conversa nunha burbulla"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Esta aplicación non admite a configuración mellorada"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Máis opcións de configuración"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Hai máis opcións de configuración dentro desta aplicación"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Amainar notificacións"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorías"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Outros"</string>
<string name="no_channels" msgid="4716199078612071915">"Esta aplicación non emitiu notificacións"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorías sen usar"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Configuración adicional da aplicación"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorías sen usar"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorías sen usar"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplicacións que poden interromper"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplicacións seleccionadas"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ningunha"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todas"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selecciona máis aplicacións"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper o modo Non molestar"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguén pode interromper o modo Non molestar"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algunhas persoas poden interromper o modo Non molestar"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Todas as persoas poden interromper o modo Non molestar"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Chamadas repetidas"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir chamadas repetidas"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Cambia durante 1 hora (ata esta hora: {time}) ao modo Só alarmas}other{Cambia durante # horas (ata esta hora: {time}) ao modo Só alarmas}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambiar ao modo Só alarmas ata as <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Cambia a interromper sempre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Editar un modo"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Engadir 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="warning_button_text" msgid="1274234338874005639">"Advertencia"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Pechar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar comentarios do dispositivo"</string>
@@ -4286,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegación"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navegación con 2 botóns"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para cambiar de aplicación, pasa o dedo cara arriba no botón Inicio. Para ver todas as aplicacións pasa o dedo cara arriba de novo. Para volver á pantalla anterior, toca o botón Atrás."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Seguranza e emerxencia"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Seguranza persoal e emerxencia"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Emerxencia SOS, información médica, alertas"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navegación con xestos"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Para ir ao inicio, pasa o dedo cara arriba desde a parte inferior da pantalla. Para cambiar de aplicación, pasa o dedo cara arriba desde a parte inferior da pantalla, mantena premida e sóltaa. Para volver á pantalla anterior, pasa o dedo desde o bordo esquerdo ou dereito."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Carcasa"</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="force_desktop_mode" msgid="1336913605091334238">"Forzar modo de escritorio"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forza o modo de escritorio experimental en pantallas secundarias"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Activar ventás de forma libre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Activa a compatibilidade coas ventás de forma libre."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activar ventás forma libre na pantalla secundaria"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Activa as ventás de forma libre só na pantalla secundaria."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Activar aplicacións sen axuste de tamaño no modo multiventá"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite utilizar as aplicacións sen axuste de tamaño no modo multiventá"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Ignorar Forzar modo escuro"</string>
@@ -4870,14 +4917,14 @@
<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_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="5374451262432025419">"É necesario desbloquear o cargador de arranque para usar o modo de 16 kB"</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 <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="269039281591806585">"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="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Controlador do Informe de erros"</string>
@@ -5009,7 +5056,7 @@
<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="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar servizo de impresión"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir varios usuarios"</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>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"múltiples, usuarios, perfís, persoas, contas, cambiar, moitos"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar depuración sen fíos"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Escolle o que aparecerá na pantalla cando a tableta estea na súa base. Pode que o dispositivo utilice máis enerxía se se usa un protector de pantalla."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Cómpre reiniciar o dispositivo para activar a compatibilidade coa forma libre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Cómpre reiniciar o dispositivo para forzar o modo de escritorio nas pantallas secundarias."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Cómpre reiniciar o dispositivo para activar a compatibilidade coas ventás de forma libre antigas."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Cómpre reiniciar o dispositivo para cambiar a compatibilidade coas ventás de forma libre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Cómpre reiniciar o dispositivo para forzar o uso de ventás de forma libre nas pantallas secundarias."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar agora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar máis adiante"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio espacial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Opción activada"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desactivadas"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Opción activada"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio: %1$d %% do lado esquerdo, %2$d %% do lado dereito"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio: %1$d %% do lado dereito, %2$d %% do lado esquerdo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"As aplicacións que teñas instaladas poderán consultar o nome do teu dispositivo. Tamén poderán velo outros usuarios cando te conectes a dispositivos Bluetooth ou a redes wifi, así como cando configures zonas wifi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Xénero gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Seleccionar o xénero gramatical"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Buscar en Configuración"</string>
</resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 33420db..0219890 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"બેડટાઇમ"</item>
+ <item msgid="4152450357280759894">"ડ્રાઇવિંગ"</item>
+ <item msgid="7096549258219399423">"ઇમર્સિવ"</item>
+ <item msgid="2760716776980432977">"મેનેજ કરેલી"</item>
+ <item msgid="601734478369121764">"સ્ટાર"</item>
+ <item msgid="6243809315432780521">"કૅલેન્ડર"</item>
+ <item msgid="4913577903148415331">"સમય"</item>
+ <item msgid="3653377604690057780">"થિયેટર"</item>
+ <item msgid="3843711267408385410">"ફૂલ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3453adb..093ecdf 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ઉપકરણને ડિસ્કનેક્ટ કરીએ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"નવા ડિવાઇસ જોડો"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"બ્લૂટૂથ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"આવતીકાલે ઑટોમૅટિક રીતે ચાલુ કરો"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"સાંભળવામાં મદદ આપતા ડિવાઇસ સંબંધી સેટિંગ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"શૉર્ટકટ, શ્રવણ યંત્રની સુસંગતતા"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"પ્રીસેટ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"તમારા ઑડિયોલોજિસ્ટ દ્વારા પ્રોગ્રામ કરેલા કોઈ પ્રીસેટ નથી"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"પ્રીસેટ અપડેટ કરી શક્યા નથી"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ઑડિયો આઉટપુટ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ઑડિયો આઉટપુટ વિશે"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"બંધ છે"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ચાલુ છે / # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}one{ચાલુ છે / # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}other{ચાલુ છે / # ઍપ લોકેશનનો ઍક્સેસ ધરાવે છે}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"લોડ કરી રહ્યું છે…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"નજીકના ડિવાઇસ જોવાની પરવાનગી ધરાવતી ઍપ, કનેક્ટ કરેલા ડિવાઇસના સ્થાનની માહિતી મેળવી શકે છે."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"નજીકના ડિવાઇસ જોવાની પરવાનગી ધરાવતી બધી ઍપ, કનેક્ટ કરેલા ડિવાઇસના લોકેશન નિર્ધારિત કરી શકે છે."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ઍપ અને સેવાઓને આપવામાં આવેલો લોકેશનની માહિતીનો ઍક્સેસ બંધ છે. આમ છતાં જ્યારે તમે કૉલ કે ટેક્સ્ટ મારફતે ઇમર્જન્સી નંબરનો સંપર્ક કરશો, ત્યારે ઇમર્જન્સીમાં પ્રતિસાદ આપનારાઓને તમારા ડિવાઇસના લોકેશનની માહિતી મોકલવામાં આવી શકે છે."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"લોકેશન સેટિંગ વિશે વધુ જાણો"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ફેરફાર કરવા માટે, ChromeOS સેટિંગ > પ્રાઇવસી અને સુરક્ષા > પ્રાઇવસીને લગતા નિયંત્રણો > લોકેશન ઍક્સેસ પર જાઓ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ફેસ અને <xliff:g id="WATCH">%s</xliff:g> ઉમેર્યા"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ફેસ, ફિંગરપ્રિન્ટ અને <xliff:g id="WATCH">%s</xliff:g> ઉમેર્યા"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ફેસ, ફિંગરપ્રિન્ટ અને <xliff:g id="WATCH">%s</xliff:g> ઉમેર્યા"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ઓળખની તપાસ ચાલુ હોવાથી આમ કરવું જરૂરી છે"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator અનલૉક"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"વૉચ ઉમેરી"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"તમારી વૉચનું સેટઅપ કરો"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"વૉચ અનલૉક સુવિધા વિશે વધુ જાણો"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"વૉચ ઉમેરો"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"વૉચ કાઢી નાખો"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ફિંગરપ્રિન્ટ અને ફેસ અનલૉક"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ફેસ અનલૉક અને ફિંગરપ્રિન્ટ અનલૉક સુવિધા"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ઑફિસની પ્રોફાઇલ માટે ફેસ અને ફિંગરપ્રિન્ટ અનલૉકની સુવિધા"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"સેટઅપ જરૂરી છે"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ચહેરાનું મૉડલ અને એકથી વધુ ફિંગરપ્રિન્ટ ઉમેરી"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ઍપ ઇન્સ્ટૉલ કરો"</b>\n"તમે તમારી સ્પેસમાં ખાનગી રાખવા માગતા હો, તે ઍપ ઇન્સ્ટૉલ કરો"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ધ્યાનમાં રાખો"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"જ્યારે તમે તમારી સ્પેસ લૉક કરશો, ત્યારે ઍપ બંધ થઈ જશે"</b>\n"જ્યારે તમે તમારી સ્પેસ લૉક કરશો, ત્યારે તમારી સ્પેસમાંની ઍપ બંધ થઈ જશે અને તમને તેમના તરફથી કોઈ નોટિફિકેશન મળશે નહીં"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ખાનગી સ્પેસ એવી ઍપ માટે યોગ્ય નથી કે જેને બૅકગ્રાઉન્ડમાં ચલાવવાની જરૂર પડે અથવા મેડિકલ ઍપ જેવા મહત્ત્વપૂર્ણ નોટિફિકેશન મોકલવાની જરૂર પડે. આનું કારણ એ છે કે જ્યારે તમારી સ્પેસ લૉક કરેલી હોય ત્યારે નોટિફિકેશન અને બૅકગ્રાઉન્ડ ઍક્ટિવિટી બંધ હોય છે.\n\nજ્યારે તમારી ખાનગી સ્પેસ લૉક કરેલી હોય ત્યારે તમારી ખાનગી સ્પેસમાંની ઍપ પરવાનગી મેનેજર, પ્રાઇવસી ડૅશબોર્ડ અને અન્ય સેટિંગમાં દેખાશે નહીં.\n\nતમારી ખાનગી સ્પેસ નવા ડિવાઇસ પર ખસેડી શકાશે નહીં. અન્ય કોઈ ડિવાઇસમાં ઉપયોગ કરવા માટે તમારે અન્ય કોઈ ખાનગી સ્પેસ સેટઅપ કરવી પડશે.\n\nજો કોઈ વ્યક્તિ તમારા ડિવાઇસને કોઈ કમ્પ્યૂટર સાથે જોડે કે તમારા ડિવાઇસ પર નુકસાનકારક ઍપ ઇન્સ્ટૉલ કરે, તો તેઓ તમારી ખાનગી સ્પેસને ઍક્સેસ કરી શકે એમ બને."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ખાનગી સ્પેસ એવી ઍપ માટે યોગ્ય નથી કે જેને બૅકગ્રાઉન્ડમાં ચલાવવાની જરૂર પડે અથવા મેડિકલ ઍપ જેવા મહત્ત્વપૂર્ણ નોટિફિકેશન મોકલવાની જરૂર પડે. આનું કારણ એ છે કે જ્યારે તમારી સ્પેસ લૉક કરેલી હોય ત્યારે નોટિફિકેશન અને બૅકગ્રાઉન્ડ ઍક્ટિવિટી બંધ હોય છે.\n\nજ્યારે ખાનગી સ્પેસ લૉક કરેલી હોય ત્યારે તમારી ખાનગી સ્પેસમાંની ઍપ પરવાનગી મેનેજર, પ્રાઇવસી ડૅશબોર્ડ અને અન્ય સેટિંગમાં દેખાશે નહીં.\n\nતમારી ખાનગી સ્પેસ નવા ડિવાઇસ પર રિસ્ટોર કરી શકાશે નહીં. જો તમે કોઈ બીજા ડિવાઇસ પર તેનો ઉપયોગ કરવા માગતા હો, તો તમારે કોઈ બીજી સ્પેસનું સેટઅપ કરવું જરૂરી રહેશે.\n\nતમારા ડિવાઇસને કોઈ કમ્પ્યૂટર સાથે કનેક્ટ કરનાર કે તમારા ડિવાઇસ પર દુર્ભાવનાપૂર્ણ ઍપ ઇન્સ્ટૉલ કરનાર કોઈપણ વ્યક્તિ તમારી ખાનગી સ્પેસને ઍક્સેસ કરી શકે છે."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ખાનગી સ્પેસ વિશે વધુ જાણો"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"આમાં થોડો સમય લાગશે"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ખાનગી સ્પેસનું સેટઅપ કરી રહ્યાં છીએ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"શું ડિવાઇસને ફરી શરૂ કરીએ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFCનું વિગતવાર લૉગ ઇન માત્ર ડેવલપમેન્ટના હેતુઓ માટે છે. બગ રિપોર્ટમાં વધારાનો NFC ડેટા શામેલ છે, જેમાં ખાનગી માહિતી હોઈ શકે છે. આ સેટિંગમાં ફેરફાર કરવા માટે, તમારા ડિવાઇસને ફરી શરૂ કરો."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ફરી શરૂ કરો"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"મિરર, બાહ્ય ડિસ્પ્લે, કનેક્ટેડ ડિસ્પ્લે, USB ડિસ્પ્લે, રિઝોલ્યુશન, રોટેશન"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"રોટેશન"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"સ્ટૅન્ડર્ડ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"તમારી સ્ક્રીનની બ્રાઇટનેસ તમારા પર્યાવરણ અને પ્રવૃત્તિઓ સાથે ઑટોમૅટિક રીતે ઓછું-વધતું થઈને ગોઠવાશે. તમે સ્લાઇડર મેન્યુઅલી ખસેડીને અડૅપ્ટિવ બ્રાઇટનેસને તમારી પસંદગીઓ જાણવામાં સહાય કરી શકો છો."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"વ્હાઇટ બૅલેન્સ ડિસ્પ્લે"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ઑન-સ્ક્રીન કીબોર્ડનો ઉપયોગ કરો"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"જ્યારે ભૌતિક કીબોર્ડ સક્રિય હોય ત્યારે તેને સ્ક્રીન પર રાખો"</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> msની અંદર એક જ કીને વારંવાર ઝડપથી દબાવવાની પ્રક્રિયાની કીબોર્ડ અવગણના કરે છે"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"પૉઇન્ટર ફીલ શૈલીને પીળામાં બદલો"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"પૉઇન્ટર ફીલ શૈલીને ગુલાબીમાં બદલો"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"પૉઇન્ટર ફીલ શૈલીને વાદળીમાં બદલો"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"પૉઇન્ટર સ્ટ્રોકની શૈલી"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"સફેદ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"કાળો"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"એકપણ નહીં"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"વપરાશકર્તા દ્વારા પસંદ કરેલો: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"સ્પીચ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"પૉઇન્ટરની ગતિ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"પૉઇન્ટર સ્કેલ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"પૉઇન્ટર સ્કેલ ઘટાડો"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"પૉઇન્ટર સ્કેલ વધારો"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"રમત નિયંત્રક"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"વાઇબ્રેશનને રીડાયરેક્ટ કરો"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"કનેક્ટેડ હોય ત્યારે ગેમ નિયંત્રક પર વાઇબ્રેશનને મોકલો"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"તેમ છતાં ચાલુ રાખો"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"રદ કરો"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"સ્ક્રીન મોટી કરવાનું સેટિંગ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"એક આંગળી વડે પૅન કરવાની સુવિધા"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"નાનામોટા કરવાના ભાગને 1 આંગળીથી ખસેડો"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"સ્ક્રીન પર અહીંતહીં જવા 1 આંગળીથી ખેંચો"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"એક આંગળી ખેંચીને મોટું કરવાનો વિસ્તાર ખસેડો."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"બે આંગળી ખેંચીને મોટું કરવાનો વિસ્તાર ખસેડો."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"માત્ર સ્ક્રીનના ભાગને મોટો કરતી વખતે અનુપલબ્ધ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ઝૂમ કરવા માટે બટન ટૅપ કરો"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"કન્ટેન્ટને મોટું કરવા માટે સ્ક્રીનને ઝડપથી મોટી કરો"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>મોટું કરવા માટે:</b><br/> {0,number,integer}. મોટું કરવાનું શરૂ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/> {1,number,integer}. સ્ક્રીન પર ટૅપ કરો<br/> {2,number,integer}. સ્ક્રીન પર કોઈપણ જગ્યાએ જવા માટે 2 આંગળી ખેંચો<br/> {3,number,integer}. નાનું-મોટું કરવાનું ગોઠવવા માટે 2 આંગળી વડે પિન્ચ કરો<br/> {4,number,integer}. મોટું કરવાનું રોકવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/><br/> <b>હંગામી રીતે મોટું કરવા માટે:</b><br/> {0,number,integer}. તમારા ડિવાઇસ પર મોટું કરવાના પ્રકારને પૂર્ણ સ્ક્રીન પર સેટ કરવામાં આવ્યો હોય તેની ખાતરી કરો<br/> {1,number,integer}. મોટું કરવાનું શરૂ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/> {2,number,integer}. સ્ક્રીન પર ગમે-ત્યાં આંગળી ટચ કરીને થોડીવાર દબાવી રાખો<br/> {3,number,integer}. સ્ક્રીન પર કોઈપણ જગ્યાએ જવા માટે આંગળી ખેંચો<br/> {4,number,integer}. મોટું કરવાનું રોકવા માટે આંગળીને ઉઠાવી લો"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>મોટું કરવા માટે:</b><br/> {0,number,integer}. મોટું કરવાનું શરૂ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/> {1,number,integer}. સ્ક્રીન પર ટૅપ કરો<br/> {2,number,integer}. સ્ક્રીન પર અહીંતહીં જવા 2 આંગળીથી ખેંચો<br/> {3,number,integer}. નાનું-મોટું કરવાનું ગોઠવવા માટે 2 આંગળી વડે પિન્ચ કરો<br/> {4,number,integer}. મોટું કરવાનું બંધ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/><br/> તમે હંગામી રીતે મોટું કરવાની સાથે બીજું ઘણું કરી શકો છો."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>મોટું કરવા માટે:</b><br/> {0,number,integer}. મોટું કરવાનું શરૂ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/> {1,number,integer}. સ્ક્રીન પર ટૅપ કરો<br/> {2,number,integer}. સ્ક્રીન પર અહીંતહીં જવા 1 કે 2 આંગળીથી ખેંચો<br/> {3,number,integer}. નાનું-મોટું કરવાનું ગોઠવવા માટે 2 આંગળી વડે પિન્ચ કરો<br/> {4,number,integer}. મોટું કરવાનું બંધ કરવા માટેના શૉર્ટકટનો ઉપયોગ કરો<br/><br/> તમે હંગામી રીતે મોટું કરવાની સાથે બીજું ઘણું કરી શકો છો."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"જ્યારે મેગ્નિફિકેશન ચાલુ હોય, ત્યારે તમે તમારી સ્ક્રીનને મોટી કરી શકો છો.\n\n"<b>"નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ક્યાંય પણ ટૅપ કરો.\n"<ul><li>"સ્ક્રોલ કરવા માટે 2 કે તેથી વધુ આંગળી વડે ખેંચો"</li>\n<li>"નાનું-મોટું ગોઠવવા માટે 2 કે તેથી વધુ આંગળીથી પિન્ચ કરો"</li></ul>\n\n<b>"અસ્થાયી રૂપે નાનું-મોટું કરવા માટે"</b>", મેગ્નિફિકેશન શરૂ કરો, પછી સ્ક્રીન પર ગમે ત્યાં ટચ કરીને થોડીવાર દબાવી રાખો.\n"<ul><li>"સમગ્ર સ્ક્રીન પર આવવા-જવા માટે તમારી આંગળીને ખેંચો"</li>\n<li>"નાનું કરવા માટે તમારી આંગળીને ઉઠાવી લો"</li></ul>\n\n"તમે કીબોર્ડ અથવા નૅવિગેશન બાર પર મોટું કરી શકતાં નથી."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>માંથી <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> પેજ"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ઍક્સેસિબિલિટી બટન શૉર્ટકટ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{એકપણ નહીં}=1{એક શેડ્યૂલ સેટ કરવામાં આવ્યું}one{# શેડ્યૂલ સેટ કરવામાં આવ્યું}other{# શેડ્યૂલ સેટ કરવામાં આવ્યા}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ખલેલ પાડશો નહીં"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"પ્રાધાન્યતાના મોડ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"મોડ ઉમેરો"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ફક્ત મહત્ત્વપૂર્ણ લોકો અને ઍપ દ્વારા નોટિફિકેશન મેળવો"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"સક્રિય કરવાના મોડનો પ્રકાર પસંદ કરો"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"સમય"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ઉદા. \"સવારે 9:30 – સાંજે 5:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"કૅલેન્ડર"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ઉદા. \"વ્યક્તિગત કૅલેન્ડર\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"કોઈ મોડ બનાવો"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"કસ્ટમ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"વિક્ષેપો મર્યાદિત કરો"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ખલેલ પાડશો નહીં ચાલુ કરો"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"અલાર્મ અને મીડિયાના સાઉન્ડ વિક્ષેપ કરી શકે છે"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"શેડ્યૂલ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"શેડ્યૂલ ડિલીટ કરો"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ડિલીટ કરો"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"નામ બદલો"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ડિલીટ કરો"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" મોડ ડિલીટ કરીએ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ફેરફાર કરો"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"શેડ્યૂલ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"શેડ્યૂલ કરો"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"કૅલેન્ડર ઉમેરો"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"તમારા કૅલેન્ડરનો ઉપયોગ કરો"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"શેડ્યૂલ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"શેડ્યૂલ સેટ કરો"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"શેડ્યૂલ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> કલાક, <xliff:g id="MINUTES">%2$d</xliff:g> મિનિટ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ઑટોમૅટિક રીતે ચાલુ કરો"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"શેડ્યૂલ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ચોક્કસ સમયે ફોનના અવાજને મ્યૂટ કરો"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"ખલેલ પાડશો નહીંના નિયમો સેટ કરો"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"અવાજવાળા વિક્ષેપોને મંજૂરી આપો"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"દૃશ્ય વિક્ષેપોને બ્લૉક કરો"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"વિઝ્યુઅલ સંકેતોને મંજૂરી આપો"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"તમારા સુધી પહોંચી શકે તેવા નોટિફિકેશન"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"એકાગ્રચિત્ત રહો"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"અતિરિક્ત ક્રિયાઓ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{બંધ}=1{બંધ / 1 મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}one{બંધ / # મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}other{બંધ / # મોડ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ડિસ્પ્લે સેટિંગ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ડિસ્પ્લેનાં વિકલ્પો"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ગ્રેસ્કેલ"</string>
@@ -3369,7 +3407,9 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ડાર્ક થીમ ચાલુ કરો"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"OS અને ઍપ સ્વિચ કરો, જેથી ઘેરા બૅકગ્રાઉન્ડ પર લાઇટ ટેક્સ્ટની પસંદગી કરી શકાય, જેનાથી આંખો માટે વધુ સરળતા રહી શકે છે અને અમુક ડિવાઇસ પર બૅટરીની નોંધપાત્ર બચતનો લાભ મળે છે"</string>
<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}}one{{effect_1}, {effect_2} અને વધુ #}other{{effect_1}, {effect_2} અને વધુ #}}"</string>
- <string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"ફિલ્ટર કરેલા નોટિફિકેશન માટેના વિકલ્પો બતાવો"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"વિક્ષેપને ફિલ્ટર કરો"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"કોઈ વિક્ષેપને ફિલ્ટર કરેલા નથી"</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>
@@ -3455,7 +3495,7 @@
<string name="work_sync_dialog_yes" msgid="5785488304957707534">"કન્ફર્મ કરો"</string>
<string name="work_sync_dialog_message" msgid="5066178064994040223">"તમારી ઑફિસની પ્રોફાઇલ તમારી વ્યક્તિગત પ્રોફાઇલ જેનો ઉપયોગ કરે છે એ જ સાઉન્ડનો ઉપયોગ કરશે"</string>
<string name="configure_notification_settings" msgid="1492820231694314376">"નોટિફિકેશન"</string>
- <string name="notification_dashboard_summary" msgid="7530169251902320652">"નોટિફિકેશનનો ઇતિહાસ, વાતચીત"</string>
+ <string name="notification_dashboard_summary" msgid="7530169251902320652">"નોટિફિકેશનનો ઇતિહાસ, વાતચીતો"</string>
<string name="conversation_notifs_category" msgid="2549844862379963273">"વાતચીત"</string>
<string name="general_notification_header" msgid="3669031068980713359">"મેનેજ કરો"</string>
<string name="app_notification_field" msgid="3208079070539894909">"ઍપ નોટિફિકેશન"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"નોટિફિકેશન ખોલો"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"નોટિફિકેશન સ્નૂઝ કરવાની મંજૂરી આપો"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ઍપ આઇકન પર નોટિફિકેશનનું ચિહ્ન"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"નોટિફિકેશન બંડલ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"બબલ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"બબલ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"આ વાતચીતને બબલ તરીકે બતાવો"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"આ ઍપ વધારાના સેટિંગને સપોર્ટ કરતી નથી"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"વધુ સેટિંગ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"આ ઍપમાં વધુ સેટિંગ ઉપલબ્ધ છે"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"નોટિફિકેશન કૂલડાઉન"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ઑફિસની પ્રોફાઇલ પર લાગુ કરો"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ઑફિસની પ્રોફાઇલ ઍપ પર લાગુ કરો"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"કૅટેગરી"</string>
<string name="notification_channels_other" msgid="18159805343647908">"અન્ય"</string>
<string name="no_channels" msgid="4716199078612071915">"આ ઍપએ કોઈ નોટિફિકેશન પોસ્ટ કરી નથી"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"બિનવપરાયેલી કૅટેગરી બતાવો"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ઍપમાંના વધારાના સેટિંગ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"બિનવપરાયેલી કૅટેગરી બતાવો"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"બિનવપરાયેલી કૅટેગરી છુપાવો"</string>
@@ -3762,7 +3803,7 @@
<string name="zen_mode_system_list" msgid="2256218792042306434">"ટચ સાઉન્ડ"</string>
<string name="zen_mode_system_list_first" msgid="8590078626001067855">"ટચ સાઉન્ડ"</string>
<string name="zen_mode_reminders" msgid="1970224691551417906">"રિમાઇન્ડર"</string>
- <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"કાર્યો અને રિમાઇન્ડરથી"</string>
+ <string name="zen_mode_reminders_summary" msgid="3961627037429412382">"ટાસ્ક અને રિમાઇન્ડરથી"</string>
<string name="zen_mode_reminders_list" msgid="3133513621980999858">"રિમાઇન્ડર"</string>
<string name="zen_mode_reminders_list_first" msgid="1130470396012190814">"રિમાઇન્ડર"</string>
<string name="zen_mode_events" msgid="7425795679353531794">"કૅલેન્ડર ઇવેન્ટ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"વિક્ષેપ ઊભો કરી શકે તેવી ઍપ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"પસંદગીની ઍપ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"એકપણ નહીં"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"બધી"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"અૅપને ઓવરરાઇડ કરવાની મંજૂરી આપો"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"વિક્ષેપ ઊભો કરી શકે તેવી ઍપ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"વધુ ઍપ પસંદ કરો"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"કોઈપણ સાઉન્ડ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"કોઈપણ વિક્ષેપ કરી શકશે નહીં"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"અમુક લોકો વિક્ષેપ કરી શકે છે"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"બધા લોકો વિક્ષેપ કરી શકે છે"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"પુનરાવર્તિત કૉલર્સ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"રિપીટ કૉલરને મંજૂરી આપો"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} સુધી ફક્ત એક કલાક માટે અલાર્મમાં બદલો}one{{time} સુધી ફક્ત # કલાક માટે અલાર્મમાં બદલો}other{{time} સુધી ફક્ત # કલાક માટે અલાર્મમાં બદલો}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"એલાર્મ્સ પર ફક્ત <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> સુધી બદલો"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"હંમેશાં ખલેલ પાડો પર બદલો"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ફેરફાર કરવાનો મોડ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"મોડ ઉમેરો"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"કસ્ટમ મોડ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"મોડનું નામ"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ચેતવણી"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"બંધ કરો"</string>
<string name="device_feedback" msgid="5351614458411688608">"આ ડિવાઇસ વિશે પ્રતિસાદ મોકલો"</string>
@@ -4022,8 +4067,8 @@
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"બહેતર બૅટરી આવરદા માટે ભલામણ કરેલ"</string>
<string name="app_list_preference_none" msgid="1635406344616653756">"કોઈ નહીં"</string>
<string name="work_profile_usage_access_warning" msgid="3477719910927319122">"આ ઍપ્લિકેશન માટે વપરાશ ઍક્સેસ બંધ કરવી તે તમારા વ્યવસ્થાપકને તમારી કાર્ય પ્રોફાઇલમાં ઍપ્લિકેશનો માટે ડેટા વપરાશને ટ્રૅક કરવાથી અટકાવતું નથી"</string>
- <string name="draw_overlay" msgid="7902083260500573027">"અન્ય ઍપથી ઉપર બતાવો"</string>
- <string name="system_alert_window_settings" msgid="6458633954424862521">"અન્ય ઍપથી ઉપર બતાવો"</string>
+ <string name="draw_overlay" msgid="7902083260500573027">"અન્ય ઍપની ઉપર ડિસ્પ્લે કરો"</string>
+ <string name="system_alert_window_settings" msgid="6458633954424862521">"અન્ય ઍપની ઉપર ડિસ્પ્લે કરો"</string>
<string name="permit_draw_overlay" msgid="4468994037192804075">"અન્ય ઍપની ઉપર ડિસ્પ્લે કરવાની મંજૂરી આપો"</string>
<string name="allow_overlay_description" msgid="1607235723669496298">"તમે ઉપયોગમાં લઈ રહ્યાં હો તેવી અન્ય ઍપની ટોચ ઉપર આ ઍપને ડિસ્પ્લે થવા દો. આ ઍપ તમે ક્યાં ટૅપ કરો છો અથવા તો સ્ક્રીનના ડિસ્પ્લે પર શું ફેરફાર કરો છો તે જોઈ શકશે."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"મીડિયા આઉટપુટ બદલો"</string>
@@ -4172,7 +4217,7 @@
<string name="unrestricted_data_saver" msgid="5913547065342097274">"અસીમિત મોબાઇલ ડેટા"</string>
<string name="restrict_background_blocklisted" msgid="2308345280442438232">"બૅકગ્રાઉન્ડ ડેટા બંધ કર્યો છે"</string>
<string name="data_saver_on" msgid="7848893946018448793">"ચાલુ"</string>
- <string name="data_saver_off" msgid="5891210864117269045">"બંધ"</string>
+ <string name="data_saver_off" msgid="5891210864117269045">"બંધ છે"</string>
<string name="data_saver_switch_title" msgid="7111538580123722959">"ડેટા સેવરનો ઉપયોગ કરો"</string>
<string name="unrestricted_app_title" msgid="8531936851059106374">"અસીમિત મોબાઇલ ડેટા વપરાશ"</string>
<string name="unrestricted_app_summary" msgid="8320813971858627624">"જ્યારે ડેટા સેવર ચાલુ હોય ત્યારે અસીમિત મોબાઇલ ડેટાના ઍક્સેસની મંજૂરી આપો"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ફરજિયાત ડેસ્કટૉપ મોડ ચાલુ કરો"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"સેકન્ડરી ડિસ્પ્લે પર ફરજિયાત પ્રયોગાત્મક ડેસ્કટૉપ મોડ ચાલુ કરો"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ફ્રીફોર્મ વિન્ડો ચાલુ કરો"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ફ્રીફોર્મ વિન્ડો માટે સપોર્ટ મેળવવાની સુવિધા ચાલુ કરો."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"બીજા ડિસ્પ્લે પર ફ્રીફોર્મ વિન્ડો ચાલુ કરો"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"માત્ર સેકન્ડરી ડિસ્પ્લે પર ફ્રીફોર્મ વિન્ડો ચાલુ કરો."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"એકથી વધુ વિન્ડોમાં ફરીથી કદ ન બદલી શકવાનો વિકલ્પ ચાલુ કરો"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ફરીથી કદ ન બદલી શકે તેવી ઍપને એકથી વધુ વિન્ડોમાં દેખાવાની મંજૂરી આપે છે"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ફરજિયાત ઘેરા મોડની સુવિધાને ઓવરરાઇડ કરો"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"ડેવલપરના 16KB વિકલ્પનો ઉપયોગ કરતા પહેલાં આ ડિવાઇસના ડેટા પાર્ટીશનને ext4માં રૂપાંતરિત કરવાની જરૂર છે. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. 16KB વિકલ્પને સક્રિય કરવાથી આ પછી વધુ એક વખત રીબૂટ કરવાની જરૂર પડશે. એકવાર તમે આ મોડમાં આવી ગયા પછી, એક જ વખત રીબૂટ કરીને તમે 4KB અને 16KB મોડ વચ્ચે આગળ અને પાછળ સ્વિચ કરી શકો છો. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. ડિવાઇસને પ્રોડક્શન મોડમાં પાછું લાવવા માટે, તમારે 4KB મોડ પર પાછા સ્વિચ કરવાની અને પછી બૂટલોડરને લૉક કરવાની જરૂર પડશે, જે ડિવાઇસને ફેક્ટરી રીસેટ કરે છે. ડિવાઇસ સફળતાપૂર્વક Androidમાં બૂટ થાય તે પછી, ડેવલપરના વિકલ્પોમાં OEM અનલૉક કરવાની સુવિધાને ચાલુ કરો. ડિવાઇસને વાઇપ કરવામાં આવશે અને કન્ફર્મેશન પછી ફાઇલસિસ્ટમને ext4માં બદલવામાં આવશે. આ પૂર્ણ થયા પછી, 16KB ફરીથી ચાલુ કરવા માટે કૃપા કરીને પાછા આવો."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"બધો ડેટા કાઢી નાખો"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ડેટા પાર્ટિશનને ext4 પર ફરીથી ફૉર્મેટ અને વાઇપ કરી શક્યા નહીં."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB મોડ માટે બૂટલોડરને અનલૉક કરવાની જરૂર છે"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"બૂટલોડર અનલૉક કરવું આવશ્યક છે"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"ડેવલપરના 16KB વિકલ્પનો ઉપયોગ કરતા પહેલાં આ ડિવાઇસ દ્વારા બૂટલોડરને અનલૉક કરવાની જરૂર છે. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. 16KB મોડ સક્રિય કરતી વખતે વપરાશકર્તાનો તમામ ડેટા અને સેટિંગ વાઇપ થઈ જશે. એકવાર બૂટલોડર અનલૉક કરવામાં આવે, પછી 16KB વિકલ્પને સક્રિય કરવા માટે બે વખત રીબૂટ કરવાની જરૂર પડશે. એકવાર તમે આ મોડમાં આવી ગયા પછી, એક જ વખત રીબૂટ કરીને તમે 4KB અને 16KB મોડ વચ્ચે આગળ અને પાછળ સ્વિચ કરી શકો છો. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. ડિવાઇસને પ્રોડક્શન મોડમાં પાછું લાવવા માટે, તમારે 4KB મોડ પર પાછા સ્વિચ કરવાની જરૂર પડશે અને પછી OEM/બૂટલોડર ડિવાઇસને લૉક (જે ફેક્ટરી રીસેટ કરે છે) કરે છે. કૃપા કરીને બૂટલોડરને અનલૉક કરો અને ફરી પ્રયાસ કરો. તમે આ કેવી રીતે કરવું તે માટેની સૂચનાઓ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> પર જોઈ શકો છો"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB પેજ-એગ્નોસ્ટિક મોડનો ઉપયોગ કરીને"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"તમે પેજ-એગ્નોસ્ટિક મોડના 4KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે ડિવાઇસના બૂટલોડરને લૉક કરવું આવશ્યક છે. વધુ વાંચવા ટૅપ કરો."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"તમે પેજ-એગ્નોસ્ટિક મોડના 4KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે ડિવાઇસના બૂટલોડરને લૉક કરવું આવશ્યક છે. આ ડિવાઇસને ફરીથી ફેક્ટરી રીસેટ કરશે અને તેને પ્રોડક્શન સેટિંગમાં રિસ્ટોર કરશે. ડિવાઇસ સફળતાપૂર્વક Androidમાં બૂટ થાય તે પછી, ડેવલપરના વિકલ્પોમાં OEM અનલૉક કરવાની સુવિધાને ચાલુ કરો. જો ડિવાઇસ Androidમાં બૂટ કરવામાં નિષ્ફળ જાય અથવા અસ્થિર હોય, તો <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> પરથી નવીનતમ ફેક્ટરી છબીઓ સાથે ડિવાઇસને ફરીથી ફ્લૅશ કરો અથવા <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>નો ઉપયોગ કરો અને \'ડિવાઇસ વાઇપ કરો\', \'બૂટલોડર લૉક કરો\' અને \'તમામ પાર્ટિશનને ફરજિયાત ફ્લૅશ કરો\' પસંદ કરો."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB પેજ-એગ્નોસ્ટિક મોડનો ઉપયોગ કરીને"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"તમે પેજ-એગ્નોસ્ટિક મોડના 16KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે 4K મોડ પર પાછા સ્વિચ કરવું આવશ્યક છે અને પછી ડિવાઇસના બૂટલોડરને લૉક કરો. વધુ વાંચવા ટેપ કરો."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"તમે પેજ-એગ્નોસ્ટિક મોડના 16KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી, અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોન પર સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશન કામ કરશે નહીં. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે 4K મોડ પર પાછા સ્વિચ કરવું આવશ્યક છે અને પછી ડિવાઇસના બૂટલોડરને લૉક કરો. આ ડિવાઇસને ફરીથી ફેક્ટરી રીસેટ કરશે અને તેને પ્રોડક્શન સેટિંગમાં રિસ્ટોર કરશે. ડિવાઇસ સફળતાપૂર્વક Androidમાં બૂટ થાય તે પછી, ડેવલપરના વિકલ્પોમાં OEM અનલૉક કરવાની સુવિધાને ચાલુ કરો. જો ડિવાઇસ Androidમાં બૂટ કરવામાં નિષ્ફળ જાય અથવા અસ્થિર હોય, તો <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> પરથી નવીનતમ ફેક્ટરી છબીઓ સાથે ડિવાઇસને ફરીથી ફ્લૅશ કરો અથવા <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>નો ઉપયોગ કરો અને \'ડિવાઇસ વાઇપ કરો\', \'બૂટલોડર લૉક કરો\' અને \'તમામ પાર્ટિશનને ફરજિયાત ફ્લૅશ કરો\' પસંદ કરો."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"તમે પેજ-એગ્નોસ્ટિક મોડના 16KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોનમાં સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશનો કામ ન કરે એવું બની શકે છે. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે 4KB મોડ પર પાછા સ્વિચ કરવું આવશ્યક છે અને પછી ડિવાઇસના બૂટલોડરને લૉક કરો. વધુ વાંચવા માટે ટૅપ કરો."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"તમે પેજ-એગ્નોસ્ટિક મોડના 16KB મોડમાં છો. આ મોડમાં સૉફ્ટવેરની સંપૂર્ણતાની ગૅરંટી આપી શકાતી નથી અને જ્યારે બૂટલોડર અનલૉક કરેલું હોય ત્યારે ફોનમાં સ્ટોર કરેલો કોઈપણ ડેટા જોખમમાં હોઈ શકે છે. આ મોડમાં અમુક સુવિધાઓ બંધ કરવામાં આવશે, તેથી અમુક ઍપ્લિકેશનો કામ ન કરે એવું બની શકે છે. પ્રોડક્શન મોડમાં ફરીથી દાખલ થવા માટે, તમારે 4KB મોડ પર પાછા સ્વિચ કરવું આવશ્યક છે અને પછી ડિવાઇસના બૂટલોડરને લૉક કરો. આ ડિવાઇસને ફરીથી ફેક્ટરી રીસેટ કરશે અને તેને પ્રોડક્શન સેટિંગમાં રિસ્ટોર કરશે. ડિવાઇસ સફળતાપૂર્વક Androidમાં બૂટ થાય તે પછી, ડેવલપરના વિકલ્પોમાં OEM અનલૉક કરવાના સેટિંગને બંધ કરો. જો ડિવાઇસ Android OSથી બૂટ થવાનું નિષ્ફળ રહે અથવા અસ્થિર હોય, તો ડિવાઇસને <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>ની નવીનતમ ફેક્ટરી છબીઓથી OS ફરીથી ફ્લૅશ કરો અથવા <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>નો ઉપયોગ કરો તેમજ \'ડિવાઇસનો ડેટા વાઇપ કરો\', \'બૂટલોડર લૉક કરો\' અને \'તમામ પાર્ટિશન ફરજિયાત રીતે ફલૅશ કરો\' પસંદ કરો."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB પેજ એગ્નોસ્ટિક મોડ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"વધુ વાંચો"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"બગ રિપોર્ટ હૅન્ડલ કરનાર"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ઍપ પિનિંગનો ઉપયોગ કરો"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ડેવલપરના વિકલ્પોનો ઉપયોગ કરો"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"પ્રિન્ટ સેવાનો ઉપયોગ કરો"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"એકથી વધુ વપરાશકર્તાઓને મંજૂરી આપો"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"વપરાશકર્તા સ્વિચ કરવાની મંજૂરી આપો"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"મંજૂરી આપો, એકથી વધુ, વપરાશકર્તા, પરવાનગી આપો, અનેક"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"એકથી વધુ, વપરાશકર્તાઓ, પ્રોફાઇલ, લોકો, એકાઉન્ટ, સ્વિચ કરો, ઘણા"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"વાયરલેસ ડિબગીંગનો ઉપયોગ કરો"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"જ્યારે તમારું ટૅબ્લેટ ડૉક કરેલું હોય, ત્યારે તમે તમારી સ્ક્રીન પર શું જોશો તે પસંદ કરો. જ્યારે સ્ક્રીનસેવરનો ઉપયોગ કરવામાં આવે, ત્યારે તમારું ડિવાઇસ વધુ ઊર્જાનો ઉપયોગ કરી શકે છે."</string>
<string name="customize_button_title" msgid="1110284655990203359">"કસ્ટમાઇઝ કરો"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>ને કસ્ટમાઇઝ કરો"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ફ્રીફોર્મ સપોર્ટ ચાલુ કરવા માટે રીબૂટ કરવું જરૂરી છે."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ગૌણ ડિસ્પ્લે પર ડેસ્કટૉપ મોડ લાગુ થવાની ફરજ પાડવા માટે રીબૂટ કરવું જરૂરી છે."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"જૂની ફ્રીફોર્મ વિન્ડો માટે સપોર્ટ મેળવવાની સુવિધા ચાલુ કરવા રીબૂટ કરવું જરૂરી છે."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ફ્રીફોર્મ વિન્ડો માટે સપોર્ટ મેળવવાની સુવિધા બદલવા રીબૂટ કરવું જરૂરી છે."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"સેકન્ડરી ડિસ્પ્લે પર ફ્રીફોર્મ વિન્ડો ફરજિયાત રીતે ચાલુ કરવા માટે રીબૂટ કરવું જરૂરી છે."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"હમણાં રીબૂટ કરો"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"પછીથી રીબૂટ કરો"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"સ્પેશલ ઑડિયો"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ચાલુ"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"બંધ"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ચાલુ"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ઑડિયો %1$d%% ડાબી બાજુ, %2$d%% જમણી બાજુ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ઑડિયો %1$d%% જમણી બાજુ, %2$d%% ડાબી બાજુ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"તમે ઇન્સ્ટૉલ કરેલી ઍપ તમારા ડિવાઇસનું નામ જોઈ શકે છે. જ્યારે તમે બ્લૂટૂથ ડિવાઇસથી કનેક્ટ કરો, કોઈ વાઇ-ફાઇ નેટવર્કથી કનેક્ટ કરો અથવા કોઈ વાઇ-ફાઇ હૉટસ્પૉટ સેટઅપ કરો ત્યારે અન્ય લોકો પણ તે જોઈ શકે છે."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"વ્યાકરણ અનુસારનું લિંગ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"વ્યાકરણ અનુસારનું લિંગ પસંદ કરો"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"શોધ સેટિંગ"</string>
</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index f05608a..3db8312 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"बेडटाइम"</item>
+ <item msgid="4152450357280759894">"ड्राइविंग"</item>
+ <item msgid="7096549258219399423">"इमर्सिव"</item>
+ <item msgid="2760716776980432977">"मैनेज किया गया"</item>
+ <item msgid="601734478369121764">"स्टार"</item>
+ <item msgid="6243809315432780521">"कैलेंडर"</item>
+ <item msgid="4913577903148415331">"समय"</item>
+ <item msgid="3653377604690057780">"थिएटर"</item>
+ <item msgid="3843711267408385410">"फूल"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f10c11c..a866ad6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"डिवाइस डिसकनेक्ट करना चाहते हैं?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नया डिवाइस जोड़ें"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लूटूथ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ब्लूटूथ कल अपने-आप चालू हो जाएगा"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"कान की मशीन की सेटिंग"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"शॉर्टकट, कान की मशीन के साथ काम करने की सुविधा"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"प्रीसेट"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"आपके ऑडियोलॉजिस्ट ने कोई प्रीसेट सेट नहीं किया है"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"प्रीसेट अपडेट नहीं किया जा सका"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ऑडियो आउटपुट"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ऑडियो आउटपुट की जानकारी"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद है"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{चालू है / # ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है}one{चालू है / # ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है}other{चालू है / # ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"लोड हो रहा है…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ऐसे ऐप्लिकेशन, जिन्हें आस-पास मौजूद डिवाइसों के साथ इंटरैक्ट करने की अनुमति मिली है वे कनेक्ट किए गए डिवाइसों की जगह की जानकारी का पता लगा सकते हैं."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"जिन ऐप्लिकेशन को आस-पास मौजूद डिवाइसों के साथ इंटरैक्ट करने की अनुमति मिली है वे कनेक्ट किए गए डिवाइसों की जगह की जानकारी का पता लगा सकते हैं."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ऐप्लिकेशन और सेवाओं के लिए, जगह की जानकारी का ऐक्सेस बंद है. आपके डिवाइस की जगह की जानकारी, आपातकालीन स्थिति में मदद करने वाले लोगों को अब भी दी जा सकती है. ऐसा आपके किसी आपातकालीन नंबर पर कॉल करने या मैसेज भेजने पर किया जाएगा."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"जगह की जानकारी की सेटिंग के बारे में ज़्यादा जानें"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"इसे बदलने के लिए, ChromeOS की सेटिंग > निजता और सुरक्षा > निजता सेटिंग > जगह की जानकारी के ऐक्सेस पर जाएं"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"चेहरा और <xliff:g id="WATCH">%s</xliff:g> सेट अप की गई"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"चेहरा, फ़िंगरप्रिंट, और <xliff:g id="WATCH">%s</xliff:g> सेट अप की गई"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"चेहरा, फ़िंगरप्रिंट, और <xliff:g id="WATCH">%s</xliff:g> सेट अप की गई"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"बायोमेट्रिक्स इस्तेमाल करना ज़रूरी है, क्योंकि पहचान की पुष्टि करने की सुविधा वाली सेटिंग चालू है"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator अनलॉक करें"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"स्मार्टवॉच जोड़ दी गई"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"अपनी स्मार्ट वॉच सेट अप करें"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"स्मार्टवॉच से फ़ोन अनलॉक करने की सुविधा के बारे में ज़्यादा जानें"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"स्मार्टवॉच कनेक्ट करें"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"स्मार्टवॉच डिसकनेक्ट करें"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"फ़िंगरप्रिंट और फ़ेस अनलॉक"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"फ़िंगरप्रिंट और फ़ेस अनलॉक"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"वर्क प्रोफ़ाइल के लिए, फ़ेस और फ़िंगरप्रिंट अनलॉक की सुविधा"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"सेटअप करना होगा"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"चेहरे का मॉडल और फ़िंगरप्रिंट जोड़े गए"</string>
@@ -547,7 +548,7 @@
<string name="work_profile_category_header" msgid="85707750968948517">"वर्क प्रोफ़ाइल"</string>
<string name="private_space_title" msgid="1752064212078238723">"प्राइवेट स्पेस"</string>
<string name="private_space_summary" msgid="2274405892301976238">"निजी ऐप्लिकेशन को लॉक करके और छिपाकर रखें"</string>
- <string name="private_space_description" msgid="4059594203775816136">"निजी ऐप्लिकेशन ऐसी जगह पर रखें जिसे छिपाया या लॉक किया जा सकता है"</string>
+ <string name="private_space_description" msgid="4059594203775816136">"निजी ऐप्लिकेशन ऐसी जगह पर रखें जहां आप उन्हें लॉक कर सकें या छिपा सकें"</string>
<string name="private_space_lock_title" msgid="7230836881433350526">"प्राइवेट स्पेस के लिए लॉक"</string>
<string name="private_space_one_lock_summary" msgid="2106513606571219068">"डिवाइस की तरह ही, प्राइवेट स्पेस को अनलॉक किया जा सकता है या कोई दूसरा लॉक सेट किया जा सकता है"</string>
<string name="private_space_screen_lock_title" msgid="8679383894967823163">"डिवाइस के स्क्रीन लॉक का इस्तेमाल करें"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ऐप्लिकेशन इंस्टॉल करें"</b>\n"ऐसे ऐप्लिकेशन इंस्टॉल करें जिन्हें आपको अपने स्पेस में निजी रखना है"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ध्यान रखें"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"स्पेस को लॉक करने से, ऐप्लिकेशन बंद हो जाते हैं"</b>\n"स्पेस को लॉक करने से, स्पेस में मौजूद ऐप्लिकेशन बंद हो जाते हैं, जिस वजह से आपको ऐप्लिकेशन से सूचनाएं नहीं मिलती हैं"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"प्राइवेट स्पेस का इस्तेमाल, बैकग्राउंड में चलाए जाने वाले या ज़रूरी सूचनाएं भेजने वाले ऐप्लिकेशन के लिए नहीं किया जा सकता. जैसे, चिकित्सा से जुड़े ऐप्लिकेशन. ऐसा इसलिए है, क्योंकि स्पेस के लॉक होने पर सूचनाएं भेजने की सुविधा और बैकग्राउंड में चल रही गतिविधि बंद हो जाती है.\n\nप्राइवेट स्पेस के लॉक होने पर, उसमें मौजूद ऐप्लिकेशन, \'अनुमतियों को मैनेज करें\' सेक्शन, प्राइवसी डैशबोर्ड, और अन्य सेटिंग में नहीं दिखेंगे.\n\nआपके प्राइवेट स्पेस को किसी नए डिवाइस में ट्रांसफ़र नहीं किया जा सकता. किसी दूसरे डिवाइस में इस्तेमाल करने के लिए, आपको दूसरा प्राइवेट स्पेस सेट अप करना होगा.\n\nआपके डिवाइस को कंप्यूटर से कनेक्ट करने या डिवाइस में, नुकसान पहुंचाने वाले ऐप्लिकेशन इंस्टॉल करने वाला व्यक्ति आपके प्राइवेट स्पेस को ऐक्सेस कर सकता है."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"प्राइवेट स्पेस का इस्तेमाल, बैकग्राउंड में चलाए जाने वाले या ज़रूरी सूचनाएं भेजने वाले ऐप्लिकेशन के लिए नहीं किया जा सकता. जैसे, चिकित्सा से जुड़े ऐप्लिकेशन. ऐसा इसलिए है, क्योंकि स्पेस के लॉक होने पर सूचनाएं भेजने की सुविधा और बैकग्राउंड में चल रही गतिविधि बंद हो जाती है.\n\nप्राइवेट स्पेस के लॉक होने पर, उसमें मौजूद ऐप्लिकेशन, \'अनुमतियों को मैनेज करें\' सेक्शन, प्राइवसी डैशबोर्ड, और अन्य सेटिंग में नहीं दिखेंगे.\n\nआपके प्राइवेट स्पेस को किसी नए डिवाइस पर नहीं ले जाया जा सकता. किसी दूसरे डिवाइस में इस्तेमाल करने के लिए, आपको दूसरा स्पेस सेट अप करना होगा.\n\nआपके डिवाइस को कंप्यूटर से कनेक्ट करने या डिवाइस में, नुकसान पहुंचाने वाले ऐप्लिकेशन इंस्टॉल करने वाला व्यक्ति आपके प्राइवेट स्पेस को ऐक्सेस कर सकता है."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"प्राइवेट स्पेस के बारे में ज़्यादा जानें"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"इसमें कुछ समय लगेगा"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"प्राइवेट स्पेस सेट अप किया जा रहा है…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"क्या आपको डिवाइस रीस्टार्ट करना है?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"एनएफ़सी का लाॅग सिर्फ़ डेवलपमेंट के मकसद से बनाया गया है. गड़बड़ी की रिपोर्ट में एनएफ़सी का अतिरिक्त डेटा शामिल होता है. इसमें निजी जानकारी भी शामिल हो सकती है. इस सेटिंग को बदलने के लिए, डिवाइस को रीस्टार्ट करें."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"रीस्टार्ट करें"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"स्क्रीन शेयर करना, बाहरी डिसप्ले, कनेक्ट किया गया डिसप्ले, यूएसबी डिसप्ले, रिज़ॉल्यूशन, रोटेशन"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"रोटेशन"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"स्टैंडर्ड रोटेशन"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1174,7 +1188,7 @@
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"व्यक्तिगत खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="search_settings" msgid="7573686516434589771">"खोजें"</string>
<string name="display_settings" msgid="7197750639709493852">"डिसप्ले"</string>
- <string name="accelerometer_title" msgid="7745991950833748909">"स्क्रीन की ओरिएंटेशन अपने-आप बदलना (ऑटो-रोटेट)"</string>
+ <string name="accelerometer_title" msgid="7745991950833748909">"ऑटो-रोटेट"</string>
<string name="auto_rotate_option_off" msgid="2788096269396290731">"बंद है"</string>
<string name="auto_rotate_option_on" msgid="5776678230808498171">"चालू है"</string>
<string name="auto_rotate_option_face_based" msgid="3438645484087953174">"चालू है - चेहरे के हिसाब से"</string>
@@ -1189,9 +1203,10 @@
<string name="color_mode_option_natural" msgid="6192875655101283303">"बिना किसी बदलाव के"</string>
<string name="color_mode_option_boosted" msgid="4698797857766774289">"बूस्ट किया गया"</string>
<string name="color_mode_option_saturated" msgid="3413853820158447300">"रंग को गहरा या फीका किया गया"</string>
- <string name="color_mode_option_automatic" msgid="2281217686509980870">"ज़रूरत के हिसाब से स्क्रीन की चमक बदलता है"</string>
+ <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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ऑन-स्क्रीन कीबोर्ड का इस्तेमाल करें"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"इसे सामान्य कीबोर्ड चालू रहने के दौरान भी स्क्रीन पर दिखाएं"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"पॉइंटर फ़िल स्टाइल, येलो में बदलें"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"पॉइंटर फ़िल स्टाइल, पिंक में बदलें"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"पॉइंटर फ़िल स्टाइल, ब्लू में बदलें"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"पॉइंटर स्ट्रोक स्टाइल"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"सफ़ेद"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"काला"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"कोई नहीं"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"उपयोगकर्ता का चुना गया: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"बोली"</string>
<string name="pointer_speed" msgid="7398649279282675718">"पॉइंटर स्पीड"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"माउस पॉइंटर का साइज़"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"माउस पॉइंटर का साइज़ कम करें"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"माउस पॉइंटर का साइज़ बढ़ाएं"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"गेमनियंत्रक"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"वाइब्रेशन रिडायरेक्ट करें"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"कनेक्ट होने पर, गेम कंट्रोलर पर वाइब्रेशन हो"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"जारी रखें"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"अभी नहीं"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ज़ूम करने की सुविधा की सेटिंग"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ज़ूम वाले हिस्से को एक उंगली से ड्रैग करने की सुविधा"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ज़ूम वाले हिस्से को एक उंगली से ड्रैग करके इधर-उधर ले जाएं"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"स्क्रीन पर मूव करने के लिए उसे एक उंगली से खींचें और छोड़ें"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ज़ूम वाला हिस्सा एक उंगली से ड्रैग करके इधर-उधर ले जाएं."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ज़ूम वाला हिस्सा दो उंगलियों से ड्रैग करके इधर-उधर ले जाएं."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"स्क्रीन का एक हिस्सा ज़ूम करने के दौरान, यह सुविधा उपलब्ध नहीं होगी"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"कॉन्टेंट को बड़े साइज़ में देखने के लिए, स्क्रीन पर तेज़ी से ज़ूम इन करें"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ज़ूम इन करने के लिए:</b><br/> {0,number,integer}. ज़ूम करने की सुविधा को शुरू करने के लिए, शॉर्टकट का इस्तेमाल करें<br/> {1,number,integer}. स्क्रीन पर टैप करें<br/> {2,number,integer}. स्क्रीन पर इधर-उधर जाने के लिए, दो उंगलियों से खींचें और छोड़ें<br/> {3,number,integer}. ज़ूम को कम या ज़्यादा करने के लिए, दो उंगलियों से पिंच करें<br/> {4,number,integer}. ज़ूम करने की सुविधा को बंद करने के लिए, शॉर्टकट का इस्तेमाल करें<br/><br/> <b>कुछ समय तक ज़ूम इन करने के लिए:</b><br/> {0,number,integer}. पक्का करें कि आपके डिवाइस पर, पूरी स्क्रीन को ज़ूम करने का विकल्प चुना गया हो<br/> {1,number,integer}. ज़ूम करने की सुविधा को शुरू करने के लिए, शॉर्टकट का इस्तेमाल करें<br/> {2,number,integer}. स्क्रीन पर कहीं भी उंगली से दबाकर रखें<br/> {3,number,integer}. स्क्रीन पर इधर-उधर जाने के लिए, उंगली से खींचें और छोड़ें<br/> {4,number,integer}. ज़ूम करने की सुविधा बंद करने के लिए, स्क्रीन से अपनी उंगली हटाएं"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ज़ूम इन करने के लिए:</b><br/> {0,number,integer}. ज़ूम करने की सुविधा को शुरू करने के लिए, शॉर्टकट का इस्तेमाल करें<br/> {1,number,integer}. स्क्रीन पर टैप करें<br/> {2,number,integer}. स्क्रीन पर इधर-उधर जाने के लिए, उसे दो उंगलियों से खींचें और छोड़ें<br/> {3,number,integer}. ज़ूम को कम या ज़्यादा करने के लिए, दो उंगलियों से पिंच करें<br/> {4,number,integer}. ज़ूम करने की सुविधा को रोकने के लिए, शॉर्टकट का इस्तेमाल करें<br/><br/> आपके पास कुछ समय के लिए ज़ूम इन करने और अन्य काम करने का भी विकल्प है."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ज़ूम इन करने के लिए:</b><br/> {0,number,integer}. ज़ूम करने की सुविधा को शुरू करने के लिए, शॉर्टकट का इस्तेमाल करें<br/> {1,number,integer}. स्क्रीन पर टैप करें<br/> {2,number,integer}. स्क्रीन पर इधर-उधर जाने के लिए, उसे एक या दो उंगली से खींचें और छोड़ें<br/> {3,number,integer}. ज़ूम को कम या ज़्यादा करने के लिए, दो उंगलियों से पिंच करें<br/> {4,number,integer}. ज़ूम करने की सुविधा को रोकने के लिए, शॉर्टकट का इस्तेमाल करें<br/><br/> आपके पास कुछ समय के लिए ज़ूम इन करने और अन्य काम करने का भी विकल्प है."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"बड़ा करके देखने की सुविधा चालू होने पर, आप स्क्रीन को ज़ूम इन कर सकते हैं.\n\n"<b>"ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें और फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए दो या ज़्यादा उंगलियों से खींचें और छोड़ें"</li>\n<li>"ज़ूम नियंत्रित करने के लिए दो या ज़्यादा उंगलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", बड़ा करके देखने की सुविधा चालू करें, फिर स्क्रीन पर कहीं भी दबाकर रखें.\n"<ul><li>"स्क्रीन के दूसरे हिस्सों पर जाने के लिए, उंगलियों से खींचें और छोड़ें"</li>\n<li>"ज़ूम घटाने के लिए उंगलियों को स्क्रीन से हटाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार को ज़ूम इन नहीं कर सकते."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"पेज <xliff:g id="NUM_PAGES">%2$d</xliff:g> में से <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"सुलभता बटन का शॉर्टकट"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{कोई शेड्यूल सेट नहीं है}=1{1 शेड्यूल सेट है}one{# शेड्यूल सेट है}other{# शेड्यूल सेट हैं}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"परेशान न करें"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"अहम मोड"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"कोई मोड जोड़ें"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"सिर्फ़ ज़रूरी लोगों और ऐप्लिकेशन की सूचनाएं पाएं"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"मोड अपने-आप चालू होने का शेड्यूल चुनें"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"समय"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"उदाहरण के लिए, \"सुबह 9:30 से शाम 5:00 बजे तक\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"कैलेंडर"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"उदाहरण के लिए, \"निजी कैलेंडर\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"कोई मोड बनाएं"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"कस्टम मोड"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"रुकावटों को कम करें"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'परेशान न करें\' चालू करें"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"अलार्म और मीडिया की आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"शेड्यूल"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"शेड्यूल मिटाएं"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"मिटाएं"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"नाम बदलें"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"मिटाएं"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"क्या आपको \"<xliff:g id="MODE">%1$s</xliff:g>\" मोड मिटाना है?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"बदलाव करें"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"शेड्यूल"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"शेड्यूल"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"कैलेंडर जोड़ें"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"कैलेंडर का इस्तेमाल करें"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"शेड्यूल"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"शेड्यूल सेट करें"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"शेड्यूल"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> घंटे <xliff:g id="MINUTES">%2$d</xliff:g> मिनट"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"अपने-आप चालू करें"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"शेड्यूल"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"कुछ खास समय पर फ़ोन साइलेंट करें"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'परेशान न करें\' सुविधा के नियम सेट करें"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"उन सूचनाओं की अनुमति दें जिनके लिए आवाज़ होती है"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"मैसेज पर स्क्रीन चमकने से रोकें"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"संकेत दिखाए जाने की अनुमति दें"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"वे सूचनाएं जो आपको मिल सकती हैं"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"फ़ोकस बनाए रखें"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"अन्य कार्रवाइयां"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{बंद है}=1{बंद है / 1 मोड अपने-आप चालू हो सकता है}one{बंद है / # मोड अपने-आप चालू हो सकता है}other{बंद है / # मोड अपने-आप चालू हो सकते हैं}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"डिसप्ले की सेटिंग"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"डिसप्ले के विकल्प"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ग्रेस्केल"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"इससे गहरे रंग वाली थीम चालू होती है"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"गहरे रंग के बैकग्राउंड पर हल्के रंग के टेक्स्ट को प्राथमिकता देने के लिए, ओएस और ऐप्लिकेशन पर स्विच करें. ऐसा करके, टेक्स्ट को देख पाना आसान हो जाता है. साथ ही, कुछ डिवाइसों पर बैटरी की काफ़ी बचत होती है"</string>
<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}}one{{effect_1}, {effect_2}, और # अन्य}other{{effect_1}, {effect_2}, और # अन्य}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"सूचना, साउंड वगैरह को रोकें"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"किसी भी सूचना, साउंड वगैरह को रोका नहीं जा रहा है"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"सूचना खोलें"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"सूचनाएं स्नूज़ करने की अनुमति दें"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ऐप्लिकेशन आइकॉन पर सूचनाएं बताने वाला डॉट"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"सूचनाओं के बंडल"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"बबल्स"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"बबल्स"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"इस बातचीत को बबल के रूप में दिखाएं"</string>
@@ -3504,7 +3545,7 @@
<string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"इस बातचीत के लिए बबल्स चालू करें"</string>
<string name="swipe_direction_ltr" msgid="5137180130142633085">"खारिज करने के लिए दाईं ओर स्वाइप करें और मेन्यू दिखाने के लिए बाईं ओर"</string>
<string name="swipe_direction_rtl" msgid="1707391213940663992">"खारिज करने के लिए बाईं ओर स्वाइप करें और मेन्यू दिखाने के लिए दाईं ओर"</string>
- <string name="silent_notifications_status_bar" msgid="6113307620588767516">"साइलेंट मोड पर सेट की गई सूचनाएं, स्टेटस बार में न दिखाएं"</string>
+ <string name="silent_notifications_status_bar" msgid="6113307620588767516">"साइलेंट मोड में मिली सूचनाएं, स्टेटस बार में न दिखाएं"</string>
<string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
<string name="lock_screen_notifications_title" msgid="2876323153692406203">"निजता सेटिंग"</string>
<string name="lockscreen_bypass_title" msgid="6519964196744088573">"पिछली खुली स्क्रीन पर जाएं"</string>
@@ -3516,7 +3557,7 @@
<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>
- <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"साइलेंट मोड पर सेट की गई सूचनाएं और बातचीत छिपाएं"</string>
+ <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"साइलेंट मोड में मिली सूचनाएं और बातचीत छिपाएं"</string>
<string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"कोई भी सूचना न दिखाएं"</string>
<string name="lock_screen_notifs_redact" msgid="9024158855454642296">"संवेदनशील सूचनाएं"</string>
<string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"स्क्रीन लॉक रहने पर भी संवेदनशील कॉन्टेंट दिखाएं"</string>
@@ -3588,10 +3629,10 @@
<string name="notification_listener_security_warning_title" msgid="5791700876622858363">"क्या आपको <xliff:g id="SERVICE">%1$s</xliff:g> को सूचना ऐक्सेस करने की अनुमति देनी है?"</string>
<string name="notification_listener_security_warning_summary" msgid="1131986567509818121">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ऐप्लिकेशन, सभी सूचनाओं को पढ़ पाएगा. इसमें आपकी निजी जानकारी शामिल है. जैसे, संपर्कों के नाम, फ़ोटो, और आपको मिलने वाले मैसेज. यह ऐप्लिकेशन, सूचनाओं के साथ दिखने वाले बटन से कार्रवाई कर सकता है या सूचनाओं को स्नूज़/खारिज भी कर पाएगा. यह फ़ोन कॉल का जवाब भी दे पाएगा. \n\nइससे यह ऐप्लिकेशन, \'परेशान न करें\' मोड चालू या बंद कर पाएगा और इससे जुड़ी सेटिंग भी बदल पाएगा."</string>
<string name="nls_warning_prompt" msgid="1486887096703743841">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ऐप्लिकेशन ये काम कर पाएगा:"</string>
- <string name="nls_feature_read_title" msgid="7629713268744220437">"आपकी सूचनाएं पढ़ना"</string>
- <string name="nls_feature_read_summary" msgid="1064698238110273593">"यह ऐप्लिकेशन आपकी सूचनाओं को पढ़ सकता है. इनमें आपकी निजी जानकारी, जैसे कि संपर्कों के नाम, आपको मिलने वाले मैसेज, और फ़ोटो शामिल हैं."</string>
+ <string name="nls_feature_read_title" msgid="7629713268744220437">"आपकी सूचनाएं ऐक्सेस करना"</string>
+ <string name="nls_feature_read_summary" msgid="1064698238110273593">"यह ऐप्लिकेशन आपकी सूचनाओं को ऐक्सेस कर सकता है. साथ ही, आपके संपर्क, मैसेज, और फ़ोटो जैसी निजी जानकारी को भी ऐक्सेस कर सकता है."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"मैसेज का जवाब देना"</string>
- <string name="nls_feature_reply_summary" msgid="4492543411395565556">"यह ऐप्लिकेशन मैसेज के जवाब दे सकता है और सूचनाओं में मौजूद बटन से कार्रवाई कर सकती है. जैसे, सूचनाओं को स्नूज़ (थोड़ी देर के लिए बंद करना) या उन्हें खारिज करना और फ़ोन कॉल का जवाब देना."</string>
+ <string name="nls_feature_reply_summary" msgid="4492543411395565556">"यह ऐप्लिकेशन मैसेज के जवाब दे सकता है. साथ ही, सूचनाओं में दिखने वाले बटन से कार्रवाइयां भी कर सकता है, जैसे- सूचनाओं को स्नूज़ (थोड़ी देर के लिए बंद) या खारिज करना. यह फ़ोन कॉल के जवाब भी दे सकता है."</string>
<string name="nls_feature_settings_title" msgid="8208164329853194414">"सेटिंग में बदलाव करना"</string>
<string name="nls_feature_settings_summary" msgid="3770028705648985689">"यह ऐप्लिकेशन \'परेशान न करें\' मोड को चालू या बंद कर सकता है और इससे जुड़ी सेटिंग में बदलाव कर सकता है."</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"अगर <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का ऐक्सेस बंद किया जाता है, तो \'परेशान न करें\' सेवा का ऐक्सेस भी बंद हो सकता है."</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"यह ऐप्लिकेशन, बेहतर सेटिंग के साथ काम नहीं करता है"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"अन्य सेटिंग"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"इस ऐप्लिकेशन में ज़्यादा सेटिंग उपलब्ध हैं"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"लगातार सूचनाएं आने पर आवाज़ कम करने की सेटिंग"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"वर्क प्रोफ़ाइल पर लागू करें"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"वर्क प्रोफ़ाइल ऐप्लिकेशन पर लागू करें"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"कैटगरी"</string>
<string name="notification_channels_other" msgid="18159805343647908">"अन्य"</string>
<string name="no_channels" msgid="4716199078612071915">"इस ऐप्लिकेशन ने कोई भी सूचना पोस्ट नहीं की है"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"इस्तेमाल नहीं की गई कैटगरी दिखाएं"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ऐप्लिकेशन की दूसरी सेटिंग"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"इस्तेमाल न हुई कैटगरी दिखाएं"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"इस्तेमाल न हुई कैटगरी छिपाएं"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"वे ऐप्लिकेशन जो परेशान न करने की सुविधा लागू कर सकते हैं"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"चुने गए ऐप्लिकेशन"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"कोई नहीं"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"सभी"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ऐप्लिकेशन को ओवरराइड करने की मंज़ूरी दें"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ऐप्लिकेशन जो \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"और ऐप्लिकेशन चुनें"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"कोई भी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास नहीं कर सकता"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"कुछ चुने हुए लोग \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास कर सकता है"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"बार-बार कॉल करने वाले (कॉलर)"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"दोबारा काॅल करने वालों को बायपास करने की अनुमति दें"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} तक, सिर्फ़ एक घंटे के लिए अलार्म मोड पर स्विच करें}one{{time} तक, सिर्फ़ # घंटे के लिए अलार्म मोड पर स्विच करें}other{{time} तक, सिर्फ़ # घंटों के लिए अलार्म मोड पर स्विच करें}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"हमेशा बाधित करें में बदलें"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"मोड में बदलाव करें"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"मोड जोड़ें"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोड का नाम"</string>
<string name="warning_button_text" msgid="1274234338874005639">"चेतावनी"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"बंद करें"</string>
<string name="device_feedback" msgid="5351614458411688608">"इस डिवाइस के बारे में सुझाव भेजें"</string>
@@ -4023,8 +4068,8 @@
<string name="app_list_preference_none" msgid="1635406344616653756">"कोई नहीं"</string>
<string name="work_profile_usage_access_warning" msgid="3477719910927319122">"इस ऐप के इस्तेमाल का ऐक्सेस बंद करने के बाद भी आपका एडमिन आपकी वर्क प्रोफ़ाइल के ऐप का डेटा खर्च ट्रैक कर सकते हैं"</string>
<string name="draw_overlay" msgid="7902083260500573027">"दूसरे ऐप्लिकेशन के ऊपर दिखाएं"</string>
- <string name="system_alert_window_settings" msgid="6458633954424862521">"दूसरे ऐप्लिकेशन के ऊपर दिखाने की अनुमति"</string>
- <string name="permit_draw_overlay" msgid="4468994037192804075">"दूसरे ऐप्लिकेशन के ऊपर दिखाने की अनुमति दें"</string>
+ <string name="system_alert_window_settings" msgid="6458633954424862521">"दूसरे ऐप्लिकेशन के ऊपर दिखाएं"</string>
+ <string name="permit_draw_overlay" msgid="4468994037192804075">"दूसरे ऐप्लिकेशन के ऊपर दिखने की अनुमति दें"</string>
<string name="allow_overlay_description" msgid="1607235723669496298">"इस ऐप्लिकेशन को, उन सभी ऐप्लिकेशन के ऊपर दिखने की अनुमति दें जो इस्तेमाल में हैं. यह ऐप्लिकेशन देख पाएगा कि आपने कहां टैप किया है. इसके अलावा, स्क्रीन पर दिखने वाली चीज़ों को भी बदल पाएगा."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"मीडिया आउटपुट बदलने की अनुमति"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"ऐप को मीडिया आउटपुट बदलने की अनुमति दें"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"डेस्कटॉप मोड चालू करें"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"दूसरी स्क्रीन पर डेस्कटॉप मोड आज़माने की सुविधा चालू करें"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"फ़्रीफ़ॉर्म विंडो मोड चालू करें"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"फ़्रीफ़ॉर्म विंडो मोड के लिए सेटिंग चालू करें."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"सेकंडरी डिसप्ले पर फ़्रीफ़ॉर्म विंडो मोड चालू करें"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"सिर्फ़ सेकंडरी डिसप्ले पर फ़्रीफ़ॉर्म विंडो मोड चालू करें."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"मल्टी-विंडो में विंडो का साइज़ न बदलने का विकल्प चालू करें"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"साइज़ न बदलने वाले ऐप्लिकेशन को मल्टी-विंडो (एक से ज़्यादा ऐप्लिकेशन, एक साथ) में दिखाने की अनुमति दें"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"गहरे रंग वाली थीम को तुरंत लागू करने की सुविधा ओवरराइड करें"</string>
@@ -4861,23 +4908,23 @@
<string name="enable_16k_pages" msgid="8001470927566110689">"16 केबी पेज साइज़ चालू करें"</string>
<string name="enable_16k_pages_summary" msgid="1964363364670306912">"16 केबी पेज साइज़ वाले कर्नेल के ज़रिए चालू करें"</string>
<string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"4 केबी मोड से 16 केबी मोड पर स्विच करें"</string>
- <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"आप 4 केबी कर्नेल पर चल रहे पेज-ऐग्नोस्टिक मोड में हैं. आपको 16 केबी मोड पर स्विच किया जा रहा है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. स्विच करने पर डिवाइस फिर से चालू होगा. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को वापस प्रोडक्शन मोड पर सेट करने के लिए, आपको फिर से 4 केबी मोड पर स्विच करना होगा और बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फ़ैक्ट्री रीसेट हो जाता है. जब डिवाइस, अपग्रेड किए गए वर्शन में चालू हो जाए, तब \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें."</string>
+ <string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"आप 4 केबी कर्नेल पर चल रहे पेज-ऐग्नोस्टिक मोड में हैं. आपको 16 केबी मोड पर स्विच किया जा रहा है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. स्विच करने पर डिवाइस फिर से चालू होगा. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को प्रोडक्शन मोड में वापस लाने के लिए, आपको फिर से 4 केबी मोड पर स्विच करना होगा और बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फ़ैक्ट्री रीसेट हो जाता है. डिवाइस का Android ऑपरेटिंग सिस्टम चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें."</string>
<string name="confirm_enable_4k_pages_title" msgid="3210360137887034659">"16 केबी मोड से 4 केबी मोड पर स्विच करें"</string>
<string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"आप 16 केबी कर्नेल पर चल रहे पेज-ऐग्नोस्टिक मोड में हैं. आपको 4 केबी मोड पर स्विच किया जा रहा है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक होने के दौरान आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में हो सकती है. इससे डिवाइस फिर से चालू होगा. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, ऐसा हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को प्रोडक्शन मोड में वापस लाने के लिए, आपको बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फ़ैक्ट्री रीसेट हो जाता है. डिवाइस के Android में चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें."</string>
<string name="toast_16k_update_failed_text" msgid="8888858987184345567">"कर्नेल को 16 केबी पेज साइज़ के साथ काम करने वाले कर्नेल में अपडेट नहीं किया जा सका."</string>
<string name="progress_16k_ota_title" msgid="2117218313875523741">"बदलाव लागू किया जा रहा है"</string>
<string name="confirm_format_ext4_title" msgid="6696191800594435577">"क्या आपको अपना डिवाइस फिर से ext4 में फ़ॉर्मैट करना है? (16 केबी मोड के लिए ज़रूरी है)"</string>
- <string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 केबी मोड का इस्तेमाल करने से पहले, इस डिवाइस के डेटा पार्टिशन को ext4 में बदलना होगा. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. अगर आपने 16 केबी मोड चालू किया है, तो इसके बाद डिवाइस को एक और बार फिर से चालू करना होगा. इस मोड में आ जाने के बाद, डिवाइस को फिर से चालू करके 4 केबी और 16 केबी मोड के बीच स्विच किया जा सकता है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को प्रोडक्शन मोड में वापस लाने के लिए, आपको फिर से 4 केबी मोड पर स्विच करना होगा और बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फ़ैक्ट्री रीसेट हो जाता है. डिवाइस के Android में चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. इससे डिवाइस का डेटा वाइप हो जाएगा और पुष्टि करने के बाद, फ़ाइलसिस्टम ext4 में बदल दिया जाएगा. इस प्रक्रिया के बाद, कृपया फिर से 16 केबी मोड को चालू करें."</string>
+ <string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 केबी मोड का इस्तेमाल करने से पहले, इस डिवाइस के डेटा पार्टिशन को ext4 में बदलना होगा. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. अगर आपने 16 केबी मोड चालू किया है, तो इसके बाद डिवाइस को एक और बार चालू करना होगा. इस मोड में आ जाने के बाद, डिवाइस को फिर से चालू करके 4 केबी और 16 केबी मोड के बीच स्विच किया जा सकता है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को प्रोडक्शन मोड में वापस लाने के लिए, आपको फिर से 4 केबी मोड पर स्विच करना होगा और बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फ़ैक्ट्री रीसेट हो जाता है. डिवाइस का Android ऑपरेटिंग सिस्टम चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. इससे डिवाइस का डेटा वाइप हो जाएगा और पुष्टि करने के बाद, फ़ाइलसिस्टम ext4 में बदल दिया जाएगा. इस प्रक्रिया के बाद, कृपया फिर से 16 केबी मोड को चालू करें."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"डिवाइस का सारा डेटा हमेशा के लिए मिटाएं"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"डेटा के हिस्से को ext4 में फिर से फ़ॉर्मैट नहीं किया जा सका, न ही इसे वाइप किया जा सका."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 केबी मोड के लिए, बूटलोडर अनलॉक करना ज़रूरी है"</string>
- <string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 केबी मोड इस्तेमाल करने के लिए, इस डिवाइस के बूटलोडर को अनलॉक करना ज़रूरी है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. अगर 16 केबी मोड चालू किया जाता है, तो उपयोगकर्ता का पूरा डेटा और सभी सेटिंग वाइप हो जाती हैं. बूटलोडर अनलॉक करने के बाद, 16 केबी मोड चालू करने के लिए डिवाइस को दो बार फिर से चालू करने की ज़रूरत होती है. इस मोड के चालू हो जाने के बाद, डिवाइस को फिर से चालू करके 4 केबी और 16 केबी मोड के बीच स्विच किया जा सकता है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को वापस प्रोडक्शन मोड पर सेट करने के लिए, आपको 4 केबी मोड पर स्विच करना होगा. इसके बाद, ओईएम/बूटलोडर लॉक करना होगा. इससे डिवाइस फ़ैक्ट्री रीसेट हो जाएगा. कृपया बूटलोडर अनलॉक करें और फिर से कोशिश करें. बूटलोडर अनलॉक करने के निर्देश यहां देखे जा सकते हैं: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"बूटलोडर को अनलॉक करना ज़रूरी है"</string>
+ <string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 केबी मोड इस्तेमाल करने के लिए, इस डिवाइस के बूटलोडर को अनलॉक करना ज़रूरी है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. अगर 16 केबी मोड चालू किया जाता है, तो उपयोगकर्ता का पूरा डेटा और सभी सेटिंग वाइप हो जाती हैं. बूटलोडर अनलॉक करने के बाद, 16 केबी मोड चालू करने के लिए डिवाइस को दो बार फिर से चालू करने की ज़रूरत होती है. इस मोड के चालू हो जाने के बाद, डिवाइस को फिर से चालू करके 4 केबी और 16 केबी मोड के बीच स्विच किया जा सकता है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. डिवाइस को प्रोडक्शन मोड में वापस लाने के लिए, आपको 4 केबी मोड पर स्विच करना होगा. इसके बाद, ओईएम/बूटलोडर लॉक करना होगा. इससे डिवाइस फ़ैक्ट्री रीसेट हो जाएगा. कृपया बूटलोडर अनलॉक करें और फिर से कोशिश करें. बूटलोडर अनलॉक करने के निर्देश यहां देखे जा सकते हैं: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 केबी पेज-एग्नोस्टिक मोड का इस्तेमाल किया जा रहा है"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"आप 4 केबी पेज साइज़ के साथ काम करने वाले मोड (पेज-ऐग्नोस्टिक मोड) में है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. इसे वापस प्रोडक्शन मोड पर सेट करने के लिए, आपको डिवाइस का बूटलोडर लॉक करना होगा. ज़्यादा पढ़ने के लिए टैप करें."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"आप 4 केबी पेज साइज़ के साथ काम करने वाले मोड (पेज-ऐग्नोस्टिक मोड) में है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. प्रोडक्शन मोड में वापस जाने के लिए, आपको डिवाइस का बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फिर से फ़ैक्ट्री रीसेट हो जाएगा और इसकी प्रोडक्शन सेटिंग पहले जैसी हो जाएंगी. डिवाइस के Android में चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. अगर डिवाइस Android में चालू नहीं होता है या ठीक से काम नहीं करता है, तो <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> पर मौजूद नई फ़ैक्ट्री इमेज की मदद से डिवाइस को फिर से फ़्लैश करें या <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> का इस्तेमाल करें. इसके बाद, \'डिवाइस वाइप करें\', \'बूटलोडर को लॉक करें\', और \'सभी हिस्सों को ज़बरदस्ती फ़्लैश करें\' को चुनें."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"आप 4 केबी पेज साइज़ के साथ काम करने वाले मोड (पेज-ऐग्नोस्टिक मोड) में है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. प्रोडक्शन मोड में वापस जाने के लिए, आपको डिवाइस का बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फिर से फ़ैक्ट्री रीसेट हो जाएगा और इसकी प्रोडक्शन सेटिंग पहले जैसी हो जाएंगी. डिवाइस का Android ऑपरेटिंग सिस्टम चालू हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. अगर Android ऑपरेटिंग सिस्टम चालू नहीं होता है या ठीक से काम नहीं करता है, तो <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> पर मौजूद नई फ़ैक्ट्री इमेज की मदद से डिवाइस को फिर से फ़्लैश करें या <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> का इस्तेमाल करें. इसके बाद, \'डिवाइस वाइप करें\', \'बूटलोडर को लॉक करें\', और \'सभी हिस्सों को ज़बरदस्ती फ़्लैश करें\' को चुनें."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 केबी पेज-ऐग्नोस्टिक मोड का इस्तेमाल किया जा रहा है"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"आप 16 केबी पेज साइज़ के साथ काम करने वाले मोड (पेज-ऐग्नोस्टिक मोड) में है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. इसे वापस प्रोडक्शन मोड पर सेट करने के लिए, आपको 4 केबी मोड पर फिर से स्विच करना होगा. इसके बाद, डिवाइस का बूटलोडर लॉक करना होगा. ज़्यादा पढ़ने के लिए टैप करें."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"आप 16 केबी पेज साइज़ के साथ काम करने वाले मोड (पेज-ऐग्नोस्टिक मोड) में है. इस मोड में सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक रहने पर आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में पड़ सकती है. इन मोड में कुछ सुविधाएं बंद हो जाएंगी. इसलिए, हो सकता है कि कुछ ऐप्लिकेशन काम न करें. इसे वापस प्रोडक्शन मोड पर सेट करने के लिए, आपको 4 केबी मोड पर फिर से स्विच करना होगा. इसके बाद, डिवाइस का बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फिर से फ़ैक्ट्री रीसेट हो जाएगा और इसकी प्रोडक्शन सेटिंग पहले जैसी हो जाएंगी. जब डिवाइस, अपग्रेड किए गए वर्शन में चालू हो जाए, तब \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. अगर डिवाइस अपग्रेड किए गए वर्शन में चालू नहीं होता है या ठीक से काम नहीं करता है, तो <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> पर मौजूद नई फ़ैक्ट्री इमेज की मदद से डिवाइस को फिर से फ़्लैश करें या <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> का इस्तेमाल करें. इसके बाद, \'डिवाइस वाइप करें\', \'बूटलोडर को लॉक करें\', और \'सभी हिस्सों को ज़बरदस्ती फ़्लैश करें\' को चुनें."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"आप पेज-ऐग्नोस्टिक मोड के 16 केबी मोड में हैं. इस मोड में, सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक होने के दौरान आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में हो सकती है. इन मोड में, कुछ सुविधाएं बंद हो जाएंगी. इसलिए, ऐसा हो सकता है कि कुछ ऐप्लिकेशन काम न करें. प्रोडक्शन मोड पर वापस जाने के लिए, आपको 4 केबी मोड पर फिर से स्विच करना होगा. इसके बाद, आपको डिवाइस का बूटलोडर लॉक करना होगा. ज़्यादा पढ़ने के लिए टैप करें."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"आप पेज-ऐग्नोस्टिक मोड के 16 केबी मोड में हैं. इस मोड में, सॉफ़्टवेयर के रखरखाव की गारंटी नहीं है. साथ ही, बूटलोडर अनलॉक होने के दौरान आपके फ़ोन में सेव डेटा की सुरक्षा खतरे में हो सकती है. इन मोड में, कुछ सुविधाएं बंद हो जाएंगी. इसलिए, ऐसा हो सकता है कि कुछ ऐप्लिकेशन काम न करें. प्रोडक्शन मोड पर वापस जाने के लिए, आपको 4 केबी मोड पर फिर से स्विच करना होगा. इसके बाद, आपको डिवाइस का बूटलोडर लॉक करना होगा. ऐसा करने पर, डिवाइस फिर से फ़ैक्ट्री रीसेट हो जाएगा और इसकी प्रोडक्शन सेटिंग पहले जैसी हो जाएंगी. डिवाइस के Android में बूट हो जाने के बाद, \'डेवलपर के लिए सेटिंग और टूल\' में जाकर ओईएम से अनलॉक करने की सेटिंग बंद करें. अगर डिवाइस Android में बूट नहीं होता या ठीक से काम नहीं करता, तो <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> पर जाकर नई फ़ैक्ट्री इमेज का इस्तेमाल करके डिवाइस को फिर से फ़्लैश करें या <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> पर दिए गए टूल का इस्तेमाल करें. इसके बाद, \'डिवाइस वाइप करें\', \'बूटलोडर को लॉक करें\', और \'सभी हिस्से ज़बरदस्ती फ़्लैश करें\' को चुनें."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 केबी पेज-एग्नोस्टिक मोड"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ज़्यादा पढ़ें"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"गड़बड़ी की रिपोर्ट हैंडल करने वाला"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ऐप्लिकेशन पिन करने की सुविधा का इस्तेमाल करें"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"डेवलपर के लिए सेटिंग और टूल का इस्तेमाल करें"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"प्रिंट करने की सेवा का इस्तेमाल करें"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"एक से ज़्यादा उपयोगकर्ताओं को अनुमति दें"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"उपयोगकर्ता को स्विच करने की अनुमति दें"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"अनुमति दें, कई, इस्तेमाल करने वाले, मंज़ूरी दें, कई सारे"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"कई, उपयोगकर्ता, प्रोफ़ाइलें, लोग, खाते, स्विच, बहुत"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"वॉयरलेस डीबगिंग का इस्तेमाल करें"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"चुनें कि डॉक से टैबलेट के जुड़े होने के दौरान, आपको स्क्रीन पर क्या दिखे. स्क्रीन सेवर का इस्तेमाल करने पर, आपके डिवाइस की बैटरी ज़्यादा खर्च हो सकती है."</string>
<string name="customize_button_title" msgid="1110284655990203359">"मनमुताबिक बनाएं"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> को पसंद के मुताबिक बनाएं"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"फ़्रीफ़ॉर्म सहायता मोड को चालू करने के लिए, डिवाइस को फिर से चालू करना होगा."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"दूसरे डिसप्ले पर डेस्कटॉप मोड को ज़बरदस्ती चलाने के लिए, डिवाइस को फिर से चालू करना होगा."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"फ़्रीफ़ॉर्म विंडो वाला लेगसी मोड चालू करने के लिए, डिवाइस को फिर चालू करना होगा."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"फ़्रीफ़ॉर्म विंडो मोड की सेटिंग बदलने के लिए, डिवाइस को फिर से चालू करना होगा."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"सेकंडरी डिसप्ले पर फ़्रीफ़ॉर्म विंडो मोड ज़बरदस्ती चालू करने के लिए, डिवाइस को फिर से चालू करना होगा."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"अभी रीबूट (फिर से चालू) करें"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"बाद में रीबूट (फिर से चालू) करें"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"स्पेशल ऑडियो"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"चालू है"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"बंद है"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"चालू है"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ऑडियो, बाएं कान का %1$d%%, दाएं कान का %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ऑडियो, दाएं कान का %1$d%%, बाएं कान का %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"आपके इंस्टॉल किए गए ऐप्लिकेशन, आपके डिवाइस के नाम की जानकारी ऐक्सेस कर सकते हैं. इसके अलावा, ब्लूटूथ डिवाइसों या वाई-फ़ाई नेटवर्क से कनेक्ट करने पर या वाई-फ़ाई हॉटस्पॉट सेट अप करने पर, अन्य लोग भी इसे देख सकते हैं."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"व्याकरण के हिसाब से लिंग"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"व्याकरण के हिसाब से लिंग चुनें"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"खोज की सेटिंग"</string>
</resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index a5e61bc..ce1770d 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -364,8 +364,8 @@
<item msgid="6922258575853746220">"Pokret"</item>
</string-array>
<string-array name="accessibility_button_size_selector_titles">
- <item msgid="7482952318152486459">"Malen"</item>
- <item msgid="1666628329913333563">"Velik"</item>
+ <item msgid="7482952318152486459">"Maleno"</item>
+ <item msgid="1666628329913333563">"Veliko"</item>
</string-array>
<string-array name="vpn_proxy_settings">
<item msgid="7165538292837266997">"Nijedan"</item>
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Vrijeme za spavanje"</item>
+ <item msgid="4152450357280759894">"Vožnja"</item>
+ <item msgid="7096549258219399423">"Angažirajuće"</item>
+ <item msgid="2760716776980432977">"Upravljano"</item>
+ <item msgid="601734478369121764">"Zvijezda"</item>
+ <item msgid="6243809315432780521">"Kalendar"</item>
+ <item msgid="4913577903148415331">"Vrijeme"</item>
+ <item msgid="3653377604690057780">"Kazalište"</item>
+ <item msgid="3843711267408385410">"Cvijet"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c2db62b..a95f8ef 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Prekinuti vezu uređaja?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Uparite novi uređaj"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatski uključi sutra"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Postavke slušnih pomagala"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Prečac, kompatibilnost sa slušnim pomagalima"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Unaprijed definirana postavka"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Nema zadanih postavki koje je definirao vaš audiolog"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ažuriranje unaprijed definiranih postavki nije uspjelo"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audioizlaz"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O audioizlazu"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Uključeno / # aplikacija ima pristup lokaciji}one{Uključeno / # aplikacija ima pristup lokaciji}few{Uključeno / # aplikacije imaju pristup lokaciji}other{Uključeno / # aplikacija ima pristup lokaciji}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Učitavanje…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacije s dopuštenjem za uređaje u blizini mogu odrediti približni položaj povezanih uređaja."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacije s dopuštenjem za uređaje u blizini mogu odrediti približni položaj povezanih uređaja."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Pristup lokaciji isključen je za aplikacije i usluge. Lokacija vašeg uređaja i dalje se može poslati djelatnicima hitnih službi kada nazovete broj hitne službe ili na njega pošaljete SMS."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saznajte više o postavkama lokacije"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Da biste promijenili, otvorite Postavke ChromeOS-a > Privatnost i sigurnost > Kontrole privatnosti > Pristup lokaciji"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Dodano je lice i sat <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Dodani su lice, otisak prsta i sat <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Dodani su lice, otisci prstiju i sat <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"To je potrebno jer je uključena provjera identiteta"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Otključavanje apl. Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Sat je dodan"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Postavite telefon"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saznajte više o otključavanju satom"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj sat"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Uklonite sat"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Otisak prsta i otključavanje licem"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Otključavanje licem i otiskom prsta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Otključavanje licem i otiskom prsta za posao"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Potrebno je postavljanje"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Dodano je lice i otisci prsta"</string>
@@ -576,7 +577,7 @@
<string name="private_space_auto_lock_title" msgid="8663409382910601261">"Automatsko zaključavanje privatnog prostora"</string>
<string name="private_space_auto_lock_page_summary" msgid="8679844515655838654">"Možete automatski zaključati privatni prostor ako uređaj ne upotrebljavate neko vrijeme"</string>
<string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Svaki put kad se uređaj zaključa"</string>
- <string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"5 min nakon automatskog isključivanja"</string>
+ <string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"5 min nakon automatskog isključivanja zaslona"</string>
<string name="private_space_auto_lock_after_device_restart" msgid="288755768725895029">"Samo nakon ponovnog pokretanja uređaja"</string>
<string name="private_space_hide_page_title" msgid="3364639176511877414">"Sakrivanje privatnog prostora"</string>
<string name="private_space_hide_when_locked" msgid="6219472348124151797">"Sakrij privatni prostor kada je zaključan"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalirajte aplikacije"</b>\n"Instalirajte aplikacije koje želite da ostanu privatne u vašem prostoru"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Napomena"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacije se zaustavljaju kad zaključate prostor"</b>\n"Kad zaključate prostor, aplikacije u vašem prostoru zaustavljaju se i nećete primati obavijesti od njih"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privatni prostori nisu prikladni za aplikacije koje moraju raditi u pozadini ili slati važne obavijesti, primjerice medicinske aplikacije. To je zato što se obavijesti i pozadinska aktivnost zaustavljaju kad je vaš prostor zaključan.\n\nAplikacije u vašem privatnom prostoru neće se prikazivati u upravitelju dopuštenja, na nadzornoj ploči za privatnost i u drugim postavkama kad je privatni prostor zaključan.\n\nVaš se privatni prostor ne može premjestiti na novi uređaj. Trebat ćete postaviti novi privatni prostor ako ga želite koristiti na drugom uređaju.\n\nSvatko tko poveže vaš uređaj s računalom ili instalira štetne aplikacije na vaš uređaj možda će moći pristupiti vašem privatnom prostoru."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privatni prostori nisu prikladni za aplikacije koje moraju raditi u pozadini ili slati važne obavijesti, primjerice medicinske aplikacije. To je zato što se obavijesti i pozadinska aktivnost zaustavljaju kad je vaš prostor zaključan.\n\nAplikacije u vašem privatnom prostoru neće se prikazivati u upravitelju dopuštenja, na nadzornoj ploči za privatnost i u drugim postavkama kad je privatni prostor zaključan.\n\nVaš se privatni prostor ne može vratiti na novom uređaju. Trebat ćete postaviti novi prostor ako ga želite koristiti na drugom uređaju.\n\nSvatko tko poveže vaš uređaj s računalom ili instalira zlonamjerne aplikacije na vaš uređaj možda će moći pristupiti vašem privatnom prostoru."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saznajte više o privatnom prostoru"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"To će potrajati nekoliko trenutaka"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"U tijeku je postavljanje privatnog prostora…"</string>
@@ -652,7 +651,7 @@
<string name="encrypted_summary" msgid="545623487587251207">"Šifrirano"</string>
<string name="no_screen_lock_issue_title" msgid="1814109590692792891">"Postavljanje zaključavanja zaslona"</string>
<string name="no_screen_lock_issue_summary" msgid="2383217853510608406">"Za dodatnu sigurnost postavite PIN, uzorak ili zaporku za ovaj uređaj."</string>
- <string name="no_screen_lock_issue_action_label" msgid="2691229130486382863">"Postavite zaključavanje zaslona"</string>
+ <string name="no_screen_lock_issue_action_label" msgid="2691229130486382863">"Postavi zaključavanje zaslona"</string>
<string name="no_screen_lock_issue_notification_title" msgid="1214876733592830628">"Postavi zaključavanje zaslona"</string>
<string name="no_screen_lock_issue_notification_text" msgid="8696194459170873345">"Za dodatnu sigurnost postavite PIN, uzorak ili zaporku za ovaj uređaj."</string>
<string name="suggested_lock_settings_title" msgid="7836065447159730217">"Zaštitite telefon"</string>
@@ -666,7 +665,7 @@
<string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite dodatni način zaključavanja zaslona"</string>
<string name="lock_settings_picker_admin_restricted_personal_message" msgid="3532653662159888328">"Ako zaboravite radnju za zaključavanje zaslona, IT administrator ga ne može poništiti."</string>
<string name="lock_settings_picker_admin_restricted_personal_message_action" msgid="5956615234246626264">"Postavite zasebno zaključavanje za poslovne aplikacije"</string>
- <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Ako zaboravite čime ste ih zaključali, recite administratoru da poništi zaključavanje"</string>
+ <string name="lock_settings_picker_profile_message" msgid="9142379549980873478">"Ako zaboravite čime ste ga zaključali, recite administratoru da poništi zaključavanje"</string>
<string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja zaslona"</string>
<string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja zaslona"</string>
<string name="lock_screen_auto_pin_confirm_title" msgid="3012128112186088375">"Automatska potvrda otključavanja"</string>
@@ -779,7 +778,7 @@
<string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{Mora sadržavati najmanje # znak}one{Mora sadržavati najmanje # znak}few{Mora sadržavati najmanje # znaka}other{Mora sadržavati najmanje # znakova}}"</string>
<string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Ako upotrebljavate samo brojeve, potrebna je najmanje jedna znamenka}one{Ako upotrebljavate samo brojeve, potrebna je najmanje # znamenka}few{Ako upotrebljavate samo brojeve, potrebne su najmanje # znamenke}other{Ako upotrebljavate samo brojeve, potrebno je najmanje # znamenki}}"</string>
<string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{PIN mora sadržavati najmanje # znamenku}one{PIN mora sadržavati najmanje # znamenku}few{PIN mora sadržavati najmanje # znamenke}other{PIN mora sadržavati najmanje # znamenki}}"</string>
- <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{PIN mora sadržavati najmanje # znamenku, no radi dodatne sigurnosti preporučuje se {minAutoConfirmLen}-znamenkasti PIN}one{PIN mora sadržavati najmanje # znamenku, no radi dodatne sigurnosti preporučuje se {minAutoConfirmLen}-znamenkasti PIN}few{PIN mora sadržavati najmanje # znamenke, no radi dodatne sigurnosti preporučuje se {minAutoConfirmLen}-znamenkasti PIN}other{PIN mora sadržavati najmanje # znamenki, no radi dodatne sigurnosti preporučuje se {minAutoConfirmLen}-znamenkasti PIN}}"</string>
+ <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{PIN mora sadržavati najmanje # znamenku, no preporučuje se {minAutoConfirmLen}-znamenkasti PIN radi dodatne sigurnosti}one{PIN mora sadržavati najmanje # znamenku, no preporučuje se {minAutoConfirmLen}-znamenkasti PIN radi dodatne sigurnosti}few{PIN mora sadržavati najmanje # znamenke, no preporučuje se {minAutoConfirmLen}-znamenkasti PIN radi dodatne sigurnosti}other{PIN mora sadržavati najmanje # znamenki, no preporučuje se {minAutoConfirmLen}-znamenkasti PIN radi dodatne sigurnosti}}"</string>
<string name="lockpassword_password_too_long" msgid="1940345313260498308">"{count,plural, =1{Mora sadržavati manje od # znaka}one{Mora sadržavati manje od # znaka}few{Mora sadržavati manje od # znaka}other{Mora sadržavati manje od # znakova}}"</string>
<string name="lockpassword_pin_too_long" msgid="1678212054564388576">"{count,plural, =1{Mora sadržavati manje od # znamenke}one{Mora sadržavati manje od # znamenke}few{Mora sadržavati manje od # znamenke}other{Mora sadržavati manje od # znamenki}}"</string>
<string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dopušta upotrebu nedavnog PIN-a"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Ponovo pokrenuti?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detaljno zapisivanje za NFC namijenjeno je samo u razvojne svrhe. Dodatni podaci NFC-a uključeni su u izvješća o programskim pogreškama koja mogu sadržavati privatne podatke. Ponovo pokrenite uređaj da biste promijenili tu postavku."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Ponovno pokreni"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"zrcaljenje, vanjski zaslon, povezani zaslon, USB zaslon, razlučivost, rotacija"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotacija"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardno"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1276,7 +1291,7 @@
<string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"Nije dostupno jer je uključen način rada u vrijeme spavanja"</string>
<string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"Koristi čuvar zaslona"</string>
<string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Tijekom punjenja ili kada je na priključnoj stanici"</string>
- <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Na priklj. stanici tijekom punjenja"</string>
+ <string name="screensaver_settings_summary_dock_and_charging" msgid="8485905100159376156">"Na priključnoj stanici tijekom punjenja"</string>
<string name="screensaver_settings_summary_sleep" msgid="6555922932643037432">"Tijekom punjenja"</string>
<string name="screensaver_settings_summary_dock" msgid="6997766385189369733">"Kada je na priključnoj stanici"</string>
<string name="screensaver_settings_summary_never" msgid="4988141393040918450">"Nikada"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Koristi tipkovnicu na zaslonu"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Zadržava se na zaslonu dok je fizička tipkovnica aktivna"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Slučajni pritisci 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="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="sticky_keys" msgid="7317317044898161747">"Ljepljive tipke"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Pritisnite jednu po jednu tipku za prečace umjesto da ih pritisnete zajedno"</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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Promjena ispunj. pokaz. na žuto"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Promjena ispunj. pokaz. na ružič."</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Promjena ispunj. pokaz. na plavo"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stil poteza pokazivačem"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Bijelo"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Crno"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ništa"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Izgled koji je odabrao korisnik: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Brzina pokazivača"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Veličina pokazivača"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Smanjivanje veličine pokazivača"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Povećavanje veličine pokazivača"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Upravljač igrama"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Preusmjeri vibraciju"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Pošalji vibraciju igraćem kontroleru kada su povezani"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Ipak nastavi"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Odustani"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke povećavanja"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pomicanje jednim prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Premjestite povećalo jednim prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Povlačite prstom da biste se kretali zaslonom"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Pomičite područje povećanja jednim prstom."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Pomičite područje povećanja dvama prstima."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nije dostupno kad se povećava samo dio zaslona"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Dodirnite gumb za zumiranje"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Brzo povećajte zaslon da bi se povećao prikaz sadržaja"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Da biste povećali prikaz:</b><br/> {0,number,integer}. Upotrijebite prečac da biste pokrenuli povećavanje.<br/> {1,number,integer}. Dodirnite zaslon.<br/> {2,number,integer}. Povlačite dva prsta da biste se pomicali po zaslonu.<br/> {3,number,integer}. Spojite dva prsta da biste prilagodili povećanje.<br/> {4,number,integer}. Upotrijebite prečac da biste zaustavili povećavanje.<br/><br/> <b>Da biste privremeno povećali prikaz:</b><br/> {0,number,integer}. Provjerite je li odabrano povećavanje cijelog zaslona.<br/> {1,number,integer}. Upotrijebite prečac da biste pokrenuli povećavanje.<br/> {2,number,integer}. Dodirnite i zadržite bilo gdje na zaslonu.<br/> {3,number,integer}. Povlačite prst da biste se pomicali po zaslonu.<br/> {4,number,integer}. Podignite prst da biste zaustavili povećavanje."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Da biste povećali prikaz:</b><br/> {0,number,integer}. Upotrijebite prečac da biste pokrenuli povećavanje.<br/> {1,number,integer}. Dodirnite zaslon.<br/> {2,number,integer}. Povlačite dva prsta da biste se pomicali po zaslonu.<br/> {3,number,integer}. Spojite dva prsta da biste prilagodili povećanje.<br/> {4,number,integer}. Uz pomoć prečaca zaustavite povećavanje<br/><br/> Možete privremeno povećati itd."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Da biste povećali prikaz:</b><br/> {0,number,integer}. Upotrijebite prečac da biste pokrenuli povećavanje.<br/> {1,number,integer}. Dodirnite zaslon.<br/> {2,number,integer}. Povucite jednim prstom ili dvama prstima oko zaslona<br/> {3,number,integer}. Spojite dva prsta da biste prilagodili povećanje.<br/> {4,number,integer}. Uz pomoć prečaca zaustavite povećavanje<br/><br/> Možete privremeno povećati itd."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kad je povećanje uključeno, možete povećati prikaz na zaslonu.\n\n"<b>"Da biste zumirali"</b>", pokrenite povećanje, a zatim dodirnite bilo gdje na zaslonu.\n"<ul><li>"Povlačite s dva prsta ili više njih da biste se pomicali."</li>\n<li>"Spojite dva prsta ili više njih da biste prilagodili zumiranje."</li></ul>\n\n<b>"Da biste nešto privremeno zumirali"</b>", pokrenite povećanje, a zatim dodirnite bilo gdje na zaslonu i zadržite pritisak.\n"<ul><li>"Povlačite prstom da biste se kretali zaslonom."</li>\n<li>"Podignite prst da biste smanjili prikaz."</li></ul>\n\n"Tipkovnica i navigacijska traka ne mogu se povećati."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Stranica <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> od <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Prečac gumba za pristupačnost"</string>
@@ -2194,8 +2219,8 @@
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Upotreba gumba ili pokreta"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Lokacija"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Veličina"</string>
- <string name="accessibility_button_fade_title" msgid="8081993897680588829">"Blijedi kad se ne koristi"</string>
- <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Nakon nekoliko sekundi blijedi kako biste lakše mogli vidjeti zaslon"</string>
+ <string name="accessibility_button_fade_title" msgid="8081993897680588829">"Izblijedi kad se ne koristi"</string>
+ <string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Nakon nekoliko sekundi blijedi kako biste lakše vidjeli ono što je na zaslonu"</string>
<string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Prozirnost kad se ne koristi"</string>
<string name="accessibility_button_low_label" msgid="4193015407828927741">"Prozirno"</string>
<string name="accessibility_button_high_label" msgid="9138077512008190896">"Neprozirno"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{Postavljen je jedan raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritetni načini"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Dodajte način"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavijesti samo od važnih osoba i aplikacija"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Odaberite vrstu aktivacije"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Vrijeme"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Npr. \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Npr. \"Osobni kalendar\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Izrada načina"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Prilagođeno"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničavanje prekida"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Uključite opciju Ne uznemiravaj."</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Zvukovi alarma i medija mogu prekidati"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Rasporedi"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Brisanje rasporeda"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Brisanje"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Preimenuj"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Izbriši"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Želite li izbrisati način <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Uredi"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Rasporedi"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Raspored"</string>
@@ -3340,6 +3379,7 @@
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Postavite raspored"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Raspored"</string>
<string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Uključi automatski"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Raspored"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Utišaj telefon u određeno vrijeme"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Postavite pravila za način Ne uznemiravaj"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Dopusti ometanja koja proizvode zvuk"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizualnih ometanja"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dopusti vizualne signale"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Obavijesti koje možete dobiti"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Usredotočite se"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Dodatne radnje"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Isključeno}=1{Isključeno/jedan način može se automatski uključiti}one{Isključeno/# način može se automatski uključiti}few{Isključeno/# načina mogu se automatski uključiti}other{Isključeno/# načina može se automatski uključiti}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Postavke zaslona"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcije zaslona"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Nijanse sive"</string>
@@ -3366,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"omogući tamnu temu"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Prebacuje OS i aplikacije da koriste svijetli tekst na tamnoj pozadini, što omogućuje manje naprezanje očiju i značajnu uštedu baterije na nekim uređajima"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Bez promjena na zaslonu}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}one{{effect_1}, {effect_2} i još #}few{{effect_1}, {effect_2} i još #}other{{effect_1}, {effect_2} i još #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtriraj prekide"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nijedan prekid se ne filtrira"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcije prikaza za filtrirane obavijesti"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kad je uključena značajka Ne uznemiravaj"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bez zvuka obavijesti"</string>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otvaranje obavijesti"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Dopusti odgodu obavijesti"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Točka obavijesti na ikoni aplikacije"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paketi obavijesti"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Oblačići"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Oblačići"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Prikaži ovaj razgovor u oblačiću"</string>
@@ -3610,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ta aplikacija ne podržava napredne postavke"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Više postavki"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Više postavki dostupno je unutar aplikacije"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Postupno stišavanje obavijesti"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Primijeni na poslovne profile"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Primijeni na aplikacije poslovnog profila"</string>
@@ -3662,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorije"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Drugo"</string>
<string name="no_channels" msgid="4716199078612071915">"Ova aplikacija nije objavila nijednu obavijest"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Prikaži nekorištene kategorije"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Dodatne postavke u aplikaciji"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Prikaži nekorištene kategorije"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Sakrij nekorištene kategorije"</string>
@@ -3770,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacije koje mogu prekidati"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Odabrane aplikacije"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nijedna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Sve"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Odaberite više aplikacija"</string>
@@ -3788,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekidati"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nitko ne može prekidati"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekidati"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekidati"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Uzastopni pozivi"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Dopusti ponovne pozivatelje"</string>
@@ -3807,9 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Promijeni na opciju Samo alarmi na jedan sat do {time}}one{Promijeni na opciju Samo alarmi na # sat do {time}}few{Promijeni na opciju Samo alarmi na # sata do {time}}other{Promijeni na opciju Samo alarmi na # sati do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Promijeni na \"Samo alarmi\" do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Promijeni na \"Uvijek prekidaj\""</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"Promijeni naziv"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"Promijeni ikonu"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"Promijenite ikonu"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Uređivanje načina"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Dodavanje načina"</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="warning_button_text" msgid="1274234338874005639">"Upozorenje"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zatvori"</string>
<string name="device_feedback" msgid="5351614458411688608">"Pošalji povr. informacije o uređaju"</string>
@@ -4280,7 +4331,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Način navigacije"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navigacija pomoću dva gumba"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Da biste promijenili aplikaciju, prijeđite prstom prema gore na početnom zaslonu. Da biste vidjeli sve aplikacije, ponovo prijeđite prstom prema gore. Da biste se vratili, dodirnite gumb Natrag."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Sigurnost i hitni slučajevi"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Osobna sigurnost i hitni slučajevi"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"SOS poziv, zdravstveni podaci, upozorenja"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navigacija pokretima"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Da biste otvorili početni zaslon, prijeđite prstom od dna zaslona prema gore. Da biste promijenili aplikaciju, prijeđite prstom od dna prema gore, zadržite i otpustite. Da biste se vratili, prijeđite prstom od lijevog ili desnog ruba."</string>
@@ -4795,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Futrola"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterija"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Ploča postavki"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Nametni način rada na računalu"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Nameće eksperimentalni stolni način rada na sekundarnim zaslonima"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogući prozore slobodnog oblika"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Omogućite podršku za prozore slobodnog oblika."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Omogući prikaz u prozorima slobodnog oblika"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Omogućite prikaz u prozorima slobodnog oblika samo na sekundarnom zaslonu."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogući aplikacije nepromjenjive veličine u više prozora"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogućuje prikaz aplikacija nepromjenjive veličine u više prozora"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nadjačaj nametanje tamne teme"</string>
@@ -4864,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Podatkovna particija ovog uređaja treba se konvertirati u ext4 prije upotrebe opcije za razvojne programere od 16 KB. 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. Za aktiviranje opcije od 16 KB bit će potrebno još jedno ponovno pokretanje nakon konvertiranja podatkovne particije uređaja. Nakon što prijeđete na ovaj način, možete se prebacivati između načina od 4 KB i 16 KB uz jedno ponovno pokretanje. Neke će značajke biti onemogućene u tim načinima, pa neke aplikacije možda neće funkcionirati. Da biste uređaj vratili na produkcijski način rada, trebat ćete se vratiti na način od 4 KB, a zatim zaključati pokretač operativnog sustava, čime će se uređaj vratiti na tvorničke postavke. Nakon što uređaj uspješno pokrene Android, onemogućite otključavanje OEM-a u opcijama za razvojne programere. Podaci s uređaja će se izbrisati, a nakon potvrde datotečni sustav promijenit će se u ext4. Nakon što se to dovrši, vratite se da biste ponovno omogućili način od 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Izbriši sve podatke"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Formatiranje i čišćenje podatkovne particije u ext4 nije uspjelo."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Za način od 16 KB potrebno je otključati pokretač operativnog sustava"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Potrebno je otključavanje pokretača operativnog sustava"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Ovaj uređaj mora imati otključan pokretač operativnog sustava prije upotrebe opcije za razvojne programere od 16 KB. 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. Svi korisnički podaci i postavke izbrisat će se nakon aktiviranja načina od 16 KB. Nakon što se pokretač operativnog sustava otključa, za aktiviranje opcije od 16 KB bit će potrebno dva puta pokrenuti ponovno pokretanje. Nakon što prijeđete na ovaj način, možete se prebacivati između načina od 4 KB i 16 KB uz jedno ponovno pokretanje. Neke će značajke biti onemogućene u tim načinima, pa neke aplikacije možda neće funkcionirati. Da biste uređaj vratili na produkcijski način rada, trebat ćete se vratiti na način od 4 KB, a zatim zaključati OEM/pokretač operativnog sustava (čime će se uređaj vratiti na tvorničke postavke). Otključajte pokretač operativnog sustava i pokušajte ponovno. Upute kako to učiniti možete pronaći na web-lokaciji <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Upotreba načina od 4 KB koji ne ovisi o veličini stranice"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Aktivan je način od 4 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 se vratili u produkcijski način rada, morate zaključati pokretač operativnog sustava. Dodirnite za više informacija."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Aktivan je način od 4 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 zaključati pokretač operativnog sustava uređaja. 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 otključavanje OEM-a 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite web-lokaciju <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>, 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_16k_pages_title" msgid="7762533464569818498">"Upotreba načina od 16 KB koji ne ovisi o veličini stranice"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Aktivan je način 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 uređaja. Dodirnite da biste pročitali više."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Aktivan je način 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 uređaja. To će ponovno vratiti uređaj na tvorničke odnosno produkcijske postavke. Nakon što uređaj uspješno pokrene Android, onemogućite otključavanje OEM-a 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite web-lokaciju <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>, 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_16k_pages_text_short" msgid="3282018880292691631">"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. Dodirnite da biste pročitali više."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ili upotrijebite web-lokaciju <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>, 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="bug_report_handler_title" msgid="713439959113250125">"Rukovatelj izvješćem o programskim pogreškama"</string>
@@ -4971,8 +5024,8 @@
<string name="default_active_sim_sms" msgid="8041498593025994921">"SMS"</string>
<string name="default_active_sim_mobile_data" msgid="6798083892814045301">"mobilne podatke"</string>
<string name="wifi_scan_notify_message" msgid="1331238142061476869">"Radi boljeg doživljaja na uređaju, aplikacije i usluge i dalje mogu tražiti Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Time se primjerice mogu poboljšati značajke i usluge koje se temelje na lokaciji. To možete promijeniti u postavkama traženja Wi-Fija."</string>
- <string name="wifi_scan_change" msgid="8438320311511852918">"Promijeni"</string>
- <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
+ <string name="wifi_scan_change" msgid="8438320311511852918">"Promijenite"</string>
+ <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
<string name="mobile_data_temp_connection_active" msgid="3430470299756236413">"Privremeno povezano"</string>
<string name="mobile_data_temp_using" msgid="5211002380149434155">"Privremeno koristite <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
@@ -5004,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Koristi prikvačivanje aplikacije"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Koristi opcije za razvojne programere"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Koristi uslugu ispisa"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Dopusti više korisnika"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Dopusti prebacivanje između korisnika"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"dopustiti, više, korisnik, dopuštenje, mnogo"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"više, korisnici, profili, osobe, računi, prebaci, mnogi"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Upotreba bežičnog otklanjanja pogrešaka"</string>
@@ -5118,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Odaberite što će se prikazivati na zaslonu kad se tablet nalazi na priključnoj stanici. Uređaj može trošiti više energije kad se koristi čuvar zaslona."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Prilagodite"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Prilagodite <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Za omogućivanje podrške slobodnom obliku potrebno je ponovno pokretanje."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Za prisilno uključivanje načina radne površine na sekundarnim zaslonima potrebno je ponovno pokretanje."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Za omogućivanje podrške za prikaz u naslijeđenim prozorima slobodnog oblika potrebno je ponovno pokretanje."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Za izmjenu podrške za prikaz u prozorima slobodnog oblika potrebno je ponovno pokretanje."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Za prisilno uključivanje prikaza u prozorima slobodnog oblika na sekundarnim zaslonima potrebno je ponovno pokretanje."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Ponovno pokreni sada"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Ponovno pokreni kasnije"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Prostorni zvuk"</string>
@@ -5237,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Uključeno"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Isključeno"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Uključeno"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Zvuk %1$d%% lijevo, %2$d%% desno"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Zvuk %1$d%% desno, %2$d%% lijevo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Naziv vašeg uređaja vidljiv je aplikacijama koje ste instalirali. Mogu ga vidjeti i druge osobe kada se povežete s Bluetooth uređajima ili Wi-Fi mrežom ili kada postavite Wi-Fi žarišnu točku."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatički rod"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Odaberite gramatički rod"</string>
@@ -5348,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Pretražite postavke"</string>
</resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index db7e4a4..109259a 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Alvásidő"</item>
+ <item msgid="4152450357280759894">"Vezetés"</item>
+ <item msgid="7096549258219399423">"Magával ragadó"</item>
+ <item msgid="2760716776980432977">"Kezelt"</item>
+ <item msgid="601734478369121764">"Csillag"</item>
+ <item msgid="6243809315432780521">"Naptár"</item>
+ <item msgid="4913577903148415331">"Idő"</item>
+ <item msgid="3653377604690057780">"Színház"</item>
+ <item msgid="3843711267408385410">"Virág"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 73dff50..a1adfda 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Leválasztja az eszközt?"</string>
<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>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatikus bekapcsolás holnap"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Hallókészülék-beállítások"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Gyorsparancs, hallókészülék-kompatibilitás"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Beállításkészlet"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Audiológusa nem programozott be beállításkészleteket"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Nem sikerült frissíteni a beállításkészletet"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Hangkimenet"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"A hangkimenetről"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Ki"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Be / # alkalmazás hozzáfér a helyadatokhoz}other{Be / # alkalmazás hozzáfér a helyadatokhoz}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Betöltés…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"A közeli eszközökre vonatkozó engedéllyel rendelkező alkalmazások meghatározhatják a csatlakoztatott eszközök relatív pozícióját."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"A közeli eszközökre vonatkozó engedéllyel rendelkező alkalmazások meghatározhatják a csatlakoztatott eszközök relatív pozícióját."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"A helyhozzáférés ki van kapcsolva az alkalmazásoknál és a szolgáltatásoknál. A rendszer azonban így is elküldheti az eszköz helyét a segélyszolgálatoknak, ha Ön segélyhívó számot hív, vagy SMS-t küld rá."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"További információ a helybeállításokról"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"A módosításához lépjen a következő menübe ChromeOS-eszközén: Beállítások > Adatvédelem és biztonság > Adatvédelmi beállítások > Helyhozzáférés"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Arc és <xliff:g id="WATCH">%s</xliff:g> hozzáadva"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Arc, ujjlenyomat és <xliff:g id="WATCH">%s</xliff:g> hozzáadva"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Arc, ujjlenyomatok és <xliff:g id="WATCH">%s</xliff:g> hozzáadva"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Ez szükséges, mert a személyazonosság-ellenőrzés be van kapcsolva"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Távoli hitelesítő alapú feloldás"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Óra hozzáadva"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Az óra beállítása"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"További információ a Feloldás órával funkcióról"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Óra hozzáadása"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Óra eltávolítása"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Feloldás ujjlenyomattal és Arcalapú feloldás"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Arc- és ujjlenyomat-alapú feloldás"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Arc- és ujjlenyomat-alapú feloldás a munkaprofilban"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Beállítás szükséges"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Arc és ujjlenyomatok hozzáadva"</string>
@@ -614,11 +615,9 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Alkalmazások telepítése"</b>\n"Telepítse azokat az alkalmazásokat, amelyeket privát területén szeretne tartani."</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Fontos tudnivalók"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Az alkalmazások leállnak, amikor zárolja a területét"</b>\n"A területe zárolásakor a benne található alkalmazások leállnak, és nem fog tőlük értesítéseket kapni."</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
- <string name="private_space_learn_more_text" msgid="5314198983263277586">"További információ a magánterületről"</string>
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"A privát területek nem alkalmasak olyan alkalmazások számára, amelyeknek a háttérben kell futniuk, vagy kulcsfontosságú értesítéseket kell küldeniük (ilyenek például az egészségügyi appok). Ez azért van így, mert az értesítések és a háttértevékenységek le vannak állítva, amikor zárolva van a terület.\n\nA privát területen lévő alkalmazások nem jelennek meg az Engedélykezelőben, az adatvédelmi irányítópulton és más beállításokban, amikor a privát terület zárolva van.\n\nA privát terület nem helyezhető át új eszközre. Ha másik eszközön szeretné használni, akkor másik privát területet kell beállítania.\n\nBárki, aki az Ön eszközét számítógéphez csatlakoztatja, vagy kártékony alkalmazást telepít az Ön eszközére, hozzá tud férni a privát területhez."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"A privát területek nem alkalmasak olyan alkalmazások számára, amelyeknek a háttérben kell futniuk, vagy kulcsfontosságú értesítéseket kell küldeniük (ilyenek például az egészségügyi appok). Ez azért van így, mert az értesítések és a háttértevékenységek le vannak állítva, amikor zárolva van a terület.\n\nA privát területen lévő alkalmazások nem jelennek meg az Engedélykezelőben, az adatvédelmi irányítópulton és más beállításokban, amikor a privát terület zárolva van.\n\nA privát terület nem állítható vissza új eszközön. Ha másik eszközön szeretné használni, akkor másik területet kell beállítania.\n\nBárki, aki az Ön eszközét számítógéphez csatlakoztatja, vagy rosszindulatú alkalmazást telepít az eszközére, hozzá tud férni az Ön privát területéhez."</string>
+ <string name="private_space_learn_more_text" msgid="5314198983263277586">"További információ a privát területről"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Ez eltart egy kis ideig"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"A privát terület beállítása…"</string>
<string name="private_space_error_screen_title" msgid="739381738044418346">"Nem sikerült a privát terület beállítása"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Újraindítja az eszközt?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"A részletes NFC-naplózás csak fejlesztési célokra szolgál. A hibajelentésekben további NFC-adatok is szerepelnek, amelyek között privát információk is lehetnek. A beállítás módosításához indítsa újra eszközét."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Újraindítás"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"tükrözés, külső kijelző, csatlakoztatott kijelző, usb-s kijelző, felbontás, elforgatás"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Elforgatás"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Normál"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Képernyő-billentyűzet használata"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Maradjon a képernyőn, amíg a fizikai billentyűzet aktív"</string>
<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="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="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">"Használhatja a fizikai billentyűzetet az egér vezérlésére."</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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Mutatókitöltés-stílus módosítása: sárga"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Mutatókitöltés-stílus módosítása: rózsaszín"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Mutatókitöltés-stílus módosítása: kék"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Mutató húzásának stílusa"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Fehér"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Fekete"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nincs"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Felhasználó által kiválasztva: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Beszéd"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Mutató sebessége"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Mutató mérete"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Mutató méretének csökkentése"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Mutató méretének növelése"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Játékvezérlő"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Rezgés átirányítása"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Rezgés küldése a játékvezérlőre kapcsolódáskor"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Folytatás mégis"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Mégse"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nagyítási beállítások"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Egyujjas pásztázás"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"A nagyító mozgatása egy ujjal"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Egy ujjal húzva mozgathatja a képernyő tartalmát"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"A nagyítási terület mozgatása egy ujj húzásával."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"A nagyítási terület mozgatása két ujj húzásával."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nem áll rendelkezésre, ha a nagyítás csak a képernyő egy részére terjed ki"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Nagyításhoz koppintson a gombra"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Gyorsan nagyíthat a képernyőn a tartalom felnagyítása érdekében"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>A nagyításhoz:</b><br/> {0,number,integer}. Használja a gyorsparancsot a nagyítás megkezdéséhez.<br/> {1,number,integer}. Koppintson a képernyőre.<br/> {2,number,integer}. Két ujjának húzásával mozoghat a képernyőn.<br/> {3,number,integer}. Két ujjának összehúzásával módosíthatja a nagyítási szintet.<br/> {4,number,integer}. A gyorsparancs segítségével leállíthatja a nagyítási funkciót.<br/><br/><b>Az ideiglenes nagyításhoz:</b><br/> {0,number,integer}. Ellenőrizze, hogy a nagyítás típusa teljes képernyőre van-e beállítva.<br/> {1,number,integer}. Használja a gyorsparancsot a nagyítás megkezdéséhez.<br/> {2,number,integer}. Tartsa lenyomva egyik ujját bárhol a képernyőn.<br/> {3,number,integer}. Ujjának húzásával mozoghat a képernyőn.<br/> {4,number,integer}. Emelje fel ujját a nagyítás befejezéséhez."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>A nagyításhoz:</b><br/> {0,number,integer}. Használja a gyorsparancsot a nagyítás megkezdéséhez.<br/> {1,number,integer}. Koppintson a képernyőre.<br/> {2,number,integer}. Két ujjal húzva mozgathatja a képernyő tartalmát.<br/> {3,number,integer}. Két ujjának összehúzásával módosíthatja a nagyítási szintet.<br/> {4,number,integer}. A gyorsparancs használatával leállíthatja a nagyítást<br/><br/> Egyebek mellett ideiglenesen is nagyíthat."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>A nagyításhoz:</b><br/> {0,number,integer}. Használja a gyorsparancsot a nagyítás megkezdéséhez.<br/> {1,number,integer}. Koppintson a képernyőre.<br/> {2,number,integer}. Egy vagy két ujjal húzva mozgathatja a képernyő tartalmát<br/> {3,number,integer}. Két ujjának összehúzásával módosíthatja a nagyítási szintet.<br/> {4,number,integer}. A gyorsparancs használatával leállíthatja a nagyítást<br/><br/> Egyebek mellett ideiglenesen is nagyíthat."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Ha be van kapcsolva a nagyítás funkció, ránagyíthat a képernyő tartalmára.\n\nA "<b>"nagyításhoz"</b>", indítsa el a funkciót, majd koppintson a kívánt területre a képernyőn.\n"<ul><li>"Görgetéshez húzza legalább két ujját a képernyőn."</li>\n<li>"A nagyítás mértékét két vagy több ujjának össze- vagy széthúzásával módosíthatja."</li></ul>\n\n<b>"Ideiglenes nagyításhoz"</b>" indítsa el a funkciót, majd tartsa lenyomva a kívánt területet a képernyőn.\n"<ul><li>"Ujját lenyomva tartva mozoghat a képernyőn."</li>\n<li>"A méret visszaállításához emelje fel ujját a képernyőről."</li></ul>\n\n"A billentyűzeten és a navigációs sávon nem lehetséges a nagyítás."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>/<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. oldal"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Gyorsparancs a Kisegítő lehetőségek gombhoz"</string>
@@ -3171,7 +3196,7 @@
<string name="cloned_app_created_summary" msgid="7277912971544890710">"Klónozva"</string>
<string name="cloned_app_creation_toast_summary" msgid="3854494347144867870">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>-klón létrehozása…"</string>
<string name="cloned_app_created_toast_summary" msgid="755225403495544163">"<xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>-klón létrehozva"</string>
- <string name="system_dashboard_summary" msgid="7400745270362833832">"Nyelvek, gesztusok, idő, biztonsági mentés"</string>
+ <string name="system_dashboard_summary" msgid="7400745270362833832">"Nyelvek, kézmozdulatok, idő, biztonsági mentés"</string>
<string name="languages_setting_summary" msgid="2650807397396180351">"Rendszernyelvek, alkalmazásnyelvek, regionális preferenciák, beszéd"</string>
<string name="keywords_wifi" msgid="8156528242318351490">"WiFi, Wi-Fi, hálózati kapcsolat, internet, vezeték nélküli, adatok, Wi Fi"</string>
<string name="keywords_wifi_notify_open_networks" msgid="6580896556389306636">"Wi‑Fi-értesítés, wifi értesítés"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nincs}=1{1 ütemezés beállítva}other{# ütemezés beállítva}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne zavarjanak"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritási módok"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Mód hozzáadása"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Értesítés fogadása csak fontos személyektől és alkalmazásoktól"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Aktiválástípus kiválasztása"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Idő"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Pl.: „9:30 – 17:00”"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Naptár"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Pl.: „Személyes naptár”"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Mód létrehozása"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Egyéni"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"A megszakítások korlátozása"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"A Ne zavarjanak mód bekapcsolása"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Az ébresztések és médiahangok megszakíthatják a „Ne zavarjanak” módot"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Ütemezések"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Ütemezések törlése"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Törlés"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Átnevezés"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Törlés"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Törli a(z) „<xliff:g id="MODE">%1$s</xliff:g>” módot?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Szerkesztés"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Ütemezések"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ütemezés"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Naptár hozzáadása"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Naptár használata"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Ütemezés"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Állítson be ütemezést"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Ütemezés"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ó, <xliff:g id="MINUTES">%2$d</xliff:g> p"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Automatikus bekapcsolás"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ütemezés"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefonnémítás ütemezése"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"A Ne zavarjanak szabályai"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Hanggal járó jelzések engedélyezése"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Megjelenő értesítések tiltása"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizuális jelek engedélyezése"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Értesítések, amelyek eljuthatnak Önhöz"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Folyamatosan figyeljen"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"További műveletek"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Ki}=1{Ki / 1 mód automatikusan bekapcsolhat}other{Ki/ # mód automatikusan bekapcsolhat}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Megjelenítési beállítások"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Megjelenítési beállítások"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Szürkeárnyalatos"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"sötét téma engedélyezése"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Módosíthatja az operációs rendszer és az alkalmazások beállításait úgy, hogy a sötét háttér előtti világos szöveget részesítsék előnyben, ami kevésbé megterhelő a szemnek, valamint jóval energiatakarékosabb használatot eredményez egyes eszközökön."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nincs megjelenítésmódosítás}=1{{effect_1}}=2{{effect_1} és {effect_2}}=3{{effect_1}, {effect_2} és {effect_3}}other{{effect_1}, {effect_2}, és # további}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Megszakítások szűrése"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"A rendszer nem szűrt ki megszakításokat"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"A szűrt értesítések megjelenítési beállításai"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Ha a „Ne zavarjanak” mód aktív"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Nincs hang az értesítéseknél"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"értesítés megnyitása"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Értesítés halasztásának engedélyezése"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Értesítési pötty az alkalmazásikonon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Értesítéscsomagok"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Buborékok"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Buborékok"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Beszélgetés buborékba helyezése"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Az alkalmazás nem támogatja a speciális beállításokat"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"További beállítások"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Ebben az alkalmazásban további beállítások állnak rendelkezésre"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Értesítések befagyasztása"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategóriák"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Egyéb"</string>
<string name="no_channels" msgid="4716199078612071915">"Ez az alkalmazás nem küldött semmilyen értesítést"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Nem használt kategóriák mutatása"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Az alkalmazás további beállításai"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Nem használt kategóriák mutatása"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Nem használt kategóriák elrejtése"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Azok az alkalmazások, amelyeknél engedélyezve van a megszakítás"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Kiválasztott alkalmazások"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nincs"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Összes"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"További alkalmazások kiválasztása"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Semmi sem szakíthatja meg a „Ne zavarjanak” módot"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Senki sem szakíthatja meg a „Ne zavarjanak” módot"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Néhány személy megszakíthatja a „Ne zavarjanak” módot"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Minden személy megszakíthatja a „Ne zavarjanak” módot"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Többször hívó személyek"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Többször hívó személyek engedélyezése"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Módosítás csak ébresztésekre egy órára, eddig: {time}}other{Módosítás csak ébresztésekre # órára, eddig: {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Váltás „Csak ébresztésekre” eddig: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Módosítás a bármikor történő megszakításra"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Szerkesztési mód"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Mód hozzáadá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="warning_button_text" msgid="1274234338874005639">"Figyelmeztetés"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Bezárás"</string>
<string name="device_feedback" msgid="5351614458411688608">"Visszajelzés küldése az eszközről"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Tok"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Akkumulátor"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Beállítások panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Asztali mód kényszerítése"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Kísérleti asztali mód kényszerítése a másodlagos kijelzőkön"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Szabad formájú ablakok engedélyezése"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Szabad formájú ablakok támogatásának engedélyezése."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Szabad formájú ablakkezelés engedélyezése 2. kijelzőn"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Szabad formájú ablakok engedélyezése csak a másodlagos kijelzőn."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Nem átméretezhető appok engedélyezése többablakos nézetben"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Engedélyezi a nem átméretezhető alkalmazásokat a többablakos nézetben"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"A kényszerített sötétítés felülírása"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"A 16 kB-os fejlesztői opció használata előtt konvertálja ext4 fájlrendszerre az eszköz adatpartícióját. 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. A 16 kB-os opció aktiválásával még egy újraindításra van szükség ezután. Ebben a módban egyetlen újraindítással válthat oda és vissza a 4 kB-os és a 16 kB-os mód között. 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 szeretné az eszközt éles üzemmódba visszaállítani, akkor annyit kellene tennie, hogy visszavált 4 kB-os módra, majd zárolja a rendszerindítót, ezzel ugyanis visszaállítja az eszközt a gyári beállításokra. 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. A rendszer ekkor törli az eszköz adatait, a fájlrendszer pedig a megerősítést követően ext4 rendszerre módosul. Miután a folyamat befejeződött, próbálja újra engedélyezni a 16 kB-os módot."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Minden adat törlése"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Nem sikerült az ext4 fájlrendszerre való újraformatálás és az adatpartíció adatainak visszaállíthatatlan törlése."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"A 16 kB-os módhoz a rendszerindító zárolásának feloldása szükséges"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Fel kell oldani a rendszerindítót"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"A 16 kB-os fejlesztői opció használata előtt fel kell oldani ezen az eszközön a rendszerindító zárolását. A szoftverek integritása nem garantálható ebben a módban, és a telefonon tárolt összes adat veszélyben lehet, amíg rendszerindító zárolása fel van oldva. A 16 kB-os mód aktiválásakor a rendszer minden felhasználói adatot és beállítást töröl. A rendszerindító zárolásának feloldása után két újraindítás szükséges a 16 kB-os opció aktiválásához. Ebben a módban egyetlen újraindítással válthat oda és vissza a 4 kB-os és a 16 kB-os mód között. 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 szeretné az eszközt éles üzemmódba visszaállítani, akkor annyit kellene tennie, hogy visszavált 4 kB-os módra, majd zárolja az eszközön az OEM-et/rendszerindítót (ezzel visszaállítja az eszközt a gyári beállításokra). Oldja fel a rendszerindító zárolását, majd próbálkozzon újra. A művelettel kapcsolatos utasításokat itt találja: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 kB-os, lapmérettől független módot használ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ön jelenleg a lapmérettől független mód 4 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, zárolja az eszköz rendszerindítóját. Koppintson a további információk megtekintéséhez."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ön jelenleg a lapmérettől független mód 4 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, 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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Másik megoldásként használhatja a <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"16 kB-os, lapmérettől független módot használ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Ö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. Koppintson a további információk megtekintéséhez."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Ö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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Másik megoldásként használhatja a <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"Ö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. Koppintson a további információk megtekintéséhez."</string>
+ <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: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Másik megoldásként használhatja a <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Hibajelentés kezelője"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Alkalmazáskitűzés használata"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Fejlesztői beállítások használata"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Nyomtatási szolgáltatás használata"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Több felhasználó engedélyezése"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Felhasználóváltás engedélyezése"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"engedélyezés, több, felhasználó, engedély, sok"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"több, felhasználók, profilok, személyek, fiókok, kapcsoló, sok"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Vezeték nélküli hibakeresés használata"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Kiválaszthatja, hogy mi legyen látható a képernyőn, amikor a táblagép dokkolt állapotban van. Előfordulhat, hogy az eszköz több energiát használ, ha a képernyőkímélő be van kapcsolva."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Szerkesztés"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> személyre szabása"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"A szabad formátumú támogatás engedélyezéséhez újraindításra van szükség."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Az asztali mód másodlagos kijelzőkön való kényszerítéséhez újraindításra van szükség."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Újraindítás szükséges a régi szabad formájú ablakkezelés támogatásának engedélyezéséhez."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Újraindítás szükséges a szabad formájú ablakkezelés támogatásának módosításához."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Újraindítás szükséges a szabad formájú ablakkezelés másodlagos kijelzőre való kényszerítéséhez."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Újraindítás most"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Újraindítás később"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Térbeli hangzás"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Be"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Ki"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Be"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Hang: %1$d%% a bal oldalon, %2$d%% a jobb oldalon"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Hang: %1$d%% a jobb oldalon, %2$d%% a bal oldalon"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Eszköze neve látható a telepített alkalmazások számára. Mások is láthatják, ha csatlakoztatja telefonját más Bluetooth-eszközökhöz, Wi-Fi-hálózathoz, vagy ha Wi-Fi-hotspotot állít be."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Nyelvtani nem"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Nyelvtani nem kiválasztása"</string>
@@ -5353,4 +5403,5 @@
<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">"Audiostream QR-kódjának beolvasása 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="homepage_search" msgid="6759334912284663559">"Keresési beállítások"</string>
</resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 1a8b95d..13aa275 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Քնելու ժամը"</item>
+ <item msgid="4152450357280759894">"Մեքենայով"</item>
+ <item msgid="7096549258219399423">"Ներկայության էֆեկտով"</item>
+ <item msgid="2760716776980432977">"Կառավարվող"</item>
+ <item msgid="601734478369121764">"Աստղ"</item>
+ <item msgid="6243809315432780521">"Օրացույց"</item>
+ <item msgid="4913577903148415331">"Ժամ"</item>
+ <item msgid="3653377604690057780">"Թատրոն"</item>
+ <item msgid="3843711267408385410">"Ծաղիկ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 2845385..3430529 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Անջատե՞լ սարքը:"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Նոր սարքի զուգակցում"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ավտոմատ միացնել վաղը"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Լսողական սարքի կարգավորումներ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Դյուրանցում, լսողական սարքի համատեղելիություն"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Կարգավորումների հավաքածու"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Մասնագետի կողմից կազմված կարգավորումների հավաքածուներ չկան"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Չհաջողվեց թարմացնել կարգավորումների հավաքածուն"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Աուդիո ելք"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Աուդիո ելքի մասին"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Անջատված է"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Միացված է / Տեղադրության տվյալները հասանելի են # հավելվածի}one{Միացված է / Տեղադրության տվյալները հասանելի են # հավելվածի}other{Միացված է / Տեղադրության տվյալները հասանելի են # հավելվածի}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Բեռնում…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Հավելվածները, որոնց հասանելի են մոտակա սարքերը, կարող են որոշել միացված սարքերի հարաբերական դիրքավորումը։"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Հավելվածները, որոնց հասանելի են մոտակա սարքերը, կարող են որոշել միացված սարքերի հարաբերական դիրքավորումը։"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Տեղադրության տվյալների օգտագործման թույլտվությունն անջատված է հավելվածների և ծառայությունների համար։ Ձեր սարքի տեղադրության տվյալները կարող են ուղարկվել փրկարար ծառայություններին, եթե դուք զանգեք կամ հաղորդագրություն գրեք արտակարգ իրավիճակների հեռախոսահամարով։"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Իմանալ ավելին տեղադրության կարգավորումների մասին"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Փոխելու համար անցեք ChromeOS-ի կարգավորումներ > Գաղտնիություն և անվտանգություն > Գաղտնիության կարգավորումներ > Տեղորոշման թույլտվություն"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Դեմքով և ժամացույցով (<xliff:g id="WATCH">%s</xliff:g>) ապակողպումը կարգավորված է"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Դեմքով, մատնահետքով և ժամացույցով (<xliff:g id="WATCH">%s</xliff:g>) ապակողպումը կարգավորված է"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Դեմքով, մատնահետքերով և ժամացույցով (<xliff:g id="WATCH">%s</xliff:g>) ապակողպումը կարգավորված է"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Սա անհրաժեշտ է, քանի որ «Անձի նույնականացում» գործառույթը միացված է"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Authenticator-ով հեռակա ապակողպում"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Ժամացույցն ավելացված է"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Կարգավորեք ձեր ժամացույցը"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Իմանալ ավելին ժամացույցով ապակողպման մասին"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Ավելացնել ժամացույց"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Հեռացնել ժամացույցը"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Մատնահետքով և դեմքով ապակողպում"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Դեմքով և մատնահետքով ապակողպում"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Դեմքով և մատնահետքով ապակողպում աշխատանքի համար"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Պահանջվում է կարգավորում"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Դեմքի և մատնահետքի նմուշներն ավելացվեցին"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Տեղադրեք հավելվածներ"</b>\n"Ձեր տարածքում տեղադրեք հավելվածներ, որոնք չեք ուզում, որ ցուցադրվեն"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Հիշեք"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Եթե կողպեք տարածքը, հավելվածները կդադարեն աշխատել"</b>\n"Երբ կողպեք ձեր տարածքը, տարածքի հավելվածները կդադարեն աշխատել, և դուք դրանցից ծանուցումներ չեք ստանա"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Մասնավոր տարածքները հարմար չեն հավելվածների համար, որոնք պետք է աշխատեն ֆոնային ռեժիմում և ուղարկեն կարևոր ծանուցումներ, օրինակ՝ բժշկական հավելվածների։ Պատճառն այն է, որ ծանուցումները և ֆոնային ռեժիմում աշխատանքը դադարում են, երբ ձեր տարածքը կողպվում է։\n\nՁեր մասնավոր տարածքի հավելվածները չեն հայտնվի թույլտվությունների կառավարչում, թույլտվությունների կառավարման վահանակում և այլ կարգավորումներում, երբ մասնավոր տարածքը կողպված է։\n\nՄասնավոր տարածքը հնարավոր չի լինի վերականգնել նոր սարքում։ Դուք պետք է այլ անձնական տարածք կարգավորեք, եթե ուզում եք այն օգտագործել ուրիշ սարքում։\n\nՑանկացած մեկը, ով ձեր սարքը միացնի համակարգչի կամ վնասաբեր հավելվածներ տեղադրի ձեր սարքում, կկարողանա բացել ձեր մասնավոր տարածքը։"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Մասնավոր տարածքները հարմար չեն հավելվածների համար, որոնք պետք է աշխատեն ֆոնային ռեժիմում և ուղարկեն կարևոր ծանուցումներ, օրինակ՝ բժշկական հավելվածների։ Պատճառն այն է, որ ծանուցումները և ֆոնային ռեժիմում աշխատանքը դադարում են, երբ ձեր տարածքը կողպվում է։\n\nՁեր մասնավոր տարածքի հավելվածները չեն հայտնվի թույլտվությունների կառավարչում, թույլտվությունների կառավարման վահանակում և այլ կարգավորումներում, երբ մասնավոր տարածքը կողպված է։\n\nՄասնավոր տարածքը հնարավոր չի լինի վերականգնել նոր սարքում։ Դուք պետք է այլ տարածք կարգավորեք, եթե ուզում եք այն օգտագործել ուրիշ սարքում։\n\nՑանկացած մեկը, ով ձեր սարքը միացնի համակարգչի կամ վնասաբեր հավելվածներ տեղադրի ձեր սարքում, կկարողանա բացել ձեր մասնավոր տարածքը։"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Իմանալ ավելին մասնավոր տարածքի մասին"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Դա կտևի մի քանի րոպե"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Մասնավոր տարածքի կարգավորում…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Վերագործարկե՞լ սարքը"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC-ի միջոցով մանրամասն մատյանի վարումը նախատեսված է ոչ միայն ծրագրավորման նպատակներով։ NFC-ի լրացուցիչ տվյալները ավելացվում են նաև վրիպակների մասին զեկույցներում, որոնք կարող են անձնական տեղեկություններ պարունակել։ Այս կարգավորումը փոխելու համար վերագործարկեք ձեր սարքը։"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Վերագործարկել"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"հայելապատճենել, արտաքին էկրան, միացված էկրան, usb էկրան, լուծաչափ, պտտում"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Պտտում"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Ստանդարտ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Օգտագործել էկրանի ստեղնաշարը"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Պահել էկրանին, երբ ֆիզիկական ստեղնաշարն ակտիվ է"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Ցուցիչի լցման ոճը դարձնել դեղին"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Ցուցիչի լցման ոճը դարձնել վարդագույն"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Ցուցիչի լցման ոճը դարձնել կապույտ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Նշորդի ոճը"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Սպիտակ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Սև"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ընտրված չէ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Օգտատիրոջ ընտրած՝ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Խոսք"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Նշորդի արագությունը"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Մկնիկի ցուցիչի չափսը"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Փոքրացնել մկնիկի ցուցիչի չափսը"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Մեծացնել մկնիկի ցուցիչի չափսը"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Խաղերի կարգավորիչ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Թրթռոցի վերաուղղորդում"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Ուղարկել թրթռոցը խաղի կարգավորիչին, եթե վերջինս միացված է"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Շարունակել"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Չեղարկել"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Խոշորացման կարգավորումներ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Մեկ մատով տեղաշարժ"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Տեղաշարժեք խոշորացույցը 1 մատով"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Քաշեք մեկ մատով՝ էկրանին տեղաշարժվելու համար"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Տեղափոխեք խոշորացման ընդգրկույթը՝ մեկ մատով քաշելով։"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Տեղափոխեք խոշորացման ընդգրկույթը՝ երկու մատով քաշելով։"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Հասանելի չէ, երբ միայն էկրանի մի մասն է խոշորացվում"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Հպել որևէ կոճակի՝ մեծացնելու համար"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Արագ խոշորացրեք էկրանը՝ բովանդակությունն ավելի պարզ տեսնելու համար"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Խոշորացնելու համար՝</b><br/> {0,number,integer}. Օգտագործեք դյուրանցումը<br/> {1,number,integer}. Հպեք էկրանին<br/> {2,number,integer}. Քաշեք երկու մատով՝ էկրանի վրա տեղաշարժվելու համար<br/> {3,number,integer}. Շարժեք երկու մատը՝ խոշորացումը կարգավորելու համար<br/> {4,number,integer}. Դյուրանցման միջոցով դադարեցրեք խոշորացումը<br/><br/> <b>Ժամանակավորապես խոշորացնելու համար՝</b><br/> {0,number,integer}. Համոզվեք, որ խոշորացման համար նշված է լիաէկրան ռեժիմը<br/> {1,number,integer}. Օգտագործեք դյուրանցումը<br/> {2,number,integer}. Հպեք էկրանի որևէ մասի և պահեք<br/> {3,number,integer}. Քաշեք մատով՝ էկրանի վրա տեղաշարժվելու համար<br/> {4,number,integer}. Հեռացրեք մատը էկրանից՝ խոշորացումը դադարեցնելու համար"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Մեծացնելու համար՝</b><br/> {0,number,integer}․ Օգտագործեք դյուրանցումը՝ խոշորացումը սկսելու համար<br/> {1,number,integer}. Հպեք էկրանին<br/> {2,number,integer}. Քաշեք երկու մատով՝ էկրանի վրա տեղաշարժվելու համար<br/> {3,number,integer}. Շարժեք երկու մատը՝ խոշորացումը կարգավորելու համար<br/> {4,number,integer}. Օգտագործեք դյուրանցումը՝ խոշորացումը կանգնեցնելու համար<br/><br/> Կարող եք նաև ժամանակավորապես մեծացնել և այլ գործողություններ կատարել։"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Մեծացնելու համար՝</b><br/> {0,number,integer}․ Օգտագործեք դյուրանցումը՝ խոշորացումը սկսելու համար<br/> {1,number,integer}. Հպեք էկրանին<br/> {2,number,integer}. Քաշեք մեկ կամ երկու մատով՝ էկրանի վրա տեղաշարժվելու համար<br/> {3,number,integer}. Շարժեք երկու մատը՝ խոշորացումը կարգավորելու համար<br/> {4,number,integer}. Օգտագործեք դյուրանցումը՝ խոշորացումը կանգնեցնելու համար<br/><br/> Կարող եք նաև ժամանակավորապես մեծացնել և այլ գործողություններ կատարել։"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Երբ խոշորացումը միացված է, դուք կարող եք մեծացնել էկրանի մասշտաբը:\n\n"<b>"Մասշտաբը մեծացնելու համար"</b>"միացրեք խոշորացումը և հպեք էկրանի ցանկացած հատվածին:\n"<ul><li>"Ոլորելու համար 2 կամ ավելի մատները քաշեք էկրանի վրայով։"</li>\n<li>"Մասշտաբը փոխելու համար 2 կամ ավելի մատները մոտեցրեք միմյանց։"</li></ul>\n\n<b>"Մասշտաբը ժամանակավորապես փոխելու համար"</b>" միացրեք խոշորացումը, ապա հպեք էկրանի ցանկացած հատվածին և պահեք։\n"<ul><li>"Քաշեք՝ էկրանով մեկ շարժելու համար։"</li>\n<li>"Բարձրացրեք մատը՝ փոքրացնելու համար։"</li></ul>\n\n"Ստեղնաշարի կամ նավիգացիայի գոտու միջոցով հնարավոր չէ մեծացնել:"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Էջ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"«Հատուկ գործառույթներ» կոճակի դյուրանցում"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ոչ մի ժամանակացույց}=1{Սահմանված է 1 ժամանակացույց}one{Սահմանված է # ժամանակացույց}other{Սահմանված է # ժամանակացույց}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Չանհանգստացնել"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Կարևոր ռեժիմներ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Ավելացնել ռեժիմ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ծանուցում ստանալ միայն կարևոր մարդկանցից և հավելվածներից"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Ընտրել ակտիվացման տեսակը"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ժամ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Օրինակ՝ «9:30 – 17:00»"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Օրացույց"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Օրինակ՝ «Անձնական օրացույց»"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Ստեղծեք ռեժիմ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Հատուկ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ընդհատումների սահմանափակում"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Միացրեք «Չանհանգստացնել» ռեժիմը"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Զարթուցիչներն ու մեդիայի ձայները"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Ժամանակացույցներ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Ժամանակացույցների ջնջում"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Ջնջել"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Վերանվանել"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Ջնջել"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Ջնջե՞լ «<xliff:g id="MODE">%1$s</xliff:g>» ռեժիմը"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Փոփոխել"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Ժամանակացույցներ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ժամանակացույց"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Ավելացնել օրացույց"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Օգտագործել իմ օրացույցը"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Ժամանակացույց"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Սահմանեք ժամանակացույց"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Ժամանակացույց"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ժ <xliff:g id="MINUTES">%2$d</xliff:g> ր"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ավտոմատ միացնել"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ժամանակացույց"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Հեռախոսի ձայնի անջատում որոշակի ժամերի"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"«Չանհանգստացնել» ռեժիմի կանոնների սահմանում"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Թույլատրել ձայնային ազդանշանները"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Արգելափակել տեսողական ծանուցումները"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Թույլատրել տեսողական ազդանշանները"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Ծանուցումներ, որոնք միևնույն է կստանաք"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Կենտրոնացում"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Լրացուցիչ գործողություններ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Անջատված է}=1{Անջատված է / 1 ռեժիմ կարող է ավտոմատ միանալ}one{Անջատված է / # ռեժիմ կարող է ավտոմատ միանալ}other{Անջատված է / # ռեժիմ կարող է ավտոմատ միանալ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ցուցադրման կարգավորումներ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Ցուցադրման տարբերակներ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Մոխրագույնի երանգներ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"միացնել մուգ թեման"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Օպերացիոն համակարգն ու հավելվածները դարձրեք բաց տեքստով՝ մուգ ֆոնի վրա։ Դա կարող է աչքերին ավելի հաճելի լինել և նշանակալի կերպով տնտեսել մարտկոցի լիցքը որոշ սարքերում"</string>
<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}}one{{effect_1}, {effect_2} ու ևս #-ը}other{{effect_1}, {effect_2} ու ևս #-ը}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Զտել ընդհատումները"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ընդհատումները չեն զտվում"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"բացել ծանուցումը"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Թույլատրել ծանուցումների հետաձգումը"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ծանուցման կետիկ հավելվածի պատկերակի վրա"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Ծանուցումների փաթեթներ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Ամպիկներ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Ամպիկներ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Ցույց տալ այս զրույցն ամպիկներում"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Այս հավելվածում ընդլայնված կարգավորումները չեն աջակցվում"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Լրացուցիչ կարգավորումներ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Լրացուցիչ կարգավորումները հասանելի են հավելվածում"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Ծանուցումների ձայնի նվազեցում"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Կիրառել աշխատանքային պրոֆիլների համար"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Կիրառել աշխատանքային պրոֆիլի հավելվածների նկատմամբ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Կատեգորիաներ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Այլ"</string>
<string name="no_channels" msgid="4716199078612071915">"Այս հավելվածը ծանուցումներ չի փակցրել"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Ցույց տալ չկիրառվող կատեգորիաները"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Հավելվածի լրացուցիչ կարգավորումները"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Ցույց տալ չկիրառվող կատեգորիաները"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Թաքցնել չկիրառվող կատեգորիաները"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Հավելվածներ, որոնք կարող են ընդհատել"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Ընտրված հավելվածները"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ոչ մեկը"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Բոլորը"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Թույլատրել հավելվածներին փոխել «Չանհանգստացնել» ռեժիմի կարգավորումները"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Հավելվածներ, որոնք կարող են ընդհատել"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Ընտրեք այլ հավելվածներ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ոչինչ չի կարող ընդհատել"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ոչ ոք չի կարող ընդհատել"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Որոշ մարդիկ"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Բոլոր մարդիկ"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Կրկնվող զանգեր"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Թույլատրել կրկնվող զանգեր"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մեկ ժամով մինչև {time}}one{Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը # ժամով մինչև {time}}other{Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը # ժամով մինչև {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Խմբագրման ռեժիմ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Ավելացնել ռեժիմ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Հատուկ ռեժիմ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Ռեժիմի անվանումը"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Նախազգուշացում"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Փակել"</string>
<string name="device_feedback" msgid="5351614458411688608">"Կարծիք հայտնել սարքի մասին"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Աշխատասեղանի ռեժիմի հարկադրված միացում"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Աշխատասեղանի փորձնական ռեժիմի հարկադրված միացում լրացուցիչ էկրանների վրա"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Միացնել կամայական ձևի պատուհանները"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Միացնել կամայական ձևի պատուհանների աջակցումը։"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Միացնել կամայական ձևի պատուհանները երկրորդ էկրանին"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Միացնել կամայական ձևի պատուհանները միայն լրացուցիչ էկրանին։"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Միացնել չփոփոխվող մասշտաբը բազմապատուհան ռեժիմում"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Թույլ է տալիս հավելվածները բացել չփոփոխվող մասշտաբով բազմապատուհան ռեժիմում"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Չեղարկել մուգ ռեժիմի պարտադիր միացումը"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Նախքան մշակողի 16 ԿԲ ընտրանքն օգտագործելը սարքի տվյալների բաժինն անհրաժեշտ է փոխարկել ext4 ֆայլային համակարգի։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ 16 ԿԲ ընտրանքի ակտիվացման համար կարող է պահանջվել ևս մեկ վերագործարկում։ Երբ անցնեք այս ռեժիմին, մեկ վերագործարկմամբ կկարողանաք անցում կատարել 4 ԿԲ և 16 ԿԲ ռեժիմների միջև։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Սարքն արտադրական ռեժիմին վերադարձնելու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք օպերացիոն համակարգի բեռնիչը, որը վերականգնում է սարքի գործարանային կարգավորումները։ Android-ը հաջողությամբ գործարկելուց հետո Մշակողի ընտրանքներում անջատեք OEM-ի ապակողպումը։ Հաստատումից հետո սարքի տվյալները կսրբվեն, և ֆայլային համակարգը կփոխարինվի ext4-ով։ Դրանից հետո նորից վերադարձեք՝ 16 ԿԲ-ը կրկին միացնելու համար։"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Ջնջել բոլոր տվյալները"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Չհաջողվեց վերաֆորմատավորել սարքը ext4 ֆայլային համակարգի և սրբել տվյալների բաժինը։"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 ԿԲ ռեժիմի համար պահանջվում է ապակողպել օպերացիոն համակարգի բեռնիչը"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Պահանջվում է բեռնիչով ապակողպում"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Նախքան մշակողի 16 ԿԲ ընտրանքն օգտագործելը հարկավոր է ապակողպել օպերացիոն համակարգի բեռնիչը։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Երբ 16 ԿԲ ռեժիմն ակտիվացվի, օգտատիրոջ բոլոր տվյալները և կարգավորումները կսրբվեն։ Հենց որ օպերացիոն համակարգի բեռնիչն ապակողպվի, 16 ԿԲ ընտրանքի ակտիվացման համար կպահանջվի երկու վերագործարկում։ Երբ անցնեք այս ռեժիմին, մեկ վերագործարկմամբ կկարողանաք անցում կատարել 4 ԿԲ և 16 ԿԲ ռեժիմների միջև։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Սարքը արտադրական ռեժիմին վերադարձնելու համար անհրաժեշտ է նորից անցնել 4 ԿԲ ռեժիմին և կողպել OEM-ը / օպերացիոն համակարգի բեռնիչը, որը վերականգնում է սարքի գործարանային կարգավորումները։ Ապակողպեք օպերացիոն համակարգի բեռնիչը և նորից փորձեք։ Թե ինչպես կարող եք դա անել, կարդացեք այստեղ՝ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Էջաչափից անկախ 4 ԿԲ ռեժիմի օգտագործում"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Դուք էջաչափից անկախ 4 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Հպեք՝ ավելին իմանալու համար։"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Դուք էջաչափից անկախ ռեժիմի 4 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Սարքի գործարանային կարգավորումները նորից կվերականգնվեն, և այն կանցնի արտադրական կարգավորումների ռեժիմ։ Android-ը հաջողությամբ գործարկելուց հետո Մշակողի ընտրանքներում անջատեք OEM-ի ապակողպումը։ Եթե սարքն անկայուն է աշխատում, կամ չհաջողվի այն գործարկել Android-ով, թարմացրեք սարքը՝ օգտագործելով գործարանային պատկերներ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> էջից կամ անցեք <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> և ընտրեք «Սրբել սարքը», «Կողպել օպերացիոն համակարգի բեռնիչը» և «Ստիպողաբար թարմացնել բոլոր բաժինները»։"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Էջաչափից անկախ 16 ԿԲ ռեժիմի օգտագործում"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Դուք էջաչափից անկախ 16 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Հպեք՝ ավելին իմանալու համար։"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Դուք էջաչափից անկախ ռեժիմի 16 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Սարքի գործարանային կարգավորումները նորից կվերականգնվեն, և այն կանցնի արտադրական կարգավորումների ռեժիմ։ Android-ը հաջողությամբ գործարկելուց հետո Մշակողի ընտրանքներում անջատեք OEM-ի ապակողպումը։ Եթե սարքն անկայուն է աշխատում, կամ չհաջողվի այն գործարկել Android-ով, թարմացրեք սարքը՝ օգտագործելով գործարանային պատկերներ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> էջից կամ անցեք <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> և ընտրեք «Սրբել սարքը», «Կողպել օպերացիոն համակարգի բեռնիչը» և «Ստիպողաբար թարմացնել բոլոր բաժինները»։"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Դուք էջի չափսից չկախված ռեժիմի 16 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Հպեք՝ ավելին իմանալու համար։"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Դուք էջի չափսից չկախված ռեժիմի 16 ԿԲ ռեժիմում եք։ Ծրագրի ամբողջականությունը հնարավոր չէ երաշխավորել այս ռեժիմում, և ցանկացած տվյալ, որը պահվում է հեռախոսում, քանի դեռ բեռնիչը ապակողպված է, կարող է վտանգված լինել։ Որոշ գործառույթներ կանջատվեն այս ռեժիմներում, ուստի հնարավոր է՝ ոչ բոլոր հավելվածներն աշխատեն։ Արտադրական ռեժիմին վերադառնալու համար պետք է նորից անցնեք 4 ԿԲ ռեժիմին և կողպեք սարքի օպերացիոն համակարգի բեռնիչը։ Սարքի գործարանային կարգավորումները նորից կվերականգնվեն, և այն կանցնի արտադրական կարգավորումների ռեժիմ։ Android-ը հաջողությամբ գործարկելուց հետո Մշակողի ընտրանքներում անջատեք OEM-ի ապակողպումը։ Եթե սարքն անկայուն է աշխատում, կամ չհաջողվի այն գործարկել Android-ով, թարմացրեք սարքը՝ օգտագործելով գործարանային պատկերներ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> էջից կամ անցեք <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> և ընտրեք «Սրբել սարքը», «Կողպել օպերացիոն համակարգի բեռնիչը» և «Ստիպողաբար թարմացնել բոլոր բաժինները»։"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Էջաչափից անկախ 16 ԿԲ ռեժիմ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Կարդալ ավելին"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Վրիպակների մասին հաշվետվությունների մշակիչ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Օգտագործել հավելվածների ամրացումը"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Օգտագործել մշակողի ընտրանքները"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Օգտագործել տպման ծառայությունը"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Թույլատրել մեկից ավելի օգտատերեր"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Թույլատրել օգտատերերի փոխումը"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"թույլ տալ, մի քանի, օգտատեր, թույլատրել, շատ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"մի քանի, օգտատերեր, պրոֆիլներ, մարդիկ, հաշիվներ, փոխել հաշիվը, շատ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Օգտագործել անլար վրիպազերծումը"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Ընտրեք, թե ինչ եք ուզում տեսնել ձեր սարքի էկրանին, երբ ձեր պլանշետը դոկ-կայանում է։ Ձեր սարքը կարող է ավելի շատ էներգիա ծախսել, երբ էկրանապահ է օգտագործվում։"</string>
<string name="customize_button_title" msgid="1110284655990203359">"Հարմարեցնել"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Անհատականացնել «<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>» էկրանապահը"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Կամայական ձևի պատուհանների ստեղծման աջակցումը միացնելու համար պահանջվում է վերաբեռնում։"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Լրացուցիչ էկրաններին համակարգչի ռեժիմը հարկադրաբար միացնելու համար պահանջվում է վերաբեռնում։"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Կամայական ձևի պատուհանների ստեղծման հնացած գործառույթի աջակցումը միացնելու համար պահանջվում է վերաբեռնում։"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Կամայական ձևի պատուհանների ստեղծման աջակցումը փոփոխելու համար պահանջվում է վերաբեռնում։"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Լրացուցիչ էկրաններին կամայական ձևի պատուհանները հարկադրաբար միացնելու համար պահանջվում է վերաբեռնում։"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Վերաբեռնել հիմա"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Վերաբեռնել ավելի ուշ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Տարածական հնչողություն"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Միացված է"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Անջատված է"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Միացված է"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Աուդիո %1$d%% ձախ, %2$d%% աջ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Աուդիո %1$d%% աջ, %2$d%% ձախ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Ձեր սարքի անունը տեսանելի է ձեր տեղադրած հավելվածներին։ Այն կարող են տեսնել օգտատերերը, երբ միանում եք Bluetooth սարքերի, Wi-Fi ցանցի, կամ կարգավորում եք Wi-Fi թեժ կետ։"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Քերականական սեռ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Ընտրեք քերականական սեռը"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Որոնեք կարգավորումներում"</string>
</resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index e878f49..c5d73ab 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Waktu Tidur"</item>
+ <item msgid="4152450357280759894">"Mengemudi"</item>
+ <item msgid="7096549258219399423">"Imersif"</item>
+ <item msgid="2760716776980432977">"Dikelola"</item>
+ <item msgid="601734478369121764">"Bintang"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Waktu"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Bunga"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0dda465..acde000 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Putuskan sambungan perangkat?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sambungkan perangkat baru"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktifkan otomatis besok"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Setelan alat bantu dengar"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Pintasan, kompatibilitas alat bantu dengar (HAC)"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Tidak ada preset yang diprogram oleh ahli audiologi Anda"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Tidak dapat memperbarui preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Output audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Tentang output audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Nonaktif"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aktif / # aplikasi memiliki akses ke lokasi}other{Aktif / # aplikasi memiliki akses ke lokasi}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Memuat…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikasi dengan izin Perangkat di sekitar dapat menentukan posisi relatif perangkat terhubung."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikasi dengan izin perangkat di sekitar dapat menentukan posisi relatif perangkat terhubung."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Akses lokasi dinonaktifkan untuk aplikasi dan layanan. Lokasi perangkat Anda tetap dapat dikirimkan ke petugas tanggap darurat saat Anda menelepon atau mengirim SMS ke nomor darurat."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Pelajari lebih lanjut Setelan lokasi"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Untuk mengubahnya, buka Setelan ChromeOS > Privasi dan keamanan > Kontrol privasi > Akses lokasi"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Wajah dan <xliff:g id="WATCH">%s</xliff:g> ditambahkan"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Wajah, sidik jari, dan <xliff:g id="WATCH">%s</xliff:g> ditambahkan"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Wajah, sidik jari, dan <xliff:g id="WATCH">%s</xliff:g> ditambahkan"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Hal ini diperlukan karena Pemeriksaan Identitas diaktifkan"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Buka Kunci Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Smartwatch ditambahkan"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Menyiapkan smartwatch"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Pelajari lebih lanjut Buka dengan Smartwatch"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Tambahkan smartwatch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Hapus smartwatch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Buka dengan Sidik Jari & Wajah"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Buka dengan Wajah & Sidik Jari"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Buka dengan Wajah & Sidik Jari untuk profil kerja"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Penyiapan diperlukan"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Wajah dan sidik jari ditambahkan"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instal aplikasi"</b>\n"Instal aplikasi yang ingin Anda jadikan pribadi di ruang Anda"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Perlu diingat"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikasi berhenti saat Anda mengunci ruang"</b>\n"Saat Anda mengunci ruang, aplikasi di ruang Anda akan dihentikan dan Anda tidak akan menerima notifikasi dari aplikasi tersebut"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Ruang privasi tidak cocok untuk aplikasi yang perlu berjalan di latar belakang atau mengirim notifikasi penting, seperti aplikasi medis. Hal ini dikarenakan notifikasi dan aktivitas latar belakang dihentikan saat ruang Anda dikunci.\n\nAplikasi di ruang privasi Anda tidak akan muncul di pengelola izin, dasbor privasi, dan setelan lainnya saat ruang privasi Anda dikunci.\n\nRuang privasi Anda tidak dapat dipindahkan ke perangkat baru. Anda harus menyiapkan ruang privasi baru jika ingin menggunakannya di perangkat lain.\n\nSiapa pun yang menghubungkan perangkat Anda ke komputer atau menginstal aplikasi berbahaya ke perangkat Anda mungkin dapat mengakses ruang privasi Anda."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Ruang privasi tidak cocok untuk aplikasi yang perlu berjalan di latar belakang atau mengirim notifikasi penting, seperti aplikasi medis. Hal ini dikarenakan notifikasi dan aktivitas latar belakang dihentikan saat ruang Anda dikunci.\n\nAplikasi di ruang privasi Anda tidak akan muncul di pengelola izin, dasbor privasi, dan setelan lainnya saat ruang privasi dikunci.\n\nRuang privasi Anda tidak dapat dipulihkan ke perangkat baru. Anda harus menyiapkan ruang lain jika ingin menggunakannya di perangkat lain.\n\nSiapa pun yang menghubungkan perangkat Anda ke komputer atau menginstal aplikasi berbahaya ke perangkat Anda mungkin dapat mengakses ruang privasi Anda."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Pelajari lebih lanjut ruang privasi"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Proses ini perlu waktu beberapa saat"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Menyiapkan ruang privasi…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Mulai Ulang Perangkat?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Pencatatan log NFC detail dimaksudkan hanya untuk tujuan pengembangan. Data NFC tambahan disertakan dalam laporan bug, yang mungkin berisi informasi pribadi. Mulai ulang perangkat untuk mengubah setelan ini."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Mulai ulang"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"pencerminan, layar eksternal, layar terhubung, layar usb, resolusi, rotasi"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotasi"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standar"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Kecerahan layar akan disesuaikan otomatis dengan lingkungan dan aktivitas Anda. Anda dapat memindahkan penggeser secara manual untuk membantu kecerahan adaptif belajar dari preferensi Anda."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"White balance layar"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Gunakan keyboard virtual"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Biarkan di layar meski keyboard fisik aktif"</string>
<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="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="sticky_keys" msgid="7317317044898161747">"Tombol lekat"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Tekan satu tombol pada satu waktu untuk mengaktifkan pintasan, bukan menekan 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="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 & fitur profil kerja"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Ubah gaya isian pointer ke warna kuning"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Ubah gaya isian pointer ke warna merah muda"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Ubah gaya isian pointer ke warna biru"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Gaya goresan kursor"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Putih"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Hitam"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Tidak ada"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Dipilih pengguna: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Ucapan"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kecepatan kursor"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Skala kursor"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Turunkan skala kursor"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Tingkatkan skala kursor"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Pengendali Game"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Mengalihkan getaran"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Kirim getaran ke pengontrol game saat terhubung"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Tetap lanjutkan"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Batal"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setelan pembesaran"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Penggeseran satu jari"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Gerakkan pembesar dengan 1 jari"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Tarik 1 jari untuk berpindah pada layar"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Pindahkan area pembesaran dengan menarik satu jari."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Pindahkan area pembesaran dengan menarik dua jari."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Tidak tersedia ketika hanya memperbesar sebagian layar"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ketuk tombol untuk zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Perbesar layar dengan cepat untuk membuat konten terlihat lebih besar"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Untuk memperbesar:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulai pembesaran<br/> {1,number,integer}. Ketuk layar<br/> {2,number,integer}. Tarik dengan 2 jari untuk berpindah pada layar<br/> {3,number,integer}. Cubit dengan 2 jari untuk menyesuaikan zoom<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> <b>Untuk memperbesar sementara:</b><br/> {0,number,integer}. Pastikan jenis pembesaran disetel ke layar penuh<br/> {1,number,integer}. Gunakan pintasan untuk memulai pembesaran<br/> {2,number,integer}. Sentuh lama di mana pun pada layar<br/> {3,number,integer}. Tarik dengan jari untuk berpindah pada layar<br/> {4,number,integer}. Angkat jari untuk menghentikan pembesaran"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Untuk memperbesar:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulai pembesaran<br/> {1,number,integer}. Ketuk layar<br/> {2,number,integer}. Tarik 2 jari untuk berpindah pada layar<br/> {3,number,integer}. Cubit dengan 2 jari untuk menyesuaikan zoom<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> Anda juga dapat memperbesar sementara dan lainnya."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Untuk memperbesar:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulai pembesaran<br/> {1,number,integer}. Ketuk layar<br/> {2,number,integer}. Tarik 1 atau 2 jari untuk berpindah pada layar<br/> {3,number,integer}. Cubit dengan 2 jari untuk menyesuaikan zoom<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> Anda juga dapat memperbesar sementara dan lainnya."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Jika pembesaran diaktifkan, Anda dapat memperbesar tampilan layar.\n\n"<b>"Untuk memperbesar tampilan"</b>", mulai pembesaran, lalu ketuk di bagian mana saja pada layar.\n"<ul><li>"Tarik dengan 2 jari atau lebih untuk melakukan scroll"</li>\n<li>"Cubit dengan 2 jari atau lebih untuk menyesuaikan pembesaran"</li></ul>\n\n<b>"Untuk memperbesar tampilan sementara"</b>", mulai pembesaran, lalu sentuh lama di bagian mana saja pada layar.\n"<ul><li>"• Tarik untuk menggeser layar"</li>\n<li>"• Angkat jari untuk memperkecil tampilan"</li></ul>\n\n"Anda tidak dapat memperbesar keyboard atau menu navigasi."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Halaman <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> dari <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Pintasan tombol aksesibilitas"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tidak ada}=1{1 jadwal disetel}other{# jadwal disetel}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Mode Prioritas"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Tambahkan mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Hanya dapatkan notifikasi dari aplikasi dan orang yang penting"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Pilih jenis aktivasi"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Waktu"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Misalnya, \"09:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Misalnya, \"Kalender pribadi\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Buat mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Kustom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Batasi gangguan"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktifkan mode Jangan Ganggu"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarm dan media boleh menginterupsi"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Jadwal"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Hapus jadwal"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Hapus"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Ganti nama"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Hapus"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Hapus mode \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Jadwal"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Jadwal"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Tambahkan kalender"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Gunakan kalender Anda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Jadwal"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Setel jadwal"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Jadwal"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> jam, <xliff:g id="MINUTES">%2$d</xliff:g> mnt"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Aktifkan secara otomatis"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Jadwal"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Nonaktifkan notifikasi ponsel pada waktu tertentu"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Setel aturan Jangan Ganggu"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Izinkan gangguan yang mengeluarkan suara"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokir gangguan visual"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Izinkan sinyal visual"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifikasi yang dapat menjangkau Anda"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Tetap fokus"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Tindakan tambahan"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Nonaktif}=1{Nonaktif/1 mode dapat aktif otomatis}other{Nonaktif/ # mode dapat aktif otomatis}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Setelan layar"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opsi tampilan"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Hitam putih"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"aktifkan tema gelap"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Gunakan pilihan teks terang dengan latar belakang gelap di OS dan aplikasi, yang mungkin akan lebih nyaman di mata dan menghemat baterai secara signifikan di beberapa perangkat"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Tidak ada perubahan tampilan}=1{{effect_1}}=2{{effect_1} dan {effect_2}}=3{{effect_1}, {effect_2}, dan {effect_3}}other{{effect_1}, {effect_2}, dan # lainnya}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filter gangguan"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Tidak ada gangguan yang difilter"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opsi tampilan untuk notifikasi yang difilter"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Saat mode Jangan Ganggu diaktifkan"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Tidak ada suara dari notifikasi"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"membuka notifikasi"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Izinkan penundaan notifikasi"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Titik notifikasi di ikon aplikasi"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paket notifikasi"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Balon"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Balon"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Tampilkan percakapan ini dalam balon"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Aplikasi ini tidak mendukung setelan yang ditingkatkan"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Setelan lainnya"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Setelan lainnya tersedia di dalam aplikasi ini"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Periode tunggu notifikasi"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategori"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Lainnya"</string>
<string name="no_channels" msgid="4716199078612071915">"Aplikasi ini belum memposting notifikasi"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Tampilkan kategori yang tidak digunakan"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Setelan tambahan di aplikasi"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Tampilkan kategori yang tidak digunakan"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Sembunyikan kategori yang tidak digunakan"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikasi yang dapat mengganggu"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplikasi terpilih"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Tidak ada"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Semua"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Tidak ada aplikasi yang dapat mengganggu}=1{{app_1} dapat mengganggu}=2{{app_1} dan {app_2} dapat mengganggu}=3{{app_1}, {app_2}, dan {app_3} dapat mengganggu}other{{app_1}, {app_2}, dan # lainnya dapat mengganggu}}"</string>
+ <string name="zen_mode_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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Izinkan aplikasi mengganti"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Aplikasi yang boleh menginterupsi"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Pilih aplikasi lain"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tidak ada yang boleh menginterupsi"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Tidak ada orang yang boleh menginterupsi"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Sebagian orang boleh menginterupsi"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang boleh menginterupsi"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Penelepon berulang"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Izinkan penelepon berulang"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ubah ke mode hanya alarm selama satu jam hingga {time}}other{Ubah ke mode hanya alarm selama # jam hingga {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ubah ke mode hanya alarm hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Ubah ke mode selalu ganggu"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edit mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Tambahkan 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="warning_button_text" msgid="1274234338874005639">"Peringatan"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Tutup"</string>
<string name="device_feedback" msgid="5351614458411688608">"Kirim masukan tentang perangkat ini"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Casing"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterai"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel Setelan"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Paksa mode desktop"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Paksa mode desktop eksperimental di layar sekunder"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktifkan jendela freeform"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktifkan dukungan untuk jendela freeform."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktifkan windowing freeform di layar sekunder"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktifkan jendela freeform hanya di layar sekunder."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktifkan ukuran tidak dapat diubah di multi-jendela"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Izinkan aplikasi yang ukurannya tidak dapat diubah di multi-jendela"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Aktifkan Gelap Otomatis"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Partisi data perangkat ini perlu dikonversi ke ext4 sebelum menggunakan opsi developer 16KB. Integritas software tidak dapat dijamin dalam mode ini, dan data apa pun yang disimpan di ponsel saat bootloader dibuka kuncinya dapat berpotensi terkena bahaya. Mengaktifkan opsi 16KB akan memerlukan mulai ulang sekali lagi setelah ini. Setelah Anda berada dalam mode ini, Anda dapat beralih antara mode 4KB dan 16KB dengan sekali mulai ulang. Beberapa fitur akan dinonaktifkan dalam mode ini, sehingga beberapa aplikasi mungkin tidak berfungsi. Untuk mengembalikan perangkat ke mode produksi, Anda perlu beralih kembali ke mode 4KB dan mengunci bootloader, yang akan mereset perangkat ke setelan pabrik. Setelah perangkat berhasil melakukan booting ke Android, nonaktifkan pembukaan kunci OEM di Opsi developer. Perangkat akan dihapus total dan sistem file akan diubah menjadi ext4 setelah konfirmasi. Setelah selesai, kembali untuk mengaktifkan 16KB lagi."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Hapus semua data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Gagal memformat ulang dan menghapus total partisi data ke ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Buka Kunci Bootloader Diperlukan untuk menggunakan Mode 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Buka Kunci Bootloader Diperlukan"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Perangkat ini harus membuka kunci bootloader sebelum menggunakan opsi developer 16KB. Integritas software tidak dapat dijamin dalam mode ini, dan data apa pun yang disimpan di ponsel saat bootloader dibuka kuncinya dapat berpotensi terkena bahaya. Semua data dan setelan pengguna akan dihapus total saat mengaktifkan mode 16KB. Setelah bootloader dibuka kuncinya, mengaktifkan opsi 16KB akan memerlukan dua kali mulai ulang. Setelah Anda berada dalam mode ini, Anda dapat beralih antara mode 4KB dan 16KB dengan sekali mulai ulang. Beberapa fitur akan dinonaktifkan dalam mode ini, sehingga beberapa aplikasi mungkin tidak berfungsi. Untuk mengembalikan perangkat ke mode produksi, Anda perlu beralih kembali ke mode 4KB dan mengunci bootloader/OEM perangkat (yang akan mereset perangkat setelan pabrik). Buka kunci bootloader dan coba lagi. Anda dapat melihat petunjuk cara melakukannya di <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Menggunakan mode agnostik halaman 4KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Anda berada dalam mode 4KB dari mode agnostik 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 mengunci bootloader perangkat. Ketuk untuk membaca selengkapnya."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Anda berada dalam mode 4KB dari mode agnostik 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> atau gunakan <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dan pilih \'Hapus Total Perangkat\', \'Kunci Bootloader\', dan \'Paksa Flash semua partisi\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Menggunakan mode agnostik halaman 16KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Anda berada dalam mode 16KB dari mode agnostik 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 4K dan kemudian mengunci bootloader perangkat. Ketuk untuk membaca selengkapnya."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Anda berada dalam mode 16KB dari mode agnostik 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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> atau gunakan <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dan pilih \'Hapus Total Perangkat\', \'Kunci Bootloader\', dan \'Paksa Flash semua partisi\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Ketuk untuk membaca selengkapnya."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> atau gunakan <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Pengendali laporan bug"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Gunakan penyematan aplikasi"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Gunakan opsi developer"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Gunakan layanan cetak"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Izinkan multi-pengguna"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Izinkan peralihan pengguna"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"izinkan, beberapa, pengguna, izin, banyak"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"beberapa, pengguna, profil, orang, akun, tombol akses, banyak"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Gunakan proses debug nirkabel"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Pilih screensaver yang akan ditampilkan di layar saat tablet dipasang ke dok. Perangkat Anda mungkin menggunakan lebih banyak daya saat screensaver digunakan."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Sesuaikan"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Sesuaikan <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Perlu memulai ulang untuk mengaktifkan dukungan bentuk bebas."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Perlu memulai ulang untuk memaksa mode desktop di layar sekunder."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Perlu memulai ulang untuk mengaktifkan dukungan windowing freeform versi lama."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Perlu memulai ulang untuk mengubah dukungan windowing freeform."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Perlu memulai ulang untuk memaksa windowing freeform di layar sekunder."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Mulai ulang sekarang"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Mulai ulang nanti"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio Spasial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aktif"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Nonaktif"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aktif"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% kiri, %2$d%% kanan"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% kanan, %2$d%% kiri"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Nama perangkat Anda dapat dilihat oleh aplikasi yang diinstal dan mungkin juga oleh orang lain saat Anda terhubung ke perangkat Bluetooth atau jaringan Wi-Fi, atau saat menyiapkan hotspot Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gender gramatikal"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Pilih Gender gramatikal"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Telusuri Setelan"</string>
</resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index f13f517..c791ae1 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Svefntími"</item>
+ <item msgid="4152450357280759894">"Akstur"</item>
+ <item msgid="7096549258219399423">"Umlykjandi"</item>
+ <item msgid="2760716776980432977">"Í umsjón"</item>
+ <item msgid="601734478369121764">"Stjarna"</item>
+ <item msgid="6243809315432780521">"Dagatal"</item>
+ <item msgid="4913577903148415331">"Tími"</item>
+ <item msgid="3653377604690057780">"Leikhús"</item>
+ <item msgid="3843711267408385410">"Blóm"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 55bbc5c..e2ac92e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Aftengja tæki?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Para nýtt tæki"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Kveikja sjálfkrafa á morgun"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Stillingar heyrnartækis"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Flýtileið, samhæfi við heyrnartæki"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Forstilling"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Heyrnarsérfræðingurinn þinn hefur ekki valið neinar forstillingar"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Tókst ekki að uppfæra forstillingu"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Hljóðúttak"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Um hljóðúttak"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Slökkt"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Kveikt / # forrit hefur aðgang að staðsetningu}one{Kveikt / # forrit hefur aðgang að staðsetningu}other{Kveikt / # forrit hafa aðgang að staðsetningu}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Hleður…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Forrit með heimildir nálægra tækja geta ákvarðað afstæða staðsetningu tengdra tækja."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Forrit með heimildir nálægra tækja geta ákvarðað hlutfallslega stöðu tengdra tækja."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Slökkt er á aðgangi að staðsetningu fyrir forrit og þjónustur. Staðsetning tækisins kann samt að verða send til viðbragðsaðila þegar þú hringir eða sendir skilaboð í neyðarnúmer."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Nánar um staðsetningarstillingar"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Til að skipta skaltu opna „Stillingar ChromeOS > Persónuvernd og öryggi > Persónuverndarstillingar > Aðgangur að staðsetningu“"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Andliti og <xliff:g id="WATCH">%s</xliff:g> bætt við"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Andliti, fingrafari og <xliff:g id="WATCH">%s</xliff:g> bætt við"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Andliti, fingraförum og <xliff:g id="WATCH">%s</xliff:g> bætt við"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Þetta er nauðsynlegt þar sem kveikt er á auðkennisathugun"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Taka úr lás með Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Úri bætt við"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Setja upp úr"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Nánar um opnun með úri"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Bæta við úri"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Fjarlægja úr"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingrafar og andlitskenni"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Andlits- og fingrafarskenni"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Andlits- og fingrafarskenni fyrir vinnu"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Þörf er á uppsetningu"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Andliti og fingraförum bætt við"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Settu upp forrit"</b>\n"Settu upp forrit sem þú vilt halda leyndum í rýminu þínu"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Hafðu í huga"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Forrit stöðvast þegar þú læsir rýminu þínu"</b>\n"Þegar þú læsir rýminu þínu eru forrit í því rými stöðvuð og þú færð ekki tilkynningar frá þeim"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Leynirými henta ekki fyrir forrit sem þurfa að keyra í bakgrunni eða senda mikilvægar tilkynningar, s.s. forrit sem notuð eru í læknisfræðilegum tilgangi. Það er vegna þess að tilkynningar og bakgrunnsvirkni stöðvast þegar rýmið er læst.\n\nForrit í leynirýminu þínu birtast ekki í leyfisstjóra, á persónuverndarstjórnborði og í öðrum stillingum þegar leynirýmið er læst.\n\nEkki er hægt að flytja leynirými yfir í nýtt tæki. Þú þarft að setja upp nýtt leynirými ef þú vilt nota það í öðru tæki.\n\nHver sem tengir tækið þitt við tölvu eða setur upp skaðleg forrit í tækinu gæti fengið aðgang að leynirýminu."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Leynirými henta ekki fyrir forrit sem þurfa að keyra í bakgrunni eða senda mikilvægar tilkynningar, s.s. forrit sem notuð eru í læknisfræðilegum tilgangi. Það er vegna þess að tilkynningar og bakgrunnsvirkni stöðvast þegar rýmið er læst.\n\nForrit í leynirýminu þínu birtast ekki í leyfisstjóra, á persónuverndarstjórnborði og í öðrum stillingum þegar leynirýmið er læst.\n\nEkki er hægt að endurheimta leynirými í nýju tæki. Þú þarft að setja upp annað rými ef þú vilt nota það í öðru tæki.\n\nHver sem tengir tækið þitt við tölvu eða setur upp skaðleg forrit í tækinu gæti fengið aðgang að leynirýminu."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Nánar um leynirými"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Þetta tekur stutta stund"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Setur upp leynirými…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Endurræsa tæki?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Ítarleg NFC-skráning er aðeins ætluð í þróunartilgangi. Viðbótargögn um NFC fylgja villutilkynningum sem kunna að innihalda lokaðar upplýsingar. Endurræstu tækið til að breyta þessari stillingu."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Endurræsa"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"spegla, ytri skjár, tengdur skjár, USB-skjár, upplausn, snúningur"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Snúningur"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Staðlað"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Nota skjályklaborð"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Haltu því á skjánum meðan vélbúnaðarlyklaborðið er virkt"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Breyta stíl bendilfyllingar í gulan"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Breyta stíl bendilfyllingar í bleikan"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Breyta stíl bendilfyllingar í bláan"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Strokustíll bendils"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Hvítur"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Svartur"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ekkert"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Valið af notanda: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Tal"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Hraði bendils"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Stærð bendils"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Minnka bendil"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Stækka bendil"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Leikjafjarstýring"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Endurbeina titringi"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Senda titring í leikjafjarstýringu þegar hún er tengd"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Halda samt áfram"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Hætta við"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Stillingar stækkunar"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Hliðrun með einum fingri"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Færðu stækkunarglerið með 1 fingri"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Dragðu með 1 fingri til að fara um skjáinn"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Færðu stækkaða svæðið með því að draga einn fingur."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Færðu stækkaða svæðið með því að draga tvo fingur."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ótiltækt þegar aðeins hluti skjásins er stækkaður"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ýttu á hnapp til að stækka"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Auktu aðdráttinn á skjánum til að stækka efnið"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Gerðu eftirfarandi til að auka aðdrátt:</b><br/> {0,number,integer}. Notaðu flýtileið til að hefja stækkun<br/> {1,number,integer}. Ýttu á skjáinn<br/> {2,number,integer}. Dragðu 2 fingur til að ferðast um skjáinn<br/> {3,number,integer}. Færðu tvo fingur saman til að stilla aðdráttinn<br/> {4,number,integer}. Notaðu flýtileið til að hætta stækkun<br/><br/> <b>Til að auka aðdrátt tímabundið:</b><br/> {0,number,integer}. Gakktu úr skugga um að stækkunaraðferðin sé stillt til að birtast á öllum skjánum<br/> {1,number,integer}. Notaðu flýtileið til að hefja stækkun<br/> {2,number,integer}. Haltu fingri hvar sem er á skjánum<br/> {3,number,integer}. Dragðu fingurinn til að ferðast um skjáinn<br/> {4,number,integer}. Lyftu fingri til að hætta stækkun"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Gerðu eftirfarandi til að auka aðdrátt:</b><br/> {0,number,integer}. Notaðu flýtileið til að hefja stækkun<br/> {1,number,integer}. Ýttu á skjáinn<br/> {2,number,integer}. Dragðu 2 fingur til að fara um skjáinn<br/> {3,number,integer}. Færðu 2 fingur saman til að stilla aðdráttinn<br/> {4,number,integer}. Notaðu flýtileið til að stöðva stækkun<br/><br/> Þú getur líka aukið aðdrátt tímabundið og fleira."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Gerðu eftirfarandi til að auka aðdrátt:</b><br/> {0,number,integer}. Notaðu flýtileið til að hefja stækkun<br/> {1,number,integer}. Ýttu á skjáinn<br/> {2,number,integer}. Dragðu 1 eða 2 fingur til að fara um skjáinn<br/> {3,number,integer}. Færðu 2 fingur saman til að stilla aðdráttinn<br/> {4,number,integer}. Notaðu flýtileið til að stöðva stækkun<br/><br/> Þú getur líka aukið aðdrátt tímabundið og fleira."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Þegar kveikt er á stækkun geturðu aukið aðdráttinn á skjánum.\n\n"<b>"Til að stækka"</b>" skaltu hefja stækkun og ýta svo hvar sem er á skjáinn.\n"<ul><li>"Dragðu með tveimur eða fleiri fingrum til að fletta"</li>\n<li>"Færðu tvo eða fleiri fingur saman til að stilla aðdrátt"</li></ul>\n\n<b>"Til að stækka tímabundið"</b>" skaltu hefja stækkun og halda síðan fingri hvar sem er á skjánum.\n"<ul><li>"Dragðu til að fara um skjáinn"</li>\n<li>"Lyftu fingrinum til að minnka aðdrátt"</li></ul>\n\n"Þú getur ekki stækkað á lyklaborðinu eða yfirlitsstikunni."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Síða <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> af <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Flýtileið fyrir aðgengishnapp"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Engin}=1{1 áætlun stillt}one{# áætlun stillt}other{# áætlanir stilltar}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ónáðið ekki"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Forgangsstillingar"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Bæta stillingu við"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Fáðu aðeins tilkynningar frá mikilvægum einstaklingum og forritum"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Veldu virkjunartegund"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tími"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"T.d. „9:30 – 17:00“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Dagatal"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"T.d. „Persónulegt dagatal“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Búðu til stillingu"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Sérsniðin"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Takmarka truflanir"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Kveikja á „Ónáðið ekki“"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Vekjarar og hljóð efnis mega trufla"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Tímaáætlanir"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Eyða áætlunum"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Eyða"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Endurnefna"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Eyða"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Eyða stillingunni „<xliff:g id="MODE">%1$s</xliff:g>“?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Breyta"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Áætlanir"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Áætlun"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Bæta við dagatali"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Nota dagatalið þitt"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Áætlun"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Stilla áætlun"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Áætlun"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> klst. og <xliff:g id="MINUTES">%2$d</xliff:g> mín."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Kveikja sjálfkrafa"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Áætlun"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Þagga í símanum á vissum tíma"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Stilla reglur fyrir „Ónáðið ekki“"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Leyfa truflanir sem gefa frá sér hljóð"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Útiloka sjónrænt áreiti"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Leyfa sjónræn merki"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Tilkynningar sem geta náð til þín"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Haltu einbeitingunni"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Fleiri aðgerðir"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Slökkt}=1{Slökkt / Ein stilling getur kveikt sjálfkrafa á sér}one{Slökkt / # stilling getur kveikt sjálfkrafa á sér}other{Slökkt / # stillingar geta kveikt sjálfkrafa á sér}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Skjástillingar"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Birtingarvalkostir"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grátónar"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"kveikja á dökku þema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Stilltu stýrikerfið og forrit á að hafa ljósan texta á dökkum bakgrunni, sem getur verið þægilegra fyrir augun og hefur í för með sér umtalsverðan rafhlöðusparnað í sumum tækjum"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Engar skjábreytingar}=1{{effect_1}}=2{{effect_1} og {effect_2}}=3{{effect_1}, {effect_2} og {effect_3}}one{{effect_1}, {effect_2} og # í viðbót}other{{effect_1}, {effect_2} og # í viðbót}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Sía truflanir"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Engar truflanir eru síaðar"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Skjávalkostir fyrir síaðar tilkynningar"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Þegar kveikt er á „Ónáðið ekki“"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ekkert hljóð frá tilkynningum"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"opna tilkynningu"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Leyfa þöggun tilkynninga"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Tilkynningapunktur á forritstákni"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Tilkynningapakkar"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Blöðrur"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Blöðrur"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Setja þetta samtal í blöðru"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Þetta forrit styður ekki endurbættar stillingar"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Fleiri stillingar"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Fleiri stillingar eru í boði í forritinu"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Fækkun tilkynninga"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Flokkar"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Annað"</string>
<string name="no_channels" msgid="4716199078612071915">"Þetta forrit hefur ekki birt neinar tilkynningar"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Sýna ónotaða flokka"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Fleiri stillingar í forritinu"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Sýna ónotaða flokka"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Fela ónotaða flokka"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Forrit sem mega trufla"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Valin forrit"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Engin"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Öll"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Veldu fleiri forrit"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ekkert má trufla"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Enginn má trufla"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Sumt fólk má trufla"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Allt fólk má trufla"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Hringt endurtekið"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Leyfa endurtekin símtöl"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Skipta yfir í vekjara í aðeins eina klukkustund til kl. {time}}one{Skipta yfir í vekjara í aðeins # klukkustund til kl. {time}}other{Skipta yfir í vekjara í aðeins # klukkustundir til kl. {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Breyta í vekjara eingöngu til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Breyta í truflanir alltaf"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Breyta stillingu"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Bæta stillingu við"</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="warning_button_text" msgid="1274234338874005639">"Viðvörun"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Loka"</string>
<string name="device_feedback" msgid="5351614458411688608">"Senda ábendingar um þetta tæki"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Hulstur"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Rafhlaða"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Stillingasvæði"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Þvinga skjáborðsstillingu"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Þvinga tilraunaskjáborðsstillingu á öðrum skjá"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Virkja glugga á frjálsu sniði"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Virkja stuðning við glugga á frjálsu sniði."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Virkja glugga á frjálsu sniði á aukaskjá"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Virkja glugga á frjálsu sniði eingöngu á aukaskjá."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Kveikja á „Ekki hægt að breyta stærð“ í mörgum gluggum"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Leyfir forritum sem ekki er hægt að breyta stærðinni á að opnast í mörgum gluggum"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Hnekkja dökku"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Þú þarft að breyta gagnaskiptingu tækisins í ext4 áður en þú getur valið 16 kB-forritunarkostinn. 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. Virkjun 16 kB-valkostsins krefst þess að tækið sé endurræst einu sinni í viðbót. Þegar þú hefur virkjað þessa stillingu geturðu skipt á milli 4 kB- og 16 kB-stillinganna með því að endurræsa tækið einu sinni. Í þessum stillingum er slökkt á tilteknum eiginleikum og því munu einhver forrit ekki virka. Til að kveikja á framleiðslustillingu tækisins á ný þarftu að núllstilla tækið með því að skipta aftur yfir í 4 kB-stillingu og læsa ræsiforritinu. Slökktu síðan á „Taka ræsiforrit úr lás“ í forritunarkostunum þegar tækið hefur ræst Android. Að lokinni staðfestingu verður tækið straujað og skráarkerfinu breytt í ext4. Að því loknu skaltu koma hingað aftur til að virkja 16 kB á ný."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Eyða öllum gögnum"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Ekki tókst að endursníða og strauja gagnaskiptinguna til að breyta henni í ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 kB-stilling krefst þess að ræsiforritið sé tekið úr lás"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Krefst þess að ræsiforritið sé tekið úr lás"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Þú þarft að taka ræsiforrit tækisins úr lás áður en þú getur valið 16 kB-forritunarkostinn. 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. Öll notandagögn og stillingar verða straujaðar þegar 16 kB-stillingin er virkjuð. Þegar ræsiforritið hefur verið tekið úr lás mun virkjun 16 kB-stillingarinnar krefjast þess að tækið sé endurræst tvisvar sinnum. Þegar þú hefur virkjað þessa stillingu geturðu skipt á milli 4 kB- og 16 kB-stillinganna með því að endurræsa tækið einu sinni. Í þessum stillingum er slökkt á tilteknum eiginleikum og því munu einhver forrit ekki virka. Til að kveikja á framleiðslustillingu tækisins á ný þarftu að núllstilla tækið með því að skipta aftur yfir í 4 kB-stillingu og læsa ræsiforritinu. Taktu ræsiforritið úr lás og reyndu aftur. Leiðbeiningar um hvernig þetta er framkvæmt má finna á <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Notar 4 kB-stillingu óháðrar síðustillingar"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Þú ert að nota 4 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ý þarfðu að læsa ræsiforriti tækisins. Ýttu til að lesa meira."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Þú ert að nota 4 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ý þarfðu að 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eða fara á <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> og velja „Strauja tæki“, „Læsa ræsiforriti“ og „Þvinga uppfærslu allra deilda“."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Notar 16 kB-stillingu óháðrar síðustillingar"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Þú 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. Ýttu til að lesa meira."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Þú 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eða fara á <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> og velja „Strauja tæki“, „Læsa ræsiforriti“ og „Þvinga uppfærslu allra deilda“."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Þú 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. Ýttu til að lesa meira."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eða fara á <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Meðhöndlun villutilkynningar"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Nota forritsfestingu"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Nota forritunarkosti"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Nota prentþjónustu"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Leyfa marga notendur"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Leyfa skipti á notanda"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"leyfa, margir, notandi, leyfi, margir"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"margir, notendur, prófílar, fólk, reikningar, skipta, margt"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Nota þráðlausa villuleit"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Veldu það sem á að birta á skjánum á meðan spjaldtölvan er í dokkunni. Tækið kann að nota meiri orku þegar skjávarinn er notaður."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Sérsníða"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Sérsníða <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Endurræsingar er krafist til að kveikja á stuðningi við Freeform."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Endurræsingar er krafist til að þvinga skjáborðsstillingu á öðrum skjáum."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Endurræsingar er krafist fyrir virkjun stuðnings við eldri glugga á frjálsu sniði."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Endurræsingar er krafist fyrir breytingu á stuðningi við glugga á frjálsu sniði."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Endurræsingar er krafist fyrir þvingun glugga á frjálsu sniði á aukaskjáum."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Endurræsa núna"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Endurræsa seinna"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Rýmishljóð"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Kveikt"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Slökkt"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Kveikt"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Hljóð: %1$d%% vinstri, %2$d%% hægri"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Hljóð: %1$d%% hægri, %2$d%% vinstri"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Heiti tækisins er sýnilegt uppsettum forritum. Heiti þess er hugsanlega einnig sýnilegt öðru fólki þegar þú tengist Bluetooth-tækjum, WiFi-neti eða setur upp heitan WiFi-reit."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Kyn"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Veldu kyn"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Leitarstillingar"</string>
</resources>
diff --git a/res/values-it-feminine/strings.xml b/res/values-it-feminine/strings.xml
new file mode 100644
index 0000000..c574afc
--- /dev/null
+++ b/res/values-it-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_on" msgid="2840850085134853754">"Ora sei una sviluppatrice."</string>
+ <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già una sviluppatrice."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"Per risultati ottimali, usa una protezione per lo schermo con la certificazione Made For Google. Con altre protezioni per lo schermo l\'impronta di tua figlia potrebbe non funzionare."</string>
+ <string name="storage_other_users" msgid="7017206190449510992">"Altre utenti"</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="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratrice potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratrice per avere ulteriori informazioni su questo certificato.}other{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratrice potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratrice per avere ulteriori informazioni su questi certificati.}}"</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="other_user_category_title" msgid="7089976887307643217">"Altre utenti"</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 0000000..bdd8113
--- /dev/null
+++ b/res/values-it-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_on" msgid="2840850085134853754">"Ora sei uno sviluppatore."</string>
+ <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già uno sviluppatore."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"Per risultati ottimali, usa una protezione per lo schermo con la certificazione Made For Google. Con altre protezioni per lo schermo l\'impronta di tuo figlio potrebbe non funzionare."</string>
+ <string name="storage_other_users" msgid="7017206190449510992">"Altri utenti"</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="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni su questo certificato.}other{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratore potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratore per avere ulteriori informazioni su questi certificati.}}"</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="other_user_category_title" msgid="7089976887307643217">"Altri utenti"</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 0000000..7473294
--- /dev/null
+++ b/res/values-it-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_on" msgid="2840850085134853754">"Ora sei unə sviluppatorə."</string>
+ <string name="show_dev_already" msgid="7041756429707644630">"Non è necessario, sei già unə sviluppatorə."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"Per risultati ottimali, usa una protezione per lo schermo con la certificazione Made For Google. Con altre protezioni per lo schermo l\'impronta di tuə figliə potrebbe non funzionare."</string>
+ <string name="storage_other_users" msgid="7017206190449510992">"Altrə utenti"</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="ssl_ca_cert_info_message" msgid="3111724430981667845">"{numberOfCertificates,plural, =1{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratorə potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratorə per avere ulteriori informazioni su questo certificato.}other{{orgName} ha installato un\'autorità di certificazione per il tuo profilo di lavoro. L\'amministratorə potrebbe monitorare l\'attività di rete lavorativa, inclusi siti web protetti, email e app.\n\nContatta l\'amministratorə per avere ulteriori informazioni su questi certificati.}}"</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="other_user_category_title" msgid="7089976887307643217">"Altrə utenti"</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 6b7b9fd..b2cabe8 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -281,7 +281,7 @@
<item msgid="7948784184567841794">"Volume Bluetooth"</item>
<item msgid="1148968792599973150">"Mantieni attivo"</item>
<item msgid="8482874682804856549">"Posizione"</item>
- <item msgid="5186169827582545242">"Geolocalizzazione"</item>
+ <item msgid="5186169827582545242">"Posizione"</item>
<item msgid="6122293931012635638">"Ricevi statistiche sull\'utilizzo"</item>
<item msgid="2526677383312751932">"Attiva/disattiva microfono"</item>
<item msgid="4000577305179914546">"Visualizzazione dell\'avviso popup"</item>
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Riposo"</item>
+ <item msgid="4152450357280759894">"Alla guida"</item>
+ <item msgid="7096549258219399423">"Immersiva"</item>
+ <item msgid="2760716776980432977">"Gestita"</item>
+ <item msgid="601734478369121764">"Stella"</item>
+ <item msgid="6243809315432780521">"Calendario"</item>
+ <item msgid="4913577903148415331">"Tempo"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Fiore"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c4d883d..a208eb7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -65,18 +65,18 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Scollegare il dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Accoppia nuovo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Attiva automaticamente domani"</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>
<string name="bluetooth_pair_other_ear_dialog_left_ear_message" msgid="5711642363615781647">"La tua protesi uditiva sinistra è connessa.\n\nPer accoppiare quella destra, assicurati che sia accesa e pronta per l\'accoppiamento."</string>
<string name="bluetooth_pair_other_ear_dialog_right_ear_message" msgid="631521133525979967">"La tua protesi uditiva destra è connessa.\n\nPer accoppiare quella sinistra, assicurati che sia accesa e pronta per l\'accoppiamento."</string>
- <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Accoppia orecchio destro"</string>
+ <string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"Accoppia orecchio dx"</string>
<string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"Accoppia orecchio sx"</string>
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Impostazioni protesi uditive"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Scorciatoia, compatibilità con apparecchi acustici"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Non sono presenti preset programmati dal tuo audiologo"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Impossibile aggiornare preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Uscita audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Informazioni su uscita audio"</string>
@@ -216,7 +216,7 @@
<string name="terms_of_address_feminine" msgid="1743479869695539283">"Femminili"</string>
<string name="terms_of_address_masculine" msgid="983106046135098856">"Maschili"</string>
<string name="terms_of_address_neutral" msgid="5475414185543112478">"Neutra"</string>
- <string name="dlg_remove_locales_title" msgid="3170501604483612114">"{count,plural, =1{Vuoi rimuovere la lingua selezionata?}other{Vuoi rimuovere le lingue selezionate?}}"</string>
+ <string name="dlg_remove_locales_title" msgid="3170501604483612114">"{count,plural, =1{Rimuovere la lingua selezionata?}other{Rimuovere le lingue selezionate?}}"</string>
<string name="dlg_remove_locales_message" msgid="8110560091134252067">"Il testo verrà mostrato in un\'altra lingua."</string>
<string name="dlg_remove_locales_error_title" msgid="5875503658221562572">"Impossibile rimuovere tutte le lingue"</string>
<string name="dlg_remove_locales_error_message" msgid="6504279959974675302">"Mantieni almeno una lingua preferita"</string>
@@ -278,12 +278,12 @@
<string name="owner_info_settings_title" msgid="3555626140700093017">"Testo su schermata di blocco"</string>
<string name="owner_info_settings_summary" msgid="347238313388083297">"Nessuno"</string>
<string name="owner_info_settings_edit_text_hint" msgid="841926875876050274">"Ad es. Dispositivo Android di Anna"</string>
- <string name="location_settings_title" msgid="8375074508036087178">"Geolocalizzazione"</string>
+ <string name="location_settings_title" msgid="8375074508036087178">"Posizione"</string>
<string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usa posizione"</string>
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
- <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Opzione attiva: # app ha accesso alla posizione}other{Opzione attiva: # app hanno accesso alla posizione}}"</string>
+ <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{On / # app ha accesso alla posizione}other{On / # app hanno accesso alla posizione}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Caricamento…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Le app con l\'autorizzazione Dispositivi nelle vicinanze possono stabilire la posizione relativa dei dispositivi connessi."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Le app con autorizzazione di accesso ai dispositivi nelle vicinanze possono stabilire la posizione relativa dei dispositivi connessi."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"L\'accesso alla posizione è disattivato per app e servizi. La posizione del dispositivo potrebbe essere comunque inviata ai servizi di emergenza se chiami o invii un SMS a un numero di emergenza."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Scopri di più sulle impostazioni di geolocalizzazione"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Per apportare modifiche, vai alle Impostazioni di ChromeOS > Privacy e sicurezza > Controlli per la privacy > Accesso alla posizione"</string>
@@ -342,8 +342,8 @@
<string name="security_settings_face_enroll_must_re_enroll_title" msgid="4421818770682557621">"Riconfigura lo Sblocco con il Volto"</string>
<string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"Migliora la sicurezza e le prestazioni"</string>
<string name="security_settings_face_enroll_improve_face_alert_title" msgid="6194184776580066012">"Configura lo Sblocco con il Volto"</string>
- <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Elimina l\'attuale modello del volto per riconfigurare lo Sblocco con il Volto.\n\nIl modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare il PIN, la sequenza o la password per sbloccare il telefono o eseguire l\'autenticazione nelle app."</string>
- <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Elimina l\'attuale modello del volto per riconfigurare lo Sblocco con il Volto.\n\nIl modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare l\'impronta, il PIN, la sequenza o la password per sbloccare il telefono o eseguire l\'autenticazione nelle app."</string>
+ <string name="security_settings_face_enroll_improve_face_alert_body" msgid="2670118180411127323">"Elimina l\'attuale modello del volto per riconfigurare lo Sblocco con il Volto.\n\nIl modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare il PIN, la sequenza o la password per sbloccare lo smartphone o eseguire l\'autenticazione nelle app."</string>
+ <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint" msgid="2469599074650327489">"Elimina l\'attuale modello del volto per riconfigurare lo Sblocco con il Volto.\n\nIl modello del volto verrà eliminato definitivamente e in sicurezza.\n\nDopo l\'eliminazione dovrai usare l\'impronta, il PIN, la sequenza o la password per sbloccare lo smartphone o eseguire l\'autenticazione nelle app."</string>
<string name="security_settings_face_settings_use_face_category" msgid="1638314154119800188">"Usa lo Sblocco con il Volto per"</string>
<string name="security_settings_face_settings_preferences_category" msgid="7628929873407280453">"Quando usi lo Sblocco con il Volto"</string>
<string name="security_settings_face_settings_require_attention" msgid="4395309855914391104">"Gli occhi devono essere aperti"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Volto e <xliff:g id="WATCH">%s</xliff:g> aggiunti"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Volto, impronta e <xliff:g id="WATCH">%s</xliff:g> aggiunti"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Volto, impronte e <xliff:g id="WATCH">%s</xliff:g> aggiunti"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"È necessario perché la verifica dell\'identità è attiva"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Sblocco Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Smartwatch aggiunto"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configura l\'orologio"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Scopri di più su Sblocco dall\'orologio"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Aggiungi smartwatch"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Rimuovi smartwatch"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Sblocco con il Volto e l\'Impronta"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Sblocco con il Volto e con l\'Impronta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Sblocco con il Volto e l\'Impronta per lavoro"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configurazione richiesta"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Impronte e volto aggiunti"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installa le app"</b>\n"Installa le app che vuoi mantenere private nel tuo spazio"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Aspetti da considerare"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Le app vengono interrotte quando blocchi il tuo spazio"</b>\n"Quando blocchi il tuo spazio, le app al suo interno verranno interrotte e non ti invieranno notifiche"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Gli spazi privati non sono adatti per le app che devono essere eseguite in background o inviare notifiche critiche, come le app mediche. Questo perché le notifiche e le attività in background vengono interrotte quando il tuo spazio è bloccato.\n\nLe app nel tuo spazio privato non verranno visualizzate nella gestione autorizzazioni, nella dashboard della privacy e in altre impostazioni quando lo spazio privato è bloccato.\n\nIl tuo spazio privato non può essere ripristinato su un nuovo dispositivo. Dovrai configurare un altro spazio privato per poterlo usare su un altro dispositivo.\n\nChiunque colleghi il dispositivo a un computer o installi app dannose sul dispositivo può avere accesso al tuo spazio privato."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Gli spazi privati non sono adatti per le app che devono essere eseguite in background o inviare notifiche critiche, come le app mediche. Questo perché le notifiche e le attività in background vengono interrotte quando lo spazio è bloccato.\n\nLe app nel tuo spazio privato non verranno visualizzate nella gestione autorizzazioni, nella dashboard della privacy e in altre impostazioni quando lo spazio privato è bloccato.\n\nIl tuo spazio privato non può essere ripristinato su un nuovo dispositivo. Dovrai configurare un altro spazio se vuoi usarlo su un altro dispositivo.\n\nChiunque colleghi il tuo dispositivo a un computer o installi app dannose sul tuo dispositivo potrebbe accedere al tuo spazio privato."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Scopri di più sullo spazio privato"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"L\'operazione richiederà alcuni istanti"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurazione dello spazio privato in corso…"</string>
@@ -779,7 +778,7 @@
<string name="lockpassword_password_too_short" msgid="1938086368137797700">"{count,plural, =1{Deve contenere almeno # carattere}other{Deve contenere almeno # caratteri}}"</string>
<string name="lockpassword_password_too_short_all_numeric" msgid="4301294924022401502">"{count,plural, =1{Se utilizzi solo numeri, la password deve avere almeno 1 cifra}other{Se utilizzi solo numeri, la password deve avere almeno # cifre}}"</string>
<string name="lockpassword_pin_too_short" msgid="8910105226463085689">"{count,plural, =1{Il PIN deve contenere almeno # cifra}other{Il PIN deve contenere almeno # cifre}}"</string>
- <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{Il PIN deve contenere almeno # cifra, ma è consigliato un PIN di {minAutoConfirmLen} cifre per una maggiore sicurezza}other{Il PIN deve contenere almeno # cifre, ma è consigliato un PIN di {minAutoConfirmLen} cifre per una maggiore sicurezza}}"</string>
+ <string name="lockpassword_pin_too_short_autoConfirm_extra_message" msgid="3271351502900762571">"{count,plural, =1{Il PIN deve contenere almeno # cifra, ma un PIN di {minAutoConfirmLen} cifre è consigliato per una maggiore sicurezza}other{Il PIN deve contenere almeno # cifre, ma un PIN di {minAutoConfirmLen} cifre è consigliato per una maggiore sicurezza}}"</string>
<string name="lockpassword_password_too_long" msgid="1940345313260498308">"{count,plural, =1{Deve contenere meno di # carattere}other{Deve contenere meno di # caratteri}}"</string>
<string name="lockpassword_pin_too_long" msgid="1678212054564388576">"{count,plural, =1{Deve contenere meno di # cifra}other{Deve contenere meno di # cifre}}"</string>
<string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vuoi riavviare il dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Il logging NFC dettagliato è a solo scopo di sviluppo. Vengono inclusi dati NFC aggiuntivi nelle segnalazioni di bug, che potrebbero contenere informazioni private. Riavvia il dispositivo per cambiare questa impostazione."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Riavvia"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirroring, display esterno, display connesso, display usb, risoluzione, ruota"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotazione"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1021,7 +1035,7 @@
<string name="wifi_scan_always_turn_on_message_unknown" msgid="4903345360745717385">"Per migliorare la precisione della posizione e per altri scopi, un\'app sconosciuta vuole attivare la ricerca della rete, anche se il Wi‑Fi non è attivo.\n\nVuoi autorizzare ogni app che richiede di eseguire la ricerca?"</string>
<string name="wifi_scan_always_confirm_allow" msgid="4154200627800959777">"Consenti"</string>
<string name="wifi_scan_always_confirm_deny" msgid="6997087934558839256">"Rifiuta"</string>
- <string name="no_internet_access_text" msgid="3611993143350310936">"Questa rete non ha accesso a Internet. Vuoi restare connesso?"</string>
+ <string name="no_internet_access_text" msgid="3611993143350310936">"Questa rete non ha accesso a internet. Vuoi restare connesso?"</string>
<string name="partial_connectivity_text" msgid="8874614799723694554">"Alcuni servizi e app potrebbero non funzionare a causa della connettività limitata. Usarli comunque?"</string>
<string name="no_internet_access_remember" msgid="5113610157731269258">"Non chiedermelo più per questa rete"</string>
<string name="lost_internet_access_title" msgid="9032463989950384698">"Wi-Fi non connesso a Internet"</string>
@@ -1133,7 +1147,7 @@
<string name="wifi_add_app_single_network_saved_summary" msgid="7135016314713158289">"Salvata"</string>
<string name="wifi_add_app_network_save_failed_summary" msgid="7223817782309294652">"Impossibile salvare. Riprova."</string>
<string name="wifi_add_app_networks_title" msgid="4384594865433042851">"Vuoi salvare le reti?"</string>
- <string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"Salvataggio di <xliff:g id="NUMBER">%d</xliff:g> reti…"</string>
+ <string name="wifi_add_app_networks_saving_summary" msgid="577680250954742033">"Salvataggio di <xliff:g id="NUMBER">%d</xliff:g> reti in corso…"</string>
<string name="wifi_add_app_networks_saved_summary" msgid="1648417628665152905">"Reti salvate"</string>
<string name="wifi_calling_settings_title" msgid="264665264535884440">"Chiamate Wi-Fi"</string>
<string name="wifi_calling_suggestion_title" msgid="4791435106729906727">"Estendi le chiamate usando il Wi‑Fi"</string>
@@ -1159,7 +1173,7 @@
<string name="wifi_calling_off_explanation" msgid="6295526820826322895">"Se le chiamate Wi-Fi sono attive, il tuo telefono può indirizzare le chiamate tramite reti Wi-Fi o la rete del tuo operatore, in base alle tue preferenze e alla potenza del segnale. Prima di attivare questa funzionalità, verifica tariffe e altri dettagli con il tuo operatore.<xliff:g id="ADDITIONAL_TEXT">%1$s</xliff:g>"</string>
<string name="wifi_calling_off_explanation_2" msgid="3487475808574416183"></string>
<string name="emergency_address_title" msgid="8102786488994263815">"Indirizzo per le emergenze"</string>
- <string name="emergency_address_summary" msgid="3022628750270626473">"Viene considerato la tua posizione quando fai una chiamata di emergenza tramite Wi‑Fi"</string>
+ <string name="emergency_address_summary" msgid="3022628750270626473">"Viene considerato come la tua posizione quando fai una chiamata di emergenza tramite Wi‑Fi"</string>
<string name="private_dns_help_message" msgid="851221502063782306"><annotation id="url">"Scopri di più"</annotation>" sulle funzioni di DNS privato"</string>
<string name="private_dns_mode_on" msgid="8878679071975375696">"On"</string>
<string name="wifi_calling_settings_activation_instructions" msgid="3936067355828542266">"Attiva le chiamate Wi-Fi"</string>
@@ -1176,7 +1190,7 @@
<string name="display_settings" msgid="7197750639709493852">"Display"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"Rotazione automatica dello schermo"</string>
<string name="auto_rotate_option_off" msgid="2788096269396290731">"Off"</string>
- <string name="auto_rotate_option_on" msgid="5776678230808498171">"On"</string>
+ <string name="auto_rotate_option_on" msgid="5776678230808498171">"Attiva"</string>
<string name="auto_rotate_option_face_based" msgid="3438645484087953174">"On - Rotazione basata sul viso"</string>
<string name="auto_rotate_switch_face_based" msgid="9116123744601564320">"Riconoscimento facciale"</string>
<string name="auto_rotate_link_a11y" msgid="5146188567212233286">"Scopri di più sulla rotazione automatica"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1406,14 +1421,14 @@
<string name="storage_os_detail_dialog_system" msgid="1423073052313067844">"Sono inclusi il tuo sistema operativo e i file necessari per far funzionare correttamente il tuo smartphone. Per proteggere la loro integrità, non è possibile accedere a questi file."</string>
<string name="storage_other_files_detail_dialog_system" msgid="8241153880150866635">"Sono inclusi la cache e altri file temporanei richiesti dal tuo sistema operativo. Potresti notare delle modifiche alla quantità di spazio di archiviazione utilizzato nel tempo."</string>
<string name="storage_system_label" msgid="8320948583086758295">"Sistema"</string>
- <string name="storage_wizard_guest" msgid="5813419895687733649">"Utenti Ospite non possono formattare le schede SD"</string>
+ <string name="storage_wizard_guest" msgid="5813419895687733649">"Utenti ospite non possono formattare le schede SD"</string>
<string name="storage_wizard_format_progress_title" msgid="9170393018855949774">"Formattazione della <xliff:g id="NAME">^1</xliff:g>…"</string>
<string name="storage_wizard_format_progress_body" msgid="1044024044955390417">"Non rimuovere il dispositivo <xliff:g id="NAME">^1</xliff:g> durante la formattazione."</string>
<string name="storage_wizard_ready_title" msgid="3631022511474086605">"Formattazione <xliff:g id="NAME">^1</xliff:g> eseguita"</string>
<string name="storage_wizard_move_confirm_title" msgid="6812469630804101590">"Sposta <xliff:g id="APP">^1</xliff:g>"</string>
<string name="storage_wizard_move_confirm_body" msgid="1713022828842263574">"Lo spostamento dell\'app <xliff:g id="APP">^1</xliff:g> e dei relativi dati sulla <xliff:g id="NAME_0">^2</xliff:g> sarà veloce. Potrai utilizzare l\'app soltanto al termine dello spostamento. \n\nNon rimuovere la <xliff:g id="NAME_1">^2</xliff:g> durante lo spostamento."</string>
<string name="storage_wizard_move_unlock" msgid="14651384927767749">"Per spostare i dati devi sbloccare l\'utente <xliff:g id="APP">^1</xliff:g>."</string>
- <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g>…"</string>
+ <string name="storage_wizard_move_progress_title" msgid="3912406225614672391">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g> in corso…"</string>
<string name="storage_wizard_move_progress_body" msgid="2396714553394935094">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante lo spostamento. \n\nL\'app <xliff:g id="APP">^2</xliff:g> su questo dispositivo sarà disponibile soltanto al termine dello spostamento."</string>
<string name="storage_wizard_init_v2_title" msgid="2538630338392381113">"Come userai <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_wizard_init_v2_or" msgid="5558706089661158026">"Oppure"</string>
@@ -1573,19 +1588,19 @@
<string name="location_recent_location_access_see_all" msgid="4203102419355323325">"Mostra tutto"</string>
<string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Vedi dettagli"</string>
<string name="location_no_recent_apps" msgid="6814206631456177033">"Nessuna app ha richiesto la posizione di recente"</string>
- <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nessuna app ha effettuato di recente l\'accesso alla posizone"</string>
+ <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nessuna app ha effettuato di recente l\'accesso alla posizione"</string>
<string name="location_high_battery_use" msgid="4277318891200626524">"Elevato utilizzo della batteria"</string>
<string name="location_low_battery_use" msgid="5218950289737996431">"Basso utilizzo della batteria"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Ricerca di reti Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Consenti ad app e servizi di cercare reti Wi-Fi in qualsiasi momento, anche quando il Wi-Fi non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
<string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ricerca di dispositivi Bluetooth"</string>
<string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
- <string name="location_services_preference_title" msgid="604317859531782159">"Servizi di geolocalizzazione"</string>
- <string name="location_services_screen_title" msgid="5640002489976602476">"Servizi di geolocalizzazione"</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_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 geolocalizzazione non attivi"</string>
+ <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"Geolocalizzazione o Servizi di localizzazione non attivi"</string>
<string name="location_time_zone_detection_status_summary_blocked_by_environment" msgid="2279833212923765802"></string>
<string name="location_time_zone_detection_status_summary_temporarily_unavailable" msgid="6586801403644278967"></string>
<string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"È necessario attivare la geolocalizzazione del dispositivo"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Usa tastiera sullo schermo"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Tienila sullo schermo quando è attiva la tastiera fisica"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Tasti rimbalzati"</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="slow_keys" msgid="2891452895499690837">"Tasti lenti"</string>
<string name="slow_keys_summary" msgid="1784371292745423292">"Regola il tempo richiesto per l\'attivazione della pressione di un tasto su <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</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 del mouse"</string>
+ <string name="mouse_keys_summary" msgid="2396247040177734245">"Usa la tastiera fisica per controllare il 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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Cambia riempim. puntatore in giallo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Cambia riempim. puntatore in rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Cambia riempim. puntatore in blu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stile tratto puntatore"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Bianco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Nero"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nessuno"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Selezionato dall\'utente: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voce"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocità del puntatore"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Scala puntatore"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuisci scala puntatore"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumenta scala puntatore"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controller di gioco"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Reindirizza vibrazione"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Invia la vibrazione al controller di gioco quando è collegato"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continua comunque"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Annulla"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Impostazioni ingrandimento"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Panning con un dito"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Muovi Lente d\'ingrandimento con 1 dito"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Trascina 1 dito per spostarti nella schermata"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Sposta l\'area di ingrandimento trascinando un dito."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Sposta l\'area di ingrandimento trascinando due dita."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Non disponibile quando viene ingrandita solo una parte dello schermo"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tocca un pulsante per eseguire lo zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Aumenta velocemente lo zoom sullo schermo per ingrandire i contenuti"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Per aumentare lo zoom:</b><br/> {0,number,integer}. Usa la scorciatoia per avviare l\'ingrandimento<br/> {1,number,integer}. Tocca lo schermo<br/> {2,number,integer}. Trascina 2 dita per spostarti sullo schermo<br/> {3,number,integer}. Pizzica con 2 dita per regolare lo zoom<br/> {4,number,integer}. Usa la scorciatoia per interrompere l\'ingrandimento<br/><br/> <b>Per aumentare lo zoom temporaneamente:</b><br/> {0,number,integer}. Assicurati che sia impostato il tipo di ingrandimento a schermo intero<br/> {1,number,integer}. Usa la scorciatoia per avviare l\'ingrandimento<br/> {2,number,integer}. Tocca e tieni premuto un punto qualsiasi dello schermo<br/> {3,number,integer}. Trascina il dito per spostarti sullo schermo<br/> {4,number,integer}. Solleva il dito per interrompere l\'ingrandimento"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Per aumentare lo zoom:</b><br/> {0,number,integer}. Usa la scorciatoia per avviare l\'ingrandimento.<br/> {1,number,integer}. Tocca lo schermo.<br/> {2,number,integer}. Trascina 2 dita per spostarti sullo schermo.<br/> {3,number,integer}. Pizzica con 2 dita per regolare lo zoom.<br/> {4,number,integer}. Utilizza la scorciatoia per interrompere l\'ingrandimento<br/><br/> Puoi anche aumentare lo zoom temporaneamente e altro ancora."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Per aumentare lo zoom:</b><br/> {0,number,integer}. Usa la scorciatoia per avviare l\'ingrandimento.<br/> {1,number,integer}. Tocca lo schermo.<br/> {2,number,integer}. Trascina 1 o 2 dita per spostarti sullo schermo<br/> {3,number,integer}. Pizzica con 2 dita per regolare lo zoom.<br/> {4,number,integer}. Utilizza la scorciatoia per interrompere l\'ingrandimento<br/><br/> Puoi anche aumentare lo zoom temporaneamente e altro ancora."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Quando è attivo l\'ingrandimento, puoi aumentare lo zoom sullo schermo.\n\n"<b>"Per eseguire lo zoom"</b>", avvia l\'ingrandimento, quindi tocca un punto qualsiasi sullo schermo.\n"<ul><li>"Trascina almeno due dita per scorrere"</li>\n<li>"Pizzica con almeno due dita per regolare lo zoom."</li></ul>\n\n<b>"Per ingrandire temporaneamente"</b>", avvia l\'ingrandimento, quindi tocca e tieni premuto un punto qualsiasi sullo schermo.\n"<ul><li>"Trascina per spostarti sullo schermo"</li>\n<li>"Solleva il dito per ridurre lo zoom"</li></ul>\n\n"Non puoi aumentare lo zoom sulla tastiera o nella barra di navigazione."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> di <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Scorciatoia pulsante Accessibilità"</string>
@@ -2809,7 +2834,7 @@
<string name="remove_managed_profile_label" msgid="1294933737673830431">"Rimuovi profilo di lavoro"</string>
<string name="background_data" msgid="321903213000101158">"Dati in background"</string>
<string name="background_data_summary" msgid="6572245922513522466">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
- <string name="background_data_dialog_title" msgid="1692005302993229867">"Disatt. dati backgr.?"</string>
+ <string name="background_data_dialog_title" msgid="1692005302993229867">"Disatt. dati backg.?"</string>
<string name="background_data_dialog_message" msgid="7760280837612824670">"La disattivazione dei dati in background aumenta la durata della batteria e riduce l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
<string name="sync_enabled" msgid="5794103781356455043">"Sincronizzazione attiva"</string>
<string name="sync_disabled" msgid="1636223106968593391">"La sincronizzazione non è attiva"</string>
@@ -2920,8 +2945,8 @@
<string name="vpn_set_vpn_title" msgid="1667539483005810682">"Impostare la rete VPN sempre attiva?"</string>
<string name="vpn_first_always_on_vpn_message" msgid="2769478310633047870">"Quando questa impostazione è attiva, la connessione Internet non sarà disponibile fino a quando la rete VPN sarà connessa correttamente"</string>
<string name="vpn_replace_always_on_vpn_enable_message" msgid="9154843462740876652">"La rete VPN attuale sarà sostituita e la connessione Internet non sarà disponibile fino a quando la rete VPN sarà connessa correttamente"</string>
- <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Sei già collegato 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à collegato a una rete VPN. Se ti connetti a un\'altra rete, la VPN attuale verrà sostituita."</string>
+ <string name="vpn_replace_always_on_vpn_disable_message" msgid="4299175336198481106">"Hai già effettuato la connessione 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">"Hai già eseguito la connessione a una rete VPN. Se ti connetti a un\'altra rete, la VPN attuale verrà sostituita."</string>
<string name="vpn_turn_on" msgid="3568307071295211187">"Attiva"</string>
<string name="vpn_cant_connect_title" msgid="5670787575925519386">"Impossibile connettersi alla rete <xliff:g id="VPN_NAME">%1$s</xliff:g>"</string>
<string name="vpn_cant_connect_message" msgid="2139148820719163694">"Questa app non supporta le reti VPN sempre attive"</string>
@@ -2939,7 +2964,7 @@
<string name="vpn_require_connection_title" msgid="4186758487822779039">"Connessione VPN obbligatoria?"</string>
<string name="vpn_insecure_dialog_subtitle" msgid="1857621742868835300">"Tipo non sicuro. Usa una VPN IKEv2."</string>
<string name="vpn_start_unsupported" msgid="7139925503292269904">"Impossibile avviare la VPN non supportata."</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="vpn_lockdown_summary" msgid="4700625960550559029">"Seleziona un profilo VPN con cui mantenere la connessione attiva. Il traffico di rete sarà consentito solo durante la connessione a questa VPN."</string>
<string name="vpn_lockdown_none" msgid="455915403560910517">"Nessuna"</string>
<string name="vpn_lockdown_config_error" msgid="1992071316416371316">"La VPN sempre attiva richiede un indirizzo IP per server e DNS."</string>
<string name="vpn_no_network" msgid="7187593680049843763">"Nessuna connessione di rete disponibile. Riprova più tardi."</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 pianificazione impostata}other{# pianificazioni impostate}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Non disturbare"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modalità priorità"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Aggiungi una modalità"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ricevi soltanto le notifiche di app e persone importanti"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Seleziona tipo di attivazione"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Ad esempio, \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendario"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Ad esempio, \"Calendario personale\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crea una modalità"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizzato"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitare le interruzioni"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Attiva Non disturbare"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Sveglie e suoni multimediali possono interrompere"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Pianificazioni"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Elimina pianificazioni"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Elimina"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Rinomina"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Elimina"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vuoi eliminare la modalità \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Modifica"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Pianificazioni"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Pianificazione"</string>
@@ -3340,6 +3379,7 @@
<string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Imposta una programmazione"</string>
<string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programmazione"</string>
<string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Attiva automaticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Pianificazione"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Disattiva la suoneria in orari specifici"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Imposta regole Non disturbare"</string>
@@ -3349,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Consenti le interruzioni sonore"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blocca interruzioni visive"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Consenti segnali visivi"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notifiche che possono arrivarti"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Mantieni la concentrazione"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Azioni aggiuntive"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Off}=1{Off/Può essere attivata automaticamente 1 modalità}other{Off/Possono essere attivate automaticamente # modalità}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Impostazioni di visualizzazione"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opzioni di visualizzazione"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Scala di grigi"</string>
@@ -3366,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"attiva tema scuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Scegli l\'opzione Testo chiaro su sfondo scuro per il sistema operativo e le app per non stancare gli occhi e consentire un notevole risparmio della batteria su alcuni dispositivi"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nessuna modifica del display}=1{{effect_1}}=2{{effect_1} e {effect_2}}=3{{effect_1}, {effect_2} e {effect_3}}other{{effect_1}, {effect_2} e altri #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtra interruzioni"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nessuna interruzione filtrata"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Mostra opzioni per le notifiche filtrate"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quando è attiva la modalità Non disturbare"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Notifiche senza audio"</string>
@@ -3418,7 +3461,7 @@
<string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fino alla disattivazione"</string>
<string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}other{# ore}}"</string>
<string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minuti}}"</string>
- <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 pianificazione può attivarsi automaticamente}other{Off/# pianificazioni possono attivarsi automaticamente}}"</string>
+ <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/Può essere attivata automaticamente 1 programmazione}other{Off/Possono essere attivate automaticamente # programmazioni}}"</string>
<string name="zen_category_behavior" msgid="3214056473947178507">"Possono interrompere la modalità Non disturbare"</string>
<string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
<string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
@@ -3481,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"viene aperta la notifica"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Consenti posticipazione delle notifiche"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Indicatore di notifica su icona app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Bundle di notifiche"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bolle"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bolle"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostra conversazione sotto forma di bolla"</string>
@@ -3575,13 +3619,13 @@
<string name="notifications_sent_never" msgid="9081278709126812062">"Mai"</string>
<string name="manage_notification_access_title" msgid="4154723216570646451">"Lettura, risposta e controllo notifiche"</string>
<string name="manage_notification_access_summary" msgid="2907135226478903997">"Controlla quali app e dispositivi possono leggere le notifiche"</string>
- <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
+ <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accesso bloccato alle notifiche del profilo di lavoro"</string>
<string name="notification_assistant_title" msgid="5889201903272393099">"Notifiche avanzate"</string>
<string name="notification_assistant_summary" msgid="1957783114840908887">"Ricevi suggerimenti di azioni, risposte e altro"</string>
<string name="no_notification_assistant" msgid="2533323397091834096">"Nessuna"</string>
<string name="no_notification_listeners" msgid="2839354157349636000">"Nessuna delle app installate ha richiesto l\'accesso alle notifiche."</string>
<string name="notification_access_detail_switch" msgid="46386786409608330">"Consenti l\'accesso alle notifiche"</string>
- <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Le notifiche adattive sono state sostituite dalle notifiche avanzate in Android 12. Questa funzionalità mostra risposte e azioni suggerite e organizza le tue notifiche. \n\nLe notifiche avanzate possono accedere ai contenuti delle notifiche, incluse le informazioni personali, come i nomi dei contatti e i messaggi. Questa funzionalità può anche ignorare le notifiche o rispondervi, ad esempio accettando le telefonate, e controllare la modalità Non disturbare."</string>
+ <string name="notification_assistant_security_warning_summary" msgid="4846559755787348129">"Le notifiche adattive Android sono state sostituite dalle notifiche avanzate in Android 12. Questa funzionalità mostra risposte e azioni suggerite e organizza le tue notifiche. \n\nLe notifiche avanzate possono accedere ai contenuti di una notifica, incluse le informazioni personali, come i nomi dei contatti e i messaggi. Questa funzionalità può anche ignorare le notifiche o rispondervi, ad esempio accettando le telefonate, e controllare la modalità Non disturbare."</string>
<string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Consentire a <xliff:g id="SERVICE">%1$s</xliff:g> di accedere alle notifiche?"</string>
<string name="notification_listener_security_warning_summary" msgid="1131986567509818121">"L\'app <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> potrà leggere tutte le notifiche, incluse informazioni personali quali nomi dei contatti, foto e il testo dei messaggi ricevuti. Questa app potrà inoltre posticipare o ignorare le notifiche oppure agire sui pulsanti nelle notifiche, ad esempio rispondere alle telefonate. \n\nL\'app potrà anche attivare o disattivare la funzionalità Non disturbare e modificare le relative impostazioni."</string>
<string name="nls_warning_prompt" msgid="1486887096703743841">"L\'app <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> potrà:"</string>
@@ -3595,11 +3639,11 @@
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Disattiva"</string>
<string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annulla"</string>
<string name="notif_type_ongoing" msgid="135675014223627555">"In tempo reale"</string>
- <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Comunicazione costante da app in uso, navigazione, telefonate e tanto altro"</string>
+ <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Comunicazione costante da app in uso, navigazione, telefonate e altro"</string>
<string name="notif_type_conversation" msgid="4383931408641374979">"Conversazioni"</string>
<string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, messaggi di testo e altre comunicazioni"</string>
<string name="notif_type_alerting" msgid="4713073696855718576">"Notifiche"</string>
- <string name="notif_type_alerting_summary" msgid="4681068287836313604">"Il telefono potrebbe suonare o vibrare in base alle impostazioni"</string>
+ <string name="notif_type_alerting_summary" msgid="4681068287836313604">"Il dispositivo potrebbe suonare o vibrare in base alle impostazioni"</string>
<string name="notif_type_silent" msgid="6273951794420331010">"Silenziose"</string>
<string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifiche che non emettono mai suoni o vibrazioni"</string>
<string name="notification_listener_allowed" msgid="5536962633536318551">"Autorizzazione concessa"</string>
@@ -3610,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Questa app non supporta le impostazioni avanzate"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Altre impostazioni"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Altre impostazioni sono disponibili all\'interno di quest\'app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Attenuazione delle notifiche"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Usa attenuazione delle notifiche"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3662,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorie"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Altro"</string>
<string name="no_channels" msgid="4716199078612071915">"L\'app non ha pubblicato alcuna notifica"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostra le categorie inutilizzate"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Altre impostazioni nell\'app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostra le categorie inutilizzate"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Nascondi le categorie inutilizzate"</string>
@@ -3770,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"App che possono interrompere"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"App selezionate"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nessuna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Tutti"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Seleziona altre app"</string>
@@ -3788,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niente può interrompere"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nessuno può interrompere"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Alcune persone possono interrompere"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Tutte le persone possono interrompere"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Chiamate ripetute"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Consenti chiamate ripetute"</string>
@@ -3807,9 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Passa alla modalità Solo sveglie per un\'ora, fino alle ore {time}}other{Passa alla modalità Solo sveglie per # ore, fino alle ore {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Cambia su Solo sveglie fino alle <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Cambia su Interrompi sempre"</string>
- <string name="zen_mode_action_change_name" msgid="766639614789907016">"Rinomina"</string>
- <string name="zen_mode_action_change_icon" msgid="6192187791750301778">"Modifica icona"</string>
- <string name="zen_mode_icon_picker_title" msgid="6845490379143557472">"Modifica icona"</string>
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modalità di modifica"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Aggiungi 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="warning_button_text" msgid="1274234338874005639">"Avviso"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Chiudi"</string>
<string name="device_feedback" msgid="5351614458411688608">"Invia feedback sul dispositivo"</string>
@@ -4014,7 +4064,7 @@
<string name="ignore_optimizations_off" msgid="9186557038453586295">"Ottimizza"</string>
<string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"La batteria potrebbe scaricarsi più rapidamente. L\'uso della batteria in background non sarà più impedito all\'app."</string>
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"Opzione consigliata per una durata maggiore della batteria"</string>
- <string name="app_list_preference_none" msgid="1635406344616653756">"Nessuno"</string>
+ <string name="app_list_preference_none" msgid="1635406344616653756">"Nessuna"</string>
<string name="work_profile_usage_access_warning" msgid="3477719910927319122">"Se disattivi l\'accesso ai dati di utilizzo di questa app, l\'amministratore potrà comunque monitorare l\'utilizzo dei dati per le app nel tuo profilo di lavoro"</string>
<string name="draw_overlay" msgid="7902083260500573027">"Mostra sopra altre app"</string>
<string name="system_alert_window_settings" msgid="6458633954424862521">"Mostra sopra altre app"</string>
@@ -4154,7 +4204,7 @@
<string name="data_remaining" msgid="6316251496381922837">"Dati rimanenti: <xliff:g id="ID_1">^1</xliff:g>"</string>
<string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Grafico che mostra l\'utilizzo dei dati dal giorno <xliff:g id="START_DATE">%1$s</xliff:g> al giorno <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
<string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Non ci sono dati in questo intervallo di date"</string>
- <string name="billing_cycle_days_left" msgid="174337287346866400">"{count,plural, =1{# giorno rimanente}other{# giorni rimanenti}}"</string>
+ <string name="billing_cycle_days_left" msgid="174337287346866400">"{count,plural, =1{Manca # giorno}other{Mancano # giorni}}"</string>
<string name="billing_cycle_none_left" msgid="1694844019159277504">"Tempo scaduto"</string>
<string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Meno di 1 giorno rimanente"</string>
<string name="carrier_and_update_text" msgid="5363656651921656280">"Aggiornato da <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> fa"</string>
@@ -4498,7 +4548,7 @@
<string name="device_theme" msgid="5027604586494772471">"Tema del dispositivo"</string>
<string name="default_theme" msgid="4815428567082263639">"Valore predefinito"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"Nome della rete"</string>
- <string name="show_operator_name_summary" msgid="5352696579216501773">"Nome della Rete Display nella bara di stato"</string>
+ <string name="show_operator_name_summary" msgid="5352696579216501773">"Mostra nome della rete nella barra di stato"</string>
<string name="install_type_instant" msgid="7685381859060486009">"App istantanea"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="4905106133215702099">"Disattivare la gestione della memoria?"</string>
<string name="zen_suggestion_title" msgid="4555260320474465668">"Aggiorna modalità Non disturbare"</string>
@@ -4795,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Custodia"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batteria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Riquadro delle impostazioni"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forza la modalità desktop"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forza la modalità desktop sperimentale su display secondari"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Attiva finestre a forma libera"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Attiva il supporto delle finestre a forma libera."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Attiva finestre a forma libera sul secondo display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Attiva le finestre a forma libera solo sul secondo display."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Attiva app non ridimensionabili in multi-finestra"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Consente la presenza di app non ridimensionabili in modalità multi-finestra"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Esegui override modalità Buio forzata"</string>
@@ -4864,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"La partizione dei dati del dispositivo deve essere convertita in ext4 prima di usare l\'opzione sviluppatore a 16 kB. Non è possibile garantire l\'integrità del software in questa modalità e i dati archiviati sullo smartphone potrebbero essere a rischio finché il bootloader è sbloccato. Se attivi l\'opzione a 16 kB, sarà necessario un ulteriore riavvio. Una volta che sarà attiva questa modalità, potrai passare dalla modalità a 4 kB a quella a 16 kB con un solo riavvio. Alcune funzionalità verranno disattivate in queste modalità, pertanto alcune applicazioni potrebbero non funzionare. Per far tornare il dispositivo in modalità di produzione, dovrai tornare alla modalità a 4 kB e bloccare il bootloader, il che ripristina i dati di fabbrica del dispositivo. Dopo che Android viene avviato correttamente sul dispositivo, disattiva lo sblocco OEM nelle Opzioni sviluppatore. Tutti i dati verranno cancellati dal dispositivo e il file system verrà convertito in ext4 dopo la conferma. Quando termina l\'operazione, riabilita nuovamente la modalità a 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Resetta tutti i dati"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Impossibile riformattare e cancellare la partizione di dati in ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Sblocco del bootloader richiesto per la modalità a 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Sblocco bootloader richiesto"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"È necessario sbloccare il bootloader del dispositivo prima di usare l\'opzione sviluppatore a 16 kB. Non è possibile garantire l\'integrità del software in questa modalità e i dati archiviati sullo smartphone potrebbero essere a rischio finché il bootloader è sbloccato. Tutti i dati utente e le impostazioni verranno cancellati quando attivi la modalità a 16 kB. Dopo aver sbloccato il bootloader, l\'attivazione dell\'opzione a 16 kB richiederà due riavvii. Una volta che sarà attiva questa modalità, potrai passare dalla modalità a 4 kB a quella a 16 kB con un solo riavvio. Alcune funzionalità verranno disattivate in queste modalità, pertanto alcune applicazioni potrebbero non funzionare. Per far tornare il dispositivo in modalità di produzione, dovrai tornare alla modalità a 4 kB e bloccare il bootloader del dispositivo, il che ripristina i dati di fabbrica del dispositivo. Sblocca il bootloader e riprova. Puoi consultare le istruzioni su come fare all\'indirizzo <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Modalità indipendente dalla pagina a 4 kB in uso"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Hai attivato l\'opzione a 4 kB della modalità indipendente dalla pagina. 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 bloccare il bootloader del dispositivo. Tocca per leggere altro."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Hai attivato l\'opzione a 4 kB della modalità indipendente dalla pagina. 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> e seleziona \"Cancella dati dispositivo\", \"Blocca bootloader\" e \"Esegui il flash forzato di tutte le partizioni\"."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Hai attivato l\'opzione a 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> e seleziona \"Cancella dati dispositivo\", \"Blocca bootloader\" e \"Esegui il flash forzato di tutte le partizioni\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Modalità indipendente dalla pagina a 16 kB in uso"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Hai attivato l\'opzione a 16 kB della modalità indipendente dalla pagina. 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. Tocca per leggere altro."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Hai attivato l\'opzione a 16 kB della modalità indipendente dalla pagina. 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> e seleziona \"Cancella dati dispositivo\", \"Blocca bootloader\" e \"Esegui il flash forzato di tutte le partizioni\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tocca per leggere altro."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o usa <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Gestore segnalazione di bug"</string>
@@ -5003,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usa Blocco app su schermo"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usa Opzioni sviluppatore"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usa servizio di stampa"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Consenti utenti multipli"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Consenti cambio utente"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"consentire, multiplo, utente, autorizzare, molti"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"più, utenti, profili, persone, account, sensore, molti"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usa debug wireless"</string>
@@ -5117,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Scegli cosa visualizzare sullo schermo quando il tablet è agganciato alla base. Il dispositivo potrebbe consumare più energia quando viene usato un salvaschermo."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizza"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizza <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"È necessario riavviare per attivare il supporto del formato libero."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"È necessario riavviare per forzare la modalità desktop su display secondari."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"È necessario riavviare per abilitare il supporto delle finestre a forma libera legacy."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"È necessario riavviare per modificare il supporto delle finestre a forma libera."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"È necessario riavviare per forzare le finestre a forma libera sul secondo display."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Riavvia ora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Riavvia più tardi"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio spaziale"</string>
@@ -5208,7 +5261,7 @@
<string name="screen_flash_color_cyan" msgid="6878780006173747267">"Ciano"</string>
<string name="screen_flash_color_spring_green" msgid="4466548514738457815">"Verde primavera"</string>
<string name="screen_flash_color_green" msgid="8418019648507964564">"Verde"</string>
- <string name="screen_flash_color_chartreuse_green" msgid="7456381649919010366">"Giallo-verdognolo"</string>
+ <string name="screen_flash_color_chartreuse_green" msgid="7456381649919010366">"Verde acido"</string>
<string name="screen_flash_color_yellow" msgid="7413465411615454556">"Giallo"</string>
<string name="screen_flash_color_orange" msgid="979177126315557656">"Arancione"</string>
<string name="screen_flash_color_red" msgid="8954162219886445491">"Rosso"</string>
@@ -5236,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"On"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"On"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% a sinistra, %2$d%% a destra"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% a destra, %2$d%% a sinistra"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Il nome del tuo dispositivo è visibile alle app installate. Potrebbe essere visibile anche ad altre persone quando ti connetti a dispositivi Bluetooth, a una rete Wi-Fi o configuri un hotspot Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genere grammaticale"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Seleziona genere grammaticale"</string>
@@ -5347,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"Cerca in Impostazioni"</string>
</resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 44c7e80..972aaf8 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"מנוחה"</item>
+ <item msgid="4152450357280759894">"נהיגה"</item>
+ <item msgid="7096549258219399423">"ריכוז"</item>
+ <item msgid="2760716776980432977">"בשליטה"</item>
+ <item msgid="601734478369121764">"כוכב"</item>
+ <item msgid="6243809315432780521">"יומן"</item>
+ <item msgid="4913577903148415331">"שעה"</item>
+ <item msgid="3653377604690057780">"תיאטרון"</item>
+ <item msgid="3843711267408385410">"פרח"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3e68933..2e673ef 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"לנתק את המכשיר?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"התאמה של מכשיר חדש"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"הפעלה אוטומטית מחר"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ההגדרות של מכשיר השמיעה"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"קיצור דרך, תאימות למכשירי שמיעה"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"הגדרה קבועה מראש"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"לא תוכנתו הגדרות קבועות מראש על ידי האודיולוג שלך"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"לא ניתן לעדכן את ההגדרה הקבועה מראש"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"פלט אודיו"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"מידע על פלט האודיו"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"כבוי"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ההגדרה פועלת / לאפליקציה אחת (#) יש גישה למיקום}one{ההגדרה פועלת / ל-# אפליקציות יש גישה למיקום}two{ההגדרה פועלת / ל-# אפליקציות יש גישה למיקום}other{ההגדרה פועלת / ל-# אפליקציות יש גישה למיקום}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"בטעינה…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"אפליקציות עם ההרשאה \'מכשירים בקרבת מקום\' יכולות להעריך את המיקום היחסי של המכשירים המחוברים."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"אפליקציות עם ההרשאה \'מכשירים בקרבת מקום\' יכולות להקבוע את המיקום היחסי של המכשירים המחוברים."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"הגישה למיקום מושבתת עבור אפליקציות ושירותים. אם מתקשרים למספר חירום או שולחים אליו הודעת טקסט, ייתכן שפרטי מיקום המכשיר יישלחו לכוחות ההצלה."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"מידע נוסף על הגדרות המיקום"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"כדי להחליף עוברים אל ההגדרות של ChromeOS > \'פרטיות ואבטחה\' > \'אמצעי בקרה על פרטיות\' > \'גישה למיקום\'"</string>
@@ -383,7 +383,7 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"איך זה עובד"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"הפיצ\'ר \'ביטול הנעילה בטביעת אצבע\' יוצר תבנית ייחודית של טביעת האצבע שלך כדי לאמת את זהותך. תהליך היצירה של תבנית לטביעת האצבע כולל צילום תמונות של טביעת האצבע שלך מזוויות שונות."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"הפיצ\'ר \'ביטול הנעילה בטביעת אצבע\' יוצר תבנית ייחודית של טביעת האצבע של הילד או הילדה כדי לאמת את זהותם. כדי ליצור את התבנית הזו לטביעת האצבע במהלך ההגדרה, יהיה עליהם לצלם תמונות של טביעת האצבע מזוויות שונות."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"לקבלת התוצאות הטובות ביותר, כדאי להשתמש במגן מסך בעל אישור Made for Google. טביעת האצבע שלך עלולה לא לעבוד עם מגיני מסך אחרים."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"לקבלת התוצאות הטובות ביותר, כדאי להשתמש במגן מסך שקיבל אישור Made for Google. יכול להיות שטביעת האצבע שלך לא תעבוד עם מגני מסך אחרים."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"לקבלת התוצאות הטובות ביותר, כדאי להשתמש במגן מסך בעל אישור Made for Google. טביעת האצבע של הילד או הילדה עלולה לא לעבוד עם מגני מסך אחרים."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
<string name="security_settings_activeunlock_preference_title" msgid="4257580421087062228">"ביטול נעילה עם השעון"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"הפנים וה-<xliff:g id="WATCH">%s</xliff:g> נוספו"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"הפנים, טביעת האצבע וה-<xliff:g id="WATCH">%s</xliff:g> נוספו"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"הפנים, טביעות האצבע וה-<xliff:g id="WATCH">%s</xliff:g> נוספו"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"זה נחוץ כי בדיקת הזהות מופעלת"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"ביטול הנעילה של Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"נוסף שעון"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"הגדרת השעון"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"מידע נוסף על ביטול נעילה עם השעון"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"הוספת השעון"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"הסרת השעון"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ביטול הנעילה בטביעת אצבע ופתיחה ע\"י זיהוי הפנים"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"פתיחה ע\"י זיהוי הפנים וביטול הנעילה בטביעת אצבע"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"פתיחה ע\"י זיהוי הפנים וביטול הנעילה בטביעת אצבע בפרופיל העבודה"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"צריך להגדיר ביטול נעילה בעזרת מידע ביומטרי"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"נוספו טביעות אצבע וזיהוי פנים"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"התקנת אפליקציות"</b>\n"במרחב הפרטי אפשר להתקין אפליקציות שרוצים שיישארו פרטיות"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"חשוב לזכור"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"האפליקציות מפסיקות לפעול כשהמרחב הפרטי ננעל"</b>\n"כשנועלים את המרחב הפרטי, האפליקציות במרחב מפסיקות לפעול ולא נשלחות מהן התראות"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"מרחבים פרטיים לא מתאימים לאפליקציות שצריכות לפעול ברקע או לשלוח הודעות קריטיות, כמו אפליקציות רפואיות. הסיבה היא שההתראות והפעילות ברקע מופסקות כשהמרחב שלך נעול.\n\nהאפליקציות במרחב הפרטי שלך לא יופיעו בניהול ההרשאות, במרכז הבקרה להגדרות הפרטיות ובהגדרות אחרות כשהמרחב הפרטי שלך נעול.\n\nלא ניתן להעביר את המרחב הפרטי שלך למכשיר חדש. כדי להשתמש במרחב פרטי במכשיר אחר, צריך להגדיר מרחב פרטי חדש.\n\nכל אדם שיחבר את המכשיר שלך למחשב או יתקין אפליקציות מזיקות במכשיר שלך יוכל לגשת למרחב הפרטי שלך."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"מרחבים פרטיים לא מתאימים לאפליקציות שצריכות לפעול ברקע או לשלוח הודעות קריטיות, כמו אפליקציות רפואיות. הסיבה היא שההתראות והפעילות ברקע מופסקות כשהמרחב שלך נעול.\n\nהאפליקציות במרחב הפרטי שלך לא יופיעו בניהול ההרשאות, במרכז הבקרה להגדרות הפרטיות ובהגדרות אחרות כשהמרחב הפרטי נעול.\n\nלא ניתן לשחזר את המרחב הפרטי שלך במכשיר חדש. כדי להשתמש במרחב פרטי במכשיר אחר, צריך להגדיר מרחב חדש.\n\nכל אדם שיחבר את המכשיר שלך למחשב או יתקין אפליקציות זדוניות במכשיר שלך יוכל לגשת למרחב הפרטי שלך."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"מידע נוסף על המרחב הפרטי"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"הפעולה הזו תימשך כמה רגעים"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"הגדרת המרחב הפרטי מתבצעת…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"להפעיל את המכשיר מחדש?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"הרישום ביומן של פרטי NFC מיועד למטרות פיתוח בלבד. נתוני NFC נוספים נכללים בדוחות על באגים, שעשויים להכיל מידע פרטי. צריך להפעיל מחדש את המכשיר כדי לשנות את ההגדרה."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"הפעלה מחדש"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"שיקוף מסך, מסך חיצוני, מסך מחובר, תצוגת USB, רזולוציה, סיבוב"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"סיבוב"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"רגיל"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"בהירות המסך תותאם באופן אוטומטי לסביבה ולפעילויות שלך. עדיין אפשר לכוונן את הבהירות באופן ידני מפס ההזזה, וכך הבהירות האוטומטית תותאם עם הזמן להעדפות שלך."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"הצגת איזון לבן"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"שימוש במקלדת שמופיעה במסך"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"תישאר במסך בזמן שהמקלדת הפיזית פעילה"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"שינוי סגנון המילוי של המצביע לצהוב"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"שינוי סגנון המילוי של המצביע לוורוד"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"שינוי סגנון המילוי של המצביע לכחול"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"סגנון קו המצביע"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"לבן"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"שחור"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ללא"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"המשתמש שנבחר: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"דיבור"</string>
<string name="pointer_speed" msgid="7398649279282675718">"מהירות המצביע"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"גודל המצביע"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"הקטנת גודל המצביע"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"הגדלת גודל המצביע"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"בקר משחק"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"הפניה אוטומטית של רטט"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"שליחת רטט אל בקר משחק כשמחובר"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"אני רוצה להמשיך בכל זאת"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ביטול"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"הגדרות ההגדלה"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"הזזה עם אצבע אחת"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"מזיזים את זכוכית המגדלת עם אצבע אחת"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"גוררים אצבע אחת כדי לנוע על פני המסך"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"גוררים אצבע אחת כדי להזיז את אזור ההגדלה."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"גוררים שתי אצבעות כדי להזיז את אזור ההגדלה."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"לא זמין בזמן הגדלה של רק חלק מהמסך"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"הקשה על לחצן כדי לשנות את מרחק התצוגה"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"כדי לראות טוב יותר את התוכן, אפשר להגדיל במהירות את התצוגה"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>כדי להגדיל את התצוגה:</b><br/> {0,number,integer}. משתמשים בקיצור הדרך כדי להתחיל בהגדלה<br/> {1,number,integer}. מקישים על המסך<br/> {2,number,integer}. גוררים 2 אצבעות על המסך כדי לזוז בו<br/> {3,number,integer}. עושים תנועת צביטה באמצעות 2 אצבעות כדי לשנות את מרחק התצוגה<br/> {4,number,integer}. משתמשים בקיצור הדרך כדי להפסיק את ההגדלה<br/><br/> <b>כדי להגדיל את התצוגה באופן זמני:</b><br/> {0,number,integer}. מוודאים שסוג ההגדלה הוא \'מסך מלא\'<br/> {1,number,integer}. משתמשים בקיצור הדרך כדי להתחיל בהגדלה<br/> {2,number,integer}. לוחצים לחיצה ארוכה במקום כלשהו במסך<br/> {3,number,integer}. גוררים את האצבע על המסך כדי לזוז בו<br/> {4,number,integer}. כדי להפסיק את ההגדלה, מרימים את האצבע"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>כדי להגדיל את התצוגה:</b><br/> {0,number,integer}. משתמשים במקש קיצור כדי להתחיל בהגדלה<br/> {1,number,integer}. מקישים על המסך<br/> {2,number,integer}. גוררים 2 אצבעות על המסך כדי לזוז בו<br/> {3,number,integer}. עושים תנועת צביטה עם 2 אצבעות כדי לשנות את מרחק התצוגה<br/> {4,number,integer}. אפשר להשתמש במקש קיצור כדי לעצור את ההגדלה<br/><br/> ניתן גם להגדיל את התצוגה באופן זמני ועוד."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>כדי להגדיל את התצוגה:</b><br/> {0,number,integer}. משתמשים במקש קיצור כדי להתחיל בהגדלה<br/> {1,number,integer}. מקישים על המסך<br/> {2,number,integer}. גוררים אצבע אחת או שתיים על המסך כדי לזוז בו<br/> {3,number,integer}. עושים תנועת צביטה עם 2 אצבעות כדי לשנות את מרחק התצוגה<br/> {4,number,integer}. אפשר להשתמש במקש קיצור כדי לעצור את ההגדלה<br/><br/> ניתן גם להגדיל את התצוגה באופן זמני ועוד."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"כשההגדלה מופעלת, ניתן להתקרב למסך.\n\n"<b>"כדי להתקרב,"</b>", מתחילים בהגדלה ולאחר מכן מקישים במקום כלשהו במסך.\n"<ul><li>"גוררים שתי אצבעות או יותר כדי לגלול"</li>\n<li>"עושים תנועת צביטה עם שתי אצבעות או יותר כדי לשנות את מרחק התצוגה"</li></ul>\n\n<b>"כדי להתקרב באופן זמני"</b>", מתחילים בהגדלה ולאחר מכן, לוחצים לחיצה ארוכה במקום כלשהו במסך.\n"<ul><li>"גוררים כדי לנוע במסך"</li>\n<li>"מרימים את האצבע כדי להתרחק"</li></ul>\n\n"לא ניתן להתקרב באמצעות המקלדת או סרגל הניווט."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"דף <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> מתוך <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"קיצור דרך באמצעות לחצן הנגישות"</string>
@@ -2546,7 +2571,7 @@
<string name="battery_missing_link_message" msgid="6021565067124898074"></string>
<string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"יש להקיש לקבלת מידע נוסף על השגיאה הזו"</string>
<string name="power_screen" msgid="4596900105850963806">"מסך"</string>
- <string name="power_cpu" msgid="1820472721627148746">"(CPU) מעבד"</string>
+ <string name="power_cpu" msgid="1820472721627148746">"מעבד (CPU)"</string>
<string name="power_flashlight" msgid="8993388636332573202">"פנס"</string>
<string name="power_camera" msgid="4778315081581293923">"מצלמה"</string>
<string name="power_gps" msgid="6352380895542498164">"GPS"</string>
@@ -2706,7 +2731,7 @@
<string name="cellular_security_settings_title" msgid="7779141923670352595">"אבטחת הרשת הסלולרית"</string>
<string name="cellular_security_notifications" msgid="4619728340612184944">"התראות"</string>
<string name="cellular_security_notifications_controller_title" msgid="4853056963523277847">"התראות רשת"</string>
- <string name="cellular_security_notifications_controller_summary" msgid="8339863845393759958">"קבלת התראה כשהמכשיר מתחבר לרשת לא מוצפנת, או כשרשת מתעדת את המכשיר או מזהה כרטיס ה-SIM הייחודי שלך"</string>
+ <string name="cellular_security_notifications_controller_summary" msgid="8339863845393759958">"קבלת התראה כשהמכשיר מתחבר לרשת לא מוצפנת, או כשרשת מתעדת את המזהה הייחודי של המכשיר או של כרטיס ה-SIM"</string>
<string name="cellular_security_settings_encryption_title" msgid="4013084091666375780">"הצפנה"</string>
<string name="cellular_security_network_generations_title" msgid="2343026988833783854">"דורות של רשתות"</string>
<string name="cellular_security_network_generations_summary" msgid="139087814553929402">"אפשר לקבוע שכל כרטיס SIM שהותקן יתחבר רק לרשתות שתומכות ב-3G, ב-4G וב-5G. כרטיס ה-SIM לא יתחבר לרשתות 2G ישנות ולא מאובטחות. ההגדרה הזו עשויה להגביל את הקישוריות במקרה שהרשת הזמינה היחידה היא 2G. במקרה חירום, ניתן להשתמש ברשת 2G."</string>
@@ -2848,7 +2873,7 @@
<string name="data_usage_label_foreground" msgid="8782117644558473624">"בחזית"</string>
<string name="data_usage_label_background" msgid="8862781660427421859">"ברקע"</string>
<string name="data_usage_app_restricted" msgid="312065316274378518">"מוגבל"</string>
- <string name="data_usage_disable_mobile" msgid="6183809500102606801">"לכבות את חבילת הגלישה?"</string>
+ <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>
@@ -2986,7 +3011,7 @@
<string name="user_summary_not_set_up" msgid="4602868481732886115">"לא מוגדר"</string>
<string name="user_summary_restricted_not_set_up" msgid="1658946988920104613">"לא מוגדר – פרופיל מוגבל"</string>
<string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"לא מוגדר – פרופיל עבודה"</string>
- <string name="user_owner" msgid="2079206733011361994">"בעלים"</string>
+ <string name="user_owner" msgid="2079206733011361994">"בעלי המכשיר"</string>
<string name="user_admin" msgid="4024553191395768119">"אדמין"</string>
<string name="user_you" msgid="3070562015202859996">"את/ה (<xliff:g id="NAME">%s</xliff:g>)"</string>
<string name="user_add_max_count" msgid="3328539978480663740">"לא ניתן להוסיף עוד משתמשים. צריך להסיר משתמש כדי להוסיף משתמש חדש."</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{אין}=1{הוגדר לוח זמנים אחד}one{הוגדרו # לוחות זמנים}two{הוגדרו # לוחות זמנים}other{הוגדרו # לוחות זמנים}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"נא לא להפריע"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"מצבי עדיפות"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"הוספת מצב"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"קבלת התראות רק מאפליקציות ומאנשים חשובים"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"בחירת סוג ההפעלה"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"שעה"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"לדוגמה: \"21:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"יומן"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"לדוגמה: \"יומן אישי\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"יצירה של מצב"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"בהתאמה אישית"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"הגבלת הפרעות"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"הפעלת מצב \'נא לא להפריע\'"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"שעונים מעוררים וצלילי מדיה יכולים להפריע"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"לוחות זמנים"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"מחיקת לוחות זמנים"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"מחיקה"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"שינוי השם"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"מחיקה"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"למחוק את מצב \'<xliff:g id="MODE">%1$s</xliff:g>\'?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"עריכה"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"לוחות זמנים"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"לוח זמנים"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"הוספת יומן"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"שימוש ביומן"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"לוח זמנים"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"הגדרת לוח זמנים"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"לוח זמנים"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> שע\', <xliff:g id="MINUTES">%2$d</xliff:g> דק\'"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"הפעלה אוטומטית"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"לוח זמנים"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"השתקת הטלפון בזמנים מסוימים"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"הגדרת כללים ל\'נא לא להפריע\'"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"אישור להפרעות עם צלילים"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"חסימת הפרעות חזותיות"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"הפעלת אותות חזותיים"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"התראות שיכולות להגיע אליך"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"שמירה על ריכוז"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"פעולות נוספות"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{מושבת}=1{מושבת/יכולה להתבצע הפעלה אוטומטית בעקבות מצב אחד}one{מושבת/יכולה להתבצע הפעלה אוטומטית בעקבות # מצבים}two{מושבת/יכולה להתבצע הפעלה אוטומטית בעקבות # מצבים}other{מושבת/יכולה להתבצע הפעלה אוטומטית בעקבות # מצבים}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"הגדרות תצוגה"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"אפשרויות תצוגה"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"גווני אפור"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"הפעלת העיצוב הכהה"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"במערכת ההפעלה ובאפליקציות, כדאי להחליף להעדפה של טקסט בהיר על רקע כהה. העיצוב הזה פחות מאמץ את העיניים ומוביל לחיסכון משמעותי בסוללה במכשירים מסוימים"</string>
<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}}one{{effect_1}, {effect_2} ועוד #}other{{effect_1}, {effect_2} ועוד #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"סינון של הפרעות"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ללא סינון של הפרעות"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"פתיחת ההתראה"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"הפעלת האפשרות להעביר התראות למצב \'נודניק\'"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"סימן ההתראות בסמל האפליקציה"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"חבילות התראות"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"בועות"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"בועות"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"הוספת בועה לשיחה"</string>
@@ -3522,9 +3563,9 @@
<string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"הצגת תוכן רגיש כשהמכשיר נעול"</string>
<string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"התראות רגישות מפרופיל העבודה"</string>
<string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"הצגת תוכן רגיש מפרופיל העבודה כשהמכשיר נעול"</string>
- <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"הצגת תוכן ההתראות במלואו"</string>
- <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"הצגת תוכן רגיש רק כשהמכשיר לא נעול"</string>
- <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"לא להציג התראות בכלל"</string>
+ <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"תוכן ההתראות יוצג במלואו"</string>
+ <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"לא יוצג תוכן רגיש במסך הנעילה"</string>
+ <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"לא יוצגו התראות בכלל"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6326229471276829730">"מה היית רוצה שיוצג במסך הנעילה?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"מסך נעילה"</string>
<string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"הצגת כל התוכן של התראות מהעבודה"</string>
@@ -3576,7 +3617,7 @@
<string name="notifications_sent_daily" msgid="10274479224185437">"{count,plural, =1{כהתראה אחת (#) ליום}one{כ-# התראות ליום}two{כ-# התראות ליום}other{כ-# התראות ליום}}"</string>
<string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{כהתראה אחת (#) לשבוע}one{כ-# התראות לשבוע}two{כ-# התראות לשבוע}other{כ-# התראות לשבוע}}"</string>
<string name="notifications_sent_never" msgid="9081278709126812062">"אף פעם"</string>
- <string name="manage_notification_access_title" msgid="4154723216570646451">"שליטה בקריאת ההתראות והשבה להן"</string>
+ <string name="manage_notification_access_title" msgid="4154723216570646451">"הגדרת התראות"</string>
<string name="manage_notification_access_summary" msgid="2907135226478903997">"לאילו אפליקציות ומכשירים תהיה אפשרות לקרוא התראות"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"הגישה חסומה להתראות של פרופיל העבודה"</string>
<string name="notification_assistant_title" msgid="5889201903272393099">"התראות משופרות"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"האפליקציה הזו לא תומכת בהגדרות המשופרות"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"הגדרות נוספות"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"הגדרות נוספות זמינות בתוך האפליקציה הזו"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"הפוגת התראות"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"הפעלה בפרופילי העבודה"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"הפעלה באפליקציות של פרופיל העבודה"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"קטגוריות"</string>
<string name="notification_channels_other" msgid="18159805343647908">"אחר"</string>
<string name="no_channels" msgid="4716199078612071915">"האפליקציה הזו לא שלחה התראות"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"הצגת קטגוריות שלא בשימוש"</string>
<string name="app_settings_link" msgid="6725453466705333311">"הגדרות נוספות באפליקציה"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"הצגת קטגוריות שלא בשימוש"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"הסתרת קטגוריות שלא בשימוש"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"אפליקציות שיכולות להפריע"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"אפליקציות שנבחרו"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"אף אחת מהאפשרויות"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"הכול"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ניתן לאפשר לאפליקציות לבטל הגדרה זו"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"אפליקציות שיכולות להפריע"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"בחירת אפליקציות נוספות"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"שום דבר לא יכול להפריע"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"אף אחד לא יכול להפריע"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"אנשים מסוימים יכולים להפריע"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"כל אחד יכול להפריע"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"מתקשרים חוזרים"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"שיחות חוזרות מאותו מספר"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{החלפה למצב \'התראות בלבד\' למשך שעה אחת עד {time}}one{החלפה למצב \'התראות בלבד\' למשך # שעות עד {time}}two{החלפה למצב \'התראות בלבד\' למשך שעתיים (#) עד {time}}other{החלפה למצב \'התראות בלבד\' למשך # שעות עד {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"מעבר למצב \'התראות בלבד\' עד <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"שינוי ל\'הפרעות בכל מצב\'"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"מצב עריכה"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"הוספת מצב"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"מצב מותאם אישית"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"שם המצב"</string>
<string name="warning_button_text" msgid="1274234338874005639">"אזהרה"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"סגירה"</string>
<string name="device_feedback" msgid="5351614458411688608">"שליחת משוב על המכשיר הזה"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"אילוץ מצב שולחן עבודה"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"אילוץ מצב שולחן עבודה ניסיוני במסכים משניים"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"הפעלת האפשרות לשנות את הגודל והמיקום של החלונות"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"הפעלת תמיכה בשינוי הגודל והמיקום של החלונות."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"הפעלת שינוי הגודל והמיקום של החלונות במסך השני"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"הפעלת שינוי הגודל והמיקום של החלונות רק במסך השני."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"הפעלת אפליקציות שלא ניתן לשנות את גודלן בריבוי חלונות"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ההגדרה מאפשרת להפעיל בריבוי חלונות אפליקציות שלא ניתן לשנות את גודלן"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"שינוי התכונה SmartDark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"צריך להמיר את מחיצת הנתונים של המכשיר הזה ל-ext4 לפני השימוש באפשרות למפתחים של 16KB. לא ניתן להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. לאחר הפעלת האפשרות של 16KB תידרש הפעלה נוספת מחדש. מהמצב הזה, אפשר לעבור בין מצב 4KB למצב 16KB בהפעלה אחת מחדש. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להחזיר את המכשיר למצב ייצור, עליך לחזור למצב 4KB ולנעול את תוכנת האתחול. המכשיר יאופס להגדרות המקוריות. אחרי שהמכשיר מאותחל ל-Android, צריך להשבית את מצב OEM באפשרויות למפתחים. לאחר האישור, הנתונים במכשיר יאופסו ומערכת הקבצים תשתנה ל-ext4. לאחר השלמת הפעולה הזו, צריך לחזור כדי להפעיל את מצב 16KB שוב."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"מחיקת כל הנתונים"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"הניסיון לפרמט מחדש את המכשיר ולאפס את מחיצת הנתונים ל-ext4 נכשל."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"נדרש ביטול נעילה של תוכנת האתחול למצב 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"צריך לבטל את הנעילה של תוכנת האתחול"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"לפני השימוש באפשרות למפתחים של 16KB, צריך לבטל את הנעילה של תוכנת האתחול במכשיר הזה. לא ניתן להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. כל נתוני המשתמש וההגדרות יאופסו בהפעלת מצב 16KB. לאחר ביטול הנעילה של תוכנת האתחול יידרשו שתי הפעלות מחדש כדי שמצב 16KB ייכנס לתוקף. מהמצב הזה, אפשר לעבור בין מצב 4KB למצב 16KB בהפעלה אחת מחדש. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להחזיר את המכשיר למצב ייצור, צריך לחזור למצב 4KB ואז לנעול את תוכנת האתחול או את מצב ה-OEM של המכשיר (המכשיר יאופס להגדרות המקוריות). צריך לבטל את הנעילה של תוכנת האתחול ולנסות שוב. הוראות לביצוע הפעולה זמינות בכתובת <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
- <string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"שימוש במצב לא מותאם לדף של 4KB"</string>
- <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"הפעילות שלך מתרחשת במצב לא מותאם לדף של 4KB. לא ניתן להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להיכנס שוב למצב ייצור, עליך לנעול את תוכנת האתחול של המכשיר. אפשר להקיש כדי לקרוא עוד."</string>
- <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"הפעילות שלך מתרחשת במצב 4KB השייך למצב שבו גודל הדף לא נקבע מראש על ידי מערכת ההפעלה. לא ניתן להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להיכנס שוב למצב ייצור, עליך לנעול את תוכנת האתחול של המכשיר. הפעולה הזו תאפס שוב את המכשיר להגדרות המקוריות ותשחזר את הגדרות הייצור. אחרי שהמכשיר מאותחל ל-Android, צריך להשבית את מצב OEM באפשרויות למפתחים. אם לא ניתן לאתחל את המכשיר ל-Android או שהוא לא יציב, צריך לעדכן במכשיר את גיבויי הקושחה בכתובת <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> או להשתמש ב-<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ולבחור באפשרות \'איפוס נתונים במכשיר\' > \'נעילת תוכנת האתחול\' > \'כפיית עדכון על כל המחיצות\'."</string>
- <string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"שימוש במצב מותאם לדף של 16KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"הפעילות שלך מתרחשת במצב לא מותאם לדף של 16KB. לא ניתן להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להיכנס שוב למצב ייצור, עליך לחזור למצב 4K ואז לנעול את תוכנת האתחול של המכשיר. אפשר להקיש כדי לקרוא עוד."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"מצב העבודה הנוכחי שלך הוא 16KB של מצב עבודה לא מותאם. אי אפשר להבטיח את תקינות התוכנה במצב הזה. כל הנתונים שמאוחסנים בטלפון בזמן שתוכנת האתחול לא נעולה עלולים להיות בסיכון. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להיכנס שוב למצב ייצור, עליך לחזור למצב 4K ואז לנעול את תוכנת האתחול של המכשיר. הפעולה הזו תאפס שוב את המכשיר להגדרות המקוריות ותשחזר את הגדרות הייצור. אחרי שהמכשיר מאותחל ל-Android, צריך להשבית את מצב OEM באפשרויות למפתחים. אם לא ניתן לאתחל את המכשיר ל-Android או שהוא לא יציב, צריך לעדכן במכשיר את גיבויי הקושחה בכתובת <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> או להשתמש ב-<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ולבחור באפשרות \'איפוס נתונים במכשיר\' > \'נעילת תוכנת האתחול\' > \'כפיית עדכון על כל המחיצות\'."</string>
+ <string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"מצב שמסתגל לגודל הדף: 4KB"</string>
+ <string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"המכשיר נמצא במצב שמסתגל לגודל הדף, והגודל הנוכחי הוא 4KB. במצב הזה, תקינות התוכנה לא מובטחת. כל הנתונים שמאוחסנים בטלפון נמצאים בסיכון בזמן שתוכנת האתחול לא נעולה. חלק מהתכונות מושבתות במצב כזה, ולכן יש אפליקציות שלא יעבדו. כדי לחזור למצב ייצור, צריך לנעול את תוכנת האתחול של המכשיר. אפשר להקיש כדי לקרוא עוד."</string>
+ <string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"המכשיר נמצא במצב שמסתגל לגודל הדף, והגודל הנוכחי הוא 4KB. במצב הזה, תקינות התוכנה לא מובטחת. כל הנתונים שמאוחסנים בטלפון נמצאים בסיכון בזמן שתוכנת האתחול לא נעולה. חלק מהתכונות מושבתות במצב כזה, ולכן יש אפליקציות שלא יעבדו. כדי לחזור למצב ייצור, צריך לנעול את תוכנת האתחול של המכשיר. הפעולה הזו תחזיר את המכשיר למצב מאופס, עם ההגדרות הייצור המקוריות. אחרי שהמכשיר יאותחל ומערכת Android תיטען כראוי, עליך להשבית את האפשרות \'ביטול נעילה של OEM\' בדף \'אפשרויות למפתחים\'. אם אתחול המכשיר נכשל ומערכת Android לא נטענת כראוי, או שהמכשיר לא מתפקד ביציבות, צריך לבצע התקנת ROM של קובצי האימג\' העדכניים של הקושחה המקורית. כדי לעשות את זה, עוברים לכתובת <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> או משתמשים ב-<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ובוחרים באפשרות \'איפוס נתונים במכשיר\' > \'נעילת תוכנת האתחול\' > \'כפיית עדכון על כל המחיצות\'."</string>
+ <string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"מצב שמסתגל לגודל הדף: 16KB"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"הפעילות שלך מתרחשת במצב שמסתגל לגודל דף של 16KB. לא בטוח שהתוכנה תעבוד כראוי במצב הזה, וכל הנתונים שמאוחסנים בטלפון עלולים להיות בסיכון בזמן שתוכנת האתחול לא נעולה. חלק מהתכונות יושבתו במצבים האלה, כך שחלק מהאפליקציות לא יפעלו. כדי להיכנס שוב למצב ייצור, עליך לחזור למצב 4KB ואז לנעול את תוכנת האתחול של המכשיר. אפשר להקיש כדי לקרוא עוד."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"המכשיר נמצא במצב שמסתגל לגודל הדף, והגודל הנוכחי הוא 16KB. במצב הזה, תקינות התוכנה לא מובטחת. כל הנתונים שמאוחסנים בטלפון נמצאים בסיכון בזמן שתוכנת האתחול לא נעולה. חלק מהתכונות מושבתות במצב כזה, ולכן יש אפליקציות שלא יעבדו. כדי לחזור למצב ייצור, צריך לחזור למצב 4KB לנעול את תוכנת האתחול של המכשיר. הפעולה הזו תחזיר את המכשיר למצב מאופס, עם ההגדרות הייצור המקוריות. אחרי שהמכשיר יאותחל ומערכת Android תיטען כראוי, עליך להשבית את האפשרות \'ביטול נעילה של OEM\' בדף \'אפשרויות למפתחים\'. אם אתחול המכשיר נכשל ומערכת Android לא נטענת כראוי, או שהמכשיר לא מתפקד ביציבות, צריך לבצע התקנת ROM של קובצי האימג\' העדכניים של הקושחה המקורית. כדי לעשות את זה, עוברים לכתובת <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> או משתמשים ב-<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ובוחרים באפשרות \'איפוס נתונים במכשיר\' > \'נעילת תוכנת האתחול\' > \'כפיית עדכון על כל המחיצות\'."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"מצב לא מותאם לדף של 16KB"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"עוד פרטים"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"טיפול בדוחות על באגים"</string>
@@ -4984,8 +5031,8 @@
<string name="mobile_data_temp_using" msgid="5211002380149434155">"עושה שימוש זמני ב<xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
<string name="mobile_data_no_connection" msgid="905897142426974030">"אין חיבור"</string>
<string name="mobile_data_off_summary" msgid="1884248776904165539">"אין חיבור אוטו\' לחבילת הגלישה"</string>
- <string name="mobile_data_disable_title" msgid="8438714772256088913">"לכבות את חבילת הגלישה?"</string>
- <string name="mobile_data_disable_message" msgid="7829414836454769970">"לא תהיה לך גישה לנתונים או לאינטרנט באמצעות <xliff:g id="CARRIER">%s</xliff:g>. אינטרנט יהיה זמין רק באמצעות Wi-Fi."</string>
+ <string name="mobile_data_disable_title" msgid="8438714772256088913">"לכבות את השימוש בחבילת הגלישה?"</string>
+ <string name="mobile_data_disable_message" msgid="7829414836454769970">"לא תהיה לך גישה לנתונים או לאינטרנט דרך <xliff:g id="CARRIER">%s</xliff:g>. אפשר יהיה לגשת לאינטרנט רק דרך Wi-Fi."</string>
<string name="mobile_data_disable_message_default_carrier" msgid="4449469407705838612">"הספק שלך"</string>
<string name="not_allowed_by_ent" msgid="1958611623122304411">"הארגון שלך לא מתיר את האפשרות הזו"</string>
<string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"אינו זמין כאשר מצב שינה מופעל"</string>
@@ -4998,7 +5045,7 @@
<string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"להעניק גישה לאנשי הקשר וליומן השיחות?"</string>
<string name="bluetooth_phonebook_access_dialog_content" msgid="959658135522249170">"מכשיר Bluetooth, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, מבקש לקבל גישה לאנשי הקשר וליומן השיחות. הגישה תכלול גם נתונים על שיחות נכנסות ויוצאות.\n\nלא התחברת בעבר למכשיר <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
<string name="category_name_brightness" msgid="8520372392029305084">"בהירות"</string>
- <string name="category_name_lock_display" msgid="8310402558217129670">"מסך נעילה"</string>
+ <string name="category_name_lock_display" msgid="8310402558217129670">"תצוגת מסך נעילה"</string>
<string name="category_name_appearance" msgid="8287486771764166805">"מראה"</string>
<string name="category_name_color" msgid="937514550918977151">"צבע"</string>
<string name="category_name_display_controls" msgid="7046581691184725216">"הגדרות תצוגה נוספות"</string>
@@ -5010,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"שימוש בהצמדת אפליקציה"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"שימוש באפשרויות למפתחים"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"שימוש בשירות הדפסה"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"הרשאה למשתמשים מרובים"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"אישור החלפת המשתמש"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"אפשר, משתמשים, מרובים, אישור, רבים"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ריבוי, רבים, משתמשים, משתמשות, פרופילים, אנשים, אנשי קשר, חשבונות, חשבונות אישיים, החלפה, מעבר, שינוי, הרבה"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ניפוי באגים אלחוטי"</string>
@@ -5036,7 +5083,7 @@
<string name="enable_2g_summary" msgid="2794534052372565914">"רמת האבטחה של רשתות 2G נמוכה יותר, אבל הן עשויות לשפר את החיבור שלך במיקומים מסוימים. לרשתות 2G תמיד ניתנת הרשאה כשצריך לבצע שיחות חירום."</string>
<string name="enable_2g_summary_disabled_carrier" msgid="8141118453219482762">"לצורך זמינות ב-<xliff:g id="CARRIER_NAME_2G">%1$s</xliff:g> נדרשת רשת 2G"</string>
<string name="require_cellular_encryption_title" msgid="6087085031703089235">"מתן הרשאה לרשתות מוצפנות בלבד"</string>
- <string name="require_cellular_encryption_summary" msgid="6090569065420631457">"הפעולה הזו מאובטחת יותר אך עשויה להגביל את החיבור שלך לרשת הסלולרית במקומות מסוימים. תמיד אפשר לבצע שיחת חירום."</string>
+ <string name="require_cellular_encryption_summary" msgid="6090569065420631457">"ההגדרה הזו מאובטחת יותר אבל היא עלולה להוביל לבעיות קליטה במקומות מסוימים. תמיד אפשר לבצע שיחת חירום."</string>
<string name="app_info_all_services_label" msgid="1487070364839071105">"כל השירותים"</string>
<string name="show_clip_access_notification" msgid="7782300987639778542">"הצגת גישה ללוח העריכה"</string>
<string name="show_clip_access_notification_summary" msgid="474090757777203207">"הצגת הודעה בזמן גישה של אפליקציות לטקסט, לתמונות או לכל תוכן אחר שהעתקת"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"אפשר לבחור מה יוצג במסך כשהטאבלט בעגינה. יכול להיות שהמכשיר ינצל יותר אנרגיה בזמן השימוש בשומר מסך."</string>
<string name="customize_button_title" msgid="1110284655990203359">"התאמה אישית"</string>
<string name="customize_button_description" msgid="7440248477266126231">"התאמה אישית של <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"צריך להפעיל מחדש כדי להפעיל את התמיכה במצב החופשי."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"צריך להפעיל מחדש כדי לאלץ את הצגת הגרסה למחשב במסכים המשניים."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"צריך להפעיל מחדש כדי להפעיל תמיכה בשינוי הגודל והמיקום של החלונות מדור קודם."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"צריך להפעיל מחדש כדי לשנות את התמיכה בשינוי הגודל והמיקום של החלונות."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"צריך להפעיל מחדש כדי לאלץ את שינוי הגודל והמיקום של החלונות רק במסך השני."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"להפעיל מחדש עכשיו"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"להפעיל מחדש מאוחר יותר"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"אודיו מרחבי"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"מופעלת"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"מושבתות"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"מופעלות"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"אודיו %1$d%% משמאל, %2$d%% מימין"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"אודיו %1$d%% מימין, %2$d%% משמאל"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"המכשיר שלך גלוי לאפליקציות שהתקנת. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth, לרשת Wi-Fi, או בהגדרת נקודת Wi-Fi לשיתוף אינטרנט."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"לשון הפנייה"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"בחירת לשון הפנייה"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"חיפוש הגדרות"</string>
</resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index ceafd68..118104f 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"就寝"</item>
+ <item msgid="4152450357280759894">"運転中"</item>
+ <item msgid="7096549258219399423">"臨場感"</item>
+ <item msgid="2760716776980432977">"管理対象"</item>
+ <item msgid="601734478369121764">"スター"</item>
+ <item msgid="6243809315432780521">"カレンダー"</item>
+ <item msgid="4913577903148415331">"時刻"</item>
+ <item msgid="3653377604690057780">"劇場"</item>
+ <item msgid="3843711267408385410">"花"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index de14686..0b94618 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"デバイスの接続を解除しますか？"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"新しいデバイスとペア設定"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明日自動的に 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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"補聴器の設定"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ショートカット、補聴器両立性"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"プリセット"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"言語聴覚士によってプログラムされたプリセットはありません"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"プリセットを更新できませんでした"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音声出力"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"音声出力について"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"OFF"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ON / # 個のアプリに位置情報へのアクセスを許可}other{ON / # 個のアプリに位置情報へのアクセスを許可}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"読み込んでいます…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"付近のデバイスへのアクセス許可を持つアプリは、接続されたデバイスの相対位置を確認できます。"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"付近のデバイスへのアクセス許可を持つアプリは、接続されたデバイスの相対位置を確認できます。"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"アプリとサービスの位置情報へのアクセスは OFF になっています。緊急通報番号に電話をかけたりテキスト メッセージを送信したりした場合は、デバイスの位置情報が緊急サービスに送信されることがあります。"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"位置情報の設定の詳細"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"変更するには ChromeOS の [設定] > [プライバシーとセキュリティ] > [プライバシー管理] > [位置情報へのアクセス] に移動します"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"顔、<xliff:g id="WATCH">%s</xliff:g>を登録しました"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"顔、指紋、<xliff:g id="WATCH">%s</xliff:g>を登録しました"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"顔、指紋、<xliff:g id="WATCH">%s</xliff:g>を登録しました"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"本人確認が ON になっているため、これが必要です"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"リモート認証のロック解除"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"スマートウォッチを追加しました"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"スマートウォッチのセットアップ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ウォッチ認証の詳細"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"スマートウォッチを追加"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"スマートウォッチを削除"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"指紋認証と顔認証"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"顔認証と指紋認証"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"仕事用の顔認証と指紋認証"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"セットアップが必要です"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"顔と指紋を登録しました"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"アプリをインストールする"</b>\n"スペース内で非公開にするアプリをインストールします"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"注意事項"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"スペースをロックするとアプリが停止する"</b>\n"スペースをロックするとアプリが停止して、アプリからの通知が届かなくなります"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"プライベート スペースは、バックグラウンドでの実行や重要な通知の送信が必要なアプリ（医療アプリなど）には適していません。その理由は、スペースがロックされている場合、通知とバックグラウンド アクティビティが停止するためです。\n\nプライベート スペースがロックされている場合、プライベート スペース内のアプリは権限マネージャ、プライバシー ダッシュボード、その他の設定に表示されません。\n\nプライベート スペースを新しいデバイスに移動することはできません。別のデバイスで使用したい場合は、別のプライベート スペースを設定する必要があります。\n\n誰かがあなたのデバイスをパソコンに接続したり、あなたのデバイスに有害なアプリをインストールしたりすると、そのユーザーもあなたのプライベート スペースにアクセスできる可能性があります。"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"プライベート スペースは、バックグラウンドでの実行や重要な通知の送信が必要なアプリ（医療アプリなど）には適していません。その理由は、スペースがロックされている場合、通知とバックグラウンド アクティビティが停止するためです。\n\nプライベート スペースがロックされている場合、プライベート スペース内のアプリは権限マネージャ、プライバシー ダッシュボード、その他の設定に表示されません。\n\nプライベート スペースを新しいデバイスに復元することはできません。別のデバイスで使用したい場合は、別のスペースを設定する必要があります。\n\n誰かがあなたのデバイスをパソコンに接続したり、あなたのデバイスに悪意のあるアプリをインストールしたりすると、そのユーザーもあなたのプライベート スペースにアクセスできる可能性があります。"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"プライベート スペースの詳細"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"しばらくお待ちください"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"プライベート スペースを設定しています…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"デバイスを再起動しますか？"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC 詳細ログは開発専用に設計されています。バグレポートには、追加の NFC データが含まれます。これには、非公開の情報が含まれることがあります。この設定を変更するには、デバイスを再起動してください。"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"再起動"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ミラーリング, 外部ディスプレイ, ディスプレイの接続, USB ディスプレイ, 解像度, 回転"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"回転"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"標準"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"画面キーボードを使用"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"物理キーボードが有効になっていても画面に表示させます"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ポインターの塗りつぶしを黄色に変更"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ポインターの塗りつぶしを桃色に変更"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ポインターの塗りつぶしを青色に変更"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"ポインターのストローク スタイル"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"白"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"黒"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"なし"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ユーザーによる選択: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"読み上げ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ポインタの速度"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ポインタのスケール"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ポインタのスケールを小さくする"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"ポインタのスケールを大きくする"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ゲーム用コントローラ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"リダイレクトのバイブレーション"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"接続時にバイブレーションをゲーム用コントローラに送信"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"無視して続行"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"キャンセル"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"画面の拡大設定"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"指 1 本でのパン操作"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 本の指で拡大鏡を移動"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"1 本の指でドラッグして画面上を移動"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"1 本の指でドラッグして拡大領域を移動します。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"2 本の指でドラッグして拡大領域を移動します。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"画面の一部のみを拡大している間は利用できません"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ボタンをタップしてズームします"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"画面をすばやくズームインして、コンテンツを拡大できます"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ズームインするには:</b><br/> {0,number,integer}. ショートカットを使って拡大を開始します<br/> {1,number,integer}. 画面をタップします<br/> {2,number,integer}. 2 本の指でドラッグして画面上を移動します<br/> {3,number,integer}. 2 本の指でピンチ操作してズームを調整します<br/> {4,number,integer}. ショートカットを使って拡大を停止します<br/><br/> <b>一時的にズームインするには:</b><br/> {0,number,integer}. 拡大の種類が全画面に設定されていることを確認します<br/> {1,number,integer}. ショートカットを使って拡大を開始します<br/> {2,number,integer}. 画面を長押しします<br/> {3,number,integer}. 指をドラッグして画面上を移動します<br/> {4,number,integer}. 指を離して拡大を停止します"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ズームインするには:</b><br/> {0,number,integer}. ショートカットを使って拡大を開始します<br/> {1,number,integer}. 画面をタップします<br/> {2,number,integer}. 2 本の指でドラッグして画面上を移動します<br/> {3,number,integer}. 2 本の指でピンチ操作してズームを調整します<br/> {4,number,integer}. ショートカットを使って拡大を停止します<br/><br/> 一時的にズームインするなどの操作もできます。"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ズームインするには:</b><br/> {0,number,integer}. ショートカットを使って拡大を開始します<br/> {1,number,integer}. 画面をタップします<br/> {2,number,integer}. 1 本または 2 本の指でドラッグして画面上を移動します<br/> {3,number,integer}. 2 本の指でピンチ操作してズームを調整します<br/> {4,number,integer}. ショートカットを使って拡大を停止します<br/><br/> 一時的にズームインするなどの操作もできます。"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"[拡大] を ON にすると、画面で拡大操作を行えます。\n\n"<b>"ズーム"</b>"するには、[拡大] を ON にして画面をタップします。\n"<ul><li>"2 本以上の指をドラッグしてスクロール"</li>\n<li>"2 本以上の指でピンチ操作して拡大率を調節"</li></ul>\n\n<b>"一時的にズーム"</b>"するには、[拡大] を ON にして画面を長押しします。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大操作は行えません。"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g> ページ目"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ユーザー補助機能ボタンのショートカット"</string>
@@ -2706,7 +2731,7 @@
<string name="cellular_security_settings_title" msgid="7779141923670352595">"モバイル ネットワーク セキュリティ"</string>
<string name="cellular_security_notifications" msgid="4619728340612184944">"通知"</string>
<string name="cellular_security_notifications_controller_title" msgid="4853056963523277847">"ネットワークに関する通知"</string>
- <string name="cellular_security_notifications_controller_summary" msgid="8339863845393759958">"デバイスが暗号化されていないネットワークに接続された場合や、ネットワークで一意のデバイス ID や SIM ID が記録された場合に、お知らせします"</string>
+ <string name="cellular_security_notifications_controller_summary" msgid="8339863845393759958">"デバイスが暗号化されていないネットワークに接続された場合や、一意のデバイス ID や SIM ID がネットワークで記録された場合に、お知らせします"</string>
<string name="cellular_security_settings_encryption_title" msgid="4013084091666375780">"暗号化"</string>
<string name="cellular_security_network_generations_title" msgid="2343026988833783854">"ネットワークの世代"</string>
<string name="cellular_security_network_generations_summary" msgid="139087814553929402">"挿入した SIM カードごとに、3G、4G、5G 対応のネットワークにのみ接続するように設定できます。旧式の安全でない 2G ネットワークには接続できなくなります。この設定により、2G ネットワークしか利用できない場合に接続が制限されることがあります。緊急の場合は 2G が使用されることがあります。"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{なし}=1{1 件のスケジュールが有効}other{# 件のスケジュールが有効}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"サイレント モード"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"優先モード"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"モードを追加する"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"大切な人やアプリからの通知のみ受け取ります"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"有効化の種類を選択する"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"時刻"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"例: 「9 時 30 分～午後 5 時」"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"カレンダー"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"例: 「個人用のカレンダー」"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"モードの作成"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"カスタム"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"割り込みを制限する"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"サイレント モードを ON にする"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"アラームとメディア サウンドが割り込み可能"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"スケジュール"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"スケジュールを削除"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"削除"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"名前を変更"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"削除"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"「<xliff:g id="MODE">%1$s</xliff:g>」を削除しますか？"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"編集"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"スケジュール"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"スケジュール"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"カレンダーの追加"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"カレンダーを使用する"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"スケジュール"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"スケジュールを設定してください"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"スケジュールを設定"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> 時間 <xliff:g id="MINUTES">%2$d</xliff:g> 分"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"自動的に ON"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"スケジュール"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"一時的にスマートフォンを消音"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"サイレント モード ルールの設定"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"音が出る割り込みの許可"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"視覚的な通知のブロック"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"視覚的な割り込みを許可"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"確認できる通知"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"集中しましょう"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"その他の操作"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{OFF}=1{OFF / 1 件のモードを自動的に ON にできます}other{OFF / # 件のモードを自動的に ON にできます}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"表示の設定"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"表示オプション"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"グレースケール"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ダークモードを有効にする"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"暗い背景に明るいテキストを表示するよう OS やアプリを切り替えると、見やすくなることがあり、デバイスによってはバッテリーの大幅な節約につながります"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"割り込みをフィルタする"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"フィルタしている割り込みはありません"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"フィルタした通知の表示オプション"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"サイレント モードが ON のとき"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"通知音なし"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"通知を開く"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"通知のスヌーズを許可する"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"アプリアイコン上の通知ドット"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"通知バンドル"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"バブル"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"バブル"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"この会話をバブルで表示"</string>
@@ -3604,7 +3645,7 @@
<string name="notif_type_alerting" msgid="4713073696855718576">"通知"</string>
<string name="notif_type_alerting_summary" msgid="4681068287836313604">"スマートフォンの設定を基に着信音またはバイブレーションが有効になります"</string>
<string name="notif_type_silent" msgid="6273951794420331010">"消音"</string>
- <string name="notif_type_silent_summary" msgid="7820923063105060844">"通知があっても、着信音やバイブレーションは発生しません"</string>
+ <string name="notif_type_silent_summary" msgid="7820923063105060844">"通知があっても、着信音は鳴らず、バイブレーションも作動しません"</string>
<string name="notification_listener_allowed" msgid="5536962633536318551">"許可されているアプリ"</string>
<string name="notification_listener_not_allowed" msgid="3352962779597846538">"許可されてないアプリ"</string>
<string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"アプリをすべて表示"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"このアプリは拡張設定に対応していません"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"その他の設定"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"このアプリ内でその他の設定を利用できます"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"通知のクールダウン"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"仕事用プロファイルに適用する"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"仕事用プロファイルのアプリに適用する"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"カテゴリ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"その他"</string>
<string name="no_channels" msgid="4716199078612071915">"このアプリの通知はありません"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"使用していないカテゴリを表示"</string>
<string name="app_settings_link" msgid="6725453466705333311">"アプリ内のその他の設定"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"使用していないカテゴリを表示"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"使用していないカテゴリを非表示"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"割り込み可能なアプリ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"選択したアプリ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"なし"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"すべて"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"アプリのオーバーライドを許可"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"割り込み可能なアプリ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"他のアプリを選択"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"割り込み可能なアラームなどはありません"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"割り込み可能なユーザーはいません"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"一部のユーザーが割り込み可能"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"すべてのユーザーが割り込み可能"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"同一番号からの再着信"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"同一番号からの再着信に割り込みを許可"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time}まで1時間、アラームのみに変更します}other{{time}まで#時間、アラームのみに変更します}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>までアラームのみに変更します"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"常に割り込みに変更します"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"モードの編集"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"モードの追加"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"カスタムモード"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"モード名"</string>
<string name="warning_button_text" msgid="1274234338874005639">"警告"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"閉じる"</string>
<string name="device_feedback" msgid="5351614458411688608">"このデバイスについてフィードバックを送信"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"デスクトップ モードに強制的に切り替え"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"セカンダリ ディスプレイで試験運用版デスクトップ モードに強制的に切り替えます"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"フリーフォーム ウィンドウを有効にする"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"フリーフォーム ウィンドウのサポートを有効にします。"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"2 つ目のディスプレイでフリーフォーム ウィンドウを有効にする"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"2 つ目のディスプレイでのみフリーフォーム ウィンドウを有効にします。"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"マルチウィンドウでのサイズ変更不可を有効にする"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"サイズ変更できないアプリをマルチウィンドウでも使用可能にします"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"フォースダークのオーバーライド"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 KB デベロッパー オプションを使用するには、このデバイスのデータ パーティションを ext4 に変換する必要があります。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。16 KB オプションを有効にするには、この操作の後でもう 1 回再起動が必要です。このモードになったら、4 KB モードと 16 KB モードの間で切り替えることができます（切り替えのたびに 1 回再起動します）。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。デバイスを本番環境モードに戻すには、4 KB モードに戻してからブートローダーをロックする必要があります。この操作でデバイスは出荷時の設定にリセットされます。デバイスが Android で起動したら、開発者向けオプションで [OEM のロック解除] を無効にします。デバイスがワイプされて、確認後にファイルシステムが ext4 に変更されます。完了したら、戻って 16 KB を再度有効にしてください。"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"すべてのデータを消去"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"データ パーティションを ext4 に再フォーマットしてワイプすることができませんでした。"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB モードを使用するにはブートローダーのロック解除が必要です"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ブートローダーのロック解除が必要です"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"このデバイスで 16KB デベロッパー オプションを使用するには、ブートローダーのロックを解除しておく必要があります。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。16KB モードの有効化中にユーザーデータと設定はすべてワイプされます。ブートローダーのロックが解除されたら、16KB オプションを有効にするために再起動が 2 回必要です。このモードになったら、4KB モードと 16KB モードの間で切り替えることができます（切り替えのたびに 1 回再起動します）。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。デバイスを本番環境モードに戻すには、4KB モードに戻してから、OEM / ブートローダーをロックする必要があります。この操作で、デバイスは出荷時の設定にリセットされます。ブートローダーのロックを解除してから、もう一度お試しください。この手順については、<a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> をご覧ください。"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 KB のページ非依存モードを使用中"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"4KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、デバイスのブートローダーをロックする必要があります。タップすると詳細が表示されます。"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"4 KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、デバイスのブートローダーをロックする必要があります。この操作で、デバイスは再び出荷時の設定にリセットされ、製品版の設定に復元されます。デバイスが Android で起動したら、開発者向けオプションで [OEM のロック解除] を無効にします。デバイスが Android で起動しなかった場合や不安定な場合は、<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> の最新のファクトリー イメージでデバイスの再書き込みを行うか、<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> を使用し、[Wipe Device]、[Lock Bootloader]、[Force Flash all partitions] を選択してください。"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 KB のページ非依存モードを使用中"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"16 KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、4 KB モードに戻してからデバイスのブートローダーをロックする必要があります。タップすると詳細が表示されます。"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"16KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、4KB モードに戻してから、デバイスのブートローダーをロックする必要があります。この操作で、デバイスは再び出荷時の設定にリセットされ、製品版の設定に復元されます。デバイスが Android で起動したら、開発者向けオプションで [OEM のロック解除] を無効にします。デバイスが Android で起動しなかった場合や不安定な場合は、<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> の最新のファクトリー イメージでデバイスの再書き込みを行うか、<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> を使用し、[Wipe Device]、[Lock Bootloader]、[Force Flash all partitions] を選択してください。"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"16KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、4KB モードに戻してから、デバイスのブートローダーをロックする必要があります。タップすると詳細が表示されます。"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"16KB のページ非依存モードです。ソフトウェアの完全性はこのモードでは保証されないため、ブートローダーのロック解除中にスマートフォンに保存されているデータが失われる恐れがあります。これらのモードで無効になる機能があるため、一部のアプリが動作しないことがあります。再び本番環境モードにするには、4KB モードに戻してから、デバイスのブートローダーをロックする必要があります。この操作で、デバイスは再び出荷時の設定にリセットされ、製品版の設定に復元されます。デバイスが Android で起動したら、開発者向けオプションで [OEM のロック解除] を無効にします。デバイスが Android で起動しなかった場合や不安定な場合は、<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> の最新のファクトリー イメージでデバイスの再書き込みを行うか、<a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> を使用し、[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="bug_report_handler_title" msgid="713439959113250125">"バグレポート ハンドラ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"アプリ固定機能を使用"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"開発者向けオプションを使用"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"印刷サービスを使用"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"複数のユーザーを許可する"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ユーザーの切り替えを許可する"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"許可, 複数, ユーザー, 認可, 大勢"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"複数、ユーザー、プロフィール、複数のユーザー、アカウント、切り替え、多数"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ワイヤレス デバッグの使用"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"タブレットが装着されているときに画面に表示するものを選択してください。スクリーン セーバーを使用すると、デバイスの電力使用量が増えることがあります。"</string>
<string name="customize_button_title" msgid="1110284655990203359">"カスタマイズ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> をカスタマイズ"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"フリーフォームのサポートを有効にするには、再起動が必要です。"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"セカンダリ ディスプレイをデスクトップ モードに強制的に切り替えるには、再起動が必要です。"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"従来のフリーフォームのウィンドウ処理のサポートを有効にするには、再起動が必要です。"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"フリーフォームのウィンドウ処理のサポートを変更するには、再起動が必要です。"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"2 つ目のディスプレイでフリーフォームのウィンドウ処理を強制するには、再起動が必要です。"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"今すぐ再起動する"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"後で再起動する"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"空間オーディオ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ON"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"OFF"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ON"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"音声: 左 %1$d%%、右 %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"音声: 右 %1$d%%、左 %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"インストールしたアプリにデバイス名が表示されます。また、Bluetooth デバイスや Wi-Fi ネットワークに接続したり、Wi-Fi アクセス ポイントを設定したりすると、他のユーザーにもデバイス名が表示されます。"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"文法性"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"文法性の選択"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"検索設定"</string>
</resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index e70a3e3..a7e6438 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ძილის დრო"</item>
+ <item msgid="4152450357280759894">"ავტომობილის მართვა"</item>
+ <item msgid="7096549258219399423">"იმერსიული"</item>
+ <item msgid="2760716776980432977">"მართული"</item>
+ <item msgid="601734478369121764">"ვარსკვლავი"</item>
+ <item msgid="6243809315432780521">"კალენდარი"</item>
+ <item msgid="4913577903148415331">"დრო"</item>
+ <item msgid="3653377604690057780">"თეატრი"</item>
+ <item msgid="3843711267408385410">"ყვავილი"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b378c8d..2a0d2da 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"გსურთ მოწყობილობის დაკავშირების გაწყვეტა?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ახალი მოწყობილობის დაწყვილება"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ხვალ ავტომატურად ჩართვა"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"სმენის აპარატის პარამეტრები"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"მალსახმობი, სმენის აპარატებთან თავსებადობა"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"წინასწარ დაყენებული"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"აუდიოლოგისტს არ დაუპროგრამებია წინასწარ დაყენებული პარამეტრები."</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"წინასწარ დაყენებულის განახლება ვერ მოხერხდა"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"გამომავალი აუდიო"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"აუდიოს გამოსატანის შესახებ"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"გამორთული"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ჩართულია — # აპს აქვს მდებარეობაზე წვდომა}other{ჩართულია — # აპს აქვს მდებარეობაზე წვდომა}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"მიმდინარეობს ჩატვირთვა…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ახლომდებარე მოწყობილობების ნებართვების მქონე აპებს შეუძლია დაკავშირებული მოწყობილობების პოზიციის განსაზღვრა."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"ახლომდებარე მოწყობილობების ნებართვების მქონე აპებს შეუძლია დაკავშირებული მოწყობილობების პოზიციის განსაზღვრა."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"აპებისა და სერვისების მდებარეობაზე წვდომა გამორთულია. თქვენი მოწყობილობის მდებარეობა მაინც გაიგზავნება გადაუდებელი დახმარების სამსახურში, როცა გადაუდებელი დახმარების სამსახურის ნომერზე დარეკავთ ან ტექსტურ შეტყობინებას გაგზავნით."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"შეიტყვეთ მეტი მდებარეობის პარამეტრების შესახებ"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"შესაცვლელად გადადით ChromeOS-ის პარამეტრებში &gt კონფიდენციალურობა და უსაფრთხოება > კონფიდენციალურობის მართვის პარამეტრები > მდებარეობაზე წვდომა"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"დაემატა სახე და <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"დაემატა სახე, თითის ანაბეჭდი და <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"დაემატა სახე, თითის ანაბეჭდები და <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ეს საჭიროა, რადგან ვინაობის დადასტურებაა ჩართული"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Authenticator-ით დისტანციურად განბლოკვა"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"დაემატა საათი"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"თქვენი საათის დაყენება"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"შეიტყვეთ მეტი საათის განბლოკვის შესახებ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"საათის დამატება"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"საათის ამოშლა"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"თითის ანაბეჭდით და სახით განბლოკვა"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"სახით და ანაბეჭდით განბლოკვა"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"სახით და თითის ანაბეჭდით განბლოკვა სამსახურისთვის"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"საჭიროა დაყენება"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"სახე და თითის ანაბეჭდები დამატებულია"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"აპების ინსტალაცია"</b>\n"დააინსტალირეთ აპები, რომლებიც გსურთ კონფიდენციალურად შეინახოთ თქვენს სივრცეში"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"გაითვალისწინეთ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"აპების მუშაობის შეწყვეტა თქვენი კერძო სივრცის ჩაკეტვისას"</b>\n"თქვენს კერძო სივრცეში არსებული აპების ჩაკეტვისას, ისინი შეწყვეტენ მუშაობას და მათგან შეტყობინებებს აღარ მიიღებთ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"„კერძო სივრცეები“ არ არის შესაფერისი ისეთი აპებისთვის, რომლებიც ფონურად მუშაობს ან აგზავნის კრიტიკულ შეტყობინებებს. ასეთია, მაგალითად, სამედიცინო აპები. ამის მიზეზი შემდეგია: როცა თქვენი სივრცე იკეტება, შეტყობინებები და ფონური აქტივობა ჩერდება.\n\nროცა თქვენი კერძო სივრცე ჩაკეტილია, იქ არსებული აპები არ გამოჩნდება ნებართვების მმართველში, კონფიდენციალურობის საინფორმაციო დაფაზე და სხვა პარამეტრებში.\n\nკერძო სივრცის ახალ მოწყობილობაში გადატანა შეუძლებელია. თქვენ უნდა დააყენოთ სხვა კერძო სივრცე, თუ გსურთ მისი სხვა მოწყობილობაზე გამოყენება.\n\nნებისმიერს, ვინც თქვენს მოწყობილობას აკავშირებს კომპიუტერთან ან დააინსტალირებს მავნე აპებს თქვენს მოწყობილობაზე, შეიძლება ჰქონდეს წვდომა თქვენს კერძო სივრცეზე."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"„კერძო სივრცეები“ არ არის შესაფერისი ისეთი აპებისთვის, რომლებიც ფონურად მუშაობს ან აგზავნის კრიტიკულ შეტყობინებებს. ასეთია, მაგალითად, სამედიცინო აპები. ამის მიზეზი შემდეგია: როცა თქვენი სივრცე იკეტება, შეტყობინებები და ფონური აქტივობა ჩერდება.\n\nროცა კერძო სივრცე ჩაკეტილია, იქ არსებული აპები არ გამოჩნდება ნებართვების მმართველში, კონფიდენციალურობის საინფორმაციო დაფაზე და სხვა პარამეტრებში.\n\nკერძო სივრცის ახალ მოწყობილობაში აღდგენა შეუძლებელია. თქვენ უნდა დააყენოთ სხვა სივრცე, თუ გსურთ მისი სხვა მოწყობილობაზე გამოყენება.\n\nნებისმიერს, ვინც თქვენს მოწყობილობას აკავშირებს კომპიუტერთან ან დააინსტალირებს მავნე აპებს თქვენს მოწყობილობაზე, შეიძლება ჰქონდეს წვდომა თქვენს კერძო სივრცეზე."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"შეიტყვეთ მეტი კერძო სივრცის შესახებ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ამას ცოტა ხანი დასჭირდება"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"მიმდინარეობს პირადი სივრცის დაყენება…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"გსურთ მოწყობილობის გადატვირთვა?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"დეტალური NFC აღრიცხვა გათვალისწინებულია მხოლოდ დეველოპერული მიზნებისთვის. დამატებითი NFC მონაცემები მოყვანილია სისტემის ხარვეზის ანგარიშებში, რომლებიც შეიძლება მოიცავდეს პირად ინფორმაციას. გადატვირთეთ თქვენი მოწყობილობა ამ პარამეტრის შესაცვლელად."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"გადატვირთვა"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"გამოსახულების ასლი, გარე ეკრანი, დაკავშირებული ეკრანი, usb ეკრანი, გარჩევადობა, შეტრიალება"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"შეტრიალება"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"სტანდარტული"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ეკრანული კლავიატურის გამოყენება"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"აქტიური ფიზიკური კლავიატურისას ეკრანზე შენარჩუნება"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"კურსორის სტილის შეცვლა ყვითლად"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"კურსორის სტილის შეცვლა ვარდისფრად"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"კურსორის სტილის შეცვლა ლურჯად"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"კურსორის ხაზების სტილი"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"თეთრი"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"შავი"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"არცერთი"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"მომხმარებლის მიერ არჩეული: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"მეტყველება"</string>
<string name="pointer_speed" msgid="7398649279282675718">"მანიშნებლის სიჩქარე"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"კურსორის ზომა"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"კურსორის ზომის შემცირება"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"კურსორის ზომის გაზრდა"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"თამაშის მეთვალყურე"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ვიბრაციის გადამისამართება"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"დაკავშირებისას ვიბრაციის სათამაშო კონტოლერზე გადამისამართება"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"მაინც გაგრძელება"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"გაუქმება"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"გადიდების პარამეტრები"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ერთი თითით პანირება"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"გადაადგილეთ გამადიდებელი 1 თითით"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ეკრანზე გადასაადგილებლად ჩაავლეთ 1 თითით"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"გაამოძრავეთ გადიდების ზონა ერთი თითის ჩავლებით."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"გაამოძრავეთ გადიდების ზონა ორი თითის ჩავლებით."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"მიუწვდომელია ეკრანის მხოლოდ ნაწილის გადიდებისას"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"მასშტაბირება ღილაკზე შეხებით"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"კონტენტის გასადიდებლად სწრაფად გაადიდეთ მასშტაბი ეკრანზე"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>მასშტაბის გასადიდებლად:</b><br/> {0,number,integer}. გადიდების დასაწყებად გამოიყენეთ მალსახმობი<br/> {1,number,integer}. შეეხეთ ეკრანს<br/> {2,number,integer}. ჩაავლეთ 2 თითი ეკრანზე გადასაადგილებლად<br/> {3,number,integer}. მასშტაბის კორექტირებისთვის გამოიყენეთ თითებით მასშტაბირება 2 თითით<br/> {4,number,integer}. გადიდების შესაწყვეტად გამოიყენეთ მალსახმობი<br/><br/><b>მასშტაბის დროებით გასადიდებლად:</b><br/> {0,number,integer}. გადიდების მასშტაბი სრულ ეკრანზე უნდა იყოს დაყენებული<br/> {1,number,integer}. გადიდების დასაწყებად გამოიყენეთ მალსახმობი<br/> {2,number,integer}. ხანგრძლივად შეეხეთ ეკრანს ნებისმიერ ადგილას<br/> {3,number,integer}. ჩაავლეთ თითი ეკრანზე გადასაადგილებლად<br/> {4,number,integer}. გადიდების შესაწყვეტად მოაშორეთ თითი"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>მასშტაბის გასადიდებლად:</b><br/> {0,number,integer}. გადიდების დასაწყებად გამოიყენეთ მალსახმობი<br/> {1,number,integer}. შეეხეთ ეკრანს<br/> {2,number,integer}. ეკრანზე გადასაადგილებლად ჩაავლეთ 2 თითით<br/> {3,number,integer}. მასშტაბის კორექტირებისთვის გამოიყენეთ თითებით მასშტაბირება 2 თითით<br/> {4,number,integer}. გადიდების შეწყვეტისთვის გამოიყენეთ მალსახმობი<br/><br/> თქვენ ასევე შეგიძლიათ დროებით გაადიდოთ მასშტაბი და შეასრულოთ სხვა მოქმედებები."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>მასშტაბის გასადიდებლად:</b><br/> {0,number,integer}. გადიდების დასაწყებად გამოიყენეთ მალსახმობი<br/> {1,number,integer}. შეეხეთ ეკრანს<br/> {2,number,integer}. ეკრანზე გადასაადგილებლად ჩაავლეთ 1 ან 2 თითით<br/> {3,number,integer}. მასშტაბის კორექტირებისთვის გამოიყენეთ თითებით მასშტაბირება 2 თითით<br/> {4,number,integer}. გადიდების შეწყვეტისთვის გამოიყენეთ მალსახმობი<br/><br/> თქვენ ასევე შეგიძლიათ დროებით გაადიდოთ მასშტაბი და შეასრულოთ სხვა მოქმედებები."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"როდესაც გადიდება ჩართულია, შეგიძლიათ გაადიდოთ მასშტაბი თქვენს ეკრანზე.\n\n"<b>"მასშტაბირებისთვის"</b>", დაიწყეთ გადიდება, შემდეგ შეეხეთ ეკრანის ნებისმიერ ადგილს.\n"<ul><li>"გადასაადგილებლად გადაატარეთ ეკრანს 2 ან მეტი თითი"</li>\n<li>"მასშტაბის დასარეგულირებლად ეკრანზე შეაერთეთ 2 ან მეტი თითი"</li></ul>\n\n<b>"მასშტაბის დროებით გასადიდებლად"</b>", დაიწყეთ გადიდება, შემდეგ ხანგრძლივად შეეხეთ ეკრანის ნებისმიერ ნაწილს.\n"<ul><li>"გადაატარეთ თითი ეკრანს მისი სხვადასხვა ნაწილის დასათვალიერებლად"</li>\n<li>"მასშტაბის შესამცირებლად ასწიეთ თითი"</li></ul>\n\n"კლავიატურისა და ნავიგაციის ზოლის მასშტაბის გაზრდა ვერ მოხერხდება."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"გვერდი <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="NUM_PAGES">%2$d</xliff:g>-დან"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"მარტივი წვდომის ღილაკის მალსახმობი"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{არცერთი}=1{დაყენებულია 1 განრიგი}other{დაყენებულია # განრიგი}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"არ შემაწუხოთ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"პრიორიტეტული რეჟიმები"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"რეჟიმის დამატება"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"შეტყობინებების მიღება მხოლოდ მნიშვნელოვანი ხალხისგან და აპებიდან"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"აქტივაციის ტიპის არჩევა"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"დრო"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"მაგ. „09:30 — 17:00“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"კალენდარი"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"მაგ. „პირადი კალენდარი“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"რეჟიმის შექმნა"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"მორგებული"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"წყვეტების შეზღუდვა"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"„არ შემაწუხოთ“ რეჟიმის ჩართვა"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"შეწყვეტა შეუძლია მაღვიძარებს და მედიის ხმებს"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"განრიგები"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"განრიგების წაშლა"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"წაშლა"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"გადარქმევა"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"წაშლა"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"გსურთ „<xliff:g id="MODE">%1$s</xliff:g>“ რეჟიმის წაშლა?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"რედაქტირება"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"განრიგები"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"განრიგი"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"კალენდრის დამატება"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"თქვენი კალენდრის გამოყენება"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"განრიგი"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"განრიგის დაყენება"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"განრიგი"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> სთ, <xliff:g id="MINUTES">%2$d</xliff:g> წთ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ავტომატურად ჩართვა"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"განრიგი"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ტელეფონის დადუმება გარკვეულ მომენტებში"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"„არ შემაწუხოთ“ რეჟიმის წესების დაყენება"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ხმის გამომცემი წყვეტების დაშვება"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ვიზუალური სიგნალების დაბლოკვა"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ვიზუალური სიგნალების დაშვება"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"შეტყობინებები, რომლებსაც თქვენთან დაკავშირება შეუძლიათ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ფოკუსის შენარჩუნება"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"დამატებითი მოქმედებები"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{გამორთულია}=1{გამორთულია / 1 რეჟიმი შეიძლება ავტომატურად ჩაირთოს}other{გამორთულია / # რეჟიმი შეიძლება ავტომატურად ჩაირთოს}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ეკრანის პარამეტრები"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ეკრანის ვარიანტები"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ნაცრისფერი ტონები"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"მუქი თემის ჩართვა"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"შეცვალეთ ოპერაციული სისტემა და აპები და უპირატესობა მიანიჭეთ ნათელ ტექსტს მუქ ფონზე, რაც თვალისთვის უფრო ადვილი აღსაქმელია და მნიშვნელოვნად ზოგავს ბატარეას ზოგიერთ მოწყობილობაზე"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"შეფერხებების გაფილტვრა"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"შეფერხებები არ გაფილტრულა"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"შეტყობინების გახსნა"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"შეტყობინებების ჩაჩუმების დაშვება"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"შეტყობ. ნიშნული აპის ხატულაზე"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"შეტყობინების ნაკრებები"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ბუშტები"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ბუშტები"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ამ მიმოწერის ბუშტად ჩვენება"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ამ აპს არ აქვს გაძლიერებული პარამეტრების მხარდაჭერა"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"დამატებითი პარამეტრები"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"მეტი პარამეტრი ხელმისაწვდომია ამ აპში"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"შეტყობინების განტვირთვის პერიოდი"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"შეტყობინების განტვირთვის პერიოდის გამოყენება"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"გამოიყენეთ სამსახურის პროფილზე"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"სამსახურის პროფილის აპებზე გავრცელება"</string>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"კატეგორიები"</string>
<string name="notification_channels_other" msgid="18159805343647908">"სხვა"</string>
<string name="no_channels" msgid="4716199078612071915">"ამ აპს შეტყობინებები არ გამოუქვეყნებია"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"გამოუყენებელი კატეგორიების ჩვენება"</string>
<string name="app_settings_link" msgid="6725453466705333311">"დამატებითი პარამეტრები აპში"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"გამოუყენებელი კატეგორიების ჩვენება"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"გამოუყენებელი კატეგორიების დამალვა"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"აპები, რომლებსაც შეწყვეტა შეუძლიათ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"არჩეული აპები"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"არცერთი"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ყველა"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"აპებისთვის უგულებელყოფის დაშვება"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"აპები, რომლებსაც შეწყვეტა შეუძლია"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"მეტი აპის არჩევა"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"შეწყვეტა არაფერს შეუძლია"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"შეწყვეტა არავის შეუძლია"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"შეწყვეტა შეუძლია ზოგიერთ ადამიანს"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"შეწყვეტა შეუძლია ყველას"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"აბონენტების გამეორება"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"განმეორებითი აბონენტების დაშვება"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{შეცვალეთ სიგნალიზაცია მხოლოდ ერთი საათის განმავლობაში {time}-მდე}other{მაღვიძარების შეცვლა მხოლოდ # საათის განმავლობაში {time}-მდე}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"მაღვიძარებზე მხოლოდ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-მდე გადაყვანა"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"„მუდმივად შეწყვეტის“ რეჟიმზე გადაყვანა"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"რეჟიმის რედაქტირება"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"რეჟიმის დამატება"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"მორგებული რეჟიმი"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"რეჟიმის სახელი"</string>
<string name="warning_button_text" msgid="1274234338874005639">"შენიშვნა"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"დახურვა"</string>
<string name="device_feedback" msgid="5351614458411688608">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
@@ -4801,8 +4845,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"დესკტოპის რეჟიმის იძულებით გააქტიურება"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"დესკტოპის ექსპერიმენტული რეჟიმის იძულებით გააქტიურება მეორეულ ეკრანებზე"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"თავისუფალი ფორმის ფანჯრების ჩართვა"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"მხარდაჭერის ჩართვა თავისუფალი ფორმის ფანჯრებისთვის"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"თავისუფალი ფორმის ფანჯრების ჩართვა მეორე ეკრანზე"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"თავისუფალი ფორმის ფანჯრების ჩართვა მხოლოდ დამატებით ეკრანზე."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ფიქსირებული ზომის აპის ჩართვა მრავალი ფანჯრის რეჟიმში"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ეს პარამეტრი საშუალებას იძლევა, აპი ზომის შეუცვლელად გამოჩნდეს მრავალი ფანჯრის რეჟიმში"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"გამუქების იძულების უგულებელყოფა"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"დეველოპერთა 16-კბაიტიანი პარამეტრების გამოყენებამდე ამ მოწყობილობის მონაცემთა დანაყოფი უნდა დაკონვერტირდეს ext4-ზე. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. 16-კბაიტიანი ვარიანტის გააქტიურება მოითხოვს კიდევ ერთ გადატვირთვას. ამ რეჟიმში შესვლის შემდეგ, 4-კბაიტიან და 16-კბაიტიან რეჟიმებს შორის შეგიძლიათ ერთი გადატვირთვით გადაერთოთ. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმზე დასაბრუნებლად, უკან უნდა გადმოერთოთ 4-კბაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ ჩამტვირთავი, რაც მოწყობილობას ქარხნულ პარამეტრებზე დააბრუნებს. მოწყობილობის Android-ში წარმატებით ჩატვირთვის შემდეგ, დეველოპერთა პარამეტრებში გათიშეთ OEM-ის მხრიდან განბლოკვა. თანხმობის შემდეგ, ეს მოწყობილობა ამოიშლება და ფაილის სისტემა შეიცვლება ext4-ზე. მას შემდეგ რაც ეს დასრულდება, გთხოვთ დაბრუნდეთ რათა თავიდან ჩართოთ 16-კბაიტიანი რეჟიმი."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ყველა მონაცემის ამოშლა"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ფორმატის შეცვლა და მონაცემთა დანაყოფის ext4-მდე ამოშლა ვერ მოხერხდა."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16-კბაიტიანი რეჟიმისათვის აუცილებელია ჩამტვირთავის განბლოკვა."</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"საჭიროა ჩამტვირთავის განბლოკვა"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"დეველოპერთა 16-კბაიტიანი პარამეტრების გამოყენებამდე ამ მოწყობილობის ჩამტვირთავი განბლოკილი უნდა იყოს. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. 16-კბაიტიანი რეჟიმის აქტივაციის შემდეგ, ყველა მომხმარებლის მონაცემები და პარამეტრები ამოიშლება. 16-კბაიტიან ვარიანტს ესაჭიროება ორჯერ გადატვირთვა ჩამტვირთავის განბლოკვის შემდეგ. ამ რეჟიმში შესვლის შემდეგ, 4-კბაიტიან და 16-კბაიტიან რეჟიმებს შორის შეგიძლიათ ერთი გადატვირთვით გადაერთოთ. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში დასაბრუნებლად, უკან უნდა გადმოერთოთ 4-კბაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ OEM/ჩამტვირთავი (რაც მოწყობილობას ქარხნულ პარამეტრებზე დააბრუნებს). გთხოვთ, განბლოკოთ ჩამტვირთავი და ხელახლა ცადოთ. მოცემულ ბმულზე შეგიძლიათ იხილოთ ამ პროცესის ინსტრუქცია: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"იყენებთ 4-კბაიტიან გვერდ-აგნოსტიკურ რეჟიმს"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 4-კბაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში თავიდან შესასვლელად უნდა ჩაკეტოთ მოწყობილობის ჩამტვირთავი. მეტის წასაკითხად შეეხეთ."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 4-კბაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში თავიდან შესასვლელად უნდა ჩაკეტოთ მოწყობილობის ჩამტვირთავი. ეს მოწყობილობას კვლავ ქარხნულ პარამეტრებზე დააბრუნებს და შესაბამისად, აღადგენს მისი წარმოების პარამეტრებს. მოწყობილობის Android-ში წარმატებით ჩატვირთვის შემდეგ, დეველოპერთა პარამეტრებში გათიშეთ OEM-ის მხრიდან განბლოკვა. თუ მოწყობილობა ვერ იტვირთება Android-ში ან არასტაბილურია, განაახლეთ ჩაშენებული პროგრამული უზრუნველყოფა უახლესი ქარხნული იმიჯებით შემდეგი ბმულიდან: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> და აირჩიეთ „მოწყობილობის წაშლა“, „ჩამტვირთავის ჩაკეტვა“ და „ყველა დანაყოფზე იძულებითი ჩატვირთვა“."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"იყენებთ 16-კბაიტიან გვერდ-აგნოსტიკურ რეჟიმს"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 16-კბაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში ხელახლა შესასვლელად უნდა გადაერთოთ 4-კბაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ მოწყობილობის ჩამტვირთავი. მეტის წასაკითხად შეეხეთ."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 16-კბაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში ხელახლა შესასვლელად უნდა გადაერთოთ 4-კბაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ მოწყობილობის ჩამტვირთავი. ეს მოწყობილობას კვლავ ქარხნულ პარამეტრებზე დააბრუნებს და შესაბამისად, აღადგენს მისი წარმოების პარამეტრებს. მოწყობილობის Android-ში წარმატებით ჩატვირთვის შემდეგ, დეველოპერთა პარამეტრებში გათიშეთ OEM-ის მხრიდან განბლოკვა. თუ მოწყობილობა ვერ იტვირთება Android-ში ან არასტაბილურია, განაახლეთ ჩაშენებული პროგრამული უზრუნველყოფა უახლესი ქარხნული იმიჯებით შემდეგი ბმულიდან: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> და აირჩიეთ „მოწყობილობის წაშლა“, „ჩამტვირთავის ჩაკეტვა“ და „ყველა დანაყოფზე იძულებითი ჩატვირთვა“."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 16-კილობაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში ხელახლა შესასვლელად უნდა გადაერთოთ 4-კილობაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ მოწყობილობის ჩამტვირთავი. მეტის წასაკითხად შეეხეთ."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"თქვენ იმყოფებით გვერდ-აგნოსტიკური რეჟიმის 16-კილობაიტიან რეჟიმში. აღნიშნულ რეჟიმში პროგრამული უზრუნველყოფის მთლიანობა ვერ იქნება გარანტირებული და სანამ ჩამტვირთავი განბლოკილია, ტელეფონში შენახული ნებისმიერი მონაცემი შეიძლება რისკის ქვეშ იყოს. ამ რეჟიმებში ზოგი ფუნქცია გაითიშება, რის გამოც გარკვეულმა აპლიკაციებმა შეიძლება არ იმუშაოს. მოწყობილობის წარმოების რეჟიმში ხელახლა შესასვლელად უნდა გადაერთოთ 4-კილობაიტიან რეჟიმზე და შემდეგ ჩაკეტოთ მოწყობილობის ჩამტვირთავი. ეს მოწყობილობას კვლავ ქარხნულ პარამეტრებზე დააბრუნებს და შესაბამისად, აღადგენს მისი წარმოების პარამეტრებს. მოწყობილობის Android-ში წარმატებით ჩატვირთვის შემდეგ, დეველოპერთა პარამეტრებში გათიშეთ OEM-ის მხრიდან განბლოკვა. თუ მოწყობილობა ვერ იტვირთება Android-ში ან არასტაბილურია, განაახლეთ ჩაშენებული პროგრამული უზრუნველყოფა უახლესი ქარხნული იმიჯებით შემდეგი ბმულიდან: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> და აირჩიეთ „მოწყობილობის წაშლა“, „ჩამტვირთავის ჩაკეტვა“ და „ყველა დანაყოფზე იძულებითი ჩატვირთვა“."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16-კბაიტიანი გვერდ-აგნოსტიკური რეჟიმი"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ვრცლად"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"სისტემის ხარვეზის ანგარიშის დამმუშავებელი"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"აპის ჩამაგრების გამოყენება"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"დეველოპერთა პარამეტრების გამოყენება"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ბეჭდვის სერვისის გამოყენება"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"მრავალი მომხმარებლის დაშვება"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"მომხმარებლის გადართვაზე ნების დართვა"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"დაშვება, მრავალჯერადი, მომხმარებელი, ნებართვა, ბევრი"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"რამდენიმე მომხმარებელი, პროფილი, ადამიანები, ანგარიშები, გადართვა, ბევრი"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"უსადენო გამართვის გამოყენება"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"აირჩიეთ, რას იხილავთ თქვენს ეკრანზე, როცა თქვენი ტაბლეტი დოკ-სადგურთან იქნება მიერთებული. ეკრანმზოგის გამოყენების შემთხვევაში თქვენმა მოწყობილობამ შეიძლება მეტი ენერგია გამოიყენოს."</string>
<string name="customize_button_title" msgid="1110284655990203359">"მორგება"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>-ის მორგება"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"თავისუფალი ფორმის მხარდაჭერის ჩასართავად საჭიროა გადატვირთვა."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"მეორეულ ეკრანზე დესკტოპ რეჟიმის იძულებით გასააქტიურებლად საჭიროა გადატვირთვა."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"მოძველებული თავისუფალი ფორმის ფანჯრების მხარდაჭერის ჩასართავად საჭიროა გადატვირთვა."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"თავისუფალი ფანჯრების მხარდაჭერის შესაცვლელად საჭიროა გადატვირთვა."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"დამატებით ეკრანებზე თავისუფალი ფორმის ფანჯრების გასააქტიურებლად საჭიროა გადატვირთვა."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ახლავე გადატვირთვა"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"გადატვირთვა მოგვიანებით"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"სივრცითი აუდიო"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ჩართული"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"გამორთული"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ჩართული"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"აუდიო %1$d%% მარცხენა, %2$d%% მარჯვენა"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"აუდიო %1$d%% მარჯვენა, %2$d%% მარცხენა"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"თქვენი მოწყობილობის სახელი ხილულია დაინსტალირებული აპებისთვის. მის დანახვას შეძლებენ სხვა პირებიც, როცა Bluetooth მოწყობილობებს ან Wi-Fi ქსელს დაუკავშირდებით, ან Wi-Fi უსადენო ქსელს დააყენებთ."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"გრამატიკული სქესი"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"აირჩიეთ გრამატიკული სქესი"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"ძიების პარამეტრები"</string>
</resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index ba44902..7c17892 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -58,7 +58,7 @@
<item msgid="286164147080824297">"Ажыратуда…"</item>
<item msgid="1628460745311787730">"Ажыратылған"</item>
<item msgid="4013828218541488949">"Сәтсіз"</item>
- <item msgid="5473541238056528086">"Бөгелген"</item>
+ <item msgid="5473541238056528086">"Блокталған"</item>
<item msgid="1114588261171522603">"Нашар байланысты уақытша қолданбау"</item>
</string-array>
<!-- no translation found for wifi_tether_security:0 (6312112980634811065) -->
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Ұйқы режимі"</item>
+ <item msgid="4152450357280759894">"Көлік жүргізу"</item>
+ <item msgid="7096549258219399423">"Әсерлі"</item>
+ <item msgid="2760716776980432977">"Басқару"</item>
+ <item msgid="601734478369121764">"Жұлдыз"</item>
+ <item msgid="6243809315432780521">"Күнтізбе"</item>
+ <item msgid="4913577903148415331">"Уақыт"</item>
+ <item msgid="3653377604690057780">"Театр"</item>
+ <item msgid="3843711267408385410">"Гүл"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 408368c..e8d6527 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Құрылғы ажыратылсын ба?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Жаңа құрылғымен жұптастыру"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ертең автоматты түрде қосу"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Есту құрылғысының параметрлері"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Жылдам пәрмен, есту аппаратының үйлесімділігі"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Параметрлер жинағы"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Аудиолог бағдарламалаған параметрлер жинағы жоқ."</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Параметрлер жинағы жаңартылмады."</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио шығысы"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио шығысы туралы"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өшірулі"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Қосулы / # қолданба локацияны пайдалана алады.}other{Қосулы / # қолданба локацияны пайдалана алады.}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Жүктелуде…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Маңайдағы құрылғыларды пайдалану рұқсаты бар қолданбалар телефонға жалғанған құрылғылардың тиісті орнын анықтай алады."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"\"Маңайдағы құрылғылар\" рұқсаты бар қолданбалар жалғанған құрылғылардың тиісті орнын анықтай алады."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Қолданбалар мен қызметтер үшін локацияны пайдалану рұқсаты өшірулі. Бірақ құтқару қызметіне қоңырау шалатын немесе хабар жіберетін болсаңыз, құрылғыңыздың локациясы беріледі."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Локация параметрлері туралы толық ақпарат"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Өзгерту үшін ChromeOS жүйесінің \"Параметрлер > Құпиялық және қауіпсіздік > Құпиялық параметрлері > Локацияны пайдалану рұқсаты\" бөліміне өтіңіз."</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Бет тану функциясы және <xliff:g id="WATCH">%s</xliff:g> қосылды."</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Бет тану функциясы, саусақ ізі және <xliff:g id="WATCH">%s</xliff:g> қосылды."</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Бет тану функциясы, саусақ іздері және <xliff:g id="WATCH">%s</xliff:g> қосылды."</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Бұл керек, себебі жеке басты тексеру функциясы қосылған."</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator құлпын ашу"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Сағат қосылды."</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Сағат параметрлерін реттеу"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Құлыпты сағат арқылы ашу туралы толық ақпарат"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Сағатты қосу"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Сағатты өшіру"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Бет және саусақ ізі арқылы құлыпты ашу"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Бет тану, саусақ ізімен ашу"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Жұмысқа арналған бет тану және саусақ ізімен ашу функциялары"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Реттеу қажет."</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Бет және саусақ іздері енгізілді."</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Қолданбалар орнату"</b>\n"Кеңістігіңізге құпия сақтағыңыз келетін қолданбаларды орнатуға болады."</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Есте сақтаңыз"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Кеңістігіңізді құлыптасаңыз, қолданбалардың жұмысы тоқтайды."</b>\n"Кеңістікті құлыптаған кезде, ондағы қолданбалар жұмысын тоқтатады және олардан хабарландырулар алмайсыз."</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Құпия кеңістіктер фондық режимде жұмыс істейтін немесе маңызды хабарландырулар жіберетін (мысалы, медициналық мақсаттағы) қолданбаларға арналмаған. Себебі кеңістік құлыпталған кезде, хабарландырулар мен фондық режимдегі әрекеттер тоқтатылады.\n\nСонымен қатар ондағы қолданбалар \"Рұқсаттарды басқару\" бөлімінде, құпиялық тақтасында және басқа параметрлерде көрсетілмейді.\n\nҚұпия кеңістікті жаңа құрылғыға көшіру мүмкін емес. Оны басқа құрылғыда пайдаланғыңыз келсе, жаңасын орнатуыңыз керек болады.\n\nҚұрылғыңызды компьютерге жалғаған немесе оған зиянды қолданбалар орнатқан кез келген адам құпия кеңістігіңізге кіре алады."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Құпия кеңістіктер фондық режимде жұмыс істейтін немесе маңызды хабарландырулар жіберетін (мысалы, медициналық мақсаттағы) қолданбаларға арналмаған. Себебі кеңістік құлыпталған кезде, хабарландырулар мен фондық режимдегі әрекеттер тоқтатылады.\n\nСонымен қатар ондағы қолданбалар \"Рұқсаттарды басқару\" бөлімінде, құпиялық тақтасында және басқа параметрлерде көрсетілмейді.\n\nҚұпия кеңістікті жаңа құрылғыда қалпына келтіру мүмкін емес. Оны басқа құрылғыда пайдаланғыңыз келсе, жаңасын орнатуыңыз керек болады.\n\nҚұрылғыңызды компьютерге жалғаған немесе оған зиянды қолданбалар орнатқан кез келген адам құпия кеңістігіңізге кіре алады."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Құпия кеңістік туралы толық ақпарат"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Бұған бірнеше минут кетеді."</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Құпия кеңістік реттеліп жатыр…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Құрылғыны өшіріп қосасыз ба?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Толық NFC журналы әзірлеу мақсаттарына ғана арналған. Қосымша NFC деректері қате туралы есептерге қосылған, ал онда құпия ақпарат болуы мүмкін. Бұл параметрді өзгерту үшін құрылғыны өшіріп қосыңыз."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Өшіріп қосу"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"экран көшірмесі, сыртқы дисплей, қосылған дисплей, USB дисплейі, ажыратымдылық, бұру"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Бұру"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандартты"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Экран жарықтығы қоршаған ортаға және әрекеттерге автоматты түрде бейімделеді. Жүгірткіні қолмен жылжытуыңызға болады."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Дисплейдің ақ түс балансы"</string>
@@ -1227,7 +1242,7 @@
<string name="night_display_start_time_title" msgid="2611541851596977786">"Басталу уақыты"</string>
<string name="night_display_end_time_title" msgid="5243112480391192111">"Аяқталу уақыты"</string>
<string name="night_display_temperature_title" msgid="857248782470764263">"Қанықтығы"</string>
- <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Автоматты қосылмайды"</string>
+ <string name="night_display_summary_off_auto_mode_never" msgid="7406899634169354142">"Автоматты түрде қосылмайды"</string>
<string name="night_display_summary_off_auto_mode_custom" msgid="6667008039080687931">"Автоматты қосылады: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_off_auto_mode_twilight" msgid="3669132200611324994">"Күн батқанда, автоматты түрде қосылады"</string>
<string name="night_display_summary_on_auto_mode_never" msgid="832333009202889350">"Автоматты өшпейді"</string>
@@ -1247,7 +1262,7 @@
<string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"Белгілі бір уақытта қосылады"</string>
<string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"Ұйқы режимінде қосылады."</string>
<string name="dark_ui_status_title" msgid="3505119141437774329">"Күйі"</string>
- <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Автоматты қосылмайды"</string>
+ <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"Автоматты түрде қосылмайды"</string>
<string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"Күн батқанда, автоматты түрде қосылады"</string>
<string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"Автоматты түрде қосылады: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"Ұйқы режимінде автоматты түрде қосылады."</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Экрандағы пернетақтаны пайдалану"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Физикалық пернетақта қосулы кезде оны экранға шығару"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Меңзердің бояу стилін сары түске өзгертеді."</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Меңзердің бояу стилін қызғылт түске өзгертеді."</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Меңзердің бояу стилін көк түске өзгертеді."</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Меңзер сызығының стилі"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Ақ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Қара"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Жоқ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Пайдаланушы таңдаған: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Сөз"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Меңзер жылдамдығы"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Меңзер өлшемі"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Меңзер өлшемін кішірейту"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Меңзер өлшемін ұлғайту"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Ойын бақылаушы"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Дірілді бағыттау"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Жалғанған кезде дірілді ойын контроллеріне бағыттау"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Бәрібір жалғастыру"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Бас тарту"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ұлғайту параметрлері"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Бір саусақпен панорамалау"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Ұлғайтқышты 1 саусақпен жылжытыңыз"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Экранда жылжу үшін 1 саусақпен сүйреңіз."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Ұлғайту аймағын бір саусақпен сүйреп жылжытыңыз."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Ұлғайту аймағын екі саусақпен сүйреп жылжытыңыз."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Экранның тек бір бөлігін ұлғайту кезінде қолданылмайды."</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Масштабтау үшін түймені түртіңіз"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Экранның масштабын тез өзгертіп, контентті үлғайта аласыз."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Ұлғайту үшін:</b><br/> {0,number,integer}. Жылдам пәрмен көмегімен ұлғайта бастаңыз.<br/> {1,number,integer}. Экранды түртіңіз.<br/> {2,number,integer}. Экранның басқа жеріне жылжу үшін 2 саусақпен сүйреңіз.<br/> {3,number,integer}. Ыңғайлы масштабты таңдау үшін 2 саусақ арасын ашыңыз немесе қосыңыз.<br/> {4,number,integer}. Жылдам пәрмен көмегімен ұлғайту режимінен шығыңыз.<br/><br/> <b>Уақытша ұлғайту үшін:</b><br/> {0,number,integer}. Ұлғайту түріне \"толық экран\" мәні тағайындалғанына көз жеткізіңіз.<br/> {1,number,integer}. Жылдам пәрмен көмегімен ұлғайта бастаңыз.<br/> {2,number,integer}. Экранның кез келген жерін түртіп ұстап тұрыңыз.<br/> {3,number,integer}. Экранның басқа жеріне жылжу үшін саусақпен сүйреңіз.<br/> {4,number,integer}. Ұлғайту режимінен шығу үшін саусағыңызды көтеріңіз."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Ұлғайту үшін:</b><br/> {0,number,integer}. Жылдам пәрмен көмегімен ұлғайта бастаңыз.<br/> {1,number,integer}. Экранды түртіңіз.<br/> {2,number,integer}. Экранның басқа жеріне жылжу үшін 2 саусақпен сүйреңіз.<br/> {3,number,integer}. Масштабтаудты реттеу үшін 2 саусақ арасын ашыңыз.<br/> {4,number,integer}. Жылдам пәрмен көмегімен ұлғайтуды тоқтатыңыз.<br/><br/> Сондай-ақ уақытша ұлғайта аласыз және басқа әрекеттерді орындауыңызға болады."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Ұлғайту үшін:</b><br/> {0,number,integer}. Жылдам пәрмен көмегімен ұлғайта бастаңыз.<br/> {1,number,integer}. Экранды түртіңіз.<br/> {2,number,integer}. Экранның басқа жеріне жылжу үшін 1 не 2 саусақпен сүйреңіз.<br/> {3,number,integer}. Масштабтаудты реттеу үшін 2 саусақ арасын ашыңыз.<br/> {4,number,integer}. Жылдам пәрмен көмегімен ұлғайтуды тоқтатыңыз.<br/><br/> Сондай-ақ уақытша ұлғайта аласыз және басқа әрекеттерді орындауыңызға болады."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Ұлғайту функциясы қосулы тұрғанда, экраныңызды ұлғайта аласыз.\n\n"<b>"Масштабтау үшін"</b>" ұлғайту функциясын іске қосып, экранның кез келген жерін түртіңіз.\n"<ul><li>"Айналдыру үшін екі немесе бірнеше саусақпен сүйреңіз."</li>\n<li>"Масштабтауды реттеу үшін екі немесе бірнеше саусақты жақындатыңыз."</li></ul>\n\n<b>"Уақытша масштабтау үшін"</b>" ұлғайту функциясын іске қосыңыз, содан кейін экранның кез келген жерін басып тұрыңыз.\n"<ul><li>"Жылжыту үшін саусағыңызды экранның бір жерінен екінші жеріне сүйреңіз."</li>\n<li>"Кішірейту үшін саусағыңызды көтеріңіз."</li></ul>\n\n"Пернетақтада және навигация жолағында ұлғайту мүмкін емес."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g> бет"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Арнайы мүмкіндіктер түймесінің жылдам пәрмені"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жоқ}=1{1 кесте қойылған}other{# кесте қойылған}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Мазаламау"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Басымдылық режимдері"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Режим қосу"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Хабарландыруды маңызды адамдардан және қолданбалардан ғана алу"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Іске қосу түрін таңдау"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Уақыты"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"(мысалы, \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Күнтізбе"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"(мысалы, \"Жеке күнтізбе\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Режим жасау"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Арнаулы"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Хабарландыруларды шектеу"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Мазаламау режимін қосу"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Оятқыштар мен мультимедиа дыбыстары тоқтата алады."</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Кестелер"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Кестелерді жою"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Жою"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Атын өзгерту"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Жою"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" режимі өшірілсін бе?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Өзгерту"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Кестелер"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Кесте"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Күнтізбе қосыңыз"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Өз күнтізбеңізді пайдаланыңыз"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Жоспарлау"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Кесте құру"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Кесте"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> сағ <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Автоматты түрде қосу"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Кесте"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Телефонды үнсіз режимге қою"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Мазаламау ережесін орнату"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Дыбыстарға рұқсат ету"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Көрнекі мазалағыштарды бөгеу"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуалды сигналдарды қосу"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Сізге жіберілуі мүмкін хабарландырулар"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Жолға қараңыз!"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Қосымша әрекеттер"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Өшірулі}=1{Өшірулі / 1 режимді автоматты түрде қосуға болады.}other{Өшірулі / # режимді автоматты түрде қосуға болады.}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Дисплей параметрлері"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Дисплей опциялары"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Сұр түстер"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"қараңғы режимді қосу"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Ашық түсті мәтін қараңғы фонда көрсетілу үшін операциялық жүйе мен қолданба режимін ауыстырыңыз. Сонда көзге жеңіл болады әрі кейбір құрылғылардың батареясын барынша үнемдейді."</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"Кедергілерді іріктеу"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ешқандай кедергі іріктелмейді."</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"хабарландыруды ашу"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Хабарландыруларды кейінге қалдыруға рұқсат беру"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Қолданба белгішесіндегі хабарландыру белгісі"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Хабарландыру топтары"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Қалқыма хабарлар"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Қалқыма хабарлар"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Осы әңгімені қалқыма хабар түрінде шығару"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Бұл қолданбада жақсартылған параметрлерге қолдау көрсетілмейді."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Қосымша параметрлер"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Қолданбада қосымша параметрлер қолжетімді."</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Хабарландыру дыбысын бәсеңдету"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Жұмыс профильдеріне қолдану"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Жұмыс профиліндегі қолданбаларға қолдану"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Санаттар"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Басқа"</string>
<string name="no_channels" msgid="4716199078612071915">"Бұл қолданба ешқандай хабарландыру жіберген жоқ."</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Пайдаланылмайтын санаттарды көрсету"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Қолданбадағы қосымша параметрлер"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Пайдаланылмайтын санаттарды көрсету"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Пайдаланылмайтын санаттарды жасыру"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Тоқтата алатын қолданбалар"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Таңдалған қолданбалар"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Жоқ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Барлығы"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Қолданбаларға қайта анықтауға рұқсат беру"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Тоқтата алатын қолданбалар"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Басқа да қолданбаларды таңдаңыз"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ештеңе тоқтата алмайды"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ешкім тоқтата алмайды"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Кейбір адамдар тоқтата алады."</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Барлығы тоқтата алады."</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Қайта қоңырау шалушылар"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Қайта қоңырау шалушыларға рұқсат ету"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Мына уақытқа дейін оятқышқа бір сағатқа өзгерту: {time}}other{Мына уақытқа дейін оятқышқа # сағатқа өзгерту: {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін \"дабылдар ғана\" режиміне өзгерту"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Әрқашан тоқтатуға өзгерту"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Өзгерту режимі"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Режим енгізу"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Пайдаланушы режимі"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Режим аты"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Ескерту"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Жабу"</string>
<string name="device_feedback" msgid="5351614458411688608">"Осы құрылғы туралы пікір жіберу"</string>
@@ -4286,7 +4331,7 @@
<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">"Құтқару қызметін шақыру, медициналық ақпарат, хабарландырулар"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Қимылмен басқару"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Негізгі экранға өту үшін экранның төменгі жағынан жоғары қарай сырғытыңыз. Қолданбалар арасында ауысу үшін төменнен жоғары қарай сырғытып, ұстап тұрыңыз да, саусағыңызды жіберіңіз. Артқа оралу үшін экранның сол немесе оң жиегінен сырғытыңыз."</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Жұмыс үстелінің режимін мәжбүрлеп қосу"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Қосымша дисплейлерде эксперименттік жұмыс үстелі режимін мәжбүрлеп қосу"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Еркін пішінді терезелерге рұқсат беру"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Еркін пішінді терезелерді қолдауға рұқсат береді."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Екінші экранда еркін пішінді терезе құруға рұқсат беру"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Еркін пішінді терезе құруға тек қосалқы экранда рұқсат береді."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Өлшемі өзгермейтін қолданба мен көп терезелі режим"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Өлшемі өзгермейтін қолданбаларды көп терезелі режимде пайдалануға мүмкіндік береді."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Қараңғылауға жол бермеу"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 КБ әзірлеуші опциясын пайдаланбас бұрын, құрылғының деректер бөлігін ext4 файл жүйесіне түрлендіру керек. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. 16 КБ опциясын қосқаннан кейін, құрылғыны тағы бір рет өшіріп қосу керек. Осы режимге өткеннен кейін, 4 КБ және 16 КБ режимдері арасында бір рет өшіріп қосу арқылы ауыса аласыз. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Құрылғыны жұмыс күйіне қайтару үшін 4 КБ режиміне қайта ауысып, құрылғыны зауыттық параметрлерге қайтаратын жүктегішті құлыптау керек. Құрылғы Android жүйесіне жүктелген кезде, Әзірлеуші опцияларынан жүктегіш құлпын ашу параметрін өшіріңіз. Растағаннан кейін, құрылғы тазартылып, файл жүйесі ext4 түріне өзгертіледі. Болған соң, қайта оралып, 16 КБ режимін қайта қосыңыз."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Барлық деректі өшіру"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Құрылғыны қайта форматтау және деректер бөлімін ext4 жүйесіне тазарту мүмкін болмады."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 КБ режимі үшін жүктегіш құлпын ашу керек"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Жүктегіштің құлпын ашу керек"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 КБ әзірлеуші опциясын пайдаланбас бұрын, құрылғыдағы жүктегіш құлпын ашу керек. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Пайдаланушының барлық дерегі мен параметрі 16 КБ режимі қосылған кезде тазартылады. Жүктегіш құлпын ашқан соң, 16 КБ опциясын қосу үшін құрылғыны екі рет өшіріп қосу керек. Осы режимге өткеннен кейін, 4 КБ және 16 КБ режимдері арасында бір рет өшіріп қосу арқылы ауыса аласыз. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Құрылғыны жұмыс күйіне қайтару үшін 4 КБ режиміне қайта ауысып, (құрылғыны зауыттық параметрлерге қайтаратын) жүктегішті құлыптау керек. Жүктегіш құлпын ашып, қайталап көріңіз. Осыған қатысты нұсқауларды мына сілтеме арқылы көре аласыз: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Бетке тәуелсіз 4 КБ режимін пайдалану"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Бетке тәуелсіз режимдегі 4 КБ режимінде жұмыс істеп отырсыз. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Жұмыс режиміне қайта оралу үшін құрылғының жүктегішін құлыптау керек. Қосымша ақпарат алу үшін түртіңіз."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Бетке тәуелсіз режимдегі 4 КБ режимінде жұмыс істеп отырсыз. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Жұмыс режиміне қайта оралу үшін құрылғының жүктегішін құлыптау керек. Мұндайда құрылғы қайтадан зауыттық параметрлерге қайтарылып, жұмыс параметрлері қалпына келтіріледі. Құрылғы Android жүйесіне жүктелген кезде, Әзірлеуші опцияларынан жүктегіш құлпын ашу параметрін өшіріңіз. Құрылғыда Android жүйесі жүктелмесе немесе дұрыс жұмыс істемесе, құрылғыны <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> немесе <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> сілтемесіндегі зауыттық образдармен қайта бағдарламалап, \"Құрылғыны тазарту\", \"Жүктегішті құлыптау\" және \"Барлық бөлікті бағдарламау\" опцияларын таңдаңыз."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Бетке тәуелсіз 16 КБ режимін пайдалану"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Бетке тәуелсіз режимдегі 16 КБ режимінде жұмыс істеп отырсыз. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Жұмыс күйіне қайта оралу үшін 4 К режиміне қайта ауысып, құрылғының жүктегішін құлыптау керек. Қосымша ақпарат алу үшін түртіңіз."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Бетке тәуелсіз режимдегі 16 КБ режимінде жұмыс істеп отырсыз. Бұл режимде жұмыс істеген кезде, бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашылған кезде, телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Осы режимдерде кейбір функциялар өшірілетіндіктен, кейбір қолданбалар жұмыс істемеуі мүмкін. Жұмыс күйіне қайта оралу үшін 4 К режиміне қайта ауысып, құрылғының жүктегішін құлыптау керек. Мұндайда құрылғы қайтадан зауыттық параметрлерге қайтарылып, жұмыс параметрлері қалпына келтіріледі. Құрылғы Android жүйесіне жүктелген кезде, Әзірлеуші опцияларынан жүктегіш құлпын ашу параметрін өшіріңіз. Құрылғыда Android жүйесі жүктелмесе немесе дұрыс жұмыс істемесе, құрылғыны <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> немесе <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> сілтемесіндегі зауыттық образдармен қайта бағдарламалап, \"Құрылғыны тазарту\", \"Жүктегішті құлыптау\" және \"Барлық бөлікті мәжбүрлеп бағдарламалау\" опцияларын таңдаңыз."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Бет өлшеміне тәуелсіз режимдегі 16 КБ режимінде жұмыс істеп отырсыз. Бұл режимде бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашық кезде телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Бұл режимдерде кейбір функциялар өшірілетіндіктен, белгілі бір қолданбалар жұмыс істемеуі мүмкін. Жұмыс күйіне қайта оралу үшін 4 КБ режиміне қайта ауысып, құрылғының жүктегішін құлыптау керек. Қосымша ақпарат алу үшін түртіңіз."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Бет өлшеміне тәуелсіз режимдегі 16 КБ режимінде жұмыс істеп отырсыз. Бұл режимде бағдарламалық құрал тұтастығына кепілдік берілмейді және жүктегіш құлпы ашық кезде телефоныңызда сақталған деректерге қауіп төнуі мүмкін. Бұл режимдерде кейбір функциялар өшірілетіндіктен, белгілі бір қолданбалар жұмыс істемеуі мүмкін. Жұмыс күйіне қайта оралу үшін 4 КБ режиміне қайта ауысып, құрылғының жүктегішін құлыптау керек. Мұндайда құрылғы қайтадан зауыттық параметрлерге қайтарылып, жұмыс параметрлері қалпына келтіріледі. Құрылғы Android жүйесіне жүктелгенде, \"Әзірлеуші опциялары\" параметрлерінен жүктегіш құлпын ашу параметрін өшіріңіз. Құрылғы Android жүйесіне жүктелмесе немесе дұрыс жұмыс істемесе, құрылғыны <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> немесе <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> сілтемесіндегі зауыттық образдармен қайта бағдарламалап, \"Құрылғыны тазарту\", \"Жүктегішті құлыптау\" және \"Барлық бөлікті бағдарламау\" опцияларын таңдаңыз."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Бетке тәуелсіз 16 КБ режимі"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Толық ақпарат"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Қате туралы есеп өңдеу құралы"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Қолданбаны бекіту функциясын пайдалану"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Әзірлеуші опцияларын пайдалану"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Баспа қызметін пайдалану"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Бірнеше пайдаланушыға рұқсат беру"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Пайдаланушыны ауыстыруға рұқсат беру"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"рұқсат беру, бірнеше, пайдаланушы, көп"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"бірнеше, пайдаланушылар, профильдер, адамдар, аккаунттар, ауыстыру, көп"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Сымсыз түзетуді пайдалану"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Планшет қондыру станциясына қойылған кезде, экраныңызда ненің көрсетілетінін таңдаңыз. Скринсейвер пайдаланылған кезде құрылғы көбірек қуат тұтынуы мүмкін."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Реттеу"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> скринсейверін бейімдеу"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Еркін түрде қолдау параметрін белсендіру үшін құрылғыны өшіріп қосу қажет."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Қосымша дисплейлерде жұмыс үстелі режимін мәжбүрлеп белсендіру үшін құрылғыны өшіріп қосу қажет."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Еркін пішінді терезелерді қолдауға рұқсат беру үшін құрылғыны өшіріп қосу қажет."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Еркін пішінді терезелерді қолдауды өзгерту үшін құрылғыны өшіріп қосу қажет."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Қосалқы экранда еркін пішінді терезені күштеп құру үшін құрылғыны өшіріп қосу қажет."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Қазір өшіріп қосу"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Кейінірек өшіріп қосу"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Кеңістіктік дыбыс"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Қосулы"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Өшірулі"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Қосулы"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио: сол жақ %1$d%%, оң жақ %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио: сол жақ %1$d%%, оң жақ %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Құрылғыңыздың аты орнатылған қолданбаларға көрінеді. Bluetooth құрылғыларына, Wi-Fi желісіне қосылғанда немесе Wi-Fi хотспотын орнатқанда, басқа адамдарға да көрінуі мүмкін."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Грамматикалық тек"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Грамматикалық текті таңдаңыз"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Іздеу параметрлері"</string>
</resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 2500cdd..10fdbab 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ម៉ោងគេង"</item>
+ <item msgid="4152450357280759894">"កំពុងបើកបរ"</item>
+ <item msgid="7096549258219399423">"ជក់ចិត្ត"</item>
+ <item msgid="2760716776980432977">"បានគ្រប់គ្រង"</item>
+ <item msgid="601734478369121764">"ផ្កាយ"</item>
+ <item msgid="6243809315432780521">"ប្រតិទិន"</item>
+ <item msgid="4913577903148415331">"ពេលវេលា"</item>
+ <item msgid="3653377604690057780">"រោងល្ខោន"</item>
+ <item msgid="3843711267408385410">"ផ្កា"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c45d27a..1aac673 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ផ្ដាច់ឧបករណ៍?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ផ្គូផ្គងឧបករណ៍ថ្មី"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ប៊្លូធូស"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"បើកនៅថ្ងៃស្អែកដោយស្វ័យប្រវត្តិ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ការកំណត់ឧបករណ៍ជំនួយការស្ដាប់"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ផ្លូវកាត់ ភាពត្រូវគ្នាជាមួយនឹងឧបករណ៍ជំនួយការស្ដាប់"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"កំណត់ជាមុន"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"មិនមានការកំណត់ជាមុនដែលរៀបចំដោយអ្នកជំនាញផ្នែកសោតវិញ្ញាណរបស់អ្នកទេ"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"មិនអាចប្ដូរការកំណត់ជាមុនបានទេ"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ឧបករណ៍បញ្ចេញសំឡេង"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"អំពីឧបករណ៍បញ្ចេញសំឡេង"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"បិទ"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{បើក / កម្មវិធី # មានសិទ្ធិចូលប្រើទីតាំង}other{បើក / កម្មវិធី # មានសិទ្ធិចូលប្រើទីតាំង}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"កំពុងផ្ទុក…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"កម្មវិធីដែលមានការអនុញ្ញាតឱ្យប្រើឧបករណ៍នៅជិតអាចកំណត់ចម្ងាយពាក់ព័ន្ធនៃឧបករណ៍ដែលបានភ្ជាប់។"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"កម្មវិធីដែលមានការអនុញ្ញាតឧបករណ៍នៅជិតអាចកំណត់ទីតាំងដែលពាក់ព័ន្ធនៃឧបករណ៍ដែលបានភ្ជាប់។"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ការចូលប្រើទីតាំងត្រូវបានបិទសម្រាប់កម្មវិធី និងសេវាកម្ម។ ទីតាំងឧបករណ៍របស់អ្នកនៅតែអាចត្រូវបានផ្ញើទៅអ្នកសង្គ្រោះបន្ទាន់ដដែល នៅពេលដែលអ្នកហៅទូរសព្ទ ឬផ្ញើសារជាអក្សរទៅលេខសង្គ្រោះបន្ទាន់។"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ស្វែងយល់បន្ថែមអំពីការកំណត់ទីតាំង"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ដើម្បីផ្លាស់ប្ដូរ សូមចូលទៅកាន់ការកំណត់ ChromeOS > ឯកជនភាព និងសុវត្ថិភាព > ការគ្រប់គ្រងឯកជនភាព > ការចូលប្រើទីតាំង"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"បានបញ្ចូលមុខ និង <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"បានបញ្ចូលមុខ ស្នាមម្រាមដៃ និង <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"បានបញ្ចូលមុខ ស្នាមម្រាមដៃ និង <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ចាំបាច់ធ្វើសកម្មភាពនេះ ដោយសារតែការត្រួតពិនិត្យអត្តសញ្ញាណត្រូវបានបើក"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"ការដោះសោពីចម្ងាយតាមកម្មវិធីផ្ទៀងផ្ទាត់"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"បានបញ្ចូលនាឡិកាហើយ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"រៀបចំនាឡិការបស់អ្នក"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ស្វែងយល់បន្ថែមអំពីការដោះសោដោយប្រើនាឡិកា"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"បញ្ចូលនាឡិកា"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ដកនាឡិកាចេញ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ការដោះសោដោយស្កេនមុខ និងស្នាមម្រាមដៃ"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ការដោះសោដោយស្កេនមុខ និងស្នាមម្រាមដៃ"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ការដោះសោដោយស្កេនស្នាមម្រាមដៃ និងមុខសម្រាប់ការងារ"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ត្រូវការរៀបចំ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"បានបញ្ចូលស្នាមម្រាមដៃ និងមុខ"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ដំឡើងកម្មវិធី"</b>\n"ដំឡើងកម្មវិធីដែលអ្នកចង់រក្សាឱ្យមានភាពឯកជននៅក្នុងលំហរបស់អ្នក"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"សូមចងចាំ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"កម្មវិធីឈប់នៅពេលអ្នកចាក់សោលំហរបស់អ្នក"</b>\n"នៅពេលអ្នកចាក់សោលំហរបស់អ្នក កម្មវិធីនៅក្នុងលំហរបស់អ្នកត្រូវបានបញ្ឈប់ ហើយអ្នកនឹងមិនទទួលបានការជូនដំណឹងពីកម្មវិធីទាំងនេះទេ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"លំហឯកជនមិនស័ក្ដិសមសម្រាប់កម្មវិធីដែលត្រូវការដំណើរការនៅផ្ទៃខាងក្រោយ ឬផ្ញើការជូនដំណឹងសំខាន់ខ្លាំង ដូចជា កម្មវិធីវេជ្ជសាស្រ្តជាដើមនោះទេ។ ប្រការនេះគឺដោយសារតែការជូនដំណឹង និងសកម្មភាពនៅផ្ទៃខាងក្រោយត្រូវបានបញ្ឈប់ នៅពេលលំហរបស់អ្នកត្រូវបានចាក់សោ។\n\nកម្មវិធីនៅក្នុងលំហឯកជនរបស់អ្នកនឹងមិនបង្ហាញនៅក្នុងមុខងារគ្រប់គ្រងការអនុញ្ញាត ផ្ទាំងគ្រប់គ្រងឯកជនភាព និងការកំណត់ផ្សេងទៀតនៅពេលលំហឯកជនរបស់អ្នកត្រូវបានចាក់សោទេ។\n\nមិនអាចផ្លាស់ទីលំហឯកជនរបស់អ្នកទៅឧបករណ៍ថ្មីបានទេ។ អ្នកនឹងត្រូវរៀបចំលំហឯកជនមួយទៀត ប្រសិនបើអ្នកចង់ប្រើវាលើឧបករណ៍មួយទៀត។\n\nគ្រប់គ្នាដែលភ្ជាប់ឧបករណ៍របស់អ្នកទៅនឹងកុំព្យូទ័រ ឬដំឡើងកម្មវិធីគ្រោះថ្នាក់នៅលើឧបករណ៍របស់អ្នក ប្រហែលអាចចូលប្រើប្រាស់លំហឯកជនរបស់អ្នកបាន។"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"លំហឯកជនមិនស័ក្ដិសមសម្រាប់កម្មវិធីដែលត្រូវការដំណើរការនៅផ្ទៃខាងក្រោយ ឬផ្ញើការជូនដំណឹងសំខាន់ខ្លាំង ដូចជា កម្មវិធីវេជ្ជសាស្រ្តជាដើមនោះទេ។ ប្រការនេះគឺដោយសារតែការជូនដំណឹង និងសកម្មភាពនៅផ្ទៃខាងក្រោយត្រូវបានបញ្ឈប់ នៅពេលលំហរបស់អ្នកត្រូវបានចាក់សោ។\n\nកម្មវិធីនៅក្នុងលំហឯកជនរបស់អ្នកនឹងមិនបង្ហាញនៅក្នុងមុខងារគ្រប់គ្រងការអនុញ្ញាត ផ្ទាំងគ្រប់គ្រងឯកជនភាព និងការកំណត់ផ្សេងទៀតទេ នៅពេលលំហឯកជនរបស់អ្នកត្រូវបានចាក់សោ។\n\nមិនអាចស្ដារលំហឯកជនរបស់អ្នកទៅឧបករណ៍ថ្មីបានទេ។ អ្នកនឹងត្រូវរៀបចំលំហមួយទៀត ប្រសិនបើអ្នកចង់ប្រើវានៅលើឧបករណ៍មួយទៀត។\n\nនរណាក៏ដោយដែលភ្ជាប់ឧបករណ៍របស់អ្នកទៅកុំព្យូទ័រ ឬដំឡើងកម្មវិធីគ្រោះថ្នាក់នៅលើឧបករណ៍របស់អ្នក ប្រហែលជាអាចចូលប្រើលំហឯកជនរបស់អ្នកបាន។"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ស្វែងយល់បន្ថែមអំពីលំហឯកជន"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"សកម្មភាពនេះនឹងចំណាយពេលបន្តិច"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"កំពុងរៀបចំលំហឯកជន…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ចាប់ផ្តើមឧបករណ៍ឡើងវិញឬ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ការកត់ត្រា NFC លម្អិតគឺសម្រាប់តែការអភិវឌ្ឍប៉ុណ្ណោះ។ ទិន្នន័យ NFC បន្ថែមត្រូវបានរួមបញ្ចូលក្នុងរបាយការណ៍អំពីបញ្ហាដែលអាចមានព័ត៌មានឯកជន។ ចាប់ផ្ដើមឧបករណ៍របស់អ្នកឡើងវិញ ដើម្បីប្ដូរការកំណត់នេះ។"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ចាប់ផ្ដើមឡើងវិញ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"បញ្ចាំង, ផ្ទាំងអេក្រង់ខាងក្រៅ, ផ្ទាំងអេក្រង់ដែលបានភ្ជាប់, ផ្ទាំងអេក្រង់ usb, កម្រិតគុណភាព, ការបង្វិល"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ការបង្វិល"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ស្តង់ដារ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1260,7 +1275,7 @@
<string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"ការកំណត់មុខងារម៉ោងគេង"</string>
<string name="even_dimmer_display_title" msgid="6731255736830410149">"កាន់តែងងឹត"</string>
<string name="even_dimmer_display_summary" msgid="120301078873242172">"អនុញ្ញាតឱ្យឧបករណ៍មានពន្លឺងងឹតជាងធម្មតា"</string>
- <string name="screen_timeout" msgid="7709947617767439410">"រយៈពេលបិទអេក្រង់"</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>
<string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"មិនបានកំណត់"</string>
<string name="wallpaper_settings_title" msgid="5635129851136006383">"ផ្ទាំងរូបភាព"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ប្រើក្ដារចុចលើអេក្រង់"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"រក្សានៅលើអេក្រង់ ពេលក្តារចុចរូបវ័ន្តកំពុងធ្វើប្រតិបត្តិការ"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ប្ដូរស្តាយល៍បំពេញរបស់ព្រួញទៅលឿង"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ប្ដូរស្តាយល៍បំពេញរបស់ព្រួញទៅផ្កាឈូក"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ប្ដូរស្តាយល៍បំពេញរបស់ព្រួញទៅខៀវ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"រចនាប័ទ្មគំនូសសញ្ញាព្រួញ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ស"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ខ្មៅ"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"គ្មាន"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"បានជ្រើសរើសដោយអ្នកប្រើប្រាស់៖ <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ការនិយាយ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ល្បឿនព្រួញ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"សមាមាត្រសញ្ញាព្រួញ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"បន្ថយសមាមាត្រសញ្ញាព្រួញ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"បង្កើនសមាមាត្រសញ្ញាព្រួញ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"កម្មវិធីពិនិត្យល្បែង"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ការញ័រពេលបញ្ជូនបន្ត"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"បញ្ជូនរំញ័រទៅឧបករណ៍បញ្ជាហ្គេមនៅពេលភ្ជាប់"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"មិនអីទេ បន្តចុះ"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"បោះបង់"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ការកំណត់ការពង្រីក"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ការចាប់អូសដោយម្រាមដៃមួយ"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ផ្លាស់ទីកែវពង្រីកដោយប្រើម្រាមដៃ 1"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"អូសម្រាមដៃ 1 ដើម្បីផ្លាស់ទីជុំវិញអេក្រង់"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ផ្លាស់ទីផ្ទៃពង្រីកដោយអូសម្រាមដៃមួយ។"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ផ្លាស់ទីផ្ទៃពង្រីកដោយអូសម្រាមដៃពីរ។"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"មិនអាចប្រើបានទេ ពេលពង្រីកតែផ្នែកនៃអេក្រង់"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ចុចប៊ូតុងដើម្បីពង្រីក ឬបង្រួម"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ពង្រីកនៅលើអេក្រង់យ៉ាងរហ័ស ដើម្បីបង្ហាញខ្លឹមសារធំជាងមុន"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ដើម្បីពង្រីក៖</b><br/> {0,number,integer}. ប្រើផ្លូវកាត់ ដើម្បីចាប់ផ្ដើមការពង្រីក<br/> {1,number,integer}. ចុចអេក្រង់<br/> {2,number,integer}. អូសម្រាមដៃ 2 ដើម្បីផ្លាស់ទីនៅជុំវិញអេក្រង់<br/>{3,number,integer}. ច្បិចដោយប្រើម្រាមដៃ 2 ដើម្បីកែតម្រូវការពង្រីកបង្រួម<br/> {4,number,integer}. ប្រើផ្លូវកាត់ ដើម្បីបញ្ឈប់ការពង្រីក<br/><br/> <b>ដើម្បីពង្រីកជាបណ្ដោះអាសន្ន៖</b><br/> {0,number,integer}. សូមប្រាកដថា ប្រភេទនៃការពង្រីករបស់អ្នកត្រូវបានកំណត់ទៅពេញអេក្រង់<br/> {1,number,integer}. ប្រើផ្លូវកាត់ ដើម្បីចាប់ផ្ដើមការពង្រីក<br/> {2,number,integer}. ចុចកន្លែងណាមួយនៅលើអេក្រង់ឱ្យជាប់<br/> {3,number,integer}. អូសម្រាមដៃ ដើម្បីផ្លាស់ទីនៅជុំវិញអេក្រង់<br/> {4,number,integer}. ដកម្រាមដៃចេញ ដើម្បីបញ្ឈប់ការពង្រីក"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ដើម្បីពង្រីក៖</b><br/> {0,number,integer}។ ប្រើផ្លូវកាត់ ដើម្បីចាប់ផ្ដើមការពង្រីក<br/> {1,number,integer}។ ចុចអេក្រង់<br/> {2,number,integer}។ អូសម្រាមដៃ 2 ដើម្បីផ្លាស់ទីលើអេក្រង់<br/>{3,number,integer}។ ច្បិចដោយប្រើម្រាមដៃ 2 ដើម្បីកែតម្រូវការពង្រីកបង្រួម<br/> {4,number,integer}។ ប្រើផ្លូវកាត់ ដើម្បីបញ្ឈប់ការពង្រីក<br/><br/> អ្នកក៏អាចពង្រីកជាបណ្ដោះអាសន្ន និងធ្វើអ្វីៗជាច្រើនទៀតបានផងដែរ។"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ដើម្បីពង្រីក៖</b><br/> {0,number,integer}។ ប្រើផ្លូវកាត់ ដើម្បីចាប់ផ្ដើមការពង្រីក<br/> {1,number,integer}។ ចុចអេក្រង់<br/> {2,number,integer}។ អូសម្រាមដៃ 1 ឬ 2 ដើម្បីផ្លាស់ទីលើអេក្រង់<br/> {3,number,integer}។ ច្បិចដោយប្រើម្រាមដៃ 2 ដើម្បីកែតម្រូវការពង្រីកបង្រួម<br/> {4,number,integer}។ ប្រើផ្លូវកាត់ ដើម្បីបញ្ឈប់ការពង្រីក<br/><br/> អ្នកក៏អាចពង្រីកជាបណ្ដោះអាសន្ន និងធ្វើអ្វីៗជាច្រើនទៀតបានផងដែរ។"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"នៅពេលបើកការពង្រីក អ្នកអាចពង្រីកនៅលើអេក្រង់របស់អ្នកបាន។\n\n"<b>"ដើម្បីពង្រីកបង្រួម"</b>" សូមចាប់ផ្ដើមការពង្រីក រួចចុចលើកន្លែងណាមួយនៅលើអេក្រង់។\n"<ul><li>"អូសដោយប្រើម្រាមដៃ 2 ឬច្រើនដើម្បីរំកិល"</li>\n<li>"ច្បិចដោយប្រើម្រាមដៃ 2 ឬច្រើន ដើម្បីកែតម្រូវការពង្រីកបង្រួម"</li></ul>\n\n<b>"ដើម្បីពង្រីកបង្រួមជាបណ្តោះអាសន្ន"</b>" ចាប់ផ្តើមការពង្រីក បន្ទាប់មកចុចសង្កត់កន្លែងណាមួយនៅលើអេក្រង់ឱ្យជាប់។\n"<ul><li>"អូសដើម្បីផ្លាស់ទីនៅលើអេក្រង់"</li>\n<li>"លើកម្រាមដៃឡើងដើម្បីបង្រួម"</li></ul>\n\n"អ្នកមិនអាចពង្រីកនៅលើក្តារចុច ឬរបាររុករកបានទេ។"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"ទំព័រទី <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> នៃ <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ផ្លូវកាត់ប៊ូតុងភាពងាយស្រួល"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{គ្មាន}=1{បានកំណត់កាលវិភាគ 1}other{បានកំណត់កាលវិភាគ #}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"កុំរំខាន"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ម៉ូដអាទិភាព"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"បញ្ចូលមុខងារ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ទទួលការជូនដំណឹងពីកម្មវិធី និងមនុស្សសំខាន់ៗតែប៉ុណ្ណោះ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"ជ្រើសរើសប្រភេទនៃការបើកដំណើរការ"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ពេលវេលា"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ឧ. \"9:30 – 5:00 ល្ងាច\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ប្រតិទិន"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ឧ. \"ប្រតិទិនផ្ទាល់ខ្លួន\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"បង្កើតមុខងារ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ផ្ទាល់ខ្លួន"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"កាត់បន្ថយការរំខាន"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"បើកមុខងារកុំរំខាន"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"សំឡេងមេឌៀ និងម៉ោងរោទ៍អាចផ្អាកបាន"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"កាលវិភាគ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"លុបកាលវិភាគ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"លុប"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"ប្ដូរឈ្មោះ"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"លុប"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"លុបមុខងារ \"<xliff:g id="MODE">%1$s</xliff:g>\" ឬ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"កែ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"កាលវិភាគ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"កាលវិភាគ"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"បញ្ចូលប្រតិទិន"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ប្រើប្រតិទិនរបស់អ្នក"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"កាលវិភាគ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"កំណត់កាលវិភាគ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"កាលវិភាគ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ម៉ <xliff:g id="MINUTES">%2$d</xliff:g> ន"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"បើកដោយស្វ័យប្រវត្តិ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"កាលវិភាគ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"បិទសំឡេងទូរសព្ទក្នុងពេលជាក់លាក់"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"កំណត់ច្បាប់សម្រាប់មុខងារកុំរំខាន"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"អនុញ្ញាតការរំខានដែលបញ្ចេញសំឡេង"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"រារាំងការរំខានក្នុងការមើល"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"អនុញ្ញាតសញ្ញាដែលមើលឃើញ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ការជូនដំណឹងដែលអាចផ្សាយទៅដល់អ្នក"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ផ្ដោតអារម្មណ៍"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"សកម្មភាពបន្ថែម"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{បិទ}=1{បិទ / មុខងារ 1 អាចបើកដោយស្វ័យប្រវត្តិ}other{បិទ / មុខងារ # អាចបើកដោយស្វ័យប្រវត្តិ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ការកំណត់ផ្ទាំងអេក្រង់"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ជម្រើសផ្ទាំងអេក្រង់"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"មាត្រដ្ឋានពណ៌ប្រផេះ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"បើកទម្រង់រចនាងងឹត"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ប្ដូរប្រព័ន្ធប្រតិបត្តិការ និងកម្មវិធីទៅអក្សរពណ៌ស្រាលដែលចង់ប្រើនៅលើផ្ទៃខាងក្រោយងងឹត ដែលអាចមានភាពងាយស្រួលជាងមុនសម្រាប់ភ្នែក និងជួយសន្សំថ្មបានច្រើននៅលើឧបករណ៍មួយចំនួន"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"ត្រងការរំខាន"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"គ្មានការរំខានត្រូវបានត្រងទេ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"បើកការជូនដំណឹង"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"អនុញ្ញាតការផ្អាកការជូនដំណឹង"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ស្លាកជូនដំណឹងនៅលើរូបកម្មវិធី"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"កញ្ចប់នៃការជូនដំណឹង"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ពពុះ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ពពុះ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"បង្ហាញការសន្ទនានេះជាពពុះ"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"កម្មវិធីនេះមិនស្គាល់ការកំណត់ដែលប្រសើរឡើងទេ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ការកំណត់ច្រើនទៀត"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"អាចប្រើការកំណត់បានច្រើនទៀតនៅក្នុងកម្មវិធីនេះ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"ការបន្ថយសំឡេងការជូនដំណឹង"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ដាក់ប្រើលើកម្រងព័ត៌មានការងារ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ដាក់ប្រើលើកម្មវិធីកម្រងព័ត៌មានការងារ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ប្រភេទ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ផ្សេងៗ"</string>
<string name="no_channels" msgid="4716199078612071915">"កម្មវិធីនេះមិនបានបង្ហោះការជូនដំណឹងណាមួយឡើយ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"បង្ហាញប្រភេទដែលមិនប្រើ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ការកំណត់បន្ថែមនៅក្នុងកម្មវិធីនេះ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"បង្ហាញប្រភេទដែលមិនប្រើ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"លាក់ប្រភេទដែលមិនប្រើ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"កម្មវិធីដែលអាចផ្អាកបាន"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"កម្មវិធីដែលបានជ្រើសរើស"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"គ្មាន"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ទាំងអស់"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"អនុញ្ញាតឱ្យកម្មវិធីលុបពីលើ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"កម្មវិធីដែលអាចផ្អាកបាន"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ជ្រើសរើសកម្មវិធីច្រើនទៀត"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"គ្មានអ្វីមួយអាចផ្អាកបានទេ"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"គ្មាននរណាអាចផ្អាកបានទេ"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"មនុស្សមួយចំនួនអាចផ្អាកបាន"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"នរណាក៏អាចផ្អាកបានដែរ"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"អ្នកហៅចូលសាជាថ្មី"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"អនុញ្ញាតអ្នកហៅដដែលៗ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{ប្ដូរទៅម៉ោងរោទ៍រយៈពេលតែមួយម៉ោងប៉ុណ្ណោះរហូតដល់ {time}}other{ប្ដូរទៅម៉ោងរោទ៍រយៈពេលតែ # ម៉ោងប៉ុណ្ណោះរហូតដល់ {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"ប្តូរទៅម៉ោងរោទិ៍រហូតទាល់តែដល់ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ប៉ុណ្ណោះ"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ប្តូរទៅរំខានជានិច្ច"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"មុខងារកែ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"មុខងារបញ្ចូល"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"មុខងារផ្ទាល់ខ្លួន"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ឈ្មោះមុខងារ"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ការព្រមាន"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"បិទ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ផ្ដល់មតិកែលម្អអំពីឧបករណ៍នេះ"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"បង្ខំមុខងារអេក្រង់ដើម"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"បង្ខំមុខងារអេក្រង់ដើមសាកល្បងនៅលើអេក្រង់ទីពីរ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"បើកវិនដូទម្រង់សេរី"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"បើកជំនួយសម្រាប់វិនដូទម្រង់សេរី។"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"បើកវិនដូទម្រង់សេរីលើផ្ទាំងអេក្រង់ទីពីរ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"បើកវិនដូទម្រង់សេរីតែផ្ទាំងអេក្រង់ទីពីរប៉ុណ្ណោះ។"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"បើកកម្មវិធីដែលមិនអាចប្ដូរទំហំបាននៅក្នុងពហុវិនដូ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"អនុញ្ញាតឱ្យកម្មវិធីដែលមិនអាចប្ដូរទំហំបានស្ថិតនៅក្នុងពហុវិនដូ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"លុបពីលើមុខងារបង្ខំឱ្យងងឹត"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"ផ្នែកទិន្នន័យរបស់ឧបករណ៍នេះត្រូវបំប្លែងទៅជា ext4 មុនពេលប្រើជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍ 16KB។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ ការបើកដំណើរការជម្រើស 16KB នឹងតម្រូវឱ្យមានការចាប់ផ្ដើមឡើងវិញម្ដងទៀតបន្ទាប់ពីនេះ។ នៅពេលដែលអ្នកកំពុងប្រើមុខងារនេះ អ្នកអាចប្ដូរទៅមករវាងមុខងារ 4KB និង 16KB តាមរយៈការចាប់ផ្ដើមឡើងវិញតែម្ដងគត់។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីត្រឡប់ឧបករណ៍ទៅមុខងារផលិតកម្ម អ្នកនឹងត្រូវប្ដូរត្រឡប់ទៅមុខងារ 4KB វិញ បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធ ដែលកំណត់ឧបករណ៍ដូចចេញពីរោងចក្រ។ បន្ទាប់ពីឧបករណ៍ចាប់ផ្ដើមចូល Android ដោយជោគជ័យ សូមបិទការដោះសោ OEM នៅក្នុងជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍។ ឧបករណ៍នឹងត្រូវបានឈូស ហើយប្រព័ន្ធឯកសារនឹងត្រូវបានប្ដូរទៅជា ext4 បន្ទាប់ពីបញ្ជាក់រួច។ បន្ទាប់ពីដំណើរការនេះចប់ សូមត្រឡប់មកបើក 16KB ម្ដងទៀត។"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"លុបទិន្នន័យទាំងអស់"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"មិនអាចឈូស និងកំណត់ទម្រង់ផ្នែកទិន្នន័យឡើងវិញទៅជា ext4 បានទេ។"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"តម្រូវឱ្យដោះសោកម្មវិធីដំណើរការប្រព័ន្ធសម្រាប់មុខងារ 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"តម្រូវឱ្យមានការដោះសោកម្មវិធីដំណើរការប្រព័ន្ធ"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"ឧបករណ៍នេះត្រូវដោះសោកម្មវិធីដំណើរការប្រព័ន្ធ មុនពេលប្រើជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍ 16KB។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ ទិន្នន័យ និងការកំណត់ទាំងអស់របស់អ្នកប្រើប្រាស់នឹងត្រូវបានឈូស នៅពេលបើកដំណើរការមុខងារ 16KB។ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ ការបើកដំណើរការជម្រើស 16KB នឹងតម្រូវឱ្យមានការចាប់ផ្ដើមឡើងវិញពីរដង។ នៅពេលដែលអ្នកកំពុងប្រើមុខងារនេះ អ្នកអាចប្ដូរទៅមករវាងមុខងារ 4KB និង 16KB តាមរយៈការចាប់ផ្ដើមឡើងវិញតែម្ដងគត់។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីត្រឡប់ឧបករណ៍ទៅមុខងារផលិតកម្ម អ្នកត្រូវប្ដូរទៅមុខងារ 4KB វិញ បន្ទាប់មក ការចាក់សោ OEM/កម្មវិធីដំណើរការប្រព័ន្ធ (ដែលកំណត់ឧបករណ៍ដូចចេញពីរោងចក្រ)។ សូមដោះសោកម្មវិធីដំណើរការប្រព័ន្ធ រួចព្យាយាមម្ដងទៀត។ អ្នកអាចមើលការណែនាំអំពីរបៀបអនុវត្តសកម្មភាពនេះតាម <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"ការប្រើមុខងារ Page-Agnostic 4KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"អ្នកកំពុងប្រើមុខងារ 4KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីបញ្ចូលមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ចុចដើម្បីអានបន្ថែម។"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"អ្នកកំពុងប្រើមុខងារ 4KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីបញ្ចូលមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ដំណើរការនេះនឹងកំណត់ឧបករណ៍ដូចចេញពីរោងចក្រ រួចត្រឡប់ឧបករណ៍ទៅការកំណត់ផលិតកម្មវិញ។ បន្ទាប់ពីឧបករណ៍ចាប់ផ្ដើមចូល Android ដោយជោគជ័យ សូមបិទការដោះសោ OEM នៅក្នុងជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍។ ប្រសិនបើឧបករណ៍មិនអាចចាប់ផ្ដើមប្រព័ន្ធប្រតិបត្តិការ Android ឬមិនមានស្ថិរភាព សូមជំនួសកម្មវិធីឧបករណ៍ឡើងវិញដោយប្រើរូបភាពពីរោងចក្រចុងក្រោយបំផុតពី <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ឬប្រើ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> រួចជ្រើសរើស \'ឈូសឧបករណ៍\' \'ចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធ\' និង \'បង្ខំឱ្យជំនួសផ្នែកទាំងអស់\'។"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"ដោយប្រើមុខងារ Page-Agnostic 16KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"អ្នកកំពុងប្រើមុខងារ 16KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីចូលទៅក្នុងមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែប្ដូរត្រឡប់ទៅមុខងារ 4K បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ចុចដើម្បីអានបន្ថែម។"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"អ្នកកំពុងប្រើមុខងារ 16KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីចូលទៅក្នុងមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែប្ដូរត្រឡប់ទៅមុខងារ 4K បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ដំណើរការនេះនឹងកំណត់ឧបករណ៍ដូចចេញពីរោងចក្រ រួចត្រឡប់ឧបករណ៍ទៅការកំណត់ផលិតកម្មវិញ។ បន្ទាប់ពីឧបករណ៍ចាប់ផ្ដើមចូល Android ដោយជោគជ័យ សូមបិទការដោះសោ OEM នៅក្នុងជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍។ ប្រសិនបើឧបករណ៍មិនអាចចាប់ផ្ដើមប្រព័ន្ធប្រតិបត្តិការ Android ឬមិនមានស្ថិរភាព សូមជំនួសកម្មវិធីឧបករណ៍ឡើងវិញដោយប្រើរូបភាពពីរោងចក្រចុងក្រោយបំផុតពី <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ឬប្រើ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> រួចជ្រើសរើស \'ឈូសឧបករណ៍\' \'ចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធ\' និង \'បង្ខំឱ្យជំនួសផ្នែកទាំងអស់\'។"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"អ្នកកំពុងប្រើមុខងារ 16KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីចូលទៅក្នុងមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែប្ដូរត្រឡប់ទៅមុខងារ 4KB បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ចុចដើម្បីអានបន្ថែម។"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"អ្នកកំពុងប្រើមុខងារ 16KB នៃមុខងារ Page-Agnostic។ មិនអាចធានាសុក្រឹតភាពកម្មវិធីនៅក្នុងមុខងារនេះទេ ហើយទិន្នន័យទាំងឡាយដែលបានរក្សាទុកនៅលើទូរសព្ទ នៅពេលកម្មវិធីដំណើរការប្រព័ន្ធត្រូវបានដោះសោ អាចប្រឈមនឹងហានិភ័យ។ មុខងារមួយចំនួននឹងត្រូវបានបិទនៅក្នុងមុខងារទាំងនេះ ដូច្នេះកម្មវិធីមួយចំនួនប្រហែលជាមិនដំណើរការទេ។ ដើម្បីចូលទៅក្នុងមុខងារផលិតកម្មឡើងវិញ អ្នកត្រូវតែប្ដូរត្រឡប់ទៅមុខងារ 4KB បន្ទាប់មកចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធរបស់ឧបករណ៍។ ដំណើរការនេះនឹងកំណត់ឧបករណ៍ដូចចេញពីរោងចក្រ រួចត្រឡប់ឧបករណ៍ទៅការកំណត់ផលិតកម្មវិញ។ បន្ទាប់ពីឧបករណ៍ចាប់ផ្ដើមចូល Android ដោយជោគជ័យ សូមបិទការដោះសោ OEM នៅក្នុងជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍។ ប្រសិនបើឧបករណ៍មិនអាចចាប់ផ្ដើមប្រព័ន្ធប្រតិបត្តិការ Android ឬមិនមានស្ថិរភាព សូមជំនួសកម្មវិធីឧបករណ៍ឡើងវិញដោយប្រើរូបភាពពីរោងចក្រចុងក្រោយបំផុតពី <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ឬប្រើ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> រួចជ្រើសរើស \'ឈូសឧបករណ៍\' \'ចាក់សោកម្មវិធីដំណើរការប្រព័ន្ធ\' និង \'បង្ខំឱ្យជំនួសផ្នែកទាំងអស់\'។"</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="bug_report_handler_title" msgid="713439959113250125">"ឧបករណ៍ដោះស្រាយរបាយការណ៍អំពីបញ្ហា"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ប្រើការខ្ទាស់កម្មវិធី"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ប្រើជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ប្រើសេវាកម្មបោះពុម្ព"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"អនុញ្ញាតអ្នកប្រើប្រាស់ច្រើន"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"អនុញ្ញាតឱ្យប្ដូរអ្នកប្រើប្រាស់"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"អនុញ្ញាត, ពហុ, អ្នកប្រើប្រាស់, ផ្ដល់សិទ្ធិ, ច្រើន"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ពហុ, អ្នកប្រើប្រាស់, កម្រងព័ត៌មាន, មនុស្ស, គណនី, ប្ដូរ, ច្រើន"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ប្រើការជួសជុលដោយឥតខ្សែ"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ជ្រើសរើសអ្វីដែលអ្នកនឹងមើលឃើញនៅលើអេក្រង់របស់អ្នក នៅពេលភ្ជាប់ថេប្លេតរបស់អ្នក។ ឧបករណ៍របស់អ្នកអាចប្រើថាមពលកាន់តែច្រើន នៅពេលប្រើធាតុរក្សាអេក្រង់។"</string>
<string name="customize_button_title" msgid="1110284655990203359">"ប្ដូរតាមបំណង"</string>
<string name="customize_button_description" msgid="7440248477266126231">"ប្ដូរ <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> តាមបំណង"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ ដើម្បីបើកជំនួយទម្រង់សេរី។"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ ដើម្បីបង្ខំមុខងារកុំព្យូទ័រនៅលើផ្ទាំងអេក្រង់បន្ទាប់បន្សំ។"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ ដើម្បីបើកជំនួយវិនដូទម្រង់សេរីចាស់។"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ ដើម្បីប្ដូរជំនួយវិនដូទម្រង់សេរី។"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"តម្រូវឱ្យចាប់ផ្ដើមឡើងវិញ ដើម្បីបង្ខំឱ្យបើកវិនដូទម្រង់សេរីលើផ្ទាំងអេក្រង់ទីពីរ។"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ចាប់ផ្ដើមឡើងវិញឥឡូវនេះ"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ចាប់ផ្ដើមឡើងវិញពេលក្រោយ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"សំឡេងលំហ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"បើក"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"បិទ"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"បើក"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"សំឡេងខាងឆ្វេង %1$d%% ខាងស្ដាំ %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"សំឡេងខាងស្ដាំ %1$d%% ខាងឆ្វេង %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"កម្មវិធីដែលអ្នកបានដំឡើងអាចមើលឃើញឈ្មោះឧបករណ៍របស់អ្នក។ មនុស្សផ្សេងទៀតក៏អាចមើលឃើញឈ្មោះឧបករណ៍នេះផងដែរ នៅពេលអ្នកភ្ជាប់ទៅឧបករណ៍ប៊្លូធូស ភ្ជាប់ទៅបណ្ដាញ Wi-Fi ឬរៀបចំហតស្ប៉ត Wi-Fi។"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"យេនឌ័រតាមវេយ្យាករណ៍"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ជ្រើសរើសយេនឌ័រតាមវេយ្យាករណ៍"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ស្វែងរកការកំណត់"</string>
</resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index f8f2930..50392bc 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ಬೆಡ್ಟೈಮ್"</item>
+ <item msgid="4152450357280759894">"ಡ್ರೈವಿಂಗ್"</item>
+ <item msgid="7096549258219399423">"ತಲ್ಲೀನಗೊಳಿಸುವ"</item>
+ <item msgid="2760716776980432977">"ನಿರ್ವಹಿಸಿರುವುದು"</item>
+ <item msgid="601734478369121764">"ಸ್ಟಾರ್"</item>
+ <item msgid="6243809315432780521">"ಕ್ಯಾಲೆಂಡರ್"</item>
+ <item msgid="4913577903148415331">"ಸಮಯ"</item>
+ <item msgid="3653377604690057780">"ಥಿಯೇಟರ್"</item>
+ <item msgid="3843711267408385410">"ಹೂವು"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ad2353c..d929ea4 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ಹೊಸ ಸಾಧನ ಪೇರ್ ಮಾಡಿ"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ಬ್ಲೂಟೂತ್"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ನಾಳೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ಶ್ರವಣ ಸಾಧನದ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ಶಾರ್ಟ್ಕಟ್, ಶ್ರವಣ ಸಾಧನ ಹೊಂದಾಣಿಕೆ"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ಪ್ರಿಸೆಟ್"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ನಿಮ್ಮ ಆಡಿಯಾಲಜಿಸ್ಟ್ರಿಂದ ಪ್ರೋಗ್ರಾಮ್ ಮಾಡಲಾದ ಯಾವುದೇ ಪ್ರಿಸೆಟ್ಗಳಿಲ್ಲ"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ಪ್ರಿಸೆಟ್ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ಆಡಿಯೋ ಔಟ್ಪುಟ್"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ಆಡಿಯೋ ಔಟ್ಪುಟ್ ಕುರಿತು"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ಆಫ್"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ಆನ್ ಆಗಿದೆ / # ಆ್ಯಪ್ ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿದೆ}one{ಆನ್ ಆಗಿದೆ / # ಆ್ಯಪ್ಗಳು ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿವೆ}other{ಆನ್ ಆಗಿದೆ / # ಆ್ಯಪ್ಗಳು ಸ್ಥಳಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಹೊಂದಿವೆ}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ಲೋಡ್ ಆಗುತ್ತಿದೆ…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳ ಅನುಮತಿ ಹೊಂದಿರುವ ಆ್ಯಪ್ಗಳು ಕನೆಕ್ಟ್ ಮಾಡಿರುವ ಸಾಧನಗಳ ಸಂಬಂಧಿತ ಸ್ಥಾನವನ್ನು ನಿರ್ಧರಿಸಬಹುದು."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"ಸಮೀಪದ ಸಾಧನಗಳ ಅನುಮತಿ ಹೊಂದಿರುವ ಆ್ಯಪ್ಗಳು ಕನೆಕ್ಟ್ ಮಾಡಿರುವ ಸಾಧನಗಳ ಸಂಬಂಧಿತ ಸ್ಥಾನವನ್ನು ನಿರ್ಧರಿಸಬಹುದು."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ಆ್ಯಪ್ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗೆ ಸ್ಥಳ ಪ್ರವೇಶಪಡೆಯುವಿಕೆ ಆಫ್ ಆಗಿದೆ. ನೀವು ತುರ್ತು ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿದಾಗ ಅಥವಾ ಪಠ್ಯ ಕಳುಹಿಸಿದಾಗ ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳವನ್ನು ತುರ್ತಾಗಿ ಪ್ರತಿಕ್ರಿಯಿಸುವವರಿಗೆ ಕಳುಹಿಸಬಹುದು."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ಸ್ಥಳ ಸೆಟ್ಟಿಂಗ್ಗಳ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ಬದಲಾಯಿಸಲು, ChromeOS ಸೆಟ್ಟಿಂಗ್ಗಳು > ಗೌಪ್ಯತೆ ಮತ್ತು ಭದ್ರತೆ > ಗೌಪ್ಯತೆ ನಿಯಂತ್ರಣಗಳು > ಸ್ಥಳ ಆ್ಯಕ್ಸೆಸ್ ಎಂಬಲ್ಲಿಗೆ ಹೋಗಿ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ಮುಖ ಮತ್ತು <xliff:g id="WATCH">%s</xliff:g> ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ಮುಖ, ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಮತ್ತು <xliff:g id="WATCH">%s</xliff:g> ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ಮುಖ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ಗಳನ್ನು, ಮತ್ತು <xliff:g id="WATCH">%s</xliff:g> ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ಗುರುತಿನ ಪರಿಶೀಲನೆ ಆನ್ ಆಗಿರುವುದರಿಂದ ಇದರ ಅಗತ್ಯವಿದೆ"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"ರಿಮೋಟ್ Authenticator ಅನ್ಲಾಕ್"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ವಾಚ್ ಅನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ನಿಮ್ಮ ವಾಚ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ವಾಚ್ ಅನ್ಲಾಕ್ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ವಾಚ್ ಅನ್ನು ಸೇರಿಸಿ"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ವಾಚ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಮತ್ತು ಫೇಸ್ ಅನ್ಲಾಕ್"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ಫೇಸ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ಕೆಲಸಕ್ಕಾಗಿ ಫೇಸ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ಸೆಟಪ್ ಅಗತ್ಯವಿದೆ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ಫೇಸ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ"</string>
@@ -558,7 +559,7 @@
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ನ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ನ ಫೇಸ್ ಅನ್ಲಾಕ್"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ಗೆ ಫೇಸ್ ಮತ್ತು ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ಗೆ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ಗೆ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅನ್ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"ನೀವು ಆ್ಯಪ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡುವಂತೆ ಅಥವಾ ಖರೀದಿಯನ್ನು ಅನುಮೋದಿಸುವಂತೆಯೇ, ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ನಿಮ್ಮ ಗುರುತನ್ನು ದೃಢೀಕರಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಿ"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ನೀವು ಅನ್ಲಾಕ್ ಮಾಡಲು ಬಯಸದಿದ್ದರೂ ಸಹ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಬೆರಳಿಗೆ ಟಚ್ ಮಾಡುವ ಮೂಲಕ ಯಾರಾದರೂ ಅದನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬಹುದು."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಅನ್ನು ಬಳಸಿ"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</b>\n"ನಿಮ್ಮ ಸ್ಪೇಸ್ನಲ್ಲಿ ನೀವು ಖಾಸಗಿಯಾಗಿ ಇರಿಸಿಕೊಳ್ಳಲು ಬಯಸುವ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ನೆನಪಿನಲ್ಲಿಡಿ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"ನಿಮ್ಮ ಸ್ಪೇಸ್ ಅನ್ನು ನೀವು ಲಾಕ್ ಮಾಡಿದಾಗ ಆ್ಯಪ್ಗಳು ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತವೆ"</b>\n"ನಿಮ್ಮ ಸ್ಪೇಸ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಸ್ಪೇಸ್ನಲ್ಲಿರುವ ಆ್ಯಪ್ಗಳು ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತವೆ ಮತ್ತು ಅವುಗಳಿಂದ ನೀವು ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗುವ ಅಥವಾ ವೈದ್ಯಕೀಯ ಆ್ಯಪ್ಗಳಂತಹ ನಿರ್ಣಾಯಕ ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ಕಳುಹಿಸಲು ಅಗತ್ಯವಿರುವ ಆ್ಯಪ್ಗಳಿಗೆ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ಗಳು ಸೂಕ್ತವಲ್ಲ. ಏಕೆಂದರೆ, ನಿಮ್ಮ ಸ್ಪೇಸ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿದಾಗ ನೋಟಿಫಿಕೇಶನ್ಗಳು ಮತ್ತು ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತದೆ.\n\nನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿರುವಾಗ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ನಲ್ಲಿರುವ ಆ್ಯಪ್ಗಳು ಅನುಮತಿ ನಿರ್ವಾಹಕ, ಗೌಪ್ಯತೆ ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಮತ್ತು ಇತರ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಗೋಚರಿಸುವುದಿಲ್ಲ.\n\nನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಹೊಸ ಸಾಧನಕ್ಕೆ ಸರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಅದನ್ನು ಬಳಸಲು ಬಯಸಿದರೆ, ನೀವು ಇನ್ನೊಂದು ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಕಂಪ್ಯೂಟರ್ಗೆ ಕನೆಕ್ಟ್ ಮಾಡುವ ಅಥವಾ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಹಾನಿಕಾರಕ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವ ಯಾರಾದರೂ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗುವ ಅಥವಾ ವೈದ್ಯಕೀಯ ಆ್ಯಪ್ಗಳಂತಹ ನಿರ್ಣಾಯಕ ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ಕಳುಹಿಸಲು ಅಗತ್ಯವಿರುವ ಆ್ಯಪ್ಗಳಿಗೆ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ಗಳು ಸೂಕ್ತವಲ್ಲ. ಏಕೆಂದರೆ, ನಿಮ್ಮ ಸ್ಪೇಸ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿದಾಗ ನೋಟಿಫಿಕೇಶನ್ಗಳು ಮತ್ತು ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತದೆ.\n\nಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಿರುವಾಗ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ನಲ್ಲಿರುವ ಆ್ಯಪ್ಗಳು ಅನುಮತಿ ನಿರ್ವಾಹಕ, ಗೌಪ್ಯತೆ ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಮತ್ತು ಇತರ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಗೋಚರಿಸುವುದಿಲ್ಲ.\n\nನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಹೊಸ ಸಾಧನದಲ್ಲಿ ಮರುಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ಮತ್ತೊಂದು ಸಾಧನದಲ್ಲಿ ಅದನ್ನು ಬಳಸಲು ಬಯಸಿದರೆ, ನೀವು ಇನ್ನೊಂದು ಸ್ಪೇಸ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಕಂಪ್ಯೂಟರ್ಗೆ ಕನೆಕ್ಟ್ ಮಾಡುವ ಅಥವಾ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ದುರುದ್ದೇಶಪ್ರೇರಿತ ಆ್ಯಪ್ಗಳನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವ ಯಾರಾದರೂ ನಿಮ್ಮ ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಅನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಬಹುದು."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ಪ್ರೈವೆಟ್ ಸ್ಪೇಸ್ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ಇದು ಕೆಲವು ಕ್ಷಣಗಳ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ಖಾಸಗಿ ಸ್ಪೇಸ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೆ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ವಿವರವಾದ NFC ಲಾಗಿಂಗ್ ಅನ್ನು ಅಭಿವೃದ್ಧಿ ಉದ್ದೇಶಗಳಿಗಾಗಿ ಮಾತ್ರ ಉದ್ದೇಶಿಸಲಾಗಿದೆ. ದೋಷ ವರದಿಗಳು ಹೆಚ್ಚುವರಿ NFC ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತವೆ, ಅದು ಖಾಸಗಿ ಮಾಹಿತಿಯನ್ನು ಹೊಂದಿರಬಹುದು. ಈ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಬದಲಾಯಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ಪ್ರತಿಬಿಂಬಿಸುವಿಕೆ, ಬಾಹ್ಯ ಡಿಸ್ಪ್ಲೇ, ಕನೆಕ್ಟೆಡ್ ಡಿಸ್ಪ್ಲೇ, usb ಡಿಸ್ಪ್ಲೇ, ರೆಸಲ್ಯೂಶನ್, ತಿರುಗುವಿಕೆ"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ತಿರುಗುವಿಕೆ"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ಪ್ರಮಾಣಿತ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ಆನ್-ಸ್ಕ್ರೀನ್ ಕೀಬೋರ್ಡ್ ಬಳಸಿ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಸಕ್ರಿಯವಾಗಿರುವಾಗ ಅದನ್ನು ಪರದೆಯ ಮೇಲೆ ಇರಿಸಿಕೊಳ್ಳಿ"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ಹಳದಿಗೆ ಪಾಯಿಂಟರ್ ಫಿಲ್ ಶೈಲಿ ಬದಲಿಸಿ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ಪಿಂಕ್ಗೆ ಪಾಯಿಂಟರ್ ಫಿಲ್ ಶೈಲಿ ಬದಲಿಸಿ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ನೀಲಿಗೆ ಪಾಯಿಂಟರ್ ಫಿಲ್ ಶೈಲಿ ಬದಲಿಸಿ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"ಪಾಯಿಂಟರ್ ಸ್ಟ್ರೋಕ್ ಶೈಲಿ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ಬಿಳಿ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ಕಪ್ಪು"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ಯಾವುದೂ ಇಲ್ಲ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ಬಳಕೆದಾರರು ಆಯ್ಕೆಮಾಡಿರುವುದು: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ಧ್ವನಿ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ಪಾಯಿಂಟರ್ ವೇಗ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ಪಾಯಿಂಟರ್ ಸ್ಕೇಲ್"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ಪಾಯಿಂಟರ್ ಸ್ಕೇಲ್ ಕಡಿಮೆ ಮಾಡಿ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"ಪಾಯಿಂಟರ್ ಸ್ಕೇಲ್ ಹೆಚ್ಚಿಸಿ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ಆಟ ನಿಯಂತ್ರಕ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ಕಂಪನವನ್ನು ಮರುನಿರ್ದೇಶಿಸಿ"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ಸಂಪರ್ಕಗೊಂಡಾಗ ಆಟ ನಿಯಂತ್ರಕಕ್ಕೆ ಕಂಪನವನ್ನು ಕಳುಹಿಸಿ"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ಹೇಗಾದರೂ ಮುಂದುವರಿಸಿ"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ರದ್ದುಮಾಡಿ"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ಹಿಗ್ಗಿಸುವಿಕೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ಒಂದು ಬೆರಳಿನ ಪ್ಯಾನಿಂಗ್"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 ಬೆರಳಿನಿಂದ ಮ್ಯಾಗ್ನಿಫೈಯರ್ ಅನ್ನು ಸರಿಸಿ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಸರಿಸಲು 1 ಬೆರಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ಒಂದು ಬೆರಳಿನಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡುವ ಮೂಲಕ ಹಿಗ್ಗಿಸುವಿಕೆಯ ಪ್ರದೇಶವನ್ನು ಸರಿಸಿ."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ಎರಡು ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡುವ ಮೂಲಕ ಹಿಗ್ಗಿಸುವಿಕೆಯ ಪ್ರದೇಶವನ್ನು ಸರಿಸಿ."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ಸ್ಕ್ರೀನ್ನ ಭಾಗವನ್ನು ಹಿಗ್ಗಿಸುವಾಗ ಮಾತ್ರ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ಝೂಮ್ ಮಾಡಲು ಒಂದು ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ವಿಷಯವು ದೊಡ್ಡದಾಗಿ ಕಾಣಿಸಲು ಸ್ಕ್ರೀನ್ ಮೇಲೆ ತ್ವರಿತವಾಗಿ ಝೂಮ್ ಇನ್ ಮಾಡಿ"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ಝೂಮ್ ಇನ್ ಮಾಡಲು:</b><br/> {0,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/> {1,number,integer}. ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ<br/> {2,number,integer}. ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಸರಿಸಲು 2 ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ<br/> {3,number,integer}. ಝೂಮ್ ಹೊಂದಿಸಲು 2 ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ<br/> {4,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/><br/> <b>ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಇನ್ ಮಾಡಲು:</b><br/> {0,number,integer}. ನಿಮ್ಮ ಹಿಗ್ಗಿಸುವಿಕೆಯ ವಿಧಾನವು ಫುಲ್ಸ್ಕ್ರೀನ್ಗೆ ಸೆಟ್ ಆಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ<br/> {1,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/> {2,number,integer}. ಸ್ಕ್ರೀನ್ನ ಯಾವುದೇ ಭಾಗದಲ್ಲಿ ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿಹಿಡಿಯಿರಿ<br/> {3,number,integer}. ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಸರಿಸಲು ಬೆರಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ<br/> {4,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಲು ಬೆರಳನ್ನು ಮೇಲಕ್ಕೆತ್ತಿ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ಝೂಮ್ ಇನ್ ಮಾಡಲು:</b><br/> {0,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/> {1,number,integer}. ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ<br/> {2,number,integer}. ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಸರಿಸಲು 2 ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ<br/> {3,number,integer}. ಝೂಮ್ ಹೊಂದಿಸಲು 2 ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ<br/> {4,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/><br/> ನೀವು ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಇನ್ ಹಾಗೂ ಇನ್ನಷ್ಟು ಮಾಡಬಹುದು."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ಝೂಮ್ ಇನ್ ಮಾಡಲು:</b><br/> {0,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/> {1,number,integer}. ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ<br/> {2,number,integer}. ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ಸರಿಸಲು 1 ಅಥವಾ 2 ಬೆರಳುಗಳಿಂದ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ<br/> {3,number,integer}. ಝೂಮ್ ಹೊಂದಿಸಲು 2 ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ<br/> {4,number,integer}. ಹಿಗ್ಗಿಸುವಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಲು ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ<br/><br/> ನೀವು ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಇನ್ ಹಾಗೂ ಇನ್ನಷ್ಟು ಮಾಡಬಹುದು."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಆನ್ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿ ನೀವು ಝೂಮ್ ಇನ್ ಮಾಡಬಹುದು.\n\n"<b>"ಝೂಮ್ ಮಾಡಲು"</b>", ಹಿಗ್ಗಿಸುವಿಕೆ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಿಯಾದರೂ ಟ್ಯಾಪ್ ಮಾಡಿ.\n"<ul><li>"ಸ್ಕ್ರಾಲ್ ಮಾಡಲು 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳನ್ನು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಹೊಂದಿಸಲು, 2 ಅಥವಾ ಹೆಚ್ಚು ಬೆರಳುಗಳಿಂದ ಪಿಂಚ್ ಮಾಡಿ"</li></ul>\n\n<b>"ತಾತ್ಕಾಲಿಕವಾಗಿ ಝೂಮ್ ಮಾಡಲು"</b>", ಮ್ಯಾಗ್ನಿಫಿಕೇಶನ್ ಅನ್ನು ಪ್ರಾಂಭಿಸಿ, ನಂತರ ಪರದೆಯ ಮೇಲೆ ಎಲ್ಲಾದರೂ ಸ್ಪರ್ಶಿಸಿ, ಒತ್ತಿಹಿಡಿಯಿರಿ.\n"<ul><li>"ಪರದೆಯಲ್ಲಿ ಅತ್ತಿತ್ತ ಸರಿಸಲು, ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</li>\n<li>"ಝೂಮ್ ಔಟ್ ಮಾಡಲು ಬೆರಳನ್ನು ಎತ್ತಿ"</li></ul>\n\n"ನೀವು ಕೀಬೋರ್ಡ್ ಅಥವಾ ನ್ಯಾವಿಗೇಶನ್ ಬಾರ್ನಲ್ಲಿ ಝೂಮ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"ಪುಟ <xliff:g id="NUM_PAGES">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ಆ್ಯಕ್ಸೆಸಿಬಿಲಿಟಿ ಬಟನ್ ಶಾರ್ಟ್ಕಟ್"</string>
@@ -2545,7 +2570,7 @@
<string name="battery_missing_message" msgid="400958471814422770">"ಬ್ಯಾಟರಿ ಮೀಟರ್ ರೀಡಿಂಗ್ನಲ್ಲಿ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ."</string>
<string name="battery_missing_link_message" msgid="6021565067124898074"></string>
<string name="battery_missing_link_a11y_message" msgid="3310971406602316323">"ಈ ದೋಷದ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿದುಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="power_screen" msgid="4596900105850963806">"ಪರದೆ"</string>
+ <string name="power_screen" msgid="4596900105850963806">"ಸ್ಕ್ರೀನ್"</string>
<string name="power_cpu" msgid="1820472721627148746">"CPU"</string>
<string name="power_flashlight" msgid="8993388636332573202">"ಫ್ಲಾಶ್ಲೈಟ್"</string>
<string name="power_camera" msgid="4778315081581293923">"ಕ್ಯಾಮರಾ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}one{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}other{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ಆದ್ಯತೆಯ ಮೋಡ್ಗಳು"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ಮೋಡ್ ಸೇರಿಸಿ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ಪ್ರಮುಖ ಜನರು ಮತ್ತು ಆ್ಯಪ್ಗಳಿಂದ ಮಾತ್ರ ನೋಟಿಫಿಕೇಶನ್ ಪಡೆಯಿರಿ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ಸಮಯ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ಉದಾ. \"9:30 – ಸಂಜೆ 5:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ಕ್ಯಾಲೆಂಡರ್"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ಉದಾ. \"ವೈಯಕ್ತಿಕ ಕ್ಯಾಲೆಂಡರ್\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ಮೋಡ್ ಅನ್ನು ರಚಿಸಿ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ಕಸ್ಟಮ್"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ಅಡಚಣೆಗಳನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆನ್ ಮಾಡಿ"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ಅಲಾರಾಂಗಳು ಮತ್ತು ಮೀಡಿಯಾ ಧ್ವನಿಗಳು ಅಡಚಣೆಯಾಗಬಹುದು"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"ವೇಳಾಪಟ್ಟಿಗಳು"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಅಳಿಸಿ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ಅಳಿಸಿ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"ಮರುಹೆಸರಿಸಿ"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ಅಳಿಸಿ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" ಮೋಡ್ ಅನ್ನು ಅಳಿಸಬೇಕೆ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ಎಡಿಟ್"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"ವೇಳಾಪಟ್ಟಿಗಳು"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"ವೇಳಾಪಟ್ಟಿ"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"ಕ್ಯಾಲೆಂಡರ್ ಅನ್ನು ಸೇರಿಸಿ"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ನಿಮ್ಮ ಕ್ಯಾಲೆಂಡರ್ ಅನ್ನು ಬಳಸಿ"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"ವೇಳಾಪಟ್ಟಿ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"ವೇಳಾಪಟ್ಟಿ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ಗಂ, <xliff:g id="MINUTES">%2$d</xliff:g> ನಿಮಿ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"ಅವಧಿ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ಕೆಲವು ಸಮಯ ಫೋನ್ ನಿಶ್ಯಬ್ಧವಾಗಿಸಿ"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮ ಹೊಂದಿಸಿ"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ಅಡಚಣೆಗಳ ಧ್ವನಿಯನ್ನು ಅನುಮತಿಸಿ"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ದೃಶ್ಯ ಅಡಚಣೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ದೃಶ್ಯ ಸಂಕೇತಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದಾದ ನೋಟಿಫಿಕೇಶನ್ಗಳು"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ಫೋಕಸ್ ಆಗಿರಿ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"ಹೆಚ್ಚುವರಿ ಆ್ಯಕ್ಷನ್ಗಳು"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ಆಫ್ ಆಗಿದೆ}=1{ಆಫ್ ಆಗಿದೆ / 1 ಮೋಡ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}one{ಆಫ್ ಆಗಿದೆ / # ಮೋಡ್ಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}other{ಆಫ್ ಆಗಿದೆ / # ಮೋಡ್ಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗಬಹುದು}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ಡಿಸ್ಪ್ಲೇ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ಡಿಸ್ಪ್ಲೇ ಆಯ್ಕೆಗಳು"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ಗ್ರೇಸ್ಕೇಲ್"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ಡಾರ್ಕ್ ಥೀಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ಡಾರ್ಕ್ ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಲೈಟ್ ಟೆಕ್ಸ್ಟ್ಗೆ ಆದ್ಯತೆ ನೀಡಲು OS ಮತ್ತು ಆ್ಯಪ್ಗಳನ್ನು ಬದಲಾಯಿಸಿ, ಇದರಿಂದ ಕಣ್ಣಿಗೆ ಆಯಾಸವಾಗುವುದಿಲ್ಲ ಮತ್ತು ಇದು ಕೆಲವು ಸಾಧನಗಳಲ್ಲಿ ಗಮನಾರ್ಹವಾಗಿ ಬ್ಯಾಟರಿ ಹೆಚ್ಚುಕಾಲ ಉಳಿಯುವಂತೆ ಮಾಡುತ್ತದೆ."</string>
<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}}one{{effect_1}, {effect_2} ಮತ್ತು ಇನ್ನೂ #}other{{effect_1}, {effect_2} ಮತ್ತು ಇನ್ನೂ #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"ಅಡಚಣೆಗಳನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಿ"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ಯಾವುದೇ ಅಡಚಣೆಗಳನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ಅಧಿಸೂಚನೆಯನ್ನು ತೆರೆಯಿರಿ"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"ನೋಟಿಫಿಕೇಶನ್ಗಳನ್ನು ಸ್ನೂಜ್ ಮಾಡಲು ಅನುಮತಿಸಿ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ಆ್ಯಪ್ ಐಕಾನ್ ಮೇಲೆ ನೋಟಿಫಿಕೇಶನ್ ಡಾಟ್"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"ನೋಟಿಫಿಕೇಶನ್ ಬಂಡಲ್ಗಳು"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ಬಬಲ್ಸ್"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ಬಬಲ್ಸ್"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ಈ ಸಂಭಾಷಣೆಗೆ ಬಬಲ್ ಗುರುತು ಮಾಡಿ"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ವರ್ಧಿತ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಈ ಆ್ಯಪ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್ಗಳು ಈ ಆ್ಯಪ್ನ ಒಳಗೆ ಲಭ್ಯವಿವೆ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"ನೋಟಿಫಿಕೇಶನ್ ಕೂಲ್ಡೌನ್"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ಉದ್ಯೋಗದ ಪ್ರೊಫೈಲ್ಗಳಿಗೆ ಅನ್ವಯಿಸಿ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಆ್ಯಪ್ಗಳಿಗೆ ಅನ್ವಯಿಸಿ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ವಿಭಾಗಗಳು"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ಇತರೆ"</string>
<string name="no_channels" msgid="4716199078612071915">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್ ಪೋಸ್ಟ್ ಮಾಡಿಲ್ಲ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ಬಳಕೆಯಾಗದ ವರ್ಗಗಳನ್ನು ತೋರಿಸಿ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ಆ್ಯಪ್ನಲ್ಲಿ ಹೆಚ್ಚುವರಿ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ಬಳಕೆಯಾಗದ ವರ್ಗಗಳನ್ನು ತೋರಿಸಿ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ಬಳಕೆಯಾಗದ ವರ್ಗಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ಅಡಚಣೆ ಉಂಟುಮಾಡಬಹುದಾದ ಆ್ಯಪ್ಗಳು"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ಆಯ್ಕೆ ಮಾಡಿದ ಆ್ಯಪ್ಗಳು"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ಯಾವುದೂ ಅಲ್ಲ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ಎಲ್ಲಾ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ಅತಿಕ್ರಮಿಸಲು ಆ್ಯಪ್ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ಅಡಚಣೆ ಉಂಟುಮಾಡಬಹುದಾದ ಆ್ಯಪ್ಗಳು"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ಇನ್ನಷ್ಟು ಆ್ಯಪ್ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ಯಾರೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"ಕೆಲವು ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ಎಲ್ಲಾ ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರಿಗೆ ಅನುಮತಿಸಿ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} ವರೆಗೆ, ಒಂದು ಗಂಟೆಯವರೆಗೆ ಮಾತ್ರ ಅಲಾರಾಂಗಳನ್ನು ಬದಲಾಯಿಸಿ}one{{time} ವರೆಗೆ, # ಗಂಟೆಗಳವರೆಗೆ ಮಾತ್ರ ಅಲಾರಾಂಗಳನ್ನು ಬದಲಾಯಿಸಿ}other{{time} ವರೆಗೆ, # ಗಂಟೆಗಳವರೆಗೆ ಮಾತ್ರ ಅಲಾರಾಂಗಳನ್ನು ಬದಲಾಯಿಸಿ}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ ಮಾತ್ರ ಅಲಾರಮ್ಗಳಲ್ಲಿ ಬದಲಾವಣೆ"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ಎಡಿಟ್ ಮೋಡ್"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ಮೋಡ್ ಅನ್ನು ಸೇರಿಸಿ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ಕಸ್ಟಮ್ ಮೋಡ್"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ಮೋಡ್ ಹೆಸರು"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ಎಚ್ಚರಿಕೆ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ಮುಚ್ಚಿರಿ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ಡೆಸ್ಕ್ಟಾಪ್ ಮೋಡ್ ಅನ್ನು ಒತ್ತಾಯ ಮಾಡಿ"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಪ್ರಾಯೋಗಿಕ ಡೆಸ್ಕ್ಟಾಪ್ ಮೋಡ್ ಅನ್ನು ಒತ್ತಾಯ ಮಾಡಿ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೋಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೋಗಳಿಗಾಗಿ ಬೆಂಬಲವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"ಎರಡನೇ ಡಿಸ್ಪ್ಲೇಯಲ್ಲಿ ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೋಯಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ದ್ವಿತೀಯ ಡಿಸ್ಪ್ಲೇಯಲ್ಲಿ ಮಾತ್ರ ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೋಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ಬಹು-ವಿಂಡೋದಲ್ಲಿ ಮರುಗಾತ್ರಗೊಳಿಸಲು ಆಗದಿರುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ಮರುಗಾತ್ರಗೊಳಿಸಲು ಆಗದ ಆ್ಯಪ್ಗಳನ್ನು ಬಹು-ವಿಂಡೋದಲ್ಲಿ ಇರಲು ಅನುಮತಿಸುತ್ತದೆ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ಫೋರ್ಸ್-ಡಾರ್ಕ್ ಅನ್ನು ಓವರ್ರೈಡ್ ಮಾಡಿ"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB ಡೆವಲಪರ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸುವ ಮೊದಲು ಈ ಸಾಧನದ ಡೇಟಾ ಪಾರ್ಟಿಶನ್ ಅನ್ನು ext4 ಗೆ ಪರಿವರ್ತಿಸುವ ಅಗತ್ಯವಿದೆ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. 16KB ಆಯ್ಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಇದರ ನಂತರ ಮತ್ತೊಮ್ಮೆ ರೀಬೂಟ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ. ಒಮ್ಮೆ ನೀವು ಈ ಮೋಡ್ನಲ್ಲಿದ್ದರೆ, ಒಂದೇ ರೀಬೂಟ್ನೊಂದಿಗೆ ನೀವು 4KB ಮತ್ತು 16KB ಮೋಡ್ಗಳ ನಡುವೆ ಹಿಂದಕ್ಕೆ ಮತ್ತು ಮುಂದಕ್ಕೆ ಬದಲಾಯಿಸಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿಸಲು, ನೀವು 4KB ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿ ನಂತರ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ, ಅದು ಸಾಧನವನ್ನು ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುತ್ತದೆ. ಸಾಧನವು ಯಶಸ್ವಿಯಾಗಿ Android ಗೆ ಬೂಟ್ ಆದ ನಂತರ, ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳಲ್ಲಿ OEM ಅನ್ಲಾಕಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ ಮತ್ತು ದೃಢೀಕರಣದ ನಂತರ ಫೈಲ್ಸಿಸ್ಟಮ್ ಅನ್ನು ext4 ಗೆ ಬದಲಾಯಿಸಲಾಗುತ್ತದೆ. ಇದು ಪೂರ್ಣಗೊಂಡ ನಂತರ, ಮತ್ತೆ 16KB ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಹಿಂತಿರುಗಿ."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ಡೇಟಾ ವಿಭಾಗವನ್ನು ext4 ಗೆ ಮರು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲು ಮತ್ತು ಅಳಿಸಲು ವಿಫಲವಾಗಿದೆ."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB ಮೋಡ್ಗೆ ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಅಗತ್ಯವಿದೆ"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16KB ಡೆವಲಪರ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸುವ ಮೊದಲು ಈ ಸಾಧನದಲ್ಲಿ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಬೇಕಾಗಿದೆ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. 16KB ಮೋಡ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವಾಗ ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಡೇಟಾ ಮತ್ತು ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ಒಮ್ಮೆ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲಾದ ನಂತರ, 16KB ಆಯ್ಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಎರಡು ರೀಬೂಟ್ಗಳ ಅಗತ್ಯವಿರುತ್ತದೆ. ಒಮ್ಮೆ ನೀವು ಈ ಮೋಡ್ನಲ್ಲಿದ್ದರೆ, ಒಂದೇ ರೀಬೂಟ್ನೊಂದಿಗೆ ನೀವು 4KB ಮತ್ತು 16KB ಮೋಡ್ಗಳ ನಡುವೆ ಹಿಂದಕ್ಕೆ ಮತ್ತು ಮುಂದಕ್ಕೆ ಬದಲಾಯಿಸಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿಸಲು, ನೀವು 4KB ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಬೇಕು ಮತ್ತು ನಂತರ OEM/ಬೂಟ್ಲೋಡರ್ ಸಾಧನವನ್ನು ಲಾಕ್ (ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್) ಮಾಡುತ್ತದೆ. ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಇದನ್ನು ಹೇಗೆ ಮಾಡುವುದು ಎಂಬುದರ ಸೂಚನೆಗಳನ್ನು ನೀವು <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> ಇಲ್ಲಿ ನೋಡಬಹುದು"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"ನೀವು ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ನ 4KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿನ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ನೀವು ಲಾಕ್ ಮಾಡಬೇಕು. ಇನ್ನಷ್ಟು ಓದಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"ನೀವು ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ನ 4KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿನ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ನೀವು ಲಾಕ್ ಮಾಡಬೇಕು. ಇದು ಸಾಧನವನ್ನು ಮತ್ತೆ ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುತ್ತದೆ ಮತ್ತು ಅದನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಮರುಸ್ಥಾಪಿಸುತ್ತದೆ. ಸಾಧನವು ಯಶಸ್ವಿಯಾಗಿ Android ಗೆ ಬೂಟ್ ಆದ ನಂತರ, ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳಲ್ಲಿ OEM ಅನ್ಲಾಕಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನವು Android ಗೆ ಬೂಟ್ ಮಾಡಲು ವಿಫಲವಾದಲ್ಲಿ ಅಥವಾ ಅಸ್ಥಿರವಾಗಿದ್ದರೆ, <a href=\"https://developers.google.com/android/images\">https://developers ನಿಂದ ಇತ್ತೀಚಿನ ಫ್ಯಾಕ್ಟರಿ ಚಿತ್ರಗಳೊಂದಿಗೆ ಸಾಧನವನ್ನು ಮರು-ಫ್ಲಾಶ್ ಮಾಡಿ .google.com/android/images</a> ಅಥವಾ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ಮತ್ತು \'ವೈಪ್ ಡಿವೈಸ್\', \'ಲಾಕ್ ಬೂಟ್ಲೋಡರ್\' ಮತ್ತು \'ಎಲ್ಲಾ ಪಾರ್ಟಿಶನ್ಗಳನ್ನು ಫೋರ್ಸ್ ಫ್ಲ್ಯಾಶ್ ಮಾಡಿ\' ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"ನೀವು ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ನ 16KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನೀವು 4K ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿ ಮತ್ತು ನಂತರ ಸಾಧನದ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕು. ಇನ್ನಷ್ಟು ಓದಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"ನೀವು ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್ನ 16KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನೀವು 4K ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿ ಮತ್ತು ನಂತರ ಸಾಧನದ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕು. ಇದು ಸಾಧನವನ್ನು ಮತ್ತೆ ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುತ್ತದೆ ಮತ್ತು ಅದನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಮರುಸ್ಥಾಪಿಸುತ್ತದೆ. ಸಾಧನವು ಯಶಸ್ವಿಯಾಗಿ Android ಗೆ ಬೂಟ್ ಆದ ನಂತರ, ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳಲ್ಲಿ OEM ಅನ್ಲಾಕಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನವು Android ಗೆ ಬೂಟ್ ಮಾಡಲು ವಿಫಲವಾದಲ್ಲಿ ಅಥವಾ ಅಸ್ಥಿರವಾಗಿದ್ದರೆ, <a href=\"https://developers.google.com/android/images\">https://developers ನಿಂದ ಇತ್ತೀಚಿನ ಫ್ಯಾಕ್ಟರಿ ಚಿತ್ರಗಳೊಂದಿಗೆ ಸಾಧನವನ್ನು ಮರು-ಫ್ಲಾಶ್ ಮಾಡಿ .google.com/android/images</a> ಅಥವಾ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ಮತ್ತು \'ವೈಪ್ ಡಿವೈಸ್\', \'ಲಾಕ್ ಬೂಟ್ಲೋಡರ್\' ಮತ್ತು \'ಎಲ್ಲಾ ಪಾರ್ಟಿಶನ್ಗಳನ್ನು ಫೋರ್ಸ್ ಫ್ಲ್ಯಾಶ್ ಮಾಡಿ\' ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"ನೀವು ಪೇಜ್-ಅಗ್ನಾಸ್ಟಿಕ್ ಮೋಡ್ನ 16KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಆ್ಯಪ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನೀವು 4KB ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿ ಮತ್ತು ನಂತರ ಸಾಧನದ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕು. ಇನ್ನಷ್ಟು ಓದಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ನೀವು ಪೇಜ್-ಅಗ್ನಾಸ್ಟಿಕ್ ಮೋಡ್ನ 16KB ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ಈ ಮೋಡ್ನಲ್ಲಿ ಸಾಫ್ಟ್ವೇರ್ ಇಂಟಿಗ್ರಿಟಿಯ ಭರವಸೆ ನೀಡಲಾಗುವುದಿಲ್ಲ ಮತ್ತು ಬೂಟ್ಲೋಡರ್ ಅನ್ಲಾಕ್ ಆಗಿರುವಾಗ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಯಾವುದೇ ಡೇಟಾ ಅಪಾಯದಲ್ಲಿರಬಹುದು. ಈ ಮೋಡ್ಗಳಲ್ಲಿ ಕೆಲವು ಫೀಚರ್ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ, ಹಾಗಾಗಿ ಕೆಲವು ಆ್ಯಪ್ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಪ್ರೊಡಕ್ಷನ್ ಮೋಡ್ ಅನ್ನು ಮರು-ಪ್ರವೇಶಿಸಲು, ನೀವು 4KB ಮೋಡ್ಗೆ ಹಿಂತಿರುಗಿ ಮತ್ತು ನಂತರ ಸಾಧನದ ಬೂಟ್ಲೋಡರ್ ಅನ್ನು ಲಾಕ್ ಮಾಡಬೇಕು. ಇದು ಸಾಧನವನ್ನು ಮತ್ತೆ ಫ್ಯಾಕ್ಟರಿ ರೀಸೆಟ್ ಮಾಡುತ್ತದೆ ಮತ್ತು ಅದನ್ನು ಪ್ರೊಡಕ್ಷನ್ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಮರುಸ್ಥಾಪಿಸುತ್ತದೆ. ಸಾಧನವು ಯಶಸ್ವಿಯಾಗಿ Android ಗೆ ಬೂಟ್ ಆದ ನಂತರ, ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳಲ್ಲಿ OEM ಅನ್ಲಾಕಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ. ಸಾಧನವು Android ಗೆ ಬೂಟ್ ಮಾಡಲು ವಿಫಲವಾದಲ್ಲಿ ಅಥವಾ ಸ್ಥಿರವಾಗಿಲ್ಲದಿದ್ದರೆ, <a href=\"https://developers.google.com/android/images\">https://developers ನಿಂದ ಇತ್ತೀಚಿನ ಫ್ಯಾಕ್ಟರಿ ಚಿತ್ರಗಳೊಂದಿಗೆ ಸಾಧನವನ್ನು ಮರು-ಫ್ಲಾಶ್ ಮಾಡಿ .google.com/android/images</a> ಅಥವಾ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ಮತ್ತು \'ವೈಪ್ ಡಿವೈಸ್\', \'ಲಾಕ್ ಬೂಟ್ಲೋಡರ್\' ಮತ್ತು \'ಎಲ್ಲಾ ಪಾರ್ಟಿಶನ್ಗಳನ್ನು ಫೋರ್ಸ್ ಫ್ಲ್ಯಾಶ್ ಮಾಡಿ\' ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ಪೇಜ್-ಅಗ್ನೋಸ್ಟಿಕ್ ಮೋಡ್"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ಇನ್ನಷ್ಟು ಓದಿ"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"ಬಗ್ ವರದಿ ಹ್ಯಾಂಡ್ಲರ್"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಿ"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಬಳಸಿ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ಪ್ರಿಂಟ್ ಸೇವೆಯನ್ನು ಬಳಸಿ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"ಬಹು ಬಳಕೆದಾರರನ್ನು ಅನುಮತಿಸಿ"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ಬಳಕೆದಾರರ ಸ್ವಿಚ್ ಅನುಮತಿಸಿ"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ಅನುಮತಿಸಿ, ಬಹು, ಬಳಕೆದಾರರು, ಪರವಾನಗಿ, ಹಲವು"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ಅನೇಕ, ಬಳಕೆದಾರರು, ಪ್ರೊಫೈಲ್ಗಳು, ಜನರು, ಖಾತೆಗಳು, ಸ್ವಿಚ್, ಹಲವು"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ವೈರ್ಲೆಸ್ ಡೀಬಗಿಂಗ್ ಅನ್ನು ಬಳಸಿ"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಡಾಕ್ ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ನ ಮೇಲೆ ನಿಮಗೇನು ಕಾಣಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ. ಸ್ಕ್ರೀನ್ ಸೇವರ್ ಬಳಸಿದಾಗ ನಿಮ್ಮ ಸಾಧನ ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸಬಹುದು."</string>
<string name="customize_button_title" msgid="1110284655990203359">"ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ಫ್ರೀಫಾರ್ಮ್ ಬೆಂಬಲವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ರೀಬೂಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಡೆಸ್ಕ್ಟಾಪ್ ಮೋಡ್ ಅನ್ನು ಬಲವಂತವಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲು ರೀಬೂಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ಲೆಗಸಿ ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೊಯಿಂಗ್ ಬೆಂಬಲವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ರೀಬೂಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೊಯಿಂಗ್ ಬೆಂಬಲವನ್ನು ಬದಲಾಯಿಸಲು ರೀಬೂಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ಸೆಕೆಂಡರಿ ಡಿಸ್ಪ್ಲೇಗಳಲ್ಲಿ ಫ್ರೀಫಾರ್ಮ್ ವಿಂಡೊಯಿಂಗ್ ಅನ್ನು ಬಲವಂತವಾಗಿ ರೀಬೂಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ಈಗಲೇ ರೀಬೂಟ್ ಮಾಡಿ"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ನಂತರ ರೀಬೂಟ್ ಮಾಡಿ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ಸ್ಪೇಷಿಯಲ್ ಆಡಿಯೋ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ಆನ್"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ಆಫ್"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ಆನ್"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ಆಡಿಯೊ %1$d%% ಎಡ, %2$d%% ಬಲ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ಆಡಿಯೊ %1$d%% ಬಲ, %2$d%% ಎಡ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"ನೀವು ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್ಗಳಿಗೆ ನಿಮ್ಮ ಸಾಧನದ ಹೆಸರು ಗೋಚರಿಸುತ್ತದೆ. ನೀವು ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿದಾಗ, ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿದಾಗ ಅಥವಾ ವೈ-ಫೈ ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿದಾಗ ಇತರ ಜನರು ಸಹ ಅದನ್ನು ನೋಡಬಹುದು."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ವ್ಯಾಕರಣ ಲಿಂಗ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ವ್ಯಾಕರಣದ ಲಿಂಗವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ಹುಡುಕಾಟ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
</resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 9edb91b..08db70c 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"취침 시간"</item>
+ <item msgid="4152450357280759894">"운전"</item>
+ <item msgid="7096549258219399423">"몰입형"</item>
+ <item msgid="2760716776980432977">"관리형"</item>
+ <item msgid="601734478369121764">"별표"</item>
+ <item msgid="6243809315432780521">"캘린더"</item>
+ <item msgid="4913577903148415331">"시간"</item>
+ <item msgid="3653377604690057780">"영화관"</item>
+ <item msgid="3843711267408385410">"꽃"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dd0e236..f298fed 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"기기 연결을 해제하겠습니까?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"새 기기와 페어링"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"블루투스"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"내일 자동 사용 설정"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"청각 보조 기기 설정"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"단축키, 보청기 호환성"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"미리 설정"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"청능사가 사전 설정한 프로그램이 없습니다."</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"사전 설정을 업데이트할 수 없음"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"오디오 출력"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"오디오 출력 정보"</string>
@@ -281,9 +281,9 @@
<string name="location_settings_title" msgid="8375074508036087178">"위치"</string>
<string name="location_settings_primary_switch_title" msgid="8849081766644685127">"위치 사용"</string>
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"사용 안함"</string>
- <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{사용 - 앱 #개가 위치에 액세스할 수 있음}other{사용 - 앱 #개가 위치에 액세스할 수 있음}}"</string>
+ <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{사용 - 앱 #개가 위치 정보에 액세스할 수 있음}other{사용 - 앱 #개가 위치 정보에 액세스할 수 있음}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"로드 중…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"근처 기기 액세스 권한이 있는 앱은 연결된 기기 간의 상대적인 위치를 파악할 수 있습니다."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"근처 기기 권한이 있는 앱이 연결된 기기의 상대적인 위치를 파악할 수 있습니다."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"앱 및 서비스에 대한 위치 정보 액세스가 사용 중지되어 있습니다. 그래도 긴급 전화번호로 전화를 걸거나 문자 메시지를 보내면 기기의 위치 정보가 긴급 구조원에게 전달될 수 있습니다."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"위치 설정에 대해 자세히 알아보기"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"변경하려면 ChromeOS 설정 > 개인 정보 보호 및 보안 > 개인 정보 보호 설정 > 위치 액세스로 이동하세요."</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"얼굴 및 <xliff:g id="WATCH">%s</xliff:g> 추가됨"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"얼굴, 지문, <xliff:g id="WATCH">%s</xliff:g> 추가됨"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"얼굴, 지문, <xliff:g id="WATCH">%s</xliff:g> 추가됨"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"신원 확인이 설정되어 필수입니다."</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator 잠금 해제"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"시계 추가됨"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"시계 설정하기"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"스마트시계 잠금 해제 자세히 알아보기"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"시계 추가"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"시계 삭제"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"지문 및 얼굴 인식 잠금 해제"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"얼굴 인식/지문 잠금 해제"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"직장용 얼굴 인식/지문 잠금 해제"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"설정 필요"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"얼굴 및 지문 추가됨"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"앱 설치"</b>\n"스페이스에서 비공개로 유지할 앱을 설치하세요."</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"주의사항"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"스페이스를 잠그면 앱이 중지됩니다"</b>\n"스페이스를 잠그면 스페이스에 있는 앱이 중지되고 해당 앱으로부터 알림을 받을 수 없습니다."</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"비공개 스페이스는 의료 앱과 같이 백그라운드에서 실행되어야 하거나 중요한 알림을 보내야 하는 앱에는 적합하지 않습니다. 스페이스가 잠겨 있으면 알림 및 백그라운드 활동이 중지되기 때문입니다.\n\n비공개 스페이스가 잠겨 있으면 비공개 스페이스의 앱이 권한 관리자, 개인 정보 대시보드, 기타 설정에 표시되지 않습니다.\n\n비공개 스페이스는 새 기기로 옮길 수 없습니다. 다른 기기에서 사용하려면 해당 기기에 비공개 스페이스를 설정해야 합니다.\n\n기기를 컴퓨터에 연결하거나 기기에 유해한 앱을 설치 가능한 사용자가 내 비공개 스페이스에 액세스할 수도 있습니다."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"비공개 스페이스는 의료 앱과 같이 백그라운드에서 실행되어야 하거나 중요한 알림을 보내야 하는 앱에는 적합하지 않습니다. 스페이스가 잠겨 있으면 알림 및 백그라운드 활동이 중지되기 때문입니다.\n\n비공개 스페이스가 잠겨 있으면 비공개 스페이스의 앱이 권한 관리자, 개인 정보 대시보드, 기타 설정에 표시되지 않습니다.\n\n비공개 스페이스는 새 기기로 복원할 수 없습니다. 다른 기기에서 사용하려면 해당 기기에 비공개 스페이스를 설정해야 합니다.\n\n기기를 컴퓨터에 연결하거나 기기에 악성 앱을 설치할 수 있는 다른 사용자가 내 비공개 스페이스에 액세스할 수도 있습니다."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"비공개 스페이스에 관해 자세히 알아보기"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"몇 분 정도 걸릴 수 있습니다."</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"비공개 스페이스 설정 중…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"기기를 다시 시작하시겠습니까?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"세부 NFC 로깅은 개발용으로만 사용됩니다. 추가 NFC 데이터는 버그 신고에 포함되며, 여기에는 개인 정보가 포함될 수 있습니다. 이 설정을 변경하려면 기기를 다시 시작하세요."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"다시 시작"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"미러링, 외부 디스플레이, 연결된 디스플레이, USB 디스플레이, 해상도, 회전"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"회전"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"표준"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"터치 키보드 사용"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"물리적 키보드가 활성 상태인 경우 화면에 켜 둠"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"포인터 채움 스타일을 노란색으로 변경"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"포인터 채움 스타일을 분홍색으로 변경"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"포인터 채움 스타일을 파란색으로 변경"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"포인터 획 스타일"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"흰색"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"검은색"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"없음"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"사용자 선택: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"음성"</string>
<string name="pointer_speed" msgid="7398649279282675718">"포인터 속도"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"포인터 크기"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"포인터 크기 줄이기"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"포인터 크기 늘리기"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"게임 컨트롤러"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"진동 리디렉션"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"게임 컨트롤러가 연결되어 있으면 진동을 컨트롤러로 전송합니다."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"무시하고 계속하기"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"취소"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"확대 설정"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"한 손가락으로 패닝"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"한 손가락으로 돋보기 이동"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"한 손가락으로 드래그하여 화면을 움직입니다"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"한 손가락으로 드래그하여 확대 영역을 이동하세요."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"두 손가락으로 드래그하여 확대 영역을 이동하세요."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"화면의 일부만 확대하는 동안에는 사용할 수 없음"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"버튼을 탭하여 확대/축소"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"화면을 빠르게 확대하여 콘텐츠를 더 크게 표시합니다."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>확대하는 방법:</b><br/> {0,number,integer}. 바로가기를 사용하여 확대를 시작합니다.<br/> {1,number,integer}. 화면을 탭합니다.<br/> {2,number,integer}. 두 손가락으로 드래그하여 화면을 움직입니다.<br/> {3,number,integer}. 두 손가락을 모아서 배율을 조정합니다.<br/> {4,number,integer}. 바로가기를 사용하여 확대를 멈춥니다.<br/><br/> <b>일시적으로 확대하는 방법:</b><br/> {0,number,integer}. 확대 유형이 전체 화면으로 설정되어 있어야 합니다.<br/> {1,number,integer}. 바로가기를 사용하여 확대를 시작합니다.<br/> {2,number,integer}. 화면 아무 곳이나 길게 터치합니다.<br/> {3,number,integer}. 손가락으로 드래그하여 화면을 움직입니다.<br/> {4,number,integer}. 손가락을 떼어 확대를 멈춥니다."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>확대하는 방법:</b><br/> {0,number,integer}. 단축키를 사용하여 확대를 시작합니다.<br/> {1,number,integer}. 화면을 탭합니다.<br/> {2,number,integer}. 두 손가락으로 드래그하여 화면을 움직입니다.<br/> {3,number,integer}. 두 손가락을 모으거나 벌려서 확대/축소 배율을 조정합니다.<br/> {4,number,integer}. 단축키를 사용해 확대를 멈춥니다.<br/><br/> 일시적으로 확대하는 등의 작업을 수행할 수도 있습니다."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>확대하는 방법:</b><br/> {0,number,integer}. 단축키를 사용하여 확대를 시작합니다.<br/> {1,number,integer}. 화면을 탭합니다.<br/> {2,number,integer}. 한 손가락 또는 두 손가락으로 드래그하여 화면을 움직입니다.<br/> {3,number,integer}. 두 손가락을 모으거나 벌려서 확대/축소 배율을 조정합니다.<br/> {4,number,integer}. 단축키를 사용해 확대를 멈춥니다.<br/><br/> 일시적으로 확대하는 등의 작업을 수행할 수도 있습니다."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"확대 기능을 사용 설정하면 화면을 확대할 수 있습니다.\n\n"<b>"화면을 확대하려면"</b>" 확대 기능을 시작한 다음 화면에서 아무 곳이나 탭합니다.\n"<ul><li>"스크롤하려면 2개 이상의 손가락으로 드래그합니다."</li>\n<li>"확대/축소 수준을 조정하려면 2개 이상의 손가락을 모읍니다."</li></ul>\n\n<b>"화면을 일시적으로 확대하려면"</b>" 확대를 시작한 다음 화면에서 아무 곳이나 길게 터치합니다.\n"<ul><li>"화면에서 이동하려면 드래그합니다."</li>\n<li>"축소하려면 손가락을 뗍니다."</li></ul>\n\n"키보드 또는 탐색 메뉴는 확대할 수 없습니다."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>페이지 중 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>페이지"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"접근성 버튼 바로가기"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{없음}=1{예약 1개 설정됨}other{예약 #개 설정됨}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"방해 금지 모드"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"우선순위 모드"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"모드 추가"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"중요한 사람과 앱의 알림만 받기"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"활성화 유형 선택"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"시간"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"예: \"9시 30분부터 오후 5시까지\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"캘린더"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"예: \"개인 캘린더\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"모드 만들기"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"커스텀"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"방해 요소 제한"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"방해 금지 모드 사용 설정"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"알람 및 미디어 소리 예외"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"예약"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"예약 삭제"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"삭제"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"이름 변경"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"삭제"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\'<xliff:g id="MODE">%1$s</xliff:g>\' 모드를 삭제하시겠습니까?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"수정"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"예약"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"예약"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"캘린더 추가"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"내 캘린더 사용"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"일정"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"일정 설정"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"일정"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>시간 <xliff:g id="MINUTES">%2$d</xliff:g>분"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"자동으로 사용 설정"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"예약"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"특정 시간 동안 휴대전화 무음 설정"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"방해 금지 모드 규칙 설정"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"소리를 내는 방해 요소 허용"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"시각적 방해 차단"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"시각적 신호 허용"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"알림 허용 항목"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"집중"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"추가 작업"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{꺼짐}=1{꺼짐/모드 1개가 자동으로 사용 설정될 수 있음}other{꺼짐/모드 #개가 자동으로 사용 설정될 수 있음}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"디스플레이 설정"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"디스플레이 옵션"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"그레이 스케일"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"어두운 테마 사용"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"어두운 배경에 밝은 텍스트를 표시하도록 OS와 앱을 전환합니다. 이렇게 하면 눈의 피로도를 낮출 수 있고, 일부 기기에서는 배터리를 크게 절약할 수 있습니다."</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"방해 금지 필터링"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"방해 금지 필터링 안함"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"알림 열기"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"다시 알림 허용"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"앱 아이콘에 알림 표시 점 사용"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"알림 번들"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"대화창"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"대화창"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"이 대화를 대화창으로 표시"</string>
@@ -3600,7 +3641,7 @@
<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>
- <string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, 문자 메시지 및 기타 통신 유형"</string>
+ <string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, 문자 메시지 등의 커뮤니케이션 유형"</string>
<string name="notif_type_alerting" msgid="4713073696855718576">"알림"</string>
<string name="notif_type_alerting_summary" msgid="4681068287836313604">"설정에 따라 벨소리나 진동이 울릴 수 있음"</string>
<string name="notif_type_silent" msgid="6273951794420331010">"무음"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"이 앱은 향상된 설정을 지원하지 않습니다."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"기타 설정"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"앱 안에서 추가 설정을 볼 수 있음"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"알림 쿨다운"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"직장 프로필에 적용"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"직장 프로필 앱에 적용"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"카테고리"</string>
<string name="notification_channels_other" msgid="18159805343647908">"기타"</string>
<string name="no_channels" msgid="4716199078612071915">"이 앱에서 게시한 알림이 없음"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"사용하지 않는 카테고리 표시"</string>
<string name="app_settings_link" msgid="6725453466705333311">"앱 내 추가 설정"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"사용하지 않는 카테고리 표시"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"사용하지 않는 카테고리 숨기기"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"예외 앱"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"선택한 앱"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"없음"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"모두"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"앱에서 무시하도록 허용"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"예외 앱"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"앱 추가 선택"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"예외 소리 없음"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"예외 사용자 없음"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"일부 사람만 예외"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"모든 사람 예외"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"반복 발신자"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"반복 발신자 허용"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time}까지 1시간 동안 알람만 허용으로 변경}other{{time}까지 #시간 동안 알람만 허용으로 변경}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>까지 알람만 수신 모드로 변경"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"항상 알림 모드로 변경"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"수정 모드"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"추가 모드"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"커스텀 모드"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"모드 이름"</string>
<string name="warning_button_text" msgid="1274234338874005639">"주의"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"닫기"</string>
<string name="device_feedback" msgid="5351614458411688608">"이 기기에 대한 의견 보내기"</string>
@@ -4025,7 +4070,7 @@
<string name="draw_overlay" msgid="7902083260500573027">"다른 앱 위에 표시"</string>
<string name="system_alert_window_settings" msgid="6458633954424862521">"다른 앱 위에 표시"</string>
<string name="permit_draw_overlay" msgid="4468994037192804075">"다른 앱 위에 표시 허용"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"이 앱이 사용 중인 다른 앱 위에 표시되도록 허용합니다. 앱에서 내가 탭하는 위치를 확인하고 화면에 표시되는 내용을 변경할 수 있습니다."</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"이 앱이 사용 중인 다른 앱 위에 표시되도록 허용합니다. 앱에서 내가 탭하는 위치를 확인하거나 화면에 표시되는 내용을 변경할 수 있습니다."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"미디어 출력을 변경하세요"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"앱이 미디어 출력을 전환하도록 허용"</string>
<string name="allow_media_routing_description" msgid="8343709701298051207">"이 앱이 다른 앱에서 오디오나 동영상을 재생할 연결된 기기를 선택하도록 허용합니다. 허용할 경우, 이 앱은 헤드폰이나 스피커와 같은 사용 가능한 기기의 목록에 액세스하여 오디오 또는 동영상을 스트리밍하거나 전송할 출력 장치를 선택할 수 있습니다."</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"데스크톱 모드 강제 사용"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"보조 디스플레이에서 실험적 데스크톱 모드 강제 사용"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"자유 형식 창 사용"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"자유 형식 창 지원을 사용하도록 설정합니다."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"보조 디스플레이에서 자유 형식 창 모드 사용"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"보조 디스플레이에서만 자유 형식 창을 사용하도록 설정합니다."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"멀티 윈도우에서 크기 조정 불가 앱 사용"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"멀티 윈도우에서 크기 조정 불가 앱 허용"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"강제로 어둡게 재정의"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB 개발자 옵션을 사용하기 전에 이 기기의 데이터 파티션을 ext4로 변환해야 합니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 16KB 옵션을 활성화하려면 이후에 한 번 더 재부팅해야 합니다. 이 모드에서는 한 번의 재부팅으로 4KB와 16KB 모드 사이를 오가며 전환할 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 기기를 프로덕션 모드로 되돌리려면 4KB 모드로 다시 전환한 후 부트로더를 잠가야 하며, 이렇게 하면 기기가 초기화됩니다. 기기를 Android로 부팅 완료한 후에는 개발자 옵션에서 OEM 잠금 해제를 사용 중지하세요. 확인 후에는 기기가 완전 삭제되며 파일 시스템이 ext4로 변경됩니다. 이 과정을 완료한 후에는 다시 돌아와 16KB를 사용 설정하세요."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"모든 데이터 삭제"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"데이터 파티션을 ext4로 재포맷하고 완전 삭제할 수 없습니다."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB 모드에 필요한 부트로더 잠금 해제"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"부트로더를 잠금 해제해야 합니다"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16KB 개발자 옵션을 사용하려면 이 기기의 부트로더가 잠금 해제되어 있어야 합니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 16KB 모드를 활성화하면 모든 사용자 데이터와 설정이 완전 삭제됩니다. 부트로더가 잠금 해제되고 나서 16KB 옵션을 활성화하려면 두 번 재부팅해야 합니다. 이 모드에서는 한 번의 재부팅으로 4KB와 16KB 모드 사이를 오가며 전환할 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 기기를 프로덕션 모드로 되돌리려면 4KB 모드로 다시 전환한 후 OEM/부트로더로 기기를 잠가 초기화해야 합니다. 부트로더를 잠금 해제한 후 다시 시도해 주세요. <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>에서 방법에 대한 안내를 참고하세요."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"페이지에 구속받지 않는 4KB 모드 사용"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"현재 페이지에 구속받지 않는 4KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 기기의 부트로더를 잠가야 합니다. 탭하여 자세히 알아보세요."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"현재 페이지에 구속받지 않는 4KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 기기의 부트로더를 잠가야 합니다. 이렇게 하면 기기가 다시 초기화되고 프로덕션 설정으로 복원됩니다. 기기를 Android로 부팅 완료한 후에는 개발자 옵션에서 OEM 잠금 해제를 사용 중지하세요. 기기가 Android로 부팅되지 않거나 불안정한 경우 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>의 최신 공장 출고 시 이미지로 기기를 다시 플래시하거나 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>을 사용하여 \'Wipe Device\'(기기 완전 삭제), \'Lock Bootloader\'(부트로더 잠금), \'Force Flash all partitions\'(모든 파티션 강제 플래시)를 선택하세요."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"페이지에 구속받지 않는 16KB 모드 사용"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"현재 페이지에 구속받지 않는 16KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 4K 모드로 다시 전환한 후 기기의 부트로더를 잠가야 합니다. 탭하여 자세히 알아보세요."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"현재 페이지에 구속받지 않는 16KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 돌아가려면 4K 모드로 다시 전환한 후 기기의 부트로더를 잠가야 합니다. 이렇게 하면 기기가 다시 초기화되고 프로덕션 설정으로 복원됩니다. 기기를 Android로 부팅 완료한 후에는 개발자 옵션에서 OEM 잠금 해제를 사용 중지하세요. 기기가 Android로 부팅되지 않거나 불안정한 경우 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>의 최신 공장 출고 시 이미지로 기기를 다시 플래시하거나 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>을 사용하여 \'Wipe Device\'(기기 완전 삭제), \'Lock Bootloader\'(부트로더 잠금), \'Force Flash all partitions\'(모든 파티션 강제 플래시)를 선택하세요."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"현재 페이지 크기에 구속받지 않는 16KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 4KB 모드로 다시 전환한 후 기기의 부트로더를 잠가야 합니다. 탭하여 자세히 알아보세요."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"현재 페이지 크기에 구속받지 않는 16KB 모드입니다. 이 모드에서는 소프트웨어 무결성이 보장되지 않기 때문에 부트로더가 잠금 해제된 상태에서는 휴대전화에 저장된 모든 데이터가 위험에 노출될 수 있습니다. 이 모드에서는 일부 기능이 사용 중지되므로 일부 애플리케이션이 작동하지 않을 수 있습니다. 프로덕션 모드로 다시 들어가려면 4KB 모드로 다시 전환한 후 기기의 부트로더를 잠가야 합니다. 이렇게 하면 기기가 다시 초기화되고 프로덕션 설정으로 복원됩니다. 기기를 Android로 부팅 완료한 후에는 개발자 옵션에서 OEM 잠금 해제를 사용 중지하세요. 기기가 Android로 부팅되지 않거나 불안정한 경우 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>의 최신 공장 출고 시 이미지로 기기를 다시 플래시하거나 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>을 사용하여 \'기기 완전 삭제\', \'부트로더 잠금\', \'모든 파티션 강제 플래시\'를 선택하세요."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"페이지에 구속받지 않는 16KB 모드"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"자세히 알아보기"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"버그 신고 핸들러"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"앱 고정 사용"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"개발자 옵션 사용"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"인쇄 서비스 사용"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"여러 사용자 허용"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"사용자 전환 허용"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"허용, 멀티, 사용자, 허가, 다수"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"다중, 사용자, 프로필, 사람, 계정, 전환, 다수"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"무선 디버깅 사용"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"태블릿이 도킹되었을 때 화면에 표시할 항목을 선택하세요. 화면 보호기를 사용하면 기기에서 더 많은 에너지를 사용할 수 있습니다."</string>
<string name="customize_button_title" msgid="1110284655990203359">"맞춤설정"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> 맞춤설정"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"자유 형식 지원을 사용 설정하려면 재부팅해야 합니다."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"보조 디스플레이에서 데스크톱 모드를 강제 실행하려면 재부팅해야 합니다."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"레거시 자유 형식 창 모드 지원을 사용하려면 재부팅해야 합니다."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"자유 형식 창 모드 지원을 변경하려면 재부팅해야 합니다."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"보조 디스플레이에서 자유 형식 창 모드를 강제 실행하려면 재부팅해야 합니다."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"지금 재부팅"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"나중에 재부팅"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"공간 음향"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"사용"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"사용 안함"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"사용"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"오디오 %1$d%% 왼쪽, %2$d%% 오른쪽"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"오디오 %1$d%% 오른쪽, %2$d%% 왼쪽"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"기기 이름이 설치한 앱에 표시됩니다. 블루투스 기기 및 Wi-Fi 네트워크에 연결하거나 Wi-Fi 핫스팟을 설정할 때도 기기 이름이 다른 사용자에게 표시될 수 있습니다."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"문법적 성별"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"문법적 성별 선택"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"검색 설정"</string>
</resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index d63a292..9a1bf85 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Уйку режими"</item>
+ <item msgid="4152450357280759894">"Унаа айдоо"</item>
+ <item msgid="7096549258219399423">"Сүңгүтүүчү"</item>
+ <item msgid="2760716776980432977">"Башкарылган"</item>
+ <item msgid="601734478369121764">"Жылдыз"</item>
+ <item msgid="6243809315432780521">"Жылнаама"</item>
+ <item msgid="4913577903148415331">"Убакыт"</item>
+ <item msgid="3653377604690057780">"Театр"</item>
+ <item msgid="3843711267408385410">"Гүл"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 15001ec..14b7140 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Түзмөк ажыратылсынбы?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Жаңы түзмөк кошуу"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Эртең автоматтык түрдө күйгүзүлсүн"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Угуу аппаратынын параметрлери"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Ыкчам баскыч, угуу аппаратынын шайкештиги"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Алдын ала коюлган параметрлер"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Булар аудиолог тарабынан алдын ала коюлган параметрлер эмес"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Алдын ала коюлган параметрлер жаңыртылган жок"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио түзмөк"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио түзмөк жөнүндө"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өчүк"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Күйүк / # колдонмо жайгашкан жерди көрө алат}other{Күйүк / # колдонмо жайгашкан жерди көрө алат}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Жүктөлүүдө…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Жакын жердеги түзмөктөрдү көрө алган колдонмолор туташкан түзмөктөрдүн абалын аныкташы мүмкүн."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Жакын жердеги түзмөктөрдү көрүүгө уруксаты бар колдонмолор туташкан түзмөктөрдүн абалын көрө алышат."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Колдонмолор менен кызматтар түзмөктүн жайгашкан жерин көрө алышпайт. Кырсыктаганда жардамга келчү кызматка чалып же билдирүү жөнөтүп жатканыңызда, ага түзмөгүңүздүн жайгашкан жери көрүнөт."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Жайгашкан жерди аныктоо параметрлери жөнүндө кеңири маалымат"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Өзгөртүү үчүн ChromeOS параметрлери > Купуялык жана коопсуздук > Купуялыкты көзөмөлдөө параметрлери > Жайгашкан жерди аныктоо бөлүмүнө өтүңүз"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Жүз жана <xliff:g id="WATCH">%s</xliff:g> кошулду"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Жүз, манжа издери жана <xliff:g id="WATCH">%s</xliff:g> кошулду"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Жүз, манжа издери жана <xliff:g id="WATCH">%s</xliff:g> кошулду"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Өздүгүн текшерүү күйгүзүлгөндүктөн, бул керек"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator менен кулпусун ачуу"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Саат кошулду"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Саатыңызды тууралап алыңыз"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Кулпуну саат менен ачуу тууралуу кеңири маалымат"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Саат кошуу"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Саатты өчүрүү"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Манжа изи жана Жүзүнөн таанып ачуу"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Түзмөктү жүз жана манжа изи менен ачуу"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Жумуш профилинде жүз жана манжа изи менен ачуу функциясы"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Коюу керек"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Жүз жана манжа изи кошулду"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Колдонмолорду орнотуу"</b>\n"Жеке мейкиндикте купуя сактагыңыз келген колдонмолорду орнотуңуз"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Эскертүү"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Жеке мейкиндикти кулпулаганыңызда колдонмолор иштебей калат"</b>\n"Жеке мейкиндикти кулпулаганыңызда андагы колдонмолор иштебей калат жана алардан билдирмелерди албай каласыз"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Жеке мейкиндиктер фондук режимде иштеп же маанилүү билдирмелерди жөнөтүшү керек болгон колдонмолорго (мисалы, медициналык колдонмолор) ылайыксыз. Мындай мейкиндик кулпуланганда, фондогу аракеттер жана билдирмелер токтотулат.\n\nЖеке мейкиндик кулпуланганда андагы колдонмолор уруксаттарда, купуялык тактасында жана башка параметрлерде көрүнбөйт.\n\nЖеке мейкиндигиңизди жаңы түзмөккө жылдырууга болбойт. Башка түзмөктө колдонуу үчүн башка жеке мейкиндикти тууралашыңыз керек болот.\n\nЖеке мейкиндигиңизге түзмөгүңүзгө зыянкеч колдонмолорду орноткон же аны өз компьютерине кошуп алган адам кире алат."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Жеке мейкиндиктер фондук режимде иштеп же маанилүү билдирмелерди жөнөтүшү керек болгон колдонмолорго (мисалы, медициналык колдонмолор) ылайыксыз. Мындай мейкиндик кулпуланганда фондогу аракеттер жана билдирмелер токтотулат.\n\nЖеке мейкиндик кулпуланганда андагы колдонмолор уруксаттарда, купуялык тактасында жана башка параметрлерде көрүнбөйт.\n\nЖеке мейкиндикти жаңы түзмөктө калыбына келтирүүгө болбойт. Башка түзмөктө колдонуу үчүн башка мейкиндикти тууралашыңыз керек.\n\nЖеке мейкиндигиңизге түзмөгүңүзгө зыянкеч колдонмолорду орноткон же аны өз компьютерине кошуп алган адам кире алат."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Жеке мейкиндик тууралуу кеңири маалымат"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Буга аз эле убакыт кетет"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Жеке мейкиндик туураланууда…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Түзмөк өчүп күйсүнбү?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC\'нин толук таржымалы иштеп чыгуу максатында гана колдонулат. NFC тууралуу кошумча маалыматта мүчүлүштүктөр тууралуу кабарлар жана купуя маалымат камтылышы мүмкүн. Бул параметрди өзгөртүү үчүн түзмөгүңүздү өчүрүп күйгүзүңүз."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Өчүрүп күйгүзүү"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"башка экранга чыгаруу, тышкы экран, туташкан экран, usb экраны, дааналык, буруу"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Буруу"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Кадимки"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1212,7 +1227,7 @@
<string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\"Ыңгайлашуучу көшүү режими\" экранды кимдир-бирөө карап жатканын текшерүү үчүн маңдайкы камераны колдонот. Ал түзмөктө иштеп, сүрөттөрдү эч качан сактап калбайт жана Google\'га жөнөтпөйт."</string>
<string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ыңгайл. көшүү режимин күйгүзүү"</string>
<string name="adaptive_sleep_contextual_slice_summary" msgid="2993867044745446094">"Экранды карап турганда, өчпөйт"</string>
- <string name="power_consumption_footer_summary" msgid="4901490700555257237">"Экран өчө турган убакыт узак болсо, батарея көбүрөөк сарпталат."</string>
+ <string name="power_consumption_footer_summary" msgid="4901490700555257237">"Экран көпкө чейин өчпөсө, батарея тез отуруп калышы мүмкүн."</string>
<string name="auto_rotate_camera_lock_title" msgid="5369003176695105872">"Камера кулпуланган"</string>
<string name="auto_rotate_camera_lock_summary" msgid="5699491516271544672">"Жүздү аныктоо үчүн камеранын кулпусун ачуу керек"</string>
<string name="adaptive_sleep_camera_lock_summary" msgid="8417541183603618098">"Ыңгайлашуучу көшүү режимин колдонуу үчүн камеранын кулпусун ачуу керек"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Экрандагы баскычтопту колдонуу"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Баскычтоп иштетилгенде экранда көрүнүп турат"</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="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="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="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>
@@ -1924,11 +1939,15 @@
<string name="trackpad_bottom_right_tap_summary" msgid="8734094086900680674">"Дагы параметрлерди көрүү үчүн сенсордук тактанын ылдыйкы оң бурчун таптаңыз"</string>
<string name="trackpad_pointer_speed" msgid="7786579408631352625">"Көрсөткүчтүн ылдамдыгы"</string>
<string name="pointer_fill_style" msgid="8413840032931637595">"Көрсөткүчтү толтуруу стили"</string>
- <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Көрсөткүчтү толтуруу стилин карага өзгөртүү"</string>
- <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Көрсөткүчтү толтуруу стилин жашылга өзгөртүү"</string>
- <string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Көрсөткүчтү толтуруу стилин сарыга өзгөртүү"</string>
- <string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Көрсөткүчтү толтуруу стилин кызгылтымга өзгөртүү"</string>
- <string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Көрсөткүчтү толтуруу стилин көккө өзгөртүү"</string>
+ <string name="pointer_fill_style_black_button" msgid="4540815366995820960">"Толтуруу стилин карага өзгөртүү"</string>
+ <string name="pointer_fill_style_green_button" msgid="3731413496528067979">"Толтуруу стилин жашылга өзгөртүү"</string>
+ <string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Толтуруу стилин сарыга өзгөртүү"</string>
+ <string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Толтуруу стилин күлгүнгө өзгөртүү"</string>
+ <string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Толтуруу стилин көккө өзгөртүү"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Көрсөткүчтүн стили"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Ак"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Кара"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Жок"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Колдонуучу тандаган: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Кеп"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Көрсөткүчтүн ылдамдыгы"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Көрсөткүчтүн өлчөмү"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Көрсөткүчтүн өлчөмүн кичирейтүү"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Көрсөткүчтүн өлчөмүн чоңойтуу"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Оюн контроллери"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Дирилдөөнү багыттоо"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Туташкан учурларда, дирилдөөнү оюн көзөмөлдөгүчүнө жөнөтүү"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Баары бир улантуу"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Жок"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Чоңойтуу параметрлери"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Бир манжа менен жылдыруу"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Лупаны 1 манжаңыз менен жылдырыңыз"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Экрандын башка бөлүгүнө 1 манжаңыз менен жылыңыз"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Чоңойтуу аймагын бир манжаңыз менен сүйрөп жылдырыңыз."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Чоңойтуу аймагын эки манжаңыз менен сүйрөп жылдырыңыз."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Экрандын бир бөлүгүн гана чоңойткондо жеткиликсиз"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Чоңойтуп/кичирейтүү үчүн баскычты басыңыз"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Экранды оңой чоңойто аласыз"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Жакындатуу үчүн:</b><br/> {0,number,integer}. Чоңойтуу режимин иштетүү үчүн ыкчам баскычты басыңыз<br/> {1,number,integer}. Экранды басыңыз<br/> {2,number,integer}. Экрандын башка бөлүгүнө 2 манжаңыз менен жылыңыз<br/> {3,number,integer}. Чоңойтуп/кичирейтүү үчүн 2 манжаңызды бириктириңиз<br/> {4,number,integer}. Чоңойтуу режиминен чыгуу үчүн ыкчам баскычты басыңыз<br/><br/> <b>Убактылуу жакындатуу үчүн:</b><br/> {0,number,integer}. Чоңойтуу режими толук экранга орнотулганын текшериңиз<br/> {1,number,integer}. Чоңойтуу режимин иштетүү үчүн ыкчам баскычты басыңыз<br/> {2,number,integer}. Экрандын бир жерин коё бербей басып туруңуз<br/> {3,number,integer}. Экрандын башка бөлүгүнө манжаңыз менен жылыңыз<br/> {4,number,integer}. Чоңойтуу режиминен чыгуу үчүн манжаңызды көтөрүп коюңуз"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Жакындатуу үчүн:</b><br/> {0,number,integer}. Чоңойтуу режимин иштетүү үчүн ыкчам баскычты басыңыз<br/> {1,number,integer}. Экранды басыңыз<br/> {2,number,integer}. Экрандын башка бөлүгүнө 2 манжаңыз менен жылыңыз<br/> {3,number,integer}. Чоңойтуп/кичирейтүү үчүн 2 манжаңызды бириктириңиз<br/> {4,number,integer}. Чоңойтуу режиминен чыгуу үчүн ыкчам баскычты басыңыз<br/><br/> Ошондой эле, убактылуу жакындатып жана башка аракеттерди аткара аласыз."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Жакындатуу үчүн:</b><br/> {0,number,integer}. Чоңойтуу режимин иштетүү үчүн ыкчам баскычты басыңыз<br/> {1,number,integer}. Экранды басыңыз<br/> {2,number,integer}. Экрандын башка бөлүгүнө 1 же 2 манжаңыз менен жылыңыз<br/> {3,number,integer}. Чоңойтуп/кичирейтүү үчүн 2 манжаңызды бириктириңиз<br/> {4,number,integer}. Чоңойтуу режиминен чыгуу үчүн ыкчам баскычты басыңыз<br/><br/> Ошондой эле, убактылуу жакындатып жана башка аракеттерди аткара аласыз."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Бул функциянын жардамы менен, экрандагы нерсени чоңойтуп, кичирейте аласыз.\n\n"<b>"Чоңойткуңуз келсе"</b>", кызматты иштетип туруп, экрандын бир жерин басыңыз.\n"<ul><li>"Чоңойгон жерди ары-бери жылдырып көргүңүз келсе, экранды эки же үч манжаңыз менен сүрүңүз."</li>\n<li>"Чоңойтуп/кичирейтүү үчүн эки же үч манжаңызды бириктирип/ажыратыңыз."</li></ul>\n\n<b>"Убактылуу чоңойтуп/кичирейтүү үчүн"</b>" кызматты иштетип, экрандын бир жерин коё бербей басып туруңуз.\n"<ul><li>"Экранды жылдырып көрүү үчүн аны манжаңыз менен сүрүңүз."</li>\n<li>"Кызматты өчүрүү үчүн манжаңызды көтөрүңүз."</li></ul>\n\n"Баскычтопто же чабыттоо тилкесинде көрүнүш чоңойбойт."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> ичинен <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>-барак"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Атайын мүмкүнчүлүктөр ыкчам баскычы"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жок}=1{1 график коюлду}other{# график коюлду}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Тынчымды алба"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Маанилүүлүк режимдери"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Режим кошуу"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Маанилүү байланыштар менен колдонмолордон гана билдирмелерди алып турасыз"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Иштетүү түрүн тандоо"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Убакыт"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Мис., \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Жылнаама"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Мис., \"Жеке жылнаама\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Режим түзүү"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Жеке"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Билдирмелерди чектөө"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Тынчымды алба\" режимин күйгүзүү"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Ойготкучтар менен медиа добуштар үзгүлтүккө учуратышы мүмкүн"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Ырааттамалар"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Ырааттамаларды өчүрүү"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Өчүрүү"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Аталышын өзгөртүү"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Өчүрүү"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" режими өчүрүлсүнбү?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Түзөтүү"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Ырааттамалар"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ырааттама"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Жылнаама кошуу"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Жылнааманы колдонуу"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"График"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"График түзүү"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"График"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> с. <xliff:g id="MINUTES">%2$d</xliff:g> мүн."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Автоматтык түрдө күйөт"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ырааттама"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Телефондун үнүн өчүрүүнү жөндөө"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\"Тынчымды алба\" режиминин эрежелерин коюу"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Үнү чыккан билдирмелерге уруксат берүү"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Визуалдык билдирмелерди бөгөттөө"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуалдык сигнал иштетилсин"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Сиз ала турган билдирмелер"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Алагды болбоңуз"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Кошумча аракеттер"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Өчүк}=1{Өчүк / 1 режим автоматтык түрдө иштетилет}other{Өчүк / # режим автоматтык түрдө иштетилет}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Көрүнүш параметрлери"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Көрүнүш параметрлери"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Боз"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"караңгы теманы иштетүү"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Текстти күңүрт фондо ачык түстө көрүү үчүн OS менен колдонмолорду которуңуз. Бул көзүңүзгө доо кетирбей, айрым түзмөктөрдө батареяны олуттуу үнөмдөөгө жардам бериши мүмкүн"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"Билдирмелерди чыпкалоо"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Билдирмелер чыпкаланган жок"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"билдирмени ачуу"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Билдирмени тындырууга уруксат берүү"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Колдонмонун сүрөтчөсүндөгү билдирменин белгиси"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Билдирмелердин топтомдору"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Калкып чыкма билдирмелер"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Калкып чыкма билдирмелер"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Калкып чыкма билдирмелерди көрсөтүү"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Бул колдонмодо кеңири жөндөөлөр колдоого алынбайт"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Дагы параметрлер"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Бул колдонмодо кошумча параметрлер бар"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Билдирмелердин үнүн басаңдатуу"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Жумуш профилдерине колдонуу"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Жумуш профилинин колдонмолоруна карата пайдаланыңыз"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категориялар"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Башка"</string>
<string name="no_channels" msgid="4716199078612071915">"Бул колдонмодон эч кандай билдирме келген жок"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Колдонулбаган категорияларды көрсөтүү"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Колдонмонун кошумча параметрлери"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Колдонулбаган категорияларды көрсөтүү"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Колдонулбаган категорияларды жашыруу"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"\"Тынчымды алба\" режими таасир этпеген колдонмолор"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Тандалган колдонмолор"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Жок"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Баары"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Колдонмолорго өзгөртүп коюуга уруксат берүү"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"\"Тынчымды алба\" режими таасир этпеген колдонмолор"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Дагы колдонмолорду тандаңыз"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Эч нерсе үзгүлтүккө учурата албайт"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Эч ким үзгүлтүккө учурата албайт"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Айрым байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Бардык байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Кайра чалуучулар"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Кайра чалып жаткан абоненттерге уруксат берүү"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} чейин бир саатка \"Ойготкучтар гана\" режимине өзгөртүү}other{{time} чейин # саатка \"Ойготкучтар гана\" режимине өзгөртүү}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Режимди түзөтүү"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Режимди кошуу"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Жеке режим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Режимдин аталышы"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Эскертүү"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Жабуу"</string>
<string name="device_feedback" msgid="5351614458411688608">"Түзмөк тууралуу пикир билдирүү"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Иш такта режимин күйгүзүү"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Иш тактанын сынамык режими көмөкчү экрандарда мажбурлап иштетилет"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Эркин формадагы терезелерди түзүүнү иштетүү"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Эркин формадагы терезелерди түзүүнү иштетиңиз."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Эркин формадагы терезелерди экинчи экранда түзүүнү иштетүү"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Эркин формадагы терезелерди кошумча экранда гана түзүүнү иштетүү."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Өлчөмү өзгөрбөгөн колдонмолорду бир нече терезеде иштетүү"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Өлчөмү өзгөрбөгөн колдонмолор бир нече терезеде көрүнөт"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Түнкү режимди мажбурлап иштетүү функциясын өзгөртүп коюу"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Бул түзмөктүн маалымат камтылган катуу диск бөлүгү 16Kб өлчөмүндөгү иштеп чыгуучунун параметрин колдонуудан мурун ext4 форматына өзгөртүлүшү керек. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. 16Kб параметрин иштетүү үчүн дагы бир жолу өчүрүп-күйгүзүү талап кылынат. Бул режимге өткөндөн кийин, бир жолу өчүрүп-күйгүзүү менен 4Kб жана 16Kб режимдеринин арасында которула аласыз. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Түзмөктү өндүрүш режимине кайтаруу үчүн кайра 4Кб режимине которулуп, түзмөктү баштапкы абалга келтирген операциялык тутумду жүктөгүчтү кулпулашыңыз керек болот. Түзмөк Android\'ге ийгиликтүү жүктөлгөндөн кийин, иштеп чыгуучунун параметрлеринен OEM ачууну өчүрүңүз. Ырастоодон кийин түзмөк тазаланат жана файл системасы ext4 форматына өзгөртүлөт. Бул процесс аяктагандан кийин, 16Кб режимин кайра иштетүү үчүн кайтыңыз."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Бардык нерселерди өчүрүү"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Кайра форматталбай жана катуу диск бөлүгүндөгү маалымат ext4 үчүн тазаланбай калды."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16Kб режими үчүн операциялык тутумду жүктөгүчтүн кулпусун ачуу талап кылынат"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Операциялык тутумду жүктөгүчтүн кулпусун ачуу талап кылынат"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Беттин өлчөмүн 16 кБка өзгөртүп, иштеп чыгуучуларга арналган параметрди колдонуудан мурун, түзмөктөгү операциялык системаны жүктөгүчтүн кулпусун ачыңыз. Бул режимде программанын бүтүндүгүнө кепилдик бере албайбыз. Операциялык системаны жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык нерселер коркунучта болушу мүмкүн. Беттин өлчөмүн 16 кБ көбөйткөндө, колдонуучунун бардык нерселери жана параметрлери өчүп калат. Операциялык системаны жүктөгүчтүн кулпусу ачылгандан кийин түзмөктү эки жолу өчүрүп күйгүзүшүңүз керек. Бул режимде беттин өлчөмүн 4 кБтан 16 кБка которуу үчүн түзмөктү бир жолу өчүрүп күйгүзүшүңүз керек. Кээ бир функциялар өчүп калгандыктан, айрым колдонмолор иштебей калышы мүмкүн. Түзмөктү баштапкы абалга кайтаруу үчүн беттин өлчөмүн кайра 4 кБ режимине которуп, операциялык системаны жүктөгүчтү кулпулашыңыз керек. Операциялык системаны жүктөгүчтүн кулпусун ачып, кайталап көрүңүз. Бул жөнүндө кененирээк маалымат алгыңыз келсе, бул жерге өтүңүз: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Беттен көз карандысыз 4Кб өлчөмүндөгү режимди колдонуу"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Беттен көз карандысыз режиминин 4Кб өлчөмүндөгү режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн, түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Көбүрөөк окуу үчүн таптаңыз."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Беттен көз карандысыз режиминин 4Кб өлчөмүндөгү режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн, түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Бул түзмөктү кайра баштапкы абалга келтирип, өндүрүш параметрлерине кайтарат. Түзмөк Android\'ге ийгиликтүү жүктөлгөндөн кийин, иштеп чыгуучунун параметрлеринен OEM ачууну өчүрүңүз. Түзмөк Android\'ге жүктөлбөй калса же туруксуз болсо, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> дарегиндеги баштапкы сүрөттөр менен акыркы версияга кайтарып, \"Түзмөктү тазалоо\", \"Операциялык тутумду жүктөгүчтү кулпулоо\" жана \'Бардык бөлүктөрүн мажбурлап программалоо\" параметрлерин тандаңыз."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 кБ өлчөмүндөгү бетке байланышпаган режимди колдонуу"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Беттен көз карандысыз режимдин 16Кб режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн 4Кб режимине кайтып, андан кийин түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Көбүрөөк окуу үчүн таптаңыз."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"16 кБ өлчөмдүү беттин эс тутумуна байланышпаган режимде иштеп жатасыз. Бул режимде программанын бүтүндүгүнө кепилдик бере албайбыз. Операциялык системаны жүктөгүчтүн кулпусу ачылып турганда, телефондо сакталган бардык нерселер коркунучта мүмкүн. Бул режимдерде айрым функциялар өчүрүлгөндүктөн, кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайтуу үчүн беттин өлчөмүн 4 кБ чейин азайтып, түзмөктүн операциялык системасын жүктөгүчтү кулпулап коюңуз. Натыйжада, түзмөктүн параметрлери баштапкы абалга коюлат. Android ишке киргизилгенден кийин, иштеп чыгуучунун параметрлеринен жүктөгүчтү кулпулап коюңуз. Түзмөк жакшы иштебей же Android ишке киргизилбей жатса, түзмөктү тазалап салыңыз. Ал үчүн <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> же use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> дарегиндеги баштапкы сүрөттөрдү колдонуңуз. Андан соң \"Түзмөктү тазалоо\", \"Операциялык системаны жүктөгүчтү кулпулоо\" жана \'Бардык бөлүмдөрдү мажбурлап программалоо\" параметрлерин тандаңыз."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Беттин көлөмүнө көз каранды эмес режимдин 16 Кб режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн 4 Кб режимине кайтып, андан кийин түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Көбүрөөк окуу үчүн таптаңыз."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Беттин көлөмүнө көз каранды эмес режимдин 16 Кб режиминдесиз. Бул режимде программанын бүтүндүгүнө кепилдик берилбейт. Операциялык тутумду жүктөгүчтүн кулпусу ачылып турганда телефондо сакталган бардык маалыматтар коркунучта болушу мүмкүн. Бул режимдерде айрым функциялар өчүрүлөт, андыктан кээ бир колдонмолор иштебей калышы мүмкүн. Өндүрүш режимине кайра кирүү үчүн 4 Кб режимине кайтып, андан кийин түзмөктүн операциялык тутумунун жүктөгүчүн кулпулашыңыз керек. Бул түзмөктү кайра баштапкы абалга келтирип, өндүрүш параметрлерине кайтарат. Түзмөк Android\'ге ийгиликтүү жүктөлгөндөн кийин, иштеп чыгуучунун параметрлеринен OEM ачууну өчүрүңүз. Түзмөк Android\'ге жүктөлбөй калса же туруксуз болсо, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> дарегиндеги баштапкы сүрөттөр менен акыркы версияга кайтарып, \"Түзмөктү тазалоо\", \"Операциялык тутумду жүктөгүчтү кулпулоо\" жана \'Бардык бөлүктөрүн мажбурлап программалоо\" параметрлерин тандаңыз."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Беттен көз карандысыз 16Кб өлчөмүндөгү режим"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Дагы окуу"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Мүчүлүштүк тууралуу кабар берүүнү иштеткич"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Колдонмону кадап коюу функциясын иштетүү"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Иштеп чыгуучулардын параметрлерин колдонуу"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Басып чыгаруу кызматын колдонуу"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Бир нече колдонуучуга уруксат берүү"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Колдонуучуну которууга уруксат берүү"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"уруксат берүү, бир нече, колдонуучу, уруксат, көп"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"бир нече, колдонуучулар, профилдер, адамдар, аккаунттар, которуштуруу, көп"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Мүчүлүштүктөрдү Wi-Fi аркылуу оңдоону колдонуу"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Планшет док бекетке туташып турганда экранда эмне көрүнөрүн тандаңыз. Көшөгө иштетилгенде, түзмөк көбүрөөк кубат керектеши мүмкүн."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Ыңгайлаштыруу"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ыңгайлаштыруу"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Эркин форма режиминде колдоону иштетүү үчүн өчүрүп-күйгүзүү керек."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Кошумча экрандарда иш такта режимин мажбурлап иштетүү үчүн өчүрүп-күйгүзүү керек."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Эркин формадагы эски терезелерди түзүүнү иштетүү үчүн өчүрүп-күйгүзүү талап кылынат."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Эркин формадагы терезелерди өзгөртүү үчүн өчүрүп-күйгүзүү талап кылынат."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Эркин формадагы терезелерди кошумча экрандарда түзүүнү иштетүү үчүн өчүрүп-күйгүзүү талап кылынат."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Азыр өчүрүп-күйгүзүү"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Кийинчерээк өчүрүп-күйгүзүү"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Мейкиндиктүү үн"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Күйүк"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Өчүк"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Күйүк"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио: %1$d%% (сол), %2$d%% (оң)"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио: %1$d%% (оң), %2$d%% (сол)"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Түзмөгүңүздүн аталышы орнотулган колдонмолорго көрүнүп турат. Ошондой эле, Bluetooth түзмөктөрүнө, Wi‑Fi тармагына туташып же Wi‑Fi байланыш түйүнүн тууралаганыңызда башка адамдарга көрүнүшү мүмкүн."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Грамматикалык жак"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Грамматикалык жакты тандаңыз"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Издөө параметрлери"</string>
</resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 225ac31..8c5f677 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ເວລານອນ"</item>
+ <item msgid="4152450357280759894">"ການຂັບຂີ່"</item>
+ <item msgid="7096549258219399423">"ສົມຈິງ"</item>
+ <item msgid="2760716776980432977">"ທີ່ມີການຈັດການ"</item>
+ <item msgid="601734478369121764">"ດາວ"</item>
+ <item msgid="6243809315432780521">"ປະຕິທິນ"</item>
+ <item msgid="4913577903148415331">"ເວລາ"</item>
+ <item msgid="3653377604690057780">"ໂຮງລະຄອນ"</item>
+ <item msgid="3843711267408385410">"ດອກໄມ້"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index eabf159..70a7efe 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ຕັດການເຊື່ອມຕໍ່ອຸປະກອນຫຼືບໍ່?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ຈັບຄູ່ອຸປະກອນໃໝ່"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ເປີດໂດຍອັດຕະໂນມັດໃນມື້ອື່ນ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ການຕັ້ງຄ່າອຸປະກອນຊ່ວຍຟັງ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ທາງລັດ, ການໃຊ້ຮ່ວມກັນໄດ້ຂອງເຄື່ອງຊ່ວຍຟັງ"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ຄ່າທີ່ກຳນົດລ່ວງໜ້າ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ບໍ່ມີພຣີເຊັດທີ່ນັກສຳຜັດວິທະຍາຂອງທ່ານຕັ້ງໂປຣແກຣມໄວ້"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ບໍ່ສາມາດອັບເດດການຕັ້ງຄ່າລ່ວງໜ້າໄດ້"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ເອົ້າພຸດສຽງ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ກ່ຽວກັບເອົ້າພຸດສຽງ"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ປິດ"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ເປີດຢູ່ / # ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່}other{ເປີດຢູ່ / # ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ກຳລັງໂຫລດ…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ແອັບທີ່ມີການອະນຸຍາດອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງສາມາດລະບຸສະຖານທີ່ທີ່ກ່ຽວຂ້ອງກັນຂອງອຸປະກອນທີ່ເຊື່ອມຕໍ່ໄດ້."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"ແອັບທີ່ມີການອະນຸຍາດອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງສາມາດລະບຸຕຳແໜ່ງທີ່ສຳພັນກັນຂອງອຸປະກອນທີ່ເຊື່ອມຕໍ່ແລ້ວໄດ້."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ການເຂົ້າເຖິງສະຖານທີ່ຖືກປິດໄວ້ສຳລັບແອັບ ແລະ ບໍລິການຕ່າງໆ. ສະຖານທີ່ອຸປະກອນອາດຍັງຄົງຖືກສົ່ງໄປຫາທີມກູ້ໄພເມື່ອທ່ານໂທ ຫຼື ສົ່ງຂໍ້ຄວາມຫາເບີໂທສຸກເສີນ."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ສຶກສາເພີ່ມເຕີມກ່ຽວກັບການຕັ້ງຄ່າສະຖານທີ່"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ເພື່ອປ່ຽນ ໃຫ້ເຂົ້າໄປການຕັ້ງຄ່າ ChromeOS > ຄວາມເປັນສ່ວນຕົວ ແລະ ຄວາມປອດໄພ > ການຄວບຄຸມຄວາມເປັນສ່ວນຕົວ > ສິດເຂົ້າເຖິງສະຖານທີ່"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ເພີ່ມໃບໜ້າ ແລະ <xliff:g id="WATCH">%s</xliff:g> ແລ້ວ"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ເພີ່ມໃບໜ້າ, ລາຍນິ້ວມື ແລະ <xliff:g id="WATCH">%s</xliff:g> ແລ້ວ"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ເພີ່ມໃບໜ້າ, ລາຍນິ້ວມື ແລະ <xliff:g id="WATCH">%s</xliff:g> ແລ້ວ"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ຕ້ອງດຳເນີນການເນື່ອງຈາກການກວດສອບຕົວຕົນເປີດຢູ່"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"ການປົດລັອກ Authenticator ຈາກທາງໄກ"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ເພີ່ມໂມງແລ້ວ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ຕັ້ງຄ່າໂມງຂອງທ່ານ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ສຶກສາເພີ່ມເຕີມກ່ຽວກັບການປົດລັອກດ້ວຍໂມງ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ເພີ່ມໂມງ"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ລຶບໂມງອອກ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ປົດລັອກດ້ວຍລາຍນິ້ວມື ແລະ ໜ້າ"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ປົດລັອກດ້ວຍໜ້າ ແລະ ລາຍນິ້ວມື"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ການປົດລັອກດ້ວຍໜ້າ ແລະ ລາຍນິ້ວມືສຳລັບການເຮັດວຽກ"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ຕ້ອງຕັ້ງຄ່າ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ເພີ່ມໜ້າ ແລະ ລາຍນິ້ວມືແລ້ວ"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ຕິດຕັ້ງແອັບ"</b>\n"ຕິດຕັ້ງແອັບທີ່ທ່ານຕ້ອງການເກັບໄວ້ເປັນສ່ວນຕົວໃນພື້ນທີ່ຂອງທ່ານ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ຂໍ້ຄວນຈື່"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"ແອັບຈະຢຸດເຮັດວຽກເມື່ອທ່ານລັອກພື້ນທີ່ຂອງທ່ານ"</b>\n"ເມື່ອທ່ານລັອກພື້ນທີ່ຂອງທ່ານ, ຈະເຮັດໃຫ້ແອັບໃນພື້ນທີ່ດັ່ງກ່າວຢຸດເຮັດວຽກ ແລະ ທ່ານກໍຈະບໍ່ໄດ້ຮັບການແຈ້ງເຕືອນຈາກແອັບເຫຼົ່ານັ້ນ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ພື້ນທີ່ສ່ວນບຸກຄົນບໍ່ເໝາະສົມກັບແອັບທີ່ຕ້ອງເຮັດວຽກໃນພື້ນຫຼັງ ຫຼື ສົ່ງການແຈ້ງເຕືອນສຳຄັນ, ເຊັ່ນ: ແອັບທາງການແພດ. ນີ້ແມ່ນຍ້ອນວ່າການແຈ້ງເຕືອນ ແລະ ການເຄື່ອນໄຫວໃນພື້ນຫຼັງໄດ້ຢຸດລົງເມື່ອພື້ນທີ່ຂອງທ່ານຖືກລັອກ.\n\nແອັບໃນພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານຈະບໍ່ປາກົດຢູ່ໃນຕົວຈັດການສິດອະນຸຍາດ, ແຜງໜ້າປັດຄວາມເປັນສ່ວນຕົວ ແລະ ການຕັ້ງຄ່າອື່ນໆ ເມື່ອພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານຖືກລັອກ.\n\nບໍ່ສາມາດຍ້າຍພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານໄປໃສ່ອຸປະກອນໃໝ່ໄດ້. ທ່ານຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ສ່ວນບຸກຄົນໃໝ່ຫາກທ່ານຕ້ອງການໃຊ້ຢູ່ອຸປະກອນອື່ນ.\n\nໃຜກໍຕາມທີ່ເຊື່ອມຕໍ່ອຸປະກອນຂອງທ່ານກັບຄອມພິວເຕີ ຫຼື ຕິດຕັ້ງແອັບທີ່ເປັນອັນຕະລາຍຢູ່ອຸປະກອນຂອງທ່ານອາດສາມາດເຂົ້າເຖິງພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານໄດ້."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ພື້ນທີ່ສ່ວນບຸກຄົນບໍ່ເໝາະສົມກັບແອັບທີ່ຕ້ອງເຮັດວຽກໃນພື້ນຫຼັງ ຫຼື ສົ່ງການແຈ້ງເຕືອນສຳຄັນ, ເຊັ່ນ: ແອັບທາງການແພດ. ນີ້ແມ່ນຍ້ອນວ່າການແຈ້ງເຕືອນ ແລະ ການເຄື່ອນໄຫວໃນພື້ນຫຼັງໄດ້ຢຸດລົງເມື່ອພື້ນທີ່ຂອງທ່ານຖືກລັອກ.\n\nແອັບໃນພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານຈະບໍ່ປາກົດຢູ່ໃນຕົວຈັດການສິດອະນຸຍາດ, ແຜງໜ້າປັດຄວາມເປັນສ່ວນຕົວ ແລະ ການຕັ້ງຄ່າອື່ນໆ ເມື່ອພື້ນທີ່ສ່ວນບຸກຄົນຖືກລັອກ.\n\nບໍ່ສາມາດກູ້ຄືນພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານໄປໃສ່ອຸປະກອນໃໝ່ໄດ້. ທ່ານຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ອີກລາຍການໜຶ່ງຫາກທ່ານຕ້ອງການໃຊ້ພື້ນທີ່ນັ້ນໃນອຸປະກອນອື່ນ.\n\nໃຜກໍຕາມທີ່ເຊື່ອມຕໍ່ອຸປະກອນຂອງທ່ານກັບຄອມພິວເຕີ ຫຼື ຕິດຕັ້ງແອັບທີ່ປະສົງຮ້າຍໃນອຸປະກອນຂອງທ່ານອາດເຂົ້າເຖິງພື້ນທີ່ສ່ວນບຸກຄົນຂອງທ່ານໄດ້."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ສຶກສາເພີ່ມເຕີມກ່ຽວກັບພື້ນທີ່ສ່ວນບຸກຄົນ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ຂັ້ນຕອນນີ້ຈະໃຊ້ເວລາໄລຍະໜຶ່ງ"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ກຳລັງຕັ້ງຄ່າພື້ນທີ່ສ່ວນຕົວ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ການບັນທຶກລາຍລະອຽດຂອງ NFC ແມ່ນສຳລັບຈຸດປະສົງການພັດທະນາເທົ່ານັ້ນ. ຂໍ້ມູນເພີ່ມເຕີມຂອງ NFC ຈະຮວມຢູ່ໃນລາຍງານຂໍ້ຜິດພາດ, ເຊິ່ງອາດມີຂໍ້ມູນສ່ວນຕົວ. ຣີສະຕາດອປະກອນເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ຣີສະຕາດ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ສະທ້ອນ, ຈໍສະແດງຜົນພາຍນອກ, ຈໍສະແດງຜົນທີ່ເຊື່ອມຕໍ່, ຈໍສະແດງຜົນ USB, ຄວາມລະອຽດ, ການໝຸນ"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ການໝຸນ"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ມາດຕະຖານ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ໃຊ້ແປ້ນພິມຢູ່ໜ້າຈໍ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ປະມັນໄວ້ໃນໜ້າຈໍເມື່ອໃຊ້ແປ້ນພິມພາຍນອກ"</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> ms"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ຮູບແບບການຕື່ມຕົວຊີ້ເປັນສີເຫຼືອງ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ຮູບແບບການຕື່ມຕົວຊີ້ເປັນສີບົວ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ຮູບແບບການຕື່ມຕົວຊີ້ເປັນສີຟ້າ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"ຮູບແບບລາຍເສັ້ນຂອງຕົວຊີ້"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ສີຂາວ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ສີດຳ"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ບໍ່ມີ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ຜູ້ໃຊ້ໄດ້ເລືອກ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ສຽງເວົ້າ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ຄວາມໄວລູກສອນ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ຂະໜາດຂອງຕົວຊີ້"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ຫຼຸດຂະໜາດຂອງຕົວຊີ້"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"ເພີ່ມຂະໜາດຂອງຕົວຊີ້"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ມືເກມ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ປ່ຽນເສັ້ນທາງການສັ່ນເຕືອນ"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibration to game controller when connected"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ຢືນຢັນດຳເນີນການຕໍ່"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ຍົກເລີກ"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ການຕັ້ງຄ່າການຂະຫຍາຍ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ການເລື່ອນດ້ວຍນິ້ວດຽວ"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ໃຊ້ 1 ນິ້ວຍ້າຍແວ່ນຂະຫຍາຍ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ໃຊ້ 1 ນິ້ວລາກເພື່ອຍ້າຍໄປອ້ອມຮອບໜ້າຈໍ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ຍ້າຍພື້ນທີ່ການຂະຫຍາຍໂດຍການລາກໜຶ່ງນິ້ວ."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ຍ້າຍພື້ນທີ່ການຂະຫຍາຍໂດຍການລາກສອງນິ້ວ."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ບໍ່ສາມາດໃຊ້ໄດ້ໃນລະຫວ່າງທີ່ກຳລັງຂະຫຍາຍພາກສ່ວນຂອງໜ້າຈໍ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ແຕະປຸ່ມເພື່ອຊູມ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ຊູມເຂົ້າໄວໆຢູ່ໜ້າຈໍເພື່ອເຮັດໃຫ້ເນື້ອຫາໃຫຍ່ຂຶ້ນ"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ເພື່ອຊູມເຂົ້າ:</b><br/> {0,number,integer}. ໃຊ້ທາງລັດເພື່ອເລີ່ມການຂະຫຍາຍ<br/> {1,number,integer}. ແຕະໃສ່ໜ້າຈໍ<br/> {2,number,integer}. ລາກ 2 ນິ້ວເພື່ອເລື່ອນໄປມາຢູ່ໜ້າຈໍ<br/> {3,number,integer}. ບີບດ້ວຍ 2 ນິ້ວເພື່ອປັບແກ້ການຊູມ<br/> {4,number,integer}. ໃຊ້ທາງລັດເພື່ອຢຸດການຂະຫຍາຍ<br/><br/><b>ເພື່ອຊູມເຂົ້າຊົ່ວຄາວ:</b><br/> {0,number,integer}. ກວດສອບວ່າປະເພດການຂະຫຍາຍຂອງທ່ານແມ່ນຕັ້ງເປັນເຕັມຈໍແລ້ວ<br/> {1,number,integer}. ໃຊ້ທາງລັດເພື່ອເລີ່ມການຂະຫຍາຍ<br/> {2,number,integer}. ແຕະຢູ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍຄ້າງໄວ້<br/> {3,number,integer}. ລາກນິ້ວເພື່ອເລື່ອນໄປມາຢູ່ໜ້າຈໍ<br/> {4,number,integer}. ຍົກນິ້ວຂຶ້ນເພື່ອຢຸດການຂະຫຍາຍ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ເພື່ອຊູມເຂົ້າ:</b><br/> {0,number,integer}. ໃຊ້ທາງລັດເພື່ອເລີ່ມການຂະຫຍາຍ<br/> {1,number,integer}. ແຕະໜ້າຈໍ<br/> {2,number,integer}. ໃຊ້ 2 ນິ້ວລາກເພື່ອຍ້າຍໄປອ້ອມຮອບໜ້າຈໍ<br/> {3,number,integer}. ໃຊ້ 2 ນິ້ວບີບເພື່ອປັບການຊູມ<br/> {4,number,integer}. ໃຊ້ທາງລັດເພື່ອຢຸດການຂະຫຍາຍ<br/><br/> ທ່ານຍັງສາມາດຊູມເຂົ້າຊົ່ວຄາວ ແລະ ເຮັດສິ່ງອື່ນໆໄດ້ນຳ."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ເພື່ອຊູມເຂົ້າ:</b><br/> {0,number,integer}. ໃຊ້ທາງລັດເພື່ອເລີ່ມການຂະຫຍາຍ<br/> {1,number,integer}. ແຕະໜ້າຈໍ<br/> {2,number,integer}. ໃຊ້ 1 ຫຼື 2 ນິ້ວລາກເພື່ອຍ້າຍໄປອ້ອມຮອບໜ້າຈໍ<br/> {3,number,integer}. ໃຊ້ 2 ນິ້ວບີບເພື່ອປັບການຊູມ<br/> {4,number,integer}. ໃຊ້ທາງລັດເພື່ອຢຸດການຂະຫຍາຍ<br/><br/> ທ່ານຍັງສາມາດຊູມເຂົ້າຊົ່ວຄາວ ແລະ ເຮັດສິ່ງອື່ນໆໄດ້ນຳ."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ເມື່ອເປີດໃຊ້ການຂະຫຍາຍແລ້ວ, ທ່ານສາມາດຊູມເຂົ້າຢູ່ໜ້າຈໍຂອງທ່ານໄດ້.\n\n"<b>"ເພື່ອຊູມ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍ.\n"<ul><li>"ລາກ 2 ນິ້ວ ຫຼື ຫຼາຍກວ່ານັ້ນເພື່ອເລື່ອນ"</li>\n<li>"ຖ່າງ 2 ນິ້ວ ຫຼື ຫຼາຍກວ່ານັ້ນເພື່ອປັບແຕ່ງການຊູມ"</li></ul>\n\n<b>"ເພື່ອຊູມຊົ່ວຄາວ"</b>", ໃຫ້ເລີ່ມການຂະຫຍາຍ, ຈາກນັ້ນແຕະໃສ່ບ່ອນໃດກໍໄດ້ຢູ່ໜ້າຈໍຄ້າງໄວ້.\n"<ul><li>"ລາກເພື່ອຍ້າຍໄປມາຢູ່ໜ້າຈໍ"</li>\n<li>"ຍົກນິ້ວຂຶ້ນເພື່ອຊູມອອກ"</li></ul>\n\n"ທ່ານບໍ່ສາມາດຊູມໃສ່ແປ້ນພິມ ຫຼື ແຖບການນຳທາງໄດ້."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"ໜ້າທີ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ທາງລັດຂອງປຸ່ມການຊ່ວຍເຂົ້າເຖິງ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ບໍ່ມີ}=1{ຕັ້ງກຳນົດເວລາ 1 ລາຍການແລ້ວ}other{ຕັ້ງກຳນົດເວລາ # ລາຍການແລ້ວ}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ຫ້າມລົບກວນ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ໂໝດຄວາມສຳຄັນ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ເພີ່ມໂໝດ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ຮັບການແຈ້ງເຕືອນສະເພາະຄົນ ແລະ ແອັບສຳຄັນເທົ່ານັ້ນ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"ເລືອກປະເພດການເປີດການນຳໃຊ້"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ເວລາ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ເຊັ່ນ: \"9:30 – 17:00 ໂມງ\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ປະຕິທິນ"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ເຊັ່ນ: \"ປະຕິທິນສ່ວນຕົວ\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ສ້າງໂໝດ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ກຳນົດເອງ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ຈຳກັດການລົບກວນ"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"ເປີດໂໝດຫ້າມລົບກວນ"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ສຽງໂມງປຸກ ແລະ ມີເດຍສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"ກຳນົດເວລາ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ລຶບກຳນົດເວລາ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ລຶບ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"ປ່ຽນຊື່"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ລຶບ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"ລຶບໂໝດ \"<xliff:g id="MODE">%1$s</xliff:g>\" ບໍ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ແກ້ໄຂ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"ການກຳນົດເວລາ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"ກຳນົດເວລາ"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"ເພີ່ມປະຕິທິນ"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ໃຊ້ປະຕິທິນຂອງທ່ານ"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"ກຳນົດເວລາ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ຕັ້ງກຳນົດເວລາ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"ກຳນົດເວລາ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ຊມ, <xliff:g id="MINUTES">%2$d</xliff:g> ນທ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ເປີດໃຊ້ອັດຕະໂນມັດ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"ກຳນົດເວລາ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ປິດສຽງໂທລະສັບໃນບາງເວລາ"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"ຕັ້ງກົດຂອງການຫ້າມລົບກວນ"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ອະນຸຍາດການລົບກວນທີ່ມີສຽງ"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ບລັອກການລົບກວນທາງພາບ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ອະນຸຍາດສັນຍານພາບ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ການແຈ້ງເຕືອນທີ່ທ່ານອາດໄດ້ຮັບ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ມີສະມາທິຢູ່ສະເໝີ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"ຄຳສັ່ງເພີ່ມເຕີມ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ປິດ}=1{ປິດ / 1 ໂໝດຈະສາມາດເປີດໄດ້ໂດຍອັດຕະໂນມັດ}other{ປິດ / # ໂໝດຈະສາມາດເປີດໄດ້ໂດຍອັດຕະໂນມັດ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ການຕັ້ງຄ່າການສະແດງຜົນ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ຕົວເລືອກການສະແດງຜົນ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ຂາວດຳ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ເປີດການນຳໃຊ້ຮູບແບບສີສັນມືດ"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ສະຫຼັບລະບົບປະຕິບັດການ ແລະ ແອັບເພື່ອໃຊ້ຂໍ້ຄວາມສີອ່ອນເທິງພື້ນຫຼັງສີເຂັ້ມ, ເຊິ່ງອາດສະບາຍຕາຫຼາຍຂຶ້ນ ແລະ ຊ່ວຍປະຢັດແບັດເຕີຣີໄດ້ຫຼາຍໃນອຸປະກອນບາງປະເພດ"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"ກັ່ນຕອງການຂັດຈັງຫວະ"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ບໍ່ໄດ້ກັ່ນຕອງການຂັດຈັງຫວະ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ເປີດການແຈ້ງເຕືອນ"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"ອະນຸຍາດໃຫ້ເລື່ອນການແຈ້ງເຕືອນ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ໄອຄອນຈຸດການແຈ້ງເຕືອນຢູ່ແອັບ"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"ກຸ່ມການແຈ້ງເຕືອນ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbles"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbles"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ສະແດງການສົນທະນານີ້ເປັນຟອງ"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ແອັບນີ້ບໍ່ຮອງຮັບການຕັ້ງຄ່າທີ່ປັບປຸງໃຫ້ດີຂຶ້ນ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ການຕັ້ງຄ່າເພີ່ມເຕີມແມ່ນມີໃຫ້ຢູ່ພາຍໃນແອັບ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"ຄູດາວການແຈ້ງເຕືອນ"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ນຳໃຊ້ກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ໃຊ້ກັບແອັບໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ໝວດໝູ່"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ອື່ນໆ"</string>
<string name="no_channels" msgid="4716199078612071915">"ແອັບນີ້ຍັງບໍ່ໄດ້ໂພສການແຈ້ງເຕືອນໃດເທື່ອ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ສະແດງໝວດໝູ່ທີ່ບໍ່ໄດ້ໃຊ້"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ການຕັ້ງຄ່າເພີ່ມເຕີມໃນແອັບ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ສະແດງໝວດໝູ່ທີ່ບໍ່ໄດ້ໃຊ້"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ເຊື່ອງໝວດໝູ່ທີ່ບໍ່ໄດ້ໃຊ້"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ແອັບທີ່ສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ແອັບທີ່ເລືອກແລ້ວ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ບໍ່ມີ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ທັງໝົດ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ອະນຸຍາດໃຫ້ແອັບຍົກເລີກໄດ້"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ແອັບທີ່ສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ເລືອກແອັບເພີ່ມເຕີມ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ບໍ່ມີໃຜສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"ບາງຄົນສາມາດລົບກວນໄດ້"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ທຸກຄົນສາມາດລົບກວນໄດ້"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ຜູ້ໂທຊ້ຳໆ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ອະນຸຍາດຜູ້ໂທທີ່ໂທຊ້ຳ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{ປ່ຽນເປັນໂມງປຸກພຽງແຕ່ໜຶ່ງຊົ່ວໂມງຈົນຮອດ {time} ເທົ່ານັ້ນ}other{ປ່ຽນເປັນໂມງປຸກພຽງແຕ່ # ຊົ່ວໂມງຈົນຮອດ {time} ເທົ່ານັ້ນ}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"ປ່ຽນເປັນໂມງປຸກເທົ່ານັ້ນຈົນຮອດ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ປ່ຽນເປັນຂັດຈັງຫວະທຸກຄັ້ງ"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ໂໝດແກ້ໄຂ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ໂໝດເພີ່ມ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ໂໝດທີ່ກຳນົດເອງ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ຊື່ໂໝດ"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ຄໍາເຕືອນ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ປິດ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ສົ່ງຄຳຕິຊົມກ່ຽວກັບອຸປະກອນນີ້"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ບັງຄັບໂໝດເດັສທັອບ"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ບັງຄັບໂໝດເດັສທັອບແບບທົດລອງໃຊ້ຢູ່ໜ້າຈໍທີສອງ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ເປີດການນຳໃຊ້ໜ້າຈໍຮູບແບບອິດສະຫຼະ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ເປີດການນຳໃຊ້ການຮອງຮັບໜ້າຈໍຮູບແບບອິດສະຫຼະ."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"ເປີດການນຳໃຊ້ໜ້າຈໍຮູບແບບອິດສະຫຼະຢູ່ຈໍສະແດງຜົນສຳຮອງ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ເປີດການນຳໃຊ້ໜ້າຈໍຮູບແບບອິດສະຫຼະຢູ່ຈໍສະແດງຜົນສຳຮອງເທົ່ານັ້ນ."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ເປີດການນຳໃຊ້ແບບບໍ່ສາມາດປັບຂະໜາດໃນການໃຊ້ຫຼາຍໜ້າຈໍ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ອະນຸຍາດໃຫ້ມີແອັບແບບບໍ່ສາມາດປັບຂະໜາດໄດ້ໃນການໃຊ້ຫຼາຍໜ້າຈໍ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ຍົກເລີກການບັງຄັບໃຫ້ໃຊ້ແບບມືດ"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"ພາທິຊັນຂໍ້ມູນຂອງອຸປະກອນນີ້ຈະຕ້ອງປ່ຽນແປງເປັນ ext4 ກ່ອນທີ່ຈະໃຊ້ຕົວເລືອກນັກພັດທະນາແບບ 16KB. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ການເປີດນຳໃຊ້ຕົວເລືອກ 16KB ຈະຕ້ອງມີການປິດເປີດໃໝ່ອີກເທື່ອໜຶ່ງຫຼັງຈາກນີ້. ເມື່ອທ່ານຢູ່ໃນໂໝດນີ້ແລ້ວ, ທ່ານສາມາດປ່ຽນໄປມາລະຫວ່າງໂໝດ 4KB ແລະ 16KB ໄດ້ໂດຍການປິດເປີດໃໝ່ເທື່ອດຽວ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອໃຫ້ອຸປະກອນກັບຄືນເປັນໂໝດໂປຣດັກຊັນ, ທ່ານຈະຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4KB ຈາກນັ້ນລັອກ bootloader, ເຊິ່ງຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານ. ຫຼັງຈາກທີ່ອຸປະກອນເປີດເຂົ້າເປັນ Android ໄດ້ສຳເລັດ, ໃຫ້ປິດການນຳໃຊ້ການປົດລັອກ OEM ໃນຕົວເລືອກນັກພັດທະນາ. ອຸປະກອນຈະຖືກລ້າງຂໍ້ມູນ ແລະ ລະບົບໄຟລ໌ຈະປ່ຽນເປັນ ext4 ຫຼັງຈາກການຢືນຢັນ. ຫຼັງຈາກການດຳເນີນການນີ້ສຳເລັດ, ກະລຸນາກັບຄືນມາເປີດການນຳໃຊ້ໂໝດ 16KB ອີກເທື່ອໜຶ່ງ."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ຟໍແມັດໃໝ່ ແລະ ລ້າງພາທິຊັນຂໍ້ມູນເປັນ ext4 ບໍ່ສຳເລັດ."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"ຕ້ອງປົດລັອກ Bootloader ສຳລັບໂໝດ 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ຕ້ອງປົດລັອກ Bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"ອຸປະກອນນີ້ຕ້ອງມີການປົດລັອກ bootloader ກ່ອນທີ່ຈະໃຊ້ຕົວເລືອກນັກພັດທະນາແບບ 16KB. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຂໍ້ມູນຜູ້ໃຊ້ ແລະ ການຕັ້ງຄ່າທັງໝົດຈະຖືກລ້າງເມື່ອເປີດນຳໃຊ້ໂໝດ 16KB. ເມື່ອປົດລັອກ bootloader ແລ້ວ, ການເປີດນຳໃຊ້ຕົວເລືອກ 16KB ຈະຕ້ອງມີການປິດເປີດໃໝ່ສອງເທື່ອ. ເມື່ອທ່ານຢູ່ໃນໂໝດນີ້ແລ້ວ, ທ່ານສາມາດປ່ຽນໄປມາລະຫວ່າງໂໝດ 4KB ແລະ 16KB ໄດ້ໂດຍການປິດເປີດໃໝ່ເທື່ອດຽວ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອໃຫ້ອຸປະກອນກັບຄືນເປັນໂໝດໂປຣດັກຊັນ, ທ່ານຈະຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4KB ຈາກນັ້ນລັອກ OEM/bootloader (ເຊິ່ງຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານ). ກະລຸນາປົດລັອກ bootloader ແລ້ວລອງໃໝ່. ທ່ານສາມາດເບິ່ງຄຳແນະນຳສຳລັບວິທີການນີ້ໄດ້ຢູ່ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"ກຳລັງໃຊ້ໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ ໂດຍໃຊ້ຂະໜາດ 4KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"ທ່ານຢູ່ໃນໂໝດ 4KB ຂອງໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງລັອກ bootloader ຂອງອຸປະກອນ. ແຕະເພື່ອອ່ານເພີ່ມເຕີມ."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"ທ່ານຢູ່ໃນໂໝດ 4KB ຂອງໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງລັອກ bootloader ຂອງອຸປະກອນ. ການດຳເນີນການນີ້ຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານອີກເທື່ອໜຶ່ງ ແລະ ກູ້ຄືນເປັນການຕັ້ງຄ່າໂປຣດັກຊັນ. ຫຼັງຈາກທີ່ອຸປະກອນເປີດເຂົ້າເປັນ Android ໄດ້ສຳເລັດ, ໃຫ້ປິດການນຳໃຊ້ການປົດລັອກ OEM ໃນຕົວເລືອກນັກພັດທະນາ. ຫາກອຸປະກອນບໍ່ສາມາດເປີດເຂົ້າເປັນ Android ຫຼື ບໍ່ສະຖຽນ, ໃຫ້ແຟລຊອຸປະກອນອີກເທື່ອໜຶ່ງໂດຍໃຊ້ຮູບພາບໂຮງງານຫຼ້າສຸດຈາກ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ຫຼື ໃຊ້ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ແລະ ເລືອກ \'ລ້າງຂໍ້ມູນອຸປະກອນ\', \'ລັອກ Bootloader\' ແລະ \'ບັງຄັບໃຫ້ແຟລຊທຸກພາທິຊັນ\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"ກຳລັງໃຊ້ໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ ໂດຍໃຊ້ຂະໜາດ 16KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"ທ່ານຢູ່ໃນໂໝດ 16KB ຂອງໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4K ຈາກນັ້ນລັອກ bootloader ຂອງອຸປະກອນ. ແຕະເພື່ອອ່ານເພີ່ມເຕີມ."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"ທ່ານຢູ່ໃນໂໝດ 16KB ຂອງໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4K ຈາກນັ້ນລັອກ bootloader ຂອງອຸປະກອນ. ການດຳເນີນການນີ້ຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານອີກເທື່ອໜຶ່ງ ແລະ ກູ້ຄືນເປັນການຕັ້ງຄ່າໂປຣດັກຊັນ. ຫຼັງຈາກທີ່ອຸປະກອນເປີດເຂົ້າເປັນ Android ໄດ້ສຳເລັດ, ໃຫ້ປິດການນຳໃຊ້ການປົດລັອກ OEM ໃນຕົວເລືອກນັກພັດທະນາ. ຫາກອຸປະກອນບໍ່ສາມາດເປີດເຂົ້າເປັນ Android ຫຼື ບໍ່ສະຖຽນ, ໃຫ້ແຟລຊອຸປະກອນອີກເທື່ອໜຶ່ງໂດຍໃຊ້ຮູບພາບໂຮງງານຫຼ້າສຸດຈາກ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ຫຼື ໃຊ້ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ແລະ ເລືອກ \'ລ້າງຂໍ້ມູນອຸປະກອນ\', \'ລັອກ Bootloader\' ແລະ \'ບັງຄັບໃຫ້ແຟລຊທຸກພາທິຊັນ\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"ທ່ານຢູ່ໃນໂໝດ 16KB ຂອງໂໝດບໍ່ຂຶ້ນກັບໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ Bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4KB ຈາກນັ້ນລັອກ Bootloader ຂອງອຸປະກອນ. ແຕະເພື່ອອ່ານເພີ່ມເຕີມ."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ທ່ານຢູ່ໃນໂໝດ 16KB ຂອງໂໝດບໍ່ຂຶ້ນກັບໜ້າ. ບໍ່ຮັບປະກັນຄວາມສົມບູນຂອງຊອບແວໃນໂໝດນີ້ ແລະ ຂໍ້ມູນໃດກໍຕາມທີ່ຈັດເກັບໃນໂທລະສັບໃນລະຫວ່າງທີ່ Bootloader ປົດລັອກຢູ່ອາດມີຄວາມສ່ຽງ. ຄຸນສົມບັດບາງຢ່າງອາດຖືກປິດການນຳໃຊ້ໃນໂໝດເຫຼົ່ານີ້, ດັ່ງນັ້ນບາງແອັບພລິເຄຊັນຈຶ່ງອາດບໍ່ເຮັດວຽກ. ເພື່ອກັບຄືນເປັນໂໝດໂປຣດັກຊັນອີກເທື່ອໜຶ່ງ, ທ່ານຕ້ອງປ່ຽນກັບໄປໃຊ້ໂໝດ 4KB ຈາກນັ້ນລັອກ Bootloader ຂອງອຸປະກອນ. ການດຳເນີນການນີ້ຈະຣີເຊັດອຸປະກອນເປັນຄ່າຈາກໂຮງງານອີກເທື່ອໜຶ່ງ ແລະ ກູ້ຄືນເປັນການຕັ້ງຄ່າໂປຣດັກຊັນ. ຫຼັງຈາກທີ່ອຸປະກອນເປີດເຂົ້າເປັນ Android ໄດ້ສຳເລັດ, ໃຫ້ປິດການນຳໃຊ້ການປົດລັອກ OEM ໃນຕົວເລືອກນັກພັດທະນາ. ຫາກອຸປະກອນບໍ່ສາມາດເປີດເຂົ້າເປັນ Android ຫຼື ບໍ່ສະຖຽນ, ໃຫ້ແຟລຊອຸປະກອນອີກເທື່ອໜຶ່ງໂດຍໃຊ້ຮູບພາບໂຮງງານຫຼ້າສຸດຈາກ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ຫຼື ໃຊ້ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ແລະ ເລືອກ \'ລ້າງຂໍ້ມູນອຸປະກອນ\', \'ລັອກ Bootloader\' ແລະ \'ບັງຄັບໃຫ້ແຟລຊທຸກພາທິຊັນ\'."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"ໂໝດບໍ່ເນັ້ນການໃຊ້ໜ້າ ໂດຍໃຊ້ຂະໜາດ 16KB"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ອ່ານເພີ່ມເຕີມ"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"ເຄື່ອງຈັດການລາຍງານຂໍ້ຜິດພາດ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ໃຊ້ການປັກໝຸດແອັບ"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ໃຊ້ຕົວເລືອກນັກພັດທະນາ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ໃຊ້ບໍລິການພິມ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"ອະນຸຍາດຜູ້ໃຊ້ຫຼາຍຄົນ"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ອະນຸຍາດໃຫ້ຜູ້ໃຊ້ປ່ຽນໄດ້"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ອະນຸຍາດ, ຫຼາຍຄົນ, ຜູ້ໃຊ້, ອະນຸຍາດ, ຫຼາຍ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ຫຼາຍ, ຜູ້ໃຊ້, ໂປຣໄຟລ໌, ຄົນ, ບັນຊີ, ສະຫຼັບ, ຫຼາຍ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ໃຊ້ການດີບັກໄຮ້ສາຍ"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ເລືອກວ່າທ່ານຈະເຫັນຫຍັງຢູ່ໜ້າຈໍຂອງທ່ານເມື່ອແທັບເລັດຂອງທ່ານຕັ້ງຢູ່ດັອກ. ອຸປະກອນຂອງທ່ານອາດໃຊ້ພະລັງງານຫຼາຍຂຶ້ນເມື່ອໃຊ້ສະກຣີນເຊບເວີ."</string>
<string name="customize_button_title" msgid="1110284655990203359">"ປັບແຕ່ງ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"ປັບແຕ່ງ <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ຕ້ອງປິດເປີດໃໝ່ເພື່ອເປີດການນຳໃຊ້ການຊ່ວຍເຫຼືອຮູບແບບອິດສະລະ."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ຕ້ອງປິດເປີດໃໝ່ເພື່ອບັງຄັບໂໝດເດັສທັອບຢູ່ໜ້າຈໍທີສອງ."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ຕ້ອງປິດເປີດໃໝ່ເພື່ອເປີດການນຳໃຊ້ການຮອງຮັບໜ້າຈໍຮູບແບບອິດສະຫຼະແບບເກົ່າ."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ຕ້ອງປິດເປີດໃໝ່ເພື່ອປ່ຽນການຮອງຮັບໜ້າຈໍຮູບແບບອິດສະຫຼະ."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ຕ້ອງປິດເປີດໃໝ່ເພື່ອບັງຄັບໃຫ້ເປີດການນຳໃຊ້ໜ້າຈໍຮູບແບບອິດສະຫຼະຢູ່ຈໍສະແດງຜົນສຳຮອງ."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ປິດເປີດໃໝ່ໃນຕອນນີ້"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ປິດເປີດໃໝ່ໃນພາຍຫຼັງ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ສຽງຮອບທິດທາງ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ເປີດ"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ປິດ"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ເປີດ"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ສຽງ %1$d%% ຊ້າຍ, %2$d%% ຂວາ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ສຽງ %1$d%% ຂວາ, %2$d%% ຊ້າຍ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"ຊື່ອຸປະກອນຂອງທ່ານຈະສະແດງໃຫ້ແອັບທີ່ທ່ານຕິດຕັ້ງໄວ້ເຫັນ. ມັນອາດຖືກສະແດງໃຫ້ຄົນອື່ນເຫັນໃນເວລາທີ່ທ່ານເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth, ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ Wi-Fi ຫຼື ຕັ້ງຄ່າຮັອດສະປອດ Wi-Fi ນຳ."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ເພດທາງໄວຍາກອນ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ເລືອກເພດທາງໄວຍາກອນ"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ຊອກຫາໃນການຕັ້ງຄ່າ"</string>
</resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 4560705..004822f 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Laikas miegoti"</item>
+ <item msgid="4152450357280759894">"Vairavimas"</item>
+ <item msgid="7096549258219399423">"Įtraukiantis"</item>
+ <item msgid="2760716776980432977">"Tvarkoma"</item>
+ <item msgid="601734478369121764">"Žvaigždė"</item>
+ <item msgid="6243809315432780521">"Kalendorius"</item>
+ <item msgid="4913577903148415331">"Laikas"</item>
+ <item msgid="3653377604690057780">"Teatras"</item>
+ <item msgid="3843711267408385410">"Gėlė"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bd1bdaf..c5a2349 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Atjungti įrenginį?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Susieti naują įrenginį"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatiškai įjungti rytoj"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Klausos įrenginio nustatymai"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Spartusis klavišas, klausos aparato suderinamumas"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Išankstiniai nustatymai"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Nėra jūsų audiologo suprogramuotų išankstinių nustatymų"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Išankstinių nustatymų atnaujinti nepavyko"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Garso išvestis"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Apie garso išvestį"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Išjungti"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Įjungta / # programa gali pasiekti vietovę}one{Įjungta / # programa gali pasiekti vietovę}few{Įjungta / # programos gali pasiekti vietovę}many{Įjungta / # programos gali pasiekti vietovę}other{Įjungta / # programų gali pasiekti vietovę}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Įkeliama…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Programos, turinčios netoliese esančių įrenginių leidimą, gali nustatyti apytikslį atstumą iki prijungtų įrenginių."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Programos, turinčios netoliese esančių įrenginių leidimą, gali nustatyti apytikslę prijungtų įrenginių poziciją."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Programų ir paslaugų prieiga prie vietovės išjungta. Įrenginio vietovės informacija vis tiek gali būti siunčiama pagalbos tarnyboms skambinant ar siunčiant teksto pranešimą pagalbos numeriu."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Sužinokite daugiau apie vietovės nustatymus."</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Jei norite pakeisti, eikite į „ChromeOS“ nustatymus > „Privatumas ir sauga“ > „Privatumo valdikliai“ > „Prieiga prie vietovės“"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Pridėti veido ir <xliff:g id="WATCH">%s</xliff:g> duomenys"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Pridėti veido, piršto atspaudo ir <xliff:g id="WATCH">%s</xliff:g> duomenys"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Pridėti veido, piršto atspaudų ir <xliff:g id="WATCH">%s</xliff:g> duomenys"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Tai reikia padaryti todėl, kad įjungta tapatybės patikra"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Nuotolinės Autentifikavimo priemonės atrakinimas"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Laikrodis pridėtas"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Nustatykite laikrodį"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Sužinokite daugiau apie funkciją „Laikrodžio atrakinimas“"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Pridėti laikrodį"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Pašalinti laikrodį"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Atrakinimas piršto atspaudu ir pagal veidą"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Atrakinimas pagal veidą ir piršto atspaudu"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Atrakinimas pagal veidą ir piršto atspaudu darbe"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Reikia nustatyti"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Pridėtas veidas ir kontroliniai kodai"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Įdiekite programų"</b>\n"Įdiekite programų, kurias norite laikyti privačiai savo erdvėje"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Ką verta atminti"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Programos sustabdomos, kai užrakinate erdvę"</b>\n"Kai užrakinate erdvę, erdvėje esančios programos sustabdomos ir negaunate iš jų pranešimų"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privačios erdvės netinkamos programoms, kurios turi veikti fone ar siųsti svarbius pranešimus, pvz., medicinos programoms. Taip yra todėl, kad pranešimai ir veikla fone sustabdomi, užrakinus erdvę.\n\nProgramos privačioje erdvėje nebus rodomos leidimų tvarkytuvėje, privatumo informacijos suvestinėje ir kituose nustatymuose, kai privati erdvė bus užrakinta.\n\nPrivačios erdvės negalima perkelti į naują įrenginį. Turėsite nustatyti kitą privačią erdvę, jei norėsite ją naudoti kitame įrenginyje.\n\nBet kuris naudotojas, prijungęs jūsų įrenginį prie kompiuterio ar įdiegęs žalingų programų įrenginyje, galės pasiekti jūsų privačią erdvę."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privačios erdvės netinkamos programoms, kurios turi veikti fone ar siųsti svarbius pranešimus, pvz., medicinos programoms. Taip yra todėl, kad pranešimai ir veikla fone sustabdomi, užrakinus erdvę.\n\nProgramos privačioje erdvėje nebus rodomos leidimų tvarkytuvėje, privatumo informacijos suvestinėje ir kituose nustatymuose, kai privati erdvė bus užrakinta.\n\nPrivačios erdvės negalima atkurti naujame įrenginyje. Jei norite ją naudoti kitame įrenginyje, reikės sukurti kitą erdvę.\n\nAsmenys, prijungę jūsų įrenginį prie kompiuterio ar įrenginyje įdiegę kenkėjiškų programų, gali pasiekti jūsų privačią erdvę."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Sužinokite daugiau apie privačią erdvę"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Tai užtruks kelias akimirkas"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Nustatoma privati erdvė…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Paleisti įrenginį iš naujo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Išsamių NFC duomenų įrašymas gali būti naudojamas tik kuriant produktą. Į pranešimus apie riktus įtraukiama papildomų NFC duomenų, kuriuose gali būti privačios informacijos. Jei norite pakeisti šį nustatymą, paleiskite įrenginį iš naujo."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Paleisti iš naujo"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ekrano vaizdo bendrinimas, išorinis vaizdo įrenginys, prijungtas vaizdo įrenginys, usb vaizdo įrenginys, skyra, pasukimas"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Pasukimas"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Įprastas"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Ekrano klaviatūros naudojimas"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Palikti ekrane, kol fizinė klaviatūra aktyvi"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Keisti rodyklės užpildymo stilių į geltoną"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Keisti rodyklės užpildymo stilių į rožinį"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Keisti rodyklės užpildymo stilių į mėlyną"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Rodyklės brūkšnio stilius"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Balta"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Juoda"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nėra"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Pasirinktas naudotojo: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Kalba"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Žymiklio greitis"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Žymeklio dydis"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Sumažinti žymeklį"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Padidinti žymeklį"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Žaidimų valdiklis"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Nukreipti vibravimą"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Siųsti vibraciją į žaidimų valdiklį, kai jis prijungtas"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Vis tiek tęsti"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Atšaukti"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Didinimo nustatymai"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Stumdymas vienu pirštu"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Perkelkite didintuvą vienu pirštu"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Judėkite ekrane vilkdami pirštu."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Perkelkite didinimo sritį vilkdami vienu pirštu."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Perkelkite didinimo sritį vilkdami dviem pirštais."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nepasiekiama, kol didinama tik dalis ekrano"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Palieskite mygtuką, kad keistumėte mastelį"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Sparčiai artinkite ekrane, kad turinys būtų didesnis"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Kad priartintumėte, atlikite toliau nurodytus veiksmus.</b><br/> {0,number,integer}. Paleiskite didinimo funkciją sparčiuoju klavišu.<br/> {1,number,integer}. Palieskite ekraną.<br/> {2,number,integer}. Pereikite nuo vieno ekrano elemento prie kito vilkdami dviem pirštais.<br/> {3,number,integer}. Koreguokite mastelį suėmę dviem pirštais.<br/> {4,number,integer}. Sustabdykite didinimo funkciją sparčiuoju klavišu.<br/><br/> <b>Kad laikinai priartintumėte, atlikite toliau nurodytus veiksmus.</b><br/> {0,number,integer}. Įsitikinkite, kad didinimo tipas nustatytas į viso ekrano.<br/> {1,number,integer}. Paleiskite didinimo funkciją sparčiuoju klavišu.<br/> {2,number,integer}. Palieskite ir palaikykite bet kurią ekrano vietą.<br/> {3,number,integer}. Pereikite nuo vieno ekrano elemento prie kito vilkdami pirštu.<br/> {4,number,integer}. Sustabdykite didinimo funkciją pakeldami pirštą."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Kad priartintumėte, atlikite toliau nurodytus veiksmus.:</b><br/> {0,number,integer}. Paleiskite didinimo funkciją sparčiuoju klavišu.<br/> {1,number,integer}. Palieskite ekraną.<br/> {2,number,integer}. Judėkite ekrane vilkdami dviem pirštais.<br/> {3,number,integer}. Koreguokite mastelį suėmę dviem pirštais.<br/> {4,number,integer}. Sustabdykite didinimo funkciją sparčiuoju klavišu.<br/><br/> Taip pat galite laikinai priartinti ir atlikti kitus veiksmus."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Kad priartintumėte, atlikite toliau nurodytus veiksmus.:</b><br/> {0,number,integer}. Paleiskite didinimo funkciją sparčiuoju klavišu.<br/> {1,number,integer}. Palieskite ekraną.<br/> {2,number,integer}. Judėkite ekrane vilkdami vienu arba dviem pirštais.<br/> {3,number,integer}. Koreguokite mastelį suėmę dviem pirštais.<br/> {4,number,integer}. Sustabdykite didinimo funkciją sparčiuoju klavišu.<br/><br/> Taip pat galite laikinai priartinti ir atlikti kitus veiksmus."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kai didinimas įjungtas, galite artinti ekraną.\n\n"<b>"Jei norite keisti mastelį,"</b>", įjunkite didinimą, tada palieskite bet kurioje ekrano vietoje.\n"<ul><li>"Slinkite vilkdami dviem ar daugiau pirštų"</li>\n<li>"Koreguokite mastelį suimdami dviem ar daugiau pirštų"</li></ul>\n\n<b>"Jei norite laikinai pakeisti mastelį"</b>", įjunkite didinimą, tada palieskite ir palaikykite bet kurioje ekrano vietoje.\n"<ul><li>"Naršykite ekraną vilkdami pirštu"</li>\n<li>"Pakelkite pirštą, kad tolintumėte"</li></ul>\n\n"Negalite artinti naudodami klaviatūrą ar naršymo juostą."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> psl. iš <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Pritaikomumo mygtuko spartusis klavišas"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nė vieno}=1{Nustatytas 1 tvarkaraštis}one{Nustatytas # tvarkaraštis}few{Nustatyti # tvarkaraščiai}many{Nustatyta # tvarkaraščio}other{Nustatyta # tvarkaraščių}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Netrukdymo režimas"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriteto režimai"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Pridėti režimą"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Gauti pranešimus tik iš svarbių žmonių ar programų"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Pasirinkti suaktyvinimo tipą"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Laikas"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Pvz.: „9.30–17.00 val.“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendorius"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Pvz.: „Asmeninis kalendorius“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Režimo kūrimas"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Tinkinta"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Pertraukčių apribojimas"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Netrukdymo režimo įjungimas"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Signalai ir medijos garsai gali trikdyti"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Tvarkaraščiai"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Tvarkaraščių trynimas"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Ištrinti"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Pervardyti"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Ištrinti"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Ištrinti režimą „<xliff:g id="MODE">%1$s</xliff:g>“?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Redaguoti"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Tvarkaraščiai"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Tvarkaraštis"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Pridėti kalendorių"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Naudoti kalendorių"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Tvarkaraštis"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Nustatykite tvarkaraštį"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Tvarkaraštis"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> val. <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Įjungti automatiškai"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Tvarkaraštis"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Nutildykite telefoną tam tikru metu"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Nustatykite netrukdymo režimo taisykles"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Leisti pertrauktis, skleidžiančias garsą"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuoti vaizdinius trikdžius"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Leisti vaizdinius signalus"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Leidžiami pranešimai"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Susikaupkite"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Papildomi veiksmai"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Išjungta}=1{Išjungta / vienas režimas gali įsijungti automatiškai}one{Išjungta / # režimas gali įsijungti automatiškai}few{Išjungta / # režimai gali įsijungti automatiškai}many{Išjungta / # režimo gali įsijungti automatiškai}other{Išjungta / # režimų gali įsijungti automatiškai}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Vaizdo nustatymai"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Pateikties parinktys"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Pilkumo tonas"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"įgalinti tamsiąją temą"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Perjunkite, kad OS ir programos teiktų pirmenybę šviesiam tekstui tamsiame fone, nes taip mažiau pavargsta akys ir labai tausojamas akumuliatorius kai kuriuose įrenginiuose"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nėra vaizdo pakeitimų}=1{{effect_1}}=2{{effect_1} ir {effect_2}}=3{{effect_1}, {effect_2} ir {effect_3}}one{{effect_1}, {effect_2} ir dar #}few{{effect_1}, {effect_2} ir dar #}many{{effect_1}, {effect_2} ir dar #}other{{effect_1}, {effect_2} ir dar #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtruoti trukdžius"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nefiltruojami jokie trukdžiai"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Išfiltruotų pranešimų rodymo parinktys"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kai įjungtas netrukdymo režimas"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Neskambėti gavus pranešimų"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"atidaromas pranešimas"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Leisti nustatyti pranešimus snausti"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Pranešimo taškas programos piktogramoje"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pranešimų rinkiniai"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbulai"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbulai"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Rodyti šio pokalbio burbulą"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ši programa nepalaiko išplėstinių nustatymų"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Daugiau nustatymų"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Daugiau nustatymų pasiekiama šioje programoje"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Pranešimų neaktyvumo laikotarpis"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Taikyti darbo profiliams"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Taikyti darbo profilio programoms"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorijos"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Kita"</string>
<string name="no_channels" msgid="4716199078612071915">"Ši programa nepaskelbė jokių pranešimų"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Rodyti nenaudojamas kategorijas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Papildomi programos nustatymai"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Rodyti nenaudojamas kategorijas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Slėpti nenaudojamas kategorijas"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Programos, kurios gali trikdyti"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Pasirinktos programos"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Netaikoma"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Viskas"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Jokios programos negali trukdyti}=1{„{app_1}“ gali trukdyti}=2{„{app_1}“ ir „{app_2}“ gali trukdyti}=3{„{app_1}“, „{app_2}“ ir „{app_3}“ gali trukdyti}one{„{app_1}“, „{app_2}“ ir dar # programa gali trukdyti}few{„{app_1}“, „{app_2}“ ir dar # programos gali trukdyti}many{„{app_1}“, „{app_2}“ ir dar # programos gali trukdyti}other{„{app_1}“, „{app_2}“ ir dar # programų gali trukdyti}}"</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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Pasirinkti daugiau programų"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niekas negali trikdyti"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niekas negali trikdyti"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Kai kurie žmonės gali trikdyti"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Visi žmonės gali trikdyti"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Pakartotinai skambinantys"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Leisti pakartotinai skambinančius žm."</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Pakeisti į signalus tik vienai valandai iki {time}}one{Pakeisti į signalus tik # valandai iki {time}}few{Pakeisti į signalus tik # valandoms iki {time}}many{Pakeisti į signalus tik # valandos iki {time}}other{Pakeisti į signalus tik # valandų iki {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Pakeisti tik į signalus iki <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Pakeisti į pertraukimo nustatymą visam laikui"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Redagavimo režimas"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Pridėti režimą"</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="warning_button_text" msgid="1274234338874005639">"Perspėjimas"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Uždaryti"</string>
<string name="device_feedback" msgid="5351614458411688608">"Siųsti atsiliepimą apie šį įrenginį"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Dėklas"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Akumuliatorius"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Nustatymų skydelis"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Priverstinai įjungti darbalaukio režimą"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Priverstinai įjungti eksperimentinį darbalaukio režimą antriniuose ekranuose"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Įgalinti laisvos formos langus"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Įgalinti laisvos formos langų palaikymą."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Įgal. pateikimą laisvos formos lang. papild. ekr."</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Įgalinti laisvos formos langus tik papildomame ekrane."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Įgalinti nekeičiamo dydžio progr. naud. kelių langų funkciją"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Leidžiama naudoti nekeičiamo dydžio programas su kelių langų funkcija"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Nepaisyti priverst. tamsaus rež. įgalin."</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Šio įrenginio duomenų skaidinį reikia konvertuoti į „ext4“ prieš naudojant 16 KB kūrėjo parinktį. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, gali kilti pavojus. Suaktyvinus 16 KB parinktį, po to reikės dar vieno paleidimo iš naujo. Dirbdami šiuo režimu galėsite perjungti 4 KB ir 16 KB režimus paleidę iš naujo vieną kartą. Kai kurios funkcijos gali būti išjungtos šiais režimais, todėl kai kurios programos gali neveikti. Jei norite vėl įjungti įrenginio generavimo režimą, turite vėl perjungti į 4 KB režimą ir užrakinti paleidyklę, tada bus atkurti įrenginio gamykliniai nustatymai. Kai įrenginys bus sėkmingai paleistas sistemoje „Android“, išjunkite OĮG operatoriaus pasirinkimo ribojimo panaikinimą „Kūrėjo parinkčių“ skiltyje. Įrenginio duomenys bus panaikinti ir patvirtinus failų sistema bus pakeista į „ext4“. Kai tai bus baigta, grįžkite ir vėl įgalinkite 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Ištrinti visus duomenis"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Nepavyko performatuoti į „ext4“ ir panaikinti duomenų skaidinio."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Norint naudoti 16 KB režimą, reikia panaikinti paleidyklės operatoriaus pasirinkimo ribojimą"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Reikia atrakinti paleidyklę"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Kad būtų galima naudoti 16 KB kūrėjo parinktį, turi būti panaikintas šio įrenginio paleidyklės operatoriaus pasirinkimo ribojimas. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, gali kilti pavojus. Suaktyvinus 16 KB režimą, visi naudotojo duomenys ir nustatymai bus panaikinti. Panaikinus paleidyklės operatoriaus pasirinkimo ribojimą, norint suaktyvinti 16 KB parinktį, reikės du kartus paleisti iš naujo. Dirbdami šiuo režimu galėsite perjungti 4 KB ir 16 KB režimus paleidę iš naujo vieną kartą. Kai kurios funkcijos gali būti išjungtos šiais režimais, todėl kai kurios programos gali neveikti. Jei norite vėl įjungti įrenginio generavimo režimą, turite vėl perjungti į 4 KB režimą ir taikyti įrenginio OĮG ir (arba) paleidyklės užrakinimą (tada bus atkurti gamykliniai nustatymai). Panaikinkite paleidyklės operatoriaus pasirinkimo ribojimą ir bandykite dar kartą. Instrukcijas, kaip tai atlikti, rasite adresu <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 KB nepriklausomo puslapio dydžio režimo naudojimas"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Dirbate 4 KB nepriklausomo puslapio dydžio režimu. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, 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 užrakinti įrenginio paleidyklę. Palieskite, jei norite skaityti daugiau."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Dirbate 4 KB nepriklausomo puslapio dydžio režimu. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, 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 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ą „Kūrėjo parinkčių“ skiltyje. 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š <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> arba naudokite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ir pasirinkite „Naikinti įrenginio duomenis“, „Užrakinti paleidyklę“ ir „Priverstinai įdiegti visus skaidinius „Android“ ROM vidinėje atmintyje“."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 KB nepriklausomo puslapio dydžio režimo naudojimas"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Dirbate 16 KB nepriklausomo puslapio dydžio režimu. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, 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ę. Palieskite, jei norite skaityti daugiau."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Dirbate 16 KB nepriklausomo puslapio dydžio režimu. Šiuo režimu negalima garantuoti programinės įrangos vientisumo ir visiems telefone saugomiems duomenims, kai panaikintas paleidyklės operatoriaus pasirinkimo ribojimas, 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ą „Kūrėjo parinkčių“ skiltyje. 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š <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> arba naudokite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ir pasirinkite „Naikinti įrenginio duomenis“, „Užrakinti paleidyklę“ ir „Priverstinai įdiegti visus skaidinius „Android“ ROM vidinėje atmintyje“."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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ę. Palieskite, jei norite skaityti daugiau."</string>
+ <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š <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> arba naudokite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Pranešimų apie riktus doroklė"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Programos prisegimo naudojimas"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Kūrėjo parinkčių naudojimas"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Naudoti spausdinimo paslaugą"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Kelių naudotojų leidimas"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Leisti perjungti naudotoją"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"leisti, keli, naudotojas, leidimas, daug"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"keli, naudotojai, profiliai, žmonės, paskyros, perjungti, daug"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Belaidžio ryšio derinimo naudojimas"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Pasirinkite, kas bus rodoma ekrane, kai planšetinis kompiuteris bus prijungtas prie doko. Naudojant ekrano užsklandą gali būti eikvojama daugiau įrenginio energijos."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Tinkinti"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Tinkinti skiltį „<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>“"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Norint įgalinti laisvos formos palaikymą, būtina paleisti iš naujo."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Norint priverstinai įjungti darbalaukio režimą antriniuose ekranuose, būtina paleisti iš naujo."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Norint įgalinti pasenusių laisvos formos langų palaikymą reikia paleisti įrenginį iš naujo."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Norint pakeisti pateikimo laisvos formos languose palaikymą reikia paleisti įrenginį iš naujo."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Norint įgalinti priverstinį pateikimą laisvos formos languose papildomuose ekranuose reikia paleisti įrenginį iš naujo."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Paleisti iš naujo dabar"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Paleisti iš naujo vėliau"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Erdvinis garsas"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Įjungta"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Išjungta"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Įjungta"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Garsas %1$d%% kairėje, %2$d%% dešinėje"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Garsas %1$d%% dešinėje, %2$d%% kairėje"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Įrenginio pavadinimas matomas jūsų įdiegtoms programoms. Kai prisijungiate prie „Bluetooth“ įrenginių ar „Wi-FI“ tinklo arba nustatote „Wi-Fi“ viešosios interneto prieigos tašką, jį taip pat gali matyti kiti žmonės."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatinė giminė"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Pasirinkite gramatinę giminę"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Nustatymų paieška"</string>
</resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 43d21e9..b537f09 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Naktsmiers"</item>
+ <item msgid="4152450357280759894">"Braukšana pie stūres"</item>
+ <item msgid="7096549258219399423">"Iekļaujošs"</item>
+ <item msgid="2760716776980432977">"Pārvaldīts"</item>
+ <item msgid="601734478369121764">"Zvaigzne"</item>
+ <item msgid="6243809315432780521">"Kalendārs"</item>
+ <item msgid="4913577903148415331">"Laiks"</item>
+ <item msgid="3653377604690057780">"Kinoteātris"</item>
+ <item msgid="3843711267408385410">"Zieds"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 84ae9db..50478e3 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Vai atvienot ierīci?"</string>
<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>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automātiski ieslēgt rīt"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Dzirdes aparāta iestatījumi"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Saīsne, saderība ar dzirdes aparātiem."</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Pirmsiestatījums"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Jūsu audiologs nav ieprogrammējis nekādus pirmsiestatījumus."</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Nebija iespējams atjaunināt pirmsiestatījumu."</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio izeja"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Par audio izvadi"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izslēgta"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ieslēgta/# lietotnei ir piekļuve atrašanās vietai.}zero{Ieslēgta/# lietotnēm ir piekļuve atrašanās vietai.}one{Ieslēgta/# lietotnei ir piekļuve atrašanās vietai.}other{Ieslēgta/# lietotnēm ir piekļuve atrašanās vietai.}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Notiek ielāde…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Lietotnes, kurām ir atļauja noteikt tuvumā esošās ierīces, var noteikt pievienoto ierīču relatīvo pozīciju."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Lietotnes, kurām ir atļauja noteikt tuvumā esošās ierīces, var noteikt pievienoto ierīču relatīvo pozīciju."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Lietotnēm un pakalpojumiem nav atļaujas piekļūt atrašanās vietai. Jūsu ierīces atrašanās vietas datus joprojām var nosūtīt ārkārtas dienestiem, ja zvanīsiet vai sūtīsiet īsziņu uz ārkārtas numuru."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Uzzināt vairāk par atrašanās vietas iestatījumiem"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Lai to mainītu, dodieties uz ChromeOS sadaļu Iestatījumi > Drošība un konfidencialitāte > Konfidencialitātes vadīklas > Piekļuve atrašanās vietai"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Pievienota seja un pulkstenis <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Pievienota seja, pirksta nospiedums un pulkstenis <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Pievienota seja, pirkstu nospiedumi un pulkstenis <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Šāda pārbaude ir vajadzīga, jo ir ieslēgta funkcija Identity Check."</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Atbloķēšana ar Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Pulkstenis pievienots"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Pulksteņa iestatīšana"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Uzzināt vairāk par funkciju “Atbloķēšana ar pulksteni”"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Pievienot pulksteni"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Noņemt pulksteni"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Autorizācija ar pirksta nospiedumu un pēc sejas"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Autorizācija pēc sejas un pirksta nospieduma"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Autorizācija pēc sejas un pirksta nospieduma darba profilam"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Nepieciešama iestatīšana"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Seja un pirksta nospiedumi ir pievienoti"</string>
@@ -496,7 +497,7 @@
<string name="security_settings_sfps_animation_a11y_label" msgid="8808819903730940446">"Reģistrēšanas progresa procenti: <xliff:g id="PERCENTAGE">%d</xliff:g>"</string>
<string name="security_settings_udfps_enroll_progress_a11y_message" msgid="6183535114682369699">"Pirksta nospieduma reģistrēšana: <xliff:g id="PERCENTAGE">%d</xliff:g> procenti"</string>
<string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Pirksta nospiedums pievienots"</string>
- <string name="security_settings_require_screen_on_to_auth_title" msgid="1641621458536715518">"Pieskarties un atbloķēt jebkurā laikā"</string>
+ <string name="security_settings_require_screen_on_to_auth_title" msgid="1641621458536715518">"Pieskarieties, lai atbloķētu jebkurā laikā"</string>
<string name="security_settings_require_screen_on_to_auth_description" msgid="4158414711168345398">"Pieskarieties sensoram, lai atbloķētu ierīci, pat ja ekrāns ir izslēgts. Tādējādi tiek palielināta nejaušas atbloķēšanas iespējamība."</string>
<string name="security_settings_require_screen_on_to_auth_keywords" msgid="5557869560397089603">"Ekrāns, atbloķēšana"</string>
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Vēlāk"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Lietotņu instalēšana"</b>\n"Instalējiet lietotnes, ko vēlaties privāti glabāt savā telpā."</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Svarīga informācija"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Lietotnes pārstāj darboties, kad bloķējat privāto telpu"</b>\n"Kad bloķējat privāto telpu, lietotnes šajā telpā pārstāj darboties un jūs turpmāk nesaņemat šo lietotņu paziņojumus."</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privātās telpas nav piemērotas lietotnēm, kam nepieciešams darboties fonā vai sūtīt kritiskus paziņojumus, piemēram, medicīnas lietotnēm. Iemesls ir tas, ka paziņojumi un darbība fonā tiek apturēta, kad telpa tiek bloķēta.\n\nLietotnes, kas atrodas jūsu privātajā telpā, nebūs redzamas atļauju pārvaldniekā, konfidencialitātes informācijas panelī un citos iestatījumos, kad privātā telpa būs bloķēta.\n\nPrivāto telpu nevar pārvietot uz jaunu ierīci. Ja vēlēsieties izmantot privāto telpu citā ierīcē, jums būs jāiestata jauna telpa.\n\nJebkura persona, kas izveidos savienojumu starp jūsu ierīci un datoru vai instalēs kaitīgas lietotnes jūsu ierīcē, iespējams, varēs piekļūt jūsu privātajai telpai."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privātās telpas nav piemērotas lietotnēm, kam nepieciešams darboties fonā vai sūtīt kritiskus paziņojumus, piemēram, medicīnas lietotnēm. Iemesls ir tas, ka paziņojumi un darbība fonā tiek apturēta, kad telpa tiek bloķēta.\n\nLietotnes, kas atrodas jūsu privātajā telpā, nebūs redzamas atļauju pārvaldniekā, konfidencialitātes informācijas panelī un citos iestatījumos, kad privātā telpa būs bloķēta.\n\nPrivāto telpu nevar atjaunot jaunā ierīcē. Ja vēlēsieties izmantot privāto telpu citā ierīcē, jums būs jāiestata jauna telpa.\n\nJebkura persona, kas izveidos savienojumu starp jūsu ierīci un datoru vai instalēs ļaunprātīgas lietotnes jūsu ierīcē, iespējams, varēs piekļūt jūsu privātajai telpai."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Uzzināt vairāk par privāto telpu"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Tas ilgs kādu brīdi."</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Notiek privātās telpas iestatīšana…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vai restartēt ierīci?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detalizētu NFC datu reģistrēšana ir paredzēta tikai ar izstrādi saistītiem nolūkiem. Papildu NFC dati tiek iekļauti kļūdu pārskatos, un tajos var būt ietverta privāta informācija. Lai mainītu šo iestatījumu, restartējiet ierīci."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Restartēt"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"spoguļot, ārējais displejs, izšķirtspēja"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Virziens"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standarta"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1173,7 +1187,7 @@
<string name="accessibility_work_account_title" msgid="7622485151217943839">"Darba konts — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="8535265881509557013">"Personīgais konts — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="search_settings" msgid="7573686516434589771">"Meklēt"</string>
- <string name="display_settings" msgid="7197750639709493852">"Attēls"</string>
+ <string name="display_settings" msgid="7197750639709493852">"Displejs"</string>
<string name="accelerometer_title" msgid="7745991950833748909">"Automātiska ekrāna pagriešana"</string>
<string name="auto_rotate_option_off" msgid="2788096269396290731">"Izslēgta"</string>
<string name="auto_rotate_option_on" msgid="5776678230808498171">"Ieslēgta"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Izmantot ekrāna tastatūru"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Paturēt ekrānā, kamēr ir aktīva fiziskā tastatūra"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Mainīt aizpildījumu uz dzeltenu"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Mainīt aizpildījuma stilu uz rozā"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Mainīt aizpildījuma stilu uz zilu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Rādītāja vilkuma stils"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Balts"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Melns"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nav"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Lietotāja atlasītais izkārtojums: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Runa"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Rādītāja ātrums"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Rādītāja mērogs"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Samazināt rādītāja mērogu"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Palielināt rādītāja mērogu"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Spēļu vadība"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Vibrācijas novirzīšana"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Novirzīt vibrāciju uz spēles vadāmierīci, kad ir izveidots savienojums"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Tomēr turpināt"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Atcelt"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Palielināšanas iestatījumi"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pārvietošana ar vienu pirkstu"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Pārvietot lupu ar vienu pirkstu"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Velciet ar pirkstu, lai pārvietotos ekrānā."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Palielinājuma apgabala pārvietošanai velciet vienu pirkstu."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Palielinājuma apgabala pārvietošanai velciet divus pirkstus."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nav pieejama, kad tiek palielināta tikai daļa ekrāna"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Pieskarieties pogai, lai palielinātu"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Ātri tuviniet ekrānu, lai palielinātu saturu"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Tuvināšana</b><br/> {0,number,integer}. Izmantojiet īsinājumtaustiņu, lai sāktu palielināšanu.<br/> {1,number,integer}. Pieskarieties ekrānam.<br/> {2,number,integer}. Lai pārvietotos ekrānā, velciet ar diviem pirkstiem.<br/> {3,number,integer}. Lai regulētu tālummaiņu, savelciet ar diviem pirkstiem.<br/> {4,number,integer}. Izmantojiet īsinājumtaustiņu, lai pārtrauktu palielināšanu.<br/><br/> <b>Īslaicīga tuvināšana</b><br/> {0,number,integer}. Pārliecinieties, vai iestatītais palielinājuma veids ir “Pilnekrāna režīms”.<br/> {1,number,integer}. Izmantojiet īsinājumtaustiņu, lai sāktu palielināšanu.<br/> {2,number,integer}. Pieskarieties un turiet jebkurā ekrāna vietā.<br/> {3,number,integer}. Lai pārvietotos ekrānā, velciet ar pirkstu.<br/> {4,number,integer}. Paceliet pirkstu, lai pārtrauktu palielināšanu."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Tuvināšana</b><br/> {0,number,integer}. Izmantojiet saīsni, lai sāktu palielināšanu.<br/> {1,number,integer}. Pieskarieties ekrānam.<br/> {2,number,integer}. Lai pārvietotos ekrānā, velciet ar diviem pirkstiem.<br/> {3,number,integer}. Lai regulētu tālummaiņu, savelciet ar diviem pirkstiem.<br/> {4,number,integer}. Lai atceltu palielinājumu, izmantojiet saīsni.<br/><br/> Varat arī tuvināt īslaicīgi un veikt vēl citas darbības."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Tuvināšana</b><br/> {0,number,integer}. Izmantojiet saīsni, lai sāktu palielināšanu.<br/> {1,number,integer}. Pieskarieties ekrānam.<br/> {2,number,integer}. Lai pārvietotos ekrānā, velciet ar vienu vai diviem pirkstiem.<br/> {3,number,integer}. Lai regulētu tālummaiņu, savelciet ar diviem pirkstiem.<br/> {4,number,integer}. Lai atceltu palielinājumu, izmantojiet saīsni.<br/><br/> Varat arī tuvināt īslaicīgi un veikt vēl citas darbības."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kad ir ieslēgts palielinājums, ekrānā varat izmantot tuvināšanu.\n\n"<b>"Lai izmantotu tālummaiņu"</b>", aktivizējiet palielinājumu un pēc tam pieskarieties jebkur ekrānā.\n"<ul><li>"Velciet ar vismaz 2 pirkstiem, lai ritinātu."</li>\n<li>"Savelciet kopā vismaz 2 pirkstus, lai pielāgotu tālummaiņu."</li></ul>\n\n<b>"Lai veiktu īslaicīgu tālummaiņu"</b>", aktivizējiet palielinājumu un pēc tam pieskarieties jebkurai vietai ekrānā un turiet to.\n"<ul><li>"Velciet ar pirkstu, lai pārvietotos pa ekrānu."</li>\n<li>"Paceliet pirkstu, lai veiktu tālināšanu."</li></ul>\n\n"Tastatūrā vai navigācijas joslā nevarat veikt tuvināšanu."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. lapa no <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Saīsne: pieejamības poga"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nav}=1{Iestatīts viens grafiks}zero{Iestatīti # grafiki}one{Iestatīts # grafiks}other{Iestatīti # grafiki}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Netraucēt"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritātes režīmi"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Pievienot režīmu"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Saņemiet paziņojumus tikai no svarīgām personām un lietotnēm."</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Atlasiet aktivizācijas veidu"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Laiks"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Piemērs. “9:30–17:00”."</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendārs"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Piemērs. “Personīgais kalendārs”."</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Režīma izveide"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Pielāgots"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Traucējumu ierobežošana"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Režīma “Netraucēt” ieslēgšana"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Modinātāji un multivides skaņas, kam atļauts pārtraukt"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Grafiki"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Grafiku dzēšana"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Dzēst"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Pārdēvēt"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Dzēst"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vai dzēst režīmu “<xliff:g id="MODE">%1$s</xliff:g>”?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Rediģēt"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Grafiki"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Grafiks"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Pievienot kalendāru"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Izmantot kalendāru"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Grafiks"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Iestatiet grafiku"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Grafiks"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ieslēgt automātiski"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Grafiks"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Skaņas izslēgšana noteiktā laikā"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Iestatīt režīma “Netraucēt” kārtulas"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Atļaut pārtraukumus ar skaņas signālu"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloķēt vizuālos traucējumus"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizuālu signālu atļaušana"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Paziņojumi, kas var jūs sasniegt"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Ilglaicīga koncentrēšanās"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Papildu darbības"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Izslēgts}=1{Izslēgts; viens režīms var tikt ieslēgts automātiski}zero{Izslēgts; # režīmi var tikt ieslēgti automātiski}one{Izslēgts; # režīms var tikt ieslēgts automātiski}other{Izslēgts; # režīmi var tikt ieslēgti automātiski}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Attēlojuma iestatījumi"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Attēlojuma iespējas"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Pelēktoņu iestatījums"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"iespējot tumšo motīvu"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Iestatiet, lai operētājsistēmā un lietotnēs priekšroka tiktu dota gaišam tekstam uz tumša fona. Tas var mazāk nogurdināt acis un ievērojami ietaupīt akumulatora jaudu dažās ierīcēs."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nav attēlojuma izmaiņu}=1{{effect_1}}=2{{effect_1} un {effect_2}}=3{{effect_1}, {effect_2} un {effect_3}}zero{{effect_1}, {effect_2} un vēl #}one{{effect_1}, {effect_2} un vēl #}other{{effect_1}, {effect_2} un vēl #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrēt traucēkļus"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Netiek filtrēts neviens traucēklis"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Filtrētu paziņojumu attēlojuma iespējas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kad ir ieslēgts režīms “Netraucēt”"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Nav skaņas signālu no paziņojumiem"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"atvērt paziņojumu"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Atļaut paziņojumu atlikšanu"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Paziņojuma punkts lietotnes ikonā"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paziņojumu komplekti"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Burbuļi"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Burbuļi"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Sarunas rādīšana burbulī"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Šajā lietotnē netiek atbalstīti izvērsti iestatījumi."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Citi iestatījumi"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Lietotnē ir pieejami citi iestatījumi"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Nogaidīšanas periods paziņojumiem"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorijas"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Cits"</string>
<string name="no_channels" msgid="4716199078612071915">"Šai lietotnei nav neviena paziņojuma."</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Rādīt neizmantotās kategorijas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Lietotnes papildu iestatījumi"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Rādīt neizmantotās kategorijas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Paslēpt neizmantotās kategorijas"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Lietotnes, kas var pārtraukt"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Atlasītās lietotnes"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Neviena"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Visas"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Citu lietotņu atlase"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nekam nav atļauts pārtraukt"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nevienai personai nav atļauts pārtraukt"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Dažām personām ir atļauts pārtraukt"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Visām personām ir atļauts pārtraukt"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Atkārtoti zvani"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Atkārtotu zvanu atļaušana"</string>
@@ -3810,18 +3857,16 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Vienu stundu pāriet uz režīmu “Tikai signāli” (līdz: {time})}zero{# stundas pāriet uz režīmu “Tikai signāli” (līdz: {time})}one{# stundu pāriet uz režīmu “Tikai signāli” (līdz: {time})}other{# stundas pāriet uz režīmu “Tikai signāli” (līdz: {time})}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Pāriet uz režīmu “Tikai signāli” līdz plkst. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Pāriet uz “Vienmēr pārtraukt”"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Režīma rediģēšana"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Režīma pievienošana"</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="warning_button_text" msgid="1274234338874005639">"Brīdinājums"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Aizvērt"</string>
<string name="device_feedback" msgid="5351614458411688608">"Sūtīt atsauksmes par šo ierīci"</string>
<string name="restr_pin_enter_admin_pin" msgid="4435410646541671918">"Ievadiet administratora PIN"</string>
<string name="switch_on_text" msgid="5664542327776075105">"Ieslēgts"</string>
- <string name="switch_off_text" msgid="1315547447393646667">"Izslēgts"</string>
+ <string name="switch_off_text" msgid="1315547447393646667">"Izslēgta"</string>
<string name="nfc_setting_on" msgid="7701896496026725772">"Ieslēgti"</string>
<string name="nfc_setting_off" msgid="7142103438532732309">"Izslēgti"</string>
<string name="screen_pinning_switch_on_text" msgid="6971386830247542552">"Ieslēgta"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Futrālis"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Akumulators"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Iestatījumu panelis"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Veikt piespiedu darbvirsmas režīma atvēršanu"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Veikt piespiedu eksperimentālā darbvirsmas režīma atvēršanu sekundārajos displejos"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Iespējot brīvās formas logus"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Iespējot atbalstu brīvās formas logiem."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Iespējot brīvās formas logus otrajā displejā"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Iespējot brīvās formas logus tikai sekundārajā displejā."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Vairāku logu režīmā iespējot nemainīga lieluma lietotnes"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Šis iestatījums ļauj vairāku logu režīmā rādīt lietotnes, kuru lielums nav maināms"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tumšā režīma piespiedu ieslēgšanas ignorēšana"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Ierīces datu nodalījuma failu sistēma jākonvertē uz ext4, lai varētu izmantot izstrādātāju opciju “16 KB”. Š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. Lai varētu aktivizēt opciju “16 KB”, ierīce būs vēl vienu reizi atkārtoti jāpalaiž. Kad būs ieslēgts šis režīms, varēsiet pārslēgt 4 KB vai 16 KB režīmu, vienreiz atkārtoti palaižot ierīci. Šajos režīmos dažas funkcijas tiks atspējotas, tādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums būs jāpārslēdz 4 KB režīms un jābloķē operētājsistēmu ielādes rīks. Tādējādi ierīcē tiks atjaunoti rūpnīcas dati. Kad ierīcē būs sekmīgi palaista operētājsistēma Android, izstrādātāju opcijās atspējojiet OAR atbloķēšanu. Apstiprinot šo darbību, ierīcē tiks notīrīti dati un failu sistēma tiks mainīta uz ext4. Kad tas būs paveikts, lūdzu, atgriezieties, lai iespējotu 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Dzēst visus datus"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Neizdevās notīrīt datu nodalījumu un to pārformatēt uz failu sistēmu ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Lai varētu izmantot 16 KB režīmu, jāatbloķē operētājsistēmu ielādes rīks"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Jāatbloķē operētājsistēmu ielādes rīks"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Lai varētu izmantot izstrādātāju opciju “16 KB”, ierīcē ir jāatbloķē operētājsistēmu ielādes rīks. Š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. Aktivizējot 16 KB režīmu, tiks notīrīti visi lietotāja dati un iestatījumi. Kad operētājsistēmu ielādes rīks būs atbloķēts, ierīce būs atkārtoti jāpalaiž divas reizes, lai aktivizētu opciju “16 KB”. Kad būs ieslēgts šis režīms, varēsiet pārslēgt 4 KB vai 16 KB režīmu, vienreiz atkārtoti palaižot ierīci. Šajos režīmos dažas funkcijas tiks atspējotas, tādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums būs jāpārslēdz 4 KB režīms un jābloķē OAR/operētājsistēmu ielādes rīks. Tādējādi ierīcē tiks atjaunoti rūpnīcas dati. Lūdzu, atbloķējiet operētājsistēmu ielādes rīku un mēģiniet vēlreiz. Norādījumi ir sniegti šeit: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Tiek izmantots 4 KB režīms, kas nav atkarīgs no lappušatmiņas lieluma"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Pašlaik izmantojat 4 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ādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums ir jābloķē operētājsistēmu ielādes rīks. Pieskarieties, lai lasītu vairāk."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Pašlaik izmantojat 4 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ādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums ir jābloķē operētājsistēmu ielādes rīks. Tādējādi ierīcē atkal tiks atjaunoti rūpnīcas dati un 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, ierīcē instalējiet jaunākos rūpnīcas attēlus no vietnes <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> vai apmeklējiet vietni <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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” (Veikt piespiedu instalēšanu visos nodalījumos)."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Tiek izmantots 16 KB režīms, kas nav atkarīgs no lappušatmiņas lieluma"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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ādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums būs jāpārslēdz 4 KB režīms un jābloķē operētājsistēmu ielādes rīks. Pieskarieties, lai lasītu vairāk."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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ādēļ dažas lietojumprogrammas var nedarboties. Lai ierīcē atjaunotu produkcijas režīmu, jums būs jāpārslēdz 4 KB režīms un jābloķē operētājsistēmu ielādes rīks. Tādējādi ierīcē atkal tiks atjaunoti rūpnīcas dati un 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, ierīcē instalējiet jaunākos rūpnīcas attēlus no vietnes <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> vai apmeklējiet vietni <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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” (Veikt piespiedu instalēšanu visos nodalījumos)."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Pieskarieties, lai lasītu vairāk."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> vai apmeklējiet vietni <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Kļūdu pārskatu apstrādātājs"</string>
@@ -5010,14 +5057,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Izmantot lietotņu piespraušanu"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Izmantot izstrādātāju opcijas"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Izmantot drukāšanas pakalpojumu"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Atļaut vairākus lietotājus"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Atļaut lietotāju pārslēgšanu"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ļaut, vairāki, lietotājs, atļaut, daudz"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"vairāki, lietotāji, profili, personas, konti, pārslēgties, daudzi"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Izmantot bezvadu atkļūdošanu"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"Izmantot grafikas draivera preferences"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"Izmantot funkciju Nakts režīms"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"Izmantot tehnoloģiju NFC"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"Izmantot adaptīvu spilgtumu"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"Izmantot adaptīvo spilgtumu"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"Izmantot Wi-Fi zvanus"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"Skatīt visas lietotnes"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"Viedā pāradresācija"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Izvēlieties, kas būs redzams ekrānā, kad planšetdators būs dokots. Ja izmantosiet ekrānsaudzētāju, ierīce var patērēt vairāk enerģijas."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Pielāgot"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Pielāgot ekrānsaudzētāju “<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>”"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Lai iespējotu brīvās formas atbalstu, nepieciešama atkārtota palaišana."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Lai piespiedu kārtā aktivizētu darbvirsmas režīmu sekundārajos displejos, nepieciešama atkārtota palaišana."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Lai iespējotu atbalstu mantotajam brīvās formas logu režīmam, nepieciešama atkārtota palaišana."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Lai mainītu atbalstu brīvās formas logu režīmam, nepieciešama atkārtota palaišana."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Lai piespiedu kārtā aktivizētu brīvās formas logu režīmu sekundārajos displejos, nepieciešama atkārtota palaišana."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Atkārtoti palaist tūlīt"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Atkārtoti palaist vēlāk"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Telpiskais audio"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Ieslēgti"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Izslēgti"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Ieslēgti"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio: %1$d%% — pa kreisi, %2$d%% — pa labi"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio: %1$d%% — pa labi, %2$d%% — pa kreisi"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Jūsu ierīces nosaukums ir redzams jūsu instalētajām lietotnēm. Tas var būt redzams arī citām personām, ja izveidosiet savienojumu ar Bluetooth ierīcēm, Wi-Fi tīklu vai iestatīsiet Wi-Fi tīklāju."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatiskā dzimte"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Atlasiet gramatisko dzimti"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Meklēšanas iestatījumi"</string>
</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index b7e7e75..2daa309 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Време за спиење"</item>
+ <item msgid="4152450357280759894">"Возење"</item>
+ <item msgid="7096549258219399423">"Реалистично"</item>
+ <item msgid="2760716776980432977">"Управувано"</item>
+ <item msgid="601734478369121764">"Ѕвезда"</item>
+ <item msgid="6243809315432780521">"Календар"</item>
+ <item msgid="4913577903148415331">"Време"</item>
+ <item msgid="3653377604690057780">"Театар"</item>
+ <item msgid="3843711267408385410">"Цвет"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index e35733e..9b8197c 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Да прекине врската со уредот?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Спарете нов уред"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматски вклучи го утре"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Поставки за слушни апарати"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Кратенка, компатибилност со слушни помагала"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Зададена вредност"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Нема зададени вредности што ги програмирал вашиот аудиолог"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Не можеше да се ажурира зададената вредност"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиоизлез"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"За аудио-излезот"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Исклучено"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Вклучено/# апликација има пристап до локацијата}one{Вклучено/# апликација имаат пристап до локацијата}other{Вклучено/# апликации имаат пристап до локацијата}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Се вчитува…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Апликациите со дозвола за пристап до уредите во близина може да ја утврдуваат релативната положба на поврзаните уреди."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Апликациите со дозвола за уреди во близина може да ја одредат релативната положба на поврзаните уреди."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Пристапот до локацијата е исклучен за апликации и услуги. Сепак, можно е локацијата на уредот да се испрати до службите за спасување во итни случаи кога ќе ги повикате или кога ќе испратите порака на број за итни случаи."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Дознајте повеќе за „Поставките за локација“"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"За да промените, одете во „Поставките за ChromeOS > Приватност и безбедност > Контроли на приватноста > Пристап до локацијата“"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Додадени се лик и <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Додадени се лик, отпечаток и <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Додадени се лик, отпечатоци и <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Ова е потребно бидејќи е вклучена „Проверка на идентитетот“"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Отклучување со далечински автентикатор"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Часовникот е додаден"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Поставете го часовникот"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Дознајте повеќе за „Отклучување со часовник“"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Додај часовник"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Отстрани часовник"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Отклучување со отпечаток и лик"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Отклучување со лик и отпечаток"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Отклучување со лик и отпечаток за работа"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Потребно е поставување"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Ликот и отпечатоците се додадени"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Инсталирајте апликации"</b>\n"Инсталирајте ги апликациите што сакате да останат приватни во вашиот „Приватен простор“"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Имајте предвид"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Апликациите сопираат кога ќе го заклучите вашиот „Приватен простор“"</b>\n"Кога ќе го заклучите вашиот „Приватен простор“, апликациите во него се сопираат и нема да добивате известувања од нив"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"„Приватен простор“ не е соодветен за апликации што треба да се извршуваат во заднина или да испраќаат важни известувања, како што се медицинските апликации. Тоа е затоа што известувањата и активноста во заднина сопираат кога вашиот „Приватен простор“ е заклучен.\n\nАпликациите од вашиот „Приватен простор“ нема да се појавуваат во „Управувач со дозволи“, „Контролна табла за приватност“, ниту во други поставки кога „Приватниот простор“ е заклучен.\n\nВашиот „Приватен простор“ не може да се премести на нов уред. Ќе треба да поставите друг „Приватен простор“ ако сакате да го користите на друг уред.\n\nАко некој го поврзе вашиот уред со компјутер или инсталира штетни апликации на уредот, можеби ќе може да пристапи до вашиот „Приватен простор“."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"„Приватен простор“ не е соодветен за апликации што треба да се извршуваат во заднина или да испраќаат важни известувања, како што се медицинските апликации. Тоа е затоа што известувањата и активноста во заднина сопираат кога вашиот „Приватен простор“ е заклучен.\n\nАпликациите од вашиот „Приватен простор“ нема да се појавуваат во „Управувач со дозволи“, „Контролна табла за приватност“, ниту во други поставки кога „Приватниот простор“ е заклучен.\n\nВашиот „Приватен простор“ не може да се врати на нов уред. Ќе треба да поставите друг „Приватен простор“ ако сакате да го користите на друг уред.\n\nАко некој го поврзе вашиот уред со компјутер или инсталира злонамерни апликации на уредот, можеби ќе може да пристапи до вашиот „Приватен простор“."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Дознајте повеќе за „Приватен простор“"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Ова ќе трае неколку секунди"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Се поставува „Приватен простор“…"</string>
@@ -828,8 +827,8 @@
<string name="bluetooth_device_context_pair_connect" msgid="2406032703622371826">"Спари и поврзи"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="7326727272747345476">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина"</string>
<string name="bluetooth_empty_list_bluetooth_off_auto_on_available" msgid="3430864468105204282">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина. Функциите како „Брзо споделување“ и „Најди го мојот уред“ користат Bluetooth."</string>
- <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"Кога Bluetooth е вклучен, вашиот уред може да комуницира со другите уреди со Bluetooth во близина.\n\nЗа да се подобри доживувањето со уредот, апликациите и услугите сепак може да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите според локација. Може да го промените во поставките за „Скенирање за Bluetooth“."</string>
- <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="7792443293031247638">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина. Функциите како „Брзо споделување“ и „Најди го мојот уред“ користат Bluetooth.\n\nАпликациите и услугите може да скенираат за уреди во близина во секое време, дури и кога е исклучен Bluetooth. Ова може да се користи, на пример, за да се подобрат функциите и услугите според локација. Ова може да го промените во поставките за скенирање за Bluetooth."</string>
+ <string name="bluetooth_scanning_on_info_message" msgid="786648535600075223">"Кога Bluetooth е вклучен, вашиот уред може да комуницира со другите уреди со Bluetooth во близина.\n\nЗа да се подобри доживувањето со уредот, апликациите и услугите сепак може да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и локациските услуги. Може да го промените во поставките за „Скенирање за Bluetooth“."</string>
+ <string name="bluetooth_scanning_on_info_message_auto_on_available" msgid="7792443293031247638">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина. Функциите како „Брзо споделување“ и „Најди го мојот уред“ користат Bluetooth.\n\nАпликациите и услугите може да скенираат за уреди во близина во секое време, дури и кога е исклучен Bluetooth. Ова може да се користи, на пример, за да се подобрат функциите и локациските услуги. Ова може да го промените во поставките за скенирање за Bluetooth."</string>
<string name="bluetooth_scan_change" msgid="1744636222637390367">"Промени"</string>
<string name="device_details_title" msgid="1155622417516195481">"Детали за уредот"</string>
<string name="bluetooth_device_keyboard_settings_preference_title" msgid="3411693160917620519">"Поставки за тастатурата"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Да се рестартира уредот?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Деталното евидентирање на NFC е наменето само за развојни цели. Дополнителни податоци од NFC се вклучени во извештаите за грешки, коишто може да содржат приватни податоци. Рестартирајте го уредов за да ја промените оваа поставка."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Рестартирај"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"отсликува, надворешен екран, поврзан екран, USB за екран, резолуција, ротација"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Ротација"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандардно"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -920,7 +934,7 @@
<string name="wifi_empty_list_user_restricted" msgid="454861411536708709">"Немате дозвола за промена на Wi-Fi мрежата."</string>
<string name="wifi_settings_scanning_required_title" msgid="1088663325396007484">"Да се вклучи скенирање за Wi-Fi?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="4770243653675416569">"За да може автоматски да се вклучува Wi-Fi, прво треба да вклучите скенирање за Wi-Fi."</string>
- <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Скенирањето за Wi-Fi дозволува апликациите и услугите да скенираат за Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и услугите според локација."</string>
+ <string name="wifi_settings_scanning_required_info" msgid="1473411566072565789">"Скенирањето за Wi-Fi дозволува апликациите и услугите да скенираат за Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и локациските услуги."</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="1112223196123955447">"Вклучи"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="4721729158927146365">"Скенирањето за Wi‑Fi е вклучено"</string>
<string name="wifi_settings_warning_wep_network" msgid="7032462362300663466">"Мрежава користи постар безбедносен протокол наречен WEP, којшто не е толку безбеден"</string>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Осветленоста на екранот ќе се приспособува автоматски на вашата околина и активностите. Може да го поместите лизгачот рачно за да ѝ помогнете на адаптивната осветленост да научи што ви одговара."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Баланс на бела боја на екранот"</string>
@@ -1577,15 +1592,15 @@
<string name="location_high_battery_use" msgid="4277318891200626524">"Голема искористеност на бат."</string>
<string name="location_low_battery_use" msgid="5218950289737996431">"Мала искористеност на бат."</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Скенирање за Wi‑Fi"</string>
- <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволете апликациите и услугите да скенираат за Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и услугите според локација."</string>
+ <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволете апликациите и услугите да скенираат за Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и локациските услуги."</string>
<string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Скенирање за Bluetooth"</string>
- <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволете апликациите и услугите да скенираат за уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите според локација."</string>
- <string name="location_services_preference_title" msgid="604317859531782159">"Услуги според локација"</string>
- <string name="location_services_screen_title" msgid="5640002489976602476">"Услуги според локација"</string>
+ <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_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>
+ <string name="location_time_zone_detection_status_summary_blocked_by_settings" msgid="5276280770344278768">"„Локацијата“ или „Локациските услуги“ се исклучени"</string>
<string name="location_time_zone_detection_status_summary_blocked_by_environment" msgid="2279833212923765802"></string>
<string name="location_time_zone_detection_status_summary_temporarily_unavailable" msgid="6586801403644278967"></string>
<string name="location_time_zone_detection_location_is_off_dialog_title" msgid="231698690198001146">"Потребна е локацијата на уредот"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Користете тастатура на екран"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Прикажувај ја на екранот додека е активна физичката тастатура"</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> ms"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Промена на стил. на покаж. во жолт"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Промена на стил. на покаж. во розов"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Промена на стил. на покаж. во син"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Стил на потег со покажувачот"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Бела"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Црна"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Нема"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Корисникот избрал: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Брзина на покажувачот"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Големина на покажувачот"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Намали го покажувачот"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Зголеми го покажувачот"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Контролор на игра"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Пренасочување вибрации"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Испрати вибрации кон контролорот на игра кога е поврзан"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Сепак продолжи"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Откажи"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Поставки за зголемување"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Повлекување со еден прст"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Движете ја лупата со 1 прст"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Повлечете со 1 прст за движење низ екранот"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Преместете го зголемување со повлекување со еден прст."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Преместете го зголемување со повлекување со два прста."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Недостапно кога се зголемува само дел од екранот"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Допрете копче за зумирање"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Брзо зумирајте на екранот за да ги направите содржините поголеми"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>За да зумирате:</b><br/> {0,number,integer}. Употребете кратенка за почеток на зголемувањето<br/> {1,number,integer}. Допрете го екранот<br/> {2,number,integer}. Повлечете со два прста за да се движите низ екранот<br/> {3,number,integer}. Штипнете со два прста за да го приспособите зумот<br/> {4,number,integer}. Употребете кратенка за крај на зголемувањето<br/><br/><b>За да зумирате привремено:</b><br/> {0,number,integer}. Погрижете се типот на зголемувањето да биде поставен на цел екран<br/> {1,number,integer}. Употребете кратенка за почеток на зголемувањето<br/> {2,number,integer}. Допрете и задржете каде било на екранот<br/> {3,number,integer}. Повлечете со прст за да се движите низ екранот<br/> {4,number,integer}. Подигнете го прстот за крај на зголемувањето"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>За да зумирате:</b><br/> {0,number,integer}. Употребете кратенка за почеток на зголемувањето<br/> {1,number,integer}. Допрете го екранот<br/> {2,number,integer}. Повлечете со 2 прста за да се движите низ екранот<br/> {3,number,integer}. Штипнете со 2 прста за да го приспособите зумот<br/> {4,number,integer}. Употребете кратенка за сопирање на зголемувањето<br/><br/> Може и да зумирате привремено и друго."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>За да зумирате:</b><br/> {0,number,integer}. Употребете кратенка за почеток на зголемувањето<br/> {1,number,integer}. Допрете го екранот<br/> {2,number,integer}. Повлечете со 1 или 2 прста за да се движите низ екранот<br/> {3,number,integer}. Штипнете со 2 прста за да го приспособите зумот<br/> {4,number,integer}. Употребете кратенка за сопирање на зголемувањето<br/><br/> Може и да зумирате привремено и друго."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Кога е вклучено зумирањето, може да зумирате на екранот.\n\n"<b>"За да зумирате"</b>", стартувајте го зголемувањето, па допрете каде било на екранот.\n"<ul><li>"Повлечете со два или повеќе прсти за да лизгате"</li>\n<li>"Штипнете со два или повеќе прсти за да го приспособите зумот"</li></ul>\n\n<b>"За да зумирате привремено"</b>", стартувајте го зголемувањето, а потоа допрете и задржете каде било на екранот.\n"<ul><li>"Повлечете за да се движите околу екранот"</li>\n<li>"Подигнете го прстот за да одзумирате"</li></ul>\n\n"Не може да зумирате на тастатурата или на лентата за навигација."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> од <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Кратенка за копчето за пристапност"</string>
@@ -2189,8 +2214,8 @@
<string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"Дознајте повеќе за копчето за пристапност и движење"</string>
<string name="accessibility_button_intro" msgid="2601976470525277903">"Користење на копчето за пристапност. Движењето не е достапно со навигација со 3 копчиња."</string>
<string name="accessibility_button_summary" msgid="8510939012631455831">"Брзо пристапувајте до функциите за пристапност"</string>
- <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>За да започнете</b><br/> {0,number,integer}. oдете во поставките за пристапност<br/> {1,number,integer}. изберете функција и допрете ја кратенката<br/> {2,number,integer}. изберете дали сакате да користите копче или движење за пристап до функцијата<br/>"</string>
- <string name="accessibility_button_description" msgid="7669538706120092399">"<b>За да започнете</b><br/> {0,number,integer}. oдете во поставките за пристапност<br/> {1,number,integer}. изберете функција и допрете ја кратенката<br/> {2,number,integer}. изберете го копчето за пристап до функцијата<br/>"</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>За да започнете</b><br/> {0,number,integer}. Одете во поставките за пристапност<br/> {1,number,integer}. Изберете функција и допрете ја кратенката<br/> {2,number,integer}. Изберете дали сакате да користите копче или движење за пристап до функцијата<br/>"</string>
+ <string name="accessibility_button_description" msgid="7669538706120092399">"<b>За да започнете</b><br/> {0,number,integer}. Одете во поставките за пристапност<br/> {1,number,integer}. Изберете функција и допрете ја кратенката<br/> {2,number,integer}. Изберете го копчето за пристап до функцијата<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Користете копче или движење"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Локација"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Големина"</string>
@@ -2882,8 +2907,8 @@
<string name="data_usage_warning_editor_title" msgid="5252748452973120016">"Поставете предупредување за потрошен интернет"</string>
<string name="data_usage_limit_editor_title" msgid="8826855902435008518">"Поставете ограничување за потрошен интернет"</string>
<string name="data_usage_limit_dialog_title" msgid="2053134451707801439">"Ограничување за потрошен интернет"</string>
- <string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"предупредување"</font></string>
- <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"граница"</font></string>
+ <string name="data_usage_sweep_warning" msgid="2072854703184614828"><font size="12">"Предупр."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
+ <string name="data_usage_sweep_limit" msgid="6947019190890086284"><font size="12">"Oгранич."</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
<string name="data_usage_uninstalled_apps" msgid="9065885396147675694">"Отстранети апликации"</string>
<string name="data_usage_uninstalled_apps_users" msgid="1262228664057122983">"Отстранети апликации и корисници"</string>
<string name="wifi_metered_title" msgid="6623732965268033931">"Користење на мрежата"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниеден}=1{Поставен е 1 распоред}one{Поставен е # распоред}other{Поставени се # распореди}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не вознемирувај"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Приоритетни режими"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Додајте режим"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добивајте известувања само од важни луѓе и апликации"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Изберете тип активација"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Време"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"На пр. „9:30 – 17:00“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календар"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"На пр. „Личен календар“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Создајте режим"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Приспособено"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничете ги прекините"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Исклучување на „Не вознемирувај“"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Алармите и звуците од аудиовизуелните содржини може да го прекинуваат"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Распореди"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Избришете ги распоредите"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Избриши"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Преименувај"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Избриши"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Да се избрише режимот „<xliff:g id="MODE">%1$s</xliff:g>“?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Измени"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Распореди"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Распоред"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Додајте календар"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Користете го календарот"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Распоред"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Поставете распоред"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Распоред"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Автоматско вклучување"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Распоред"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Не вознемирувај во одредено време"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Правила за „Не вознемирувај“"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Дозволете прекинувања што произведуваат звук"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокирајте визуелни нарушувања"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволи визуелни сигнали"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Известувања што може да стигнат до вас"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Останете фокусирани"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Дополнителни дејства"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Исклучено}=1{Исклучено/1 режим може да се вклучи автоматски}one{Исклучено/# режим може да се вклучат автоматски}other{Исклучено/# режими може да се вклучат автоматски}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Поставки за екранот"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Опции за екранот"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Сиви тонови"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"овозможете темна тема"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Префрлете ги OS и апликациите за да претпочитаат светол текст на темна заднина, што може да биде полесно за очите и овозможува значителна заштеда на батеријата на некои уреди"</string>
<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}}one{{effect_1}, {effect_2} и уште #}other{{effect_1}, {effect_2} и уште #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Филтрирај ги прекините"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Не се филтрираат прекините"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"отворете го известувањето"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Дозволи одложување на известувањата"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Точка за известување на икона за апликацијата"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Пакети известувања"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Балончиња"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Балончиња"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Стави го разговорот во балонче"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Апликацијава не поддржува подобрени поставки"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Повеќе поставки"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Повеќе поставки се достапни во апликацијава"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Намалување на известувањата"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Примени на работни профили"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Применете на апликациите во работниот профил"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категории"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Друго"</string>
<string name="no_channels" msgid="4716199078612071915">"Апликацијава не објави ниедно известување"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Прикажи ги некористените категории"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Дополнителни поставки во апликацијата"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Прикажи ги некористените категории"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Скриј ги некористените категории"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Апликации што може да прекинуваат"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Избрани апликации"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Нема"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Сите"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволете апликациите да занемаруваат"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Апликации што може да го прекинуваат режимот"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Изберете уште апликации"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништо не може да го прекинува"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Никој не може да го прекинува"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Некои луѓе може да го прекинуваат"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Сите луѓе може да го прекинуваат"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Редовни повикувачи"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Дозволи повторни повикувачи"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Смени само на аларми во траење од еден час до {time}}one{Смени само на аларми во траење од # час до {time}}other{Смени само на аларми во траење од # часа до {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Промена на аларми само до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Промени секогаш да се прекине"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Изменете режим"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Додајте режим"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Приспособете го режимот"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Име на режимот"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Опомена"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Затвори"</string>
<string name="device_feedback" msgid="5351614458411688608">"Повратни информации за уредов"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Наметни режим на работна површина"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Наметнете го експерименталниот режим на работна површина на секундарните екрани"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Овозможете прозорци со менлива големина"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Овозможете поддршка за прозорци со слободна форма."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Овозм. прозорци со менлива големина на втор екран"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Овозможете прозорци со слободна форма само на втор екран."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Овозможи фиксна големина во режим со повеќе прозорци"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Овозможува апликации со фиксна големина да бидат во режим со повеќе прозорци"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Отфрли го наметнувањето темен режим"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Пред да се користи програмерската опција од 16 kB, партицијата со податоци на уредов треба да се конвертира во ext4. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. За да се активира опцијата од 16 kB, ќе биде потребно уште едно рестартирање по ова. Штом ќе влезете во овој режим, може да се префрлате меѓу режимите од 4 kB и 16 kB со едно рестартирање. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да го вратите уредот во работен режим, ќе треба да се вратите во режимот од 4 kB, па да го заклучите вчитувачот на систем, којшто го ресетира уредот на фабрички поставки. Откако уредот успешно ќе се подигне во Android, оневозможете го отклучувањето OEM во „Програмерски опции“. По потврдувањето, уредот ќе се избрише трајно, а системот на датотеки ќе се промени во ext4. Кога ќе заврши ова, вратете се за да овозможите режим од 16 kB повторно."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Избриши ги сите податоци"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Неуспешно повторно форматирање и трајно бришење на партицијата со податоци во ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Вчитувачот на систем треба да се отклучи за режим од 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Потребно е отклучување на вчитувачот на системот"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Пред да може да се користи програмерската опција од 16 kB, треба да се отклучи вчитувачот на систем на уредов. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. При активирањето режим од 16 kB, ќе се избришат трајно сите кориснички податоци и поставки. Откако ќе се отклучи вчитувачот на систем, ќе бидат потребни две рестартирања за да се активира опцијата од 16 kB. Штом ќе влезете во овој режим, може да се префрлате меѓу режимите од 4 kB и 16 kB со едно рестартирање. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да го вратите уредот во работен режим, ќе треба да се вратите во режимот од 4 kB, па да го заклучите OEM/вчитувачот на систем, којшто го ресетира уредот на фабрички поставки. Отклучете го вчитувачот на систем, па обидете се повторно. Инструкции како да го направите ова може да најдете на <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Се користи режимот за компатибилност со мемориски страници од 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Вие сте во режимот од 4 kB на режимот за компатибилност со мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да го заклучите вчитувачот на систем на уредот. Допрете за да прочитате повеќе."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Вие сте во режимот од 4 kB на режимот за компатибилност со мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да го заклучите вчитувачот на систем на уредот. Ова ќе го ресетира уредот на фабрички поставки повторно и ќе го врати на поставките за работен режим. Откако уредот успешно ќе се подигне во Android, оневозможете го отклучувањето OEM во „Програмерски опции“. Ако уредот не може да се подигне во Android или е нестабилен, преинсталирајте ги најновите фабрички слики на уредот од <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или користете <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете „Трајно избриши ги податоците на уредот“, „Заклучи го вчитувачот на системот“ и „Force Flash all partitions“ (Наметни инсталирање на сите партиции)."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Се користи режимот за компатибилност со мемориски страници од 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Вие сте во режимот од 16 kB на режимот за компатибилност со мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да се вратите во режим од 4 kB, па да го заклучите вчитувачот на систем на уредот. Допрете за да прочитате повеќе."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Вие сте во режимот од 16 kB на режимот за компатибилност со мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да се вратите во режим од 4 kB, па да го заклучите вчитувачот на систем на уредот. Ова ќе го ресетира уредот на фабрички поставки повторно и ќе го врати на поставките за работен режим. Откако уредот успешно ќе се подигне во Android, оневозможете го отклучувањето OEM во „Програмерски опции“. Ако уредот не може да се подигне во Android или е нестабилен, преинсталирајте ги најновите фабрички слики на уредот од <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или користете <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете „Трајно избриши ги податоците на уредот“, „Заклучи го вчитувачот на системот“ и „Force Flash all partitions“ (Наметни инсталирање на сите партиции)."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Вие сте во режимот од 16 KB на режимот за компатибилност на мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да се вратите во режим од 4 KB, па да го заклучите вчитувачот на систем на уредот. Допрете за да прочитате повеќе."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Вие сте во режимот од 16 KB на режимот за компатибилност на мемориски страници. Во овој режим не може да се гарантира интегритетот на софтверот, а податоците складирани на телефонот додека е отклучен вчитувачот на систем може да бидат изложени на ризик. Некои функции ќе бидат оневозможени во овие режими, па некои апликации можеби нема да функционираат. За да влезете во работен режим повторно, мора да се вратите во режим од 4 KB, па да го заклучите вчитувачот на систем на уредот. Ова ќе го ресетира уредот на фабрички поставки повторно и ќе го врати на поставките за работен режим. Откако уредот успешно ќе се подигне во Android, оневозможете го отклучувањето OEM во „Програмерски опции“. Ако уредот не може да се подигне во Android или е нестабилен, преинсталирајте ги најновите фабрички слики на уредот од <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или користете <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изберете „Трајно избриши ги податоците на уредот“, „Заклучи го вчитувачот на системот“ и „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="bug_report_handler_title" msgid="713439959113250125">"Ракувач со извештајот за грешки"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Користи „Закачување апликации“"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Користи „Програмерски опции“"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Користи ја услугата за печатење"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Дозволи повеќе корисници"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Дозволете менување корисници"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"дозволи, повеќекратно, корисник, дозвола, многу"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"повеќе, корисници, профили, лица, сметки, смени, многу"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Користи „Безжично отстранување грешки“"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Изберете што да се прикажува на екранот кога таблетот е приклучен на док. Уредот може да користи повеќе енергија кога се користи штедач на екранот."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Приспособете"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Приспособете го <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Потребно е рестартирање за да се овозможи поддршка со слободна форма."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Потребно е рестартирање за да се присили режимот на компјутер на секундарни екрани."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Потребно е рестартирање за да се овозможи поддршка за застарени прозорци со менлива големина."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Потребно е рестартирање за да се промени поддршката за прозорци со менлива големина."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Потребно е рестартирање за да се присилат прозорци со менлива големина на секундарни екрани."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Рестартирај сега"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Рестартирај подоцна"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Просторен звук"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Вклучено"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Исклучено"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Вклучено"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио: %1$d%% одлево, %2$d%% оддесно"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио: %1$d%% оддесно, %2$d%% одлево"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Името на уредот е видливо за апликациите што сте ги инсталирале. Може да го видат и други луѓе кога ќе се поврзете со уреди со Bluetooth, на Wi-Fi мрежа или кога ќе поставите точка на пристап за Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Граматички род"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Изберете граматички род"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Пребарувајте низ поставките"</string>
</resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2f1d67b..a9cfcb7 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ബെഡ്ടൈം"</item>
+ <item msgid="4152450357280759894">"ഡ്രൈവിംഗ്"</item>
+ <item msgid="7096549258219399423">"ഇമേഴ്സീവ്"</item>
+ <item msgid="2760716776980432977">"മാനേജ് ചെയ്യുന്നത്"</item>
+ <item msgid="601734478369121764">"നക്ഷത്രം"</item>
+ <item msgid="6243809315432780521">"കലണ്ടർ"</item>
+ <item msgid="4913577903148415331">"സമയം"</item>
+ <item msgid="3653377604690057780">"തിയേറ്റർ"</item>
+ <item msgid="3843711267408385410">"പൂവ്"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index dd82a9d..1bc3535 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ഉപകരണം വിച്ഛേദിക്കണോ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"പുതിയ ഉപകരണം ജോടിയാക്കുക"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"നാളെ സ്വയമേവ ഓണാക്കുക"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ശ്രവണ സഹായിയുടെ ക്രമീകരണം"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"കുറുക്കുവഴി, ശ്രവണ സഹായ അനുയോജ്യത"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"പ്രീസെറ്റ്"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ഓഡിയോളജിസ്റ്റ് പ്രോഗ്രാം ചെയ്ത പ്രീസെറ്റുകളൊന്നുമില്ല"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"പ്രീസെറ്റ് അപ്ഡേറ്റ് ചെയ്യാനായില്ല"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ഓഡിയോ ഔട്ട്പുട്ട്"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ഓഡിയോ ഔട്ട്പുട്ടിനെ കുറിച്ച്"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ഓഫാക്കുക"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ഓണാണ് / # ആപ്പിന് ലൊക്കേഷനിലേക്ക് ആക്സസ് ഉണ്ട്}other{ഓണാണ് / # ആപ്പുകൾക്ക് ലൊക്കേഷനിലേക്ക് ആക്സസ് ഉണ്ട്}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ലോഡ് ചെയ്യുന്നു…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"സമീപമുള്ള ഉപകരണങ്ങളുടെ അനുമതിയുള്ള ആപ്പുകൾക്ക്, കണക്റ്റ് ചെയ്തിരിക്കുന്ന ഉപകരണങ്ങളുടെ ആപേക്ഷിക സ്ഥാനം നിർണ്ണയിക്കാനാകും."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"സമീപമുള്ള ഉപകരണങ്ങളുടെ അനുമതിയുള്ള ആപ്പുകൾക്ക്, കണക്റ്റ് ചെയ്തിരിക്കുന്ന ഉപകരണങ്ങളുടെ ഏകദേശ സ്ഥാനം നിർണ്ണയിക്കാനാകും."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ആപ്പുകൾക്കും സേവനങ്ങൾക്കും ലൊക്കേഷൻ ആക്സസ് ഓഫാണ്. നിങ്ങൾ അടിയന്തര നമ്പറിലേക്ക് കോൾ ചെയ്യുമ്പോഴോ ടെക്സ്റ്റ് ചെയ്യുമ്പോഴോ നിങ്ങളുടെ ഉപകരണ ലൊക്കേഷൻ, അടിയന്തര സാഹചര്യത്തിൽ പ്രതികരിക്കുന്നവർക്ക് തുടർന്നും അയച്ചേക്കാം."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ലൊക്കേഷൻ ക്രമീകരണത്തെക്കുറിച്ച് കൂടുതലറിയുക"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"മാറ്റാൻ, ChromeOS ക്രമീകരണം > സ്വകാര്യതയും സുരക്ഷയും > സ്വകാര്യതാ നിയന്ത്രണങ്ങൾ > ലൊക്കേഷൻ ആക്സസ് എന്നിങ്ങനെ പോകുക"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"മുഖവും <xliff:g id="WATCH">%s</xliff:g> എന്നതും ചേർത്തു"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"മുഖവും ഫിംഗർപ്രിന്റും <xliff:g id="WATCH">%s</xliff:g> എന്നതും ചേർത്തു"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"മുഖവും ഫിംഗർപ്രിന്റുകളും <xliff:g id="WATCH">%s</xliff:g> എന്നതും ചേർത്തു"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ഐഡന്റിറ്റി പരിശോധന ഓണായിരിക്കുന്നതിനാൽ ഇത് ആവശ്യമാണ്"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"വിദൂര Authenticator അൺലോക്ക്"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"വാച്ച് ചേർത്തു"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"നിങ്ങളുടെ വാച്ച് സജ്ജീകരിക്കൂ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"വാച്ച് അൺലോക്കിനെ കുറിച്ച് കൂടുതലറിയുക"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"വാച്ച് ചേർക്കുക"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"വാച്ച് നീക്കം ചെയ്യുക"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ഫിംഗർപ്രിന്റ് & ഫേസ് അൺലോക്ക്"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ഫെയ്സ്, ഫിംഗർപ്രിന്റ് അൺലോക്ക്"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ഔദ്യോഗികാവശ്യത്തിനുള്ള ഫെയ്സ്, ഫിംഗർപ്രിന്റ് അൺലോക്ക്"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"സജ്ജീകരിക്കേണ്ടതുണ്ട്"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"മുഖവും ഫിംഗർപ്രിന്റുകളും ചേർത്തു"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"</b>\n"നിങ്ങളുടെ സ്പേസിൽ സ്വകാര്യമായി സൂക്ഷിക്കേണ്ട ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ശ്രദ്ധിക്കേണ്ട കാര്യങ്ങൾ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"നിങ്ങൾ സ്പേസ് ലോക്ക് ചെയ്യുമ്പോൾ ആപ്പുകൾ നിർത്തുന്നു"</b>\n"നിങ്ങളുടെ സ്പേസ് ലോക്ക് ചെയ്യുമ്പോൾ, സ്പേസിലെ ആപ്പുകൾ നിർത്തും, അവയിൽ നിന്ന് അറിയിപ്പുകൾ ലഭിക്കില്ല"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യേണ്ട ആപ്പുകൾക്ക് അല്ലെങ്കിൽ മെഡിക്കൽ ആപ്പുകൾ പോലുള്ള, നിർണ്ണായക അറിയിപ്പുകൾ അയയ്ക്കേണ്ട ആപ്പുകൾക്ക് സ്വകാര്യ സ്പേസുകൾ അനുയോജ്യമല്ല. നിങ്ങളുടെ സ്പേസ് ലോക്ക് ചെയ്യുമ്പോൾ അറിയിപ്പുകളും പശ്ചാത്തല ആക്റ്റിവിറ്റിയും നിർത്തും എന്നതാണ് ഇതിന്റെ കാരണം.\n\nനിങ്ങളുടെ സ്വകാര്യ സ്പേസ് ലോക്ക് ചെയ്തിരിക്കുമ്പോൾ അനുമതി മാനേജർ, സ്വകാര്യതാ ഡാഷ്ബോർഡ്, മറ്റ് ക്രമീകരണം എന്നിവയിൽ സ്വകാര്യ സ്പേസിലെ ആപ്പുകൾ ദൃശ്യമാകില്ല.\n\nനിങ്ങളുടെ സ്വകാര്യ സ്പേസ് പുതിയ ഉപകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കാനാകില്ല. മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾക്ക് അത് ഉപയോഗിക്കണമെന്നുണ്ടെങ്കിൽ നിങ്ങൾ മറ്റൊരു സ്വകാര്യ സ്പേസ് സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nനിങ്ങളുടെ ഉപകരണത്തെ കമ്പ്യൂട്ടറുമായി ബന്ധിപ്പിക്കുന്ന അല്ലെങ്കിൽ ഉപകരണത്തിൽ ദോഷകരമായ ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുന്ന ആർക്കും നിങ്ങളുടെ സ്വകാര്യ സ്പേസ് ആക്സസ് ചെയ്യാനാകും."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യേണ്ട ആപ്പുകൾക്ക് അല്ലെങ്കിൽ മെഡിക്കൽ ആപ്പുകൾ പോലുള്ള, നിർണ്ണായക അറിയിപ്പുകൾ അയയ്ക്കേണ്ട ആപ്പുകൾക്ക് സ്വകാര്യ സ്പേസുകൾ അനുയോജ്യമല്ല. നിങ്ങളുടെ സ്പേസ് ലോക്ക് ചെയ്യുമ്പോൾ അറിയിപ്പുകളും പശ്ചാത്തല ആക്റ്റിവിറ്റിയും നിർത്തും എന്നതാണ് ഇതിന്റെ കാരണം.\n\nസ്വകാര്യ സ്പേസ് ലോക്ക് ചെയ്തിരിക്കുമ്പോൾ അനുമതി മാനേജർ, സ്വകാര്യതാ ഡാഷ്ബോർഡ്, മറ്റ് ക്രമീകരണം എന്നിവയിൽ സ്വകാര്യ സ്പേസിലെ ആപ്പുകൾ ദൃശ്യമാകില്ല.\n\nനിങ്ങളുടെ സ്വകാര്യ സ്പേസ് പുതിയ ഉപകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കാനാകില്ല. മറ്റൊരു ഉപകരണത്തിൽ നിങ്ങൾക്ക് അത് ഉപയോഗിക്കണമെന്നുണ്ടെങ്കിൽ നിങ്ങൾ മറ്റൊരു സ്പേസ് സജ്ജീകരിക്കേണ്ടതുണ്ട്.\n\nനിങ്ങളുടെ ഉപകരണത്തെ കമ്പ്യൂട്ടറുമായി ബന്ധിപ്പിക്കുന്ന അല്ലെങ്കിൽ ഉപകരണത്തിൽ ദോഷകരമായ ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുന്ന ആർക്കും നിങ്ങളുടെ സ്വകാര്യ സ്പേസ് ആക്സസ് ചെയ്യാനാകും."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"സ്വകാര്യ സ്പേസിനെക്കുറിച്ച് കൂടുതലറിയുക"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ഇതിന് കുറച്ച് സമയമെടുക്കും"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"സ്വകാര്യ സ്പേസ് സജ്ജീകരിക്കുന്നു…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യണോ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ഡെവലപ്പ്മെന്റ് ആവശ്യങ്ങൾക്ക് മാത്രം ഉദ്ദേശിച്ചുള്ളതാണ് വിശദമായ NFC ലോഗ് ചെയ്യൽ. ബഗ് റിപ്പോർട്ടുകളിൽ അധിക NFC ഡാറ്റ ഉൾപ്പെടുത്തിയിരിക്കുന്നു, അവയിൽ സ്വകാര്യ വിവരങ്ങൾ അടങ്ങിയിരിക്കാം. ഈ ക്രമീകരണം മാറ്റാൻ നിങ്ങളുടെ ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുക."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"റീസ്റ്റാർട്ട് ചെയ്യൂ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"മിറർ ചെയ്യുക, ബാഹ്യ ഡിസ്പ്ലേ, കണക്റ്റ് ചെയ്ത ഡിസ്പ്ലേ, USB ഡിസ്പ്ലേ, റെസല്യൂഷൻ, റൊട്ടേഷൻ"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"റൊട്ടേഷൻ"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"സ്റ്റാൻഡേർഡ്"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ഓൺ-സ്ക്രീൻ കീബോർഡ് ഉപയോഗിക്കുക"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ഫിസിക്കൽ കീബോർഡ് സജീവമായിരിക്കുമ്പോൾ സ്ക്രീനിൽ നിലനിർത്തുക"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"പോയിന്റർ ഫിൽ സ്റ്റൈൽ മഞ്ഞയാക്കൂ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"പോയിന്റർ ഫിൽ സ്റ്റൈൽ പിങ്ക് ആക്കൂ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"പോയിന്റർ ഫിൽ സ്റ്റൈൽ നീലയാക്കൂ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"പോയിന്റർ സ്ട്രോക്ക് സ്റ്റൈൽ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"വെള്ള"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"കറുപ്പ്"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ഒന്നുമില്ല"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"തിരഞ്ഞെടുത്ത ഉപയോക്താവ്: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"സംഭാഷണം"</string>
<string name="pointer_speed" msgid="7398649279282675718">"പോയിന്റർ വേഗത"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"പോയിന്റർ സ്കെയിൽ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"പോയിന്റർ സ്കെയിൽ കുറയ്ക്കുക"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"പോയിന്റർ സ്കെയിൽ വർദ്ധിപ്പിക്കുക"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ഗെയിം കൺട്രോളർ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"വൈബ്രേഷൻ റീഡയറക്റ്റ് ചെയ്യുക"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"കണക്റ്റ് ചെയ്തിരിക്കുമ്പോൾ, ഗെയിം കൺട്രോളറിലേക്ക് വൈബ്രേഷൻ അയയ്ക്കുക"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"എന്തായാലും തുടരുക"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"റദ്ദാക്കുക"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"മാഗ്നിഫിക്കേഷൻ ക്രമീകരണം"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ഒരു വിരൽ കൊണ്ടുള്ള പാനിംഗ്"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ഒരു വിരൽ ഉപയോഗിച്ച് മാഗ്നിഫയർ നീക്കുക"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"സ്ക്രീനിലുടനീളം നീങ്ങാൻ ഒരു വിരൽ ഉപയോഗിച്ച് വലിച്ചിടുക"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ഒരു വിരൽ കൊണ്ട് വലിച്ച് മാഗ്നിഫിക്കേഷൻ ഏരിയ നീക്കുക."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"രണ്ട് വിരലുകൾ കൊണ്ട് വലിച്ച് മാഗ്നിഫിക്കേഷൻ ഏരിയ നീക്കുക."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"സ്ക്രീനിന്റെ ഒരു ഭാഗം മാത്രം വലുതാക്കിയിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"സൂം ചെയ്യുന്നതിന് ബട്ടണിൽ ടാപ്പ് ചെയ്യുക"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ഉള്ളടക്കം വലുതാക്കാൻ സ്ക്രീനിൽ വേഗത്തിൽ സൂം ഇൻ ചെയ്യുക"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>സൂം ഇൻ ചെയ്യാൻ:</b><br/> {0,number,integer}. മാഗ്നിഫിക്കേഷൻ ആരംഭിക്കാൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/> {1,number,integer}. സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക<br/> {2,number,integer}. സ്ക്രീനിലുടനീളം നീക്കാൻ 2 വിരലുകൾ ഉപയോഗിച്ച് വലിച്ചിടുക<br/> {3,number,integer}. സൂം ക്രമീകരിക്കാൻ 2 വിരലുകൾ ഉപയോഗിച്ച് പിഞ്ച് ചെയ്യുക<br/> {4,number,integer}. മാഗ്നിഫിക്കേഷൻ നിർത്താൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/><br/> <b>താൽക്കാലികമായി സൂം ഇൻ ചെയ്യാൻ:</b><br/> {0,number,integer}. നിങ്ങളുടെ മാഗ്നിഫിക്കേഷൻ തരം പൂർണ്ണ സ്ക്രീനിലേക്ക് സജ്ജീകരിച്ചിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക<br/> {1,number,integer}. മാഗ്നിഫിക്കേഷൻ ആരംഭിക്കാൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/> {2,number,integer}. സ്ക്രീനിൽ എവിടെയെങ്കിലും സ്പർശിച്ച് പിടിക്കുക<br/> {3,number,integer}. സ്ക്രീനിലുടനീളം നീക്കാൻ വിരൽ ഉപയോഗിച്ച് വലിച്ചിടുക<br/> {4,number,integer}. മാഗ്നിഫിക്കേഷൻ നിർത്താൻ വിരൽ സ്ക്രീനിൽ നിന്ന് എടുക്കുക"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>സൂം ഇൻ ചെയ്യാൻ:</b><br/> {0,number,integer}. മാഗ്നിഫിക്കേഷൻ ആരംഭിക്കാൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/> {1,number,integer}. സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക<br/> {2,number,integer}. സ്ക്രീനിലുടനീളം നീക്കാൻ 2 വിരലുകൾ ഉപയോഗിച്ച് വലിച്ചിടുക<br/> {3,number,integer}. സൂം ക്രമീകരിക്കാൻ 2 വിരലുകൾ ഉപയോഗിച്ച് പിഞ്ച് ചെയ്യുക<br/> {4,number,integer}. മാഗ്നിഫിക്കേഷൻ നിർത്താൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/><br/> നിങ്ങൾക്ക് താൽകാലികമായും മറ്റും സൂം ഇൻ ചെയ്യാനും കഴിയും."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>സൂം ഇൻ ചെയ്യാൻ:</b><br/> {0,number,integer}. മാഗ്നിഫിക്കേഷൻ ആരംഭിക്കാൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/> {1,number,integer}. സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക<br/> {2,number,integer}. സ്ക്രീനിലുടനീളം നീക്കാൻ 1 അല്ലെങ്കിൽ 2 വിരലുകൾ ഉപയോഗിച്ച് വലിച്ചിടുക<br/> {3,number,integer}. സൂം ക്രമീകരിക്കാൻ 2 വിരലുകൾ ഉപയോഗിച്ച് പിഞ്ച് ചെയ്യുക<br/> {4,number,integer}. മാഗ്നിഫിക്കേഷൻ നിർത്താൻ കുറുക്കുവഴി ഉപയോഗിക്കുക<br/><br/> നിങ്ങൾക്ക് താൽകാലികമായും മറ്റും സൂം ഇൻ ചെയ്യാനും കഴിയും."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"മാഗ്നിഫിക്കേഷൻ ഓണാക്കിയിരിക്കുമ്പോൾ, നിങ്ങളുടെ സ്ക്രീനിൽ സൂം ഇൻ ചെയ്യാവുന്നതാണ്.\n\n"<b>"സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം നിങ്ങളുടെ സ്ക്രീനിൽ എവിടെയെങ്കിലും ടാപ്പ് ചെയ്യുക.\n"<ul><li>"സ്ക്രോൾ ചെയ്യാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ ഇഴയ്ക്കുക"</li>\n<li>"സൂം ക്രമീകരിക്കാൻ രണ്ടോ അതിലധികമോ വിരലുകൾ പിഞ്ച് ചെയ്യുക"</li></ul>\n\n<b>"താൽക്കാലികമായി സൂം ചെയ്യാൻ"</b>", മാഗ്നിഫിക്കേഷൻ ആരംഭിച്ച ശേഷം സ്ക്രീനിൽ എവിടെയെങ്കിലും സ്പർശിച്ചുപിടിക്കുക.\n"<ul><li>"സ്ക്രീനിന് ചുറ്റും നീക്കാൻ വലിച്ചിടുക"</li>\n<li>"സൂം ഔട്ട് ചെയ്യാൻ വിരൽ എടുക്കുക"</li></ul>\n\n"കീബോർഡിലും നാവിഗേഷൻ ബാറിലും നിങ്ങൾക്ക് സൂം ഇൻ ചെയ്യാനാവില്ല."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> പേജുകളിൽ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>-ാമത്തെ പേജ്"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ഉപയോഗസഹായി ബട്ടണിന്റെ കുറുക്കുവഴി"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു ഷെഡ്യൂൾ സജ്ജീകരിച്ചു}other{# ഷെഡ്യൂളുകൾ സജ്ജീകരിച്ചു}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ശല്യപ്പെടുത്തരുത്"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"മുൻഗണനാ മോഡുകൾ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ഒരു മോഡ് ചേർക്കുക"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"പ്രധാനപ്പെട്ട ആളുകളിൽ നിന്നും ആപ്പുകളിൽ നിന്നുമുള്ള അറിയിപ്പ് മാത്രം നേടുക"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"സജീവമാക്കൽ തരം തിരഞ്ഞെടുക്കുക"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"സമയം"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ഉദാ. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"കലണ്ടർ"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ഉദാ. \"സ്വകാര്യ കലണ്ടർ\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"മോഡ് സൃഷ്ടിക്കുക"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ഇഷ്ടാനുസൃതം"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"തടസ്സങ്ങൾ പരിമിതപ്പെടുത്തുക"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കുക"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"അലാറങ്ങൾക്കും മീഡിയ ശബ്ദങ്ങൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"ഷെഡ്യൂളുകൾ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ഷെഡ്യൂളുകൾ ഇല്ലാതാക്കുക"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ഇല്ലാതാക്കുക"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"പേരുമാറ്റുക"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ഇല്ലാതാക്കുക"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" മോഡ് ഇല്ലാതാക്കണോ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"എഡിറ്റ് ചെയുക"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"ഷെഡ്യൂളുകൾ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"ഷെഡ്യൂള്"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"കലണ്ടർ ചേർക്കുക"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"നിങ്ങളുടെ കലണ്ടർ ഉപയോഗിക്കുക"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"ഷെഡ്യൂൾ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ഷെഡ്യൂൾ സജ്ജീകരിക്കുക"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"ഷെഡ്യൂൾ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> മണിക്കൂർ, <xliff:g id="MINUTES">%2$d</xliff:g> മിനിറ്റ്"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"സ്വയമേവ ഓണാക്കുക"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"ഷെഡ്യൂള് ചെയ്യുക"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ചില സമയങ്ങളിൽ ഫോൺ നിശബ്ദമാക്കുക"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങൾ സജ്ജമാക്കുക"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ശബ്ദമുണ്ടാക്കുന്ന തടസ്സങ്ങൾ അനുവദിക്കുക"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ദൃശ്യതടസങ്ങൾ ബ്ലോക്കുചെയ്യൂ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ദൃശ്യ സിഗ്നലുകൾ അനുവദിക്കുക"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"നിങ്ങൾക്ക് ലഭിക്കുന്ന അറിയിപ്പുകൾ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ശ്രദ്ധയോടെ തുടരുക"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"കൂടുതൽ പ്രവർത്തനങ്ങൾ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ഓഫാണ്}=1{ഓഫാണ് / ഒരു മോഡിന് സ്വയമേവ ഓണാകാനാകും}other{ഓഫാണ് / # മോഡുകൾക്ക് സ്വയമേവ ഓണാകാനാകും}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ഡിസ്പ്ലേ ക്രമീകരണം"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ഡിസ്പ്ലേ ഓപ്ഷനുകൾ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ഗ്രേസ്കെയിൽ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ഡാർക്ക് തീം പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ഇരുണ്ട പശ്ചാത്തലത്തിലെ ലൈറ്റ് ടെക്സ്റ്റിന് മുൻഗണന നൽകാൻ OS-ഉം ആപ്പുകളും തമ്മിൽ മാറുക, ഇത് കണ്ണുകൾക്ക് അനുയോജ്യമായേക്കാം, ചില ഉപകരണങ്ങളിൽ കാര്യമായ തോതിൽ ബാറ്ററി ലാഭിക്കാനും സഹായിച്ചേക്കാം"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"തടസ്സങ്ങൾ ഫിൽട്ടർ ചെയ്യുക"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"തടസ്സങ്ങളൊന്നും ഫിൽട്ടർ ചെയ്തിട്ടില്ല"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"അറിയിപ്പ് തുറക്കുക"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"അറിയിപ്പ് സ്നൂസ് ചെയ്യൽ അനുവദിക്കുക"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ആപ്പ് ഐക്കണിലെ അറിയിപ്പ് ഡോട്ട്"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"അറിയിപ്പ് ബണ്ടിലുകൾ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ബബിളുകൾ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ബബിളുകൾ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ഈ സംഭാഷണം ബബിൾ ചെയ്യുക"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"മെച്ചപ്പെടുത്തിയ ക്രമീകരണത്തെ ഈ ആപ്പ് പിന്തുണയ്ക്കുന്നില്ല"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"കൂടുതൽ ക്രമീകരണം"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ഈ ആപ്പിനുള്ളിൽ കൂടുതൽ ക്രമീകരണം ലഭ്യമാണ്"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"അറിയിപ്പിന്റെ കൂൾഡൗൺ"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ഔദ്യോഗിക പ്രൊഫൈലുകളിൽ ബാധകമാക്കുക"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ഔദ്യോഗിക പ്രൊഫൈൽ ആപ്പുകൾക്ക് ബാധകമാക്കുക"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"വിഭാഗങ്ങള്"</string>
<string name="notification_channels_other" msgid="18159805343647908">"മറ്റുള്ളവ"</string>
<string name="no_channels" msgid="4716199078612071915">"ഈ ആപ്പ് അറിയിപ്പുകളൊന്നും പോസ്റ്റ് ചെയ്തിട്ടില്ല"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ഉപയോഗിക്കാത്ത വിഭാഗങ്ങൾ കാണിക്കൂ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ആപ്പിലെ അധിക ക്രമീകരണം"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ഉപയോഗിക്കാത്ത വിഭാഗങ്ങൾ കാണിക്കൂ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ഉപയോഗിക്കാത്ത വിഭാഗങ്ങൾ മറയ്ക്കൂ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"തടസ്സപ്പെടുത്താൻ കഴിയുന്ന ആപ്പുകൾ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"തിരഞ്ഞെടുത്ത ആപ്പുകൾ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ഒന്നുമില്ല"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"എല്ലാം"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"അസാധുവാക്കാൻ ആപ്പുകളെ അനുവദിക്കുക"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"തടസ്സപ്പെടുത്താൻ കഴിയുന്ന ആപ്പുകൾ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"കൂടുതൽ ആപ്പുകൾ തിരഞ്ഞെടുക്കുക"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ഒരാൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"ചില ആളുകൾക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"എല്ലാ ആളുകൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ആവർത്തിച്ച് വിളിക്കുന്നവർ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ആവർത്തിച്ച് വിളിക്കുന്നവരെ അനുവദിക്കുക"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} വരെ ഒരു മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക}other{{time} വരെ # മണിക്കൂർ നേരത്തേക്ക് \'അലാറങ്ങൾ മാത്രം\' എന്നതിലേക്ക് മാറ്റുക}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> വരെ മാത്രം അലാറങ്ങളിലേക്ക് മാറ്റുക"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"\'എല്ലായ്പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"എഡിറ്റ് മോഡ്"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"മോഡ് ചേർക്കുക"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ഇഷ്ടാനുസൃത മോഡ്"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"മോഡിന്റെ പേര്"</string>
<string name="warning_button_text" msgid="1274234338874005639">"മുന്നറിയിപ്പ്"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"അടയ്ക്കുക"</string>
<string name="device_feedback" msgid="5351614458411688608">"ഇതേക്കുറിച്ചുള്ള ഫീഡ്ബാക്ക് അയയ്ക്കൂ"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ഡെസ്ക്ടോപ്പ് മോഡിലേക്ക് നിർബന്ധിച്ച് വരുത്തുക"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ദ്വിതീയ ഡിസ്പ്ലേകളിൽ, പരീക്ഷണാത്മക ഡെസ്ക്ടോപ്പ് മോഡിലേക്ക് നിർബന്ധിച്ച് വരുത്തുക"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ഫ്രീഫോം വിൻഡോകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ഫ്രീഫോം വിൻഡോകൾക്കുള്ള പിന്തുണ പ്രവർത്തനക്ഷമമാക്കുക."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"സെക്കൻഡ് ഡിസ്പ്ലേയിൽ ഫ്രീഫോം വിൻഡോയിംഗ് സജീവമാക്കൂ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"സെക്കൻഡറി ഡിസ്പ്ലേയിൽ മാത്രം ഫ്രീഫോം വിൻഡോകൾ പ്രവർത്തനക്ഷമമാക്കൂ."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"വലുപ്പം മാറ്റാനാകാത്തവ മൾട്ടി വിൻഡോയിൽ പ്രവർത്തനക്ഷമമാക്കൂ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"വലുപ്പം മാറ്റാൻ കഴിയാത്ത ആപ്പുകൾ മൾട്ടി വിൻഡോയിൽ അനുവദിക്കുന്നു"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"നിർബന്ധിത ഡാർക്ക് മോഡ് അസാധുവാക്കുക"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB ഡെവലപ്പർ ഓപ്ഷൻ ഉപയോഗിക്കുന്നതിന് മുമ്പ് ഈ ഉപകരണത്തിന്റെ ഡാറ്റ പാർട്ടീഷൻ ext4 എന്നതിലേക്ക് പരിവർത്തനം ചെയ്യേണ്ടതുണ്ട്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. 16KB ഓപ്ഷൻ സജീവമാക്കുന്നതിന് ഇതിന് ശേഷം ഒരു റീബൂട്ട് കൂടി വേണ്ടി വരും. നിങ്ങൾ ഈ മോഡിൽ ആയിക്കഴിഞ്ഞ്, ഒരു സിംഗിൾ റീബൂട്ടിലൂടെ 4KB, 16KB മോഡുകൾക്കിടയിൽ പരസ്പരം മാറാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. ഉപകരണത്തെ തിരികെ പ്രൊഡക്ഷൻ മോഡിലേക്ക് മാറ്റുന്നതിന്, നിങ്ങൾ 4KB മോഡിലേക്ക് തിരികെ മാറുകയും ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം, ഇത് ഉപകരണത്തെ ഫാക്ടറി റീസെറ്റ് ചെയ്യും. ഉപകരണം വിജയകരമായി Android-ലേക്ക് ബൂട്ട് ചെയ്ത് കഴിഞ്ഞ്, ഡെവലപ്പർ ഓപ്ഷനുകളിൽ OEM അൺലോക്ക് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക. സ്ഥിരീകരണത്തിന് ശേഷം ഉപകരണം തുടച്ചുനീക്കുകയും ഫയൽസിസ്റ്റം ext4 എന്നതിലേക്ക് മാറ്റുകയും ചെയ്യും. ഇത് പൂർത്തിയായി കഴിഞ്ഞ്, 16KB വീണ്ടും പ്രവർത്തനക്ഷമമാക്കാൻ തിരികെ വരിക."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ഡാറ്റ പാർട്ടീഷൻ ext4 എന്നതിലേക്ക് വീണ്ടും ഫോർമാറ്റ് ചെയ്യാനും തുടച്ചുനീക്കാനും കഴിഞ്ഞില്ല."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB മോഡിന് ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്യണം"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ബൂട്ട് ലോഡർ അൺലോക്ക് ആവശ്യമാണ്"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16KB ഡെവലപ്പർ ഓപ്ഷൻ ഉപയോഗിക്കുന്നതിന് മുമ്പ് ഈ ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്യണം. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. 16KB മോഡ് സജീവമാക്കുമ്പോൾ എല്ലാ ഉപയോക്തൃ ഡാറ്റയും ക്രമീകരണവും തുടച്ചുനീക്കും. ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്ത് കഴിഞ്ഞ്, 16KB ഓപ്ഷൻ സജീവമാക്കുന്നതിന് രണ്ട് റീബൂട്ടുകൾ വേണ്ടി വരും. നിങ്ങൾ ഈ മോഡിൽ ആയിക്കഴിഞ്ഞ്, ഒരു സിംഗിൾ റീബൂട്ടിലൂടെ 4KB, 16KB മോഡുകൾക്കിടയിൽ പരസ്പരം മാറാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. ഉപകരണത്തെ തിരികെ പ്രൊഡക്ഷൻ മോഡിലേക്ക് മാറ്റുന്നതിന്, നിങ്ങൾ 4KB മോഡിലേക്ക് തിരികെ മാറുകയും OEM/ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം (ഇത് ഉപകരണത്തെ ഫാക്ടറി റീസെറ്റ് ചെയ്യും). ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്യുക അമർത്തിയ ശേഷം വീണ്ടും ശ്രമിക്കുക. ഇത് എങ്ങനെ ചെയ്യണമെന്നത് സംബന്ധിച്ച നിർദ്ദേശങ്ങൾ at <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> എന്നതിൽ കാണാനാകും"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB പേജ്-ആഗ്നോസ്റ്റിക് മോഡ് ഉപയോഗിക്കുന്നു"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"നിങ്ങൾ പേജ്-ആഗ്നോസ്റ്റിക് മോഡിന്റെ 4KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യണം. കൂടുതൽ വായിക്കാൻ ടാപ്പ് ചെയ്യുക."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"നിങ്ങൾ പേജ്-ആഗ്നോസ്റ്റിക് മോഡിന്റെ 4KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യണം. ഇത് ഉപകരണത്തെ വീണ്ടും ഫാക്ടറി റീസെറ്റ് ചെയ്യുകയും പ്രൊഡക്ഷൻ ക്രമീകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കുകയും ചെയ്യും. ഉപകരണം വിജയകരമായി Android-ലേക്ക് ബൂട്ട് ചെയ്ത് കഴിഞ്ഞ്, ഡെവലപ്പർ ഓപ്ഷനുകളിൽ OEM അൺലോക്ക് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക. ഉപകരണം Android-ലേക്ക് ബൂട്ട് ചെയ്യാനായില്ലെങ്കിലോ അസ്ഥിരമാണെങ്കിലോ, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> എന്നതിൽ നിന്നുള്ള ഏറ്റവും പുതിയ ഫാക്ടറി ചിത്രങ്ങൾ ഉപയോഗിച്ച് ഉപകരണം അപ്ഡേറ്റ് ചെയ്ത ശേഷം \'ഉപകരണം തുടച്ചുനീക്കുക\', \'ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുക\', \'എല്ലാ പാർട്ടീഷനുകളും ഫോഴ്സ് ഫ്ലാഷ് ചെയ്യുക\' എന്നതിലേക്ക് പോകുക."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB പേജ്-ആഗ്നോസ്റ്റിക് മോഡ് ഉപയോഗിക്കുന്നു"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"നിങ്ങൾ പേജ്-ആഗ്നോസ്റ്റിക് മോഡിന്റെ 16KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ 4K മോഡിലേക്ക് തിരികെ മാറുകയും ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം. കൂടുതൽ വായിക്കാൻ ടാപ്പ് ചെയ്യുക."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"നിങ്ങൾ പേജ്-ആഗ്നോസ്റ്റിക് മോഡിന്റെ 16KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ 4K മോഡിലേക്ക് തിരികെ മാറുകയും ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം. ഇത് ഉപകരണത്തെ വീണ്ടും ഫാക്ടറി റീസെറ്റ് ചെയ്യുകയും പ്രൊഡക്ഷൻ ക്രമീകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കുകയും ചെയ്യും. ഉപകരണം വിജയകരമായി Android-ലേക്ക് ബൂട്ട് ചെയ്ത് കഴിഞ്ഞ്, ഡെവലപ്പർ ഓപ്ഷനുകളിൽ OEM അൺലോക്ക് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക. ഉപകരണം Android-ലേക്ക് ബൂട്ട് ചെയ്യാനായില്ലെങ്കിലോ അസ്ഥിരമാണെങ്കിലോ, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> എന്നതിൽ നിന്നുള്ള ഏറ്റവും പുതിയ ഫാക്ടറി ചിത്രങ്ങൾ ഉപയോഗിച്ച് ഉപകരണം അപ്ഡേറ്റ് ചെയ്ത ശേഷം \'ഉപകരണം തുടച്ചുനീക്കുക\', \'ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുക\', \'എല്ലാ പാർട്ടീഷനുകളും ഫോഴ്സ് ഫ്ലാഷ് ചെയ്യുക\' എന്നതിലേക്ക് പോകുക."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"നിങ്ങൾ പേജ് വലുപ്പം തിരിച്ചറിയൽ മോഡിന്റെ 16KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ 4KB മോഡിലേക്ക് തിരികെ മാറുകയും ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം. കൂടുതൽ വായിക്കാൻ ടാപ്പ് ചെയ്യുക."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"നിങ്ങൾ പേജ് വലുപ്പം തിരിച്ചറിയൽ മോഡിന്റെ 16KB മോഡിലാണ്. ഈ മോഡിൽ സോഫ്റ്റ്വെയർ സമഗ്രത സംബന്ധിച്ച് ഉറപ്പ് നൽകാനാകില്ല, കൂടാതെ ബൂട്ട് ലോഡർ അൺലോക്ക് ചെയ്തിരിക്കുമ്പോൾ ഫോണിൽ സംഭരിച്ചിരിക്കുന്ന ഏതെങ്കിലും ഡാറ്റ അപകടത്തിലായേക്കാം. ഈ മോഡുകളിൽ ചില ഫീച്ചറുകൾ പ്രവർത്തനരഹിതമാക്കുന്നതിനാൽ, ചില ആപ്പുകൾ പ്രവർത്തിച്ചേക്കില്ല. പ്രൊഡക്ഷൻ മോഡിൽ തിരികെ പ്രവേശിക്കുന്നതിന്, നിങ്ങൾ 4KB മോഡിലേക്ക് തിരികെ മാറുകയും ഉപകരണത്തിന്റെ ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുകയും വേണം. ഇത് ഉപകരണത്തെ വീണ്ടും ഫാക്ടറി റീസെറ്റ് ചെയ്യുകയും പ്രൊഡക്ഷൻ ക്രമീകരണത്തിലേക്ക് പുനഃസ്ഥാപിക്കുകയും ചെയ്യും. ഉപകരണം വിജയകരമായി Android-ലേക്ക് ബൂട്ട് ചെയ്ത് കഴിഞ്ഞ്, ഡെവലപ്പർ ഓപ്ഷനുകളിൽ OEM അൺലോക്ക് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക. ഉപകരണം Android-ലേക്ക് ബൂട്ട് ചെയ്യാനായില്ലെങ്കിലോ അസ്ഥിരമാണെങ്കിലോ, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> -ൽ നിന്നുള്ള ഏറ്റവും പുതിയ ഫാക്ടറി ഇമേജുകൾ ഉപയോഗിച്ച് ഉപകരണം വീണ്ടും ഫ്ലാഷ് ചെയ്യുക അല്ലെങ്കിൽ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ഉപയോഗിക്കുക, തുടർന്ന് \'ഉപകരണം തുടച്ചുനീക്കുക\', \'ബൂട്ട് ലോഡർ ലോക്ക് ചെയ്യുക\', \'എല്ലാ പാർട്ടീഷനുകളും ഫോഴ്സ് ഫ്ലാഷ് ചെയ്യുക\' എന്നിവ തിരഞ്ഞെടുക്കുക."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB പേജ്-ആഗ്നോസ്റ്റിക് മോഡ്"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"കൂടുതൽ വായിക്കുക"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"ബഗ് റിപ്പോർട്ട് ഹാൻഡ്ലർ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കുക"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ഡെവലപ്പർ ഓപ്ഷനുകൾ ഉപയോഗിക്കുക"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"പ്രിന്റ് സേവനം ഉപയോഗിക്കുക"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"ഒന്നിലധികം ഉപയോക്താക്കളെ അനുവദിക്കുക"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ഉപയോക്താവിനെ മാറാൻ അനുവദിക്കുക"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"അനുവദിക്കുക, ഒന്നിലധികം, ഉപയോക്താവ്, അനുവാദം, നിരവധി"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ഒന്നിലധികം, ഉപയോക്താക്കൾ, പ്രൊഫൈലുകൾ, ആളുകൾ, അക്കൗണ്ടുകൾ, മാറുക, നിരവധി"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"വയർലസ് ഡീബഗ്ഗിംഗ് ഉപയോഗിക്കുക"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"നിങ്ങളുടെ ടാബ്ലെറ്റ് ഡോക്ക് ചെയ്തിരിക്കുമ്പോൾ സ്ക്രീനിൽ എന്ത് കാണണമെന്ന് തിരഞ്ഞെടുക്കുക. സ്ക്രീൻ സേവർ ഉപയോഗിക്കുമ്പോൾ ഉപകരണം കൂടുതൽ ഊർജ്ജം ഉപയോഗിച്ചേക്കാം."</string>
<string name="customize_button_title" msgid="1110284655990203359">"ഇഷ്ടാനുസൃതമാക്കുക"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ഇഷ്ടാനുസൃതമാക്കുക"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ഫ്രീംഫോം പിന്തുണ പ്രവർത്തനക്ഷമമാക്കാൻ റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ദ്വിതീയ ഡിസ്പ്ലേകളെ നിർബന്ധിതമായി ഡെസ്ക്ക്ടോപ്പ് മോഡിലാക്കാൻ റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ലെഗസി ഫ്രീഫോം വിൻഡോയിംഗ് പിന്തുണ പ്രവർത്തനക്ഷമമാക്കാൻ റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ഫ്രീഫോം വിൻഡോയിംഗ് പിന്തുണ മാറ്റാൻ റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"സെക്കൻഡറി ഡിസ്പ്ലേകളിൽ ഫ്രീഫോം വിൻഡോയിംഗ് നിർബന്ധമാക്കാൻ റീബൂട്ട് ചെയ്യേണ്ടതുണ്ട്."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ഇപ്പോൾ റീബൂട്ട് ചെയ്യുക"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"പിന്നീട് റീബൂട്ട് ചെയ്യുക"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"സ്പേഷ്യൽ ഓഡിയോ"</string>
@@ -5137,7 +5185,7 @@
<string name="bluetooth_details_audio_device_type_unknown" msgid="5299284975435974206">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
<string name="bluetooth_details_audio_device_type_speaker" msgid="3706227767994792124">"സ്പീക്കർ"</string>
<string name="bluetooth_details_audio_device_type_headphones" msgid="7644588291215033798">"ഹെഡ്ഫോണുകൾ"</string>
- <string name="bluetooth_details_audio_device_type_hearing_aid" msgid="6311786545025321187">"കേൾവിക്കുള്ള ഉപകരണം"</string>
+ <string name="bluetooth_details_audio_device_type_hearing_aid" msgid="6311786545025321187">"ഹിയറിംഗ് ഡിവൈസ്"</string>
<string name="bluetooth_details_audio_device_type_carkit" msgid="1866236563013629394">"കാർ"</string>
<string name="bluetooth_details_audio_device_type_other" msgid="7019481234617207563">"മറ്റുള്ളവ"</string>
<string name="ingress_rate_limit_title" msgid="2106694002836274350">"നെറ്റ്വർക്ക് ഡൗൺലോഡ് നിരക്ക് പരിധി"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ഓണാണ്"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ഓഫാണ്"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ഓണാണ്"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ഇടതുവശത്തെ ഓഡിയോ %1$d%%, വലതുവശം %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"വലതുവശത്തെ ഓഡിയോ %1$d%%, ഇടതുവശം %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"നിങ്ങൾ ഇൻസ്റ്റാൾ ചെയ്ത ആപ്പുകൾക്ക് നിങ്ങളുടെ ഉപകരണത്തിന്റെ പേര് ദൃശ്യമാണ്. Bluetooth ഉപകരണങ്ങളിലേക്കോ വൈഫൈ നെറ്റ്വർക്കിലേക്കോ കണക്റ്റ് ചെയ്യുമ്പോഴോ ഒരു വൈഫൈ ഹോട്ട്സ്പോട്ട് സജ്ജീകരിക്കുമ്പോഴോ ഇത് മറ്റ് ആളുകൾക്കും കാണാനായേക്കും."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"വ്യാകരണ ലിംഗഭേദം"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"വ്യാകരണ ലിംഗഭേദം തിരഞ്ഞെടുക്കുക"</string>
@@ -5259,7 +5309,7 @@
<string name="fingerprint_acquired_imager_dirty_udfps" msgid="7005042288289506776">"സെൻസറിന് സമീപമുള്ള സ്ക്രീൻ വൃത്തിയാക്കി വീണ്ടും ശ്രമിക്കുക"</string>
<string name="sim_category_converted_sim" msgid="8575548015816988908">"ഇ-സിമ്മിലേക്ക് മാറ്റി. നീക്കം ചെയ്യൂ, ഉപേക്ഷിക്കൂ."</string>
<string name="sync_across_devices_title" msgid="3447757705383089345">"ഉപകരണങ്ങളിലുടനീളം സമന്വയിപ്പിക്കുക"</string>
- <string name="device_diagnostics_title" msgid="2914523189695727897">"Device diagnostics"</string>
+ <string name="device_diagnostics_title" msgid="2914523189695727897">"ഉപകരണ ഡയഗ്നോസ്റ്റിക്സ്"</string>
<string name="audio_sharing_title" msgid="4144157137502923821">"ഓഡിയോ പങ്കിടൽ"</string>
<string name="audio_sharing_switch_title" msgid="7052827328670825701">"ഓഡിയോ പങ്കിടൂ"</string>
<string name="calls_and_alarms_device_title" msgid="6993559028175454198">"കോളുകളും അലാറങ്ങളും"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"തിരയൽ ക്രമീകരണം"</string>
</resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index c9e210c..c436c5a 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Унтлагын цаг"</item>
+ <item msgid="4152450357280759894">"Жолоо барих"</item>
+ <item msgid="7096549258219399423">"Бодит мэт"</item>
+ <item msgid="2760716776980432977">"Удирддаг"</item>
+ <item msgid="601734478369121764">"Од"</item>
+ <item msgid="6243809315432780521">"Календарь"</item>
+ <item msgid="4913577903148415331">"Хугацаа"</item>
+ <item msgid="3653377604690057780">"Театр"</item>
+ <item msgid="3843711267408385410">"Цэцэг"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 1ff8750..4777811 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Төхөөрөмжийг салгах уу?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Шинэ төхөөрөмж хослуулах"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Маргааш автоматаар асаах"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Сонсголын төхөөрөмжийн тохиргоо"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Товчлол, сонсголын төхөөрөмжийн зохицол"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Урьдчилсан тохируулга"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Сонсгол судлаачийн программчилсан урьдчилсан тохируулга алга"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Урьдчилсан тохируулгыг шинэчилж чадсангүй"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио гаралт"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Аудио оролтын тухай"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Унтраалттай"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Асаалттай / # апп байршилд хандах эрхтэй}other{Асаалттай / # апп байршилд хандах эрхтэй}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Ачаалж байна…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Ойролцоох төхөөрөмжүүдийн зөвшөөрөлтэй аппууд холбогдсон төхөөрөмжүүдийн харгалзах байрлалыг тодорхойлох боломжтой."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Ойролцоох төхөөрөмжийн зөвшөөрөлтэй аппууд холбогдсон төхөөрөмжийн харгалзах байрлалыг тодорхойлох боломжтой."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Аппууд болон үйлчилгээнүүдэд байршлын хандалт унтраалттай байна. Таныг яаралтай тусламжийн утасны дугаар луу залгах эсвэл мессеж бичих үед таны төхөөрөмжийн байршлыг яаралтай тусламжийн үйлчилгээ үзүүлэгчид рүү илгээсэн хэвээр байж магадгүй."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Байршлын тохиргооны талаар нэмэлт мэдээлэл авах"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Өөрчлөхийн тулд ChromeOS-н Тохиргоо > Нууцлал, аюулгүй байдал > Нууцлалын тохиргоо > Байршлын хандалт руу очно уу"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Царай болон <xliff:g id="WATCH">%s</xliff:g>-г нэмсэн"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Царай, хурууны хээ болон <xliff:g id="WATCH">%s</xliff:g>-г нэмсэн"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Царай, хурууны хээ болон <xliff:g id="WATCH">%s</xliff:g>-г нэмсэн"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Таниулбар шалгагч асаалттай тул энэ нь шаардлагатай"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator-н түгжээг тайлах"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Цаг нэмсэн"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Цагаа тохируулна уу"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Утасны түгжээг цагаараа тайлах онцлогийн талаар нэмэлт мэдээлэл авах"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Цаг нэмэх"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Цагийг хасах"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Хурууны хээ болон Царайгаар түгжээ тайлах"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Царай, хурууны хээгээр түгжээ тайлах"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ажилд зориулсан Царай, хурууны хээгээр түгжээ тайлах"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Тохируулга шаардлагатай"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Царай болон хурууны хээнүүд нэмсэн"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Аппуудыг суулгах"</b>\n"Та орон зайдаа хувийн байлгахыг хүсэж буй аппуудаа суулгана уу"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Санамж"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Таныг орон зайгаа түгжихэд аппууд зогсдог"</b>\n"Таныг орон зайгаа түгжихэд таны орон зай дахь аппууд зогсох бөгөөд та тухайн аппуудаас мэдэгдэл хүлээн авахгүй"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Хаалттай орон зай нь эрүүл мэндийн апп зэрэг ард ажиллах эсвэл чухал мэдэгдэл илгээх шаардлагатай аппуудад тохиромжгүй. Энэ нь таны орон зайг түгжээтэй үед мэдэгдэл болон арын үйл ажиллагаа зогсдогтой холбоотой юм.\n\nТаны хаалттай орон зай түгжээтэй үед таны хаалттай орон зай дахь аппууд зөвшөөрлийн менежер, нууцлалын хяналтын самбар болон бусад тохиргоонд гарч ирэхгүй.\n\nТаны хаалттай орон зайг шинэ төхөөрөмж рүү зөөх боломжгүй. Хэрэв та үүнийг өөр төхөөрөмжид ашиглахыг хүсвэл өөр хаалттай орон зай тохируулах шаардлагатай болно.\n\nТаны төхөөрөмжийг компьютерт холбох эсвэл таны төхөөрөмжид хортой апп суулгах аливаа хүн таны хаалттай орон зайд хандах боломжтой байж магадгүй."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Хаалттай орон зай нь эрүүл мэндийн апп зэрэг ард ажиллах эсвэл чухал мэдэгдэл илгээх шаардлагатай аппуудад тохиромжгүй. Энэ нь таны орон зай түгжээтэй үед мэдэгдэл болон арын үйл ажиллагаа зогсдогтой холбоотой юм.\n\nХаалттай орон зай түгжээтэй үед таны хаалттай орон зай дахь аппууд зөвшөөрлийн менежер, нууцлалын хяналтын самбар болон бусад тохиргоонд гарч ирэхгүй.\n\nТаны хаалттай орон зайг шинэ төхөөрөмж рүү сэргээх боломжгүй. Хэрэв та үүнийг өөр төхөөрөмжид ашиглахыг хүсвэл өөр орон зай тохируулах шаардлагатай болно.\n\nТаны төхөөрөмжийг компьютерт холбох эсвэл таны төхөөрөмжид хортой апп суулгах аливаа хүн таны хаалттай орон зайд хандах боломжтой байж магадгүй."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Хаалттай орон зайн нэмэлт мэдээлэл авах"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Үүнд хэдэн хором зарцуулна"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Хаалттай орон зайг тохируулж байна…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Нарийвчилсан NFC лог нь зөвхөн хөгжүүлэлтийн зориулалттай. Нэмэлт NFC өгөгдлийг алдааны мэдээнд багтаасан бөгөөд энэ нь хувийн мэдээлэл агуулж байж магадгүй. Энэ тохиргоог өөрчлөхийн тулд төхөөрөмжөө дахин эхлүүлнэ үү."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Дахин эхлүүлэх"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"тусгал үүсгэх, гаднын дэлгэц, холбогдсон дэлгэц, usb дэлгэц, нягтрал, эргүүлэлт"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Эргүүлэлт"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандарт"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Дэлгэцийн гэрэлтүүлэг таны хүрээлэн буй орчин болон үйл ажиллагаанд автоматаар тохирно. Орчинтой зохицох гэрэлтүүлгийн таны тохиргоог мэдэхэд нь туслахын тулд гулсуулагчийг гараараа зөөх боломжтой."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Дэлгэцийн цайралтын тэнцвэр"</string>
@@ -1260,7 +1275,7 @@
<string name="dark_ui_bedtime_footer_action" msgid="1493095487994054339">"Унтлагын цагийн горимын тохиргоо"</string>
<string name="even_dimmer_display_title" msgid="6731255736830410149">"Илүү бүдэг"</string>
<string name="even_dimmer_display_summary" msgid="120301078873242172">"Төхөөрөмжид ердийнхөөс илүү бүдэг болохыг нь зөвшөөрөх"</string>
- <string name="screen_timeout" msgid="7709947617767439410">"Дэлгэцийн завсарлага"</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>
<string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"Тохируулаагүй"</string>
<string name="wallpaper_settings_title" msgid="5635129851136006383">"Дэлгэцийн зураг"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Дэлгэц дээрх гарыг ашиглах"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Биет гар идэвхтэй үед үүнийг дэлгэцэд харуулна уу"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Заагчийг дүүргэх загварыг шар болго"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Заагчийг дүүргэх загварыг ягаан болго"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Заагчийг дүүргэх загварыг цэнхэр болго"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Заагчийн зурлагын загвар"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Цагаан"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Хар"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Байхгүй"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Хэрэглэгчийн сонгосон: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Яриа"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Заагчийн хурд"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Заагчийн хэмжээ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Заагчийн хэмжээг багасгах"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Заагчийн хэмжээг өсгөх"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Тоглоом Контроллер"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Чичиргээг дахин чиглүүлэх"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Холбогдсон үедээ тоглоомын хянагчид чичиргээ илгээнэ үү"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Ямартай ч үргэлжлүүлэх"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Цуцлах"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Томруулах тохиргоо"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Нэг хуруугаар чиглүүлэх"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Томруулагчийг 1 хуруугаараа зөөх"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Дэлгэцийн эргэн тойронд шилжихийн тулд 1 хуруугаараа чир"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Нэг хуруугаар чирч, томруулах хэсгийг зөөнө үү."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Хоёр хуруугаар чирч, томруулах хэсгийг зөөнө үү."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Дэлгэцийн зөвхөн нэг хэсгийг томруулж байхад боломжгүй"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Томруулахын тулд товчлуурыг товшино уу"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Контентыг илүү том болгохын тулд дэлгэц дээр шуурхай томруулна уу"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Томруулахын тулд:</b><br/> {0,number,integer}. Томруулах онцлогийг эхлүүлэхийн тулд товчлол ашиглана уу<br/> {1,number,integer}. Дэлгэцийг товшино уу<br/> {2,number,integer}. Дэлгэцийн эргэн тойронд шилжихийн тулд 2 хуруугаа чирнэ үү<br/> {3,number,integer}. Томруулалтыг тохируулахын тулд 2 хуруугаараа чимхэнэ үү<br/> {4,number,integer}. Томруулах онцлогийг зогсоохын тулд товчлол ашиглана уу<br/><br/> <b>Түр хугацаанд томруулахын тулд:</b><br/> {0,number,integer}. Таны томруулах төрлийг бүтэн дэлгэц болгож тохируулсан эсэхийг шалгана уу<br/> {1,number,integer}. Томруулах онцлогийг эхлүүлэхийн тулд товчлол ашиглана уу<br/> {2,number,integer}. Дэлгэцийн аль нэг хэсгийг удаан дарна уу<br/> {3,number,integer}. Дэлгэцийн эргэн тойронд шилжихийн тулд хуруугаа чирнэ үү<br/> {4,number,integer}. Томруулах онцлогийг зогсоохын тулд хуруугаа хөндийрүүлнэ үү"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Томруулахын тулд:</b><br/> {0,number,integer}. Томруулж эхлэхийн тулд товчлол ашиглана уу<br/> {1,number,integer}. Дэлгэц дээр товшино уу<br/> {2,number,integer}. Дэлгэцийн эргэн тойронд шилжихийн тулд 2 хуруугаараа чирнэ үү<br/> {3,number,integer}. Томруулах хэмжээг тохируулахын тулд 2 хуруугаараа чимхэнэ үү<br/> {4,number,integer}. Томруулахыг зогсоохын тулд товчлолыг ашиглана уу<br/><br/> Та мөн түр зуур томруулах болон бусад зүйлийг хийх боломжтой."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Томруулахын тулд:</b><br/> {0,number,integer}. Томруулж эхлэхийн тулд товчлол ашиглана уу<br/> {1,number,integer}. Дэлгэц дээр товшино уу<br/> {2,number,integer}. Дэлгэцийн эргэн тойронд шилжихийн тулд 1 эсвэл 2 хуруугаараа чирнэ үү<br/> {3,number,integer}. Томруулах хэмжээг тохируулахын тулд 2 хуруугаараа чимхэнэ үү<br/> {4,number,integer}. Томруулахыг зогсоохын тулд товчлолыг ашиглана уу<br/><br/> Та мөн түр зуур томруулах болон бусад зүйлийг хийх боломжтой."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Томруулах сонголт асаалттай үед та дэлгэцээ томруулж болно.\n\n"<b>"Томруулахын тулд "</b>" томруулах сонголтыг эхлүүлж, дэлгэцийн аль нэг хэсгийг товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл түүнээс дээш хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл түүнээс дээш хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд "</b>" томруулах сонголтыг эхлүүлээд, дэлгэцийн аль нэг хэсэг дээр удаан дарна уу.\n"<ul><li>"Дэлгэцийн эргэн тойронд очихын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа авна уу"</li></ul>\n\n"Та гар эсвэл навигацын самбарт томруулах боломжгүй."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>-н <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>-р хуудас"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Хандалтын товчлуурын товчлол"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Байхгүй}=1{1 хуваарийг тохируулсан}other{# хуваарийг тохируулсан}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Бүү саад бол"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Чухал байдлаар нь ангилах горим"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Горим нэмэх"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Зөвхөн чухал хүмүүс болон аппуудаас мэдэгдэл авах"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Идэвхжүүлэлтийн төрлийг сонгох"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Хугацаа"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Ж.нь \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календарь"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Ж.нь \"Хувийн календарь\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Горим үүсгэх"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Захиалгат"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Саад болох зүйлсийг хязгаарлах"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Бүү саад бол горимыг асаах"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Сэрүүлэг болон медиагийн ая нь тасалдуулах боломжтой"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Хуваарь"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Хуваарийг устгах"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Устгах"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Нэр өөрчлөх"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Устгах"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" горимыг устгах уу?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Засах"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Хуваарь"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Хуваарь"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Календарь нэмээрэй"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Календариа ашиглаарай"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Хуваарь"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Хуваарь тохируулах"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Хуваарь"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> цаг, <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Автоматаар асаах"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Хуваарь"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Утасны дууг тодорхой цагт хаах"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Бүү саад бол горимын дүрмийг тохируулах"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Дуу гаргадаг саад болох зүйлсийг зөвшөөрөх"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Харааны саадыг блоклох"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Харагдаж буй дохиог зөвшөөрөх"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Танд хүрэх боломжтой мэдэгдэл"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Төвлөрсөөр байгаарай"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Нэмэлт үйлдлүүд"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Унтраалттай}=1{Унтраалттай / 1 горимыг автоматаар асааж болно}other{Унтраалттай / # горимыг автоматаар асааж болно}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Дэлгэцийн тохиргоо"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Дэлгэцийн сонголтууд"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Саарал өнгө"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"бараан загварыг идэвхжүүлэх"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"OS, аппуудыг бараан дэвсгэр дээрх цайвар текстийг илүүд үзэх болгож сэлгэнэ үү. Энэ нь нүдэнд амар байж болох бөгөөд зарим төхөөрөмж дээр батарей ихээр хэмнэдэг"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"Тасалдлуудыг шүүх"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ямар ч тасалдлыг шүүгээгүй"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"мэдэгдлийг нээх"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Мэдэгдлийг түр хойшлуулахыг зөвшөөрөх"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Аппын дүрс тэмдэг дэх мэдэгдлийн цэг"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Мэдэгдлийн багц"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Бөмбөлгүүд"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Бөмбөлгүүд"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Энэ харилцан яриаг бөмбөлөг болгох"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Энэ апп нь сайжруулсан тохиргоог дэмждэггүй"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Бусад тохиргоо"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Энэ аппад бусад тохиргоо боломжтой"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Мэдэгдлийн хөргөлт"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Ажлын профайлуудад хэрэгжүүлэх"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Ажлын профайлын аппуудад ашиглах"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Ангилал"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Бусад"</string>
<string name="no_channels" msgid="4716199078612071915">"Энэ апп ямар ч мэдэгдэл нийтлээгүй"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Ашиглаагүй ангиллуудыг харуулах"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Аппын нэмэлт тохиргоо"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Ашиглаагүй ангиллуудыг харуулах"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ашиглаагүй ангиллуудыг нуух"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Тасалдуулах боломжтой аппууд"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Сонгосон аппууд"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Байхгүй"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Бүгд"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Аппуудад дарахыг нь зөвшөөрөх"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Тасалдуулах боломжтой аппууд"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Бусад аппыг сонгох"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Юу ч тасалдуулах боломжгүй"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Хэн ч тасалдуулах боломжгүй"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Зарим хүн тасалдуулах боломжтой"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Бүх хүн тасалдуулах боломжтой"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Давтан дуудлага хийгч"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Давтан дуудлага хийгчийг зөвшөөрөх"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} хүртэл зөвхөн нэг цагийн турш сэрүүлэг болгож өөрчилнө}other{{time} хүртэл зөвхөн # цагийн турш сэрүүлэг болгож өөрчилнө}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> хүртэл анхааруулах горимд шилжих"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Үргэлж саад бол горимд шилжих"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Засах горим"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Нэмэх горим"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Захиалгат горим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Горимын нэр"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Сануулга"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Хаах"</string>
<string name="device_feedback" msgid="5351614458411688608">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Дэлгэцийн горимыг хүчлэх"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Дэлгэцийн туршилтын горимыг хоёрдогч дэлгэцэд хүчлэх"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Чөлөөт хэлбэрийн цонхыг идэвхжүүлэх"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Чөлөөт хэлбэрийн цонхны дэмжлэгийг идэвхжүүлнэ үү."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Хоёрдогч дэлгэцэд чөлөөт хэлбэрийн цонхыг асаа"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Зөвхөн хоёрдогч дэлгэц дээр чөлөөт хэлбэрийн цонхыг идэвхжүүлнэ үү."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Хэмжээг өөрчлөх боломжгүй аппуудыг олон цонхонд идэвхжүүлэх"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Хэмжээг нь өөрчлөх боломжгүй аппуудыг олон цонхонд байхыг нь зөвшөөрнө"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Хүчээр бүдгэрүүлэхийг дарах"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 КБ-ын хөгжүүлэгчийн тохиргоог ашиглаж эхлэхийн өмнө энэ төхөөрөмжийн өгөгдлийн хуваалтыг ext4 рүү хөрвүүлэх шаардлагатай. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. 16 КБ-ын тохиргоог идэвхжүүлэхэд үүний дараа ахин нэг удаа дахин асаах шаардлагатай болно. Та энэ горимд орсны дараа нэг удаа дахин асааснаар 4 КБ, 16 КБ-ын хооронд нааш, цааш сэлгэх боломжтой. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Төхөөрөмжийг үйлдвэрлэлийн горим руу буцаахын тулд та 4 КБ горим руу буцаж сэлгэж, дараа нь эхэлж ачаалагчийг түгжих шаардлагатай бөгөөд энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд шинэчилнэ. Тухайн төхөөрөмжийг Android руу амжилттай ачаалсны дараа Хөгжүүлэгчийн тохиргоонд OEM түгжээг тайлахыг идэвхгүй болгоно уу. Баталгаажуулсны дараа тухайн төхөөрөмжийг арчих бөгөөд файлын системийг ext4 болгож өөрчилнө. Үүнийг дууссаны дараа 16 КБ-ыг дахин идэвхжүүлэхийн тулд буцаж ирнэ үү."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Бүх өгөгдлийг устгах"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Өгөгдлийн хуваалтыг ext4 болгож дахин форматалж, арчиж чадсангүй."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 КБ-ын горимд эхэлж ачаалагчийн түгжээг тайлахыг шаарддаг"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Эхэлж ачаалагчийн түгжээг тайлах шаардлагатай"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 КБ-ын хөгжүүлэгчийн тохиргоог ашиглахын өмнө энэ төхөөрөмжид эхэлж ачаалагчийн түгжээг тайлсан байх шаардлагатай. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. 16 КБ-ын горимыг идэвхжүүлэх үед хэрэглэгчийн бүх өгөгдөл, тохиргоог арчина. Эхэлж ачаалагчийн түгжээг тайлсны дараа 16 КБ-ын тохиргоог идэвхжүүлэхэд хоёр удаа дахин асаахыг шаардана. Та энэ горимд орсны дараа нэг удаа дахин асааснаар 4 КБ, 16 КБ-ын хооронд нааш, цааш сэлгэх боломжтой. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Төхөөрөмжийг үйлдвэрлэлийн горим руу буцаахын тулд та 4 КБ горим руу буцаж сэлгэж, дараа нь төхөөрөмжийн OEM/эхэлж ачаалагчийг түгжинэ (энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд шинэчилнэ). Эхэлж ачаалагчийн түгжээг тайлаад, дахин оролдоно уу. Та үүнийг хэрхэн хийх зааварчилгааг <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> дээрээс харах боломжтой"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 КБ дурын хэмжээтэй хуудасны (page-agnostic) горимыг ашиглаж байна"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Та хуудасны хэмжээгээ сэлгэж болох (page-agnostic) горимын 4 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Илүү ихийг уншихын тулд товшино уу."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Та хуудасны хэмжээгээ сэлгэж болох (page-agnostic) горимын 4 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд дахин шинэчилж, үйлдвэрлэлийн тохиргоо руу сэргээнэ. Тухайн төхөөрөмжийг Android руу амжилттай ачаалсны дараа Хөгжүүлэгчийн тохиргоонд OEM түгжээг тайлахыг идэвхгүй болгоно уу. Хэрэв төхөөрөмжийг Android руу ачаалж чадаагүй эсвэл энэ нь тогтворгүй байвал <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> дээрээс төхөөрөмжийг хамгийн сүүлийн үеийн үйлдвэрийн зургаар солих эсвэл <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>-г ашиглаад, \'Төхөөрөмжийг арчих\', \'Эхэлж ачаалагчийг түгжих\' болон \'Бүх хуваалтыг хүчээр солих\'-ыг сонгоно уу."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 КБ хуудасны хэмжээгээ сэлгэж болох (page-agnostic) горимыг ашиглаж байна"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Та хуудасны хэмжээгээ сэлгэж болох (page-agnostic) горимын 16 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та 4 КБ горим руу буцаж сэлгэж, дараа нь төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Илүү ихийг уншихын тулд товшино уу."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Та хуудасны хэмжээгээ сэлгэж болох (page-agnostic) горимын 16 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та 4 КБ горим руу буцаж сэлгэж, дараа нь төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд дахин шинэчилж, үйлдвэрлэлийн тохиргоо руу сэргээнэ. Тухайн төхөөрөмжийг Android руу амжилттай ачаалсны дараа Хөгжүүлэгчийн тохиргоонд OEM түгжээг тайлахыг идэвхгүй болгоно уу. Хэрэв төхөөрөмжийг Android руу ачаалж чадаагүй эсвэл энэ нь тогтворгүй байвал <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> дээрээс төхөөрөмжийг хамгийн сүүлийн үеийн үйлдвэрийн зургаар солих эсвэл <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>-г ашиглаад, \'Төхөөрөмжийг арчих\', \'Эхэлж ачаалагчийг түгжих\' болон \'Бүх хуваалтыг хүчээр солих\'-ыг сонгоно уу."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Та хуудасны хэмжээ сэлгэх горимын 16 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та 4 КБ горим руу буцаж сэлгээд, дараа нь төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Илүү ихийг уншихын тулд товшино уу."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Та хуудасны хэмжээ сэлгэх горимын 16 КБ горимд байна. Энэ горимд программ хангамжийн халдашгүй байдалд баталгаа өгөх боломжгүй бөгөөд эхэлж ачаалагчийн түгжээг тайлсан байхад утсан дээр хадгалсан аливаа өгөгдөл эрсдэлд орж магадгүй. Зарим онцлогийг эдгээр горимд идэвхгүй болгох тул зарим аппликэйшн ажиллахгүй байж магадгүй. Үйлдвэрлэлийн горимд дахин орохын тулд та 4 КБ горим руу буцаж сэлгээд, дараа нь төхөөрөмжийн эхэлж ачаалагчийг түгжих ёстой. Энэ нь төхөөрөмжийг үйлдвэрийн тохиргоонд дахин шинэчилж, үйлдвэрлэлийн тохиргоо руу сэргээнэ. Тухайн төхөөрөмжийг Android руу амжилттай ачаалсны дараа Хөгжүүлэгчийн тохиргоонд OEM түгжээг тайлахыг идэвхгүй болгоно уу. Хэрэв төхөөрөмжийг Android руу ачаалж чадаагүй эсвэл энэ нь тогтворгүй байвал <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> дээрээс төхөөрөмжийг хамгийн сүүлийн үеийн үйлдвэрийн зургаар солих эсвэл <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>-г ашиглаад, \'Төхөөрөмжийг арчих\', \'Эхэлж ачаалагчийг түгжих\', \'Бүх хуваалтыг хүчээр солих\'-ыг сонгоно уу."</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="bug_report_handler_title" msgid="713439959113250125">"Алдааны мэдээний удирдагч"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Апп бэхлэхийг ашиглах"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Хөгжүүлэгчийн тохиргоог ашиглах"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Хэвлэгчийн үйлчилгээ ашиглах"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Олон хэрэглэгчийг зөвшөөрөх"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Хэрэглэгч сэлгэхийг зөвшөөрөх"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"зөвшөөрөх, хэд хэдэн, хэрэглэгч, зөвшөөрөл олгох, олон"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"олон, хэрэглэгч, профайл, хүмүүс, бүртгэл, сэлгүүр, хэд хэдэн"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Wireless debugging-г ашиглах"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Таблетаа холбох үед дэлгэцэн дээр юу харагдахыг сонгоно уу. Дэлгэц амраагч ашиглах үед таны төхөөрөмж илүү их эрчим хүч зарцуулж болзошгүй."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Өөрчлөх"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>-г өөрчлөх"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Чөлөөт хэлбэрийн дэмжлэгийг идэвхжүүлэхийн тулд дахин асаах шаардлагатай."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Хоёрдогч дэлгэц дээр дэлгэцийн горимыг хүчлэхийн тулд дахин асаах шаардлагатай."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Чөлөөт хэлбэрийн уламжлалт цонхны дэмжлэгийг идэвхжүүлэхэд дахин асаах шаардлагатай."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Чөлөөт хэлбэрийн цонхны дэмжлэгийг өөрчлөхөд дахин асаах шаардлагатай."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Хоёрдогч дэлгэц дээр чөлөөт хэлбэрийн цонхыг хүчлэхэд дахин асаах шаардлагатай."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Одоо дахин асаах"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Дараа дахин асаах"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Орчны аудио"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Асаалттай"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Унтраалттай"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Асаалттай"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио %1$d%% зүүн, %2$d%% баруун"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио %1$d%% баруун, %2$d%% зүүн"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Таны төхөөрөмжийн нэр суулгасан аппуудад тань харагдана. Таныг Bluetooth төхөөрөмжүүд, Wi-Fi сүлжээнд холбогдох эсвэл Wi-Fi сүлжээний цэг тохируулах үед үүнийг мөн бусад хүн харж магадгүй."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Хэл зүйн хүйс"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Хэл зүйн хүйс сонгох"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Хайлтын тохиргоо"</string>
</resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 29f7ccc..a31ec8f 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"बेडटाइम"</item>
+ <item msgid="4152450357280759894">"ड्रायव्हिंग"</item>
+ <item msgid="7096549258219399423">"इमर्सिव्ह"</item>
+ <item msgid="2760716776980432977">"व्यवस्थापित"</item>
+ <item msgid="601734478369121764">"तारा"</item>
+ <item msgid="6243809315432780521">"कॅलेंडर"</item>
+ <item msgid="4913577903148415331">"वेळ"</item>
+ <item msgid="3653377604690057780">"थिएटर"</item>
+ <item msgid="3843711267408385410">"फूल"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index b08bf0c..7cbd8db 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"डिव्हाइस डिस्कनेक्ट करायचे का?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नवीन डिव्हाइससोबत पेअर करा"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लूटूथ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"उद्या आपोआप सुरू करा"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"श्रवणयंत्राची सेटिंग्ज"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"शॉर्टकट, श्रवणयंत्राची कंपॅटिबिलिटी"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"प्रीसेट"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"तुमच्या ऑडिओलॉजिस्टने प्रोग्राम केलेले प्रीसेट नाहीत"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"प्रीसेट अपडेट करता आले नाही"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ऑडिओ आउटपुट"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ऑडिओ आउटपुटबद्दल"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{सुरू आहे / # अॅपला स्थानाचा अॅक्सेस आहे}other{सुरू आहे / # अॅप्सना स्थानाचा अॅक्सेस आहे}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"लोड करत आहे…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"जवळपासच्या डिव्हाइसची परवानगी असणारी ॲप्स कनेक्ट केलेल्या डिव्हाइसचे संबंधित स्थान निर्धारित करू शकतात."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"जवळपासच्या डिव्हाइसची परवानगी असणारी ॲप्स कनेक्ट केलेल्या डिव्हाइसचे संबंधित स्थान निर्धारित करू शकतात."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ॲप्स आणि सेवांसाठी स्थान अॅक्सेस बंद आहे. तुम्ही आणीबाणी नंबरवर कॉल केल्यास किंवा एसएमएस पाठवल्यास तुमच्या डिव्हाइसचे स्थान आणीबाणी प्रतिसादकर्त्यांना अद्याप पाठवले जाऊ शकते."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"स्थान सेटिंग्जबद्दल अधिक जाणून घ्या"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"बदलण्यासाठी ChromeOS सेटिंग्ज > गोपनीयता आणि सुरक्षा > गोपनीयता नियंत्रणे > स्थान अॅक्सेस वर जा"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"चेहरा आणि <xliff:g id="WATCH">%s</xliff:g> जोडले"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"चेहरा, फिंगरप्रिंट आणि <xliff:g id="WATCH">%s</xliff:g> जोडले"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"चेहरा, फिंगरप्रिंट आणि <xliff:g id="WATCH">%s</xliff:g> जोडले"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ओळख तपासणी सुरू असल्यामुळे हे आवश्यक आहे"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator अनलॉक करा"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"वॉच जोडले आहे"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"तुमचे वॉच सेट करा"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"वॉच अनलॉक बद्दल अधिक जाणून घ्या"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"वॉच जोडा"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"वॉच काढून टाका"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"फिंगरप्रिंट आणि फेस अनलॉक"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"फेस आणि फिंगरप्रिंट अनलॉक"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"कार्य प्रोफाइलसाठी फेस आणि फिंगरप्रिंट अनलॉक"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"सेटअप आवश्यक आहे"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"चेहरा आणि फिंगरप्रिंट जोडल्या"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"अॅप्स इंस्टॉल करा"</b>\n"तुम्ही तुमच्या स्पेसमध्ये खाजगी ठेवायची असलेली ॲप्स इंस्टॉल करा"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"लक्षात ठेवा"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"तुम्ही तुमची स्पेस लॉक करता, तेव्हा ॲप्स थांबतात"</b>\n"तुम्ही तुमची स्पेस लॉक करता, तेव्हा तुमच्या स्पेसमधील ॲप्स थांबवली जातात आणि तुम्हाला त्यांच्याकडून नोटिफिकेशन मिळणार नाहीत"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ज्या अॅप्सनी बॅकग्राउंडमध्ये रन होणे आवश्यक आहे किंवा महत्त्वाची नोटिफिकेशन पाठवण्याची आवश्यकता आहे अशी वैद्यकीय अॅप्स यांच्यासाठी खाजगी स्पेस योग्य नाहीत. तुमची स्पेस लॉक केलेली असल्यामुळे, नोटिफिकेशन आणि बॅकग्राउंड अॅक्टिव्हिटी थांबवली जाते.\n\nतुमची खाजगी स्पेस लॉक केलेली असते, तेव्हा खाजगी स्पेसमधील अॅप्स परवानगी व्यवस्थापक, गोपनीयता डॅशबोर्ड आणि इतर सेटिंग्जमध्ये दिसणार नाहीत.\n\nतुमची खाजगी स्पेस नवीन डिव्हाइसवर हलवली जाऊ शकत नाही. तुम्हाला दुसर्या डिव्हाइसवर वापरायची असल्यास, दुसरी खाजगी स्पेस सेट करावी लागेल.\n\nतुमच्या डिव्हाइसला कॉंप्युटरशी कनेक्ट करणारी किंवा तुमच्या डिव्हाइसवर हानिकारक अॅप्स इंस्टॉल करणारी कोणतीही व्यक्ती तुमची खाजगी स्पेस अॅक्सेस करू शकते."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ज्या अॅप्सनी बॅकग्राउंडमध्ये रन होणे आवश्यक आहे किंवा महत्त्वाची नोटिफिकेशन पाठवण्याची आवश्यकता आहे अशी वैद्यकीय अॅप्स यांच्यासाठी खाजगी स्पेस योग्य नाहीत. तुमची स्पेस लॉक केलेली असल्यामुळे, नोटिफिकेशन आणि बॅकग्राउंड अॅक्टिव्हिटी थांबवली जाते.\n\nतुमची खाजगी स्पेस लॉक केलेली असते, तेव्हा खाजगी स्पेसमधील अॅप्स परवानगी व्यवस्थापक, गोपनीयता डॅशबोर्ड आणि इतर सेटिंग्जमध्ये दिसणार नाहीत.\n\nतुमची खाजगी स्पेस नवीन डिव्हाइसवर रिस्टोअर केली जाऊ शकत नाही. तुम्हाला ती दुसऱ्या डिव्हाइसवर वापरायची असल्यास तुम्हाला दुसरी स्पेस सेट करावी लागेल.\n\nतुमचे डिव्हाइस कॉंप्युटरशी कनेक्ट करणारी किंवा तुमच्या डिव्हाइसवर दुर्भावनापूर्ण ॲप्स इंस्टॉल करणारी कोणतीही व्यक्ती खाजगी स्पेस अॅक्सेस करू शकते."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"खाजगी स्पेसबद्दल अधिक जाणून घ्या"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"यासाठी थोडा वेळ लागू शकतो"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"खाजगी स्पेस सेट करत आहे…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"डिव्हाइस रीस्टार्ट करायचे आहे का?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"तपशीलवार NFC लॉगिंग हे फक्त विकासाच्या उद्देशाने आहे. बग रिपोर्टमध्ये अतिरिक्त NFC डेटाचा समावेश केला आहे, ज्यामध्ये खाजगी माहितीचा समावेश असू शकतो. हे सेटिंग बदलण्यासाठी तुमचे डिव्हाइस रीस्टार्ट करा."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"रीस्टार्ट करा"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"मिरर करा, बाह्य डिस्प्ले, कनेक्ट केलेला डिस्प्ले, USB डिस्प्ले, रेझोल्यूशन, रोटेशन"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"रोटेशन"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"साधारण"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"९०°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"१८०°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"२७०°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1261,7 +1276,7 @@
<string name="even_dimmer_display_title" msgid="6731255736830410149">"आणखी मंद"</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>
+ <string name="screen_timeout_summary" msgid="5558778019594643427">"इनॅक्टिव्हिटीच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
<string name="screen_timeout_summary_not_set" msgid="5107680774964178875">"सेट केलेले नाही"</string>
<string name="wallpaper_settings_title" msgid="5635129851136006383">"वॉलपेपर"</string>
<string name="style_and_wallpaper_settings_title" msgid="2232042809407308946">"वॉलपेपर आणि शैली"</string>
@@ -1548,7 +1563,7 @@
<string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"USB, ब्लूटूथ, इथरनेट"</string>
<string name="tether_settings_summary_all" msgid="7565193614882005775">"हॉटस्पॉट, USB, ब्लूटूथ, इथरनेट"</string>
<string name="tether_settings_summary_off" msgid="2526164899130351968">"इतर डिव्हाइससह इंटरनेट शेअर करत नाही"</string>
- <string name="tether_preference_summary_off" msgid="6266799346319794630">"बंद आहे"</string>
+ <string name="tether_preference_summary_off" msgid="6266799346319794630">"बंद"</string>
<string name="usb_tethering_button_text" msgid="7364633823180913777">"USB टेदरिंग"</string>
<string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"ब्लूटूथ टेदरिंग"</string>
<string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"इथरनेट टेदरिंग"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ऑन-स्क्रीन कीबोर्ड वापरा"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"वास्तविक कीबोर्ड अॅक्टिव्ह असताना त्यास स्क्रीनवर ठेवा"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"पॉइंटर फिलची शैली बदलून पिवळी करा"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"पॉइंटर फिलची शैली बदलून गुलाबी करा"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"पॉइंटर फिलची शैली बदलून निळी करा"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"पॉइंटरच्या स्ट्रोकची शैली"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"पांढरा"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"काळा"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"कोणताही नाही"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"वापरकर्त्याने निवडले आहे: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"भाषण"</string>
<string name="pointer_speed" msgid="7398649279282675718">"पॉइंटर वेग"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"पॉइंटर स्केल"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"पॉइंटर स्केल कमी करा"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"पॉइंटर स्केल वाढवा"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"गेम नियंत्रक"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"व्हायब्रेट पुनर्निर्देशित करा"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"कनेक्ट केले असताना गेम नियंत्रकाला व्हायब्रेशन पाठवा"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"तरीही पुढे सुरू ठेवा"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"रद्द करा"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"मॅग्निफिकेशन सेटिंग्ज"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"एका बोटाने पॅन करणे"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"मॅग्निफायर एका बोटाने हलवा"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"स्क्रीनभोवती हलवण्यासाठी १ बोट ड्रॅग करा"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"एका बोटाने ड्रॅग करून मॅग्निफिकेशनचा भाग हलवा."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"दोन बोटांनी ड्रॅग करून मॅग्निफिकेशनचा भाग हलवा."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"फक्त स्क्रीनचा भाग मॅग्निफाय करताना उपलब्ध नसेल"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"झूम करण्यासाठी बटणावर टॅप करा"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"आशय आणखी मोठा करून पाहण्यासाठी स्क्रीनवर झटपट झूम इन करा"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>झूम इन करण्यासाठी:</b><br/> {0,number,integer}. मॅग्निफिकेशन सुरू करण्यासाठी शॉर्टकट वापरा<br/> {1,number,integer}. स्क्रीनवर टॅप करा<br/> {2,number,integer}. स्क्रीनवर हलवण्यासाठी दोन बोटांनी ड्रॅग करा<br/> {3,number,integer}. झूम अॅडजस्ट करण्यासाठी दोन बोटांनी पिंच करा<br/> {4,number,integer}. मॅग्निफिकेशन थांबवण्यासाठी शॉर्टकट वापरा<br/><br/> <b>तात्पुरते झूम इन करण्यासाठी:</b><br/> {0,number,integer}. तुमचा मॅग्निफिकेशनचा प्रकार फुल स्क्रीनवर सेट केला असल्याची खात्री करा<br/> {1,number,integer}. मॅग्निफिकेशन सुरू करण्यासाठी शॉर्टकट वापरा<br/> {2,number,integer}. स्क्रीनवर कुठेही स्पर्श करा आणि धरून ठेवा<br/> {3,number,integer}. स्क्रीनवर हलवण्यासाठी बोटाने ड्रॅग करा<br/> {4,number,integer}. मॅग्निफिकेशन थांबवण्यासाठी बोट उचला"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>झूम इन करण्यासाठी:</b><br/> {0,number,integer}. मॅग्निफिकेशन सुरू करण्यासाठी शॉर्टकट वापरा<br/> {1,number,integer}. स्क्रीनवर टॅप करा<br/> {2,number,integer}. स्क्रीनवर हलवण्यासाठी २ बोटे ड्रॅग करा<br/> {3,number,integer}. झूम अॅडजस्ट करण्यासाठी २ बोटांनी पिंच करा<br/> {4,number,integer}. मॅग्निफिकेशन थांबवण्यासाठी शॉर्टकट वापरा<br/><br/> तुम्ही तात्पुरते झूम इन करू शकता आणि आणखी बरेच काही करू शकता."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>झूम इन करण्यासाठी:</b><br/> {0,number,integer}. मॅग्निफिकेशन सुरू करण्यासाठी शॉर्टकट वापरा<br/> {1,number,integer}. स्क्रीनवर टॅप करा<br/> {2,number,integer}. स्क्रीनवर हलवण्यासाठी १ किंवा २ बोटे ड्रॅग करा<br/> {3,number,integer}. झूम अॅडजस्ट करण्यासाठी २ बोटांनी पिंच करा<br/> {4,number,integer}. मॅग्निफिकेशन थांबवण्यासाठी शॉर्टकट वापरा<br/><br/> तुम्ही तात्पुरते झूम इन करू शकता आणि आणखी बरेच काही करू शकता."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"मॅग्निफिकेशन सुरू असल्यास, तुम्ही तुमची स्क्रीन झूम इन करू शकता.\n\n"<b>"झूम करण्यासाठी"</b>", मॅग्निफिकेशन सुरू करा आणि त्यानंतर स्क्रीनवर कुठेही टॅप करा.\n"<ul><li>"स्क्रोल करण्यासाठी दोन किंवा अधिक बोटांनी ड्रॅग करा."</li>\n<li>"झूम अॅडजस्ट करण्यासाठी दोन किंवा अधिक बोटांनी पिंच करा"</li></ul>\n\n<b>"तात्पुरते झूम करण्यासाठी "</b>", मॅग्निफिकेशन सुरू करा आणि स्क्रीनवर कुठेही धरून ठेवा.\n"<ul><li>"स्क्रीनवर कुठेही जाण्यासाठी ड्रॅग करा "</li>\n<li>"झूम आउट करण्यासाठी बोट उचला"</li></ul>\n\n"तुम्ही कीबोर्ड किंवा नेव्हिगेशन बार वर झूम इन करू शकत नाही."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> पैकी <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> पेज"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"अॅक्सेसिबिलिटी बटणासाठी शॉर्टकट"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{एक शेड्युल सेट केले}other{# शेड्युल सेट केली}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"व्यत्यय आणू नका"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"प्राधान्य मोड"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"मोड जोडा"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"फक्त महत्त्वाच्या लोकांच्या आणि अॅप्सच्या सूचना मिळवा"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"अॅक्टिव्हेशनचे प्रकार निवडा"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"वेळ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"उदा. \"संध्याकाळी ९.३० – ५.००\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"कॅलेंडर"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"उदा. \"वैयक्तिक कॅलेंडर\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"मोड तयार करा"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"कस्टम"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"व्यत्यय मर्यादित करा"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"व्यत्यय आणू नका सुरू करा"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"अलार्म आणि मीडियाचे आवाज व्यत्यय आणू शकतात"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"शेड्युल"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"शेड्युल हटवा"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"हटवा"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"नाव बदला"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"हटवा"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" मोड हटवायचा आहे का?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"संपादित करा"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"शेड्युल"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"शेड्युल"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"कॅलेंडर जोडा"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"तुमचे कॅलेंडर वापरा"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"शेड्यूल"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"शेड्यूल सेट करा"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"शेड्यूल"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> तास <xliff:g id="MINUTES">%2$d</xliff:g> मिनिटे"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"आपोआप सुरू करा"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"शेड्युल"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"काही वेळेला फोन शांत करा"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"व्यत्यय आणू नका नियम सेट करा"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"आवाज करतात त्या सर्व व्यत्ययांना अनुमती द्या"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"दृश्य व्यत्यय ब्लॉक करा"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"व्हिज्युअल सिग्नलना अनुमती द्या"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"तुमच्यापर्यंत पोहोचू शकणारी नोटिफिकेशन"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"लक्ष केंद्रित करा"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"अतिरिक्त कृती"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{बंद आहे}=1{बंद आहे / १ मोड आपोआप सुरू होऊ शकतो}other{बंद आहे / # मोड आपोआप सुरू होऊ शकतात}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"डिस्प्ले सेटिंग्ज"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"डिस्प्ले पर्याय"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ग्रेस्केल"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"गडद थीम सुरू करा"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"गडद बॅकग्राउंडवर फिकट मजकुराला प्राधान्य देण्यासाठी OS आणि ॲप्स स्विच करा, ज्यामुळे डोळ्यांवर ताण येत नाही व काही डिव्हाइसवर लक्षणीय प्रमाणात बॅटरीची बचत होते"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{No display changes}=1{{effect_1}}=2{{effect_1} आणि {effect_2}}=3{{effect_1}, {effect_2} आणि {effect_3}}other{{effect_1}, {effect_2} आणि आणखी #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"व्यत्ययांना फिल्टर करा"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"कोणतेही व्यत्यय फिल्टर केलेले नाहीत"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"सूचना उघडा"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"सूचना स्नूझ करण्याची अनुमती द्या"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ॲप आयकनवर सूचना बिंदू"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"नोटिफिकेशन बंडल"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"बबल"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"बबल"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"हे संभाषण बबल करा"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"हे ॲप वर्धित सेटिंग्जना सपोर्ट करत नाही"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"अधिक सेटिंग्ज"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"या अॅपमध्ये अधिक सेटिंग्ज उपलब्ध आहेत"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"सूचना कूलडाउन"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"कार्य प्रोफाइलला लागू करा"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"कार्य प्रोफाइलच्या अॅप्सना लागू करा"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"वर्गवाऱ्या"</string>
<string name="notification_channels_other" msgid="18159805343647908">"अन्य"</string>
<string name="no_channels" msgid="4716199078612071915">"या ॲपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"न वापरलेल्या वर्गवाऱ्या दाखवा"</string>
<string name="app_settings_link" msgid="6725453466705333311">"अॅपमधील अतिरिक्त सेटिंग्ज"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"न वापरलेल्या वर्गवाऱ्या दाखवा"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"न वापरलेल्या वर्गवाऱ्या लपवा"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"व्यत्यय आणू शकणारी ॲप्स"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"निवडलेली अॅप्स"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"कोणतेही नाही"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"सर्व"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} व्यत्यय आणू शकते}=2{{app_1} आणि {app_2} व्यत्यय आणू शकतात}=3{{app_1}, {app_2} आणि {app_3} व्यत्यय आणू शकतात}other{{app_1}, {app_2} आणि आणखी # व्यत्यय आणू शकतात}}"</string>
+ <string name="zen_mode_apps_work_app" msgid="8528767938316361588">"<xliff:g id="APP_LABEL">%s</xliff:g> (ऑफिस)"</string>
+ <string name="zen_mode_apps_calculating" msgid="5420121396943539286">"मोजत आहे…"</string>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ॲप्सना ओव्हरराइड करण्याची अनुमती द्या"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"व्यत्यय आणू शकणारी ॲप्स"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"आणखी ॲप्स निवडा"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"काहीही व्यत्यय आणू शकत नाही"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"कोणीही व्यत्यय आणू शकत नाही"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"काही लोक व्यत्यय आणू शकतात"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"सर्व लोक व्यत्यय आणू शकतात"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"नियमित कॉलर"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"पुन्हा कॉल करणाऱ्यांना अनुमती द्या"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} पर्यंत फक्त एका तासासाठी अलार्मवर बदला}other{{time} पर्यंत फक्त # तासांसाठी अलार्मवर बदला}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"केवळ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> पर्यंत अलार्मवर बदला"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"नेहमी व्यत्यय आणा वर बदला"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"संपादन मोड"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"मोड जोडा"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोडचे नाव"</string>
<string name="warning_button_text" msgid="1274234338874005639">"चेतावणी"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"बंद करा"</string>
<string name="device_feedback" msgid="5351614458411688608">"या डिव्हाइसबद्दल फीडबॅक पाठवा"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"डेस्कटॉप मोडची सक्ती करा"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"दुसऱ्या डिस्प्लेवर प्रायोगिक डेस्कटॉप मोडला सक्ती करा"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"फ्रीफॉर्म विंडो सुरू करा"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"फ्रीफॉर्म विंडोसाठी सपोर्ट सुरू करा."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"दुसऱ्या डिस्प्लेवर फ्रीफॉर्म विंडोइंग सुरू करा"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"फक्त दुय्यम डिस्प्लेवर फ्रीफॉर्म विंडो सुरू करा."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"मल्टी विंडोमध्ये आकार बदलू न शकणारे ॲप सुरू करा"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"आकार बदलू न शकणाऱ्या ॲप्सना मल्टी विंडोमध्ये राहण्याची परवानगी देते"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"फोर्स-डार्क ओव्हरराइड करते"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"१६KB डेव्हलपर पर्याय वापरण्यापूर्वी या डिव्हाइसच्या डेटा पार्टिशनचे ext4 मध्ये रूपांतर करणे आवश्यक आहे. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. १६KB पर्याय अॅक्टिव्हेट करण्यासाठी यानंतर आणखी एकदा रीबूट करावे लागेल. तुम्ही या मोडमध्ये असाल, तेव्हा तुम्ही एकदाच रीबूट करून ४KB आणि १६KB मोडमध्ये मागे व पुढे स्विच करू शकता. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. डिव्हाइसला उत्पादन मोडवर परत आणण्यासाठी, तुम्हाला ४kB मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसला फॅक्टरी रीसेट करणारा बूटलोडर लॉक करावा लागेल. Android मध्ये डिव्हाइस यशस्वीरीत्या बूट झाल्यानंतर, डेव्हलपर पर्यायांमध्ये OEM अनलॉक करणे हे बंद करा. डिव्हाइस पुसून टाकले जाईल आणि कन्फर्मेशननंतर फाइलसिस्टीम ext4 वर बदलली जाईल. हे पूर्ण झाल्यानंतर, कृपया १६KB पुन्हा सुरू करण्यासाठी परत या."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"सर्व डेटा मिटवा"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"डेटाचे पार्टिशन ext4 वर पुन्हा फॉरमॅट करून पुसून टाकता आले नाही."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"१६KB मोडसाठी बूटलोडर अनलॉक करणे आवश्यक आहे"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"बूटलोडर अनलॉक करणे आवश्यक आहे"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"१६KB डेव्हलपर पर्याय वापरण्यापूर्वी या डिव्हाइसचा बूटलोडर अनलॉक करावा लागेल. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. १६KB मोड अॅक्टिव्हेट केल्यावर सर्व वापरकर्ता डेटा आणि सेटिंग्ज पुसून टाकली जातील. बूटलोडर अनलॉक केल्यावर, १६KB पर्याय अॅक्टिव्हेट करण्यासाठी दोन वेळा रीबूट करावे लागेल. तुम्ही या मोडमध्ये असाल, तेव्हा तुम्ही एकदाच रीबूट करून ४KB आणि १६KB मोडमध्ये मागे व पुढे स्विच करू शकता. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. डिव्हाइसला उत्पादन मोडवर परत आणण्यासाठी, तुम्हाला ४KB मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइस (फॅक्टरी रीसेट करणारा) OEM/बूटलोडर लॉक करावा लागेल. कृपया बूटलोडर अनलॉक करा आणि पुन्हा प्रयत्न करा. हे कसे करावे यासाठीच्या सूचना तुम्ही <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> येथे पाहू शकता"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"४KB पेज अज्ञात मोड वापरत आहे"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"तुम्ही पेज अज्ञात मोडच्या ४KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला डिव्हाइसचा बूटलोडर लॉक करावा लागेल. आणखी वाचण्यासाठी टॅप करा."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"तुम्ही पेज अज्ञात मोडच्या ४KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला डिव्हाइसचा बूटलोडर लॉक करावा लागेल. यामुळे डिव्हाइस पुन्हा फॅक्टरी रीसेट होईल आणि उत्पादन सेटिंग्जवर रिस्टोअर केले जाईल. Android मध्ये डिव्हाइस यशस्वीरीत्या बूट झाल्यानंतर, डेव्हलपर पर्यायांमध्ये OEM अनलॉक करणे हे बंद करा. डिव्हाइस Android मध्ये बूट होत नसल्यास किंवा ते अस्थिर असल्यास, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> येथील नवीनतम फॅक्टरी इमेजच्या मदतीने डिव्हाइस पुन्हा फ्लॅश करा किंवा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> वापरा आणि \'डिव्हाइस पुसून टाका\', \'बूटलोडर लॉक करा\' व \'सर्व पार्टिशन सक्तीने फ्लॅश करा\' हे निवडा."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"१६KB पेज अज्ञात मोड वापरत आहे"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"तुम्ही पेज अज्ञात मोडच्या १६KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला ४K मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसचा बूटलोडर लॉक करावा लागेल. आणखी वाचण्यासाठी टॅप करा."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"तुम्ही पेज अज्ञात मोडच्या १६KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला ४K मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसचा बूटलोडर लॉक करावा लागेल. यामुळे डिव्हाइस पुन्हा फॅक्टरी रीसेट होईल आणि उत्पादन सेटिंग्जवर रिस्टोअर केले जाईल. Android मध्ये डिव्हाइस यशस्वीरीत्या बूट झाल्यानंतर, डेव्हलपर पर्यायांमध्ये OEM अनलॉक करणे हे बंद करा. डिव्हाइस Android मध्ये बूट होत नसल्यास किंवा ते अस्थिर असल्यास, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> येथील नवीनतम फॅक्टरी इमेजच्या मदतीने डिव्हाइस पुन्हा फ्लॅश करा किंवा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> वापरा आणि \'डिव्हाइस पुसून टाका\', \'बूटलोडर लॉक करा\' व \'सर्व पार्टिशन सक्तीने फ्लॅश करा\' हे निवडा."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"तुम्ही पेज-अॅग्नॉस्टिक मोडच्या १६KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला ४KB मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसचा बूटलोडर लॉक करावा लागेल. आणखी वाचण्यासाठी टॅप करा."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"तुम्ही पेज-अॅग्नॉस्टिक मोडच्या १६KB मोडमध्ये आहात. या मोडमध्ये सॉफ्टवेअर इंटेग्रिटीची हमी देता येणार नाही आणि बूटलोडर अनलॉक केलेला असताना फोनवर स्टोअर केलेल्या कोणत्याही डेटाला धोका असू शकतो. या मोडमध्ये काही वैशिष्ट्ये बंद केली जातील, त्यामुळे काही अॅप्लिकेशन कदाचित काम करणार नाहीत. उत्पादन मोडमध्ये पुन्हा एंटर करण्यासाठी, तुम्हाला ४KB मोडवर परत स्विच करावे लागेल आणि त्यानंतर डिव्हाइसचा बूटलोडर लॉक करावा लागेल. यामुळे डिव्हाइस पुन्हा फॅक्टरी रीसेट होईल आणि उत्पादन सेटिंग्जवर रिस्टोअर केले जाईल. Android मध्ये डिव्हाइस यशस्वीरीत्या बूट झाल्यानंतर, डेव्हलपर पर्यायांमध्ये OEM अनलॉक करणे हे बंद करा. डिव्हाइस Android मध्ये बूट होत नसल्यास किंवा ते अस्थिर असल्यास, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> येथील नवीनतम फॅक्टरी इमेजच्या मदतीने डिव्हाइस पुन्हा फ्लॅश करा किंवा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> वापरा आणि \'डिव्हाइस पुसून टाका\', \'बूटलोडर लॉक करा\' व \'सर्व पार्टिशन सक्तीने फ्लॅश करा\' हे निवडा."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"१६KB पेज अज्ञात मोड"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"आणखी वाचा"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"बग रिपोर्ट हँडलर"</string>
@@ -5009,14 +5056,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ॲप पिनिंग वापरणे"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"डेव्हलपर पर्याय वापरणे"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"प्रिंट सेवा वापरा"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"एकाहून अधिक वापरकर्त्यांना अनुमती द्या"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"वापरकर्ता स्विच करण्याची अनुमती द्या"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"अनुमती द्या, एकाहून अधिक, वापरकर्ता, परवानगी द्या, बरेच"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"एकाहून अधिक, वापरकर्ते, प्रोफाइल, लोक, खाती, स्विच करा, अनेक"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"वायरलेस डीबगिंग वापरणे"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"ग्राफिक ड्रायव्हर प्राधान्ये वापरणे"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"रात्रीचा प्रकाश वापरणे"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"NFC वापरणे"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"अडॅप्टिव्ह ब्राइटनेस वापरणे"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"अडॅप्टिव्ह ब्राइटनेस वापरा"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"वाय-फाय कॉलिंग वापरणे"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"सर्व अॅप्स पहा"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फॉरवर्डिंग"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"तुमचा टॅबलेट डॉक केलेला असतो, तेव्हा तुम्ही तुमच्या स्क्रीनवर काय पाहाल ते निवडा. स्क्रीन सेव्हर वापरला जातो, तेव्हा तुमचे डिव्हाइस आणखी ऊर्जा वापरू शकते."</string>
<string name="customize_button_title" msgid="1110284655990203359">"कस्टमाइझ करा"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> कस्टमाइझ करा"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"फ्रीफॉर्म सपोर्ट सुरू करण्यासाठी, रीबूट करणे आवश्यक आहे."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"दुय्यम डिस्प्लेवर डेस्कटॉप मोडची सक्ती करण्यासाठी, रीबूट करणे आवश्यक आहे."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"लेगसी फ्रीफॉर्म विंडोइंग सपोर्ट सुरू करण्यासाठी रीबूट करणे आवश्यक आहे."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"फ्रीफॉर्म विंडोइंग सपोर्ट बदलण्यासाठी रीबूट करणे आवश्यक आहे."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"दुय्यम डिस्प्लेवर सक्तीने फ्रीफॉर्म विंडोइंग करण्यासाठी रीबूट करणे आवश्यक आहे."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"आता रीबूट करा"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"नंतर रीबूट करा"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"स्पेशियल ऑडिओ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"सुरू आहे"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"बंद आहे"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"सुरू आहे"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ऑडिओ %1$d%% डावीकडे, %2$d%% उजवीकडे"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ऑडिओ %1$d%% उजवीकडे, %2$d%% डावीकडे"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"तुम्ही इंस्टॉल केलेल्या ॲप्सना तुमच्या डिव्हाइसचे नाव दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी कनेक्ट करता, वाय-फाय नेटवर्कशी कनेक्ट करता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकदेखील पाहू शकतात."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"व्याकरणानुसार लिंगासंबंधी माहिती"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"व्याकरणानुसार लिंगासंबंधी माहिती निवडा"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"शोध सेटिंग्ज"</string>
</resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 62c7449..9b5af35 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Waktu tidur"</item>
+ <item msgid="4152450357280759894">"Memandu"</item>
+ <item msgid="7096549258219399423">"Mengasyikkan"</item>
+ <item msgid="2760716776980432977">"Terurus"</item>
+ <item msgid="601734478369121764">"Bintang"</item>
+ <item msgid="6243809315432780521">"Kalendar"</item>
+ <item msgid="4913577903148415331">"Masa"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Bunga"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ee111aa..d6f48f6 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Putuskan sambungan peranti?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Gandingkan peranti baharu"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Hidupkan secara automatik pada hari esok"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Tetapan peranti pendengaran"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Pintasan, keserasian alat bantu pendengaran"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Pratetapan"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Tiada pratetapan yang diaturkan oleh ahli audiologi anda"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Tidak dapat mengemaskinikan pratetapan"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Output audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Perihal output audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Mati"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Hidup / # apl memiliki akses kepada lokasi}other{Hidup / # apl memiliki akses kepada lokasi}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Memuatkan…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apl dengan kebenaran peranti Berdekatan boleh menentukan kedudukan relatif peranti tersambung."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apl dengan kebenaran peranti berdekatan boleh menentukan kedudukan relatif peranti tersambung."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Akses lokasi dimatikan untuk apl dan perkhidmatan. Lokasi peranti anda mungkin tetap dihantar kepada pasukan bantuan kecemasan apabila anda menghubungi atau menghantar teks kepada nombor kecemasan."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Ketahui lebih lanjut tentang tetapan Lokasi"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Untuk membuat perubahan, lawati Tetapan ChromeOS > Privasi dan keselamatan > Kawalan privasi > Akses lokasi"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Wajah dan <xliff:g id="WATCH">%s</xliff:g> ditambah"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Wajah, cap jari dan <xliff:g id="WATCH">%s</xliff:g> ditambah"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Wajah, cap jari dan <xliff:g id="WATCH">%s</xliff:g> ditambah"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Langkah ini diperlukan kerana Semakan Identiti telah dihidupkan"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Buka Kunci Authenticator Jauh"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Jam tangan ditambahkan"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Sediakan jam tangan anda"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Ketahui lebih lanjut tentang Buka Kunci Jam Tangan"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Tambahkan jam tangan"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Alih keluar jam tangan"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Buka Kunci Cap Jari & Wajah"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Buka Kunci Wajah & Cap Jari"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Buka Kunci Wajah & Cap Jari untuk kerja"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Persediaan diperlukan"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Wajah dan cap jari ditambahkan"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Pasang apl"</b>\n"Pasang apl yang mahu anda rahsiakan dalam ruang anda"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Sentiasa ingat"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apl dihentikan apabila anda mengunci ruang anda"</b>\n"Apabila anda mengunci ruang anda, apl dalam ruang anda akan dihentikan dan anda tidak akan menerima pemberitahuan daripada apl itu"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Ruang privasi tidak sesuai untuk apl yang perlu dijalankan pada latar atau menghantar pemberitahuan genting seperti apl perubatan. Hal ini kerana pemberitahuan dan aktiviti latar dihentikan semasa ruang anda dikunci.\n\nApl dalam ruang privasi tidak akan dipaparkan dalam pengurus kebenaran, papan pemuka privasi dan tetapan lain apabila ruang privasi dikunci.\n\nRuang privasi anda tidak boleh dialihkan kepada peranti baharu. Anda perlu menyediakan ruang privasi lain jika anda mahu menggunakan ruang privasi itu pada peranti lain.\n\nSesiapa sahaja yang menyambungkan peranti anda kepada komputer atau memasang apl berbahaya pada peranti anda mungkin dapat mengakses ruang privasi anda."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Ruang privasi tidak sesuai untuk apl yang perlu dijalankan pada latar atau menghantar pemberitahuan genting seperti apl perubatan. Hal ini kerana pemberitahuan dan aktiviti latar dihentikan semasa ruang anda dikunci.\n\nApl dalam ruang privasi tidak akan dipaparkan dalam pengurus kebenaran, papan pemuka privasi dan tetapan lain apabila ruang privasi dikunci.\n\nRuang privasi anda tidak boleh dipulihkan pada peranti baharu. Anda perlu menyediakan ruang privasi lain jika anda mahu menggunakan ruang privasi pada peranti lain.\n\nSesiapa sahaja yang menyambungkan peranti anda kepada komputer atau memasang apl berbahaya pada peranti anda mungkin dapat mengakses ruang privasi anda."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Ketahui lebih lanjut tentang ruang privasi"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Proses ini akan mengambil sedikit masa"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Menyediakan ruang privasi…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Mulakan Semula Peranti?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Pengelogan butiran NFC adalah khusus untuk tujuan pembangunan sahaja. Data tambahan NFC disertakan dalam laporan pepijat yang mungkin mengandungi maklumat peribadi. Mulakan semula peranti anda untuk menukar tetapan ini."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Mulakan semula"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"cermin, paparan luaran, paparan tersambung, paparan usb, peleraian, putaran"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Putaran"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"Kecerahan skrin anda akan dilaraskan secara automatik dengan persekitaran dan aktiviti. Anda boleh mengalihkan peluncur secara manual untuk membantu kecerahan boleh suai mempelajari pilihan anda."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"Paparkan imbangan putih"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Gunakan papan kekunci pada skrin"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Pastikan papan kekunci itu pada skrin semasa papan kekunci fizikal aktif"</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="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="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="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 & alatan profil kerja"</string>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Tukar gaya isian penunjuk kepada warna kuning"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Tukar gaya isian penunjuk kepada warna merah jambu"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Tukar gaya isian penunjuk kepada warna biru"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Gaya lejang penuding"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Putih"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Hitam"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Tiada"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Pengguna dipilih: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Pertuturan"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kelajuan penuding"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Skala penuding"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Kurangkan skala penuding"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Tingkatkan skala penuding"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Pengawal Permainan"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Ubah hala getaran"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Hantar getaran ke pengawal permainan apabila disambungkan"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Teruskan juga"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Batal"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Tetapan pembesaran"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Penyorotan satu jari"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Gerakkan kanta pembesar menggunakan 1 jari"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Seret 1 jari untuk menerokai skrin"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Alihkan kawasan pembesaran dengan menyeret satu jari."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Alihkan kawasan pembesaran dengan menyeret dua jari."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Tidak tersedia semasa hanya membesarkan sebahagian daripada skrin"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Ketik butang untuk mengezum"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zum masuk dengan pantas pada skrin untuk menjadikan kandungan lebih besar"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Untuk mengezum masuk:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulakan pembesaran<br/> {1,number,integer}. Ketik skrin<br/> {2,number,integer}. Seret 2 jari untuk menerokai skrin<br/> {3,number,integer}. Jepit dengan 2 jari untuk melaraskan zum<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> <b>Untuk mengezum masuk sementara:</b><br/> {0,number,integer}. Pastikan jenis pembesaran ditetapkan kepada skrin penuh<br/> {1,number,integer}. Gunakan pintasan untuk memulakan pembesaran<br/> {2,number,integer}. Sentuh & tahan di mana-mana pada skrin<br/> {3,number,integer}. Seret jari untuk menerokai skrin<br/> {4,number,integer}. Angkat jari untuk menghentikan pembesaran"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Untuk mengezum masuk:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulakan pembesaran<br/> {1,number,integer}. Ketik skrin<br/> {2,number,integer}. Seret 2 jari untuk menerokai skrin<br/> {3,number,integer}. Cubit dengan 2 jari untuk melaraskan zum<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> Anda juga boleh mengezum masuk untuk sementara waktu dan banyak lagi."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Untuk mengezum masuk:</b><br/> {0,number,integer}. Gunakan pintasan untuk memulakan pembesaran<br/> {1,number,integer}. Ketik skrin<br/> {2,number,integer}. Seret 1 atau 2 jari untuk menerokai skrin<br/> {3,number,integer}. Cubit dengan 2 jari untuk melaraskan zum<br/> {4,number,integer}. Gunakan pintasan untuk menghentikan pembesaran<br/><br/> Anda juga boleh mengezum masuk untuk sementara waktu dan banyak lagi."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Apabila pembesaran dihidupkan, anda boleh mengezum masuk pada skrin.\n\n"<b>"Untuk mengezum"</b>", mulakan pembesaran, kemudian ketik di mana-mana pada skrin.\n"<ul><li>"Seret sekurang-kurangnya 2 jari untuk menatal"</li>\n<li>"Cubit menggunakan sekurang-kurangnya 2 jari untuk melaraskan zum"</li></ul>\n\n<b>"Untuk mengezum sementara"</b>", mulakan pembesaran, kemudian sentuh & tahan di mana-mana pada skrin.\n"<ul><li>"Seret untuk beralih-alih di sekitar skrin"</li>\n<li>"Angkat jari untuk mengezum keluar"</li></ul>\n\n"Anda tidak boleh mengezum masuk pada papan kekunci atau bar navigasi."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Halaman <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> daripada <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Pintasan butang kebolehaksesan"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tiada}=1{1 jadual ditetapkan}other{# jadual ditetapkan}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Mod Keutamaan"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Tambahkan mod"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dapatkan pemberitahuan daripada orang dan apl penting sahaja"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Pilih jenis pengaktifan"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Masa"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Cth. \"9:30 – 5:00 PTG\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Cth. \"Kalendar peribadi\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Buat mod"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Tersuai"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hadkan gangguan"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Hidupkan Jangan Ganggu"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Bunyi penggera dan media boleh ganggu"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Jadual"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Padamkan jadual"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Padam"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Namakan semula"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Padam"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Padamkan mod \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Jadual"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Jadual"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Tambahkan kalendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Gunakan kalendar anda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Jadual"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Tetapkan jadual"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Jadual"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> jam, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Hidupkan secara automatik"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Jadual"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Senyapkan telefon pd masa tertentu"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Tetapkan peraturan Jangan Ganggu"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Benarkan gangguan yang berbunyi"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Sekat gangguan visual"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Benarkan isyarat visual"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Pemberitahuan yang boleh anda terima"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Tumpukan perhatian"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Tindakan tambahan"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Mati}=1{Mati / 1 mod boleh dihidupkan secara automatik}other{Mati / # mod boleh dihidupkan secara automatik}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Tetapan paparan"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Pilihan paparan"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Skala kelabu"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"dayakan tema gelap"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Tukar OS dan apl untuk mengutamakan teks terang pada latar gelap, yang mungkin lebih mudah dilihat dan memperoleh penjimatan bateri yang ketara pada sesetengah peranti"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Tiada perubahan paparan}=1{{effect_1}}=2{{effect_1} dan {effect_2}}=3{{effect_1}, {effect_2} dan {effect_3}}other{{effect_1}, {effect_2} dan # lagi}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Tapis gangguan"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Tiada gangguan ditapis"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Pilihan paparan untuk pemberitahuan yang ditapis"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Apabila Jangan Ganggu dihidupkan"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Tiada bunyi daripada pemberitahuan"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"buka pemberitahuan"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Benarkan penundaan pemberitahuan"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Titik pemberitahuan pada ikon apl"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Himpunan pemberitahuan"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Gelembung"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Gelembung"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Gelembungkan perbualan ini"</string>
@@ -3576,7 +3617,7 @@
<string name="notifications_sent_daily" msgid="10274479224185437">"{count,plural, =1{Lebih kurang # pemberitahuan setiap hari}other{Lebih kurang # pemberitahuan setiap hari}}"</string>
<string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{Lebih kurang # pemberitahuan setiap minggu}other{Lebih kurang # pemberitahuan setiap minggu}}"</string>
<string name="notifications_sent_never" msgid="9081278709126812062">"Jangan sekali-kali"</string>
- <string name="manage_notification_access_title" msgid="4154723216570646451">"Membaca, membalas & mengawal pemberitahuan"</string>
+ <string name="manage_notification_access_title" msgid="4154723216570646451">"Bacaan, balasan & kawalan pemberitahuan"</string>
<string name="manage_notification_access_summary" msgid="2907135226478903997">"Kawal apl dan peranti yang boleh membaca pemberitahuan"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Akses ke pemberitahuan profil kerja disekat"</string>
<string name="notification_assistant_title" msgid="5889201903272393099">"Pemberitahuan dipertingkatkan"</string>
@@ -3589,11 +3630,11 @@
<string name="notification_listener_security_warning_summary" msgid="1131986567509818121">"Apl <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan, termasuk maklumat peribadi seperti nama kenalan, foto dan teks mesej yang anda terima. Apl ini juga akan dapat menunda atau mengetepikan pemberitahuan atau mengambil tindakan pada butang dalam pemberitahuan, termasuk menjawab panggilan telefon. \n\nHal ini turut mengupayakan apl untuk menghidupkan atau mematikan ciri Jangan Ganggu dan menukar tetapan yang berkaitan."</string>
<string name="nls_warning_prompt" msgid="1486887096703743841">"Apl <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat:"</string>
<string name="nls_feature_read_title" msgid="7629713268744220437">"Membaca pemberitahuan anda"</string>
- <string name="nls_feature_read_summary" msgid="1064698238110273593">"Ciri ini dapat membaca pemberitahuan anda, termasuk maklumat peribadi seperti kenalan, mesej dan foto."</string>
+ <string name="nls_feature_read_summary" msgid="1064698238110273593">"Apl ini dapat membaca pemberitahuan, termasuk maklumat peribadi seperti kenalan, mesej dan foto."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Membalas mesej"</string>
- <string name="nls_feature_reply_summary" msgid="4492543411395565556">"Ciri ini dapat membalas mesej dan mengambil tindakan pada butang dalam pemberitahuan, termasuk menunda atau mengetepikan pemberitahuan dan menjawab panggilan."</string>
+ <string name="nls_feature_reply_summary" msgid="4492543411395565556">"Apl ini dapat membalas mesej dan mengambil tindakan pada butang dalam pemberitahuan, termasuk menunda atau mengetepikan pemberitahuan dan menjawab panggilan."</string>
<string name="nls_feature_settings_title" msgid="8208164329853194414">"Menukar tetapan"</string>
- <string name="nls_feature_settings_summary" msgid="3770028705648985689">"Ciri ini dapat menghidupkan atau mematikan ciri Jangan Ganggu dan menukar tetapan yang berkaitan."</string>
+ <string name="nls_feature_settings_summary" msgid="3770028705648985689">"Apl ini dapat menghidupkan atau mematikan ciri Jangan Ganggu dan menukar tetapan yang berkaitan."</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Jika anda mematikan akses pemberitahuan untuk <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, akses Jangan Ganggu mungkin turut dimatikan."</string>
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Matikan"</string>
<string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Batal"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Apl ini tidak menyokong tetapan dipertingkatkan"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Lagi tetapan"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Lagi tetapan tersedia dalam apl ini"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Tempoh bertenang pemberitahuan"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Gunakan tempoh bertenang pemberitahuan"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategori"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Lain-lain"</string>
<string name="no_channels" msgid="4716199078612071915">"Apl ini belum menyiarkan sebarang pemberitahuan"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Tunjukkan kategori tidak digunakan"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Tetapan tambahan dalam apl"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Tunjukkan kategori tidak digunakan"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Sembunyikan kategori tidak digunakan"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apl yang boleh ganggu"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Apl yang dipilih"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Tiada"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Semua"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Pilih lagi apl"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tiada apa-apa yang boleh ganggu"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Tiada seorang pun boleh ganggu"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Sesetengah orang boleh ganggu"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang boleh ganggu"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Pemanggil berulang"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Benarkan pemanggil berulang"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Tukar kepada penggera sahaja selama satu jam hingga {time}}other{Tukar kepada penggera sahaja selama # jam hingga {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Tukar kepada penggera sahaja hingga <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Tukar kepada sentiasa ganggu"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Mod edit"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Tambahkan 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="warning_button_text" msgid="1274234338874005639">"Amaran"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Tutup"</string>
<string name="device_feedback" msgid="5351614458411688608">"Hantar maklum balas peranti ini"</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Sarung"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel Tetapan"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Paksa mod desktop"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Paksa mod desktop percubaan pada paparan kedua"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Dayakan tetingkap bentuk bebas"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Dayakan sokongan untuk tetingkap bentuk bebas."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Dayakan tetingkap bentuk bebas pada paparan kedua"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Dayakan tetingkap bentuk bebas hanya pada paparan kedua."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Dayakan tidak boleh diubah saiz dalam berbilang tetingkap"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Benarkan apl tidak boleh diubah saiz dalam berbilang tetingkap"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Batalkan paksa gelap"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Pemetakan data peranti ini perlu ditukar kepada ext4 sebelum menggunakan pilihan pembangun 16KB. Integriti perisian tidak dapat dijamin dalam mod ini dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin berisiko. Pengaktifan pilihan 16KB akan memerlukan satu lagi but semula selepas ini. Setelah anda berada dalam mod ini, anda boleh bertukar berulang kali antara mod 4KB dengan 16KB menggunakan satu but semula. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk mengembalikan peranti kepada mod pengeluaran, anda perlu menukar kembali kepada mod 4KB dan mengunci pemuat but, yang akan menetapkan semula peranti kepada tetapan kilang. Selepas peranti berjaya dibut kepada Android, lumpuhkan pembukaan kunci OEM dalam Pilihan pembangun. Data peranti akan dihapuskan dan sistem fail akan ditukar kepada ext4 selepas pengesahan. Selepas proses ini selesai, sila kembali untuk mendayakan semula 16KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Padamkan semua data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Gagal memformat semula dan menghapuskan pemetakan data kepada ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Buka Kunci Pemuat But Diperlukan untuk mod 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Buka Kunci Pemuat But Diperlukan"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Peranti ini perlu membuka kunci pemuat but sebelum menggunakan pilihan pembangun 16KB. Integriti perisian tidak boleh dijamin dalam mod ini dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin dalam risiko. Semua data dan tetapan pengguna akan dihapuskan semasa pengaktifan mod 16KB. Setelah pemuat but tidak berkunci, pengaktifan pilihan 16KB memerlukan dua but semula. Setelah anda menggunakan mod ini, anda boleh bertukar berulang kali antara mod 4KB dengan 16KB menerusi satu but semula. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk mengembalikan peranti kepada mod pengeluaran, anda perlu menukar semula kepada mod 4KB dan melakukan penguncian OEM/pemuat but (yang akan melakukan tetapan semula kilang) pada peranti. Sila buka kunci pemuat but dan cuba lagi. Anda boleh melihat arahan tentang cara melakukan perkara ini menerusi <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Menggunakan mod halaman agnostik 4KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Anda menggunakan mod 4KB bagi mod halaman agnostik. Integriti perisian tidak dapat dijamin dalam mod ini, dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin berisiko. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk memasuki semula mod pengeluaran, anda perlu mengunci pemuat but peranti. Ketik untuk mengetahui lebih lanjut."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Anda menggunakan mod 4KB bagi mod halaman agnostik. Integriti perisian tidak dapat dijamin dalam mod ini dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin berisiko. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk memasuki semula mod pengeluaran, anda perlu mengunci pemuat but peranti. Tindakan ini akan menetapkan semula peranti kepada tetapan kilang dan mengembalikan peranti kepada tetapan pengeluaran. Selepas peranti berjaya dibut kepada Android, lumpuhkan pembukaan kunci OEM dalam Pilihan pembangun. Jika peranti gagal mengebut kepada Android atau tidak stabil, denyar semula peranti dengan imej kilang terkini daripada <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> atau gunakan <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dan pilih \'Hapuskan Peranti\', \'Kunci Pemuat But\' dan \'Denyar Paksa semua pemetakan\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Menggunakan mod halaman agnostik 16KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Anda menggunakan mod 16KB bagi mod halaman agnostik. Integriti perisian tidak dapat dijamin dalam mod ini dan sebarang data yang disimpan pada telefon semasa pemuat but tidak berkunci mungkin berisiko. Sesetengah ciri akan dilumpuhkan dalam mod ini, maka sesetengah aplikasi mungkin tidak berfungsi. Untuk memasuki semula mod pengeluaran, anda perlu menukar kembali kepada mod 4K dan mengunci pemuat but peranti. Ketik untuk mengetahui lebih lanjut."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 menukar kembali kepada mod 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dan pilih \'Hapuskan Peranti\', \'Kunci Pemuat But\' dan \'Denyar Paksa semua pemetakan\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Ketik untuk membaca lebih lanjut."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Pengendali laporan pepijat"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Gunakan penyematan apl"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Gunakan pilihan pembangun"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Gunakan perkhidmatan cetakan"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Benarkan berbilang pengguna"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Benarkan penukaran pengguna"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"izinkan, beberapa, pengguna, benarkan, banyak"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"berbilang, pengguna, profil, pengguna, akaun, tukar, pelbagai"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Gunakan nyahpepijat wayarles"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Pilih paparan yang ditampilkan pada skrin apabila tablet didok. Peranti mungkin menggunakan lebih banyak tenaga apabila penyelamat skrin digunakan."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Sesuaikan"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Sesuaikan <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"But semula diperlukan untuk mendayakan sokongan bentuk bebas."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"But semula diperlukan untuk memaksa mod desktop pada paparan sekunder."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"But semula diperlukan untuk mendayakan sokongan tetingkap bentuk bebas yang lama."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"But semula diperlukan untuk menukar sokongan tetingkap bentuk bebas."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"But semula diperlukan untuk memaksa tetingkap bentuk bebas pada paparan kedua."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"But semula sekarang"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"But semula kemudian"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio Ruang"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Hidup"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Mati"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Hidup"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% kiri, %2$d%% kanan"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% kanan, %2$d%% kiri"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Nama peranti anda boleh dilihat oleh apl yang anda pasang. Nama peranti anda juga boleh dilihat oleh orang lain apabila anda menyambung kepada peranti Bluetooth, menyambung kepada rangkaian Wi-Fi atau menyediakan tempat liputan Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Jantina tatabahasa"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Pilih Jantina tatabahasa"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"Tetapan Carian"</string>
</resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 939b5ae..d754ebb 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"အိပ်ရာဝင်ချိန်"</item>
+ <item msgid="4152450357280759894">"ကားမောင်းခြင်း"</item>
+ <item msgid="7096549258219399423">"စီးမျောခြင်း"</item>
+ <item msgid="2760716776980432977">"စီမံပြီးဖြစ်သည်"</item>
+ <item msgid="601734478369121764">"ကြယ်"</item>
+ <item msgid="6243809315432780521">"ပြက္ခဒိန်"</item>
+ <item msgid="4913577903148415331">"အချိန်"</item>
+ <item msgid="3653377604690057780">"ပြဇာတ်ရုံ"</item>
+ <item msgid="3843711267408385410">"ပန်းပွင့်"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 15bc447..fd272cf 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"စက်ပစ္စည်းကို ချိတ်ဆက်မှုဖြုတ်လိုပါသလား။"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"စက်အသစ် တွဲချိတ်ရန်"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ဘလူးတုသ်"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"မနက်ဖြန် အလိုအလျောက်ဖွင့်ရန်"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"နားကြားကိရိယာ ဆက်တင်များ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ဖြတ်လမ်းလင့်ခ်၊ နားကြားကိရိယာ တွဲဖက်အသုံးပြုနိုင်မှု"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ကြိုတင်သတ်မှတ်ချက်"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"သင့်နားအထူးကုဆရာဝန်က စီမံပေးထားသည့် အသင့်သုံးများ မရှိပါ"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"အသင့်သုံးကို အပ်ဒိတ်လုပ်၍မရပါ"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"အသံထွက်မည့် ကိရိယာ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"အသံထွက်မည့် ကိရိယာအကြောင်း"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ပိတ်"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ဖွင့် / အက်ပ် # ခုက တည်နေရာသုံးခွင့် ရှိသည်}other{ဖွင့် / အက်ပ် # ခုက တည်နေရာသုံးခွင့် ရှိသည်}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ဖွင့်နေသည်…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"အနီးတစ်ဝိုက်ရှိ စက်များ၏ ခွင့်ပြုချက်ကိုရထားသော အက်ပ်များက ချိတ်ဆက်ထားသောစက်များ၏ ဆက်စပ်နေရာကို တွက်ချက်နိုင်သည်။"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"အနီးတစ်ဝိုက်ရှိ စက်များ၏ ခွင့်ပြုချက်ကိုရထားသော အက်ပ်များက ချိတ်ဆက်ထားသောစက်များ၏ ဆက်စပ်နေရာကို တွက်ချက်နိုင်သည်။"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"အက်ပ်နှင့် ဝန်ဆောင်မှုများအတွက် တည်နေရာသုံးခွင့်ကို ပိတ်ထားသည်။ သင် အရေးပေါ် နံပါတ်ကို ဖုန်းဆက်သောအခါ (သို့) စာတိုပို့သောအခါ သင့်စက်၏တည်နေရာကို အရေးပေါ်ဆောင်ရွက်ပေးသူများထံ ပို့နိုင်ပါသည်။"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"တည်နေရာပြ ဆက်တင်များအကြောင်း ပိုမိုလေ့လာရန်"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ပြောင်းရန် ChromeOS ဆက်တင်များ > ကိုယ်ရေးအချက်အလက် လုံခြုံမှုနှင့် လုံခြုံရေး > ကိုယ်ရေးအချက်အလက်လုံခြုံမှု ဆက်တင်များ > တည်နေရာ အသုံးပြုခွင့်သို့ သွားပါ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"မျက်နှာနှင့် <xliff:g id="WATCH">%s</xliff:g> ကို ထည့်လိုက်ပါပြီ"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"မျက်နှာ၊ လက်ဗွေနှင့် <xliff:g id="WATCH">%s</xliff:g> ကို ထည့်လိုက်ပါပြီ"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"မျက်နှာ၊ လက်ဗွေများနှင့် <xliff:g id="WATCH">%s</xliff:g> ကို ထည့်လိုက်ပါပြီ"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"‘အထောက်အထား စစ်ဆေးခြင်း’ ကို ဖွင့်ပြီးနောက်ပိုင်း ၎င်းကို လိုအပ်သည်"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"အဝေးထိန်း Authenticator ဖွင့်ခြင်း"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"နာရီထည့်လိုက်ပြီ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"လက်ပတ်နာရီ စနစ်ထည့်သွင်းခြင်း"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"‘နာရီဖြင့်ဖွင့်ခြင်း’ အကြောင်း ပိုမိုလေ့လာရန်"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"နာရီထည့်ရန်"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"နာရီ ဖယ်ရှားရန်"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"လက်ဗွေနှင့် မျက်နှာပြ လော့ခ်ဖွင့်ခြင်း"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"မျက်နှာ၊ လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"အလုပ်အတွက် ‘မျက်နှာပြနှင့် လက်ဗွေသုံး လော့ခ်ဖွင့်ခြင်း’"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"စနစ်ထည့်သွင်းရန် လိုအပ်သည်"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"မျက်နှာနှင့် လက်ဗွေများ ထည့်ပြီးပါပြီ"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"အက်ပ်များ ထည့်သွင်းပါ"</b>\n"သင်၏နေရာတွင် သီးသန့်ထားလိုသော အက်ပ်များကို ထည့်သွင်းပါ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"သတိပြုရန်"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"သင့်နေရာကို လော့ခ်ချပါက အက်ပ်များ ရပ်သွားမည်"</b>\n"သင့်နေရာကို လော့ခ်ချပါက သင်၏နေရာရှိ အက်ပ်များ ရပ်သွားပြီး ၎င်းတို့ထံမှ အကြောင်းကြားချက်များကို ရရှိတော့မည်မဟုတ်ပါ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"သီးသန့်နေရာများသည် ဆေးဘက်ဆိုင်ရာအက်ပ်များကဲ့သို့ အရေးကြီးအကြောင်းကြားချက်များ ပို့ရန် (သို့) နောက်ခံတွင်လုပ်ဆောင်ရန် လိုအပ်သော အက်ပ်များအတွက် မသင့်လျော်ပါ။ သင့်နေရာကို လော့ခ်ချလိုက်သောအခါ အကြောင်းကြားချက်များနှင့် နောက်ခံလုပ်ဆောင်ချက်တို့ ရပ်သွားသောကြောင့်ဖြစ်သည်။\n\nသင်၏သီးသန့်နေရာကို လော့ခ်ချထားသောအခါ ၎င်းရှိ အက်ပ်များကို ခွင့်ပြုချက်စီမံစနစ်၊ ကိုယ်ရေးအချက်အလက် လုံခြုံမှုဒက်ရှ်ဘုတ်နှင့် အခြားဆက်တင်များတွင် မြင်ရမည်မဟုတ်ပါ။\n\nသင်၏သီးသန့်နေရာကို စက်အသစ်သို့ ရွှေ့၍မရပါ။ ၎င်းကို အခြားစက်တွင် သုံးလိုပါက သီးသန့်နေရာနောက်တစ်ခုကို စီစဉ်သတ်မှတ်ရမည်။\n\nသင့်စက်ကို ကွန်ပျူတာနှင့် ချိတ်ဆက်သော (သို့) သင့်စက်တွင် အန္တရာယ်ရှိသည့်အက်ပ်များ ထည့်သွင်းသော မည်သူမဆို သင်၏သီးသန့်နေရာကို ဝင်နိုင်မည်။"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"သီးသန့်နေရာများသည် ဆေးဘက်ဆိုင်ရာအက်ပ်များကဲ့သို့ အရေးကြီးအကြောင်းကြားချက်များ ပို့ရန် (သို့) နောက်ခံတွင်လုပ်ဆောင်ရန် လိုအပ်သော အက်ပ်များအတွက် မသင့်လျော်ပါ။ သင့်နေရာကို လော့ခ်ချလိုက်သောအခါ အကြောင်းကြားချက်များနှင့် နောက်ခံလုပ်ဆောင်ချက်တို့ ရပ်သွားသောကြောင့်ဖြစ်သည်။\n\nသီးသန့်နေရာကို လော့ခ်ချထားသောအခါ ၎င်းရှိ အက်ပ်များကို ခွင့်ပြုချက်စီမံစနစ်၊ ကိုယ်ရေးအချက်အလက် လုံခြုံမှုဒက်ရှ်ဘုတ်နှင့် အခြားဆက်တင်များတွင် မြင်ရမည်မဟုတ်ပါ။\n\nသင်၏သီးသန့်နေရာကို စက်အသစ်တွင် ပြန်ယူ၍မရပါ။ ၎င်းကို အခြားစက်တွင် သုံးလိုပါက နေရာနောက်တစ်ခုကို စီစဉ်သတ်မှတ်ရမည်။\n\nသင့်စက်ကို ကွန်ပျူတာနှင့် ချိတ်ဆက်သော (သို့) သင့်တွင် အန္တရာယ်ရှိသည့်အက်ပ်များ ထည့်သွင်းသော မည်သူမဆို သင်၏သီးသန့်နေရာကို ဝင်နိုင်မည်။"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"သီးသန့်နေရာအကြောင်း ပိုမိုလေ့လာရန်"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"အချိန်အနည်းငယ် ကြာပါမည်"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"သီးသန့်နေရာကို စနစ်ထည့်သွင်းနေသည်…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"စက်ကို ပြန်စမလား။"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"အသေးစိတ် NFC မှတ်တမ်းတင်ခြင်းကို ဆော့ဖ်ဝဲရေးရန်အတွက်သာ ရည်ရွယ်ထားသည်။ ကိုယ်ရေးကိုယ်တာ အချက်အလက်များ ပါရှိနိုင်သော ချွတ်ယွင်းမှု အစီရင်ခံချက်များတွင် ထပ်ဆောင်း NFC ဒေတာ ပါဝင်သည်။ ဤဆက်တင်ပြောင်းရန် သင့်စက်ကို ပြန်စပါ။"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ပြန်စရန်"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"စကရင်ပွား၊ ပြင်ပဖန်သားပြင်၊ ချိတ်ထားသောဖန်သားပြင်၊ USB ဖန်သားပြင်၊ ပုံရိပ်ပြတ်သားကိန်း၊ လှည့်ခြင်း"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"လှည့်ခြင်း"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ပုံမှန်"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"မျက်နှာပြင်လက်ကွက်ကို သုံးခြင်း"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"စက်၏ကီးဘုတ် ဖွင့်ထားစဉ်တွင် ၎င်းကို ဖန်သားပြင်ပေါ်တွင် ဆက်ထားပါ"</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> ms အတွင်း ကီးတစ်ခုတည်း အကြိမ်ကြိမ် အမြန်နှိပ်ခြင်းကို လျစ်လျူရှုသည်"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"မြား ဖြည့်စွက်ပုံစံကို အဝါ ပြောင်းရန်"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"မြား ဖြည့်စွက်ပုံစံကို ပန်းရောင် ပြောင်းရန်"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"မြား ဖြည့်စွက်ပုံစံကို အပြာ ပြောင်းရန်"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"မြားစုတ်ချက် ပုံစံ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"အဖြူ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"အမည်း"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"မရှိ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"အသုံးပြုသူ၏ ရွေးချယ်မှု- <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"စကားသံ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"မြားရွေ့နှုန်း"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"မြားအရွယ်အစား"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"မြားအရွယ်အစား သေးရန်"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"မြားအရွယ်အစား ကြီးရန်"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ဂိမ်းထိန်းချုပ်ခြင်း"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"တစ်ဆင့်ပြန်ညွှန်ပြခြင်း တုန်ခါမှု"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ချိတ်ဆက်ထားသည့်အခါ တုန်ခါမှုကို ဂိမ်းခလုတ်ဆီသို့ ပို့ရန်"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"မည်သို့ပင်ဖြစ်စေ ရှေ့ဆက်ရန်"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"မလုပ်တော့"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ပုံကြီးချဲ့ခြင်း ဆက်တင်များ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"လက်တစ်ချောင်းသုံး ရွှေ့ကြည့်ခြင်း"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"မှန်ဘီလူးကို လက် ၁ ချောင်းဖြင့် ရွှေ့ပါ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ဖန်သားပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် လက် ၁ ချောင်းဖြင့် ဖိဆွဲပါ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"လက်တစ်ချောင်းဖြင့် ဖိဆွဲ၍ ချဲ့ပြသည့်အကွက်ကို ရွှေ့နိုင်သည်။"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"လက်နှစ်ချောင်းဖြင့် ဖိဆွဲ၍ ချဲ့ပြသည့်အကွက်ကို ရွှေ့နိုင်သည်။"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ဖန်သားပြင်၏တစ်စိတ်တစ်ပိုင်းကိုသာ ချဲ့နေစဉ် မရနိုင်ပါ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ဇူးမ်အသုံးပြုရန် ခလုတ်ကို တို့ပါ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"အကြောင်းအရာပိုကြီးလာစေရန် ဖန်သားပြင်တွင် အမြန်ဇူးမ်ဆွဲနိုင်သည်"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ဇူးမ်ဆွဲရန်အတွက်-</b><br/> {0,number,integer}။ စတင်ချဲ့ရန် ဖြတ်လမ်းလင့်ခ်ကို သုံးပါ<br/> {1,number,integer}။ ဖန်သားပြင်ကို တို့ပါ<br/> {2,number,integer}။ ဖန်သားပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် လက် ၂ ချောင်းဖြင့် ဖိဆွဲပါ<br/> {3,number,integer}။ ဇူးမ်ချိန်ညှိရန် လက် ၂ ချောင်းဖြင့် ချဲ့ချုံ့ပါ<br/> {4,number,integer}။ ချဲ့ခြင်းကို ရပ်ရန် ဖြတ်လမ်းလင့်ခ်ကို သုံးပါ<br/><br/> <b>ယာယီ ဇူးမ်ဆွဲရန်-</b><br/> {0,number,integer}။ ချဲ့သည့်ပုံစံကို ဖန်သားပြင်အပြည့် သတ်မှတ်ထားကြောင်း သေချာပါစေ<br/> {1,number,integer}။ စတင်ချဲ့ရန် ဖြတ်လမ်းလင့်ခ်ကို သုံးပါ<br/> {2,number,integer}။ ဖန်သားပြင်တစ်နေရာတွင် ထိပြီး ဖိထားပါ<br/> {3,number,integer}။ ဖန်သားပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် လက်ချောင်းကို ဖိဆွဲပါ<br/> {4,number,integer}။ ချဲ့ခြင်း ရပ်ရန် လက်ချောင်းကို ကြွပါ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ဇူးမ်ဆွဲရန်အတွက်-</b><br/> {0,number,integer}။ စတင်ချဲ့ရန် ဖြတ်လမ်းလင့်ခ်ကို သုံးပါ<br/> {1,number,integer}။ ဖန်သားပြင်ကို တို့ပါ<br/> {2,number,integer}။ ဖန်သားပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် လက် ၂ ချောင်းဖြင့် ဖိဆွဲပါ<br/> {3,number,integer}။ ဇူးမ်ချိန်ညှိရန် လက် ၂ ချောင်းဖြင့် ချဲ့ချုံ့ပါ<br/> {4,number,integer}။ ချဲ့ခြင်းကိုရပ်ရန် ဖြတ်လမ်းအသုံးပြုပါ<br/><br/> ယာယီဇူးမ်ဆွဲခြင်းနှင့် အခြားအရာများလည်း လုပ်နိုင်သည်။"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ဇူးမ်ဆွဲရန်အတွက်-</b><br/> {0,number,integer}။ စတင်ချဲ့ရန် ဖြတ်လမ်းလင့်ခ်ကို သုံးပါ<br/> {1,number,integer}။ ဖန်သားပြင်ကို တို့ပါ<br/> {2,number,integer}။ ဖန်သားပြင်ပေါ်တွင် ရွှေ့ကြည့်ရန် လက် ၁ ချောင်း သို့မဟုတ် ၂ ချောင်းဖြင့် ဖိဆွဲပါ<br/> {3,number,integer}. ဇူးမ်ချိန်ညှိရန် လက် ၂ ချောင်းဖြင့် ချဲ့ချုံ့ပါ<br/> {4,number,integer}။ ချဲ့ခြင်းကိုရပ်ရန် ဖြတ်လမ်းအသုံးပြုပါ<br/><br/> ယာယီဇူးမ်ဆွဲခြင်းနှင့် အခြားအရာများလည်း လုပ်နိုင်သည်။"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"မှန်ဘီလူးကို ဖွင့်ထားသည့်အခါ သင့်ဖန်သားပြင်ပေါ်တွင် ဇူးမ်ဆွဲနိုင်ပါသည်။\n\n"<b>"ဇူးမ်ဆွဲရန်"</b>" မှန်ဘီလူးကို ဖွင့်ပြီး ဖန်သားပြင်ပေါ်ရှိ နေရာတစ်ခုတွင် တို့ပါ။\n"<ul><li>"လှိမ့်ရွှေ့ရန် အနည်းဆုံး လက်ချောင်း ၂ ချောင်းဖြင့် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ကို ချိန်ညှိရန် အနည်းဆုံး လက်ချောင်း ၂ ချောင်းဖြင့် ဆွဲကပ်ပါ"</li></ul>\n\n<b>"ယာယီဇူးမ်ဆွဲရန်"</b>" မှန်ဘီလူးကို ဖွင့်ပြီး ဖန်သားပြင်ပေါ်ရှိ တစ်နေနေရာတွင် ဖိထားပါ။\n"<ul><li>"ဖန်သားပြင်တစ်လျှောက် ရွှေ့ကြည့်ရန် ဖိဆွဲပါ"</li>\n<li>"ဇူးမ်ဖြုတ်ရန် လက်ချောင်းကို မ လိုက်ပါ"</li></ul>\n\n"ကီးဘုတ် သို့မဟုတ် လမ်းညွှန်ဘားကို ဇူးမ်ဆွဲ၍ မရပါ။"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"စာမျက်နှာ <xliff:g id="NUM_PAGES">%2$d</xliff:g> မျက်နှာအနက် <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> မျက်နှာ"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"သုံးနိုင်မှုခလုတ် ဖြတ်လမ်းလင့်ခ်"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{မရှိ}=1{အချိန်ဇယား ၁ ခု သတ်မှတ်ထားသည်}other{အချိန်ဇယား # ခု သတ်မှတ်ထားသည်}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"မနှောင့်ယှက်ရ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ဦးစားပေးမုဒ်"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"မုဒ်ထည့်ရန်"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"အရေးကြီးပုဂ္ဂိုလ်များနှင့် အက်ပ်များထံမှသာ အကြောင်းကြားချက် ရယူပါ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"စသုံးခြင်းအမျိုးအစား ရွေးရန်"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"အချိန်"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ဥပမာ- “နံနက် ၉:၃၀ - ညနေ ၅:၀၀”"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ပြက္ခဒိန်"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ဥပမာ- “ကိုယ်ပိုင်ပြက္ခဒိန်”"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"မုဒ် ပြုလုပ်ခြင်း"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"စိတ်ကြိုက်"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"အနှောင့်အယှက်များကို တားဆီးသည်"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'မနှောင့်ယှက်ရ\' ဖွင့်ခြင်း"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"နိုးစက်နှင့် မီဒီယာအသံများ ကြားဖြတ်နိုင်သည်"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"အချိန်ဇယားများ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"အချိန်ဇယားများ ဖျက်ရန်"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ဖျက်ရန်"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"အမည်ပြောင်းရန်"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ဖျက်ရန်"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"“<xliff:g id="MODE">%1$s</xliff:g>” ကို ဖျက်မလား။"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"တည်းဖြတ်ရန်"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"အချိန်ဇယားများ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"အချိန်ဇယား"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"ပြက္ခဒိန်ထည့်ရန်"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"သင့်ပြက္ခဒိန်သုံးရန်"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"စီစဉ်ရန်"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"အချိန်ဇယား သတ်မှတ်ပါ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"အချိန်ဇယားဆွဲရန်"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> နာရီ၊ <xliff:g id="MINUTES">%2$d</xliff:g> မိနစ်"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"အလိုအလျောက်ဖွင့်ရန်"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"အချိန်ဇယား"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"အချို့အချိန်၌ ဖုန်းအသံတိတ်ခြင်း"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'မနှောင့်ယှက်ရ\' စည်းမျဉ်းများထည့်ရန်"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"အသံပေးသည့် ကြားဖြတ်မှုများ ခွင့်ပြုပါ"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"မြင်ကွင်းပိတ်ခြင်းမှတားဆီးပါ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ပြသမှုများကို ခွင့်ပြုရန်"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"သင့်ထံ ဆက်သွယ်နိုင်သော အကြောင်းကြားချက်များ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"အာရုံမပျက်ပါစေနှင့်"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"နောက်ထပ် လုပ်ဆောင်ချက်များ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ပိတ်ရန်}=1{ပိတ်ရန် / မုဒ် ၁ ခု အလိုအလျောက်ပွင့်နိုင်သည်}other{ပိတ်ရန် / မုဒ် # ခု အလိုအလျောက်ပွင့်နိုင်သည်}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ဖန်သားပြင် ဆက်တင်များ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ဖန်သားပြင်တွင် ပြသမှုရွေးစရာများ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"အဖြူအမည်း"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"အမှောင်နောက်ခံ သုံးရန်"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"အမှောင်နောက်ခံတွင် လင်းသောစာသားကို ပိုမိုနှစ်သက်ပါက OS နှင့် အက်ပ်များကို ပြောင်းနိုင်သည်။ ၎င်းသည် မျက်လုံးအားစိုက်ရမှု ပိုမိုသက်သာစေနိုင်ပြီး စက်ပစ္စည်းအချို့တွင် ဘက်ထရီ သိသာစွာ ချွေတာနိုင်သည်"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"အနှောင့်အယှက်များ စစ်ထုတ်ရန်"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"အနှောင့်အယှက်များကို စစ်ထုတ်ထားခြင်း မရှိပါ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"အကြောင်းကြားချက်ကို ဖွင့်ရန်"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"အကြောင်းကြားချက် ဆိုင်းငံ့ခြင်းကို ခွင့်ပြုပါ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"အက်ပ်သင်္ကေတပေါ်ရှိ အကြောင်းကြားချက် အစက်"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"အတွဲလိုက် အကြောင်းကြားချက်များ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ပူဖောင်းကွက်များ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ပူဖောင်းကွက်များ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ဤစကားဝိုင်းကို ပူဖောင်းကွက်အဖြစ် ပြရန်"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ဤအက်ပ်က အဆင့်မြှင့်ထားသော ဆက်တင်များကို မပံ့ပိုးပါ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"နောက်ထပ်ဆက်တင်များ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ဤအက်ပ်အတွင်း ဆက်တင်များ ရရှိနိုင်သည်"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"အကြောင်းကြားချက် အသံလျော့ချမှု"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"အလုပ်ပရိုဖိုင်များတွင် သုံးရန်"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"အလုပ်ပရိုဖိုင်အက်ပ်များတွင် သုံးရန်"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"အမျိုးအစားများ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"အခြား"</string>
<string name="no_channels" msgid="4716199078612071915">"ဤအက်ပ်က မည်သည့် အကြောင်းကြားချက်ကိုမျှ ပို့စ်တင်မထားပါ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"မသုံးသော အမျိုးအစားများကို ပြပါ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"အက်ပ်အတွင်း နောက်ထပ်ဆက်တင်များ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"မသုံးသော အမျိုးအစားများကို ပြရန်"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"မသုံးသော အမျိုးအစားများကို ဝှက်ရန်"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ကြားဖြတ်နိုင်သည့် အက်ပ်များ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ရွေးချယ်ထားသော အက်ပ်များ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"မရှိ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"အားလုံး"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"အက်ပ်များကို အစားထိုးခွင့်ပြုပါ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ကြားဖြတ်နိုင်သည့် အက်ပ်များ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"နောက်ထပ်အက်ပ်များကို ရွေးပါ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"မည်သူမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"အချို့သူများ ကြားဖြတ်နိုင်သည်"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"လူတိုင်းက ကြားဖြတ်နိုင်သည်"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"အကြိမ်ကြိမ်ခေါ်ဆိုသူများ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ထပ်မံခေါ်ဆိုသူများကို ခွင့်ပြုပါ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} အထိ တစ်နာရီအတွက်သာ နှိုးစက်များတွင် ပြောင်းမည်}other{{time} အထိ # နာရီအတွက်သာ နှိုးစက်များတွင် ပြောင်းမည်}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> အထိနိုးစက်သာလျှင် သို့ပြောင်းမည်"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"မုဒ်ပြင်ခြင်း"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"မုဒ်ထည့်ခြင်း"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"စိတ်ကြိုက်မုဒ်"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"မုဒ်အမည်"</string>
<string name="warning_button_text" msgid="1274234338874005639">"သတိပေးချက်"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ပိတ်ရန်"</string>
<string name="device_feedback" msgid="5351614458411688608">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ဒက်စ်တော့ပုံစံ မဖြစ်မနေ ပြောင်းရန်"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ဒုတိယ မျက်နှာပြင်ပြသမှုများတွင် ဒက်စ်တော့ပုံစံ မဖြစ်မနေ စမ်းသပ်ရန်"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"အလွတ်ပုံစံဝင်းဒိုးများ ဖွင့်ခြင်း"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"အလွတ်ပုံစံ ဝင်းဒိုးများအတွက် ပံ့ပိုးမှု ရယူရန်။"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"ဒုတိယဖန်သားပြင်၌ အလွတ်ပုံစံဝင်းဒိုးစနစ် ဖွင့်ရန်"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ဒုတိယဖန်သားပြင်တွင် အလွတ်ပုံစံ ဝင်းဒိုးများ ဖွင့်နိုင်သည်။"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"အရွယ်မပြင်နိုင်သည်များကို ဝင်းဒိုးများစွာတွင် ဖွင့်ရန်"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"အရွယ်မပြင်နိုင်သည့် အက်ပ်များကို ဝင်းဒိုးများစွာတွင် ဖွင့်ခွင့်ပြုသည်"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"မဖြစ်မနေအမှောင်ချခြင်းကို အစားထိုးရန်"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"၁၆ KB ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများကို အသုံးမပြုမီ ဤစက်၏ ဒေတာအပိုင်းကို ext4 သို့ ပြောင်းရမည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ၁၆ KB ရွေးစရာကို စဖွင့်ရန်အတွက် ဤသို့ပြောင်းပြီးနောက်တွင် နောက်တစ်ကြိမ်ပြန်လည်စတင်ရန် လိုပါမည်။ ဤမုဒ်သို့ ရောက်သည်နှင့် သင်သည် ၄ KB နှင့် ၁၆ KB မုဒ်အကြား တစ်ကြိမ်ပြန်လည်စတင်ရုံဖြင့် အပြန်အလှန်ပြောင်းနိုင်ပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ စက်ကို ထုတ်ကုန်မုဒ်သို့ ပြန်ထားရန် ၄ KB မုဒ်သို့ ပြန်ပြောင်းပြီး စက်ကို စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးသည့် စနစ်စတင်မှုကို လော့ခ်ချရမည်။ စက်ကို Android သို့ စတင်ပြီးနောက် ‘ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများ’ ရှိ OEM ဖွင့်ခြင်းကို ပိတ်ပါ။ အတည်ပြုပြီးနောက် စက်ကို ရှင်းလင်းပြီး ဖိုင်စနစ်ကို ext4 သို့ ပြောင်းပါမည်။ ဤသို့ပြုလုပ်ပြီးနောက် ၁၆ KB ထပ်ဖွင့်ရန် ပြန်လာပါ။"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ဒေတာအားလုံး ဖျက်ရန်"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ဒေတာအပိုင်းကို ext4 သို့ ပြန်လည်ဖော်မက်လုပ်ပြီး ရှင်းလင်း၍ မရပါ။"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"၁၆ KB မုဒ်အတွက် စနစ်စတင်မှု ဖွင့်ရန်လိုအပ်သည်"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"စနစ်စတင်မှု ဖွင့်ရန်လိုအပ်သည်"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"၁၆ KB ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများကို အသုံးမပြုမီ ဤစက်ကို စနစ်စတင်မှု ဖွင့်ရမည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ၁၆ KB မုဒ်ကို စတင်နေသောအခါ အသုံးပြုသူဒေတာနှင့် ဆက်တင်အားလုံးကို ရှင်းလင်းပါမည်။ စနစ်စတင်မှုကို ဖွင့်ပြီးပါက ၁၆ KB ရွေးစရာကို စတင်ရာတွင် နှစ်ကြိမ်ပြန်လည်စတင်ရန်လိုပါမည်။ ဤမုဒ်သို့ ရောက်သည်နှင့် သင်သည် ၄ KB နှင့် ၁၆ KB မုဒ်အကြား တစ်ကြိမ်ပြန်လည်စတင်ရုံဖြင့် အပြန်အလှန်ပြောင်းနိုင်ပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ စက်ကို ထုတ်ကုန်မုဒ်သို့ ပြန်ထားရန် ၄ KB မုဒ်သို့ ပြန်ပြောင်းပြီး စက်ကို (စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးသည့်) OEM/စနစ်စတင်မှုကို လော့ခ်ချရမည်။ စနစ်စတင်မှုကို ဖွင့်ပြီး ထပ်စမ်းကြည့်ပါ။ ယင်းသို့ ပြုလုပ်ပုံ ညွှန်ကြားချက်များကို <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a&gt တွင် တွေ့နိုင်ပါသည်၊"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သော ၄ KB မုဒ်ကို အသုံးပြုခြင်း"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၄ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ နောက်ထပ်ဖတ်ရန် တို့ပါ။"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၄ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ ၎င်းသည် စက်ကို စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးပြီး ထုတ်ကုန် ဆက်တင်များအတိုင်း ပြန်ပြောင်းပေးပါမည်။ စက်ကို Android သို့ စတင်ပြီးနောက် ‘ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများ’ ရှိ OEM ဖွင့်ခြင်းကို ပိတ်ပါ။ စက်ကို Android သို့ စတင်၍မရပါက သို့မဟုတ် မတည်ငြိမ်ပါက href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a&gt မှ နောက်ဆုံးပေါ် စက်ရုံထုတ် မူလပုံများဖြင့် စက်ကို ပြန်စပါ သို့မဟုတ် <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a&gt ကို အသုံးပြုကာ ‘စက်ရှင်းလင်းရန်’၊ ‘စနစ်စတင်မှု လော့ခ်ချရန်’ နှင့် ‘အပိုင်းအားလုံး မဖြစ်မနေ ပြန်စရန်’ ကို ရွေးပါ။"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သော ၁၆ KB မုဒ်ကို အသုံးပြုခြင်း"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၁၆ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် ၄K မုဒ်သို့ ပြန်ပြောင်းပြီး စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ နောက်ထပ်ဖတ်ရန် တို့ပါ။"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၁၆ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် ၄K မုဒ်သို့ ပြန်ပြောင်းပြီး စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ ၎င်းသည် စက်ကို စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးပြီး ထုတ်ကုန် ဆက်တင်များအတိုင်း ပြန်ပြောင်းပေးပါမည်။ စက်ကို Android သို့ စတင်ပြီးနောက် ‘ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများ’ ရှိ OEM ဖွင့်ခြင်းကို ပိတ်ပါ။ စက်ကို Android သို့ စတင်၍မရပါက သို့မဟုတ် မတည်ငြိမ်ပါက href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a&gt မှ နောက်ဆုံးပေါ် စက်ရုံထုတ် မူလပုံများဖြင့် စက်ကို ပြန်မွမ်းမံပါ သို့မဟုတ် <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a&gt ကို အသုံးပြုကာ ‘စက်ရှင်းလင်းရန်’၊ ‘စနစ်စတင်မှု လော့ခ်ချရန်’ နှင့် ‘အပိုင်းအားလုံး မဖြစ်မနေ မွမ်းမံရန်’ ကို ရွေးပါ။"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၁၆ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် ၄ KB mode မုဒ်သို့ ပြန်ပြောင်းပြီး စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ နောက်ထပ်ဖတ်ရန် တို့ပါ။"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"သင်သည် စာမျက်နှာအမျိုးမျိုးနှင့် အသုံးပြုနိုင်သောမုဒ်၏ ၁၆ KB မုဒ်တွင် ရှိနေပါသည်။ ဤမုဒ်တွင် ဆော့ဖ်ဝဲစစ်မှန်မှုကို အာမ မခံနိုင်သည့်အပြင် စနစ်စတင်မှု ဖွင့်ထားချိန်၌ ဖုန်းတွင် သိုလှောင်ထားသည့် မည်သည့်ဒေတာမဆို ဆုံးရှုံးနိုင်ခြေ ရှိပါသည်။ ဤမုဒ်များတွင် အင်္ဂါရပ်အချို့ကို ပိတ်ထားမည်ဖြစ်သဖြင့် အချို့အပလီကေးရှင်းများ အလုပ်မလုပ်နိုင်ပါ။ ထုတ်ကုန်မုဒ်သို့ ပြန်ဝင်ရန် ၄ KB mode မုဒ်သို့ ပြန်ပြောင်းပြီး စက်၏ စနစ်စတင်မှုကို လော့ခ်ချရပါမည်။ ၎င်းသည် စက်ကို စက်ရုံထုတ်အတိုင်း ပြင်ဆင်သတ်မှတ်ပေးပြီး ထုတ်ကုန် ဆက်တင်များအတိုင်း ပြန်ပြောင်းပေးပါမည်။ စက်ကို Android သို့ စတင်ပြီးနောက် ‘ဆော့ဖ်ဝဲရေးသူအတွက် ရွေးစရာများ’ ရှိ OEM ဖွင့်ခြင်းကို ပိတ်ပါ။ စက်ကို Android သို့ စတင်၍မရပါက သို့မဟုတ် မတည်ငြိမ်ပါက href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a&gt မှ နောက်ဆုံးပေါ် စက်ရုံထုတ် မူလပုံများဖြင့် စက်ကို ပြန်မွမ်းမံပါ သို့မဟုတ် <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</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="bug_report_handler_title" msgid="713439959113250125">"ချွတ်ယွင်းချက်အစီရင်ခံစာ စီမံသူ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"အက်ပ်ပင်ထိုးခြင်းကို သုံးရန်"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ဆော့ဖ်ဝဲရေးသူ ရွေးစရာများကို သုံးရန်"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ပုံနှိပ်ဝန်ဆောင်မှုကို သုံးရန်"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"အသုံးပြုသူအများအပြား ခွင့်ပြုရန်"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"အသုံးပြုသူ ပြောင်းခွင့်ပြုခြင်း"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ခွင့်ပြုရန်၊ အမျိုးစုံ၊ အသုံးပြုသူ၊ ခွင့်ပြုချက်၊ အများအပြား"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"အများအပြား၊ အသုံးပြုသူများ၊ ပရိုဖိုင်များ၊ လူများ၊ အကောင့်များ၊ ပြောင်းရန်၊ များစွာ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ကြိုးမဲ့ အမှားရှာပြင်ခြင်းကို သုံးပါ"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"တက်ဘလက် တပ်ဆင်ထားချိန် စခရင်တွင် မြင်ရမည့်အရာကို ရွေးနိုင်သည်။ စခရင်နားချိန်ပုံသုံးပါက သင်၏စက်က စွမ်းအင်ပိုသုံးနိုင်သည်။"</string>
<string name="customize_button_title" msgid="1110284655990203359">"စိတ်ကြိုက်လုပ်ရန်"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ကို စိတ်ကြိုက်လုပ်ရန်"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"freeform အကူအညီကို ဖွင့်ရန်အတွက် ပြန်လည်စတင်ရန် လိုအပ်သည်။"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"အရန်ဖန်သားပြင်တွင် ဒက်စ်တော့မုဒ်ကို မဖြစ်မနေ အသုံးပြုရန်အတွက် ပြန်လည်စတင်ရန် လိုအပ်သည်။"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"အလွတ်ပုံစံ ဝင်းဒိုးစနစ်ပံ့ပိုးမှု ဖွင့်ရန်အတွက် ပြန်လည်စတင်ရန် လိုအပ်သည်။"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"အလွတ်ပုံစံ ဝင်းဒိုးစနစ်ပံ့ပိုးမှုကို ပြောင်းရန်အတွက် ပြန်လည်စတင်ရန် လိုအပ်သည်။"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ဒုတိယဖန်သားပြင်၌ အလွတ်ပုံစံ ဝင်းဒိုးစနစ်ကို မဖြစ်မနေ သုံးရန်အတွက် ပြန်လည်စတင်ရန် လိုအပ်သည်။"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ယခု ပြန်လည်စတင်ရန်"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"နောက်မှ ပြန်လည်စတင်ရန်"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ထောင့်စုံအော်ဒီယို"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ဖွင့်"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ပိတ်"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ဖွင့်"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"အသံ %1$d%% ဘယ်၊ %2$d%% ညာ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"အသံ %1$d%% ညာ၊ %2$d%% ဘယ်"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"သင့်စက်အမည်ကို သင်ထည့်သွင်းထားသည့် အက်ပ်များက မြင်ရပါသည်။ ဘလူးတုသ်သုံးစက်များသို့ ချိတ်ဆက်သည့်အခါ၊ Wi-Fi ကွန်ရက်သို့ ချိတ်ဆက်သည့်အခါ (သို့) Wi-Fi ဟော့စပေါ့ ထုတ်လွှင့်သည့်အခါ တို့တွင်လည်း ၎င်းကို အခြားသူများက မြင်နိုင်ပါသည်။"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"သဒ္ဒါနည်းကျ လိင်အမျိုးအစား"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"သဒ္ဒါနည်းကျ လိင်အမျိုးအစား ရွေးရန်"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ဆက်တင်များတွင် ရှာရန်"</string>
</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 65d7ecc..5585885 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Sengetid"</item>
+ <item msgid="4152450357280759894">"Kjøring"</item>
+ <item msgid="7096549258219399423">"Oppslukende"</item>
+ <item msgid="2760716776980432977">"Administrert"</item>
+ <item msgid="601734478369121764">"Stjerne"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Tid"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Blomst"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9266e57..36d23ef 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Koble fra enhet?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Koble til en ny enhet"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Slå på automatisk i morgen"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Innstillinger for høreapparater"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Snarvei, kompatibilitet med høreapparater"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Forhåndsinnstilling"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Ingen forhåndsinnstillinger er programmert av audiografen"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Kunne ikke oppdatere forhåndsinnstillingen"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Utenhet for lyd"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om lyd"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{På / # app har tilgang til posisjon}other{På / # apper har tilgang til posisjon}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Laster inn …"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apper med tillatelsen for enheter i nærheten kan fastslå den relative posisjonen til tilkoblede enheter."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apper med tillatelsen for enheter i nærheten kan fastslå den relative posisjonen til tilkoblede enheter."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Posisjonstilgang er av for apper og tjenester. Enhetsposisjonen kan fremdeles sendes til utrykningspersonell når du ringer eller sender tekstmelding til et nødnummer."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Finn ut mer om posisjonsinnstillinger"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"For å bytte, gå til ChromeOS-innstillingene > Personvern og sikkerhet > Personverninnstillinger > Posisjonstilgang"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Ansiktet og <xliff:g id="WATCH">%s</xliff:g> er lagt til"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Ansiktet, fingeravtrykket og <xliff:g id="WATCH">%s</xliff:g> er lagt til"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Ansiktet, fingeravtrykkene og <xliff:g id="WATCH">%s</xliff:g> er lagt til"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Dette kreves fordi Identity Check er på"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Opplåsing med Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Klokken er lagt til"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Konfigurer klokken"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Finn ut mer om klokkelåsen"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Legg til en klokke"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Fjern klokken"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Opplåsing med fingeravtrykk og ansiktslås"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Opplåsing med ansikt og fingeravtrykk"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ansiktslås og opplåsing med fingeravtrykk for jobb"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Konfigurering kreves"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Ansikt og fingeravtrykk er lagt til"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installer apper"</b>\n"Installer apper du vil holde private, i området ditt"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Husk"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apper stopper når du låser området ditt"</b>\n"Når du låser området, blir apper i området stoppet, og du mottar ikke varsler fra dem."</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Private områder egner seg ikke for apper som må kjøre i bakgrunnen eller sende kritiske varsler, for eksempel medisinske apper. Dette er fordi varsler og bakgrunnsaktivitet stoppes når området ditt låses.\n\nApper i det private området vises ikke i tillatelseskontrollen, personvernoversikten og andre innstillinger når det private området er låst.\n\nDet private området kan ikke flyttes til en ny enhet. Du må konfigurere et nytt privat område hvis du vil bruke det på en annen enhet.\n\nHvis noen kobler enheten din til en datamaskin eller installerer skadelige apper på enheten, kan de kanskje åpne det private området ditt."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Private områder egner seg ikke for apper som må kjøre i bakgrunnen eller sende kritiske varsler, for eksempel medisinske apper. Dette er fordi varsler og bakgrunnsaktivitet stoppes når området ditt låses.\n\nApper i det private området vises ikke i tillatelseskontrollen, personvernoversikten og andre innstillinger når det private området er låst.\n\nDet private området kan ikke gjenopprettes på en ny enhet. Du må konfigurere et nytt område hvis du vil bruke det på en annen enhet.\n\nHvis noen kobler enheten din til en datamaskin eller installerer skadelige apper på enheten, kan de kanskje åpne det private området ditt."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Finn ut mer om det private området"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Dette tar en liten stund"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfigurerer det private området …"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vil du starte enheten på nytt?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detaljert NFC-loggføring er bare beregnet på utviklingsformål. Det inkluderes ekstra NFC-data i feilrapporter. Dette kan omfatte privat informasjon. Hvis du vil endre denne innstillingen, må du starte enheten på nytt."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Start på nytt"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"speiling, ekstern skjerm, tilkoblet skjerm, USB-skjerm, oppløsning, rotasjon"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotasjon"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Bruk skjermtastaturet"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Ha det på skjermen når det fysiske tastaturet er aktivt"</string>
<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="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="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">"Museknapper"</string>
+ <string name="mouse_keys_summary" msgid="2396247040177734245">"Bruk det fysiske tastaturet for å kontrollere musen."</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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Endre markørfyllstilen til gul"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Endre markørfyllstilen til rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Endre markørfyllstilen til blå"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Pekerstrøkstil"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Hvit"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Svart"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ingen"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Brukervalgt: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Tale"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Pekerhastighet"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Skala for pekeren"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Reduser skalaen for pekeren"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Øk skalaen for pekeren"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Spillkontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Viderekoble vibrering"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Send vibrering til spillkontrolleren hvis den er koblet til"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Fortsett likevel"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Avbryt"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Innstillinger for forstørring"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Panorer med én finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Flytt lupen med 1 finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Dra 1 finger for å bevege deg rundt på skjermen."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Flytt forstørringsområdet ved å dra én finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Flytt forstørringsområdet ved å dra to fingre."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ikke tilgjengelig ved forstørring av bare en del av skjermen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Trykk på en knapp for å zoome"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zoom raskt inn på skjermen for å gjøre innhold større"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Slik zoomer du inn:</b><br/> {0,number,integer}. Bruk snarveien for å starte forstørring.<br/> {1,number,integer}. Trykk på skjermen.<br/> {2,number,integer}. Dra to fingre for å bevege deg rundt på skjermen.<br/> {3,number,integer}. Klyp med to fingre for å justere zoomen.<br/> {4,number,integer}. Bruk snarveien for å stoppe forstørring.<br/><br/> <b>Slik zoomer du inn midlertidig:</b><br/> {0,number,integer}. Sørg for at forstørringstype er satt til fullskjerm.<br/> {1,number,integer}. Bruk snarveien for å starte forstørring.<br/> {2,number,integer}. Trykk og hold hvor som helst på skjermen.<br/> {3,number,integer}. Dra en finger for å bevege deg rundt på skjermen.<br/> {4,number,integer}. Løft fingeren for å stoppe forstørring."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Slik zoomer du inn:</b><br/> {0,number,integer}. Bruk snarveien for å starte forstørring.<br/> {1,number,integer}. Trykk på skjermen.<br/> {2,number,integer}. Dra 2 fingre for å bevege deg rundt på skjermen.<br/> {3,number,integer}. Klyp med 2 fingre for å justere zoomen.<br/> {4,number,integer}. Bruk snarveien for å stoppe forstørringen.<br/><br/> Du kan også zoome inn midlertidig med mer."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Slik zoomer du inn:</b><br/> {0,number,integer}. Bruk snarveien for å starte forstørring.<br/> {1,number,integer}. Trykk på skjermen.<br/> {2,number,integer}. Dra 1 eller 2 fingre for å bevege deg rundt på skjermen.<br/> {3,number,integer}. Klyp med 2 fingre for å justere zoomen.<br/> {4,number,integer}. Bruk snarveien for å stoppe forstørringen.<br/><br/> Du kan også zoome inn midlertidig med mer."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Når forstørrelse er slått på, kan du zoome inn på skjermen.\n\n"<b>"For å zoome"</b>", start forstørring og trykk hvor som helst på skjermen.\n"<ul><li>"Dra to eller flere fingre for å rulle"</li>\n<li>"Knip to eller flere fingre for å justere zoomen"</li></ul>\n\n<b>"For å zoome midlertidig"</b>", start forstørring og trykk og hold hvor som helst på skjermen.\n"<ul><li>"Dra for å bevege deg rundt på skjermen"</li>\n<li>"Løft fingeren for å zoome ut"</li></ul>\n\n"Du kan ikke zoome inn på tastaturet eller navigasjonsraden."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Side <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> av <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Snarvei via Tilgjengelighet-knappen"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angitt}other{# tidsplaner er angitt}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ikke forstyrr"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioritetsmoduser"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Legg til en modus"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Bli bare varslet av viktige personer og apper"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Velg aktiveringstype"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tidspunkt"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Eksempel: «09:30–17:00»"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Eksempel: «Personlig kalender»"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Opprett en modus"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Egendefinert"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begrens forstyrrelser"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Slå på Ikke forstyrr"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmer og medielyder kan forstyrre"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Tidsplaner"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Slett tidsplaner"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Slett"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Gi nytt navn"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Slett"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vil du slette «<xliff:g id="MODE">%1$s</xliff:g>»-modus?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Endre"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Tidsplaner"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Tidsplan"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Legg til en kalender"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Bruk kalenderen"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Tidsplan"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Angi en tidsplan"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Tidsplan"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> t, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Slå på automatisk"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Tidsplan"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Demp telefonen til bestemte tider"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Angi Ikke forstyrr-regler"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillat forstyrrelser som lager lyd"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkér visuelle forstyrrelser"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillat visuelle signaler"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Varsler som kan nå deg"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Hold fokus"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Flere handlinger"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Av}=1{Av / 1 modus kan slås på automatisk}other{Av / # moduser kan slås på automatisk}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Visningsinnstillinger"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Visningsalternativer"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Gråtoner"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"slå på mørkt tema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Bytt til at OS-et og appene foretrekker lys tekst på mørk bakgrunn, som kan være mer behagelig for øynene og gir betydelig batterisparing på noen enheter."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ingen visningsendringer}=1{{effect_1}}=2{{effect_1} og {effect_2}}=3{{effect_1}, {effect_2} og {effect_3}}other{{effect_1}, {effect_2} og # andre}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrer bort avbrytelser"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ingen avbrytelser blir filtrert bort"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Visningsalternativer for filtrerte varsler"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Når «Ikke forstyrr» er på"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Ingen lydvarsling"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"åpne varsel"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Tillat slumring av varsler"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Varselprikk på appikoner"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Varselspakker"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bobler"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bobler"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Lag boble for denne samtalen"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Denne appen støtter ikke utvidete innstillinger"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Flere innstillinger"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Flere innstillinger er tilgjengelige i denne appen"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Varseldemping"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Annet"</string>
<string name="no_channels" msgid="4716199078612071915">"Denne appen har ikke publisert noen varsler"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Vis kategorier som ikke brukes"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Flere innstillinger i appen"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Vis kategorier som ikke brukes"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Skjul kategorier som ikke brukes"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apper som kan forstyrre"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"De valgte appene"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ingen"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alle"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Velg flere apper"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ingenting kan forstyrre"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan forstyrre"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Noen personer kan forstyrre"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan forstyrre"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Gjentatte anrop"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Tillat gjentatte anrop"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Endre til bare alarmer i én time frem til {time}}other{Endre til bare alarmer i # timer frem til {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Endre til Bare alarmer frem til <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Bytt til Alltid forstyrr"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Rediger modusen"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Legg til 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="warning_button_text" msgid="1274234338874005639">"Varsel"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Lukk"</string>
<string name="device_feedback" msgid="5351614458411688608">"Send tilbakemelding om enheten"</string>
@@ -3985,7 +4030,7 @@
<string name="background_check_pref" msgid="5304564658578987535">"Bakgrunnssjekk"</string>
<string name="assist_access_context_title" msgid="5201495523514096201">"Bruk tekst fra skjermen"</string>
<string name="assist_access_context_summary" msgid="6951814413185646275">"Gi assistentappen tilgang til skjerminnholdet som tekst"</string>
- <string name="assist_access_screenshot_title" msgid="4395902231753643633">"Bruk skjermdump"</string>
+ <string name="assist_access_screenshot_title" msgid="4395902231753643633">"Bruk skjermbilde"</string>
<string name="assist_access_screenshot_summary" msgid="5276593070956201863">"Gi assistentappen tilgang til et bilde av skjermen"</string>
<string name="assist_flash_title" msgid="5449512572885550108">"Uthev skjermen"</string>
<string name="assist_flash_summary" msgid="3032289860177784594">"Uthev kantene av skjermen når assistentappen bruker tekst fra skjermen eller skjermbildet"</string>
@@ -4077,7 +4122,7 @@
<string name="disabled_by_policy_title_outgoing_calls" msgid="400089720689494562">"Kan ikke ringe"</string>
<string name="disabled_by_policy_title_sms" msgid="8951840850778406831">"Kan ikke sende SMS-meldinger"</string>
<string name="disabled_by_policy_title_camera" msgid="6616508876399613773">"Kan ikke bruke kameraet"</string>
- <string name="disabled_by_policy_title_screen_capture" msgid="6085100101044105811">"Kan ikke ta skjermdumper"</string>
+ <string name="disabled_by_policy_title_screen_capture" msgid="6085100101044105811">"Kan ikke ta skjermbilder"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan ikke åpne denne appen"</string>
<string name="disabled_by_policy_title_financed_device" msgid="2328740314082888228">"Blokkert av kredittleverandøren din"</string>
<string name="disabled_by_policy_title_biometric_parental_consent" msgid="2463673997797134678">"Forelder kreves"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Etui"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batteri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Innstillinger-panel"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Tvungen skrivebordsmodus"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Tvungen eksperimentell skrivebordsmodus på sekundære skjermer"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Slå på vinduer i fritt format"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Slå på støtte for vinduer i fritt format."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Slå på vindusvisning i fritt format på skjerm to"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Slå på vinduer i fritt format bare på sekundær skjerm."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Slå på apper som ikke kan endre størrelse, i flervindusmodus"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Tillater apper som ikke kan endre størrelse, i flervindusmodus"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Overstyr tving mørk"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Datapartisjonen på denne enheten må konverteres til ext4 før du kan bruke utvikleralternativet for 16 kB. I denne modusen kan ikke programvareintegriteten garanteres, og eventuelle data som er lagret på telefonen mens oppstartsinnlasteren er låst opp, kan være utsatt for fare. Hvis du aktiverer alternativet for 16 kB, må du starte enheten på nytt én gang til etter dette. Når du er i denne modusen, kan du bytte mellom modusen for 4 kB og modusen for 16 kB ved bare å starte enheten på nytt én gang. Noen funksjoner deaktiveres i disse modusene, så det er ikke sikkert at alle apper fungerer. For å gå tilbake til produksjonsmodusen på enheten må du bytte tilbake til modusen for 4 kB og så låse oppstartsinnlasteren. Da tilbakestilles enheten til fabrikkstandard. Når enheten har startet i Android, kan du deaktivere fjerning av produsentsperre i utvikleralternativene. Når du bekrefter, blir alle dataene på enheten visket ut, og filsystemet blir byttet til ext4. Når dette er ferdig, kan du komme tilbake for å aktivere 16 kB igjen."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Tøm alle data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Kunne ikke omformatere og viske ut datapartisjonen til ext4"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Oppstartsinnlasteren må låses opp for å bruke modusen for 16 kB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Opplåsing av oppstartsinnlasteren kreves"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Denne enheten krever at oppstartsinnlasteren er låst opp, før utvikleralternativet for 16 kB kan brukes. I denne modusen kan ikke programvareintegriteten garanteres, og eventuelle data som er lagret på telefonen mens oppstartsinnlasteren er låst opp, kan være utsatt for fare. Alle brukerdata og innstillinger viskes ut når modusen for 16 kB aktiveres. Når oppstartsinnlasteren er låst opp, kreves det to omstarter for å aktivere alternativet for 16 kB. Når du er i denne modusen, kan du bytte mellom modusen for 4 kB og modusen for 16 kB ved bare å starte enheten på nytt én gang. Noen funksjoner deaktiveres i disse modusene, så det er ikke sikkert at alle apper fungerer. For å gå tilbake til produksjonsmodusen på enheten må du bytte tilbake til modusen for 4 kB og så låse enheten via produsenten eller oppstartsinnlasteren (og da tilbakestilles enheten til fabrikkstandard). Lås opp oppstartsinnlasteren, og prøv på nytt. Du finner veiledning om hvordan du gjør dette, på <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Bruker den sideagnostiske modusen for 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Du er i modusen for 4 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 utsatt for fare. Noen funksjoner deaktiveres i disse modusene, så det er ikke sikkert at alle apper fungerer. For å gå tilbake til produksjonsmodusen, må du låse oppstartsinnlasteren på enheten. Trykk for å finne ut mer."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Du er i modusen for 4 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 utsatt for fare. Noen funksjoner deaktiveres i disse modusene, så det er ikke sikkert at alle apper fungerer. For å gå tilbake til produksjonsmodusen, må du 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruke <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Bruker den sideagnostiske modusen for 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 utsatt for 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 4K og låse oppstartsinnlasteren på enheten. Trykk for å finne ut mer."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 utsatt for 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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruke <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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 utsatt for 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. Trykk for å finne ut mer."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> eller bruke <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Feilrapporthåndtering"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Bruk festing av apper"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Bruk utvikleralternativer"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Bruk utskriftstjeneste"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Tillat flere brukere"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Tillat brukerbytte"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"tillat, flere, bruker, tillatelse, mange"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"flere, brukere, profiler, personer, kontoer, bytt, mange"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Bruk trådløs feilsøking"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Velg hva du ser på skjermen når nettbrettet er i dokken. Enheten kan bruke mer energi når en skjermsparer brukes."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Tilpass"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Tilpass <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"En omstart kreves for å slå på støtte for fritt format."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"En omstart kreves for å tvinge skrivebordmodus på sekundære skjermer."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"En omstart kreves for å slå på støtte for eldre versjon av vindusvisning i fritt format."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"En omstart kreves for å endre støtte for vindusvisning i fritt format."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"En omstart kreves for å tvinge vindusvisning i fritt format på sekundære skjermer."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Start på nytt nå"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Start på nytt senere"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Romlig lyd"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"På"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Av"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"På"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Lyd %1$d %% venstre, %2$d %% høyre"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Lyd %1$d %% høyre, %2$d %% venstre"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Enhetsnavnet ditt er synlig for apper du har installert. Det kan også ses av andre personer når du kobler til Bluetooth-enheter, kobler til et wifi-nettverk eller konfigurerer en wifi-sone."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatisk kjønn"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Velg grammatisk kjønn"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Søk i innstillingene"</string>
</resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 49344ca..57efd75 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"सुत्ने समय"</item>
+ <item msgid="4152450357280759894">"ड्राइभिङ"</item>
+ <item msgid="7096549258219399423">"इमर्सिभ"</item>
+ <item msgid="2760716776980432977">"व्यवस्थापन गरिएका"</item>
+ <item msgid="601734478369121764">"तारा"</item>
+ <item msgid="6243809315432780521">"पात्रो"</item>
+ <item msgid="4913577903148415331">"समय"</item>
+ <item msgid="3653377604690057780">"नाटकघर"</item>
+ <item msgid="3843711267408385410">"फूल"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 402ea50..2b43191 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"यन्त्र विच्छेद गर्ने हो?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ब्लुटुथ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"भोलि स्वतः अन गर्नुहोस्"</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>
@@ -75,8 +74,9 @@
<string name="bluetooth_pair_other_ear_dialog_right_ear_positive_button" msgid="533612082529204078">"दायाँ भाग कनेक्ट गर्नुहोस्"</string>
<string name="bluetooth_pair_other_ear_dialog_left_ear_positive_button" msgid="6500192653171220257">"बायाँ भाग कनेक्ट गर्नुहोस्"</string>
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"श्रवण यन्त्रसम्बन्धी सेटिङ"</string>
- <string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"सर्टकट, श्रवण सहयोगसम्बन्धी कम्प्याटिबिलिटी"</string>
+ <string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"सर्टकट, हियरिङ डिभाइस कम्प्याटिबिलिटी"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"पूर्व निर्धारित"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"तपाईंका अडियोलोजिस्टले कुनै पनि प्रिसेट तय गर्नुभएको छैन"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"प्रिसेट अपडेट गर्न सकिएन"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"अडियो आउटपुट"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"अडियो आउटपुटका बारेमा"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"निष्क्रिय"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{अन छ / # वटा एपलाई लोकेसन प्रयोग गर्ने अनुमति दिइएको छ}other{अन छ / # वटा एपहरूलाई लोकेसन प्रयोग गर्ने अनुमति दिइएको छ}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"लोड गर्दै…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"वरपर रहेका ब्लुटुथ चल्ने डिभाइसहरू खोज्ने अनुमति दिइएका एपहरूले कनेक्ट गरिएका डिभाइसहरूको सापेक्ष लोकेसन पत्ता लगाउन सक्छन्।"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"नजिकैका डिभाइसहरू खोज्ने अनुमति दिइएका एपहरूले कनेक्ट गरिएका डिभाइसहरूको सापेक्षिक लोकेसन पत्ता लगाउन सक्छन्।"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"एप तथा सेवाहरूलाई लोकेसन प्रयोग गर्ने अनुमति दिइएको छैन। तपाईंले कुनै आपत्कालीन नम्बरमा कल गर्दा वा टेक्स्ट म्यासेज पठाउँदा भने आपत्कालीन सेवा प्रदान गर्ने निकायलाई तपाईंको डिभाइसको लोकेसन पठाइन सक्छ।"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"लोकेसन सेटिङका बारेमा थप जान्नुहोस्"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"परिवर्तन गर्न \"ChromeOS का सेटिङ > गोपनीयता र सुरक्षा > गोपनीयतासम्बन्धी सेटिङ > लोकेसन एक्सेस\" मा जानुहोस्"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"अनुहार र <xliff:g id="WATCH">%s</xliff:g> दर्ता गरियो"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"अनुहार, फिंगरप्रिन्ट र <xliff:g id="WATCH">%s</xliff:g> दर्ता गरियो"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"अनुहार, फिंगरप्रिन्टहरू र <xliff:g id="WATCH">%s</xliff:g> दर्ता गरिए"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"पहिचान जाँच्ने सुविधा अन भएकाले यसको आवश्यकता पर्छ"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator Unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"स्मार्ट वाच हालिएको छ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"आफ्नो स्मार्ट वाच सेटअप गर्नुहोस्"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"स्मार्ट वाच अनलक गर्ने सुविधाका बारेमा थप जान्नुहोस्"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"स्मार्ट वाच कनेक्ट गर्नुहोस्"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"स्मार्ट वाच डिस्कनेक्ट गर्नुहोस्"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"फिंगरप्रिन्ट तथा फेस अनलक"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"फेस र फिंगरप्रिन्ट अनलक"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"कार्य प्रोफाइलका लागि फेस र फिंगरप्रिन्ट अनलक"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"सेटअप गर्नु पर्ने हुन्छ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"फेस तथा फिंगरप्रिन्टहरू थपिए"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"एपहरू इन्स्टल गर्नुहोस्"</b>\n"तपाईंले आफ्नो स्पेसमा गोप्य राख्न चाहेका एपहरू इन्स्टल गर्नुहोस्"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ख्याल गर्नुहोस्"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"तपाईंले आफ्नो स्पेस लक गर्दा एपहरू बन्द हुन्छन्"</b>\n"तपाईंले आफ्नो स्पेस लक गर्दा तपाईंको स्पेसमा भएका एपहरू बन्द हुन्छन् र तपाईं ती एपबाट नोटिफिकेसन प्राप्त गर्नु हुने छैन"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"निजी स्पेसहरू मेडिकल एपहरू जस्ता ब्याकग्राउन्डमा चलाउनु पर्ने वा महत्त्वपूर्ण नोटिफिकेसनहरू पठाउने एपहरूका लागि उपयुक्त हुँदैनन्। तपाईंको स्पेस लक गरिँदा नोटिफिकेसन र ब्याकग्राउन्डमा हुने क्रियाकलाप बन्द गरिने भएकाले यसो भएको हो।\n\nतपाईंको निजी स्पेस लक गरिएका बेला उक्त स्पेसमा भएका एपहरू अनुमति व्यवस्थापन, गोपनीयतासम्बन्धी ड्यासबोर्ड र अन्य सेटिङमा देखिने छैनन्।\n\nतपाईंको निजी स्पेस सारेर नयाँ डिभाइसमा लैजान सकिँदैन। तपाईं अर्को डिभाइसमा निजी स्पेस प्रयोग गर्न चाहनुहुन्छ भने तपाईंले अर्को निजी स्पेस सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस कम्प्युटरमा कनेक्ट गर्ने वा तपाईंको डिभाइसमा हानिकारक एपहरू इन्स्टल गर्ने सबै जना तपाईंको निजी स्पेस एक्सेस गर्न सक्ने छन्।"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"निजी स्पेसहरू मेडिकल एपहरू जस्ता ब्याकग्राउन्डमा चलाउनु पर्ने वा महत्त्वपूर्ण नोटिफिकेसनहरू पठाउने एपहरूका लागि उपयुक्त हुँदैनन्। तपाईंको स्पेस लक गरिँदा नोटिफिकेसन र ब्याकग्राउन्डमा हुने क्रियाकलाप बन्द गरिने भएकाले यसो भएको हो।\n\nतपाईंको निजी स्पेस लक गरिएका बेला उक्त स्पेसमा भएका एपहरू अनुमति व्यवस्थापन, गोपनीयतासम्बन्धी ड्यासबोर्ड र अन्य सेटिङमा देखिने छैनन्।\n\nतपाईंको निजी स्पेस नयाँ डिभाइसमा रिस्टोर गर्न सकिँदैन। तपाईं अर्को डिभाइसमा स्पेस प्रयोग गर्न चाहनुहुन्छ भने तपाईंले अर्को स्पेस सेटअप गर्नु पर्ने हुन्छ।\n\nतपाईंको डिभाइस कम्प्युटरमा कनेक्ट गर्ने वा तपाईंको डिभाइसमा हानिकारक एपहरू इन्स्टल गर्ने सबै जना तपाईंको निजी स्पेस एक्सेस गर्न सक्ने छन्।"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"निजी स्पेसका बारेमा थप जान्नुहोस्"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"लोड हुन केही बेर लाग्ने छ"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"निजी स्पेस सेटअप गरिँदै छ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"डिभाइस रिस्टार्ट गर्ने हो?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC को विस्तृत लग राख्ने सुविधा सफ्टवेयर विकास गर्ने प्रयोजनका लागि मात्र बनाइएको हो। बग रिपोर्टहरूमा NFC का अतिरिक्त डेटा समावेश हुन्छन्। यी डेटामा निजी जानकारी पनि समावेश हुन सक्छन्। यो सेटिङ बदल्न आफ्नो डिभाइस रिस्टार्ट गर्नुहोस्।"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"रिस्टार्ट गर्नुहोस्"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"मिरर गर्नुहोस्, बाह्य डिस्प्ले, कनेक्ट गरिएको डिस्प्ले, USB डिस्प्ले, रिजोल्युसन, रोटेसन"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"रोटेसन"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"स्ट्यान्डर्ड"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"९०°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"१८०°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"२७०°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"अनस्क्रिन किबोर्ड प्रयोग गर्नुहोस्"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"फिजिकल किबोर्ड सक्रिय हुँदा यसलाई स्क्रिनमा राख्नुहोस्"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"पोइन्टर फिलको शैली बदलेर पहेँलो बनाउनुहोस्"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"पोइन्टर फिलको शैली बदलेर गुलाबी बनाउनुहोस्"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"पोइन्टर फिलको शैली बदलेर निलो बनाउनुहोस्"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"पोइन्टर स्ट्रोकको शैली"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"सेतो"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"कालो"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"कुनै पनि होइन"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"प्रयोगकर्ता चयन गरिएको: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"बोली"</string>
<string name="pointer_speed" msgid="7398649279282675718">"पोइन्टरको गति"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"पोइन्टरको स्केल"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"पोइन्टरको स्केल घटाउनुहोस्"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"पोइन्टरको स्केल बढाउनुहोस्"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"खेल नियन्त्रक"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"कम्पन रिडिरेक्ट गर्नुहोस्"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"जडान हुँदा खेलको नियन्त्रकमा कम्पन गराउनुहोस्"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"जे भए पनि जारी राख्नुहोस्"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"रद्द गर्नु…"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"म्याग्निफिकेसनसम्बन्धी सेटिङ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"एउटा औंलाले प्यान गर्ने सुविधा"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"एउटा औँलाले म्याग्निफायर सार्नुहोस्"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"स्क्रिनमा यताउता सार्न एउटा औँलाले ड्र्याग गर्नुहोस्"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"एउटा औंला ड्र्याग गरेर जुम इन गरिएको क्षेत्र यताउता सार्नुहोस्।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"दुई औंला ड्र्याग गरेर जुम इन गरिएको क्षेत्र यताउता सार्नुहोस्।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"स्क्रिनको कुनै भाग मात्र जुम इन गरेका बेला यो टगल उपलब्ध हुँदैन"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"जुम गर्न बटनमा ट्याप गर्नुहोस्"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"तपाईं सामग्री अझ ठुलो बनाउन चाहनुहुन्छ भने द्रुत रूपमा स्क्रिनमा जुम इन गर्नुहोस्"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>तपाईं जुम इन गर्न चाहनुहुन्छ भने निम्न कार्य गर्नुहोस्:</b><br/> {0,number,integer}. जुम इन गर्ने सुविधा प्रयोग गर्न थाल्न सर्टकट प्रयोग गर्नुहोस्<br/> {1,number,integer}. स्क्रिनमा ट्याप गर्नुहोस्<br/> {2,number,integer}. स्क्रिनमा सामग्री यताउता सार्न २ वटा औँलाले ड्र्याग गर्नुहोस्<br/> {3,number,integer}. जुम इन वा जुम आउट गर्न २ वटा औँलाले पिन्च गर्नुहोस्<br/> {4,number,integer}. जुम इन गर्ने सुविधा बन्द गर्न सर्टकट प्रयोग गर्नुहोस्<br/><br/> <b>तपाईं केही समयका लागि जुम इन गर्न चाहनुहुन्छ भने निम्न कार्य गर्नुहोस्:</b><br/> {0,number,integer}. जुम इनको प्रकार फुल स्क्रिन तय गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्<br/> {1,number,integer}. जुम इन गर्ने सुविधा प्रयोग गर्न थाल्न सर्टकट प्रयोग गर्नुहोस्<br/> {2,number,integer}. स्क्रिनको कुनै भागमा टच एण्ड होल्ड गर्नुहोस्<br/> {3,number,integer}. स्क्रिनमा सामग्री यताउता सार्न औँलाले ड्र्याग गर्नुहोस्<br/> {4,number,integer}. जुम इन गर्ने सुविधा बन्द गर्न औँला उठाउनुहोस्"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>जुम इन गर्न:</b><br/> {0,number,integer}. जुम इन गर्न थाल्न सर्टकट प्रयोग गर्नुहोस्<br/> {1,number,integer}. स्क्रिनमा ट्याप गर्नुहोस्<br/> {2,number,integer}. स्क्रिनमा यताउता सार्न २ वटा औँलाले ड्र्याग गर्नुहोस्<br/> {3,number,integer}. जुमको स्तर मिलाउन २ वटा औँलाले पिन्च गर्नुहोस्<br/> {4,number,integer}. जुम इन गर्न छाड्न सर्टकट प्रयोग गर्नुहोस्<br/><br/> तपाईं केही समयका लागि जुम इन गर्नेलगायतका अन्य कार्यहरू गर्न पनि सक्नुहुन्छ।"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>जुम इन गर्न:</b><br/> {0,number,integer}. जुम इन गर्न थाल्न सर्टकट प्रयोग गर्नुहोस्<br/> {1,number,integer}. स्क्रिनमा ट्याप गर्नुहोस्<br/> {2,number,integer}. स्क्रिनमा यताउता सार्न एउटा वा २ वटा औँलाले ड्र्याग गर्नुहोस्<br/> {3,number,integer}. जुमको स्तर मिलाउन २ वटा औँलाले पिन्च गर्नुहोस्<br/> {4,number,integer}. जुम इन गर्न छाड्न सर्टकट प्रयोग गर्नुहोस्<br/><br/> तपाईं केही समयका लागि जुम इन गर्नेलगायतका अन्य कार्यहरू गर्न पनि सक्नुहुन्छ।"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"म्याग्निफिकेसन सुविधा सक्रिय गरेपछि, तपाईं आफ्नो स्क्रिनमा जुम इन गर्न सक्नुहुन्छ।\n\n"<b>"जुम गर्न"</b>", म्याग्निफिकेसन सुविधा सुरु गर्नुहोस्, त्यसपछि स्क्रिनको कुनै पनि भागमा ट्याप गर्नुहोस्।\n"<ul><li>"स्क्रोल गर्न २ वा सोभन्दा बढी औँलाले ड्र्याग गर्नुहोस्"</li>\n<li>"जुम समायोजन गर्न २ वा सोभन्दा बढी औँलाले पिन्च गर्नुहोस्"</li></ul>\n\n<b>"केहीबेरका लागि जुम गर्न"</b>", म्याग्निफिकेसन सुविधा सुरु गर्नुहोस्, त्यसपछि स्क्रिनको कुनै पनि भागमा केहीबेर छोइरहनुहोस्।\n"<ul><li>"स्क्रिनमा यताउता जान ड्र्याग गर्नुहोस्"</li>\n<li>"जुम आउट गर्न औँला उचाल्नुहोस्"</li></ul>\n\n"तपाईं किबोर्ड वा नेभिगेसन पट्टीमा जुम इन गर्न सक्नुहुन्न।"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> मध्ये <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> औँ पृष्ठ"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"एक्सेसिबिलिटी बटनको सर्टकट"</string>
@@ -2316,7 +2341,7 @@
<string name="accessibility_hearing_device_saved_title" msgid="7573926212664909296">"सेभ गरिएका डिभाइस"</string>
<string name="accessibility_hearing_device_control" msgid="2661965917013100611">"हियरिङ डिभाइस नियन्त्रण गर्ने विजेटहरू"</string>
<string name="accessibility_hearing_device_shortcut_title" msgid="7645100199603031360">"हियरिङ डिभाइसको सर्टकट"</string>
- <string name="accessibility_hac_mode_title" msgid="2037950424429555652">"श्रवण सहयोगसम्बन्धी कम्प्याटिबिलिटी"</string>
+ <string name="accessibility_hac_mode_title" msgid="2037950424429555652">"हियरिङ डिभाइस कम्प्याटिबिलिटी"</string>
<string name="accessibility_hac_mode_summary" msgid="5198760061256669067">"टेलिकोइलसँग अझ राम्रोसँग काम गर्ने बनाउँछ र अनावश्यक आवाज कम गर्छ"</string>
<string name="accessibility_hearing_device_about_title" msgid="7883758309646288250">"श्रवण यन्त्रहरूका बारेमा"</string>
<string name="accessibility_hearing_device_footer_summary" msgid="256061045064940818">"ASHA वा LE अडियो प्रयोग गर्न नमिल्ने अन्य हियरिङ डिभाइस भेट्टाउन "<b>"नयाँ डिभाइस कनेक्ट गर्नुहोस्"</b>" > "<b>"अझ धेरै डिभाइसहरू हेर्नुहोस्"</b>" मा ट्याप गर्नुहोस्"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{कुनै पनि समयतालिका बनाइएको छैन}=1{एउटा समयतालिका बनाइएको छ}other{# वटा समयतालिका बनाइएको छ}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"बाधा नपुऱ्याउनुहोस्"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"महत्त्वपूर्ण मोडहरू"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"मोड हाल्नुहोस्"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"महत्त्वपूर्ण मान्छे र एपका सूचना मात्र प्राप्त गर्नुहोस्"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"एक्टिभेसनको प्रकार चयन गर्नुहोस्"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"समय"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"उदाहरण: \"बिहान ९:३० बजेदेखि साँझ ५:०० बजेसम्म\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"पात्रो"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"उदाहरण: \"व्यक्तिगत पात्रो\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"मोड बनाउनुहोस्"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"कस्टम"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"अवरोधहरू सीमित पार्नुहोस्"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"बाधा नपुऱ्याउनुहोस् नामक मोडलाई अन गर्नुहोस्"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"अलार्म तथा मिडियाका आवाजहरूले अवरोध गर्न सक्छन्"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"समयतालिकाहरू"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"समयतालिकाहरू मेट्नुहोस्"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"मेट्नुहोस्"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"नाम बदल्नुहोस्"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"मेटाउनुहोस्"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" मोड मेटाउने हो?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"सम्पादन गर्नुहोस्"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"समयतालिकाहरू"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"समयतालिका"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"कुनै पात्रो हाल्नुहोस्"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"आफ्नो पात्रो प्रयोग गर्नुहोस्"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"समयतालिका"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"समयतालिका सेट गर्नुहोस्"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"समयतालिका"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> घण्टा, <xliff:g id="MINUTES">%2$d</xliff:g> मिनेट"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"स्वतः अन गर्नुहोस्"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"समयतालिका"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"तोकिएको समयमा फोनलाई मौन अवस्थामा राख्नुहोस्"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"बाधा नपुर्याउनुहोस् नामक मोडका नियमहरू सेट गर्नुहोस्"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"साउन्डसहित आउने कुरालाई अनुमति दिनुहोस्"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"दृश्य सम्बन्धी बाधालाई रोक्नु"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"सङ्केतहरूलाई देखिन दिनुहोस्"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"तपाईंले प्राप्त गर्न सक्ने नोटिफिकेसनहरू"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ध्यान केन्द्रित गर्नुहोस्"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"अतिरिक्त कारबाहीहरू"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{अफ छ}=1{अफ छ / एउटा मोड स्वतः अन हुन सक्छ}other{अफ छ / # वटा मोड स्वतः अन हुन सक्छन्}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"डिस्प्लेसम्बन्धी सेटिङ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"डिस्प्लेसम्बन्धी विकल्पहरू"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ग्रेस्केल"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"\"अँध्यारो थिम\" अन गर्नुहोस्"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"अँध्यारो ब्याकग्राउन्डमा हल्का रङको टेक्स्टलाई प्राथमिकता दिन OS र एपहरू अदलबदल गर्नुहोस्। तपाईंले यसो गर्नुभयो भने तपाईंको आँखामा धेरै असर पर्दैन र यसले केही डिभाइसहरूको ब्याट्री उल्लेख्य रूपमा बचत गर्छ।"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"अवरोधहरू फिल्टर गर्नुहोस्"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"कुनै पनि अवरोध फिल्टर गरिँदैन"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"सूचना खोल्नुहोस्"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"सूचना स्नुज गर्न दिनुहोस्"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"एपको आइकनमा देखिने नोटिफिकेसन डट"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"नोटिफिकेसन बन्डलहरू"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"बबलहरू"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"बबलहरू"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"यो वार्तालाप बबलमा देखाउनुहोस्"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"यो एपमा परिष्कृत सेटिङ प्रयोग गर्न मिल्दैन"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"थप सेटिङ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"यस एपभित्र थप सेटिङ उपलब्ध छन्"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"नोटिफिकेसन कुलडाउन"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"कार्य प्रोफाइलहरूमा लागू गर्नुहोस्"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"कार्य प्रोफाइलका एपहरूमा लागू गर्नुहोस्"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"कोटिहरू"</string>
<string name="notification_channels_other" msgid="18159805343647908">"अन्य"</string>
<string name="no_channels" msgid="4716199078612071915">"यो एपले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"प्रयोग नगरिएका कोटीहरू देखाउनुहोस्"</string>
<string name="app_settings_link" msgid="6725453466705333311">"एपका अतिरिक्त सेटिङहरू"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"प्रयोग नगरिएका कोटीहरू देखाउनुहोस्"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"प्रयोग नगरिएका कोटीहरू लुकाइयोस्"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"बाधा पुऱ्याउने अनुमति दिइएका एपहरू"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"चयन गरिएका एपहरू"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"कुनै पनि होइन"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"सबै"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"एपहरूलाई ओभरराइड गर्ने अनुमति दिनुहोस्"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"अफ गर्न सक्ने एपहरू"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"थप एपहरू चयन गर्नुहोस्"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"कुनै पनि साउन्डले अफ गर्न सक्दैन"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"अफ गर्न सक्दैनन्"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"केही मान्छेहरूले अवरोध गर्न सक्छन्"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"सबै मान्छेहरू अवरोध गर्न सक्छन्"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"कलरहरू दोरोर्याउनुहोस्"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"धेरै कल गर्ने व्यक्तिहरू"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} सम्म एक घण्टाका लागि मोड बदलेर \"अलार्महरू मात्र\" बनाउनुहोस्}other{{time} सम्म # घण्टाका लागि मोड बदलेर \"अलार्महरू मात्र\" बनाउनुहोस्}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> सम्मको लागि मात्र अलार्म परिवर्तन गर्नुहोस्"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"सधैं अवरोध गर्ने गरी परिवर्तन गर्नुहोस्"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"मोड परिवर्तन गर्नुहोस्"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"मोड हाल्नुहोस्"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"कस्टम मोड"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"मोडको नाम"</string>
<string name="warning_button_text" msgid="1274234338874005639">"चेतावनी"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"बन्द गर्नुहोस्"</string>
<string name="device_feedback" msgid="5351614458411688608">"डिभाइसका बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"बलपूर्वक डेस्कटप मोड लागू गर्नुहोस्"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"सहायक डिस्प्लेमा प्रयोगात्मक डेस्कटप मोड बलपूर्वक लागू गर्नुहोस्"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"फ्रिफर्म विन्डोहरू अन गर्नुहोस्"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"फ्रिफर्म विन्डोहरू चल्ने बनाउनुहोस्"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"दोस्रो डिस्प्लेमा फ्रिफर्म विन्डोहरू अन गर्नुहोस्"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"दोस्रो डिस्प्लेमा मात्र फ्रिफर्म विन्डोहरू अन गर्नुहोस्"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"एउटै विन्डोमा नअट्ने एपहरू एकभन्दा बढी विन्डोमा खोल्न दिइयोस्"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"विन्डोको आकार मिलाउन नसकिने एपहरू एकभन्दा बढी विन्डोमा खोल्न दिइयोस्"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"\'फोर्स डार्क\' ओभरराइड गर्नुहोस्"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"१६ के.बि. विकासकर्ता मोड प्रयोग गर्नुअघि यो डिभाइसको डेटा पार्टिसन रूपान्तरण गरी ext4 बनाउनु पर्ने हुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। १६ के.बि. विकल्प अन गर्न यसपछि अरू एक पटक रिबुट गर्नु पर्ने हुन्छ। तपाईंले यो मोड प्रयोग गर्न थालेपछि भने तपाईं एक पटक रिबुट गरेकै भरमा ४ के.बि. र १६ के.बि. मोडमा अदलबदल गर्न सक्नुहुन्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। डिभाइसलाई प्रोडक्सन मोडमा फर्काउन तपाईंले ४ के.बि. मोडमा फर्किएर बुटलोडर लक गर्नु पर्ने हुन्छ। यसो गर्दा डिभाइस फ्याक्ट्री रिसेट हुन्छ। डिभाइस Android मा बुट भएपछि विकासकर्ता मोडमा गई OEM अनलक सेटिङ अफ गर्नुहोस्। डिभाइसमा भएको सबै डेटा मेटिने छ र पुष्टि गरेपछि फाइल सिस्टम परिवर्तन भई ext4 हुने छ। यो प्रक्रिया पूरा भएपछि १६ के.बि. अन गर्न कृपया यहाँ फर्किएर आउनुहोस्।"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"सबै डेटा मेटाउनुहोस्"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"रिफर्म्याट गर्न र डेटाको पार्टिसन मेटाएर ext4 बनाउन सकिएन।"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"१६ के.बि. मोड प्रयोग गर्न बुटलोडर अनलक गर्नु पर्ने हुन्छ"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"बुटलोडर अनलक गर्नु पर्ने हुन्छ"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"१६ के.बि. विकासकर्ता मोड प्रयोग गर्नुअघि यो डिभाइसको बुटलोडर अनलक गर्नु पर्ने हुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। १६ के.बि. मोड अन गर्दा प्रयोगकर्ताका सबै डेटा तथा सेटिङ मेटिने छ। बुटलोडर अनलक भइसकेपछि १६ के.बि. विकल्प एक्टिभेट गर्न दुई पटक रिबुट गर्नु पर्ने हुन्छ। तपाईंले यो मोड प्रयोग गर्न थालेपछि भने तपाईं एक पटक रिबुट गरेकै भरमा ४ के.बि. र १६ के.बि. मोडमा अदलबदल गर्न सक्नुहुन्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। डिभाइसलाई प्रोडक्सन मोडमा फर्काउन तपाईंले ४ के.बि. मोडमा फर्किएर OEM/बुटलोडर फेरि लक गर्नु पर्ने हुन्छ (यसो गर्दा डिभाइस फ्याक्ट्री रिसेट हुन्छ)। कृपया बुटलोडर अनलक गर्नुहोस् र फेरि प्रयास गर्नुहोस्। तपाईं <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> मा गई यसो गर्ने तरिका हेर्न सक्नुहुन्छ"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"४ के.बि. पेज एग्नोस्टिक मोड प्रयोग गरिँदै छ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको ४ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यस सम्बन्धमा थप जानकारी पढ्न ट्याप गर्नुहोस्।"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको ४ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यसो गरेपछि डिभाइस फेरि फ्याक्ट्री रिसेट हुने छ र त्यसका सेटिङ रिस्टोर भई प्रोडक्सन सेटिङ कायम हुने छ। डिभाइस Android मा बुट भएपछि विकासकर्ता मोडमा गई OEM अनलक सेटिङ अफ गर्नुहोस्। डिभाइस Android मा बुट भएन वा डिभाइसको पर्फर्मेन्स अस्थिर भयो भने <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> मा भएको नवीनतम फ्याक्ट्री इमेज प्रयोग गरी डिभाइस रिफ्ल्यास गर्नुहोस् वा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> प्रयोग गर्नुहोस् र \'डिभाइस मेटाउनुहोस्\', \'बुटलोडर लक गर्नुहोस्\' र \'सबै पार्टिसन बलपूर्वक फ्ल्यास गर्नुहोस्\' चयन गर्नुहोस्।"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"१६ के.बि. पेज एग्नोस्टिक मोड प्रयोग गरिँदै छ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको १६ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले ४ के.बि. मोडमा फर्किएर डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यस सम्बन्धमा थप जानकारी पढ्न ट्याप गर्नुहोस्।"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको १६ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताका बारेमा ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले ४ के.बि. मोडमा फर्किएर डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यसो गरेपछि डिभाइस फेरि फ्याक्ट्री रिसेट हुने छ र त्यसका सेटिङ रिस्टोर भई प्रोडक्सन सेटिङ कायम हुने छ। डिभाइस Android मा बुट भएपछि विकासकर्ता मोडमा गई OEM अनलक सेटिङ अफ गर्नुहोस्। डिभाइस Android मा बुट भएन वा डिभाइसको पर्फर्मेन्स अस्थिर भयो भने <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> मा भएको नवीनतम फ्याक्ट्री इमेज प्रयोग गरी डिभाइस रिफ्ल्यास गर्नुहोस् वा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> प्रयोग गर्नुहोस् र \'डिभाइस मेटाउनुहोस्\', \'बुटलोडर लक गर्नुहोस्\' र \'सबै पार्टिसन बलपूर्वक फ्ल्यास गर्नुहोस्\' चयन गर्नुहोस्।"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको १६ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताको ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले ४ के.बि. मोडमा फर्किएर डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यस सम्बन्धमा थप जानकारी पढ्न ट्याप गर्नुहोस्।"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"तपाईं पेज एग्नोस्टिक मोडअन्तर्गतको १६ के.बि. मोड प्रयोग गर्दै हुनुहुन्छ। यो मोडमा सफ्टवेयरको पूर्णताको ग्यारेन्टी गर्न सकिँदैन र बुटलोडर अनलक गरिएका बेला फोनमा भण्डारण गरिएको सबै डेटा जोखिममा पर्न सक्छ। यी मोडमा केही सुविधाहरू अफ हुने हुनाले केही एपहरू नचल्न सक्छन्। तपाईंले ४ के.बि. मोडमा फर्किएर डिभाइसको बुटलोडर लक गरेपछि मात्र तपाईं प्रोडक्सन मोडमा फेरि प्रवेश गर्न सक्नुहुन्छ। यसो गरेपछि डिभाइस फेरि फ्याक्ट्री रिसेट हुने छ र त्यसका सेटिङ रिस्टोर भई प्रोडक्सन सेटिङ कायम हुने छ। डिभाइस Android मा बुट भएपछि विकासकर्ता मोडमा गई OEM अनलक सेटिङ अफ गर्नुहोस्। डिभाइस Android मा बुट भएन वा डिभाइसको पर्फर्मेन्स अस्थिर भयो भने <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> मा भएको नवीनतम फ्याक्ट्री इमेज प्रयोग गरी डिभाइस रिफ्ल्यास गर्नुहोस् वा <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> प्रयोग गर्नुहोस् र \'डिभाइस मेटाउनुहोस्\', \'बुटलोडर लक गर्नुहोस्\' र \'सबै पार्टिसन बलपूर्वक फ्ल्यास गर्नुहोस्\' चयन गर्नुहोस्।"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"१६ के.बि. पेज एग्नोस्टिक मोड"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"थप पढ्नुहोस्"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"बग रिपोर्ट ह्यान्ड्लर"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"\"एप पिनिङ\" प्रयोग गर्नुहोस्"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"\'विकासकर्ता विकल्पहरू\' प्रयोग गर्नुहोस्"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"प्रिन्ट सेवा चलाउनुहोस्"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"एकभन्दा बढी व्यक्तिलाई प्रयोग गर्न दिनुहोस्"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"प्रयोगकर्ता बदल्न दिनुहोस्"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"अनुमति दिनुहोस्, एकभन्दा बढी, प्रयोगकर्ता, अनुमति, धेरै"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"एकभन्दा बढी, प्रयोगकर्ता, प्रोफाइल, मान्छे, खाता, स्विच, धेरै"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"\'वायरलेस डिबगिङ\' सुविधा प्रयोग गर्नुहोस्"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"तपाईंको ट्याब्लेट डक गरिएका बेला तपाईंको डिभाइसमा देखाइनु पर्ने कुराहरू छान्नुहोस्। स्क्रिन सेभर प्रयोग गरिएका बेला तपाईंको डिभाइसले अरू बेलाको तुलनामा बढी ब्याट्री खपत गर्न सक्छ।"</string>
<string name="customize_button_title" msgid="1110284655990203359">"कस्टमाइज गर्नुहोस्"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> कस्टमाइज गर्नुहोस्"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"फ्रिफर्म मोड अन गर्न रिबुट गर्नु पर्ने हुन्छ।"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"सहायक डिस्प्लेहरूमा डेस्कटप मोड बलपूर्वक लागू गर्न रिबुट गर्नु पर्ने हुन्छ।"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"फ्रिफर्म विन्डो भएको लिगेसी मोड अन गर्न डिभाइस रिबुट गर्नु पर्ने हुन्छ।"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"फ्रिफर्म विन्डो मोड परिवर्तन गर्न डिभाइस रिबुट गर्नु पर्ने हुन्छ।"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"सहायक डिस्प्लेहरूमा फ्रिफर्म विन्डो मोड बलपूर्वक लागू गर्न डिभाइस रिबुट गर्नु पर्ने हुन्छ।"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"अहिले नै रिबुट गर्नुहोस्"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"पछि रिबुट गर्नुहोस्"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"स्पेशियल अडियो"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"अन छ"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"अफ छ"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"अन छ"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"अडियो %1$d%% बायाँ, %2$d%% दायाँ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"अडियो %1$d%% दायाँ, %2$d%% बायाँ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"तपाईंका डिभाइसमा इन्स्टल गरिएका एपहरूले तपाईंको डिभाइसको नाम हेर्न सक्छन्। तपाईंले ब्लुटुथ चल्ने डिभाइसमा कनेक्ट गर्दा, कुनै Wi-Fi नेटवर्कमा कनेक्ट गर्दा वा कुनै Wi-Fi हटस्पट सेटअप गर्दा अरू मान्छेहरूले पनि डिभाइसको नाम देख्न सक्छन्।"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ग्रामाटिकल जेन्डर"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ग्रामाटिकल जेन्डर चयन गर्नुहोस्"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"सेटिङ खोज्नुहोस्"</string>
</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index dd2b800..ef31960 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Bedtijd"</item>
+ <item msgid="4152450357280759894">"Autorijden"</item>
+ <item msgid="7096549258219399423">"Immersief"</item>
+ <item msgid="2760716776980432977">"Beheerd"</item>
+ <item msgid="601734478369121764">"Ster"</item>
+ <item msgid="6243809315432780521">"Agenda"</item>
+ <item msgid="4913577903148415331">"Tijd"</item>
+ <item msgid="3653377604690057780">"Theater"</item>
+ <item msgid="3843711267408385410">"Bloem"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 753adb1c..e36fe8d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Apparaat loskoppelen?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Nieuw apparaat koppelen"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Morgen automatisch aanzetten"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Instellingen voor hoortoestel"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Sneltoets, geschiktheid voor hoortoestellen"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Voorinstelling"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Geen voorinstellingen geprogrammeerd door je audioloog"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Kan voorinstelling niet updaten"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio-uitvoer"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Over audio-uitvoer"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Uit"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aan: # app heeft toegang tot de locatie}other{Aan: # apps hebben toegang tot de locatie}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Laden…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps met rechten voor apparaten in de buurt kunnen ongeveer inschatten waar verbonden apparaten zijn."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps met rechten voor apparaten in de buurt kunnen de relatieve positie van verbonden apparaten bepalen."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Toegang tot de locatie staat uit voor apps en services. De locatie van je apparaat kan nog steeds worden gestuurd naar nooddiensten als je een alarmnummer belt of sms\'t."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Meer informatie over locatie-instellingen"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Wijzig dit via ChromeOS-instellingen > Privacy en beveiliging > Privacyopties > Locatietoegang"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Gezicht en <xliff:g id="WATCH">%s</xliff:g> toegevoegd"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Gezicht, vingerafdruk en <xliff:g id="WATCH">%s</xliff:g> toegevoegd"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Gezicht, vingerafdrukken en <xliff:g id="WATCH">%s</xliff:g> toegevoegd"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Dit is nodig omdat identiteitscontrole aanstaat"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Ontgrendelen via Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Smartwatch toegevoegd"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Je smartwatch instellen"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Meer informatie over Ontgrendelen via smartwatch"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Smartwatch toevoegen"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Smartwatch verwijderen"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Ontgrendelen via vingerafdruk en gezicht"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Ontgrendelen via gezichtsherkenning en met vingerafdruk"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ontgrendelen via gezichtsherkenning en vingerafdruk voor werk"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Instellen nodig"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Gezicht en vingerafdrukken toegevoegd"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Apps installeren"</b>\n"Installeer apps die je privé wilt houden in je gedeelte"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Goed om te weten"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Apps stoppen als je je gedeelte vergrendelt"</b>\n"Als je je gedeelte vergrendelt, worden apps in je gedeelte gestopt en krijg je geen meldingen van de apps"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privégedeelten zijn niet geschikt voor apps die op de achtergrond moeten worden uitgevoerd of die kritieke meldingen sturen, zoals medische apps. Dit komt omdat meldingen en achtergrondactiviteit worden gestopt als je gedeelte is vergrendeld.\n\nApps in je privégedeelte verschijnen niet in rechtenbeheer, het privacydashboard en andere instellingen als je privégedeelte is vergrendeld.\n\nJe privégedeelte kan niet worden verplaatst naar een nieuw apparaat. Je moet een nieuw privégedeelte instellen als je dit wilt gebruiken op een ander apparaat.\n\nIedereen die je apparaat aan een computer koppelt of schadelijke apps op je apparaat installeert, heeft mogelijk toegang tot je privégedeelte."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privégedeelten zijn niet geschikt voor apps die op de achtergrond moeten worden uitgevoerd of die kritieke meldingen sturen, zoals medische apps. Dit komt omdat meldingen en achtergrondactiviteit worden gestopt als je gedeelte is vergrendeld.\n\nApps in je privégedeelte verschijnen niet in rechtenbeheer, het privacydashboard en andere instellingen als het privégedeelte is vergrendeld.\n\nJe privégedeelte kan niet worden hersteld op een nieuw apparaat. Je moet een nieuw gedeelte instellen als je dit wilt gebruiken op een ander apparaat.\n\nIedereen die je apparaat aan een computer koppelt of schadelijke apps op je apparaat installeert, heeft mogelijk toegang tot je privégedeelte."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Meer informatie over privégedeelte"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Dit duurt even"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Privégedeelte instellen…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Apparaat opnieuw opstarten?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Gedetailleerde NFC-logboekregistratie is alleen bedoeld voor ontwikkelingsdoeleinden. Aanvullende NFC-gegevens worden opgenomen in bugrapporten. Deze kunnen privé-informatie bevatten. Start je apparaat opnieuw op om deze instelling te wijzigen."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Opnieuw opstarten"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirroren, extern scherm, verbonden scherm, usb-scherm, resolutie, rotatie"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotatie"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standaard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Schermtoetsenbord gebruiken"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Toon op het scherm terwijl het fysieke toetsenbord actief is"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Vulstijl voor aanwijzer wijzigen in geel"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Vulstijl voor aanwijzer wijzigen in roze"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Vulstijl voor aanwijzer wijzigen in blauw"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Streekstijl van aanwijzer"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Wit"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Zwart"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Geen"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Door de gebruiker geselecteerd: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Spraak"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Snelheid van aanwijzer"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Aanwijzerschaal"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Aanwijzerschaal verkleinen"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aanwijzerschaal vergroten"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Gamecontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Trilling omleiden"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Trilling verzenden naar gamecontroller wanneer deze is aangesloten"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Toch doorgaan"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Annuleren"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Instellingen voor vergroting"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pannen met 1 vinger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Verplaats het vergrootglas met 1 vinger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Sleep met 1 vinger om te navigeren op het scherm."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Verplaats je vergrotingsgebied door met 1 vinger te slepen."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Verplaats je vergrotingsgebied door met 2 vingers te slepen."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Niet beschikbaar als alleen een deel van het scherm wordt vergroot"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Zoomen door te tikken op een knop"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zoom snel in op het scherm om content groter te maken"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Zo zoom je in:</b><br/> {0,number,integer}. Gebruik de snelkoppeling om de vergroting te starten.<br/> {1,number,integer}. Tik op het scherm.<br/> {2,number,integer}. Sleep met 2 vingers om te navigeren op het scherm.<br/> {3,number,integer}. Knijp met 2 vingers om het zoomniveau aan te passen.<br/> {4,number,integer}. Gebruik de snelkoppeling om de vergroting te stoppen.<br/><br/> <b>Zo zoom je tijdelijk in:</b><br/> {0,number,integer}. Zorg dat je vergrotingstype is ingesteld op volledig scherm.<br/> {1,number,integer}. Gebruik de snelkoppeling om de vergroting te starten.<br/> {2,number,integer}. Houd je vinger op het scherm.<br/> {3,number,integer}. Sleep met een vinger om te navigeren op het scherm.<br/> {4,number,integer}. Haal je vinger van het scherm om de vergroting te stoppen."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Zo zoom je in:</b><br/> {0,number,integer}. Gebruik de snelkoppeling om de vergroting te starten.<br/> {1,number,integer}. Tik op het scherm.<br/> {2,number,integer}. Sleep met 2 vingers om te navigeren op het scherm.<br/> {3,number,integer}. Knijp met 2 vingers om het zoomniveau aan te passen.<br/> {4,number,integer}. Gebruik de snelkoppeling om de vergroting te stoppen.<br/><br/> Je kunt ook tijdelijk inzoomen en meer."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Zo zoom je in:</b><br/> {0,number,integer}. Gebruik de snelkoppeling om de vergroting te starten.<br/> {1,number,integer}. Tik op het scherm.<br/> {2,number,integer}. Sleep 1 of 2 vingers om over het scherm te bewegen.<br/> {3,number,integer}. Knijp met 2 vingers om het zoomniveau aan te passen.<br/> {4,number,integer}. Gebruik de snelkoppeling om de vergroting te stoppen.<br/><br/> Je kunt ook tijdelijk inzoomen en meer."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Als vergroting aanstaat, kun je op je scherm het beeld vergroten.\n\n"<b>"Als je wilt inzoomen"</b>", start je de vergroting en tik je waar dan ook op het scherm.\n"<ul><li>"Veeg met 2 of meer vingers om te scrollen."</li>\n<li>"Knijp 2 of meer vingers samen om de zoom aan te passen."</li></ul>\n\n<b>"Als je tijdelijk wilt zoomen"</b>", start je de vergroting, waarna je ergens op het scherm tikt en vasthoudt.\n"<ul><li>"Sleep om een ander deel van het scherm weer te geven."</li>\n<li>"Haal je vinger van het scherm om uit te zoomen."</li></ul>\n\n"Je kunt niet inzoomen op het toetsenbord of de navigatiebalk."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> van <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Snelkoppeling met knop Toegankelijkheid"</string>
@@ -2193,7 +2218,7 @@
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>Aan de slag</b><br/> {0,number,integer}. Ga naar de toegankelijkheidsinstellingen<br/> {1,number,integer}. Kies een functie en tik op de snelkoppeling<br/> {2,number,integer}. Kies de knop waarmee je de functie wilt openen<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Knop of gebaar gebruiken"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Locatie"</string>
- <string name="accessibility_button_size_title" msgid="5785110470538960881">"Formaat"</string>
+ <string name="accessibility_button_size_title" msgid="5785110470538960881">"Grootte"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"Vervagen indien niet in gebruik"</string>
<string name="accessibility_button_fade_summary" msgid="7865950833524973709">"Vervaagt na een paar seconden zodat je het scherm beter ziet"</string>
<string name="accessibility_button_opacity_title" msgid="4727355657530362289">"Transparantie indien niet in gebruik"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 planning ingesteld}other{# planningen ingesteld}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Niet storen"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriteitsmodi"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Modus toevoegen"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Krijg alleen meldingen van belangrijke mensen en apps"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Activeringstype selecteren"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tijd"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Voorbeeld: \'9:30 – 17:00 uur\'"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Agenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Voorbeeld: \'Persoonlijke agenda\'"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Een modus maken"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Aangepast"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Onderbrekingen beperken"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Zet Niet storen aan."</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Wekkers en mediageluiden mogen onderbreken"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Schema\'s"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Schema\'s verwijderen"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Verwijderen"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Naam wijzigen"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Verwijderen"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Modus <xliff:g id="MODE">%1$s</xliff:g> verwijderen?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Bewerken"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Schema\'s"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schema"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Agenda toevoegen"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Je agenda gebruiken"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Schema"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Schema instellen"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schema"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> u <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Automatisch aanzetten"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schema"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoongeluid uitzetten op bepaalde tijdstippen"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Regels voor \'Niet storen\' instellen"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Onderbrekingen toestaan die een geluid laten horen"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokkeer visuele onderbreking"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Visuele signalen toestaan"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Meldingen die je mogen storen"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Blijf gefocust"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Aanvullende acties"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Uit}=1{Uit / 1 modus kan automatisch aangaan}other{Uit / # modi kunnen automatisch aangaan}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Weergave-instellingen"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Weergaveopties"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grijstinten"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"donker thema aanzetten"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"OS en apps wijzigen zodat de voorkeur wordt gegeven aan lichte tekst op een donkere achtergrond, wat prettiger voor de ogen kan zijn en op sommige apparaten een aanzienlijke batterijbesparing oplevert"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Geen weergavewijzigingen}=1{{effect_1}}=2{{effect_1} en {effect_2}}=3{{effect_1}, {effect_2} en {effect_3}}other{{effect_1}, {effect_2} en nog #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Onderbrekingen filteren"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Er worden geen onderbrekingen gefilterd"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Weergaveopties voor gefilterde meldingen"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Als Niet storen aanstaat"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Geen geluid van meldingen"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"melding openen"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Snoozen van meldingen toestaan"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Meldingsstipje op app-icoon"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Meldingsbundels"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubbels"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubbels"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Dit gesprek als bubbel tonen"</string>
@@ -3591,7 +3632,7 @@
<string name="nls_feature_read_title" msgid="7629713268744220437">"Je meldingen lezen"</string>
<string name="nls_feature_read_summary" msgid="1064698238110273593">"De app kan je meldingen lezen, waaronder persoonlijke informatie zoals contacten, berichten en foto\'s"</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Berichten beantwoorden"</string>
- <string name="nls_feature_reply_summary" msgid="4492543411395565556">"De app kan berichten beantwoorden, meldingen snoozen of sluiten en gesprekken beantwoorden."</string>
+ <string name="nls_feature_reply_summary" msgid="4492543411395565556">"De app kan berichten beantwoorden en acties uitvoeren voor knoppen in meldingen, waaronder meldingen snoozen of sluiten en gesprekken beantwoorden."</string>
<string name="nls_feature_settings_title" msgid="8208164329853194414">"Instellingen wijzigen"</string>
<string name="nls_feature_settings_summary" msgid="3770028705648985689">"De app kan Niet storen aan- of uitzetten en gerelateerde instellingen wijzigen"</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Als je <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> geen toegang tot meldingen geeft, krijgt Niet storen mogelijk ook geen toegang."</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Deze app ondersteunt geen uitgebreide instellingen"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Meer instellingen"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Er zijn meer instellingen beschikbaar in deze app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Afkoelperiode voor meldingen"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Afkoelperiode van meldingen gebruiken"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Toepassen op werkprofielen"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Toepassen op apps in werkprofiel"</string>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorieën"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Anders"</string>
<string name="no_channels" msgid="4716199078612071915">"Deze app heeft geen meldingen geplaatst"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Niet-gebruikte categorieën tonen"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Extra instellingen in de app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Niet-gebruikte categorieën tonen"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Niet-gebruikte categorieën beperken"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps die je mogen storen"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Geselecteerde apps"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Geen"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alles"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Meer apps selecteren"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niets mag onderbreken"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand mag onderbreken"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Bepaalde mensen mogen je storen"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alle mensen mogen onderbreken"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Terugkerende bellers"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Terugkerende bellers toestaan"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Wijzigen in alleen alarmen gedurende 1 uur tot {time}}other{Wijzigen in alleen alarmen gedurende # uur tot {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Wijzigen in \'Alleen wekkers\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Wijzigen in \'Altijd onderbreken\'"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Bewerkingsmodus"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Toevoegingsmodus"</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="warning_button_text" msgid="1274234338874005639">"Waarschuwing"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Sluiten"</string>
<string name="device_feedback" msgid="5351614458411688608">"Feedback sturen over dit apparaat"</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batterij"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Instellingenvenster"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Desktopmodus afdwingen"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Dwing experimentele desktopmodus af op secundaire schermen"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Vensters met vrije vorm aanzetten"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Zet ondersteuning voor vensters met vrije vorm aan."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Vensters met vrije vorm aanzetten op 2e scherm"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Zet vensters met vrije vorm alleen aan op het secundaire scherm."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Apps met niet-aanpasbaar formaat aanzetten in meerdere vensters"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Dit staat apps met een niet-aanpasbaar formaat toe in meerdere vensters"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Gedwongen donker maken negeren"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"De gegevenspartitie van dit apparaat moet worden geconverteerd naar ext4 voordat je de 16 KB-ontwikkelaarsoptie kunt gebruiken. In deze modus kan de software-integriteit niet worden gegarandeerd. Ook kunnen alle gegevens die op de telefoon zijn opgeslagen terwijl de bootloader is ontgrendeld gevaar lopen. Als je de 16 KB-optie activeert, moet je het apparaat hierna nog een keer opnieuw opstarten. Zodra je in deze modus zit, kun met één keer opnieuw opstarten wisselen tussen de 4 KB- en 16 KB-modus. Sommige functies worden in deze modi uitgezet, dus sommige apps werken misschien niet. Als je het apparaat wilt terugzetten naar de productiemodus, moet je teruggaan naar de 4 KB-modus en daarna de bootloader vergrendelen. Hierdoor worden de fabrieksinstellingen teruggezet op het apparaat. Nadat het apparaat succesvol is opgestart in Android, zet je OEM-ontgrendeling uit in de Ontwikkelaarsopties. Het apparaat wordt gewist en het bestandssysteem wordt na bevestiging gewijzigd in ext4. Als dit is gebeurd, moet je terugkomen om 16 KB opnieuw aan te zetten."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Alle gegevens wissen"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Kan niet omzetten en de gegevenspartitie niet wissen naar ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader moet worden ontgrendeld voor 16 KB-modus"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Ontgrendeling van bootloader vereist"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"De bootloader moet op dit apparaat ontgrendeld zijn voordat je de 16 KB-ontwikkelaarsoptie kunt gebruiken. 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. Alle gebruikersgegevens en instellingen worden gewist als de 16 KB-modus wordt geactiveerd. Na het ontgrendelen van de bootloader moet je voor het activeren van de 16 KB-optie het apparaat 2 keer opnieuw opstarten. Zodra je in deze modus zit, kun je met één keer opnieuw opstarten wisselen tussen de 4 KB- en 16 KB-modus. Sommige functies worden in deze modi uitgezet, dus sommige apps werken misschien niet. Als je het apparaat wilt terugzetten naar de productiemodus, moet je teruggaan naar de 4 KB-modus en daarna OEM en de bootloader vergrendelen. Hierdoor worden de fabrieksinstellingen teruggezet op het apparaat. Ontgrendel de bootloader en probeer het opnieuw. Instructies hiervoor vind je op <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Niet-paginagebonden 4 KB-modus gebruiken"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Je zit in de 4 KB-modus van de niet-paginagebonden modus. In deze modus kan de software-integriteit niet worden gegarandeerd. Ook 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 de bootloader van het apparaat vergrendelen. Tik om meer te lezen."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Je zit in de 4 KB-modus van de niet-paginagebonden modus. In deze modus kan de software-integriteit niet worden gegarandeerd. Ook 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 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 in de Ontwikkelaarsopties. Als het apparaat niet opstart in Android of instabiel is, flash het apparaat dan opnieuw met de nieuwste fabrieksimages van <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> en selecteer Apparaat wissen, Bootloader vergrendelen en Alle partities geforceerd flashen."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Niet-paginagebonden modus van 16 KB gebruiken"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Je zit in de 16 KB-modus van de niet-paginagebonden modus. In deze modus kan de software-integriteit niet worden gegarandeerd. Ook 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. Tik om meer te lezen."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 in de Ontwikkelaarsopties. Als het apparaat niet opstart in Android of instabiel is, flash het apparaat dan opnieuw met de nieuwste fabrieksimages van <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> en selecteer Apparaat wissen, Bootloader vergrendelen en Alle partities geforceerd flashen."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tik om meer te lezen."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> of gebruik <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"App voor verwerking bugrapport"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"App vastzetten gebruiken"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Ontwikkelaarsopties gebruiken"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Afdrukservice gebruiken"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Meerdere gebruikers toestaan"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Van gebruiker wisselen toestaan"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"toestaan, meerdere, gebruiker, toestemming, veel"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"meerdere, gebruikers, profielen, personen, accounts, wisselen, veel"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Draadloze foutopsporing gebruiken"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Kies wat je op het scherm wilt zien wanneer de tablet is gedockt. Het apparaat gebruikt misschien meer energie als je een screensaver instelt."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Aanpassen"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> aanpassen"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Je moet opnieuw opstarten om ondersteuning voor vrije vorm aan te zetten."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Je moet opnieuw opstarten om de desktopmodus af te dwingen op secundaire schermen."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Opnieuw opstarten is vereist om ondersteuning voor verouderde vensters met vrije vorm aan te zetten."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Opnieuw opstarten is vereist om ondersteuning voor vensters met vrije vorm te wijzigen."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Opnieuw opstarten is vereist om vensters met vrije vorm aan te zetten op secundaire schermen."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Nu opnieuw opstarten"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Later opnieuw opstarten"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Ruimtelijke audio"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aan"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Uit"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aan"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% links, %2$d%% rechts"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% rechts, %2$d%% links"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"De naam van je apparaat is zichtbaar voor de apps die je hebt geïnstalleerd. Ook kunnen anderen die zien als je verbinding maakt met bluetooth-apparaten of een wifi-netwerk, of als je een wifi-hotspot instelt."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammaticaal geslacht"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Grammaticaal geslacht selecteren"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"Zoeken in instellingen"</string>
</resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 65f977e..220f9ff 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -360,7 +360,7 @@
<item msgid="3605616699204153590">"ନାଭିଗେସନ୍ ବାର୍"</item>
</string-array>
<string-array name="accessibility_button_gesture_selector_titles">
- <item msgid="2370918472773154939">"ବଟନ୍"</item>
+ <item msgid="2370918472773154939">"ବଟନ"</item>
<item msgid="6922258575853746220">"ଜେଶ୍ଚର୍"</item>
</string-array>
<string-array name="accessibility_button_size_selector_titles">
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ଶୋଇବା ସମୟ"</item>
+ <item msgid="4152450357280759894">"ଡ୍ରାଇଭିଂ"</item>
+ <item msgid="7096549258219399423">"ଇମର୍ସିଭ"</item>
+ <item msgid="2760716776980432977">"ପରିଚାଳିତ ହୋଇଛି"</item>
+ <item msgid="601734478369121764">"ଷ୍ଟାର"</item>
+ <item msgid="6243809315432780521">"କେଲେଣ୍ଡର"</item>
+ <item msgid="4913577903148415331">"ସମୟ"</item>
+ <item msgid="3653377604690057780">"ଥିଏଟର"</item>
+ <item msgid="3843711267408385410">"ଫୁଲ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 3c0d2d3..d69ff82 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ଡିଭାଇସ୍କୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ନୂଆ ଡିଭାଇସକୁ ପେୟାର କରନ୍ତୁ"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ବ୍ଲୁଟୁଥ୍"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ଆସନ୍ତାକାଲି ସ୍ୱତଃ ଚାଲୁ ହେବ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ହିଅରିଂ ଡିଭାଇସ ସେଟିଂସ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ସର୍ଟକଟ, ଶ୍ରବଣଯନ୍ତ୍ର ଉପଯୋଗୀ"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ପ୍ରିସେଟ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ଅଡିଓଲୋଜିଷ୍ଟଙ୍କ ଦ୍ଵାରା ପ୍ରୋଗ୍ରାମ ହୋଇଥିବା କୌଣସି ପ୍ରିସେଟ ନାହିଁ"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ପ୍ରିସେଟକୁ ଅପଡେଟ କରାଯାଇପାରିବ ନାହିଁ"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ଅଡିଓ ଆଉଟପୁଟ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ଅଡିଓ ଆଉଟପୁଟ ବିଷୟରେ"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ବନ୍ଦ"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ଚାଲୁ ଅଛି / # ଆପର ଲୋକେସନକୁ ଆକ୍ସେସ ଅଛି}other{ଚାଲୁ ଅଛି / # ଆପ୍ସର ଲୋକେସନକୁ ଆକ୍ସେସ ଅଛି}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ଲୋଡ୍ ହେଉଛି…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ଅନୁମତି ଥିବା ଆପ୍ସ କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସଗୁଡ଼ିକର ଆପେକ୍ଷିକ ଅବସ୍ଥିତିକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବ।"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"ଆଖପାଖର ଡିଭାଇସଗୁଡ଼ିକ ପାଇଁ ଅନୁମତି ଥିବା ଆପ୍ସ କନେକ୍ଟେଡ ଡିଭାଇସଗୁଡ଼ିକର ଆପେକ୍ଷିକ ଅବସ୍ଥିତିକୁ ନିର୍ଦ୍ଧାରଣ କରିପାରିବ।"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ଆପ୍ସ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ ଲୋକେସନ ଆକ୍ସେସ ବନ୍ଦ ଅଛି। ଆପଣ ଏକ ଜରୁରୀକାଳୀନ ନମ୍ବରକୁ କଲ କରିବା କିମ୍ବା ଟେକ୍ସଟ ମେସେଜ ପଠାଇବା ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନ ଏବେ ବି ଜରୁରୀକାଳୀନ ଉତ୍ତରଦାତାମାନଙ୍କୁ ପଠାଯାଇପାରେ।"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ଲୋକେସନ ସେଟିଂସ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ପରିବର୍ତ୍ତନ କରିବାକୁ ChromeOS ସେଟିଂସ > ଗୋପନୀୟତା ଏବଂ ସୁରକ୍ଷା > ଗୋପନୀୟତା ନିୟନ୍ତ୍ରଣ > ଲୋକେସନ ଆକ୍ସେସକୁ ଯାଆନ୍ତୁ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ଫେସ ଏବଂ <xliff:g id="WATCH">%s</xliff:g> ଯୋଗ କରାଯାଇଛି"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ଫେସ, ଟିପଚିହ୍ନ ଏବଂ <xliff:g id="WATCH">%s</xliff:g> ଯୋଗ କରାଯାଇଛି"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ଫେସ, ଟିପଚିହ୍ନ ଏବଂ <xliff:g id="WATCH">%s</xliff:g> ଯୋଗ କରାଯାଇଛି"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ପରିଚୟ ଯାଞ୍ଚକରଣ ଚାଲୁ ଥିବା ଯୋଗୁଁ ଏହା ଆବଶ୍ୟକ"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"ରିମୋଟ ଅଥେଣ୍ଟିକେଟର ଅନଲକ"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ୱାଚ ଯୋଗ କରାଯାଇଛି"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ଆପଣଙ୍କ ୱାଚ ସେଟ ଅପ କରନ୍ତୁ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ୱାଚ ଅନଲକ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ୱାଚ ଯୋଗ କରନ୍ତୁ"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ୱାଚକୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଏବଂ ଫେସ ଅନଲକ"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ଫେସ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ୱାର୍କ ପାଇଁ ଫେସ ଏବଂ ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ଅନଲକ"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ସେଟଅପ ଆବଶ୍ୟକ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ଚେହେରା ଏବଂ ଟିପଚିହ୍ନଗୁଡ଼ିକ ଯୋଗ କରାଯାଇଛି"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ଆପ୍ସ ଇନଷ୍ଟଲ କରନ୍ତୁ"</b>\n"ଆପଣଙ୍କ ସ୍ପେସରେ ଆପଣ ପ୍ରାଇଭେଟ ରଖିବାକୁ ଚାହୁଁଥିବା ଆପ୍ସ ଇନଷ୍ଟଲ କରନ୍ତୁ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ମନେ ରଖନ୍ତୁ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"ଆପଣଙ୍କ ସ୍ପେସକୁ ଆପଣ ଲକ କଲେ ଆପ୍ସ ବନ୍ଦ ହୋଇଯାଏ"</b>\n"ଆପଣଙ୍କର ସ୍ପେସକୁ ଆପଣ ଲକ କଲେ, ଆପଣଙ୍କ ସ୍ପେସରେ ଥିବା ଆପ୍ସ ବନ୍ଦ ହୋଇଯାଏ ଏବଂ ଆପଣ ସେଗୁଡ଼ିକଠାରୁ ବିଜ୍ଞପ୍ତି ପାଇବେ ନାହିଁ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ବେକଗ୍ରାଉଣ୍ଡରେ ଚାଲିବା କିମ୍ବା ମେଡିକାଲ ଆପ୍ସ ପରି ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇବା ଆବଶ୍ୟକ କରୁଥିବା ଆପ୍ସ ପାଇଁ ପ୍ରାଇଭେଟ ସ୍ପେସଗୁଡ଼ିକ ଉପଯୁକ୍ତ ନୁହେଁ। ଏହାର କାରଣ ହେଉଛି ଆପଣଙ୍କ ସ୍ପେସ ଲକ ହୋଇଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଏବଂ ବେକଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ବନ୍ଦ ହୋଇଯାଏ।\n\nଆପଣଙ୍କର ପ୍ରାଇଭେଟ ସ୍ପେସ ଲକ ହୋଇଥିବା ସମୟରେ ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସରେ ଥିବା ଆପ୍ସ ଅନୁମତି ପରିଚାଳକ, ଗୋପନୀୟତା ଡେସବୋର୍ଡ ଏବଂ ଅନ୍ୟ ସେଟିଂସରେ ଦେଖାଯିବ ନାହିଁ।\n\nଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଏକ ନୂଆ ଡିଭାଇସକୁ ମୁଭ କରାଯାଇପାରିବ ନାହିଁ। ଯଦି ଆପଣ ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଅନ୍ୟ ଏକ ଡିଭାଇସରେ ବ୍ୟବହାର କରିବାକୁ ଚାହାଁନ୍ତି ତେବେ ଆପଣଙ୍କୁ ଅନ୍ୟ ଏକ ପ୍ରାଇଭେଟ ସ୍ପେସ ସେଟ ଅପ କରିବାକୁ ହେବ।\n\nଆପଣଙ୍କ ଡିଭାଇସକୁ ଏକ କମ୍ପ୍ୟୁଟର ସହ କନେକ୍ଟ କରୁଥିବା କିମ୍ବା ଆପଣଙ୍କ ଡିଭାଇସରେ କ୍ଷତିକାରକ ଆପ୍ସ ଇନଷ୍ଟଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତି ଆପଣଙ୍କର ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ସକ୍ଷମ ହୋଇପାରନ୍ତି।"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ବେକଗ୍ରାଉଣ୍ଡରେ ଚାଲିବା କିମ୍ବା ମେଡିକାଲ ଆପ୍ସ ପରି ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପଠାଇବା ଆବଶ୍ୟକ କରୁଥିବା ଆପ୍ସ ପାଇଁ ପ୍ରାଇଭେଟ ସ୍ପେସଗୁଡ଼ିକ ଉପଯୁକ୍ତ ନୁହେଁ। ଏହାର କାରଣ ହେଉଛି ଆପଣଙ୍କ ସ୍ପେସ ଲକ ହୋଇଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତି ଏବଂ ବେକଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ବନ୍ଦ ହୋଇଯାଏ।\n\nପ୍ରାଇଭେଟ ସ୍ପେସ ଲକ ହୋଇଥିବା ସମୟରେ ଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସରେ ଥିବା ଆପ୍ସ ଅନୁମତି ପରିଚାଳକ, ଗୋପନୀୟତା ଡେସବୋର୍ଡ ଏବଂ ଅନ୍ୟ ସେଟିଂସରେ ଦେଖାଯିବ ନାହିଁ।\n\nଆପଣଙ୍କ ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଏକ ନୂଆ ଡିଭାଇସରେ ରିଷ୍ଟୋର କରାଯାଇପାରିବ ନାହିଁ। ଯଦି ଆପଣ ଏହାକୁ ଅନ୍ୟ ଏକ ଡିଭାଇସରେ ବ୍ୟବହାର କରିବାକୁ ଚାହାଁନ୍ତି ତେବେ ଆପଣଙ୍କୁ ଅନ୍ୟ ଏକ ସ୍ପେସ ସେଟ ଅପ କରିବାକୁ ହେବ।\n\nଆପଣଙ୍କ ଡିଭାଇସକୁ ଏକ କମ୍ପ୍ୟୁଟରରେ କନେକ୍ଟ କରୁଥିବା କିମ୍ବା ଆପଣଙ୍କ ଡିଭାଇସରେ କ୍ଷତିକାରକ ଆପ୍ସ ଇନଷ୍ଟଲ କରୁଥିବା ଯେ କୌଣସି ବ୍ୟକ୍ତି ଆପଣଙ୍କର ପ୍ରାଇଭେଟ ସ୍ପେସକୁ ଆକ୍ସେସ କରିବାକୁ ସକ୍ଷମ ହୋଇପାରନ୍ତି।"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ପ୍ରାଇଭେଟ ସ୍ପେସ ବିଷୟରେ ଅଧିକ ଜାଣନ୍ତୁ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ଏଥିପାଇଁ କିଛି ସମୟ ଲାଗିବ"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ପ୍ରାଇଭେଟ ସ୍ପେସ ସେଟ ଅପ କରାଯାଉଛି…"</string>
@@ -772,7 +771,7 @@
<string name="lock_last_password_attempt_before_wipe_device" msgid="985126164175708507">"ଏଥର ମଧ୍ୟ ଭୁଲ ପାସ୍ୱାର୍ଡ ଲେଖିଲେ ଏହି ଡିଭାଇସ୍ ଡାଟା ଲିଭାଇ ଦିଆଯିବ"</string>
<string name="lock_last_pattern_attempt_before_wipe_user" msgid="8283944727199433440">"ପରବର୍ତ୍ତୀ ପ୍ରୟାସରେ ଯଦି ଆପଣ ଭୁଲ ପାଟର୍ନ ଅଙ୍କନ କରନ୍ତି, ତେବେ ଏହି ୟୁଜର ଡିଲିଟ ହୋଇଯିବେ"</string>
<string name="lock_last_pin_attempt_before_wipe_user" msgid="972834567684477451">"ପରବର୍ତ୍ତୀ ପ୍ରୟାସରେ ଯଦି ଆପଣ ଭୁଲ ପିନ ନମ୍ବର ଲେଖନ୍ତି, ତେବେ ଏହି ୟୁଜର ଡିଲିଟ ହୋଇଯିବେ"</string>
- <string name="lock_last_password_attempt_before_wipe_user" msgid="3797239847079686727">"ପରବର୍ତ୍ତୀ ପ୍ରୟାସରେ ଯଦି ଆପଣ ଭୁଲ ପାସ୍ୱର୍ଡ ଦିଅନ୍ତି, ତେବେ ଏହି ଉପଯୋଗକର୍ତ୍ତା ଡିଲିଟ୍ ହୋଇଯିବେ"</string>
+ <string name="lock_last_password_attempt_before_wipe_user" msgid="3797239847079686727">"ପରବର୍ତ୍ତୀ ପ୍ରୟାସରେ ଯଦି ଆପଣ ଭୁଲ ପାସୱର୍ଡ ଦିଅନ୍ତି ତେବେ ଏହି ୟୁଜର ଡିଲିଟ ହୋଇଯିବେ"</string>
<string name="lock_last_pattern_attempt_before_wipe_profile" msgid="2479195488386373253">"ପରବର୍ତ୍ତୀ ପ୍ରଚେଷ୍ଟାରେ ଯଦି ଆପଣ ଭୁଲ ପାଟର୍ନ ଦିଅନ୍ତି, ତେବେ ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ଓ ଏହାର ଡାଟା ଡିଲିଟ୍ ହୋଇଯିବ"</string>
<string name="lock_last_pin_attempt_before_wipe_profile" msgid="7086428013814722436">"ପରବର୍ତ୍ତୀ ପ୍ରଚେଷ୍ଟାରେ ଯଦି ଆପଣ ଭୁଲ PIN ଦିଅନ୍ତି, ତେବେ ଆପଣଙ୍କ ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ଓ ତାର ଡାଟା ଡିଲିଟ୍ ହୋଇଯିବ"</string>
<string name="lock_last_password_attempt_before_wipe_profile" msgid="253673907244112643">"ପରବର୍ତ୍ତୀ ପ୍ରଚେଷ୍ଟାରେ ଯଦି ଆପଣ ଭୁଲ ପାସୱାର୍ଡ ଲେଖନ୍ତି, ତେବେ ଆପଣଙ୍କର ୱାର୍କ ପ୍ରୋଫାଇଲ୍ ଓ ତାର ଡାଟାକୁ ଡିଲିଟ୍ କରିଦିଆଯିବ।"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରିବେ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ସବିଶେଷ NFC ଲଗିଂ କେବଳ ଉନ୍ନତି ପାଇଁ ଉଦ୍ଦିଷ୍ଟ। ବଗ ରିପୋର୍ଟରେ ଅତିରିକ୍ତ NFC ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ କରାଯାଏ, ଯେଉଁଥିରେ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଥାଇପାରେ। ଏହି ସେଟିଂକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ମିରର, ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେ, କନେକ୍ଟ ହୋଇଥିବା ଡିସପ୍ଲେ, USB ଡିସପ୍ଲେ, ରିଜୋଲ୍ୟୁସନ, ରୋଟେସନ"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ରୋଟେସନ"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ଷ୍ଟାଣ୍ଡାର୍ଡ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1191,8 +1205,9 @@
<string name="color_mode_option_saturated" msgid="3413853820158447300">"ସାଚୁରେଟେଡ୍"</string>
<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_description" msgid="6807117118142381193">"ଆପଣଙ୍କ ସ୍କ୍ରିନର ଉଜ୍ଜ୍ଵଳତା ଆପଣଙ୍କ ପରିବେଶ ଓ କାର୍ଯ୍ୟକଳାପ ଅନୁସାରେ ସ୍ୱତଃ ଆଡଜଷ୍ଟ ହେବ। ଆପଣ ସ୍ଲାଇଡର୍କୁ ହାତରେ ଘୁଞ୍ଚାଇ ଆଡେପ୍ଟିଭ୍ ଉଜ୍ଜ୍ୱଳତାକୁ ଆପଣଙ୍କ ପସନ୍ଦଗୁଡ଼ିକ ଜାଣିବାରେ ସାହାଯ୍ୟ କରିପାରିବେ।"</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"ହ୍ବାଇଟ୍ ବ୍ୟାଲେନ୍ସ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"</string>
@@ -1247,7 +1262,7 @@
<string name="dark_ui_auto_mode_custom" msgid="3800138185265182170">"କଷ୍ଟମ୍ ସମୟରେ ଚାଲୁ ହୁଏ"</string>
<string name="dark_ui_auto_mode_custom_bedtime" msgid="8465023741946439266">"ଶୋଇବା ସମୟରେ ଚାଲୁ ହୁଏ"</string>
<string name="dark_ui_status_title" msgid="3505119141437774329">"ସ୍ଥିତି"</string>
- <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"କେବେ ବି ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ ନାହିଁ"</string>
+ <string name="dark_ui_summary_off_auto_mode_never" msgid="5828281549475697398">"କେବେ ବି ସ୍ୱତଃ ଚାଲୁ ହେବ ନାହିଁ"</string>
<string name="dark_ui_summary_off_auto_mode_auto" msgid="6766831395970887213">"ସନ୍ଧ୍ୟାରେ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
<string name="dark_ui_summary_off_auto_mode_custom" msgid="1345906088326708376">"<xliff:g id="ID_1">%1$s</xliff:g>ରେ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
<string name="dark_ui_summary_off_auto_mode_custom_bedtime" msgid="7759826673214624622">"ଶୋଇବା ସମୟରେ ସ୍ୱଚାଳିତ ଭାବେ ଚାଲୁ ହେବ"</string>
@@ -1271,7 +1286,7 @@
<string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"ଏଥିରୁ ୱାଲ୍ପେପର୍ ବାଛନ୍ତୁ"</string>
<string name="style_suggestion_title" msgid="1213747484782364775">"ଆପଣଙ୍କର ଫୋନ୍ କଷ୍ଟମାଇଜ୍ କରନ୍ତୁ"</string>
<string name="style_suggestion_summary" msgid="4271131877800968159">"ବିଭିନ୍ନ ଷ୍ଟାଇଲ୍, ୱାଲ୍ପେପର୍ ଏବଂ ଆହୁରି ଅନେକ କିଛି ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ"</string>
- <string name="screensaver_settings_title" msgid="3588535639672365395">"ସ୍କ୍ରିନ୍ ସେଭର୍"</string>
+ <string name="screensaver_settings_title" msgid="3588535639672365395">"ସ୍କ୍ରିନ ସେଭର"</string>
<string name="keywords_screensaver" msgid="7249337959432229172">"ସ୍କ୍ରିନସେଭର"</string>
<string name="screensaver_settings_when_to_dream_bedtime" msgid="3279310576803094771">"ଶୋଇବା ସମୟ ମୋଡ ଚାଲୁ ଥିବା ଯୋଗୁଁ ଉପଲବ୍ଧ ନାହିଁ"</string>
<string name="screensaver_settings_toggle_title" msgid="6194634226897244374">"ସ୍କ୍ରିନ ସେଭର ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -1839,7 +1854,7 @@
<!-- no translation found for service_process_name (7827318358399776412) -->
<skip />
<string name="running_process_item_user_label" msgid="1444898861984132133">"ୟୁଜର: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="running_process_item_removed_user_label" msgid="4812732296696662613">"କାଢ଼ିଦିଆଯାଇଥିବା ଉପଯୋଗକର୍ତ୍ତା"</string>
+ <string name="running_process_item_removed_user_label" msgid="4812732296696662613">"କାଢ଼ିଦିଆଯାଇଥିବା ୟୁଜର"</string>
<string name="running_processes_item_description_s_s" msgid="6835918861352501671">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ପ୍ରକ୍ରିୟା ଏବଂ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ସେବା"</string>
<string name="running_processes_item_description_s_p" msgid="1209371773353932361">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ପ୍ରକ୍ରିୟା ଓ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ସେବା"</string>
<string name="running_processes_item_description_p_s" msgid="8957061449107822282">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ପ୍ରକ୍ରିୟା ଓ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ସେବା"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ଅନ୍-ସ୍କ୍ରିନ୍ କୀବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ଫିଜିକାଲ୍ କୀବୋର୍ଡ ସକ୍ରିୟ ଥିବାବେଳେ ଏହାକୁ ସ୍କ୍ରିନ୍ ଉପରେ ରଖନ୍ତୁ"</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> ms ମଧ୍ୟରେ ସମାନ କୀ ଶୀଘ୍ର ବାରମ୍ବାର ଦବାଇବାକୁ ଅଣଦେଖା କରେ"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ପଏଣ୍ଟର ଫିଲ ଷ୍ଟାଇଲ ହଳଦିଆରେ ବଦଳାନ୍ତୁ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ପଏଣ୍ଟର ଫିଲ ଷ୍ଟାଇଲ ଗୋଲାପିରେ ବଦଳାନ୍ତୁ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ପଏଣ୍ଟର ଫିଲ ଷ୍ଟାଇଲକୁ ନୀଳରେ ବଦଳାନ୍ତୁ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"ପଏଣ୍ଟର ଷ୍ଟ୍ରୋକର ଷ୍ଟାଇଲ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ଧଳା"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"କଳା"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"କିଛି ନାହିଁ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ୟୁଜର ଚୟନିତ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ସ୍ପିଚ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ପଏଣ୍ଟର୍ର ବେଗ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ପଏଣ୍ଟର ସ୍କେଲ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ପଏଣ୍ଟର ସ୍କେଲ କମାନ୍ତୁ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"ପଏଣ୍ଟର ସ୍କେଲ ବଢ଼ାନ୍ତୁ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ଗେମ କଣ୍ଟ୍ରୋଲର"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ଭାଇବ୍ରେଶନ୍ ରିଡାଇରେକ୍ଟ କରନ୍ତୁ"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ସଂଯୋଗ ହୋଇଥିବା ବେଳେ ଗେମ୍ କଣ୍ଟ୍ରୋଲର୍ରେ ଭାଇବ୍ରେଶନ୍ କରନ୍ତୁ"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ଯେ କୌଣସି ମତେ ଜାରି ରଖନ୍ତୁ"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ବାତିଲ କର"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ମାଗ୍ନିଫିକେସନ ସେଟିଂସ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ଗୋଟିଏ ଆଙ୍ଗୁଠିରେ ପେନିଂ"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 ଆଙ୍ଗୁଠିରେ ମେଗ୍ନିଫାୟାରକୁ ମୁଭ କରନ୍ତୁ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ସ୍କ୍ରିନରେ ଚାରିଆଡ଼େ ମୁଭ କରିବାକୁ 1 ଆଙ୍ଗୁଠିରେ ଡ୍ରାଗ କରନ୍ତୁ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ଗୋଟିଏ ଆଙ୍ଗୁଠିକୁ ଟାଣି ମ୍ୟାଗ୍ନିଫିକେସନ ଏରିଆକୁ ମୁଭ କରନ୍ତୁ।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ଦୁଇ ଆଙ୍ଗୁଠିକୁ ଟାଣି ମ୍ୟାଗ୍ନିଫିକେସନ ଏରିଆକୁ ମୁଭ କରନ୍ତୁ।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ସ୍କ୍ରିନର କେବଳ କିଛି ଅଂଶ ମେଗ୍ନିଫାଏ କରାଯିବା ସମୟରେ ଉପଲବ୍ଧ ନାହିଁ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ଜୁମ୍ କରିବା ପାଇଁ ଗୋଟିଏ ବଟନ୍ ଉପରେ ଟାପ୍ କରନ୍ତୁ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ବିଷୟବସ୍ତୁକୁ ଆହୁରି ବଡ଼ କରିବା ପାଇଁ ସ୍କ୍ରିନରେ ଶୀଘ୍ର ଜୁମ ଇନ କରନ୍ତୁ"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ଜୁମ ଇନ କରିବାକୁ:</b><br/> {0,number,integer}. ମ୍ୟାଗ୍ନିଫିକେସନ ଆରମ୍ଭ କରିବାକୁ ସର୍ଟକଟ ବ୍ୟବହାର କରନ୍ତୁ<br/> {1,number,integer}. ସ୍କ୍ରିନରେ ଟାପ କରନ୍ତୁ<br/> {2,number,integer}. ସ୍କ୍ରିନର ଚାରିପଟେ ମୁଭ କରିବାକୁ 2ଟି ଆଙ୍ଗୁଠିରେ ଡ୍ରାଗ କରନ୍ତୁ<br/> {3,number,integer}. ଜୁମ ଆଡଜଷ୍ଟ କରିବାକୁ 2ଟି ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ କରନ୍ତୁ<br/> {4,number,integer}. ମ୍ୟାଗ୍ନିଫିକେସନ ବନ୍ଦ କରିବାକୁ ସର୍ଟକଟ ବ୍ୟବହାର କରନ୍ତୁ<br/><br/> <b>ଅସ୍ଥାୟୀ ଭାବେ ଜୁମ ଇନ କରିବାକୁ:</b><br/> {0,number,integer}. ଆପଣଙ୍କ ମ୍ୟାଗ୍ନିଫିକେସନ ପ୍ରକାର ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନରେ ସେଟ ହୋଇଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ<br/> {1,number,integer}. ମ୍ୟାଗ୍ନିଫିକେସନ ଆରମ୍ଭ କରିବାକୁ ସର୍ଟକଟ ବ୍ୟବହାର କରନ୍ତୁ<br/> {2,number,integer}. ସ୍କ୍ରିନରେ ଯେ କୌଣସି ସ୍ଥାନରେ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ<br/> {3,number,integer}. ସ୍କ୍ରିନର ଚାରିପଟେ ମୁଭ କରିବାକୁ ଆଙ୍ଗୁଠିରେ ଡ୍ରାଗ କରନ୍ତୁ<br/> {4,number,integer}. ମ୍ୟାଗ୍ନିଫିକେସନ ବନ୍ଦ କରିବା ପାଇଁ ଆଙ୍ଗୁଠିକୁ ଉଠାନ୍ତୁ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ଜୁମ ଇନ କରିବାକୁ:</b><br/> {0,number,integer}. ମେଗ୍ନିଫିକେସନ ଆରମ୍ଭ କରିବାକୁ ସର୍ଟକଟ ବ୍ୟବହାର କରନ୍ତୁ<br/> {1,number,integer}. ସ୍କ୍ରିନରେ ଟାପ କରନ୍ତୁ<br/> {2,number,integer}. ସ୍କ୍ରିନରେ ଚାରିଆଡ଼େ ମୁଭ କରିବାକୁ 2 ଆଙ୍ଗୁଠିରେ ଡ୍ରାଗ କରନ୍ତୁ<br/> {3,number,integer}. ଜୁମ ଆଡଜଷ୍ଟ କରିବାକୁ 2 ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ କରନ୍ତୁ<br/> {4,number,integer}. ମେଗ୍ନିଫିକେସନ ବନ୍ଦ କରିବା ପାଇଁ ସର୍ଟକଟକୁ ବ୍ୟବହାର କରନ୍ତୁ<br/><br/> ଆପଣ ଅସ୍ଥାୟୀ ଭାବେ ଏବଂ ଅଧିକ ଜୁମ ଇନ ମଧ୍ୟ କରିପାରିବେ।"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ଜୁମ ଇନ କରିବାକୁ:</b><br/> {0,number,integer}. ମେଗ୍ନିଫିକେସନ ଆରମ୍ଭ କରିବାକୁ ସର୍ଟକଟ ବ୍ୟବହାର କରନ୍ତୁ<br/> {1,number,integer}. ସ୍କ୍ରିନରେ ଟାପ କରନ୍ତୁ<br/> {2,number,integer}. ସ୍କ୍ରିନରେ ଚାରିଆଡ଼େ ମୁଭ କରିବାକୁ 1 କିମ୍ବା 2 ଆଙ୍ଗୁଠିରେ ଡ୍ରାଗ କରନ୍ତୁ<br/> {3,number,integer}. ଜୁମ ଆଡଜଷ୍ଟ କରିବାକୁ 2 ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ କରନ୍ତୁ<br/> {4,number,integer}. ମେଗ୍ନିଫିକେସନ ବନ୍ଦ କରିବା ପାଇଁ ସର୍ଟକଟକୁ ବ୍ୟବହାର କରନ୍ତୁ<br/><br/> ଆପଣ ଅସ୍ଥାୟୀ ଭାବେ ଏବଂ ଅଧିକ ଜୁମ ଇନ ମଧ୍ୟ କରିପାରିବେ।"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଚାଲୁଥିବା ସମୟରେ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍ର ଜୁମ୍ ବଢ଼ାଇ ପାରିବେ।\n\n"<b>"ଜୁମ୍ କରିବାକୁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ତା’ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ଟାପ୍ କରନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରୋଲ୍ କରିବାକୁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ଟାଣନ୍ତୁ"</li>\n<li>"ଜୁମ୍ ଆଡ୍ଜଷ୍ଟ କରିବାକୁ 2 ବା ଅଧିକ ଆଙ୍ଗୁଠିରେ ପିଞ୍ଚ୍ କରନ୍ତୁ"</li></ul>\n\n<b>"ଅସ୍ଥାୟୀ ଭାବେ ଜୁମ୍ କରିବାକୁ"</b>", ମ୍ୟାଗ୍ନିଫିକେସନ୍ ଆରମ୍ଭ କରନ୍ତୁ, ତା’ପରେ ସ୍କ୍ରିନ୍ର ଯେ କୌଣସି ସ୍ଥାନରେ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।\n"<ul><li>"ସ୍କ୍ରିନ୍ର ଚାରିପଟରେ ଘୁଞ୍ଚାଇବାକୁ ଟାଣନ୍ତୁ"</li>\n<li>"ଜୁମ୍ କମାଇବାକୁ ଆଙ୍ଗୁଠି ବାହାର କରି ଦିଅନ୍ତୁ"</li></ul>\n\n"ଆପଣ କୀବୋର୍ଡ ବା ନେଭିଗେସନ୍ ବାର୍ ଉପରେ ଜୁମ୍ ବଢ଼ାଇ ପାରିବେ ନାହିଁ।"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> ମଧ୍ୟରୁ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ପୃଷ୍ଠା"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ ସର୍ଟକଟ"</string>
@@ -2182,7 +2207,7 @@
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"ଲକ୍ ସ୍କ୍ରିନରୁ ସର୍ଟକଟ୍"</string>
<string name="accessibility_shortcut_description" msgid="2184693606202133549">"ଲକ୍ ସ୍କ୍ରିନରୁ ଫିଚର୍ ସର୍ଟକଟ୍ ଚାଲୁ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ। କିଛି ସେକେଣ୍ଡ ପାଇଁ ଉଭୟ ଭଲ୍ୟୁମ୍ କୀ’କୁ ଧରି ରଖନ୍ତୁ।"</string>
<string name="accessibility_button_title" msgid="5251235485581552614">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ"</string>
- <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ଏବଂ ଜେଶ୍ଚର୍"</string>
+ <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ ଏବଂ ଜେଶ୍ଚର"</string>
<string name="accessibility_button_intro_text" msgid="80993874471745687">"ଯେ କୌଣସି ସ୍କ୍ରିନରୁ ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ଶୀଘ୍ର ଆକ୍ସେସ କରନ୍ତୁ"</string>
<string name="accessibility_button_about_title" msgid="3581116105084067926">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ବିଷୟରେ"</string>
<string name="accessibility_button_gesture_about_title" msgid="8468987303602865536">"ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ଏବଂ ଜେଶ୍ଚର୍ ବିଷୟରେ"</string>
@@ -2191,7 +2216,7 @@
<string name="accessibility_button_summary" msgid="8510939012631455831">"ଆକ୍ସେସିବିଲିଟୀ ଫିଚରକୁ ଶୀଘ୍ର ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
<string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>ଆରମ୍ଭ କରିବାକୁ</b><br/> {0,number,integer}। ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଆନ୍ତୁ<br/> {1,number,integer}। ଏକ ଫିଚର ଚୟନ କରି ସର୍ଟକଟରେ ଟାପ କରନ୍ତୁ<br/> {2,number,integer}। ଫିଚରକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ଆପଣ ଏକ ବଟନ କିମ୍ବା ଜେଶ୍ଚର ବ୍ୟବହାର କରିବାକୁ ଚାହାଁନ୍ତି ନା ନାହିଁ ତାହା ବାଛନ୍ତୁ<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>ଆରମ୍ଭ କରିବାକୁ</b><br/> {0,number,integer}। ଆକ୍ସେସିବିଲିଟୀ ସେଟିଂସକୁ ଯାଆନ୍ତୁ<br/> {1,number,integer}। ଏକ ଫିଚର ଚୟନ କରି ସର୍ଟକଟରେ ଟାପ କରନ୍ତୁ<br/> {2,number,integer}। ଫିଚରକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ବଟନ ବାଛନ୍ତୁ<br/>"</string>
- <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"ବଟନ୍ କିମ୍ବା ଜେଶ୍ଚର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+ <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"ବଟନ କିମ୍ବା ଜେଶ୍ଚର ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"ଲୋକେସନ"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"ଆକାର"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"ବ୍ୟବହାରରେ ନଥିବା ବେଳେ ଫିକା ଦେଖାଯାଏ"</string>
@@ -2394,7 +2419,7 @@
<string name="enable_service_title" msgid="7231533866953706788">"ଆପଣଙ୍କ ଡିଭାଇସର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ କରିବାକୁ <xliff:g id="SERVICE">%1$s</xliff:g>କୁ ଅନୁମତି ଦେବେ?"</string>
<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_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>, ଏହି ଡିଭାଇସ୍ର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଅନୁରୋଧ କରୁଛି। ଏହି ସେବା, ସ୍କ୍ରିନ୍ ପଢିପାରିବ ଏବଂ ଆକ୍ସେସିବିଲିଟୀ ଆବଶ୍ୟକତା ଅନୁଯାୟୀ ଉପଯୋଗକର୍ତ୍ତା ତରଫରୁ କାର୍ଯ୍ୟ କରିପାରିବ। ଅଧିକାଂଶ ଆପ୍ ପାଇଁ ଏହି ସ୍ତରର ନିୟନ୍ତ୍ରଣ ସଠିକ୍ ନୁହେଁ।"</string>
+ <string name="accessibility_service_warning" msgid="6779187188736432618">"<xliff:g id="SERVICE">%1$s</xliff:g>, ଏହି ଡିଭାଇସର ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଅନୁରୋଧ କରୁଛି। ଏହି ସେବା, ସ୍କ୍ରିନ ପଢ଼ିପାରିବ ଏବଂ ଆକ୍ସେସିବିଲିଟି ଆବଶ୍ୟକତା ଅନୁଯାୟୀ ୟୁଜର ତରଫରୁ କାର୍ଯ୍ୟ କରିପାରିବ। ଅଧିକାଂଶ ଆପ ପାଇଁ ଏହି ସ୍ତରର ନିୟନ୍ତ୍ରଣ ସଠିକ୍ ନୁହେଁ।"</string>
<string name="accessibility_service_warning_description" msgid="6573203795976134751">"ଯେଉଁ ଆପ୍ସ ଆପଣଙ୍କୁ ଆକ୍ସେସିବିଲିଟୀ ଆବଶ୍ୟକତାରେ ସହାୟତା କରେ, ସେହି ଆପ୍ସ ପାଇଁ ସମ୍ପୂର୍ଣ୍ଣ ନିୟନ୍ତ୍ରଣ ଉପଯୁକ୍ତ ଅଟେ, କିନ୍ତୁ ଅଧିକାଂଶ ଆପ୍ସ ପାଇଁ ଉପଯୁକ୍ତ ନୁହେଁ।"</string>
<string name="accessibility_service_screen_control_title" msgid="324795030658109870">"ସ୍କ୍ରିନକୁ ଦେଖନ୍ତୁ ଏବଂ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
<string name="accessibility_service_screen_control_description" msgid="8431940515157990426">"ଏହା ସ୍କ୍ରିନ୍ର ସମସ୍ତ ବିଷୟବସ୍ତୁ ପଢ଼ିପାରେ ଏବଂ ଅନ୍ୟ ଆପ୍ସରେ ବିଷୟବସ୍ତୁ ପ୍ରଦର୍ଶନ କରିପାରେ।"</string>
@@ -2784,7 +2809,7 @@
<string name="device_admin_status" msgid="6332571781623084064">"ଏହି ଆଡମିନ୍ ଆପ୍ ସକ୍ରିୟ ଅଛି ଏବଂ <xliff:g id="APP_NAME">%1$s</xliff:g> ଆପ୍ ଦ୍ୱାରା ନିମ୍ନଲିଖିତ କାର୍ଯ୍ୟଗୁଡ଼ିକ କରାଉଛି:"</string>
<string name="profile_owner_add_title" msgid="2774489881662331549">"ପ୍ରୋଫାଇଲ୍ ମ୍ୟାନେଜର୍ ସକ୍ରିୟ କରିବେ?"</string>
<string name="profile_owner_add_title_simplified" msgid="2320828996993774182">"ନିରୀକ୍ଷଣ ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
- <string name="adding_profile_owner_warning" msgid="6868275476058020513">"ଆଗକୁ ବଢି, ଆପଣଙ୍କ ଉପଯୋଗକର୍ତ୍ତା ଆପଣଙ୍କର ଆଡମିନ ଦ୍ୱାରା ପରିଚାଳିତ ହେବ ଯିଏ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ସହିତ, ସମ୍ବନ୍ଧିତ ଡାଟା ମଧ୍ୟ ଷ୍ଟୋର କରି ପାରିବେ।\n\nଆପଣଙ୍କ ଆଡମିନର ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ସେଟିଂସ, ଆକ୍ସେସ, ଆପ୍ସ ଏବଂ ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଡାଟା ତଦାରଖ କରିବା ତଥା ପରିଚାଳନା କରିବାର ଦକ୍ଷତା ଅଛି।"</string>
+ <string name="adding_profile_owner_warning" msgid="6868275476058020513">"ଜାରି ରଖି, ଆପଣଙ୍କ ୟୁଜର ଆପଣଙ୍କର ଆଡମିନ ଦ୍ୱାରା ପରିଚାଳିତ ହେବ ଯିଏ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ସହିତ ସମ୍ବନ୍ଧିତ ଡାଟା ମଧ୍ୟ ଷ୍ଟୋର କରିପାରିବେ।\n\nଆପଣଙ୍କ ଆଡମିନର ନେଟୱାର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଆପଣଙ୍କ ଡିଭାଇସର ଲୋକେସନ ସୂଚନା ସମେତ ସେଟିଂସ, ଆକ୍ସେସ, ଆପ୍ସ ଏବଂ ଏହି ୟୁଜରଙ୍କ ସହ ସମ୍ୱନ୍ଧିତ ଡାଟା ମନିଟର କରିବା ତଥା ପରିଚାଳନା କରିବାର ଦକ୍ଷତା ଅଛି।"</string>
<string name="admin_disabled_other_options" msgid="8122039047419172139">"ଆଡମିନ ଅକ୍ଷମ କରିଥିବା ଅନ୍ୟାନ୍ୟ ବିକଳ୍ପମାନ"</string>
<string name="admin_more_details" msgid="4928985331640193758">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
<string name="notification_log_title" msgid="2812594935014664891">"ବିଜ୍ଞପ୍ତି ଲଗ୍"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}other{#ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ପ୍ରାଥମିକତା ମୋଡ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ଏକ ମୋଡ ଯୋଗ କରନ୍ତୁ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"କେବଳ ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ଲୋକ ଏବଂ ଆପ୍ସ ଦ୍ୱାରା ସୂଚନା ପାଆନ୍ତୁ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"ସକ୍ରିୟକରଣ ପ୍ରକାର ଚୟନ କରନ୍ତୁ"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ସମୟ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ଉଦାହରଣ \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"କେଲେଣ୍ଡର"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ଉଦାହରଣ \"ବ୍ୟକ୍ତିଗତ କେଲେଣ୍ଡର\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ଏକ ମୋଡ ତିଆରି କରନ୍ତୁ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"କଷ୍ଟମ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ବ୍ୟାଘାତଗୁଡ଼ିକୁ ସୀମିତ କରନ୍ତୁ"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଅନ୍ କରନ୍ତୁ"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ଆଲାରାମ୍ ଏବଂ ମିଡିଆ ସାଉଣ୍ଡ ବାଧା ଦେଇପାରେ"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"ସିଡୁଲ୍"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ସିଡୁଲ୍ ଡିଲିଟ୍ କରନ୍ତୁ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ଡିଲିଟ୍ କରନ୍ତୁ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"ରିନେମ କରନ୍ତୁ"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ଡିଲିଟ କରନ୍ତୁ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" ମୋଡକୁ ଡିଲିଟ କରିବେ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ଏଡିଟ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"ସିଡୁଲ୍"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"ସିଡୁଲ୍"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"ଏକ କେଲେଣ୍ଡର ଯୋଗ କରନ୍ତୁ"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ଆପଣଙ୍କ କେଲେଣ୍ଡରକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"ସିଡୁଲ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ଏକ ସିଡୁଲ ସେଟ କରନ୍ତୁ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"ସିଡୁଲ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ଘଣ୍ଟା, <xliff:g id="MINUTES">%2$d</xliff:g> ମିନିଟ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ସ୍ୱତଃ ଚାଲୁ କରନ୍ତୁ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"ସିଡୁଲ୍"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ନିର୍ଦ୍ଦିଷ୍ଟ ସମୟରେ ଫୋନ୍କୁ ନିରବ କରନ୍ତୁ"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଂ\" ନିୟମ ସେଟ୍ କରନ୍ତୁ"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ବାଧାଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଶବ୍ଦ କରେ"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ଭିଜୁଆଲ୍ ବାଧା ଅବରୋଧ କରନ୍ତୁ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ଭିଜୁଆଲ୍ ସଙ୍କେତ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ଫୋକସ କରନ୍ତୁ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"ଅତିରିକ୍ତ ପଦକ୍ଷେପ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ବନ୍ଦ ଅଛି}=1{ବନ୍ଦ ଅଛି / 1 ମୋଡ ସ୍ୱତଃ ଚାଲୁ ହୋଇପାରିବ}other{ବନ୍ଦ ଅଛି / # ମୋଡ ସ୍ୱତଃ ଚାଲୁ ହୋଇପାରିବ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ଡିସପ୍ଲେ ସେଟିଂସ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ଡିସପ୍ଲେ ବିକଳ୍ପଗୁଡ଼ିକ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ଗ୍ରେସ୍କେଲ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ଡାର୍କ ଥିମକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ଆଖି ପାଇଁ ଆରାମଦାୟକ ଏବଂ କିଛି ଡିଭାଇସରେ ଉଲ୍ଲେଖନୀୟ ବେଟେରୀ ସେଭ କରୁଥିବା ଡାର୍କ ବେକଗ୍ରାଉଣ୍ଡରେ ଲାଇଟ ଟେକ୍ସଟ ପସନ୍ଦ କରିବାକୁ OS ଏବଂ ଆପ୍ସ ସୁଇଚ କରନ୍ତୁ"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"ବାଧାଗୁଡ଼ିକୁ ଫିଲ୍ଟର କରନ୍ତୁ"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"କୌଣସି ବାଧା ଫିଲ୍ଟର ହୋଇନାହିଁ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ବିଜ୍ଞପ୍ତି ଖୋଲନ୍ତୁ"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"ବିଜ୍ଞପ୍ତି ସ୍ନୁଜ କରିବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ଆପ ଆଇକନରେ ବିଜ୍ଞପ୍ତି ଡଟ"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"ବିଜ୍ଞପ୍ତିର ବଣ୍ଡଲ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ବବଲ୍ଗୁଡ଼ିକ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ବବଲ୍ଗୁଡ଼ିକ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ଏହି ବାର୍ତ୍ତାଳାପକୁ ବବଲ କରନ୍ତୁ"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ଏହି ଆପ ଉନ୍ନତ ସେଟିଂସକୁ ସମର୍ଥନ କରେ ନାହିଁ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ଅଧିକ ସେଟିଂସ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ଏହି ଆପରେ ଅଧିକ ସେଟିଂସ ଉପଲବ୍ଧ ଅଛି"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"ବିଜ୍ଞପ୍ତି କୁଲଡାଉନ"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ୱାର୍କ ପ୍ରୋଫାଇଲରେ ଲାଗୁ କରନ୍ତୁ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ୱାର୍କ ପ୍ରୋଫାଇଲ ଆପ୍ସରେ ଲାଗୁ କରନ୍ତୁ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ବର୍ଗ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ଅନ୍ୟ"</string>
<string name="no_channels" msgid="4716199078612071915">"ଏହି ଆପଟି କୌଣସି ବିଜ୍ଞପ୍ତି ପୋଷ୍ଟ୍ କରିନାହିଁ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ଅବ୍ୟବହୃତ ବର୍ଗଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ଆପର ଅତିରିକ୍ତ ସେଟିଂସ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ଅବ୍ୟବହୃତ ବର୍ଗଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ଅବ୍ୟବହୃତ ବର୍ଗଗୁଡ଼ିକ ଲୁଚାନ୍ତୁ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ଆପଗୁଡ଼ିକ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ଚୟନିତ ଆପ୍ସ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"କିଛି ନାହିଁ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ସମସ୍ତ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ନିଷ୍କ୍ରିୟ କରିବାକୁ ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ଆପଗୁଡ଼ିକ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ଅଧିକ ଆପ୍ ଚୟନ କରନ୍ତୁ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"କିଛି ବି ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"କେହି ବି ବାଧା ଉପୁଯାଇପାରିବେ ନାହିଁ"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"କିଛି ଲୋକ ବାଧା ଦେଇପାରନ୍ତି"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ସବୁ ଲୋକ ବାଧା ଉପୁଯାଇପାରିବେ"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ବାରମ୍ୱାର ଫୋନ୍ କରୁଥିବା କଲର୍"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ବାରମ୍ବାର କଲ କରୁଥିବା ବ୍ୟକ୍ତିଙ୍କ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} ପର୍ଯ୍ୟନ୍ତ କେବଳ ଏକ ଘଣ୍ଟା ପାଇଁ ଆଲାରାମରେ ପରିବର୍ତ୍ତନ କରନ୍ତୁ}other{{time} ପର୍ଯ୍ୟନ୍ତ କେବଳ # ଘଣ୍ଟା ପାଇଁ ଆଲାରାମରେ ପରିବର୍ତ୍ତନ କରନ୍ତୁ}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ପର୍ଯ୍ୟନ୍ତ କେବଳ ଆଲାର୍ମଗୁଡିକ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ସର୍ବଦା ବାଧାକୁ ବଦଳାନ୍ତୁ"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ମୋଡ ଏଡିଟ କରନ୍ତୁ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ମୋଡ ଯୋଗ କରନ୍ତୁ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"କଷ୍ଟମ ମୋଡ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ମୋଡର ନାମ"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ଚେତାବନୀ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ବନ୍ଦ କରନ୍ତୁ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ଏହି ଡିଭାଇସ ବିଷୟରେ ମତାମତ ପଠାନ୍ତୁ"</string>
@@ -4247,7 +4292,7 @@
<string name="reset_shortcut_manager_throttling_complete" msgid="8949943009096885470">"ShortcutManager ର ହାର-ସୀମିତକରଣ ରିସେଟ୍ କରିଦିଆଗଲା"</string>
<string name="notification_suggestion_title" msgid="6309263655965785411">"ଲକ୍ ସ୍କ୍ରୀନ୍ ଉପରେ ନିୟନ୍ତ୍ରଣ ସମ୍ପର୍କିତ ବିଜ୍ଞପ୍ତି"</string>
<string name="notification_suggestion_summary" msgid="7615611244249276113">"ବିଜ୍ଞପ୍ତି କଣ୍ଟେଣ୍ଟକୁ ଦେଖାନ୍ତୁ କିମ୍ୱା ଲୁଚାନ୍ତୁ"</string>
- <string name="page_tab_title_support" msgid="3235725053332345773">"ଟିପ୍ସ ଓ ସହାୟତା"</string>
+ <string name="page_tab_title_support" msgid="3235725053332345773">"ଟିପ୍ସ ଓ ସପୋର୍ଟ"</string>
<string name="developer_smallest_width" msgid="632354817870920911">"ସବୁଠାରୁ ଛୋଟ ଓସାର"</string>
<string name="premium_sms_none" msgid="4718916765158062108">"ଇନଷ୍ଟଲ କରାଯାଇଥିବା କୌଣସି ଆପ୍ସ ପ୍ରିମିୟମ SMS ପାଇଁ ଅନୁରୋଧ କରିନାହିଁ"</string>
<string name="premium_sms_warning" msgid="2192300872411073324">"ପ୍ରିମିୟମ୍ SMSରେ ଆପଣଙ୍କୁ ଖର୍ଚ୍ଚ କରିବାକୁ ପଡ଼ିପାରେ ଏବଂ ତାହା ଆପଣଙ୍କର କେରିଅର୍ ବିଲ୍ରେ ଯୋଡ଼ି ହୋଇଯିବ। ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍ ପାଇଁ ଅନୁମତି ଦେଇଛନ୍ତି, ତେବେ ସେହି ଆପ୍ ବ୍ୟବହାର କରି ଆପଣ ପ୍ରିମିୟମ୍ SMS ପଠାଇପାରିବେ।"</string>
@@ -4256,7 +4301,7 @@
<string name="bluetooth_connected_summary" msgid="8043167194934315712">"<xliff:g id="ID_1">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହେଲା"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="2294954614327771844">"ଏକାଧିକ ଡିଭାଇସ୍ରେ ସଂଯୁକ୍ତ"</string>
<string name="demo_mode" msgid="6566167465451386728">"ସିଷ୍ଟମ୍ UI ଡେମୋ ମୋଡ୍"</string>
- <string name="dark_ui_mode" msgid="898146394425795281">"ଗାଢ଼ା ଥିମ୍"</string>
+ <string name="dark_ui_mode" msgid="898146394425795281">"ଗାଢ଼ା ଥିମ"</string>
<string name="dark_ui_mode_disabled_summary_dark_theme_on" msgid="4554134480159161533">"ବ୍ୟାଟେରୀ ସେଭର୍ ଯୋଗୁଁ ଅସ୍ଥାୟୀ ଭାବେ ଅକ୍ଷମ କରାଯାଇଛି"</string>
<string name="ambient_camera_summary_battery_saver_on" msgid="1787784892047029560">"ବ୍ୟାଟେରୀ ସେଭର୍ ଯୋଗୁଁ ଅସ୍ଥାୟୀ ଭାବେ ଅକ୍ଷମ କରାଯାଇଛି"</string>
<string name="ambient_camera_battery_saver_off" msgid="689825730569761613">"ବ୍ୟାଟେରୀ ସେଭରକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
@@ -4802,8 +4847,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ଫୋର୍ସ ଡେସ୍କଟପ୍ ମୋଡ୍"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ଦ୍ବିତୀୟ ପ୍ରଦର୍ଶନରେ ଫୋର୍ସ ପରୀକ୍ଷାମୂଳକ ମୋଡ୍"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋ ସକ୍ଷମ କରନ୍ତୁ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋ ପାଇଁ ସପୋର୍ଟ ସକ୍ଷମ କରନ୍ତୁ।"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"ଦ୍ଵିତୀୟ ଡିସପ୍ଲେରେ ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋ ସକ୍ଷମ କରନ୍ତୁ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"କେବଳ ସେକେଣ୍ଡାରୀ ଡିସପ୍ଲେରେ ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋ ସକ୍ଷମ କରନ୍ତୁ।"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ମଲ୍ଟି ୱିଣ୍ଡୋରେ ରିସାଇଜ୍ କରାଯାଇପାରୁନଥିବାକୁ ସକ୍ଷମ କରନ୍ତୁ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ରିସାଇଜ୍ କରାଯାଇପାରୁନଥିବା ଆପଗୁଡ଼ିକୁ ମଲ୍ଟି ୱିଣ୍ଡୋରେ ରହିବା ପାଇଁ ଅନୁମତି ଦିଏ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ଫୋର୍ସ୍-ଡାର୍କ୍ ଓଭର୍ରାଇଡ୍ କରନ୍ତୁ"</string>
@@ -4871,14 +4918,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB ଡେଭଲପର ବିକଳ୍ପ ବ୍ୟବହାର କରିବା ପୂର୍ବରୁ ଏହି ଡିଭାଇସର ଡାଟା ପାର୍ଟିସନ ext4କୁ କନଭର୍ଟ କରାଯିବା ଆବଶ୍ୟକ। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। 16KB ବିକଳ୍ପକୁ ସକ୍ରିୟ କରିବା ପାଇଁ ଏହା ପରେ ଆଉ ଏକ ରିବୁଟ ଆବଶ୍ୟକ ହେବ। ଆପଣ ଏହି ମୋଡରେ ଥିଲେ ଆପଣ ଗୋଟିଏ ସିଙ୍ଗଲ ରିବୁଟ ସହିତ 4KB ଏବଂ 16KB ମୋଡ ମଧ୍ୟରେ ଆଗକୁ ଏବଂ ପଛକୁ ସୁଇଚ କରିପାରିବେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ଡିଭାଇସକୁ ପ୍ରଡକ୍ସନ ମୋଡକୁ ଫେରାଇ ଆଣିବା ପାଇଁ ଆପଣଙ୍କୁ ଡିଭାଇସକୁ ଫେକ୍ଟୋରୀ ରିସେଟ କରୁଥିବା 4KB ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ବୁଟଲୋଡରକୁ ଲକ କରିବାକୁ ହେବ। Androidରେ ସଫଳତାର ସହ ଡିଭାଇସ ବୁଟ ହେବା ପରେ ଡେଭେଲପର ବିକଳ୍ପରେ OEM ଅନଲକିଂକୁ ଅକ୍ଷମ କରନ୍ତୁ। ଡିଭାଇସକୁ ୱାଇପ କରାଯିବ ଏବଂ ସୁନିଶ୍ଚିତକରଣ ପରେ ଫାଇଲସିଷ୍ଟମକୁ ext4ରେ ପରିବର୍ତ୍ତନ କରାଯିବ। ଏହା ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପରେ ଦୟାକରି ପୁଣି 16KBକୁ ସକ୍ଷମ କରିବାକୁ ଫେରନ୍ତୁ।"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ସମସ୍ତ ଡାଟା ଇରେଜ କରନ୍ତୁ"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ଡାଟା ପାର୍ଟିସନକୁ ext4ରେ ପୁଣି ଫର୍ମାଟ କରି ୱାଇପ କରିବାରେ ବିଫଳ ହୋଇଛି।"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB ମୋଡ ପାଇଁ ବୁଟଲୋଡର ଅନଲକ ଆବଶ୍ୟକ"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ବୁଟଲୋଡର ଅନଲକ ଆବଶ୍ୟକ"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16KB ଡେଭେଲପର ବିକଳ୍ପ ବ୍ୟବହାର କରିବା ପୂର୍ବରୁ ଏହି ଡିଭାଇସକୁ ବୁଟଲୋଡରକୁ ଅନଲକ କରିବା ଆବଶ୍ୟକ। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। 16KB ମୋଡ ସକ୍ରିୟ କରିବା ସମୟରେ ସମସ୍ତ ୟୁଜର ଡାଟା ଏବଂ ସେଟିଂସ ୱାଇପ ହୋଇଯିବ। ବୁଟଲୋଡର ଅନଲକ ହେବା ପରେ 16KB ବିକଳ୍ପ ସକ୍ରିୟ କରିବା ପାଇଁ ଦୁଇଟି ରିବୁଟ ଆବଶ୍ୟକ ହେବ। ଆପଣ ଏହି ମୋଡରେ ଥିଲେ ଆପଣ ଗୋଟିଏ ସିଙ୍ଗଲ ରିବୁଟ ସହିତ 4KB ଏବଂ 16KB ମୋଡ ମଧ୍ୟରେ ଆଗକୁ ଏବଂ ପଛକୁ ସୁଇଚ କରିପାରିବେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ଡିଭାଇସକୁ ପ୍ରଡକ୍ସନ ମୋଡକୁ ଫେରାଇ ଆଣିବା ପାଇଁ ଆପଣଙ୍କୁ ଡିଭାଇସକୁ ପୁଣି 4KB ମୋଡକୁ ସୁଇଚ କରି ତା\'ପରେ OEM/ବୁଟଲୋଡରକୁ ଲକ (ଯାହା ଫେକ୍ଟୋରୀ ରିସେଟ କରେ) କରିବାକୁ ହେବ। ଦୟାକରି ବୁଟଲୋଡରକୁ ଅନଲକ କରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ଏହା କିପରି କରିବେ ସେଥିପାଇଁ ଆପଣ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>ରେ ନିର୍ଦ୍ଦେଶାବଳୀ ଦେଖିପାରିବେ"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡ ବ୍ୟବହାର କରାଯାଉଛି"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 4KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଅଧିକ ପଢ଼ନ୍ତୁରେ ଟାପ କରନ୍ତୁ।"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 4KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଏହା ଡିଭାଇସକୁ ପୁଣି ଫେକ୍ଟୋରୀ ରିସେଟ କରି ପ୍ରଡକ୍ସନ ସେଟିଂସରେ ରିଷ୍ଟୋର କରିବ। Androidରେ ସଫଳତାର ସହ ଡିଭାଇସ ବୁଟ ହେବା ପରେ ଡେଭେଲପର ବିକଳ୍ପରେ OEM ଅନଲକିଂକୁ ଅକ୍ଷମ କରନ୍ତୁ। ଯଦି ଡିଭାଇସ Androidରେ ବୁଟ ହେବାରେ ବିଫଳ ହୁଏ କିମ୍ବା ଅସ୍ଥିର ଅଟେ, ତେବେ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>ରୁ ନବୀନତମ ଫେକ୍ଟୋରୀ ଇମେଜଗୁଡ଼ିକ ସହ ଡିଭାଇସକୁ ପୁଣି-ଫ୍ଲାସ କରି \'ଡିଭାଇସକୁ ୱାଇପ କରନ୍ତୁ\', \'ବୁଟଲୋଡରକୁ ଲକ କରନ୍ତୁ\' ଏବଂ \'ସବୁ ପାର୍ଟିସନକୁ ଫୋର୍ସ ଫ୍ଲାସ କରନ୍ତୁ\'କୁ ଚୟନ କରନ୍ତୁ।"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡ ବ୍ୟବହାର କରାଯାଉଛି"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 16KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ 4K ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଅଧିକ ପଢ଼ନ୍ତୁରେ ଟାପ କରନ୍ତୁ।"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 16KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ 4K ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଏହା ଡିଭାଇସକୁ ପୁଣି ଫେକ୍ଟୋରୀ ରିସେଟ କରି ପ୍ରଡକ୍ସନ ସେଟିଂସରେ ରିଷ୍ଟୋର କରିବ। Androidରେ ସଫଳତାର ସହ ଡିଭାଇସ ବୁଟ ହେବା ପରେ ଡେଭେଲପର ବିକଳ୍ପରେ OEM ଅନଲକିଂକୁ ଅକ୍ଷମ କରନ୍ତୁ। ଯଦି ଡିଭାଇସ Androidରେ ବୁଟ ହେବାରେ ବିଫଳ ହୁଏ କିମ୍ବା ଅସ୍ଥିର ଅଟେ, ତେବେ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>ରୁ ନବୀନତମ ଫେକ୍ଟୋରୀ ଇମେଜଗୁଡ଼ିକ ସହ ଡିଭାଇସକୁ ପୁଣି-ଫ୍ଲାସ କରନ୍ତୁ କିମ୍ବା <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ବ୍ୟବହାର କରନ୍ତୁ ଏବଂ \'ଡିଭାଇସକୁ ୱାଇପ କରନ୍ତୁ\', \'ବୁଟଲୋଡରକୁ ଲକ କରନ୍ତୁ\' ଏବଂ \'ସବୁ ପାର୍ଟିସନକୁ ଫୋର୍ସ ଫ୍ଲାସ କରନ୍ତୁ\'କୁ ଚୟନ କରନ୍ତୁ।"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 16KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ 4KB ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଅଧିକ ପଢ଼ିବା ପାଇଁ ଟାପ କରନ୍ତୁ।"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ଆପଣ ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡର 16KB ମୋଡରେ ଅଛନ୍ତି। ଏହି ମୋଡରେ ସଫ୍ଟୱେର ଇଣ୍ଟିଗ୍ରିଟିକୁ ଗେରେଣ୍ଟି ଦିଆଯାଇପାରିବ ନାହିଁ ଏବଂ ବୁଟଲୋଡର ଅନଲକ ଥିବା ସମୟରେ ଫୋନରେ ଷ୍ଟୋର କରାଯାଇଥିବା ଯେ କୌଣସି ଡାଟା ବିପଦରେ ପଡ଼ିପାରେ। ଏହି ମୋଡଗୁଡ଼ିକରେ କିଛି ଫିଚରକୁ ଅକ୍ଷମ କରିଦିଆଯିବ, ଯାହା ଫଳରେ କିଛି ଆପ୍ଲିକେସନ କାମ କରିନପାରେ। ପ୍ରଡକ୍ସନ ମୋଡରେ ପୁଣି-ପ୍ରବେଶ କରିବା ପାଇଁ ଆପଣଙ୍କୁ 4KB ମୋଡକୁ ପୁଣି ସୁଇଚ କରି ତା\'ପରେ ଡିଭାଇସର ବୁଟଲୋଡରକୁ ଲକ କରିବା ଆବଶ୍ୟକ। ଏହା ଡିଭାଇସକୁ ପୁଣି ଫେକ୍ଟୋରୀ ରିସେଟ କରି ପ୍ରଡକ୍ସନ ସେଟିଂସରେ ରିଷ୍ଟୋର କରିବ। Androidରେ ସଫଳତାର ସହ ଡିଭାଇସ ବୁଟ ହେବା ପରେ ଡେଭେଲପର ବିକଳ୍ପରେ OEM ଅନଲକିଂକୁ ଅକ୍ଷମ କରନ୍ତୁ। ଯଦି ଡିଭାଇସ Androidରେ ବୁଟ ହେବାରେ ବିଫଳ ହୁଏ କିମ୍ବା ଏହା ଅସ୍ଥିର ଅଟେ, ତେବେ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>ରୁ ନବୀନତମ ଫେକ୍ଟୋରୀ ଇମେଜଗୁଡ଼ିକ ସହ ଡିଭାଇସକୁ ପୁଣି-ଫ୍ଲାସ କରନ୍ତୁ କିମ୍ବା <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ବ୍ୟବହାର କରନ୍ତୁ ଏବଂ \'ଡିଭାଇସକୁ ୱାଇପ କରନ୍ତୁ\', \'ବୁଟଲୋଡରକୁ ଲକ କରନ୍ତୁ\' ଓ \'ସବୁ ପାର୍ଟିସନକୁ ଫୋର୍ସ ଫ୍ଲାସ କରନ୍ତୁ\'କୁ ଚୟନ କରନ୍ତୁ।"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ପୃଷ୍ଠା-ଆଗ୍ନୋଷ୍ଟିକ ମୋଡ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ଅଧିକ ପଢ଼ନ୍ତୁ"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"ବଗ ରିପୋର୍ଟ ହେଣ୍ଡଲର"</string>
@@ -5010,14 +5057,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ଆପ୍ ପିନିଂ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ଡେଭଲପରଙ୍କ ପାଇଁ ବିକଳ୍ପଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ପ୍ରିଣ୍ଟ ସେବା ବ୍ୟବହାର କରନ୍ତୁ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"ଏକାଧିକ ୟୁଜରଙ୍କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ୟୁଜର ସୁଇଚକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ଅନୁମତି, ଏକାଧିକ, ୟୁଜର, ପରମିଟ, ଅନେକ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ଏକାଧିକ, ୟୁଜର, ପ୍ରୋଫାଇଲ, ଲୋକମାନେ, ଆକାଉଣ୍ଟ, ସୁଇଚ, ଅନେକ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ୱାୟାରଲେସ୍ ଡିବଗିଂ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ପସନ୍ଦଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"ନାଇଟ ଲାଇଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"NFC ବ୍ୟବହାର କରନ୍ତୁ"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"ଆଡେପ୍ଟିଭ୍ ଉଜ୍ଜ୍ୱଳତା ବ୍ୟବହାର କରନ୍ତୁ"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"ଆଡେପ୍ଟିଭ ଉଜ୍ଜ୍ୱଳତା ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"ୱାଇ-ଫାଇ କଲିଂ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"ସମସ୍ତ ଆପ ଦେଖନ୍ତୁ"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ଆପଣଙ୍କ ଟାବଲେଟକୁ ଡକ କରାଯାଇଥିବା ସମୟରେ ଆପଣ ଆପଣଙ୍କ ସ୍କ୍ରିନରେ କଣ ଦେଖିବେ ତାହା ବାଛନ୍ତୁ। ଏକ ସ୍କ୍ରିନ ସେଭର ବ୍ୟବହାର କରାଯିବା ସମୟରେ ଆପଣଙ୍କ ଡିଭାଇସ ଅଧିକ ଏନର୍ଜି ବ୍ୟବହାର କରିପାରେ।"</string>
<string name="customize_button_title" msgid="1110284655990203359">"କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>କୁ କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ଫ୍ରିଫର୍ମ ସହାୟତାକୁ ସକ୍ଷମ କରିବା ପାଇଁ ଏକ ରିବୁଟ ଆବଶ୍ୟକ।"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ସେକେଣ୍ଡାରୀ ଡିସପ୍ଲେରେ ଡେସ୍କଟପ ମୋଡକୁ ବାଧ୍ୟତାମୂଳକ ଭାବେ ଚାଲୁ କରିବା ପାଇଁ ରିବୁଟ କରିବା ଆବଶ୍ୟକ।"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ଲିଗାସି ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋଇଂ ସପୋର୍ଟକୁ ସକ୍ଷମ କରିବା ପାଇଁ ଏକ ରିବୁଟ ଆବଶ୍ୟକ।"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋଇଂ ସପୋର୍ଟକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏକ ରିବୁଟ ଆବଶ୍ୟକ।"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ସେକେଣ୍ଡାରୀ ଡିସପ୍ଲେରେ ଫ୍ରିଫର୍ମ ୱିଣ୍ଡୋଇଂକୁ ଫୋର୍ସ କରିବା ପାଇଁ ରିବୁଟ କରିବା ଆବଶ୍ୟକ।"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ବର୍ତ୍ତମାନ ରିବୁଟ କରନ୍ତୁ"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ପରେ ରିବୁଟ କରନ୍ତୁ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ସ୍ପେସିଆଲ ଅଡିଓ"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ଚାଲୁ ଅଛି"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ବନ୍ଦ ଅଛି"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ଚାଲୁ ଅଛି"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ଅଡିଓ %1$d%% ବାମ, %2$d%% ଡାହାଣ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ଅଡିଓ %1$d%% ଡାହାଣ, %2$d%% ବାମ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"ଆପଣ ଇନଷ୍ଟଲ କରିଥିବା ଆପ୍ସକୁ ଆପଣଙ୍କ ଡିଭାଇସ ନାମ ଦେଖାଯାଇଥାଏ। ଯେତେବେଳେ ଆପଣ ବ୍ଲୁଟୁଥ ଡିଭାଇସଗୁଡ଼ିକ ସହ କନେକ୍ଟ କରନ୍ତି, ଏକ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ସହ କନେକ୍ଟ କରନ୍ତି କିମ୍ବା ଏକ ୱାଇ-ଫାଇ ହଟସ୍ପଟ ସେଟ ଅପ କରନ୍ତି, ସେତେବେଳେ ଏହା ଅନ୍ୟ ଲୋକମାନଙ୍କୁ ମଧ୍ୟ ଦେଖାଯାଇପାରେ।"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ବ୍ୟାକରଣଗତ ଲିଙ୍ଗ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ବ୍ୟାକରଣଗତ ଲିଙ୍ଗ ଚୟନ କରନ୍ତୁ"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"ସର୍ଚ୍ଚ ସେଟିଂସ"</string>
</resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 679294d..11980c6 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"ਬੈੱਡਟਾਈਮ"</item>
+ <item msgid="4152450357280759894">"ਡਰਾਈਵਿੰਗ"</item>
+ <item msgid="7096549258219399423">"ਇਮਰਸਿਵ"</item>
+ <item msgid="2760716776980432977">"ਪ੍ਰਬੰਧਿਤ"</item>
+ <item msgid="601734478369121764">"ਤਾਰਾ"</item>
+ <item msgid="6243809315432780521">"ਕੈਲੰਡਰ"</item>
+ <item msgid="4913577903148415331">"ਸਮਾਂ"</item>
+ <item msgid="3653377604690057780">"ਥੀਏਟਰ"</item>
+ <item msgid="3843711267408385410">"ਫੁੱਲ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 61a3dbe..31e6798 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"ਕੀ ਡੀਵਾਈਸ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"ਬਲੂਟੁੱਥ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"ਕੱਲ੍ਹ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ਸੁਣਨ ਵਾਲੇ ਡੀਵਾਈਸ ਸੰਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ਸ਼ਾਰਟਕੱਟ, ਸੁਣਨ ਦੇ ਸਾਧਨ ਦੀ ਅਨੁਰੂਪਤਾ"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ਪ੍ਰੀਸੈੱਟ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ਤੁਹਾਡੇ ਆਡੀਓਲਾਜਿਸਟ ਵੱਲੋਂ ਪ੍ਰੋਗਰਾਮ ਕੀਤਾ ਕੋਈ ਪ੍ਰੀਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ਪ੍ਰੀਸੈੱਟ ਨੂੰ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ਆਡੀਓ ਆਊਟਪੁੱਟ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ਆਡੀਓ ਆਊਟਪੁੱਟ ਬਾਰੇ"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ਬੰਦ"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ਚਾਲੂ / # ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}one{ਚਾਲੂ / # ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}other{ਚਾਲੂ / # ਐਪਾਂ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਦੀਆਂ ਇਜਾਜ਼ਤਾਂ ਵਾਲੀਆਂ ਐਪਾਂ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸਾਂ ਦੀ ਸੰਬੰਧਿਤ ਸਥਿਤੀ ਨਿਰਧਾਰਿਤ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਦੀਆਂ ਇਜਾਜ਼ਤਾਂ ਵਾਲੀਆਂ ਐਪਾਂ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸਾਂ ਦੀ ਸੰਬੰਧਿਤ ਸਥਿਤੀ ਨਿਰਧਾਰਿਤ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਲਈ ਟਿਕਾਣਾ ਪਹੁੰਚ ਬੰਦ ਹੈ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਕਿਸੇ ਐਮਰਜੈਂਸੀ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰਨ ਜਾਂ ਲਿਖਤ ਸੁਨੇਹਾ ਭੇਜਣ \'ਤੇ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਐਮਰਜੈਂਸੀ ਮਦਦਗਾਰਾਂ ਨੂੰ ਭੇਜੀ ਜਾ ਸਕਦੀ ਹੈ।"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ਟਿਕਾਣਾ ਸੈਟਿੰਗਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣੋ"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"ਬਦਲਣ ਲਈ, ChromeOS ਸੈਟਿੰਗਾਂ > ਪਰਦੇਦਾਰੀ ਅਤੇ ਸੁਰੱਖਿਆ > ਪਰਦੇਦਾਰੀ ਕੰਟਰੋਲ > ਟਿਕਾਣਾ ਪਹੁੰਚ \'ਤੇ ਜਾਓ"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ਚਿਹਰੇ ਅਤੇ <xliff:g id="WATCH">%s</xliff:g> ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ਚਿਹਰੇ, ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਤੇ <xliff:g id="WATCH">%s</xliff:g> ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ਚਿਹਰੇ, ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਅਤੇ <xliff:g id="WATCH">%s</xliff:g> ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ਪਛਾਣ ਦੀ ਜਾਂਚ ਸੁਵਿਧਾ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਇਸਦੀ ਲੋੜ ਹੈ"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator ਅਣਲਾਕ"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ਘੜੀ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ਆਪਣੀ ਘੜੀ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ਵਾਚ ਅਣਲਾਕ ਬਾਰੇ ਹੋਰ ਜਾਣੋ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ਘੜੀ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ਘੜੀ ਨੂੰ ਹਟਾਓ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਤੇ ਫ਼ੇਸ ਅਣਲਾਕ"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ਫ਼ੇਸ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਫ਼ੇਸ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਅਣਲਾਕ"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ਸੈੱਟਅੱਪ ਦੀ ਲੋੜ ਹੈ"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ਚਿਹਰੇ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ਐਪਾਂ ਸਥਾਪਤ ਕਰੋ"</b>\n"ਉਨ੍ਹਾਂ ਐਪਾਂ ਨੂੰ ਸਥਾਪਤ ਕਰੋ ਜਿਨ੍ਹਾਂ ਨੂੰ ਤੁਸੀਂ ਆਪਣੀ ਸਪੇਸ ਵਿੱਚ ਪ੍ਰਾਈਵੇਟ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"ਜਦੋਂ ਤੁਸੀਂ ਆਪਣੀ ਸਪੇਸ ਨੂੰ ਲਾਕ ਕਰ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਐਪਾਂ ਬੰਦ ਹੋ ਜਾਂਦੀਆਂ ਹਨ"</b>\n"ਜਦੋਂ ਤੁਸੀਂ ਆਪਣੀ ਸਪੇਸ ਨੂੰ ਲਾਕ ਕਰ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੀ ਸਪੇਸ ਵਿਚਲੀਆਂ ਐਪਾਂ ਬੰਦ ਹੋ ਜਾਂਦੀਆਂ ਹਨ ਅਤੇ ਤੁਹਾਨੂੰ ਉਨ੍ਹਾਂ ਤੋਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੀਆਂ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਉਨ੍ਹਾਂ ਐਪਾਂ ਲਈ ਢੁਕਵੇਂ ਨਹੀਂ ਹਨ, ਜਿਨ੍ਹਾਂ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ ਜਾਂ ਮਹੱਤਵਪੂਰਨ ਸੂਚਨਾਵਾਂ ਭੇਜਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਜਿਵੇਂ ਕਿ ਡਾਕਟਰੀ ਐਪਾਂ। ਅਜਿਹਾ ਇਸ ਲਈ ਹੈ ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਸਪੇਸ ਲਾਕ ਹੋਣ \'ਤੇ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਸਰਗਰਮੀ ਬੰਦ ਹੋ ਜਾਂਦੀ ਹੈ।\n\nਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਲਾਕ ਹੋਣ \'ਤੇ, ਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਵਿਚਲੀਆਂ ਐਪਾਂ ਇਜਾਜ਼ਤ ਪ੍ਰਬੰਧਕ, ਪਰਦੇਦਾਰੀ ਸੰਬੰਧੀ ਡੈਸ਼ਬੋਰਡ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਨਹੀਂ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।\n\nਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਨੂੰ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ ਨਹੀਂ ਲਿਜਾਇਆ ਜਾ ਸਕਦਾ। ਜੇ ਤੁਸੀਂ ਆਪਣੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਨੂੰ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਹੋਰ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ।\n\nਜਦੋਂ ਕੋਈ ਵਿਅਕਤੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਸੇ ਕੰਪਿਊਟਰ ਨਾਲ ਕਨੈਕਟ ਕਰਦਾ ਹੈ ਜਾਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਨੁਕਸਾਨਦੇਹ ਐਪਾਂ ਸਥਾਪਤ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਹ ਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਉਨ੍ਹਾਂ ਐਪਾਂ ਲਈ ਢੁਕਵੇਂ ਨਹੀਂ ਹਨ, ਜਿਨ੍ਹਾਂ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ ਜਾਂ ਮਹੱਤਵਪੂਰਨ ਸੂਚਨਾਵਾਂ ਭੇਜਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ, ਜਿਵੇਂ ਕਿ ਡਾਕਟਰੀ ਐਪਾਂ। ਅਜਿਹਾ ਇਸ ਲਈ ਹੈ ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਸਪੇਸ ਲਾਕ ਹੋਣ \'ਤੇ ਸੂਚਨਾਵਾਂ ਅਤੇ ਸਰਗਰਮੀ ਬੰਦ ਹੋ ਜਾਂਦੀ ਹੈ।\n\nਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਲਾਕ ਹੋਣ \'ਤੇ, ਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਵਿਚਲੀਆਂ ਐਪਾਂ ਇਜਾਜ਼ਤ ਪ੍ਰਬੰਧਕ, ਪਰਦੇਦਾਰੀ ਸੰਬੰਧੀ ਡੈਸ਼ਬੋਰਡ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਨਹੀਂ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।\n\nਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਨੂੰ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ ਮੁੜ-ਬਹਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਜੇ ਤੁਸੀਂ ਇਸ ਸਪੇਸ ਨੂੰ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਹੋਰ ਸਪੇਸ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ।\n\nਜਦੋਂ ਕੋਈ ਵਿਅਕਤੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਸੇ ਕੰਪਿਊਟਰ ਨਾਲ ਕਨੈਕਟ ਕਰਦਾ ਹੈ ਜਾਂ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਨੁਕਸਾਨਦੇਹ ਐਪਾਂ ਸਥਾਪਤ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਹ ਤੁਹਾਡੀ ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦਾ ਹੈ।"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਬਾਰੇ ਹੋਰ ਜਾਣੋ"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"ਇਸ ਵਿੱਚ ਕੁਝ ਸਮਾਂ ਲੱਗੇਗਾ"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਦਾ ਸੈੱਟਅੱਪ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"ਕੀ ਡੀਵਾਈਸ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"ਵੇਰਵੇ ਵਾਲੀ NFC ਲੌਗਿੰਗ ਨੂੰ ਸਿਰਫ਼ ਵਿਕਾਸ ਦੇ ਉਦੇਸ਼ਾਂ ਲਈ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਵਧੀਕ NFC ਡਾਟਾ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ, ਜਿਨ੍ਹਾਂ ਵਿੱਚ ਪ੍ਰਾਈਵੇਟ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੋ ਸਕਦੀ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ ਆਪਣਾ ਡੀਵਾਈਸ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"ਪ੍ਰਤਿਬਿੰਬਿਤ ਕਰਨਾ, ਬਾਹਰੀ ਡਿਸਪਲੇ, ਕਨੈਕਟ ਕੀਤਾ ਡਿਸਪਲੇ, USB ਡਿਸਪਲੇ, ਰੈਜ਼ੋਲਿਊਸ਼ਨ, ਘੁਮਾਅ"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"ਘੁਮਾਅ"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"ਮਿਆਰੀ"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ਆਨ-ਸਕ੍ਰੀਨ ਕੀ-ਬੋਰਡ ਨੂੰ ਵਰਤੋ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਦੌਰਾਨ ਇਸ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਬਣਾਈ ਰੱਖੋ"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"ਪੁਆਇੰਟਰ ਭਰਨ ਦਾ ਸਟਾਈਲ ਪੀਲੇ ਵਿੱਚ ਬਦਲੋ"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"ਪੁਆਇੰਟਰ ਭਰਨ ਦਾ ਸਟਾਈਲ ਗੁਲਾਬੀ \'ਚ ਬਦਲੋ"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"ਪੁਆਇੰਟਰ ਭਰਨ ਦਾ ਸਟਾਈਲ ਨੀਲੇ ਵਿੱਚ ਬਦਲੋ"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"ਪੁਆਇੰਟਰ ਸਟ੍ਰੋਕ ਸਟਾਈਲ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ਸਫ਼ੈਦ"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ਕਾਲਾ"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ਕੋਈ ਨਹੀਂ"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ਵਰਤੋਂ ਦੀ ਚੋਣ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"ਬੋਲੀ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ਪੁਆਇੰਟਰ ਸਪੀਡ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ਪੁਆਇੰਟਰ ਦਾ ਸਕੇਲ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ਪੁਆਇੰਟਰ ਦੇ ਸਕੇਲ ਨੂੰ ਘਟਾਓ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"ਪੁਆਇੰਟਰ ਦੇ ਸਕੇਲ ਨੂੰ ਵਧਾਓ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"ਥਰਥਰਾਹਟ ਰੀਡਾਇਰੈਕਟ ਕਰੋ"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ \'ਤੇ ਗੇਮ ਕੰਟਰੋਲਰ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ਫਿਰ ਵੀ ਜਾਰੀ ਰੱਖੋ"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ਰੱਦ ਕਰੋ"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਸੈਟਿੰਗਾਂ"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ਇੱਕ ਉਂਗਲ ਨਾਲ ਪੈਨਿੰਗ"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 ਉਂਗਲ ਨਾਲ ਵੱਡਦਰਸ਼ੀ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲਿਜਾਓ"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਜਾਣ ਲਈ 1 ਉਂਗਲ ਘਸੀਟੋ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ਇੱਕ ਉਂਗਲ ਨਾਲ ਘਸੀਟ ਕੇ ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ ਨੂੰ ਹਿਲਾਓ।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਘਸੀਟ ਕੇ ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ ਨੂੰ ਹਿਲਾਓ।"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ਸਿਰਫ਼ ਸਕ੍ਰੀਨ ਦਾ ਇੱਕ ਹਿੱਸਾ ਵੱਡਦਰਸ਼ੀਕਰਨ ਦੌਰਾਨ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"ਜ਼ੂਮ ਕਰਨ ਲਈ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ਸਮੱਗਰੀ ਨੂੰ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ ਜ਼ੂਮ ਵਧਾਓ"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>ਜ਼ੂਮ ਵਧਾਉਣ ਲਈ:</b><br/> {0,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਵਰਤੋ<br/> {1,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ<br/> {2,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਜਾਣ ਲਈ 2 ਉਂਗਲੀਆਂ ਨਾਲ ਘਸੀਟੋ<br/> {3,number,integer}. ਜ਼ੂਮ ਵਿੱਚ ਵਾਧ-ਘਾਟ ਕਰਨ ਲਈ 2 ਉਂਗਲੀਆਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ<br/> {4,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਰੋਕਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਵਰਤੋ<br/><br/> <b>ਕੁਝ ਸਮੇਂ ਲਈ ਜ਼ੂਮ ਵਧਾਉਣ ਲਈ:</b><br/> {0,number,integer}. ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਹਾਡੀ ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਿਸਮ ਪੂਰੀ ਸਕ੍ਰੀਨ \'ਤੇ ਸੈੱਟ ਹੈ<br/> {1,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਵਰਤੋ<br/> {2,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਸਪਰਸ਼ ਕਰ ਕੇ ਰੱਖੋ<br/> {3,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਇੱਧਰ-ਉੱਧਰ ਜਾਣ ਲਈ ਉਂਗਲ ਨਾਲ ਘਸੀਟੋ<br/> {4,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਰੋਕਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>ਜ਼ੂਮ ਵਧਾਉਣ ਲਈ:</b><br/> {0,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਵਰਤੋ<br/> {1,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ<br/> {2,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਘੁਮਾਉਣ ਲਈ 2 ਉਂਗਲਾਂ ਨਾਲ ਘਸੀਟੋ<br/> {3,number,integer}. ਜ਼ੂਮ ਵਿੱਚ ਵਾਧ-ਘਾਟ ਕਰਨ ਲਈ 2 ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ<br/> {4,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਰੋਕਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਦੀ ਵਰਤੋਂ ਕਰੋ<br/><br/> ਤੁਸੀਂ ਕੁਝ ਸਮੇਂ ਲਈ ਜ਼ੂਮ ਵਧਾ ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>ਜ਼ੂਮ ਵਧਾਉਣ ਲਈ:</b><br/> {0,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸ਼ਾਰਟਕੱਟ ਵਰਤੋ<br/> {1,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ<br/> {2,number,integer}. ਸਕ੍ਰੀਨ \'ਤੇ ਘੁਮਾਉਣ ਲਈ 1 ਜਾਂ 2 ਉਂਗਲਾਂ ਨਾਲ ਘਸੀਟੋ<br/> {3,number,integer}. ਜ਼ੂਮ ਵਿੱਚ ਵਾਧ-ਘਾਟ ਕਰਨ ਲਈ 2 ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ<br/> {4,number,integer}. ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਰੋਕਣ ਲਈ ਸ਼ਾਰਟਕੱਟ ਦੀ ਵਰਤੋਂ ਕਰੋ<br/><br/> ਤੁਸੀਂ ਕੁਝ ਸਮੇਂ ਲਈ ਜ਼ੂਮ ਵਧਾ ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ ਕਰ ਸਕਦੇ ਹੋ।"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤੁਸੀਂ ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਸਕਦੇ ਹੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>" ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਵੱਡਦਰਸ਼ੀਕਰਨ ਸ਼ੁਰੂ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> ਵਿੱਚੋਂ ਪੰਨਾ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦਾ ਸ਼ਾਰਟਕੱਟ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਹੈ}other{# ਸਮਾਂ-ਸੂਚੀਆਂ ਸੈੱਟ ਹਨ}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ਤਰਜੀਹ ਮੋਡ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ਕੋਈ ਮੋਡ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ਸਿਰਫ਼ ਮਹੱਤਵਪੂਰਨ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਵੱਲੋਂ ਸੂਚਨਾ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"ਕਿਰਿਆਸ਼ੀਲਤਾ ਦੀ ਕਿਸਮ ਚੁਣੋ"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"ਸਮਾਂ"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ਉਦਾਹਰਨ ਲਈ \"ਸਵੇਰੇ 9:30 ਤੋਂ ਸ਼ਾਮ 5:00 ਵਜੇ ਤੱਕ\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ਕੈਲੰਡਰ"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ਉਦਾਹਰਨ ਲਈ \"ਨਿੱਜੀ ਕੈਲੰਡਰ\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ਕੋਈ ਮੋਡ ਬਣਾਓ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"ਵਿਉਂਤਬੱਧ"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ਰੁਕਾਵਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ਅਲਾਰਮ ਅਤੇ ਮੀਡੀਆ ਧੁਨੀਆਂ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"ਸਮਾਂ-ਸੂਚੀਆਂ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ਸਮਾਂ-ਸੂਚੀਆਂ ਮਿਟਾਓ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ਮਿਟਾਓ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"ਨਾਮ ਬਦਲੋ"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ਮਿਟਾਓ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"ਕੀ \"<xliff:g id="MODE">%1$s</xliff:g>\" ਮੋਡ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ਸੰਪਾਦਨ ਕਰੋ"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"ਸਮਾਂ-ਸੂਚੀਆਂ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"ਸਮਾਂ-ਸੂਚੀ"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"ਕੋਈ ਕੈਲੰਡਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ਆਪਣਾ ਕੈਲੰਡਰ ਵਰਤੋ"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"ਸਮਾਂ-ਸੂਚੀ"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ਕੋਈ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"ਸਮਾਂ-ਸੂਚੀ"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ਘੰ., <xliff:g id="MINUTES">%2$d</xliff:g> ਮਿੰ."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"ਸਮਾਂ-ਸੂਚੀ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ਕੁਝ ਖਾਸ ਸਮਿਆਂ \'ਤੇ ਫ਼ੋਨ ਸ਼ਾਂਤ ਰੱਖੋ"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੇ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ਧੁਨੀ ਵਜਾਉਣ ਵਾਲੀਆਂ ਰੁਕਾਵਟਾਂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਗੜਬੜੀਆਂ ਬਲਾਕ ਕਰੋ"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਸਿਗਨਲ ਦਿਖਣ ਦਿਓ"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ਉਹ ਸੂਚਨਾਵਾਂ ਜੋ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਸਕਦੀਆਂ ਹਨ"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖੋ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"ਵਧੀਕ ਕਾਰਵਾਈਆਂ"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ਬੰਦ}=1{ਬੰਦ / 1 ਮੋਡ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦਾ ਹੈ}other{ਬੰਦ / # ਮੋਡ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੇ ਹਨ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ਡਿਸਪਲੇ ਦੇ ਵਿਕਲਪ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"ਗ੍ਰੇਸਕੇਲ"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ਗੂੜ੍ਹੇ ਥੀਮ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"ਗੂੜ੍ਹੇ ਬੈਕਗ੍ਰਾਊਂਡ \'ਤੇ ਹਲਕੀ ਲਿਖਤ ਨੂੰ ਤਰਜੀਹ ਦੇਣ ਲਈ OS ਅਤੇ ਐਪਾਂ ਨੂੰ ਸਵਿੱਚ ਕਰੋ, ਜਿਸਨੂੰ ਦੇਖਣ ਨਾਲ ਅੱਖਾਂ \'ਤੇ ਕੋਈ ਅਸਰ ਨਾ ਪਵੇ ਅਤੇ ਜਿਸ ਨਾਲ ਕੁਝ ਡੀਵਾਈਸਾਂ \'ਤੇ ਬੈਟਰੀ ਦੀ ਕਾਫ਼ੀ ਬਚਤ ਹੁੰਦੀ ਹੈ"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"ਰੁਕਾਵਟਾਂ ਨੂੰ ਫਿਲਟਰ ਕਰੋ"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ਕਿਸੇ ਰੁਕਾਵਟ ਨੂੰ ਫਿਲਟਰ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"ਸੂਚਨਾ ਖੋਲ੍ਹੋ"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਨੂਜ਼ ਕਰਨ ਦਿਓ"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ਐਪ ਪ੍ਰਤੀਕ \'ਤੇ ਸੂਚਨਾ ਬਿੰਦੂ"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"ਸੂਚਨਾ ਦੇ ਬੰਡਲ"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"ਬਬਲ"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"ਬਬਲ"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ਇਸ ਗੱਲਬਾਤ ਨੂੰ ਬਬਲ ਵਜੋਂ ਦਿਖਾਓ"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"ਇਹ ਐਪ ਵਿਸਤ੍ਰਿਤ ਸੈਟਿੰਗਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"ਹੋਰ ਸੈਟਿੰਗਾਂ"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ਇਸ ਐਪ ਵਿੱਚ ਹੋਰ ਸੈਟਿੰਗਾਂ ਉਪਲਬਧ ਹਨ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"ਸੂਚਨਾ ਦੀ ਕੂਲਡਾਊਨ ਸੈਟਿੰਗ"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲਾਂ ਦੇ ਲਾਗੂ ਕਰੋ"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਐਪਾਂ \'ਤੇ ਲਾਗੂ ਕਰੋ"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ਸ਼੍ਰੇਣੀਆਂ"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ਹੋਰ"</string>
<string name="no_channels" msgid="4716199078612071915">"ਇਸ ਐਪ ਨੇ ਕੋਈ ਵੀ ਸੂਚਨਾ ਪੋਸਟ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ਅਣਵਰਤੀਆਂ ਸ਼੍ਰੇਣੀਆਂ ਦਿਖਾਓ"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ਐਪ ਵਿੱਚ ਵਧੀਕ ਸੈਟਿੰਗਾਂ"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ਅਣਵਰਤੀਆਂ ਸ਼੍ਰੇਣੀਆਂ ਦਿਖਾਓ"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ਅਣਵਰਤੀਆਂ ਸ਼੍ਰੇਣੀਆਂ ਲੁਕਾਓ"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ਐਪਾਂ ਜੋ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ਚੁਣੀਆਂ ਗਈਆਂ ਐਪਾਂ"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ਕੋਈ ਨਹੀਂ"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ਸਭ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ਐਪਾਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਨ ਦਿਓ"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ਐਪਾਂ ਜੋ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"ਹੋਰ ਐਪਾਂ ਚੁਣੋ"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ਕੋਈ ਵੀ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦਾ"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"ਕੁਝ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ਸਾਰੇ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} ਤੱਕ ਸਿਰਫ਼ ਇੱਕ ਘੰਟੇ ਲਈ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ}one{{time} ਤੱਕ ਸਿਰਫ਼ # ਘੰਟੇ ਲਈ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ}other{{time} ਤੱਕ ਸਿਰਫ਼ # ਘੰਟਿਆਂ ਲਈ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"ਅਲਾਰਮ ਨੂੰ ਸਿਰਫ਼ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ਤੱਕ ਬਦਲੋ"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ਸੰਪਾਦਨ ਮੋਡ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ਮੋਡ ਸ਼ਾਮਲ ਕਰੋ"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"ਵਿਉਂਤਬੱਧ ਮੋਡ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ਮੋਡ ਦਾ ਨਾਮ"</string>
<string name="warning_button_text" msgid="1274234338874005639">"ਚਿਤਾਵਨੀ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ਬੰਦ ਕਰੋ"</string>
<string name="device_feedback" msgid="5351614458411688608">"ਇਸ ਡੀਵਾਈਸ ਬਾਰੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ਡੈਸਕਟਾਪ ਮੋਡ ਜ਼ਬਰਦਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ਸੈਕੰਡਰੀ ਡਿਸਪਲੇ \'ਤੇ ਪ੍ਰਯੋਗਮਈ ਡੈਸਕਟਾਪ ਮੋਡ ਜ਼ਬਰਦਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋਆਂ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋਆਂ ਲਈ ਸਹਾਇਤਾ ਚਾਲੂ ਕਰੋ।"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"ਦੂਜੀ ਡਿਸਪਲੇ \'ਤੇ ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋ ਚਾਲੂ ਕਰੋ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ਸਿਰਫ਼ ਸੈਕੰਡਰੀ ਡਿਸਪਲੇ \'ਤੇ ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋ ਚਾਲੂ ਕਰੋ"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ਮਲਟੀ-ਵਿੰਡੋ ਵਿੱਚ ਆਕਾਰ ਨਾ-ਬਦਲਣਯੋਗ ਬਣਾਉਣ ਦੀ ਸੁਵਿਧਾ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ਮਲਟੀ-ਵਿੰਡੋ ਵਿੱਚ ਆਕਾਰ ਨਾ ਬਦਲਣਯੋਗ ਬਣਾਉਣ ਦੀ ਸੁਵਿਧਾ ਵਾਲੀਆਂ ਐਪਾਂ ਨੂੰ ਆਗਿਆ ਦਿੰਦੀ ਹੈ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ਜ਼ਬਰਦਸਤੀ ਗੂੜ੍ਹਾ ਮੋਡ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਸ ਡੀਵਾਈਸ ਦੇ ਡਾਟੇ ਦੇ ਹਿੱਸੇ ਨੂੰ ext4 ਫਾਰਮੈਟ ਵਿੱਚ ਬਦਲਣ ਦੀ ਲੋੜ ਹੈ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। ਇਸ ਤੋਂ ਬਾਅਦ, 16KB ਵਿਕਲਪ ਦੀ ਕਿਰਿਆਸ਼ੀਲਤਾ ਲਈ ਇੱਕ ਵਾਰ ਹੋਰ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਇਸ ਮੋਡ ਵਿੱਚ ਆਉਣ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਡੀਵਾਈਸ ਨੂੰ ਇੱਕ ਵਾਰ ਰੀਬੂਟ ਕਰ ਕੇ 4KB ਅਤੇ 16KB ਮੋਡ ਵਿਚਕਾਰ ਸਵਿੱਚ ਕਰ ਸਕਦੇ ਹੋ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਡੀਵਾਈਸ ਨੂੰ ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ \'ਤੇ ਵਾਪਸ ਲਿਜਾਉਣ ਲਈ, ਤੁਹਾਨੂੰ 4KB ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ, ਜਿਸ ਨਾਲ ਡੀਵਾਈਸ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਜਾਵੇਗਾ। ਡੀਵਾਈਸ ਦੇ Android ਵਿੱਚ ਸਫਲਤਾਪੂਰਵਕ ਬੂਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਿੱਚ OEM ਅਣਲਾਕ ਨੂੰ ਬੰਦ ਕਰੋ। ਡੀਵਾਈਸ ਸਾਫ਼ ਹੋ ਜਾਵੇਗਾ ਅਤੇ ਤਸਦੀਕ ਤੋਂ ਬਾਅਦ ਫ਼ਾਈਲਸਿਸਟਮ ext4 ਦੇ ਫਾਰਮੈਟ ਵਿੱਚ ਬਦਲ ਜਾਵੇਗਾ। ਇਸਦੇ ਪੂਰਾ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਕਿਰਪਾ ਕਰਕੇ 16KB ਮੋਡ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਲਈ ਵਾਪਸ ਆਓ।"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ਡਾਟੇ ਦੇ ਹਿੱਸੇ ਨੂੰ ext4 ਵਿੱਚ ਮੁੜ-ਫਾਰਮੈਟ ਕਰਨਾ ਅਤੇ ਸਾਫ਼ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB ਮੋਡ ਲਈ ਬੂਟਲੋਡਰ ਨੂੰ ਅਣਲਾਕ ਕਰਨਾ ਲੋੜੀਂਦਾ ਹੈ"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ਬੂਟਲੋਡਰ ਅਣਲਾਕ ਲੋੜੀਂਦਾ ਹੈ"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16KB ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ, ਇਸ ਡੀਵਾਈਸ ਲਈ ਬੂਟਲੋਡਰ ਅਣਲਾਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। 16KB ਮੋਡ ਦੇ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ \'ਤੇ, ਸਾਰਾ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ ਸਾਫ਼ ਹੋ ਜਾਣਗੀਆਂ। ਬੂਟਲੋਡਰ ਅਣਲਾਕ ਹੋਣ ਤੋਂ ਬਾਅਦ, 16KB ਵਿਕਲਪ ਦੀ ਕਿਰਿਆਸ਼ੀਲਤਾ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਦੋ ਵਾਰ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਇਸ ਮੋਡ ਵਿੱਚ ਆਉਣ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਡੀਵਾਈਸ ਨੂੰ ਇੱਕ ਵਾਰ ਰੀਬੂਟ ਕਰ ਕੇ 4KB ਅਤੇ 16KB ਮੋਡ ਵਿਚਕਾਰ ਸਵਿੱਚ ਕਰ ਸਕਦੇ ਹੋ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਡੀਵਾਈਸ ਨੂੰ ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ \'ਤੇ ਵਾਪਸ ਲਿਜਾਉਣ ਲਈ, ਤੁਹਾਨੂੰ 4KB ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ ਅਤੇ ਫਿਰ OEM/ਬੂਟਲੋਡਰ ਡੀਵਾਈਸ ਨੂੰ ਲਾਕ ਕਰੇਗਾ (ਜਿਸ ਨਾਲ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਜਾਵੇਗਾ)। ਕਿਰਪਾ ਕਰਕੇ ਬੂਟਲੋਡਰ ਨੂੰ ਅਣਲਾਕ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਤੁਸੀਂ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> \'ਤੇ ਜਾ ਕੇ ਇਸਨੂੰ ਕਰਨ ਦੇ ਤਰੀਕੇ ਸੰਬੰਧੀ ਹਿਦਾਇਤਾਂ ਦੇਖ ਸਕਦੇ ਹੋ"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 4KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ। ਹੋਰ ਪੜ੍ਹਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 4KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ। ਇਸ ਨਾਲ ਡੀਵਾਈਸ ਦੁਬਾਰਾ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਕੇ ਪ੍ਰੋਡਕਸ਼ਨ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੁੜ-ਬਹਾਲ ਹੋ ਜਾਵੇਗਾ। ਡੀਵਾਈਸ ਦੇ Android ਵਿੱਚ ਸਫਲਤਾਪੂਰਵਕ ਬੂਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਿੱਚ OEM ਅਣਲਾਕ ਨੂੰ ਬੰਦ ਕਰੋ। ਜੇ ਡੀਵਾਈਸ Android ਵਿੱਚ ਬੂਟ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ਰਹਿੰਦਾ ਹੈ ਜਾਂ ਅਸਥਿਰ ਹੈ, ਤਾਂ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ਤੋਂ ਨਵੀਆਂ ਫੈਕਟਰੀ ਇਮੇਜਾਂ ਨਾਲ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਫਲੈਸ਼ ਕਰੋ ਜਾਂ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ਵਰਤੋ ਅਤੇ \'ਡੀਵਾਈਸ ਸਾਫ਼ ਕਰੋ\', \'ਬੂਟਲੋਡਰ ਲਾਕ ਕਰੋ\' ਅਤੇ \'ਸਾਰੇ ਹਿੱਸਿਆਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਫਲੈਸ਼ ਕਰੋ\' ਨੂੰ ਚੁਣੋ।"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 16KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, 4K ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ। ਹੋਰ ਪੜ੍ਹਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 16KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਰਹਿਣ ਦੌਰਾਨ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਖਤਰੇ ਵਿੱਚ ਰਹਿ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, 4K ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ। ਇਸ ਨਾਲ ਡੀਵਾਈਸ ਦੁਬਾਰਾ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਕੇ ਪ੍ਰੋਡਕਸ਼ਨ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੁੜ-ਬਹਾਲ ਹੋ ਜਾਵੇਗਾ। ਡੀਵਾਈਸ ਦੇ Android ਵਿੱਚ ਸਫਲਤਾਪੂਰਵਕ ਬੂਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਿੱਚ OEM ਅਣਲਾਕ ਨੂੰ ਬੰਦ ਕਰੋ। ਜੇ ਡੀਵਾਈਸ Android ਵਿੱਚ ਬੂਟ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ਰਹਿੰਦਾ ਹੈ ਜਾਂ ਅਸਥਿਰ ਹੈ, ਤਾਂ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ਤੋਂ ਨਵੀਆਂ ਫੈਕਟਰੀ ਇਮੇਜਾਂ ਨਾਲ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਫਲੈਸ਼ ਕਰੋ ਜਾਂ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ਵਰਤੋ ਅਤੇ \'ਡੀਵਾਈਸ ਸਾਫ਼ ਕਰੋ\', \'ਬੂਟਲੋਡਰ ਲਾਕ ਕਰੋ\' ਅਤੇ \'ਸਾਰੇ ਹਿੱਸਿਆਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਫਲੈਸ਼ ਕਰੋ\' ਨੂੰ ਚੁਣੋ।"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 16KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਹੋਣ ਵੇਲੇ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਜੋਖਮ ਵਿੱਚ ਹੋ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, ਤੁਹਾਡਾ 4KB ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ। ਹੋਰ ਪੜ੍ਹਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ਤੁਸੀਂ ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ ਦੇ 16KB ਮੋਡ ਵਿੱਚ ਹੋ। ਇਸ ਮੋਡ ਵਿੱਚ ਸਾਫ਼ਟਵੇਅਰ ਅਖੰਡਤਾ ਦੀ ਗਰੰਟੀ ਨਹੀਂ ਦਿੱਤੀ ਜਾ ਸਕਦੀ ਅਤੇ ਬੂਟਲੋਡਰ ਦੇ ਅਣਲਾਕ ਹੋਣ ਵੇਲੇ ਫ਼ੋਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਡਾਟਾ ਜੋਖਮ ਵਿੱਚ ਹੋ ਸਕਦਾ ਹੈ। ਇਨ੍ਹਾਂ ਮੋਡਾਂ ਵਿੱਚ ਕੁਝ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹੋ ਜਾਣਗੀਆਂ, ਇਸ ਲਈ ਸ਼ਾਇਦ ਕੁਝ ਐਪਲੀਕੇਸ਼ਨਾਂ ਕੰਮ ਨਾ ਕਰਨ। ਪ੍ਰੋਡਕਸ਼ਨ ਮੋਡ ਵਿੱਚ ਮੁੜ-ਦਾਖਲ ਹੋਣ ਲਈ, ਤੁਹਾਡਾ 4KB ਮੋਡ \'ਤੇ ਵਾਪਸ ਸਵਿੱਚ ਕਰ ਕੇ ਡੀਵਾਈਸ ਦੇ ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ। ਇਸ ਨਾਲ ਡੀਵਾਈਸ ਦੁਬਾਰਾ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਹੋ ਕੇ ਪ੍ਰੋਡਕਸ਼ਨ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੁੜ-ਬਹਾਲ ਹੋ ਜਾਵੇਗਾ। ਡੀਵਾਈਸ ਦੇ Android ਵਿੱਚ ਸਫਲਤਾਪੂਰਵਕ ਬੂਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਵਿੱਚ OEM ਅਣਲਾਕ ਸੈਟਿੰਗ ਨੂੰ ਬੰਦ ਕਰੋ। ਜੇ ਡੀਵਾਈਸ Android ਵਿੱਚ ਬੂਟ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ਰਹਿੰਦਾ ਹੈ ਜਾਂ ਅਸਥਿਰ ਹੈ, ਤਾਂ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ਤੋਂ ਨਵੇਂ ਫੈਕਟਰੀ ਪ੍ਰਤਿਬਿੰਬਾਂ ਨਾਲ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਫਲੈਸ਼ ਕਰੋ ਜਾਂ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ਵਰਤੋ ਅਤੇ \'ਡੀਵਾਈਸ ਸਾਫ਼ ਕਰੋ\', \'ਬੂਟਲੋਡਰ ਨੂੰ ਲਾਕ ਕਰੋ\' ਅਤੇ \'ਸਾਰਿਆਂ ਹਿੱਸਿਆਂ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਫਲੈਸ਼ ਕਰੋ\'।"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB ਪੇਜ-ਐਗਨੌਸਟਿਕ ਮੋਡ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"ਹੋਰ ਪੜ੍ਹੋ"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"ਬੱਗ ਰਿਪੋਰਟ ਹੈਂਡਲਰ"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ਐਪ ਪਿਨਿੰਗ ਵਰਤੋ"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ ਵਰਤੋ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ਪ੍ਰਿੰਟ ਸੇਵਾ ਵਰਤੋ"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"ਇੱਕ ਤੋਂ ਵੱਧ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"ਵਰਤੋਂਕਾਰ ਸਵਿੱਚ ਕਰਨ ਸੰਬੰਧੀ ਆਗਿਆ ਦਿਓ"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ਆਗਿਆ ਦਿਓ, ਇੱਕ ਤੋਂ ਵੱਧ, ਵਰਤੋਂਕਾਰ, ਪਰਮਿਟ, ਕਈ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"ਇੱਕ ਤੋਂ ਵੱਧ, ਵਰਤੋਂਕਾਰ, ਪ੍ਰੋਫਾਈਲ, ਲੋਕ, ਖਾਤੇ, ਸਵਿੱਚ, ਬਹੁਤ ਸਾਰੇ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ਵਾਇਰਲੈੱਸ ਡੀਬੱਗਿੰਗ ਵਰਤੋ"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ਚੁਣੋ ਕਿ ਟੈਬਲੈੱਟ ਡੌਕ ਹੋਣ \'ਤੇ ਤੁਸੀਂ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀ ਦੇਖਣਾ ਚਾਹੁੰਦੇ ਹੋ। ਸਕ੍ਰੀਨ ਸੇਵਰ ਦੀ ਵਰਤੋਂ ਹੋਣ \'ਤੇ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਜ਼ਿਆਦਾ ਊਰਜਾ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦਾ ਹੈ।"</string>
<string name="customize_button_title" msgid="1110284655990203359">"ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ਫ਼੍ਰੀਫ਼ਾਰਮ ਸਹਾਇਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਆਂ \'ਤੇ ਡੈਸਕਟਾਪ ਮੋਡ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਚਾਲੂ ਕਰਨ ਲਈ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ਵਿਰਾਸਤੀ ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋ ਸਹਾਇਤਾ ਚਾਲੂ ਕਰਨ ਲਈ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋ ਸਹਾਇਤਾ ਨੂੰ ਬਦਲਣ ਲਈ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਆਂ \'ਤੇ ਫ੍ਰੀਫਾਰਮ ਵਿੰਡੋ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਚਾਲੂ ਕਰਨ ਲਈ ਰੀਬੂਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ਹੁਣੇ ਰੀਬੂਟ ਕਰੋ"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"ਬਾਅਦ ਵਿੱਚ ਰੀਬੂਟ ਕਰੋ"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"ਸਪੇਸ਼ਿਅਲ ਆਡੀਓ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ਚਾਲੂ"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ਬੰਦ"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ਚਾਲੂ"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ਆਡੀਓ %1$d%% ਖੱਬਾ, %2$d%% ਸੱਜਾ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ਆਡੀਓ %1$d%% ਸੱਜਾ, %2$d%% ਖੱਬਾ"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਤੁਹਾਡੇ ਵੱਲੋਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਗਈਆਂ ਐਪਾਂ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰਨ, ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਜਾਂ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ \'ਤੇ ਇਸਨੂੰ ਹੋਰ ਲੋਕਾਂ ਵੱਲੋਂ ਵੀ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ਵਿਆਕਰਨਿਕ ਲਿੰਗ"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ਵਿਆਕਰਨ ਸੰਬੰਧੀ ਲਿੰਗ ਚੁਣੋ"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"ਖੋਜ ਸੈਟਿੰਗਾਂ"</string>
</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 48e7178..3f7b66a 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Pora snu"</item>
+ <item msgid="4152450357280759894">"Prowadzenie samochodu"</item>
+ <item msgid="7096549258219399423">"Wciągająca rozgrywka"</item>
+ <item msgid="2760716776980432977">"Zarządzane"</item>
+ <item msgid="601734478369121764">"Gwiazdka"</item>
+ <item msgid="6243809315432780521">"Kalendarz"</item>
+ <item msgid="4913577903148415331">"Godzina"</item>
+ <item msgid="3653377604690057780">"Teatr"</item>
+ <item msgid="3843711267408385410">"Kwiat"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4ff356e..1ef241c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Rozłączyć urządzenie?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sparuj nowe urządzenie"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automatycznie włącz jutro"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Ustawienia urządzenia słuchowego"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Skrót, zgodność z aparatem słuchowym"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Gotowe ustawienia"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Twój audiolog nie zaprogramował żadnych gotowych ustawień"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Nie udało się zaktualizować gotowego ustawienia"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Wyjście audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O wyjściu audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Wyłączono"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Włączona / # aplikacja ma dostęp do lokalizacji}few{Włączona / # aplikacje mają dostęp do lokalizacji}many{Włączona / # aplikacji ma dostęp do lokalizacji}other{Włączona / # aplikacji ma dostęp do lokalizacji}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Wczytuję…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacje z uprawnieniami dostępu do urządzeń w pobliżu mogą określać położenie połączonych urządzeń względem siebie."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacje z uprawnieniami dostępu do urządzeń w pobliżu mogą określać położenie połączonych urządzeń względem siebie."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Dostęp aplikacji i usług do lokalizacji jest wyłączony. Informacje o lokalizacji urządzenia mogą jednak zostać przesłane do ratowników, gdy zadzwonisz lub wyślesz SMS-a na numer alarmowy."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Więcej informacji o ustawieniach lokalizacji"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Aby to zmienić, otwórz Ustawienia ChromeOS > Prywatność i bezpieczeństwo > Ustawienia prywatności > Dostęp do lokalizacji"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Dodano skan twarzy i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Dodano skan twarzy, odcisk palca i <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Dodano skan twarzy, odciski palca i <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Jest to wymagane, ponieważ włączono kontrolę tożsamości"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Odblokowanie Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Dodano zegarek"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Skonfiguruj zegarek"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Więcej informacji o odblokowywaniu za pomocą zegarka"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj zegarek"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Usuń zegarek"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Odblokowywanie odciskiem palca i rozpoznawanie twarzy"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Rozpoznawanie twarzy i odblokowywanie odciskiem palca"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Rozpoznawanie twarzy i odcisku palca w profilu służbowym"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Wymagana konfiguracja"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Dodano skany twarzy i odciski palca"</string>
@@ -562,7 +563,7 @@
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Używaj odcisku palca do odblokowywania przestrzeni prywatnej lub potwierdzania tożsamości, np. podczas logowania się w aplikacjach lub zatwierdzania zakupów"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"Twoja przestrzeń prywatna może się przypadkowo odblokować, np. gdy ktoś przyłoży Twój palec do telefonu."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Używaj odcisku palca do odblokowywania przestrzeni prywatnej lub zatwierdzania zakupów"</string>
- <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"Skonfiguruj rozpoznawanie twarzy do odblokowywania przestrzeni prywatnej"</string>
+ <string name="private_space_face_enroll_introduction_title" msgid="3717541082520006032">"Ustaw odblokowywanie przestrzeni prywatnej rozpoznawaniem twarzy"</string>
<string name="private_space_face_enroll_introduction_message" msgid="250239418499081821">"Używaj rozpoznawania twarzy do odblokowywania przestrzeni prywatnej lub potwierdzania tożsamości, np. podczas logowania się w aplikacjach lub zatwierdzania zakupów"</string>
<string name="private_space_face_enroll_introduction_info_looking" msgid="5694757845303924042">"Patrząc na telefon, możesz niechcący odblokować przestrzeń prywatną. Może ją odblokować także ktoś, kto wygląda bardzo podobnie do Ciebie (np. bliźniacze rodzeństwo) lub zbliży urządzenie do Twojej twarzy."</string>
<string name="private_space_face_enroll_introduction_info_less_secure" msgid="8460719783943533172">"Korzystanie z rozpoznawania twarzy do odblokowywania przestrzeni prywatnej może być mniej bezpieczne niż skomplikowany wzór, hasło czy kod PIN"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalowanie aplikacji"</b>\n"Zainstaluj w swojej przestrzeni aplikacje, które mają pozostać prywatne"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Pamiętaj"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacje przestają działać, gdy blokujesz swoją przestrzeń"</b>\n"Po zablokowaniu przestrzeni działające w niej aplikacje zostaną zatrzymane i nie będziesz otrzymywać powiadomień na ich temat"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Przestrzenie prywatne nie są odpowiednie dla aplikacji, które muszą działać w tle lub wysyłać krytyczne powiadomienia (jak np. aplikacje medyczne). Wynika to z tego, że działanie w tle i powiadomienia są wstrzymywane, gdy przestrzeń jest zablokowana.\n\nPo zablokowaniu przestrzeni prywatnej umieszczone w niej aplikacje nie będą też widoczne w menedżerze uprawnień, panelu prywatności ani innych ustawieniach.\n\nPrzestrzeni prywatnej nie można przenieść na inne urządzenie. Jeśli chcesz z niej korzystać na innym urządzeniu, musisz utworzyć nową przestrzeń.\n\nKażdy, kto połączy Twoje urządzenie z komputerem lub zainstaluje na urządzeniu szkodliwe aplikacje, będzie mógł uzyskać dostęp do Twojej przestrzeni prywatnej."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Przestrzenie prywatne nie są odpowiednie dla aplikacji, które muszą działać w tle lub wysyłać krytyczne powiadomienia (jak np. aplikacje medyczne). Wynika to z tego, że działanie w tle i powiadomienia są wstrzymywane, gdy przestrzeń jest zablokowana.\n\nPo zablokowaniu przestrzeni prywatnej umieszczone w niej aplikacje nie będą też widoczne w menedżerze uprawnień, panelu prywatności ani innych ustawieniach.\n\nPrzestrzeni prywatnej nie można przywrócić na innym urządzeniu. Jeśli chcesz z niej korzystać na innym urządzeniu, musisz utworzyć nową przestrzeń.\n\nKażdy, kto połączy Twoje urządzenie z komputerem lub zainstaluje na urządzeniu szkodliwe aplikacje, będzie mógł uzyskać dostęp do Twojej przestrzeni prywatnej."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Więcej o przestrzeni prywatnej"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Potrwa to kilka chwil"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Konfiguruję przestrzeń prywatną…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Uruchomić urządzenie ponownie?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Szczegółowe logowanie NFC jest przeznaczone tylko dla programistów. Dodatkowe dane NFC są dołączane do raportów o błędach i mogą zawierać informacje prywatne. Uruchom urządzenie ponownie, aby zmienić to ustawienie."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Uruchom ponownie"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"odbicie lustrzane, wyświetlacz zewnętrzny, podłączony, USB, rozdzielczość, obrót"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Obrót"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardowy"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1122,7 +1136,7 @@
<string name="wifi_hotspot_instant_title" msgid="7052526695338853703">"Błyskawiczny hotspot"</string>
<string name="wifi_hotspot_instant_summary_on" msgid="3142749148673081288">"Włączono"</string>
<string name="wifi_hotspot_instant_summary_off" msgid="8594065628453795615">"Wyłączono"</string>
- <string name="wifi_tether_starting" msgid="8879874184033857814">"Włączam punktu dostępu…"</string>
+ <string name="wifi_tether_starting" msgid="8879874184033857814">"Włączam hotspota…"</string>
<string name="wifi_tether_stopping" msgid="4416492968019409188">"Wyłączam punkt dostępu…"</string>
<string name="wifi_tether_carrier_unsupport_dialog_title" msgid="3089432578433978073">"Tethering niedostępny"</string>
<string name="wifi_tether_carrier_unsupport_dialog_content" msgid="5920421547607921112">"Aby uzyskać szczegółowe informacje, skontaktuj się z operatorem"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1619,7 +1634,7 @@
<string name="lockpassword_choose_your_password_header" msgid="2407205113298094824">"Ustaw hasło"</string>
<string name="lockpassword_choose_your_profile_password_header" msgid="7038997227611893312">"Ustaw hasło służbowe"</string>
<string name="lockpassword_choose_your_pin_header" msgid="7754265746504679473">"Ustaw kod PIN"</string>
- <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"Ustaw służbowy kod PIN"</string>
+ <string name="lockpassword_choose_your_profile_pin_header" msgid="4581749963670819048">"Ustaw kod PIN do profilu służbowego"</string>
<string name="lockpassword_choose_your_pattern_header" msgid="5674909390779586252">"Ustaw wzór"</string>
<string name="lockpassword_choose_your_pattern_description" msgid="6808109256008481046">"Dla większego bezpieczeństwa ustaw wzór do odblokowywania urządzenia"</string>
<string name="lockpassword_choose_your_profile_pattern_header" msgid="3101811498330756641">"Ustaw wzór służbowy"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Używaj klawiatury ekranowej"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Pozostaw na ekranie, gdy aktywna jest klawiatura fizyczna"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Klawisze zwrócone"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Zmień styl wypełnienia na żółty"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Zmień styl wypełnienia na różowy"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Zmień styl wypełnienia na niebieski"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Styl ruchu wskaźnika"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Biały"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Czarny"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Brak"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Wybrany przez użytkownika: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Mowa"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Szybkość wskaźnika"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Skala wskaźnika"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Zmniejsz wskaźnik"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Zwiększ wskaźnik"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Kontroler gier"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Przekierowuj wibracje"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Po podłączeniu kontrolera gier przekieruj do niego wibracje"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Kontynuuj mimo to"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Anuluj"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ustawienia powiększenia"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Przesuwanie jednym palcem"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Przesuń lupę 1 palcem"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Aby przesunąć ekran, przeciągnij po nim palcem."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Przesuń obszar powiększenia, przeciągając jeden palec."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Przesuń obszar powiększenia, przeciągając dwa palce."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Niedostępne podczas powiększania tylko części ekranu"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Kliknij przycisk, by powiększyć"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Szybko powiększaj ekran, aby dokładniej widzieć zawartość wyświetlacza"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Aby powiększyć:</b><br/> {0,number,integer}. Włącz powiększenie za pomocą skrótu<br/> {1,number,integer}. Kliknij ekran<br/> {2,number,integer}. Aby przesuwać powiększony ekran, przeciągaj po nim dwoma palcami<br/> {3,number,integer}. Aby regulować powiększenie, ściągaj i rozciągaj ekran dwoma palcami<br/> {4,number,integer}. Wyłącz powiększenie za pomocą skrótu<br/><br/><b>Aby powiększyć tymczasowo:</b><br/> {0,number,integer}. Sprawdź, czy ustawiony typ powiększenia to pełny ekran<br/> {1,number,integer}. Włącz powiększenie za pomocą skrótu<br/> {2,number,integer}. Naciśnij i przytrzymaj dowolne miejsce na ekranie<br/> {3,number,integer}. Aby przesuwać powiększony ekran, przeciągaj po nim palcem<br/> {4,number,integer}. Podnieś palec, aby wyłączyć powiększenie"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Aby powiększyć:</b><br/> {0,number,integer}. Włącz powiększenie skrótem.<br/> {1,number,integer}. Kliknij ekran<br/> {2,number,integer}. Aby przesuwać powiększony ekran, przeciągaj po nim 2 palcami<br/> {3,number,integer}. Aby regulować powiększenie, ściągaj i rozciągaj ekran 2 palcami<br/> {4,number,integer}. Aby wyłączyć powiększenie, użyj skrótu<br/><br/> Możesz też między innymi powiększyć ekran tymczasowo."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Aby powiększyć:</b><br/> {0,number,integer}. Włącz powiększenie skrótem.<br/> {1,number,integer}. Kliknij ekran<br/> {2,number,integer}. Aby przesunąć ekran, przeciągnij po nim 1 lub 2 palcami.<br/> {3,number,integer}. Aby regulować powiększenie, ściągaj i rozciągaj ekran 2 palcami<br/> {4,number,integer}. Aby wyłączyć powiększenie, użyj skrótu<br/><br/> Możesz też między innymi powiększyć ekran tymczasowo."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Gdy powiększenie jest włączone, możesz powiększać fragmenty ekranu.\n\n"<b>"Aby powiekszyć"</b>", uruchom powiększenie, a następnie kliknij dowolne miejsce na ekranie.\n"<ul><li>"Przeciągnij co najmniej dwoma palcami, by przewijać."</li>\n<li>"Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."</li></ul>\n\n<b>"Aby powiększyć tymczasowo"</b>", uruchom powiększenie, a następnie naciśnij i przytrzymaj dowolne miejsce na ekranie.\n"<ul><li>"Przeciągaj palcem, by poruszać się po ekranie."</li>\n<li>"Unieś palec, by wyłączyć powiększenie."</li></ul>\n\n"Nie można powiększyć klawiatury ani paska nawigacji."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Strona <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> z <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Skrót do przycisku ułatwień dostępu"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Brak}=1{Ustawiono 1 harmonogram}few{Ustawiono # harmonogramy}many{Ustawiono # harmonogramów}other{Ustawiono # harmonogramu}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Nie przeszkadzać"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Tryby priorytetowe"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Dodaj tryb"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Otrzymuj powiadomienia tylko od ważnych osób i z kluczowych aplikacji"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Wybierz typ aktywacji"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Godzina"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Na przykład: „9:30–17:00”"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendarz"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Na przykład: „Kalendarz osobisty”"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Utwórz tryb"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Niestandardowy"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograniczanie powiadomień"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Włącz tryb Nie przeszkadzać"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Dźwięki alarmów i multimediów mogą ignorować tryb Nie przeszkadzać"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Harmonogramy"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Usuń harmonogramy"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Usuń"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Zmień nazwę"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Usuń"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Usunąć tryb „<xliff:g id="MODE">%1$s</xliff:g>”?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Edytuj"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Harmonogramy"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Harmonogram"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Dodaj kalendarz"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Korzystaj z kalendarza"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Zaplanuj"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Ustaw harmonogram"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Zaplanuj"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> godz. <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Włącz automatycznie"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Harmonogram"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Wycisz telefon o pewnych porach"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Ustaw reguły trybu Nie przeszkadzać"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Zezwalaj na powiadomienia dźwiękowe"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokuj wyświetlanie"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Zezwól na sygnały wizualne"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Powiadomienia, które mogą do Ciebie docierać"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Pełne skupienie"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Dodatkowe działania"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Wyłączono}=1{Wyłączono / 1 tryb może włączać się automatycznie}few{Wyłączono / # tryby mogą włączać się automatycznie}many{Wyłączono / # trybów może włączać się automatycznie}other{Wyłączono / # trybu może włączać się automatycznie}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ustawienia wyświetlania"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opcje wyświetlania"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Tryb szarości"</string>
@@ -3362,13 +3400,15 @@
<string name="mode_aod_title" msgid="5903435070341237325">"Przyciemnienie ekranu"</string>
<string name="mode_aod_title_secondary_list" msgid="8268180392811027557">"przyciemnienie ekranu"</string>
<string name="mode_aod_summary" msgid="7516159044827627065">"Wyłącz zawsze aktywny wyświetlacz"</string>
- <string name="mode_wallpaper_title" msgid="5549693923133928374">"Przyciemnij tapetę"</string>
- <string name="mode_wallpaper_title_secondary_list" msgid="5034602021811580157">"przyciemnij tapetę"</string>
+ <string name="mode_wallpaper_title" msgid="5549693923133928374">"Przyciemnienie tapety"</string>
+ <string name="mode_wallpaper_title_secondary_list" msgid="5034602021811580157">"przyciemnienie tapety"</string>
<string name="mode_wallpaper_summary" msgid="665480011615603784">"Filtruj jasność tapety"</string>
<string name="mode_dark_theme_title" msgid="8099007897943513209">"Włącz ciemny motyw"</string>
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"włącz ciemny motyw"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Włącz preferowanie jasnego tekstu na ciemnym tle w systemie operacyjnym i aplikacjach, co mniej obciąża oczy i może zapewnić znacznie większą oszczędność energii na niektórych urządzeniach"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Brak zmian dotyczących wyświetlania}=1{{effect_1}}=2{{effect_1} i {effect_2}}=3{{effect_1}, {effect_2} i {effect_3}}few{{effect_1}, {effect_2} i # więcej}many{{effect_1}, {effect_2} i # więcej}other{{effect_1}, {effect_2} i # więcej}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtruj zakłócenia"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Żadne zakłócenia nie są filtrowane"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opcje wyświetlania filtrowanych powiadomień"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Po włączeniu trybu Nie przeszkadzać"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brak dźwięku powiadomień"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otwórz powiadomienie"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Zezwalaj na odkładanie powiadomień"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Kropka powiadomienia na ikonie aplikacji"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pakiety powiadomień"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Dymki"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Dymki"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Wyświetlaj tę rozmowę w dymkach"</string>
@@ -3598,7 +3639,7 @@
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Wyłącz"</string>
<string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anuluj"</string>
<string name="notif_type_ongoing" msgid="135675014223627555">"W czasie rzeczywistym"</string>
- <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Bieżące komunikaty z używanych aplikacji, nawigacja, rozmowy telefoniczne i inne ustawienia"</string>
+ <string name="notif_type_ongoing_summary" msgid="2348867528527573574">"Bieżące komunikaty z używanych aplikacji, w tym nawigacja i rozmowy telefoniczne"</string>
<string name="notif_type_conversation" msgid="4383931408641374979">"Rozmowy"</string>
<string name="notif_type_conversation_summary" msgid="179142405410217101">"SMS, wiadomości tekstowe i inna komunikacja"</string>
<string name="notif_type_alerting" msgid="4713073696855718576">"Powiadomienia"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ta aplikacja nie obsługuje ustawień zaawansowanych"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Więcej ustawień"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Więcej ustawień znajdziesz w tej aplikacji"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Wyciszanie powiadomień"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Używaj wyciszenia powiadomień"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorie"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Inne"</string>
<string name="no_channels" msgid="4716199078612071915">"Ta aplikacja nie opublikowała żadnych powiadomień"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Pokaż nieużywane kategorie"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Dodatkowe ustawienia w aplikacji"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Pokaż nieużywane kategorie"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ukryj nieużywane kategorie"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacje, które mogą ignorować tryb Nie przeszkadzać"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Wybrane aplikacje"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Brak"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Wszystkie"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Wybierz więcej aplikacji"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nie może ignorować trybu Nie przeszkadzać"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nikt nie może ignorować trybu Nie przeszkadzać"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Niektóre osoby mogą ignorować tryb Nie przeszkadzać"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Wszyscy mogą ignorować tryb Nie przeszkadzać"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Dzwoniący powtórnie"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Zezwalaj na połączenia od dzwoniących powtórnie"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Zmień na alarmy tylko na 1 godzinę do {time}}few{Zmień na alarmy tylko na # godziny do {time}}many{Zmień na alarmy tylko na # godzin do {time}}other{Zmień na alarmy tylko na # godziny do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Zmień na same alarmy do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Zmień na ciągle powiadamianie"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edytuj tryb"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Dodaj 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="warning_button_text" msgid="1274234338874005639">"Ostrzeżenie"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zamknij"</string>
<string name="device_feedback" msgid="5351614458411688608">"Prześlij opinię o tym urządzeniu"</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Etui"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel ustawień"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Wymuś tryb pulpitu"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Wymuś eksperymentalny tryb pulpitu na dodatkowych ekranach"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Włącz dowolny rozmiar okien"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Włącz obsługę dowolnego rozmiaru okien."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Włącz dowolny rozmiar okien na drugim ekranie"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Włącz obsługę dowolnego rozmiaru okien tylko na drugim ekranie."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Włącz brak możliwości zmiany rozmiaru w trybie wielu okien"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Zezwala na wyświetlanie aplikacji bez możliwości zmiany rozmiaru w trybie wielu okien"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Wymuszaj tryb ciemny"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Aby można było użyć trybu 16 kB w Opcjach programisty, musisz przekonwertować partycję danych na system ext4. W tym trybie nie można zagwarantować integralności oprogramowania. Kiedy program rozruchowy będzie odblokowany, dane zapisane na telefonie mogą być zagrożone. Po aktywowaniu trybu 16 kB będzie trzeba uruchomić urządzenie ponownie. Po włączeniu tego trybu przełączanie się między trybami 4 kB i 16 kB będzie wymagało tylko jednokrotnego restartu. W tych trybach niektóre funkcje będą wyłączone, a część aplikacji może nie działać. Aby przywrócić na urządzeniu tryb produkcyjny, musisz przełączyć je z powrotem na tryb 4 kB i zablokować program rozruchowy, co spowoduje zresetowanie urządzenia. Gdy na urządzeniu uruchomi się Android, wyłącz zdjęcie blokady OEM w Opcjach programisty. Z urządzenia zostaną usunięte wszystkie dane, a po potwierdzeniu system plików zmieni się na ext4. Po wykonaniu tych czynności wróć tutaj, aby ponownie włączyć tryb 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Usuń wszystkie dane"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Nie udało się wyczyścić partycji danych i sformatować jej jako ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Tryb 16 KB wymaga odblokowania programu rozruchowego"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Wymagane odblokowanie programu rozruchowego"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Aby można było użyć trybu 16 KB w Opcjach programisty, musisz odblokować program rozruchowy. W tym trybie nie można zagwarantować integralności oprogramowania. Kiedy program rozruchowy będzie odblokowany, dane zapisane na telefonie mogą być zagrożone. Po włączeniu trybu 16 KB zostaną usunięte wszystkie dane i ustawienia użytkownika. Gdy program rozruchowy zostanie odblokowany, będzie trzeba dwukrotnie uruchomić ponownie urządzenia, aby włączyć tryb 16 KB. Po włączeniu tego trybu przełączanie się między trybami 4 KB i 16 KB będzie wymagało tylko jednokrotnego restartu. W tych trybach niektóre funkcje będą wyłączone, a część aplikacji może nie działać. Aby przywrócić na urządzeniu tryb produkcyjny, musisz przełączyć je z powrotem na tryb 4 KB i włączyć blokadę OEM lub zablokować program rozruchowy, co spowoduje zresetowanie urządzenia. Odblokuj program rozruchowy i spróbuj jeszcze raz. Instrukcje znajdziesz na stronie <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Włączony jest ogólny tryb strony 4 kB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Korzystasz z ogólnego trybu strony 4 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 zablokować program rozruchowy urządzenia. Kliknij, aby dowiedzieć się więcej."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Korzystasz z ogólnego trybu strony 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> lub użyj narzędzia <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i wybierz kolejno opcje „Wyczyść pamięć urządzenia”, „Zablokuj program rozruchowy” i „Wymuś flashowanie wszystkich partycji”."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Włączony jest ogólny tryb strony 16 kB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Kliknij, aby dowiedzieć się więcej."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> lub użyj narzędzia <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> i wybierz kolejno opcje „Wyczyść pamięć urządzenia”, „Zablokuj program rozruchowy” i „Wymuś flashowanie wszystkich partycji”."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Kliknij, aby dowiedzieć się więcej."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> lub użyj narzędzia <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Obsługiwanie zgłaszania błędów"</string>
@@ -5011,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Używaj przypinania aplikacji"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Używaj opcji programisty"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Używaj usługi drukowania"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Zezwalaj na wielu użytkowników"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Pozwól na przełączanie użytkowników"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"zezwalać, wiele, użytkownik, pozwolenie, dużo"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"kilka, użytkownicy, profile, ludzie, konta, przełącznik, wiele"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Używaj debugowania bezprzewodowego"</string>
@@ -5125,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Wybierz, co ma być widoczne na ekranie, kiedy tablet będzie zadokowany. Urządzenie może pobierać więcej energii podczas korzystania z wygaszacza ekranu."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Dostosuj"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Dostosuj wygaszacz ekranu <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Włączenie obsługi trybu dowolnego wymaga ponownego uruchomienia."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Wymuszenie wersji na komputery na dodatkowych wyświetlaczach wymaga ponownego uruchomienia."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Włączenie obsługi dowolnego rozmiaru okien w starszej wersji wymaga ponownego uruchomienia urządzenia."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Zmiana obsługi dowolnego rozmiaru okien wymaga ponownego uruchomienia urządzenia."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Wymuszenie obsługi dowolnego rozmiaru okien na drugim ekranie wymaga ponownego uruchomienia urządzenia."</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="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Dźwięk przestrzenny"</string>
@@ -5244,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Włączone"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Wyłączono"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Włączono"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Dźwięk %1$d%% lewa strona, %2$d%% prawa strona"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Dźwięk %1$d%% prawa strona, %2$d%% lewa strona"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Nazwa urządzenia jest widoczna dla zainstalowanych przez Ciebie aplikacji. Mogą ją też zobaczyć inne osoby, gdy łączysz się z urządzeniami przez Bluetooth, łączysz się z siecią Wi-Fi lub konfigurujesz hotspot Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Rodzaj gramatyczny"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Wybierz rodzaj gramatyczny"</string>
@@ -5355,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Ustawienia wyszukiwania"</string>
</resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index b3bfd99..06b6904 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de dormir"</item>
+ <item msgid="4152450357280759894">"Ao dirigir"</item>
+ <item msgid="7096549258219399423">"Imersivo"</item>
+ <item msgid="2760716776980432977">"Gerenciado"</item>
+ <item msgid="601734478369121764">"Marcar com estrela"</item>
+ <item msgid="6243809315432780521">"Agenda"</item>
+ <item msgid="4913577903148415331">"Horário"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e34936d..32d1b34 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Desconectar dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parear novo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Configurações do aparelho auditivo"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Atalho, compatibilidade com aparelhos auditivos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Predefinição"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Não há predefinições programadas pelo seu audiologista"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Não foi possível atualizar a predefinição"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de áudio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre a saída de áudio"</string>
@@ -137,7 +137,7 @@
<string name="stylus_device_details_title" msgid="7618295136015480864">"Stylus"</string>
<string name="stylus_default_notes_app" msgid="4165657465911764628">"Pressionar o botão da stylus"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (perfil de trabalho)"</string>
- <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escreva nos campos de texto"</string>
+ <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escrever nos campos de texto"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorar todos os pressionamentos de botão com a stylus"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Stylus"</string>
<string name="date_and_time" msgid="1788358029823431692">"Data e hora"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ativada / # app tem acesso à localização}one{Ativada / # app tem acesso à localização}other{Ativada / # apps têm acesso à localização}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Carregando…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps com permissão para encontrar dispositivos por perto podem determinar a posição relativa dos dispositivos conectados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps com permissão para encontrar dispositivos próximos podem determinar a posição relativa dos dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acesso à localização está desativado para apps e serviços. A localização do dispositivo ainda poderá ser enviada a socorristas quando você ligar ou enviar uma mensagem de texto para um número de emergência."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saiba mais sobre as configurações de localização"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para mudar, acesse \"Configurações do ChromeOS > Privacidade e segurança > Controles de privacidade > Acesso ao local\""</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Rosto e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Rosto, impressão digital e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Rosto, impressões digitais e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Isso é necessário porque a verificação de identidade está ativada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueio do Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Relógio adicionado"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurar o relógio"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saiba mais sobre o \"Desbloqueio do relógio\""</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Adicionar relógio"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remover relógio"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Impressão digital e Desbloqueio facial"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueio facial e por impressão digital"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueio facial e por impressão digital para o trabalho"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configuração necessária"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Rosto e impressões digitais adicionados"</string>
@@ -558,7 +559,7 @@
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"Desbloqueio por impressão digital para o espaço privado"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"Desbloqueio facial para o espaço privado"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"Desbloqueio facial e por digital para espaço privado"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurar o Desbloqueio por impressão digital para o espaço privado"</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurar Desbloqueio por digital para o espaço privado"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Use sua impressão digital para desbloquear seu espaço privado ou confirmar sua identidade e acessar apps ou aprovar uma compra"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"O espaço privado poderá ser desbloqueado mesmo se essa não for sua intenção. Por exemplo, se alguém colocar seu dedo no sensor."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Use sua impressão digital para desbloquear o espaço privado ou aprovar compras"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instale apps"</b>\n"Instale os apps que você quer guardar no seu espaço com privacidade"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Observação importante"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Os apps são interrompidos quando você bloqueia o espaço"</b>\n"Ao bloquear o espaço, os apps nele serão interrompidos e você não vai receber notificações deles"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Os espaços privados não são adequados para apps que precisam ser executados em segundo plano ou enviar notificações importantes, como apps médicos. Isso porque as notificações e atividades em segundo plano são interrompidas quando o espaço é bloqueado.\n\nOs apps no espaço privado não vão aparecer na Gestão de permissões, no painel de privacidade nem em outras configurações quando o espaço estiver bloqueado.\n\nNão é possível transferir seu espaço privado para outro dispositivo. Você precisará configurar um novo espaço privado se quiser usá-lo em outro dispositivo.\n\nCaso alguém conecte seu dispositivo a um computador ou instale apps nocivos nele, essa pessoa poderá ter acesso ao seu espaço privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Os espaços privados não são adequados para apps que precisam ser executados em segundo plano ou enviar notificações importantes, como apps médicos. Isso porque as notificações e atividades em segundo plano são interrompidas quando o espaço é bloqueado.\n\nOs apps no espaço privado não vão aparecer na Gestão de permissões, no painel de privacidade nem em outras configurações quando o espaço estiver bloqueado.\n\nNão é possível restaurar seu espaço privado em outro dispositivo. Você precisará configurar um novo espaço privado se quiser usá-lo em outro dispositivo.\n\nCaso alguém conecte seu dispositivo a um computador ou instale apps maliciosos nele, essa pessoa poderá ter acesso ao seu espaço privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saiba mais sobre o espaço privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Isso vai levar alguns instantes"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando o espaço privado…"</string>
@@ -817,7 +816,7 @@
<string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
<string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
<string name="bluetooth_paring_group_msg" msgid="2455293929036668131">"Confirme para parear com o dispositivo de áudio"</string>
- <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de ligações"</string>
+ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acesso a seus contatos e histórico de ligações"</string>
<string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir o acesso a contatos e ao histórico de ligações também"</string>
<string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"As informações serão usadas para fazer o anúncio de ligações e muito mais"</string>
<string name="bluetooth_error_title" msgid="2284738188253690278"></string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Reiniciar o dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"O registro detalhado de NFC é destinado apenas a fins de desenvolvimento. Dados NFC extras estão incluídos em relatórios de bugs, que podem conter informações particulares. Reinicie o dispositivo para mudar essa configuração."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"espelhar, tela externa, tela conectada, tela usb, resolução, rotação"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotação"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Padrão"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Usar teclado na tela"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Manter na tela enquanto o teclado físico estiver ativo"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtro"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Mudar preenchimento para amarelo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Mudar preenchimento para rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Mudar preenchimento para azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo de traço do ponteiro"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Branco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Preto"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nenhum"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Usuário selecionado: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Fala"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidade do cursor"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamanho do ponteiro"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuir tamanho do ponteiro"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumentar tamanho do ponteiro"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de jogos"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirecionar vibração"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Enviar vibração para o controlador de jogo quando conectado"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar mesmo assim"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Movimento com um dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mova a lupa com 1 dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arraste um dedo para mover a tela."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mova a área de ampliação arrastando um dedo."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mova a área de ampliação arrastando dois dedos."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Indisponível ao ampliar apenas parte da tela"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toque em um botão para aplicar zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Aplique zoom rapidamente na tela para ampliar o conteúdo"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste dois dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com dois dedos para ajustar o zoom.<br/> {4,number,integer}. Use o atalho para interromper a ampliação.<br/><br/> <b>Se quiser aumentar o zoom temporariamente, faça o seguinte:</b><br/> {0,number,integer}. Confira se o tipo de ampliação está definido como tela cheia.<br/> {1,number,integer}. Use o atalho para iniciar a ampliação.<br/> {2,number,integer}. Toque em qualquer lugar da tela e a mantenha pressionada.<br/> {3,number,integer}. Arraste o dedo para navegar pela tela.<br/> {4,number,integer}. Solte para interromper a ampliação."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste 2 dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com 2 dedos para ajustar o zoom.<br/> {4,number,integer}. Pare a ampliação usando um atalho<br/><br/> Você também pode aumentar o zoom temporariamente e fazer várias outras ações|."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste 1 ou 2 dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com 2 dedos para ajustar o zoom.<br/> {4,number,integer}. Pare a ampliação usando um atalho<br/><br/> Você também pode aumentar o zoom temporariamente e fazer várias outras ações|."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar a tela."</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", inicie a ampliação e depois toque em qualquer ponto na tela e mantenha-o pressionado.\n"<ul><li>"Arraste para mover a tela."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Atalho para o botão de acessibilidade"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhuma}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos prioritários"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Adicionar um modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selecionar tipo de ativação"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Horário"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Exemplo: \"Das 9h30 às 17h\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Agenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Exemplo: \"Agenda pessoal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Criar um modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizado"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o Não perturbe"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmes e sons de mídia podem interromper"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programações"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Excluir programações"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Excluir"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Renomear"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Excluir"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Excluir modo \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programações"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programação"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Adicione uma agenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use sua agenda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programação"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Definir uma programação"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programação"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>h e <xliff:g id="MINUTES">%2$d</xliff:g>min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ativar automaticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programação"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silenciar smartphone em horários específicos"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir regras do modo \"Não perturbe\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitem sons"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificações que podem chegar até você"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Mantenha o foco"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Ações adicionais"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desativado}=1{Desativado / 1 modo pode ser ativado automaticamente}one{Desativado / # modo pode ser ativado automaticamente}other{Desativado / # modos podem ser ativados automaticamente}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Configurações de tela"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opções de exibição"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de cinza"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ativar tema escuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Muda o SO e os apps para dar preferência a texto claro em um fundo escuro, o que pode facilitar a visualização e oferecer uma economia de bateria significativa em alguns dispositivos"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nenhuma mudança na tela}=1{{effect_1}}=2{{effect_1} e {effect_2}}=3{{effect_1}, {effect_2} e {effect_3}}one{{effect_1}, {effect_2} e mais #}other{{effect_1}, {effect_2} e mais #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupções"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nenhuma interrupção está sendo filtrada"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opções de exibição para notificações filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quando o Não perturbe estiver ativado"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Desativar som de notificações"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificação"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir adiar notificações"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ponto de notificação no ícone do app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pacotes de notificações"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Balões"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Balões"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostrar conversa em um balão"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"O app não é compatível com as configurações avançadas."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Mais configurações"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Mais configurações estão disponíveis neste app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Período de espera para notificações"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorias"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Outros"</string>
<string name="no_channels" msgid="4716199078612071915">"Este app não postou nenhuma notificação"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorias não usadas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Configurações avançadas no app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorias não usadas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorias não usadas"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps que podem fazer interrupções"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Apps selecionados"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nenhum"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todos"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selecionar mais apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Autores de chamadas repetidas"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir autores de chamadas repetidas"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Mudar para somente alarmes por uma hora até {time}}one{Mudar para somente alarmes por # hora até {time}}other{Mudar para somente alarmes por # horas até {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Alterar para \"Sempre interromper\""</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modo de edição"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Modo de adição"</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="warning_button_text" msgid="1274234338874005639">"Alerta"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Fechar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar feedback sobre o dispositivo"</string>
@@ -4043,8 +4088,8 @@
<string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
<string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outros apps"</string>
<string name="filter_overlay_apps" msgid="2483998217116789206">"Apps com permissão"</string>
- <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitidas"</string>
- <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Não permitidas"</string>
+ <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitidos(as)"</string>
+ <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Não permitidos(as)"</string>
<string name="keywords_install_other_apps" msgid="563895867658775580">"instalar apps fontes desconhecidas"</string>
<string name="write_settings" msgid="6864794401614425894">"Mudar configurações do sistema"</string>
<string name="keywords_write_settings" msgid="6908708078855507813">"gravar modificar configurações de modificação"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Estojo"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Painel de configurações"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de área de trabalho"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar o modo de área de trabalho experimental em telas secundárias"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Ativar janelas de forma livre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Permitir compatibilidade com janelas de forma livre"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Permitir janelamento de forma livre na segunda tela"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Permitir janelas de forma livre apenas na tela secundária."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Manter o recurso Forçar modo escuro ativado"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"A partição de dados deste dispositivo precisa ser convertida em ext4 antes do uso da opção para desenvolvedores 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. A ativação da opção de 16 KB exigirá uma segunda reinicialização. Neste modo, você pode alternar entre os modos 4 KB e 16 KB com uma única reinicialização. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para voltar o dispositivo ao modo de produção, será necessário voltar para o modo 4 KB e, depois, bloquear o carregador de inicialização, o que redefine o dispositivo para os padrões de fábrica. Depois que o dispositivo for inicializado corretamente no Android, desative o desbloqueio de OEM nas Opções do desenvolvedor. Todos os dados serão excluídos permanentemente do dispositivo, e o sistema de arquivos vai mudar para ext4 após a confirmação. Depois disso, reative o modo 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Limpar todos os dados"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Falha ao apagar e reformatar a partição de dados para ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Desbloqueio do carregador de inicialização obrigatório para o modo 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"É necessário desbloquear o carregador de inicialização"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"O carregador de inicialização precisa ser desbloqueado neste dispositivo antes do uso da opção para desenvolvedores 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. Todos os dados do usuário e configurações serão apagados permanentemente durante a ativação do modo 16 KB. Após o desbloqueio do carregador de inicialização, a ativação da opção de 16 KB vai exigir duas reinicializações. Neste modo, você pode alternar entre os modos 4 KB e 16 KB com uma única reinicialização. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para voltar o dispositivo ao modo de produção, será necessário voltar para o modo 4 KB e, depois, bloquear o carregador de inicialização/OEM, o que redefine o dispositivo para os padrões de fábrica. Desbloqueie o carregador de inicialização e tente de novo. Para conferir instruções de como fazer isso, acesse <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Uso do modo agnóstico de páginas de 4 KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Você está no modo agnóstico de páginas de 4 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, desbloqueie o carregador de inicialização no dispositivo. Toque para ler mais."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Você está no modo agnóstico de páginas de 4 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, desbloqueie o carregador de inicialização no dispositivo. Essa ação vai redefinir o dispositivo para os padrões de fábrica 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Uso do modo agnóstico de páginas de 16 KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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, bloqueio o carregador de inicialização no dispositivo. Toque para ler mais."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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, bloqueio o carregador de inicialização no dispositivo. Essa ação vai redefinir o dispositivo para os padrões de fábrica 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Toque para ler mais."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Gerenciador de relatórios de bugs"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar a Fixação de app"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar as opções do desenvolvedor"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar o serviço de impressão"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir vários usuários"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permitir a troca de usuário"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"autorizar, vários, usuários, permitir, muitos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"múltiplos, usuários, perfis, pessoas, contas, trocar, vários"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar a depuração por Wi-Fi"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Escolha o que ver na tela quando o tablet estiver na base. O dispositivo pode consumir mais energia quando o protetor de tela é usado."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"É necessário reiniciar o dispositivo para ativar o suporte ao formato livre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"É necessário reiniciar o dispositivo para forçar o modo área de trabalho em telas secundárias."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Uma reinicialização é necessária para ativar a compatibilidade com o janelamento legado de forma livre."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Uma reinicialização é necessária para mudar a compatibilidade com janelamento de forma livre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Uma reinicialização é necessária para forçar o janelamento de forma livre em telas secundárias."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar agora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar mais tarde"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Áudio espacial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Ativada"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desativada"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Ativada"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Áudio: %1$d%% no lado esquerdo e %2$d%% no lado direito"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Áudio: %1$d%% no lado direito e %2$d%% no lado esquerdo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"O nome do dispositivo fica visível para os apps que você instalou. Ele também vai ficar visível para outras pessoas quando você se conectar a dispositivos Bluetooth ou a uma rede Wi-Fi ou quando configurar um ponto de acesso Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gênero gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecionar gênero gramatical"</string>
@@ -5353,4 +5403,5 @@
<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">"Ler 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="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
</resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index c08f8c8..aadb738 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de dormir"</item>
+ <item msgid="4152450357280759894">"Condução"</item>
+ <item msgid="7096549258219399423">"Envolvente"</item>
+ <item msgid="2760716776980432977">"Gerido"</item>
+ <item msgid="601734478369121764">"Estrela"</item>
+ <item msgid="6243809315432780521">"Calendário"</item>
+ <item msgid="4913577903148415331">"Horas"</item>
+ <item msgid="3653377604690057780">"Cinema"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 90592ef..6887329 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Quer desl. o dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Sincronizar novo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Definições do dispositivo auditivo"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Atalho, compatibilidade com aparelhos auditivos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Predefinição"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Não existem predefinições programadas pelo seu audiologista"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Não foi possível atualizar a predefinição"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de áudio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Acerca da saída de áudio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desativada"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ativada / # app tem acesso à localização}other{Ativada / # apps têm acesso à localização}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"A carregar…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"As apps com a autorização Dispositivos próximos podem determinar a posição relativa dos dispositivos ligados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"As apps com a autorização Dispositivos próximos podem determinar a posição relativa dos dispositivos ligados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acesso à localização está desativado para apps e serviços. A localização do dispositivo ainda pode ser enviada para os contactos de resposta a emergências quando liga ou envia uma mensagem de texto para um número de emergência."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saiba mais acerca das definições de localização"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para alterar, aceda a Definições do ChromeOS > Privacidade e segurança > Controlos de privacidade > Acesso à localização"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Rosto e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Rosto, impressão digital e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Rosto, impressões digitais e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Isto é necessário porque a verificação de identidade está ativada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueio remoto do Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Relógio adicionado"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configure o seu relógio"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saiba mais sobre o Desbloqueio com o relógio"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Adicionar relógio"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remover relógio"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Desbloqueio facial e por impressão digital"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueio facial e por impressão digital"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueio facial e por impressão digital para o trabalho"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configuração necessária"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Rosto e impressões digitais adicionados"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instale apps"</b>\n"Instale as apps que quer manter privadas no seu espaço"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Tenha em atenção"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"As apps param quando bloqueia o seu espaço"</b>\n"Quando bloqueia o seu espaço, as respetivas apps são paradas e deixam de lhe enviar notificações"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Os espaços privados não são adequados para apps que precisem de ser executadas em segundo plano ou de enviar notificações críticas, como as apps médicas. Isto deve-se ao facto de as notificações e a atividade em segundo plano pararem quando o espaço está bloqueado.\n\nAs apps no seu espaço privado não vão aparecer no Gestor de autorizações, no painel de privacidade e noutras definições quando o seu espaço privado estiver bloqueado.\n\nNão é possível mover o seu espaço privado para um novo dispositivo. Tem de configurar outro espaço privado se quiser usá-lo noutro dispositivo.\n\nQualquer pessoa que ligue o seu dispositivo a um computador ou instale apps prejudiciais no seu dispositivo pode conseguir aceder ao seu espaço privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Os espaços privados não são adequados para apps que precisem de ser executadas em segundo plano ou de enviar notificações críticas, como as apps médicas. Isto deve-se ao facto de as notificações e a atividade em segundo plano pararem quando o espaço está bloqueado.\n\nAs apps no seu espaço privado não vão aparecer no Gestor de autorizações, no painel de privacidade e noutras definições quando o seu espaço privado estiver bloqueado.\n\nNão é possível restaurar o seu espaço privado para um novo dispositivo. Tem de configurar outro espaço se quiser usá-lo noutro dispositivo.\n\nQualquer pessoa que ligue o seu dispositivo a um computador ou instale apps maliciosas no seu dispositivo pode conseguir aceder ao seu espaço privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saiba mais sobre o espaço privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Esta ação vai demorar alguns instantes"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"A configurar o espaço privado…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Reiniciar o dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"O registo detalhado de NFC destina-se apenas a fins de programação. Os dados de NFC são incluídos em relatórios de erros, que podem conter informações privadas. Reinicie o seu dispositivo para alterar esta definição."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"espelhar, ecrã externo, ecrã ligado, ecrã usb, resolução, rotação"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotação"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Padrão"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Usar o teclado no ecrã"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Manter no ecrã enquanto o teclado físico estiver ativo"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Teclas de rejeição"</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="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 premida para <xliff:g id="SLOW_KEYS_THRESHOLD">%1$d</xliff:g> ms"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Alt. est. preenc. pont. p/ amarelo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Alt. est. preenc. ponteiro p/ rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Alt. est. preenc. ponteiro p/ azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo do traço do ponteiro"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Branco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Preto"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nenhum"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Utilizador selecionado: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voz"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidade do ponteiro"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamanho do ponteiro"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuir tamanho do ponteiro"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumentar tamanho do ponteiro"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de Jogos"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirecionar vibração"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Enviar a vibração para o controlador do jogo, quando ligado."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar mesmo assim"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Definições de ampliação"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Deslocação com um dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mover a lupa com 1 dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arraste 1 dedo para percorrer o ecrã"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mova a área de ampliação arrastando um dedo."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mova a área de ampliação arrastando dois dedos."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Indisponível quando amplia apenas parte do ecrã"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tocar num botão para utilizar o zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Aumente o zoom rapidamente no ecrã para ampliar o tamanho do conteúdo"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para aumentar o zoom:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação<br/> {1,number,integer}. Toque no ecrã<br/> {2,number,integer}. Arraste 2 dedos para deslocar o ecrã<br/> {3,number,integer}. Junte/afaste 2 dedos para ajustar o zoom<br/> {4,number,integer}. Use o atalho para parar a ampliação<br/><br/> <b>Para aumentar o zoom temporariamente:</b><br/> {0,number,integer}. Certifique-se de que o tipo de ampliação está definido para o ecrã inteiro<br/> {1,number,integer}. Use o atalho para iniciar a ampliação<br/> {2,number,integer}. Toque sem soltar em qualquer parte do ecrã<br/> {3,number,integer}. Arraste o dedo para deslocar o ecrã<br/> {4,number,integer}. Levante o dedo para parar a ampliação"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para aumentar o zoom:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação<br/> {1,number,integer}. Toque no ecrã<br/> {2,number,integer}. Arraste 2 dedos para percorrer o ecrã<br/> {3,number,integer}. Junte/afaste 2 dedos para ajustar o zoom<br/> {4,number,integer}. Use o atalho para parar a ampliação<br/><br/> Também pode aumentar o zoom temporariamente e muito mais."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para aumentar o zoom:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação<br/> {1,number,integer}. Toque no ecrã<br/> {2,number,integer}. Arraste 1 ou 2 dedos para percorrer o ecrã<br/> {3,number,integer}. Junte/afaste 2 dedos para ajustar o zoom<br/> {4,number,integer}. Use o atalho para parar a ampliação<br/><br/> Também pode aumentar o zoom temporariamente e muito mais."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Quando a ampliação estiver ativada, pode aumentar o zoom no ecrã.\n\n"<b>"Para utilizar o zoom"</b>", inicie a ampliação e, em seguida, toque em qualquer parte do ecrã.\n"<ul><li>"Arraste 2 ou mais dedos para se deslocar."</li>\n<li>"Junte 2 ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para utilizar o zoom temporariamente"</b>", inicie a ampliação e, em seguida, toque sem soltar em qualquer parte do ecrã.\n"<ul><li>"Arraste o dedo para se mover pelo ecrã."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado nem na barra de navegação."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Atalho do botão Acessibilidade"</string>
@@ -2228,7 +2253,7 @@
<string name="accessibility_control_timeout_preference_title" msgid="1443940538597464758">"Tempo de ação"</string>
<string name="accessibility_control_timeout_preference_summary" msgid="4037051091059316310">"Esta preferência de tempo não é suportada por todas as apps"</string>
<string name="accessibility_control_timeout_preference_intro_text" msgid="1398116710556762245">"Escolha a duração de mensagens temporárias que lhe pedem que tome medidas"</string>
- <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Atraso ao manter premida a tecla"</string>
+ <string name="accessibility_long_press_timeout_preference_title" msgid="5237764682976688855">"Atraso ao manter pressionada a tecla"</string>
<string name="accessibility_display_inversion_preference_title" msgid="5476133104746207952">"Inversão de cores"</string>
<string name="accessibility_display_inversion_switch_title" msgid="7458595722552743503">"Usar inversão de cores"</string>
<string name="accessibility_display_inversion_shortcut_title" msgid="6889624526691513462">"Atalho da inversão de cores"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}other{# horários definidos}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Não incomodar"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos de prioridade"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Adicione um modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receba notificações só de pessoas e apps importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selecionar tipo de ativação"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Horas"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Por exemplo: \"9:30 - 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendário"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Por exemplo: \"Calendário pessoal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Crie um modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizar"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limite as interrupções"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o modo Não incomodar"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Os sons de alarmes e multimédia podem interromper."</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Horários"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Elimine horários"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Eliminar"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Mudar o nome"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Eliminar"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Eliminar modo \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Horários"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Horário"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Adicione um calendário"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use o seu calendário"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Agende"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Defina um horário"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Horário"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ativar automaticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Horário"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silenciar telemóvel se necessário"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir regras de Não incomodar"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitam som"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificações que pode receber"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Mantenha a concentração"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Ações adicionais"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desativado}=1{Desativado/1 modo pode ser ativado automaticamente}other{Desativado/# modos podem ser ativados automaticamente}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Definições de visualização"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opções de visualização"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de cinzentos"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ativar tema escuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Mude as opções do sistema operativo e das apps para darem preferência a texto claro num fundo escuro, o que pode ser mais agradável para os olhos e permite poupar significativamente a bateria em alguns dispositivos"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nenhuma alteração de visualização}=1{{effect_1}}=2{{effect_1} e {effect_2}}=3{{effect_1}, {effect_2} e {effect_3}}other{{effect_1}, {effect_2} e mais #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupções"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Sem interrupções filtradas"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opções de visualização para notificações filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quando o modo Não incomodar está ativado"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Sem som de notificações"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificação"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir a suspensão de notificações"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ponto de notificação no ícone da app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pacotes de notificações"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Balões"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Balões"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Apresentar esta conversa como balão"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Esta app não suporta definições avançadas"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Mais definições"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Estão disponíveis mais definições dentro desta app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Repouso das notificações"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Use o repouso das notificações"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorias"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Outra"</string>
<string name="no_channels" msgid="4716199078612071915">"Esta app não publicou notificações"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorias não usadas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Definições adicionais na app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorias não usadas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorias não usadas"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps que podem interromper"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Apps selecionadas"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nenhuma"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todas"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selecione mais apps"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Autores de chamadas repetentes"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir chamadas repetidas"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Alterar para alarmes apenas durante uma hora até à(s) {time}}other{Alterar para alarmes apenas durante # horas até à(s) {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Alterar para alarmes apenas, até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Alterar para interromper sempre"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Edite o modo"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Adicione 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="warning_button_text" msgid="1274234338874005639">"Aviso"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Fechar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar feedback do dispositivo"</string>
@@ -4043,7 +4087,7 @@
<string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual serviço de escuta estéreo serviço assistente"</string>
<string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outras apps"</string>
<string name="filter_overlay_apps" msgid="2483998217116789206">"Apps com autorização"</string>
- <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitida"</string>
+ <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitido"</string>
<string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Não permitida"</string>
<string name="keywords_install_other_apps" msgid="563895867658775580">"instalar apps de fontes desconhecidas"</string>
<string name="write_settings" msgid="6864794401614425894">"Modificar definições do sistema"</string>
@@ -4286,7 +4330,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Modo de navegação"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"Navegação com 2 botões"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Para mudar de app, deslize rapidamente para cima no botão do ecrã principal. Para ver todas as apps, volte a deslizar rapidamente para cima. Para retroceder, toque no botão Anterior."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Segurança e emergência"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Segurança física e emergência"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Urgência SOS, informações médicas, alertas"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Navegação por gestos"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Para aceder à página inicial, deslize para cima a partir da parte inferior do ecrã. Para mudar de app, deslize para cima a partir da parte inferior do ecrã sem soltar e, em seguida, solte. Para retroceder, deslize a partir da extremidade esquerda ou direita do ecrã."</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Caixa"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Painel Definições"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de ambiente de trabalho"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar modo de ambiente de trabalho experimental em ecrãs secundários"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Ativar janelas de forma livre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Ative o suporte de janelas de forma livre."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Ativar janelas de forma livre no segundo ecrã"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Ative as janelas de forma livre apenas no ecrã secundário."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar apps não redimensionáveis em multijanelas"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite que as apps não redimensionáveis estejam em multijanelas."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Substituir forçar o modo escuro"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"A partição de dados deste dispositivo tem de ser convertida em ext4 antes de usar a opção de programador de 16 KB. 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. A ativação da opção de 16 KB exige reiniciar mais uma vez depois desta ação. Quando este modo estiver ativado, pode alternar entre os modos de 4 KB e 16 KB depois de reiniciar uma vez. Algumas funcionalidades são desativadas nestes modos, por isso, algumas apps podem não funcionar. Para voltar a definir o modo de produção no dispositivo, precisa de voltar a ativar o modo de 4 KB e, de seguida, bloquear o carregador de arranque, o que repõe as definições de fábrica do dispositivo. Depois de o dispositivo arrancar com êxito no Android, desative o desbloqueio pelo OEM nas Opções de programador. O dispositivo vai ser limpo e o sistema de ficheiros vai ser alterado para ext4 após a confirmação. Concluído este passo, ative novamente o modo de 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Apagar todos os dados"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Falha ao reformatar e limpar a partição de dados para ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Desbloqueio do carregador de arranque necessário para o modo de 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Desbloqueio do carregador de arranque necessário"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Este dispositivo precisa de desbloquear o carregador de arranque antes de usar a opção de programador de 16 KB. 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. Todos os dados e definições do utilizador são limpos com a ativação do modo de 16 KB. Uma vez desbloqueado o carregador de arranque, a ativação da opção de 16 KB exige reiniciar duas vezes. Quando este modo estiver ativado, pode alternar entre os modos de 4 KB e 16 KB depois de reiniciar uma vez. Algumas funcionalidades são desativadas nestes modos, por isso, algumas apps podem não funcionar. Para voltar a definir o modo de produção no dispositivo, precisa de voltar a ativar o modo de 4 KB e, de seguida, bloquear o OEM/carregador de arranque (o que repõe as definições de fábrica do dispositivo). Desbloqueie o carregador de arranque e tente novamente. Pode ver instruções sobre como o fazer em <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"A usar o modo sem página de 4 KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Está no modo de 4 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 bloquear o carregador de arranque do dispositivo. Toque para ler mais."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Está no modo de 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> e selecione \"Limpar dispositivo\", \"Bloquear carregador de arranque\" e \"Forçar a atualização de todas as partições\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"A usar o modo sem página de 16 KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 4K e, de seguida, bloquear o carregador de arranque do dispositivo. Toque para ler mais."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> e selecione \"Limpar dispositivo\", \"Bloquear carregador de arranque\" e \"Forçar a atualização de todas as partições\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Toque para ler mais."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Controlador do relatório de erro"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar fixação de apps"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar opções de programador"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar serviço de impressão"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir vários utilizadores"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permitir mudança de utilizador"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"autorizar, vários, utilizador, permitir, muitos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"vários, utilizadores, perfis, pessoas, contas, mudar, muitos"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar depuração sem fios"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Escolha o que é apresentado no ecrã quando o seu tablet está na estação de carregamento. O seu dispositivo pode consumir mais energia quando é usada uma proteção de ecrã."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"É necessário reiniciar para ativar o suporte de forma livre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"É necessário reiniciar para forçar o modo de ambiente de trabalho em ecrãs secundários."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Para ativar o suporte das antigas janelas de forma livre, é necessário reiniciar."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Para alterar o suporte das janelas de forma livre, é necessário reiniciar."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Para forçar as janelas de forma livre em ecrãs secundários, é necessário reiniciar."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar agora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar mais tarde"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Áudio espacial"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Ativado"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desativadas"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Ativado"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Áudio: %1$d%% do lado esquerdo, %2$d%% do lado direito"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Áudio: %1$d%% do lado direito, %2$d%% do lado esquerdo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"O nome do seu dispositivo é visível para as apps instaladas por si. Também pode ser visto por outras pessoas quando se liga a dispositivos Bluetooth ou a uma rede Wi-Fi, assim como quando configura uma zona Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Género gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecione o género gramatical"</string>
@@ -5353,4 +5402,5 @@
<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 <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="homepage_search" msgid="6759334912284663559">"Pesquise definições"</string>
</resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index b3bfd99..06b6904 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Hora de dormir"</item>
+ <item msgid="4152450357280759894">"Ao dirigir"</item>
+ <item msgid="7096549258219399423">"Imersivo"</item>
+ <item msgid="2760716776980432977">"Gerenciado"</item>
+ <item msgid="601734478369121764">"Marcar com estrela"</item>
+ <item msgid="6243809315432780521">"Agenda"</item>
+ <item msgid="4913577903148415331">"Horário"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Flor"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e34936d..32d1b34 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Desconectar dispositivo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parear novo dispositivo"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ativar automaticamente amanhã"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Configurações do aparelho auditivo"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Atalho, compatibilidade com aparelhos auditivos"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Predefinição"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Não há predefinições programadas pelo seu audiologista"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Não foi possível atualizar a predefinição"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Saída de áudio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Sobre a saída de áudio"</string>
@@ -137,7 +137,7 @@
<string name="stylus_device_details_title" msgid="7618295136015480864">"Stylus"</string>
<string name="stylus_default_notes_app" msgid="4165657465911764628">"Pressionar o botão da stylus"</string>
<string name="stylus_default_notes_summary_work" msgid="4554643411627934223">"<xliff:g id="APP_NAME">%s</xliff:g> (perfil de trabalho)"</string>
- <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escreva nos campos de texto"</string>
+ <string name="stylus_textfield_handwriting" msgid="2363579035338976327">"Escrever nos campos de texto"</string>
<string name="stylus_ignore_button" msgid="7734540973145241391">"Ignorar todos os pressionamentos de botão com a stylus"</string>
<string name="stylus_connected_devices_title" msgid="2823967577941359812">"Stylus"</string>
<string name="date_and_time" msgid="1788358029823431692">"Data e hora"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ativada / # app tem acesso à localização}one{Ativada / # app tem acesso à localização}other{Ativada / # apps têm acesso à localização}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Carregando…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Apps com permissão para encontrar dispositivos por perto podem determinar a posição relativa dos dispositivos conectados."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Apps com permissão para encontrar dispositivos próximos podem determinar a posição relativa dos dispositivos conectados."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"O acesso à localização está desativado para apps e serviços. A localização do dispositivo ainda poderá ser enviada a socorristas quando você ligar ou enviar uma mensagem de texto para um número de emergência."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Saiba mais sobre as configurações de localização"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para mudar, acesse \"Configurações do ChromeOS > Privacidade e segurança > Controles de privacidade > Acesso ao local\""</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Rosto e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Rosto, impressão digital e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Rosto, impressões digitais e <xliff:g id="WATCH">%s</xliff:g> adicionados"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Isso é necessário porque a verificação de identidade está ativada"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Desbloqueio do Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Relógio adicionado"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurar o relógio"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saiba mais sobre o \"Desbloqueio do relógio\""</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Adicionar relógio"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Remover relógio"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Impressão digital e Desbloqueio facial"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Desbloqueio facial e por impressão digital"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Desbloqueio facial e por impressão digital para o trabalho"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Configuração necessária"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Rosto e impressões digitais adicionados"</string>
@@ -558,7 +559,7 @@
<string name="private_space_fingerprint_unlock_title" msgid="3614016453395789051">"Desbloqueio por impressão digital para o espaço privado"</string>
<string name="private_space_face_unlock_title" msgid="462248384776453613">"Desbloqueio facial para o espaço privado"</string>
<string name="private_space_biometric_unlock_title" msgid="1978145237698659673">"Desbloqueio facial e por digital para espaço privado"</string>
- <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurar o Desbloqueio por impressão digital para o espaço privado"</string>
+ <string name="private_space_fingerprint_enroll_introduction_title" msgid="5187730641333680942">"Configurar Desbloqueio por digital para o espaço privado"</string>
<string name="private_space_fingerprint_enroll_introduction_message" msgid="9092068873421435300">"Use sua impressão digital para desbloquear seu espaço privado ou confirmar sua identidade e acessar apps ou aprovar uma compra"</string>
<string name="private_space_fingerprint_enroll_introduction_footer_message" msgid="7125255484447984854">"O espaço privado poderá ser desbloqueado mesmo se essa não for sua intenção. Por exemplo, se alguém colocar seu dedo no sensor."</string>
<string name="private_space_fingerprint_enroll_finish_message" msgid="4754797926493316965">"Use sua impressão digital para desbloquear o espaço privado ou aprovar compras"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instale apps"</b>\n"Instale os apps que você quer guardar no seu espaço com privacidade"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Observação importante"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Os apps são interrompidos quando você bloqueia o espaço"</b>\n"Ao bloquear o espaço, os apps nele serão interrompidos e você não vai receber notificações deles"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Os espaços privados não são adequados para apps que precisam ser executados em segundo plano ou enviar notificações importantes, como apps médicos. Isso porque as notificações e atividades em segundo plano são interrompidas quando o espaço é bloqueado.\n\nOs apps no espaço privado não vão aparecer na Gestão de permissões, no painel de privacidade nem em outras configurações quando o espaço estiver bloqueado.\n\nNão é possível transferir seu espaço privado para outro dispositivo. Você precisará configurar um novo espaço privado se quiser usá-lo em outro dispositivo.\n\nCaso alguém conecte seu dispositivo a um computador ou instale apps nocivos nele, essa pessoa poderá ter acesso ao seu espaço privado."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Os espaços privados não são adequados para apps que precisam ser executados em segundo plano ou enviar notificações importantes, como apps médicos. Isso porque as notificações e atividades em segundo plano são interrompidas quando o espaço é bloqueado.\n\nOs apps no espaço privado não vão aparecer na Gestão de permissões, no painel de privacidade nem em outras configurações quando o espaço estiver bloqueado.\n\nNão é possível restaurar seu espaço privado em outro dispositivo. Você precisará configurar um novo espaço privado se quiser usá-lo em outro dispositivo.\n\nCaso alguém conecte seu dispositivo a um computador ou instale apps maliciosos nele, essa pessoa poderá ter acesso ao seu espaço privado."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Saiba mais sobre o espaço privado"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Isso vai levar alguns instantes"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Configurando o espaço privado…"</string>
@@ -817,7 +816,7 @@
<string name="bluetooth_enter_pin_other_device" msgid="6737778699899780717">"Talvez seja necessário digitar este PIN no outro dispositivo."</string>
<string name="bluetooth_enter_passkey_other_device" msgid="8270426446247344709">"Talvez seja necessário digitar esta senha no outro dispositivo."</string>
<string name="bluetooth_paring_group_msg" msgid="2455293929036668131">"Confirme para parear com o dispositivo de áudio"</string>
- <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos seus contatos e seu histórico de ligações"</string>
+ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acesso a seus contatos e histórico de ligações"</string>
<string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir o acesso a contatos e ao histórico de ligações também"</string>
<string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"As informações serão usadas para fazer o anúncio de ligações e muito mais"</string>
<string name="bluetooth_error_title" msgid="2284738188253690278"></string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Reiniciar o dispositivo?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"O registro detalhado de NFC é destinado apenas a fins de desenvolvimento. Dados NFC extras estão incluídos em relatórios de bugs, que podem conter informações particulares. Reinicie o dispositivo para mudar essa configuração."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reiniciar"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"espelhar, tela externa, tela conectada, tela usb, resolução, rotação"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotação"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Padrão"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Usar teclado na tela"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Manter na tela enquanto o teclado físico estiver ativo"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Teclas de filtro"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Mudar preenchimento para amarelo"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Mudar preenchimento para rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Mudar preenchimento para azul"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Estilo de traço do ponteiro"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Branco"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Preto"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Nenhum"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Usuário selecionado: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Fala"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Velocidade do cursor"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Tamanho do ponteiro"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Diminuir tamanho do ponteiro"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Aumentar tamanho do ponteiro"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controlador de jogos"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirecionar vibração"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Enviar vibração para o controlador de jogo quando conectado"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuar mesmo assim"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Cancelar"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Movimento com um dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mova a lupa com 1 dedo"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Arraste um dedo para mover a tela."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mova a área de ampliação arrastando um dedo."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mova a área de ampliação arrastando dois dedos."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Indisponível ao ampliar apenas parte da tela"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Toque em um botão para aplicar zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Aplique zoom rapidamente na tela para ampliar o conteúdo"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste dois dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com dois dedos para ajustar o zoom.<br/> {4,number,integer}. Use o atalho para interromper a ampliação.<br/><br/> <b>Se quiser aumentar o zoom temporariamente, faça o seguinte:</b><br/> {0,number,integer}. Confira se o tipo de ampliação está definido como tela cheia.<br/> {1,number,integer}. Use o atalho para iniciar a ampliação.<br/> {2,number,integer}. Toque em qualquer lugar da tela e a mantenha pressionada.<br/> {3,number,integer}. Arraste o dedo para navegar pela tela.<br/> {4,number,integer}. Solte para interromper a ampliação."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste 2 dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com 2 dedos para ajustar o zoom.<br/> {4,number,integer}. Pare a ampliação usando um atalho<br/><br/> Você também pode aumentar o zoom temporariamente e fazer várias outras ações|."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para aumentar o zoom, faça o seguinte:</b><br/> {0,number,integer}. Use o atalho para iniciar a ampliação.<br/> {1,number,integer}. Toque na tela.<br/> {2,number,integer}. Arraste 1 ou 2 dedos para navegar pela tela.<br/> {3,number,integer}. Faça um gesto de pinça com 2 dedos para ajustar o zoom.<br/> {4,number,integer}. Pare a ampliação usando um atalho<br/><br/> Você também pode aumentar o zoom temporariamente e fazer várias outras ações|."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Quando a ampliação está ativada, você pode aumentar o zoom na tela.\n\n"<b>"Para aplicar zoom"</b>", inicie a ampliação e toque em qualquer lugar da tela.\n"<ul><li>"Arraste dois dedos ou mais para rolar a tela."</li>\n<li>"Faça um gesto de pinça com dois ou mais dedos para ajustar o zoom."</li></ul>\n\n<b>"Para aplicar zoom temporariamente"</b>", inicie a ampliação e depois toque em qualquer ponto na tela e mantenha-o pressionado.\n"<ul><li>"Arraste para mover a tela."</li>\n<li>"Levante o dedo para diminuir o zoom."</li></ul>\n\n"Não é possível aumentar o zoom no teclado e na barra de navegação."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Atalho para o botão de acessibilidade"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhuma}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modos prioritários"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Adicionar um modo"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selecionar tipo de ativação"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Horário"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Exemplo: \"Das 9h30 às 17h\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Agenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Exemplo: \"Agenda pessoal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Criar um modo"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizado"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Ativar o Não perturbe"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmes e sons de mídia podem interromper"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programações"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Excluir programações"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Excluir"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Renomear"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Excluir"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Excluir modo \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editar"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programações"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programação"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Adicione uma agenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Use sua agenda"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Programação"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Definir uma programação"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Programação"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g>h e <xliff:g id="MINUTES">%2$d</xliff:g>min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Ativar automaticamente"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Programação"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Silenciar smartphone em horários específicos"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Definir regras do modo \"Não perturbe\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permitir interrupções que emitem sons"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Bloquear perturbações visuais"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permitir sinais visuais"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificações que podem chegar até você"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Mantenha o foco"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Ações adicionais"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Desativado}=1{Desativado / 1 modo pode ser ativado automaticamente}one{Desativado / # modo pode ser ativado automaticamente}other{Desativado / # modos podem ser ativados automaticamente}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Configurações de tela"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opções de exibição"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Escala de cinza"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"ativar tema escuro"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Muda o SO e os apps para dar preferência a texto claro em um fundo escuro, o que pode facilitar a visualização e oferecer uma economia de bateria significativa em alguns dispositivos"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nenhuma mudança na tela}=1{{effect_1}}=2{{effect_1} e {effect_2}}=3{{effect_1}, {effect_2} e {effect_3}}one{{effect_1}, {effect_2} e mais #}other{{effect_1}, {effect_2} e mais #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrar interrupções"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nenhuma interrupção está sendo filtrada"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opções de exibição para notificações filtradas"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Quando o Não perturbe estiver ativado"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Desativar som de notificações"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"abrir notificação"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permitir adiar notificações"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ponto de notificação no ícone do app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pacotes de notificações"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Balões"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Balões"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Mostrar conversa em um balão"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"O app não é compatível com as configurações avançadas."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Mais configurações"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Mais configurações estão disponíveis neste app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Período de espera para notificações"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorias"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Outros"</string>
<string name="no_channels" msgid="4716199078612071915">"Este app não postou nenhuma notificação"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Mostrar categorias não usadas"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Configurações avançadas no app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Mostrar categorias não usadas"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ocultar categorias não usadas"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Apps que podem fazer interrupções"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Apps selecionados"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nenhum"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Todos"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selecionar mais apps"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Autores de chamadas repetidas"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permitir autores de chamadas repetidas"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Mudar para somente alarmes por uma hora até {time}}one{Mudar para somente alarmes por # hora até {time}}other{Mudar para somente alarmes por # horas até {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Alterar para \"Somente alarmes\" até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Alterar para \"Sempre interromper\""</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modo de edição"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Modo de adição"</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="warning_button_text" msgid="1274234338874005639">"Alerta"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Fechar"</string>
<string name="device_feedback" msgid="5351614458411688608">"Enviar feedback sobre o dispositivo"</string>
@@ -4043,8 +4088,8 @@
<string name="keywords_vr_listener" msgid="902737490270081131">"rv realidade virtual ouvinte estéreo serviço de ajuda"</string>
<string name="overlay_settings" msgid="2030836934139139469">"Sobrepor a outros apps"</string>
<string name="filter_overlay_apps" msgid="2483998217116789206">"Apps com permissão"</string>
- <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitidas"</string>
- <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Não permitidas"</string>
+ <string name="app_permission_summary_allowed" msgid="1155115629167757278">"Permitidos(as)"</string>
+ <string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"Não permitidos(as)"</string>
<string name="keywords_install_other_apps" msgid="563895867658775580">"instalar apps fontes desconhecidas"</string>
<string name="write_settings" msgid="6864794401614425894">"Mudar configurações do sistema"</string>
<string name="keywords_write_settings" msgid="6908708078855507813">"gravar modificar configurações de modificação"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Estojo"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Painel de configurações"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forçar modo de área de trabalho"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forçar o modo de área de trabalho experimental em telas secundárias"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Ativar janelas de forma livre"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Permitir compatibilidade com janelas de forma livre"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Permitir janelamento de forma livre na segunda tela"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Permitir janelas de forma livre apenas na tela secundária."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ativar recursos não redimensionáveis em várias janelas"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permitir que apps não redimensionáveis sejam usados em várias janelas"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Manter o recurso Forçar modo escuro ativado"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"A partição de dados deste dispositivo precisa ser convertida em ext4 antes do uso da opção para desenvolvedores 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. A ativação da opção de 16 KB exigirá uma segunda reinicialização. Neste modo, você pode alternar entre os modos 4 KB e 16 KB com uma única reinicialização. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para voltar o dispositivo ao modo de produção, será necessário voltar para o modo 4 KB e, depois, bloquear o carregador de inicialização, o que redefine o dispositivo para os padrões de fábrica. Depois que o dispositivo for inicializado corretamente no Android, desative o desbloqueio de OEM nas Opções do desenvolvedor. Todos os dados serão excluídos permanentemente do dispositivo, e o sistema de arquivos vai mudar para ext4 após a confirmação. Depois disso, reative o modo 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Limpar todos os dados"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Falha ao apagar e reformatar a partição de dados para ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Desbloqueio do carregador de inicialização obrigatório para o modo 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"É necessário desbloquear o carregador de inicialização"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"O carregador de inicialização precisa ser desbloqueado neste dispositivo antes do uso da opção para desenvolvedores 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. Todos os dados do usuário e configurações serão apagados permanentemente durante a ativação do modo 16 KB. Após o desbloqueio do carregador de inicialização, a ativação da opção de 16 KB vai exigir duas reinicializações. Neste modo, você pode alternar entre os modos 4 KB e 16 KB com uma única reinicialização. Como alguns recursos serão desativados nesses modos, alguns aplicativos podem não funcionar. Para voltar o dispositivo ao modo de produção, será necessário voltar para o modo 4 KB e, depois, bloquear o carregador de inicialização/OEM, o que redefine o dispositivo para os padrões de fábrica. Desbloqueie o carregador de inicialização e tente de novo. Para conferir instruções de como fazer isso, acesse <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Uso do modo agnóstico de páginas de 4 KB"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Você está no modo agnóstico de páginas de 4 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, desbloqueie o carregador de inicialização no dispositivo. Toque para ler mais."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Você está no modo agnóstico de páginas de 4 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, desbloqueie o carregador de inicialização no dispositivo. Essa ação vai redefinir o dispositivo para os padrões de fábrica 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_title" msgid="7762533464569818498">"Uso do modo agnóstico de páginas de 16 KB"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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, bloqueio o carregador de inicialização no dispositivo. Toque para ler mais."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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, bloqueio o carregador de inicialização no dispositivo. Essa ação vai redefinir o dispositivo para os padrões de fábrica 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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_16k_pages_text_short" msgid="3282018880292691631">"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. Toque para ler mais."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ou use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Gerenciador de relatórios de bugs"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Usar a Fixação de app"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Usar as opções do desenvolvedor"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Usar o serviço de impressão"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permitir vários usuários"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permitir a troca de usuário"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"autorizar, vários, usuários, permitir, muitos"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"múltiplos, usuários, perfis, pessoas, contas, trocar, vários"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Usar a depuração por Wi-Fi"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Escolha o que ver na tela quando o tablet estiver na base. O dispositivo pode consumir mais energia quando o protetor de tela é usado."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizar"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizar <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"É necessário reiniciar o dispositivo para ativar o suporte ao formato livre."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"É necessário reiniciar o dispositivo para forçar o modo área de trabalho em telas secundárias."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Uma reinicialização é necessária para ativar a compatibilidade com o janelamento legado de forma livre."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Uma reinicialização é necessária para mudar a compatibilidade com janelamento de forma livre."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Uma reinicialização é necessária para forçar o janelamento de forma livre em telas secundárias."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reiniciar agora"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reiniciar mais tarde"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Áudio espacial"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Ativada"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Desativada"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Ativada"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Áudio: %1$d%% no lado esquerdo e %2$d%% no lado direito"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Áudio: %1$d%% no lado direito e %2$d%% no lado esquerdo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"O nome do dispositivo fica visível para os apps que você instalou. Ele também vai ficar visível para outras pessoas quando você se conectar a dispositivos Bluetooth ou a uma rede Wi-Fi ou quando configurar um ponto de acesso Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gênero gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selecionar gênero gramatical"</string>
@@ -5353,4 +5403,5 @@
<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">"Ler 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="homepage_search" msgid="6759334912284663559">"Pesquisar configurações"</string>
</resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index ba9b1d2..1c60dcb 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Ora de culcare"</item>
+ <item msgid="4152450357280759894">"La volan"</item>
+ <item msgid="7096549258219399423">"Captivant"</item>
+ <item msgid="2760716776980432977">"Gestionat"</item>
+ <item msgid="601734478369121764">"Stea"</item>
+ <item msgid="6243809315432780521">"Calendar"</item>
+ <item msgid="4913577903148415331">"Ora"</item>
+ <item msgid="3653377604690057780">"Teatru"</item>
+ <item msgid="3843711267408385410">"Floare"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f5f2c2e..1a0c599 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Deconectezi dispozitivul?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Asociază un nou dispozitiv"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Activează automat mâine"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Setări pentru aparate auditive"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Comandă rapidă, compatibilitate cu aparatele auditive"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Presetare"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Audiologul nu a configurat presetări"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Nu s-a putut actualiza presetarea"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ieșire audio"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Despre ieșirea audio"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Dezactivat"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Activată / # aplicație are acces la locație}few{Activată / # aplicații au acces la locație}other{Activată / # de aplicații au acces la locație}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Se încarcă…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplicațiile cu permisiunea pentru Dispozitive din apropiere pot stabili poziția relativă a dispozitivelor conectate."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplicațiile cu permisiunea Dispozitive din apropiere pot stabili poziția relativă a dispozitivelor conectate."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Accesul la locație este dezactivat pentru aplicații și servicii. Locația dispozitivului poate fi trimisă serviciilor de urgență atunci când suni sau trimiți un mesaj la un număr de urgență."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Află mai multe despre Setările privind locația"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Ca să schimbi, accesează Setările ChromeOS > Confidențialitate și securitate > Opțiuni de confidențialitate > Acces la locație"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Au fost adăugate fața și <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Au fost adăugate fața, amprenta și <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Au fost adăugate fața, amprentele și <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Acțiunea este necesară deoarece Verificarea identității este activată"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Deblocarea cu Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Ceasul a fost adăugat"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Configurează ceasul"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Află mai multe despre Deblocarea cu ceasul"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Adaugă un ceas"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Elimină ceasul"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Deblocare cu amprenta și Deblocare facială"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Deblocare facială și cu amprenta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Deblocarea facială și cu amprenta pentru serviciu"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Este necesară configurarea"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Fața și amprentele au fost adăugate"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalează aplicații"</b>\n"Instalează aplicațiile pe care vrei să le păstrezi private în spațiul tău"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Reține"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplicațiile se opresc când îți blochezi spațiul"</b>\n"Când îți blochezi spațiul, aplicațiile din spațiul tău sunt oprite și nu vei mai primi notificări de la ele"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Spațiile private nu sunt potrivite pentru aplicațiile care trebuie să ruleze în fundal sau să trimită notificări critice, cum ar fi aplicațiile medicale. Motivul este că notificările și activitatea din fundal sunt oprite când spațiul este blocat.\n\nAplicațiile din spațiul privat nu vor apărea în Managerul de permisiuni, în tabloul de bord de confidențialitate și în alte setări atunci când spațiul privat este blocat.\n\nSpațiul privat nu poate fi mutat pe alt dispozitiv. Va trebui să configurezi alt spațiu privat dacă vrei să-l folosești pe alt dispozitiv.\n\nOricine îți conectează dispozitivul la un computer sau instalează aplicații dăunătoare pe dispozitiv poate să îți acceseze spațiul privat."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Spațiile private nu sunt potrivite pentru aplicațiile care trebuie să ruleze în fundal sau să trimită notificări critice, cum ar fi aplicațiile medicale. Motivul este că notificările și activitatea din fundal sunt oprite când spațiul este blocat.\n\nAplicațiile din spațiul privat nu vor apărea în Managerul de permisiuni, în tabloul de bord de confidențialitate și în alte setări atunci când spațiul privat este blocat.\n\nSpațiul privat nu poate fi restabilit pe alt dispozitiv. Va fi necesar să configurezi alt spațiu dacă vrei să îl folosești pe alt dispozitiv.\n\nOricine îți conectează dispozitivul la un computer sau instalează aplicații rău intenționate pe dispozitiv poate să îți acceseze spațiul privat."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Află mai multe despre spațiul privat"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Procesul va dura câteva momente"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Se configurează spațiul privat…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Repornești dispozitivul?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Înregistrarea NFC detaliată este menită exclusiv pentru dezvoltare Datele NFC suplimentare sunt incluse în rapoartele de eroare, care pot conține informații private. Repornește dispozitivul ca să schimbi setarea."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Repornește"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"oglindește, ecran extern, ecran conectat, ecran usb, rezoluție, rotire"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotire"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Folosește tastatura pe ecran"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Se păstrează pe ecran cât timp este activată tastatura fizică"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Schimbă stilul de umplere în galben"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Schimbă stilul de umplere în roz"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Schimbă stilul de umplere în albastru"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stilul pointerului"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Alb"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Negru"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Niciunul"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Utilizator selectat: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Voce"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Viteza indicatorului"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Mărimea cursorului"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Micșorează cursorul"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Mărește cursorul"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Controler de joc"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Redirecționează vibrațiile"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Trimite vibrații la controlerul de joc când este conectat"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Continuă oricum"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Anulează"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setări pentru mărire"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Deplasare cu un deget"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Mută lupa cu un deget"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Trage cu degetul pentru a te deplasa pe ecran"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Mută zona de mărit trăgând cu un deget."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Mută zona de mărit trăgând cu două degete."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Opțiune indisponibilă dacă se mărește numai o parte a ecranului"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Atinge un buton pentru a micșora/mări"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Mărește rapid conținutul de pe ecran"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Pentru a mări:</b><br/> {0,number,integer}. folosește comanda rapidă ca să începi mărirea;<br/> {1,number,integer}. atinge ecranul;<br/> {2,number,integer}. glisează cu două degete ca să te deplasezi pe ecran;<br/> {3,number,integer}. ciupește cu două degete ca să ajustezi nivelul de zoom;<br/> {4,number,integer}. folosește comanda rapidă ca să oprești mărirea.<br/><br/> <b>Pentru a mări temporar:</b><br/> {0,number,integer}. asigură-te că tipul de mărire este setat la ecran complet;<br/> {1,number,integer}. folosește comanda rapidă ca să începi mărirea;<br/> {2,number,integer}. atinge lung oriunde pe ecran;<br/> {3,number,integer}. glisează cu degetul ca să te deplasezi pe ecran;<br/> {4,number,integer}. ridică degetul ca să oprești mărirea."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Pentru a mări:</b><br/> {0,number,integer}. folosește comanda rapidă ca să începi mărirea<br/> {1,number,integer}; atinge ecranul<br/> {2,number,integer}; glisează cu două degete ca să te deplasezi pe ecran<br/> {3,number,integer}; ciupește cu două degete ca să ajustezi nivelul de zoom<br/> {4,number,integer}. Folosește comanda rapidă ca să oprești mărirea.<br/><br/> Poți și să mărești temporar și multe altele."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Pentru a mări:</b><br/> {0,number,integer}. folosește comanda rapidă ca să începi mărirea<br/> {1,number,integer}; atinge ecranul<br/> {2,number,integer}; trage cu unul sau două degete ca să te deplasezi pe ecran<br/> {3,number,integer}; ciupește cu două degete ca să ajustezi nivelul de zoom<br/> {4,number,integer}. Folosește comanda rapidă ca să oprești mărirea.<br/><br/> Poți și să mărești temporar și multe altele."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Când mărirea este activată, poți mări ecranul curent.\n\n"<b>"Pentru a mări"</b>", începe mărirea, apoi atinge oriunde pe ecran.\n"<ul><li>"Trage cu două sau mai multe degete pentru a derula"</li>\n<li>"Ciupește cu două sau mai multe degete pentru a regla nivelul de zoom"</li></ul>\n\n<b>"Pentru a mări temporar"</b>", începe mărirea, apoi atinge lung oriunde pe ecran.\n"<ul><li>"Trage pentru a te mișca pe ecran"</li>\n<li>"Ridică degetul pentru a micșora"</li></ul>\n\n"Nu poți mări pe tastatură și pe bara de navigare."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Pagina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> din <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Comandă rapidă pentru butonul de accesibilitate"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Niciunul}=1{Un program setat}few{# programe setate}other{# de programe setate}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Nu deranja"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Moduri cu prioritate"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Adaugă un mod"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primește notificări doar de la persoane și aplicații importante"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Selectează tipul de activare"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"De exemplu, 9:30 – 17:00"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Calendar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"De exemplu, Calendar personal"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Creează un mod"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Personalizat"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitează întreruperile"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Activează Nu deranja"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmele și sunetele media îl pot întrerupe"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programe"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Șterge programele"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Ștergeți"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Redenumește"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Șterge"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Ștergi modul <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Editează"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programe"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Program"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Adaugă un calendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Folosește-ți calendarul"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Program"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Setează un program"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Program"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Activează automat"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Program"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Dezactivează sunetul uneori"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Setează regulile pentru Nu deranja"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Permite întreruperile care emit sunete"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blochează întreruperile vizuale"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Permite semnale vizuale"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Notificări acceptate"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Concentrează-te"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Acțiuni suplimentare"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Dezactivat}=1{Dezactivat / Un mod se poate activa automat}few{Dezactivat / # moduri se pot activa automat}other{Dezactivat / # de moduri se pot activa automat}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Setări de afișare"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opțiuni de afișare"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Tonuri de gri"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"activează tema întunecată"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Modifică sistemul de operare și aplicațiile astfel încât să se afișeze text de culoare deschisă pe un fundal de culoare închisă, care este mai odihnitor pentru ochi și asigură economisirea considerabilă a bateriei în cazul unor dispozitive"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Nicio modificare a afișării}=1{{effect_1}}=2{{effect_1} și {effect_2}}=3{{effect_1}, {effect_2} și {effect_3}}few{{effect_1}, {effect_2} și încă #}other{{effect_1}, {effect_2} și încă #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrează întreruperile"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nu sunt filtrate întreruperi"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opțiuni de afișare pentru notificările filtrate"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Când funcția „Nu deranja” este activată"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Fără sunet de la notificări"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"deschide notificarea"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Permite amânarea notificărilor"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Punct de notificare pe pictogramă"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Pachete de notificări"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Baloane"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Baloane"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Afișează conversația în balon"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Aplicația nu acceptă setările optimizate"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Mai multe setări"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Mai multe setări sunt disponibile în această aplicație"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Reducerea sunetului notificărilor"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Categorii"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Altele"</string>
<string name="no_channels" msgid="4716199078612071915">"Această aplicație nu a postat nicio notificare"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Afișează categoriile nefolosite"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Setări suplimentare în aplicație"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Afișează categoriile nefolosite"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ascunde categoriile nefolosite"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplicații care îl pot întrerupe"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplicațiile selectate"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Niciuna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Toate"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Selectează mai multe aplicații"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nimic nu îl poate întrerupe"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nimeni nu îl poate întrerupe"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Anumite persoane îl pot întrerupe"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Oricine îl poate întrerupe"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Apelanți care revin"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Permite apelanți care revin"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Schimbă la Numai alarme pentru o oră, până la {time}}few{Schimbă la Numai alarme pentru # ore, până la {time}}other{Schimbă la Numai alarme pentru # de ore, până la {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Schimbă la „Numai alarme” până la <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Schimbă la „Întrerupe întotdeauna”"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Editează modul"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Adaugă 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="warning_button_text" msgid="1274234338874005639">"Avertisment"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Închide"</string>
<string name="device_feedback" msgid="5351614458411688608">"Trimite feedback despre dispozitiv"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Carcasă"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panou de setări"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Forțează modul desktop"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Forțează modul desktop experimental pe ecrane secundare"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Activează ferestrele cu formă liberă"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Activează compatibilitatea pentru ferestrele cu formă liberă."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Activează ferestrele cu formă liberă pe ecranul II"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Activează ferestrele cu formă liberă doar pe ecranul II."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Permite aplicații fără redimensionare în ferestre multiple"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Permite aplicațiile fără redimensionare în ferestre multiple"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Modifică funcția Force-Dark"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Partiția de date a acestui dispozitiv trebuie schimbată la ext4 înainte de a folosi opțiunea pentru dezvoltatori pe 16 KB. 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. Activarea opțiunii pe 16 KB va necesita încă o repornire după această acțiune. Când te afli în acest mod, poți să comuți între modul de 4 KB și cel de 16 KB printr-o repornire. Unele funcții vor fi dezactivate în aceste moduri, prin urmare este posibil ca unele aplicații să nu funcționeze. Pentru a readuce dispozitivul în modul de producție, trebuie să revii la modul pe 4 KB, apoi să blochezi bootloaderul, acțiune care aduce dispozitivul la setările din fabrică. După ce dispozitivul pornește în sistemul Android, dezactivează deblocarea OEM în Opțiuni pentru dezvoltatori. Datele de pe dispozitiv vor fi șterse și sistemul de fișiere se va schimba în ext4 după confirmare. După finalizarea acțiunii, reactivează modul pe 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Șterge toate datele"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Nu s-a putut reformata și golește partiția de date cu ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Este necesară deblocarea bootloaderului pentru modul pe 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Este necesară deblocarea bootloaderului"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Bootloaderul dispozitivului trebuie deblocat înainte de a folosi opțiunea pentru dezvoltatori pe 16 KB. 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. Toate datele și setările utilizatorului vor fi șterse la activarea modului pe 16 KB. După deblocarea bootloaderului, activarea opțiunii pe 16 KB va necesita două reporniri. Când te afli în acest mod, poți să comuți între modul de 4 KB și cel de 16 KB printr-o repornire. Unele funcții vor fi dezactivate în aceste moduri, prin urmare este posibil ca unele aplicații să nu funcționeze. Pentru a readuce dispozitivul în modul de producție, trebuie să revii la modul pe 4 KB, apoi să blochezi OEM / bootloaderul dispozitivului (acțiune care aduce dispozitivul la setările din fabrică). Deblochează bootloaderul și încearcă din nou. Găsești instrucțiuni pentru acest proces la <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Se folosește modul pe 4 KB independent de dimensiunea paginii."</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ești în modul pe 4 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ă blochezi bootloaderul dispozitivului. Atinge pentru a citi mai multe."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ești în modul pe 4 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ă 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> sau accesează <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ș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_16k_pages_title" msgid="7762533464569818498">"Se folosește modul pe 16 KB independent de dimensiunea paginii."</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Atinge pentru a citi mai multe."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> sau accesează <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ș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_16k_pages_text_short" msgid="3282018880292691631">"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. Atinge pentru a citi mai multe."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> sau accesează <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ș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="bug_report_handler_title" msgid="713439959113250125">"Handler pentru rapoartele de eroare"</string>
@@ -5010,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Folosește fixarea aplicațiilor"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Folosește opțiuni pentru dezvoltatori"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Folosește serviciul de printare"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Permite utilizatori multipli"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Permite schimbarea utilizatorului"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"permite, mai mulți, utilizatori, acceptă, mulți"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"multipli, utilizatori, profiluri, persoane, conturi, schimbă, mulți"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Folosește remedierea erorilor wireless"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Alege ce vei vedea pe ecran când tableta este andocată. Dispozitivul poate consuma mai multă energie când folosește un screensaver."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizează"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Personalizează <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Este nevoie de o repornire pentru a activa asistența cu formă liberă."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Este nevoie de o repornire pentru a impune modul computer pe ecranele secundare."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Este necesară o repornire pentru a activa compatibilitatea pentru ferestrele vechi cu formă liberă."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Este necesară o repornire pentru a schimba compatibilitatea pentru ferestrele cu formă liberă."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Este necesară o repornire pentru a forța utilizarea ferestrelor cu formă liberă pe ecranele secundare."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Repornește acum"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Repornește mai târziu"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio spațial"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Activată"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Dezactivate"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Activate"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% stânga, %2$d%% dreapta"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% dreapta, %2$d%% stânga"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Numele dispozitivului este vizibil pentru aplicațiile instalate. Poate fi văzut și de alte persoane când te conectezi la dispozitivele Bluetooth sau la o rețea Wi-Fi sau când configurezi un hotspot Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genul gramatical"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Selectează genul gramatical"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Caută în setări"</string>
</resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 9f7d302..b90cc23 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Сон"</item>
+ <item msgid="4152450357280759894">"Вождение"</item>
+ <item msgid="7096549258219399423">"Погружение"</item>
+ <item msgid="2760716776980432977">"Управление"</item>
+ <item msgid="601734478369121764">"Звезда"</item>
+ <item msgid="6243809315432780521">"Календарь"</item>
+ <item msgid="4913577903148415331">"Время"</item>
+ <item msgid="3653377604690057780">"Театр"</item>
+ <item msgid="3843711267408385410">"Цветок"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f1e32b5..1e6556d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Отключить устройство?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Добавить устройство"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Включить автоматически завтра"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Настройки слуховых аппаратов"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Быстрый запуск, совместимость со слуховыми аппаратами"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Набор настроек"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Нет наборов настроек от сурдолога"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Не удалось обновить набор настроек."</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудиовыход"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"О выводе звука"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Откл."</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Включено. Доступ к данным о местоположении есть у # приложения.}one{Включено. Доступ к данным о местоположении есть у # приложения.}few{Включено. Доступ к данным о местоположении есть у # приложений.}many{Включено. Доступ к данным о местоположении есть у # приложений.}other{Включено. Доступ к данным о местоположении есть у # приложения.}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Загрузка…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Приложения с доступом к устройствам поблизости могут определять относительное местоположение подключенных устройств."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Приложения, у которых есть разрешение \"Устройства поблизости\", могут определять относительное местоположение подключенных устройств."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Доступ к данным о местоположении для приложений и сервисов отключен. Если вы позвоните по номеру экстренной службы или отправите на него сообщение, данные о местоположении вашего устройства могут быть переданы спасателям."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Подробнее о настройках местоположения…"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Чтобы внести изменения, выберите \"Настройки ChromeOS > Конфиденциальность и безопасность > Настройки конфиденциальности > Доступ к геоданным\""</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Модель лица и часы \"<xliff:g id="WATCH">%s</xliff:g>\" добавлены"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Модель лица, отпечаток пальца и часы \"<xliff:g id="WATCH">%s</xliff:g>\" добавлены"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Модель лица, отпечатки пальцев и часы \"<xliff:g id="WATCH">%s</xliff:g>\" добавлены"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Это необходимо, так как включена проверка личности."</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Разблокировка по Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Часы добавлены"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Настройте часы"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Подробнее о разблокировке с помощью часов…"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Добавить часы"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Удалить часы"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Отпечаток пальца и фейсконтроль"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Фейсконтроль и отпечаток пальца"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Фейсконтроль и отпечаток пальца для работы"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Требуется настройка"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Добавлено лицо и отпечатки пальцев"</string>
@@ -610,15 +611,13 @@
<string name="private_space_hide_apps_summary" msgid="4418722947376042418">"Создайте пространство для личных приложений, которое можно скрыть или защитить с помощью блокировки. В целях безопасности используйте отдельный аккаунт Google."</string>
<string name="private_space_setup_sub_header" msgid="550476876393954356">"Как это работает"</string>
<string name="private_space_separate_account_text" msgid="790319706810190320"><b>"Создайте аккаунт Google для частного пространства"</b>\n"Так синхронизированные файлы, фотографии и электронные письма не будут видны вне частного пространства"</string>
- <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Блокировка"</b>\n"Заблокируйте частное пространство, чтобы другие пользователи не могли его открыть."</string>
+ <string name="private_space_protected_lock_text" msgid="9123250938334372735"><b>"Включите блокировку"</b>\n"Заблокируйте частное пространство, чтобы другие пользователи не могли его открыть"</string>
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Установите приложения"</b>\n"Доступ к ним будет только у вас"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Важно!"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Если заблокировать частное пространство, работа приложений в нем остановится"</b>\n"Также перестанут приходить уведомления от них"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
- <string name="private_space_learn_more_text" msgid="5314198983263277586">"Подробнее о личном пространстве"</string>
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Частное пространство не подходит для приложений, например медицинских, которым необходимо работать в фоновом режиме и отправлять важные уведомления. Когда частное пространство заблокировано, вся фоновая активность в нем остановлена и уведомления не отправляются.\n\nПри этом приложения из него не показываются на экране управления разрешениями, панели управления доступом и в других настройках.\n\nЧастное пространство нельзя перенести на другое устройство, но можно создать новое.\n\nДоступ к частному пространству может получить злоумышленник, если ему удастся установить на устройство вредоносные приложения или подключить его к компьютеру."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Частное пространство не подходит для приложений, например медицинских, которым необходимо работать в фоновом режиме и отправлять важные уведомления. Когда частное пространство заблокировано, вся фоновая активность в нем остановлена и уведомления не отправляются.\n\nПри этом приложения из него не показываются на экране управления разрешениями, панели управления доступом и в других настройках.\n\nЧастное пространство нельзя восстановить на другом устройстве, но можно создать новое.\n\nДоступ к частному пространству может получить злоумышленник, если ему удастся установить на устройство вредоносные приложения или подключить его к компьютеру."</string>
+ <string name="private_space_learn_more_text" msgid="5314198983263277586">"Подробнее о частном пространстве"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Это займет некоторое время."</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Создание личного пространства…"</string>
<string name="private_space_error_screen_title" msgid="739381738044418346">"Не удалось создать частное пространство"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Перезапустить устройство?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Подробный журнал NFC ведется только в целях разработки. Дополнительные данные NFC будут включены в отчеты об ошибках и могут содержать конфиденциальную информацию. Чтобы изменить этот параметр, перезапустите устройство."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Перезапустить"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"дублирование, внешний дисплей, подключенный дисплей, usb-дисплей, разрешение, положение"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Положение экрана"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандартное"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Использовать экранную клавиатуру"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Не скрывать экранную клавиатуру, когда включена физическая"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Изменить стиль заливки на желтый"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Изменить стиль заливки на розовый"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Изменить стиль заливки на синий"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Стиль указателя"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Белый"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Черный"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Нет"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Выбрано пользователем: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Речь"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Скорость указателя"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Размер указателя мыши"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Уменьшить указатель мыши"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Увеличить указатель мыши"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Игровые контроллеры"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Перенаправление виброотклика"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Активировать виброотклик на подключенном игровом контроллере"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Продолжить"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Отмена"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки увеличения"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Перемещение одним пальцем"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Проведите пальцем, чтобы переместить лупу"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Для перемещения по экрану проведите пальцем."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Для перемещения зоны увеличения используется один палец"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Для перемещения зоны увеличения используются два пальца"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Недоступно при увеличении только части экрана"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Чтобы увеличить масштаб, нажмите кнопку"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Быстрое увеличение масштаба."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Чтобы увеличить масштаб:</b><br/> {0,number,integer}. Выполните действие быстрого запуска для перехода в режим увеличения.<br/> {1,number,integer}. Коснитесь экрана.<br/> {2,number,integer}. Если нужно, перетащите область увеличения двумя пальцами.<br/> {3,number,integer}. Чтобы скорректировать масштаб, сведите или разведите два пальца.<br/> {4,number,integer}. Чтобы выйти из режима увеличения, выполните действие быстрого запуска.<br/><br/> <b>Чтобы временно увеличить масштаб:</b><br/> {0,number,integer}. Убедитесь, что выбран режим увеличения \"Весь экран\".<br/> {1,number,integer}. Выполните действие быстрого запуска для перехода в режим увеличения.<br/> {2,number,integer}. Коснитесь любой области экрана и удерживайте палец.<br/> {3,number,integer}. Если нужно, перетащите область увеличения.<br/> {4,number,integer}. Чтобы вернуть исходный масштаб, уберите палец с экрана."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Чтобы увеличить масштаб:</b><br/> {0,number,integer}. Выполните действие быстрого запуска для перехода в режим увеличения.<br/> {1,number,integer}. Коснитесь экрана.<br/> {2,number,integer}. Перетащите область увеличения двумя пальцами.<br/> {3,number,integer}. Чтобы скорректировать масштаб, сведите два пальца вместе.<br/> {4,number,integer}. Чтобы выйти из режима увеличения, выполните действие быстрого запуска.<br/><br/> Вы также можете временно увеличивать масштаб и выполнять другие команды."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Чтобы увеличить масштаб:</b><br/> {0,number,integer}. Выполните действие быстрого запуска для перехода в режим увеличения.<br/> {1,number,integer}. Коснитесь экрана.<br/> {2,number,integer}. Перетащите область увеличения одним или двумя пальцами.<br/> {3,number,integer}. Чтобы скорректировать масштаб, сведите два пальца вместе.<br/> {4,number,integer}. Чтобы выйти из режима увеличения, выполните действие быстрого запуска.<br/><br/> Вы также можете временно увеличивать масштаб и выполнять другие команды."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Благодаря функции увеличения вы сможете приближать изображение на экране.\n\n"<b>"Если вы хотите увеличить изображение"</b>", включите функцию и нажмите на экран в любом месте.\n"<ul><li>"Для прокрутки проведите двумя пальцами."</li>\n<li>"Чтобы изменить масштаб, сведите два пальца вместе или разведите их."</li></ul>\n\n<b>"Если нужно временно увеличить масштаб"</b>", включите функцию увеличения, коснитесь экрана и удерживайте.\n"<ul><li>"Для обзора проведите по экрану."</li>\n<li>"Чтобы уменьшить масштаб, отпустите палец."</li></ul>\n\n"Эти жесты не работают на клавиатуре и панели навигации."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Страница <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> из <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Кнопка быстрого доступа к специальным возможностям"</string>
@@ -2286,7 +2311,7 @@
<string name="accessibility_daltonizer_footer_learn_more_content_description" msgid="2091679253892040910">"Подробнее о коррекции цвета…"</string>
<string name="accessibility_color_inversion_about_title" msgid="8275754480247040136">"Об инверсии цветов"</string>
<string name="accessibility_color_inversion_footer_learn_more_content_description" msgid="5382579548498952445">"Подробнее об инверсии цветов…"</string>
- <string name="accessibility_captioning_primary_switch_title" msgid="3663677340286206100">"Показ субтитров"</string>
+ <string name="accessibility_captioning_primary_switch_title" msgid="3663677340286206100">"Субтитры"</string>
<string name="accessibility_captioning_primary_switch_summary" msgid="2544094070306830218">"Только в поддерживаемых приложениях"</string>
<string name="captioning_appearance_title" msgid="3128792092290011408">"Размер и стиль субтитров"</string>
<string name="captioning_appearance_summary" msgid="4620682807315588019">"Размер шрифта: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нет настроенных расписаний}=1{Настроено 1 расписание}one{Настроено # расписание}few{Настроено # расписания}many{Настроено # расписаний}other{Настроено # расписания}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не беспокоить"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Режимы приоритета"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Добавить режим"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получать уведомления только от важных людей и приложений."</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Выбрать тип активации"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Время"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Например, 9:30–17:00"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календарь"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Например, \"Личный календарь\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Создайте режим"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Свой вариант"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Отключение уведомлений"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Включите режим \"Не беспокоить\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Режим \"Не беспокоить\" не действует для будильников и звука в медиафайлах"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Расписания"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Удалить расписания"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Удалить"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Переименовать"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Удалить"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Удалить режим \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Изменить"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Расписания"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Расписание"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Добавить в календарь"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Использовать календарь"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Расписание"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Создайте расписание"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Расписание"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ч. <xliff:g id="MINUTES">%2$d</xliff:g> мин."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Включать автоматически"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Расписание"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Отключать звук в заданное время"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Настройте правила режима \"Не беспокоить\"."</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Разрешить звуки"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокировка визуального оповещения"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Включить визуальное оповещение"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Разрешенные уведомления"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Фильтрация уведомлений"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Дополнительные действия"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Выключено}=1{Выключено/Может автоматически включиться 1 режим}one{Выключено/Может автоматически включиться # режим}few{Выключено/Может автоматически включиться # режима}many{Выключено/Могут автоматически включиться # режимов}other{Выключено/Могут автоматически включиться # режима}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Настройки экрана"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Параметры отображения"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Использовать оттенки серого"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"использовать темную тему"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Показывать светлый текст на темном фоне в ОС и приложениях. Такой режим значительно экономит заряд батареи на некоторых устройствах и может быть более комфортным для глаз."</string>
<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}}one{{effect_1}, {effect_2} и ещё # изменение}few{{effect_1}, {effect_2} и ещё # изменения}many{{effect_1}, {effect_2} и ещё # изменений}other{{effect_1}, {effect_2} и ещё # изменения}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Фильтровать уведомления"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Уведомления не фильтруются"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"Открыть уведомление"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Разрешить откладывать уведомления"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Значок уведомления на значке приложения"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Пакеты уведомлений"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Всплывающие чаты"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Всплывающие чаты"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Всплывающий чат"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"В этом приложении не поддерживаются расширенные настройки."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Дополнительные настройки"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Дополнительные настройки доступны в приложении"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Снижение громкости уведомлений"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Применить к рабочим профилям"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Применить для приложений в рабочем профиле"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категории"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Другие"</string>
<string name="no_channels" msgid="4716199078612071915">"Это приложение не отправляло уведомлений."</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Показать неиспользуемые категории"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Доп. настройки в приложении"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Показать неиспользуемые категории"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Скрыть неиспользуемые категории"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Приложения, для которых не действует режим \"Не беспокоить\""</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Выбранные приложения"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Нет"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Все"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Разрешить приложениям переопределять \"Не беспокоить\""</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Приложения, для которых не действует режим \"Не беспокоить\""</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Другие приложения"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Все звуки запрещены"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Режим \"Не беспокоить\" действует для всех звонков и сообщений"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Режим \"Не беспокоить\" не действует для звонков и сообщений от некоторых пользователей"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Режим \"Не беспокоить\" не действует для звонков и сообщений от любых пользователей"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Повторные вызовы"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Повторные вызовы"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Активировать режим \"Только будильник\" на один час до {time}}one{Активировать режим \"Только будильник\" на # час до {time}}few{Активировать режим \"Только будильник\" на # часа до {time}}many{Активировать режим \"Только будильник\" на # часов до {time}}other{Активировать режим \"Только будильник\" на # часа до {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Активировать режим \"Только будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Режим \"Не беспокоить\" отключен."</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Изменение режима"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Добавление режима"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Пользовательский режим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Название режима"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Уведомление"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Закрыть"</string>
<string name="device_feedback" msgid="5351614458411688608">"Отправить отзыв об устройстве"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Принудительное включение режима рабочего стола"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Принудительное включение экспериментального режима рабочего стола на дополнительных экранах"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Разрешить окна произвольной формы"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Включить функцию для создания окон произвольной формы"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Разрешить окна произвольной формы на втором экране"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Включить функцию для создания окон произвольной формы только на дополнительном экране"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Включить неизменяемый масштаб в многооконном режиме"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Открывать приложения с неизменяемым масштабом в многооконном режиме"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Переопределение включения тёмной темы"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Прежде чем использовать параметр для разработчиков и менять размер страницы памяти на 16 КБ, преобразуйте раздел данных на этом устройстве в файловую систему ext4. После этого гарантировать целостность программного обеспечения будет невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. При выполнении процедуры устройство нужно будет перезагрузить ещё раз. В этом режиме для переключения между размерами страницы памяти (4 КБ и 16 КБ) требуется одна перезагрузка. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы сбросить настройки и вернуть устройство в производственный режим, вновь уменьшите размер страницы памяти до 4 КБ и заблокируйте загрузчик операционной системы. После успешного запуска Android отключите разблокировку загрузчика в разделе \"Для разработчиков\". При подтверждении данные с вашего устройства будут удалены, а файловая система будет изменена на ext4. Затем снова увеличьте размер страницы памяти до 16 КБ."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Удалить все данные"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Не удалось отформатировать раздел данных и сменить файловую систему на ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Чтобы изменить размер страницы памяти на 16 кБ, разблокируйте загрузчик операционной системы"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Необходимо разблокировать загрузчик операционной системы"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Прежде чем использовать параметр для разработчиков и менять размер страницы памяти на 16 кБ, разблокируйте загрузчик операционной системы на этом устройстве. После этого гарантировать целостность программного обеспечения будет невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. При повышении размера до 16 кБ все пользовательские данные и настройки будут удалены. После разблокировки загрузчика операционной системы потребуется перезагрузить устройство два раза. В этом режиме для переключения между размерами страницы памяти (4 кБ и 16 кБ) требуется одна перезагрузка. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы сбросить настройки и вернуть устройство в производственный режим, вновь уменьшите размер до 4 кБ и заблокируйте загрузчик операционной системы. Разблокируйте загрузчик и повторите попытку. Сведения о том, как это сделать, опубликованы на странице <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Режим, который не зависит от страниц, с ядром 4 KБ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Вы используете режим работы, который не зависит от страниц, с размером страницы 4 КБ. Гарантировать целостность программного обеспечения при этом невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, заблокируйте загрузчик операционной системы. Нажмите, чтобы узнать подробности."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Вы используете режим работы, который не зависит от страниц, с размером страницы 4 КБ. Гарантировать целостность программного обеспечения при этом невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, заблокируйте загрузчик операционной системы. Настройки устройства при этом сбросятся. После успешного запуска Android отключите разблокировку загрузчика в разделе \"Для разработчиков\". Перепрошейте устройство, если оно работает нестабильно или Android на нем не запускается. Для этого используйте последние заводские образы с сайта <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a&gt. Затем нажмите \"Удалить данные с устройства\", \"Заблокировать загрузчик операционной системы\" и \"Принудительно прошить все разделы\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Используется режим работы, который не зависит от страниц, с размером страницы 16 кБ."</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Вы используете режим работы, который не зависит от страниц памяти, с размером страницы 16 кБ. Гарантировать целостность программного обеспечения при этом невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, вновь уменьшите размер страницы памяти до 4 кБ и заблокируйте загрузчик операционной системы. Нажмите, чтобы узнать подробности."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Вы используете режим работы, который не зависит от страниц памяти, с размером страницы 16 кБ. Гарантировать целостность программного обеспечения при этом невозможно. Любые данные, сохраненные на телефоне, пока загрузчик операционной системы разблокирован, могут быть под угрозой. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, вновь уменьшите размер страницы памяти до 4 кБ и заблокируйте загрузчик операционной системы. Настройки устройства при этом сбросятся. После успешного запуска Android отключите разблокировку загрузчика в разделе \"Для разработчиков\". Перепрошейте устройство, если оно работает нестабильно или Android на нем не запускается. Для этого используйте последние заводские образы с сайта <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a&gt. Затем нажмите \"Удалить данные с устройства\", \"Заблокировать загрузчик операционной системы\" и \"Принудительно прошить все разделы\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Вы используете режим, независимый от размера страницы, с размером страницы 16 кБ. Гарантировать целостность программного обеспечения при этом невозможно. Пока разблокирован загрузчик операционной системы, любые данные, хранящиеся на телефоне, подвергаются риску. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, уменьшите размер страницы памяти до 4 кБ и заблокируйте загрузчик операционной системы. Нажмите, чтобы узнать подробности."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Вы используете режим, независимый от размера страницы, с размером страницы 16 кБ. Гарантировать целостность программного обеспечения при этом невозможно. Пока разблокирован загрузчик операционной системы, любые данные, хранящиеся на телефоне, подвергаются риску. Некоторые функции будут отключены, поэтому отдельные приложения могут не работать. Чтобы вернуться в производственный режим, уменьшите размер страницы памяти до 4 кБ и заблокируйте загрузчик операционной системы. Настройки устройства при этом будут сброшены. После запуска Android отключите разблокировку загрузчика в разделе \"Для разработчиков\". Перепрошейте устройство, если оно работает нестабильно или Android на нем не запускается. Для этого используйте последние заводские образы с сайта <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> или <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a>. Затем нажмите \"Удалить данные с устройства\", \"Заблокировать загрузчик операционной системы\" и \"Принудительно прошить все разделы\"."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим работы, который не зависит от страниц, с размером страницы 16 кБ."</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Ещё"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Обработчик отчетов об ошибках"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Закрепление приложений"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Режим разработчика"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Использовать службу печати"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Разрешить добавлять несколько пользователей"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Разрешить переключение пользователей"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"разрешить, несколько, пользователь, разрешение, много"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"несколько, пользователи, профили, люди, аккаунты, переключиться, много"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Использовать отладку по Wi-Fi"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Выберите, что будет показано на экране, когда планшет подключен к док-станции. Устройство может потреблять больше энергии, если включена заставка."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Настроить"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Настроить заставку \"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>\""</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Чтобы включить поддержку создания окон произвольной формы, требуется перезагрузка."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Чтобы принудительно включить режим рабочего стола на дополнительных экранах, требуется перезагрузка."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Чтобы включить устаревшую функцию для создания окон произвольной формы, требуется перезагрузка."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Чтобы изменить настройки поддержки окон произвольной формы, требуется перезагрузка."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Чтобы принудительно включить функцию для создания окон произвольной формы на дополнительных экранах, требуется перезагрузка."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Перезагрузить сейчас"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Перезагрузить позже"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Пространственное звучание"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Включено"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Отключено"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Включено"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудио: %1$d %% слева, %2$d %% справа"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудио: %1$d %% справа, %2$d %% слева"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Название устройства доступно установленным приложениям. Его также могут видеть другие пользователи, когда вы подключаетесь к устройствам Bluetooth и сетям Wi-Fi или настраиваете точку доступа Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Грамматический род"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Выберите грамматический род"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Поиск по настройкам"</string>
</resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index d51a1c0..52e499a 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"නින්දට යන වේලාව"</item>
+ <item msgid="4152450357280759894">"රිය ධාවනය"</item>
+ <item msgid="7096549258219399423">"ගිලෙන සුළු"</item>
+ <item msgid="2760716776980432977">"කළමනාකරණය කළ"</item>
+ <item msgid="601734478369121764">"තරුව"</item>
+ <item msgid="6243809315432780521">"දින දර්ශනය"</item>
+ <item msgid="4913577903148415331">"වේලාව"</item>
+ <item msgid="3653377604690057780">"රඟහල"</item>
+ <item msgid="3843711267408385410">"මල"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index a30c2f3..d87fd9c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"උපාංගය විසන්ධි කරන්නද?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"නව උපාංගය යුගල කරන්න"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"බ්ලූටූත්"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"හෙට ස්වයංක්රීයව ක්රියාත්මක කරන්න"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"ශ්රවණ උපකරණ සැකසීම්"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"කෙටිමඟ, ශ්රවණාධාරක අනුකූලත්වය"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"පෙරසැකසුම"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ඔබේ ශ්රව්ය විද්යාඥයා විසින් වැඩසටහන්ගත කළ පෙර සැකසීම් නොමැත"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"පෙර සැකසීම යාවත්කාලීන කළ නොහැකි විය"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ශබ්ද ප්රතිදානය"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ශ්රව්ය ප්රතිදානය පිළිබඳව"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ක්රියාවිරහිතයි"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ක්රියාත්මකයි / # යෙදුමකට ස්ථානයට ප්රවේශය ඇත}one{ක්රියාත්මකයි / යෙදුම් #කට ස්ථානයට ප්රවේශය ඇත}other{ක්රියාත්මකයි / යෙදුම් #කට ස්ථානයට ප්රවේශය ඇත}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"පූරණය වේ…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"අවට උපාංගවල සාපේක්ෂ පිහිටීම තීරණය කිරීමට අවට උපාංග අවසරය ඇති යෙදුම්වලට හැකිය."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"සම්බන්ධිත උපාංගවල සාපේක්ෂ පිහිටීම තීරණය කිරීමට අවට උපාංග අවසරය ඇති යෙදුම්වලට හැක."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"යෙදුම් සහ සේවා සඳහා ස්ථාන ප්රවේශය ක්රියාවිරහිතයි. ඔබ හදිසි අවස්ථා අංකයක් අමතන විට හෝ කෙටි පණිවිඩයක් යැවීමේදී ඔබගේ උපාංගයේ ස්ථානය හදිසි අවස්ථා ප්රතිචාර දක්වන්නන්ට තවම යැවිය හැකිය."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ස්ථාන සැකසීම් පිළිබඳව තව දැන ගන්න"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"වෙනස් කිරීමට ChromeOS සැකසීම් > පෞද්ගලිකත්වය සහ ආරක්ෂාව > පෞද්ගලිකත්ව පාලන > ස්ථාන ප්රවේශය වෙත යන්න"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"මුහුණ සහ <xliff:g id="WATCH">%s</xliff:g> එක් කර ඇත"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"මුහුණ, ඇඟිලි සලකුණ, සහ <xliff:g id="WATCH">%s</xliff:g> එක් කර ඇත"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"මුහුණ, ඇඟිලි සලකුණු, සහ <xliff:g id="WATCH">%s</xliff:g> එක් කර ඇත"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"හැඳුනුම් පරීක්ෂාව ක්රියාත්මක බැවින් මෙය අවශ්ය වේ"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"දුරස්ථ සත්යාපක අගුලු හරින්න"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"ඔරලෝසුව එක් කර ඇත"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ඔබේ ඔරලෝසුව පිහිටුවන්න"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ඔරලෝසුව අගුලු හැරීම ගැන තව දැන ගන්න"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"ඔරලෝසුව එක් කරන්න"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"ඔරලෝසුව ඉවත් කරන්න"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"ඇඟිලි සලකුණ සහ මුහුණෙන් අගුළු හැරීම"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"මුහුණ සහ ඇඟිලි සලකුණු අගුළු හැරීම"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"වැඩ සඳහා මුහුණු සහ ඇඟිලි සලකුණු අගුළු හැරීම"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"පිහිටුවීම අවශ්යයි"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"මුහුණ සහ ඇඟිලි සලකුණු එක් කරන ලදි"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"යෙදුම් ස්ථාපන කරන්න"</b>\n"ඔබ පුද්ගලිකව තබා ගැනීමට කැමති යෙදුම් ඔබේ අවකාශය තුළ ස්ථාපන කරන්න"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"මතක තබා ගන්න"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"ඔබ ඔබේ අවකාශයට අගුලු දමන විට යෙදුම් නවතියි"</b>\n"ඔබ ඔබේ අවකාශයට අගුලු දමන විට, ඔබේ අවකාශය තුළ ඇති යෙදුම් නවතින අතර ඔබට ඒවායෙන් දැනුම්දීම් නොලැබෙයි"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"පසුබිමේ ධාවනය කිරීමට හෝ වෛද්ය යෙදුම් වැනි තීරණාත්මක දැනුම්දීම් යැවීමට අවශ්ය යෙදුම් සඳහා රහසිගත අවකාශයන් සුදුසු නොවේ. මෙයට හේතුව ඔබේ අවකාශය අගුළු දමා ඇති විට දැනුම්දීම් සහ පසුබිම් ක්රියාකාරකම් නතර වීමයි.\n\nඔබේ රහසිගත අවකාශය අගුළු දමා ඇති විට ඔබේ රහසිගත අවකාශයේ යෙදුම් අවසර කළමනාකරු, පෞද්ගලිකත්ව උපකරණ පුවරුව, සහ වෙනත් සැකසීම්වල දිස් නොවනු ඇත.\n\nඔබේ රහසිගත අවකාශය නව උපාංගයකට ගෙන යා නොහැක. ඔබට එය වෙනත් උපාංගයක භාවිතා කිරීමට අවශ්ය නම් ඔබට වෙනත් පෞද්ගලික අවකාශයක් පිහිටුවීමට අවශ්ය වනු ඇත.\n\nඔබේ උපාංගය පරිගණකයකට සම්බන්ධ කරන හෝ ඔබේ උපාංගයෙහි හානිකර යෙදුම් ස්ථාපනය කරන ඕනෑම අයෙකුට ඔබේ රහසිගත අවකාශයට ප්රවේශ විය හැක."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"පසුබිමේ ධාවනය කිරීමට හෝ වෛද්ය යෙදුම් වැනි තීරණාත්මක දැනුම්දීම් යැවීමට අවශ්ය යෙදුම් සඳහා රහසිගත අවකාශයන් සුදුසු නොවේ. මෙයට හේතුව ඔබේ අවකාශය අගුළු දමා ඇති විට දැනුම්දීම් සහ පසුබිම් ක්රියාකාරකම් නතර වීමයි.\n\nඔබේ රහසිගත අවකාශය අගුළු දමා ඇති විට ඔබේ රහසිගත අවකාශයේ යෙදුම් අවසර කළමනාකරු, පෞද්ගලිකත්ව උපකරණ පුවරුව, සහ වෙනත් සැකසීම්වල දිස් නොවනු ඇත.\n\nඔබේ රහසිගත අවකාශය නව උපාංගයකට ප්රතිසාධනය කළ නොහැක. ඔබ එය වෙනත් උපාංගයක් මත භාවිත කිරීමට කැමති නම් ඔබට තව අවකාශයක් සැකසීමට අවශ්ය වෙයි.\n\nඔබේ උපාංගය පරිගණකයකට සම්බන්ධ කරන හෝ ඔබේ උපාංගය මත අනිෂ්ට යෙදුම් ස්ථාපන කරන කිසි කෙනෙකුට ඔබේ රහසිගත අවකාශයට ප්රවේශ විය හැකි වේවි."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"රහසිගත අවකාශය ගැන තව දැන ගන්න"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"මෙයට මොහොතක් ගත වෙයි"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"පෞද්ගලික අවකාශය පිහිටුවමින්…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"උපාංගය යළි අරඹන්න ද?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"විස්තර NFC ලොග් කිරීම සංවර්ධන අරමුණු සඳහා පමණක් අදහස් කරයි. පෞද්ගලික තොරතුරු අඩංගු විය හැකි, දෝෂ වාර්තාවල අතිරේක NFC දත්ත ඇතුළත් වේ. මෙම සැකසීම වෙනස් කිරීමට ඔබේ උපාංගය යළි අරඹන්න."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"යළි අරඹන්න"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"දර්පණය, බාහිර සංදර්ශකය, සම්බන්ධිත සංදර්ශකය, usb සංදර්ශකය, විභේදනය, කරකැවීම"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"කරකැවීම"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"සම්මත"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"තිරය මත යතුරු පුවරුව භාවිත කරන්න"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"භෞතික යතුරු පුවරුව සක්රිය අතරතුර එය තිරය මත තබා ගන්න"</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> ms ඇතුළත එකම යතුර නැවත නැවතත් එබීම් නොසලකා හරියි"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"දර්ශක පිරවුම් විලාසය කහ පැහැයට වෙනස් කරන්න"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"දර්ශක පිරවුම් විලාසය රෝස පැහැයට වෙනස් කරන්න"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"දර්ශක පිරවුම් විලාසය නිල් පැහැයට වෙනස් කරන්න"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"දර්ශක පහර විලාසය"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"සුදු"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"කළු"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"කිසිවක් නැත"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"පරිශීලක තෝරා ඇත: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"කථනය"</string>
<string name="pointer_speed" msgid="7398649279282675718">"දර්ශක වේගය"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"දර්ශක පරිමාණය"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"දර්ශක පරිමාණය අඩු කරන්න"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"දර්ශක පරිමාණය වැඩි කරන්න"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"ක්රීඩා පාලකය"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"කම්පනය ප්රතියොමු කරන්න"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ක්රීඩා පාලකයට සම්බන්ධ විට කම්පනය යවන්න."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"කෙසේ වෙතත් ඉදිරියට යන්න"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"අවලංගු කරන්න"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"විශාලන සැකසීම්"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"එක ඇඟිල්ලකින් පෑන් කිරීම"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 ඇඟිල්ලකින් විශාලකය ගෙන යන්න"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"තිරය වටා ගමන් කිරීමට 1 ඇඟිල්ලක් අදින්න"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"එක ඇඟිල්ලක් ඇදීමෙන් විශාලන ප්රදේශය එහා මෙහා කරන්න."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ඇඟිලි දෙකක් ඇදීමෙන් විශාලන ප්රදේශය එහා මෙහා කරන්න."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"තිරයේ කොටසක් පමණක් විශාලනය කරන අතරේ ලබා ගත නොහැක"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"විශාලනය කිරීමට බොත්තමක් තට්ටු කරන්න"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"අන්තර්ගතය වඩා විශාල කිරීමට තිරය මත ඉක්මනින් විශාලනය කරන්න"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>විශාලනය වැඩි කිරීමට:</b><br/> {0,number,integer}. විශාලනය කිරීම ආරම්භ කිරීමට කෙටිමග භාවිත කරන්න<br/> {1,number,integer}. තිරය තට්ටු කරන්න<br/> {2,number,integer}. තිරය වටා යාමට ඇඟිලි 2කින් අදින්න<br/> {3,number,integer}. විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2කින් පින්ච් කරන්න<br/> {4,number,integer}. විශාලනය කිරීම නතර කිරීමට කෙටි මග භාවිත කරන්න<br/><br/> <b>තාවකාලිකව විශාලනය වැඩි කිරීමට:</b><br/> {0,number,integer}. ඔබගේ විශාලන වර්ගය පූර්ණ තිරයට සකසා ඇති බවට සහතික කර ගන්න<br/> {1,number,integer}. විශාලනය කිරීම ආරම්භ කිරීමට කෙටිමග භාවිත කරන්න<br/> {2,number,integer}. තිරයේ ඕනෑම තැනක ස්පර්ශ කර අල්ලා ගන්න<br/> {3,number,integer}. තිරය වටා යාමට ඇඟිල්ල අදින්න<br/> {4,number,integer}. විශාලනය කිරීම නතර කිරීමට ඇඟිල්ල ඔසවන්න"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>විශාලනය වැඩි කිරීමට:</b><br/> {0,number,integer}. විශාලනය කිරීම ආරම්භ කිරීමට කෙටිමග භාවිත කරන්න<br/> {1,number,integer}. තිරය තට්ටු කරන්න<br/> {2,number,integer}. තිරය වටා යාමට ඇඟිලි 2කින් අදින්න<br/> {3,number,integer}. විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2කින් පින්ච් කරන්න<br/> {4,number,integer}. විශාලනය නැවැත්වීමට කෙටිමඟ භාවිතා කරන්න<br/><br/> ඔබට තාවකාලිකව සහ තවත් විශාලනය කිරීමට ද හැක."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>විශාලනය වැඩි කිරීමට:</b><br/> {0,number,integer}. විශාලනය කිරීම ආරම්භ කිරීමට කෙටිමග භාවිත කරන්න<br/> {1,number,integer}. තිරය තට්ටු කරන්න<br/> {2,number,integer}. තිරය වටා ගමන් කිරීමට ඇඟිලි 1ක් හෝ 2ක් අදින්න<br/> {3,number,integer}. විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2කින් පින්ච් කරන්න<br/> {4,number,integer}. විශාලනය නැවැත්වීමට කෙටිමඟ භාවිතා කරන්න<br/><br/> ඔබට තාවකාලිකව සහ තවත් විශාලනය කිරීමට ද හැක."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"විශාලනය ක්රියාත්මක කර ඇති විට, ඔබට ඔබේ තිරයේ දී විශාලනය වැඩි කළ හැකිය.\n\n"<b>"විශාලනය කිරීමට"</b>", විශාලනය ආරම්භ කර, අනතුරුව තිරයේ ඕනෑම තැනක තට්ටු කරන්න.\n"<ul><li>"අනුචලනය කිරීමට ඇඟිලි 2ක් හෝ ඊට වැඩි ගණනක් අදින්න"</li>\n<li>"විශාලනය සීරුමාරු කිරීමට ඇඟිලි 2ක් හෝ ඊට වැඩි ගණනක් කොනහන්න"</li></ul>\n\n<b>"තාවකාලිකව විශාලනය කිරීමට"</b>", විශාලනය ආරම්භ කර, අනතුරුව තිරයේ ඕනෑම තැනක ස්පර්ශ කර & අල්ලාගෙන සිටින්න.\n"<ul><li>"තිරය වටා චලනය කිරීමට අදින්න"</li>\n<li>"විශාලනය අඩු කිරීමට ඇඟිල්ල ඔසවන්න"</li></ul>\n\n"ඔබට යතුරු පුවරුවේ හෝ සංචාලන තීරුවේ දී විශාලනය වැඩි කළ නොහැකිය."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> න් <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> පිටුව"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ප්රවේශ්යතා බොත්තම් කෙටිමඟ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{කිසිත් නැත}=1{කාලසටහන් 1ක් සකසන ලදී}one{කාලසටහන් #ක් සකසන ලදී}other{කාලසටහන් #ක් සකසන ලදී}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"බාධා නොකරන්න"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ප්රමුඛතා ප්රකාර"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ප්රකාරයක් එක් කරන්න"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"වැදගත් පුද්ගලයන් සහ යෙදුම් විසින් පමණක් දැනුම් දෙනු ලැබේ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"සක්රිය කිරීමේ වර්ගය තෝරන්න"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"වේලාව"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"උදා. \"9:30 – ප.ව. 5:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"දින දර්ශනය"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"උදා. \"පුද්ගලික දින දර්ශනය\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"ප්රකාරයක් තනන්න"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"අභිරුචි"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"බාධා සීමා කරන්න"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"බාධා නොකරන්න ක්රියාත්මක කරන්න"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"එලාම සහ මාධ්ය හඬවල්වලට බාධා කළ හැකිය"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"කාල සටහන්"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"කාල සටහන් මකන්න"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"මකන්න"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"යළි නම් කරන්න"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"මකන්න"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" ප්රකාරය මකන්න ද?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"සංස්කරණය කරන්න"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"කාල සටහන්"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"කාල සටහන"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"දින දර්ශනයක් එක් කරන්න"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ඔබේ දින දර්ශනය භාවිතා කරන්න"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"කාල සටහන"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"කාලසටහනක් සකසන්න"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"කාල සටහන"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"පැය <xliff:g id="HOURS">%1$d</xliff:g>යි, විනාඩි <xliff:g id="MINUTES">%2$d</xliff:g>ක්"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ස්වයංක්රීයව ක්රියාත්මක කරන්න"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"කාල සටහන"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"නිශ්චිත වේලාවලදී දුරකථනය නිහඬ කරන්න"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"බාධා නොකරන්න රීති සැකසීම"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ශබ්දය ඇති කරන බාධා කිරීම්වලට ඉඩ දෙන්න"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"දෘශ්ය බාධක අවහිර කරන්න"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"දෘශ්ය සංඥාවලට ඉඩ දෙන්න"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"ඔබට ළඟා විය හැකි දැනුම්දීම්"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"අවධානයෙන් සිටින්න"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"අමතර ක්රියා"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ක්රියාවිරහිතයි}=1{ක්රියාවිරහිතයි / 1 ප්රකාරයක් ස්වයංක්රියව ක්රියාත්මක කළ හැක}one{ක්රියාවිරහිතයි / ප්රකාර #ක් ස්වයංක්රියව ක්රියාත්මක කළ හැක}other{ක්රියාවිරහිතයි / ප්රකාර #ක් ස්වයංක්රියව ක්රියාත්මක කළ හැක}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"සංදර්ශක සැකසීම්"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"සංදර්ශක විකල්ප"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"අළු පැහැය"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"අඳුරු තේමාව සබල කරන්න"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"අඳුරු පසුබිමක ආලෝක පාඨයට කැමති වීමට OS සහ යෙදුම් මාරු කරන්න, එය ඇස්වලට ඉතා පහසු විය හැකි අතර සමහර උපාංග මත සැලකිය යුතු බැටරි සුරැකුම් ලබා දිය හැක"</string>
<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}}one{{effect_1}, {effect_2}, සහ තව # ක්}other{{effect_1}, {effect_2}, සහ තව # ක්}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"පෙරහන් බාධා"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"බාධා කිරීම් පෙරහන් කරනු නොලැබේ"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"පෙරන ලද දැනුම්දීම් සඳහා විකල්ප සංදර්ශන කරන්න"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Do Not Disturb ක්රියාත්මක වන්නේ මොන වේලාවටද"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"දැනුම්දීම් වෙතින් හඬ නැත"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"දැනුම් දීම විවෘත කරන්න"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"දැනුම්දීම කල් දැමීමට ඉඩ දෙන්න"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"යෙදුම් අයිකනයෙහි දැනුම් දීම් තිත"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"දැනුම්දීම් පොදි"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"බුබුළු"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"බුබුළු"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"මෙම සංවාදය බුබුලු දමන්න"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"මෙම යෙදුම වැඩිදියුණු කළ සැකසීම් සඳහා සහාය නොදක්වයි"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"තව සැකසීම්"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"මෙම යෙදුම තුළ තවත් සැකසීම් තිබේ"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"දැනුම්දීම් සිසිල් කිරීම"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"කාර්යාල පැතිකඩ සඳහා යොදන්න"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"කාර්යාල පැතිකඩ යෙදුම්වලට යොදන්න"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"ප්රවර්ග"</string>
<string name="notification_channels_other" msgid="18159805343647908">"වෙනත්"</string>
<string name="no_channels" msgid="4716199078612071915">"මෙම යෙදුම දැනුම්දීම් කිසිවක් පළ කර නැත"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"භාවිතයට නොගත් ප්රවර්ග පෙන්වන්න"</string>
<string name="app_settings_link" msgid="6725453466705333311">"අමතර සැකසීම් යෙදුම තුළ ඇත"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"භාවිතයට නොගත් ප්රවර්ග පෙන්වන්න"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"භාවිතයට නොගත් ප්රවර්ග සඟවන්න"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"බාධා කළ හැකි යෙදුම්"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"තෝරාගත් යෙදුම"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"කිසිවක් නැත"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"සියලු"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ප්රතික්ෂේප කිරිමට යෙදුම්වලට ඉඩ දෙන්න"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"බාධා කළ හැකි යෙදුම්"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"තවත් යෙදුම් තෝරන්න"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"කිසිවකට බාධා කළ නොහැකිය"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"කිසි කෙනෙකුට බාධා කළ නොහැකිය"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"සමහර පුද්ගලයන්ට බාධා කළ හැකිය"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"සියලු පුද්ගලයන්ට බාධා කළ හැකිය"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"නැවත අමතන්නන්"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"යළි අමතන්නන්ට ඉඩ දෙන්න"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} දක්වා පැයක් සඳහා පමණක් එලාම වෙත වෙනස් කරන්න}one{{time} දක්වා පැය #ක් සඳහා පමණක් එලාම වෙත වෙනස් කරන්න}other{{time} දක්වා පැය #ක් සඳහා පමණක් එලාම වෙත වෙනස් කරන්න}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> පමණක් දක්වා ඇති සීනු වෙත මාරු වෙන්න"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"සෑම විටම බාධා කිරීම වෙත මාරු වෙන්න"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"සංස්කරණ ප්රකාරය"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"ප්රකාරය එක් කරන්න"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"අභිරුචි ප්රකාරය"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ප්රකාරයේ නම"</string>
<string name="warning_button_text" msgid="1274234338874005639">"අවවාදයයි"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"වසන්න"</string>
<string name="device_feedback" msgid="5351614458411688608">"මෙම උපාංගය පිළිබඳ ප්රතිපෝෂණ යවන්න"</string>
@@ -4286,7 +4331,7 @@
<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>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"වැඩතල ප්රකාරය බල කරන්න"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ද්විතීයික සංදර්ශන කෙරෙහි අත්හදා බැලීමේ වැඩතල ප්රකාරය බල කරන්න"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"අනියම් හැඩැති කවුළු සබල කරන්න"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"නිදහස් ආකෘති කවුළු සඳහා සහය සබල කරන්න."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"දෙවන සංදර්ශකය මත නිදහස් ආකෘති කවුළු සබල කරන්න"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ද්විතියික සංදර්ශකය මත පමණක් නිදහස් ආකෘති කවුළු සබල කරන්න."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"බහු කවුළුව තුළ ප්රතිප්රමාණ කළ නොහැකි සබල කරන්න"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"බහු කවුළුව තුළ ප්රතිප්රමාණ කළ නොහැකි යෙදුම් තිබීමට ඉඩ දෙයි"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark ප්රතික්ෂේප කරන්න"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB සංවර්ධක විකල්පය භාවිත කිරීමට පෙර මෙම උපාංගයේ දත්ත කොටස ext4 වෙත පරිවර්තනය කළ යුතු ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. 16KB විකල්පය සක්රිය කිරීමට මෙයින් පසු තවත් එක් නැවත පණගැන්වීමක් අවශ්ය වේ. ඔබ මෙම ප්රකාරයට පැමිණි පසු, ඔබට තනි නැවත පණ ගැන්වීමකින් 4KB සහ 16KB ප්රකාරය අතර මාරු විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. උපාංගය නිෂ්පාදන ප්රකාරයට ආපසු යාමට, ඔබට නැවත 4KB ප්රකාරයට මාරු වීමට අවශ්ය වන අතර පසුව උපාංගය කර්මාන්තශාලා යළි සකසන ආරම්භකය අගුළු දැමිය යුතු ය. උපාංගය සාර්ථකව Android සමග ආරම්භ වූ පසු, සංවර්ධක විකල්ප තුළ OEM අගුළු හැරීම ක්රියාවිරහිත කරන්න. උපාංගය මකා දමන අතර තහවුරු කිරීමෙන් පසු ගොනු පද්ධතිය ext4 වෙත වෙනස් කරනු ඇත. මෙය සම්පූර්ණ වූ පසු, කරුණාකර නැවත 16KB සබල කිරීමට ආපසු එන්න."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"සියලු දත්ත මකන්න"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ext4 වෙත දත්ත කොටස් යළි ෆෝමැට් කිරීම සහ පිස දැමීම අසමත් විය."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB ප්රකාරය සඳහා ආරම්භක අගුළු හැරීම අවශ්ය වේ"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ආරම්භකය අගුළු ඇරීම අවශ්යයි"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"මෙම උපාංගයට 16KB සංවර්ධක විකල්පය භාවිත කිරීමට පෙර ආරම්භකය අගුළු හැර තිබිය යුතු ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. 16KB ප්රකාරය සක්රිය කරන විට සියලුම පරිශීලක දත්ත සහ සැකසුම් මකා දමනු ලැබේ. ආරම්භකය අගුළු හැරීමෙන් පසු, 16KB විකල්පය සක්රිය කිරීමට නැවත පණ ගැන්වීම් දෙකක් අවශ්ය වේ. ඔබ මෙම ප්රකාරයට පැමිණි පසු, ඔබට තනි නැවත පණ ගැන්වීමකින් 4KB සහ 16KB ප්රකාරය අතර මාරු විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. උපාංගය නිෂ්පාදන ප්රකාරයට ආපසු යාමට, ඔබට නැවත 4KB ප්රකාරයට මාරු කිරීමට අවශ්ය වන අතර පසුව OEM/අගුළු ආරම්භකය (මෙම කර්මාන්තශාලාව යළි සකසන) අගුළු දැමීම අවශ්ය වේ. කරුණාකර ආරම්භකය අගුළු ඇර නැවත උත්සාහ කරන්න. <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> හි දී ඔබට මෙය කරන ආකාරය ගැන උපදෙස් බැලිය හැක"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB පිටු-දෘෂ්ටික ප්රකාරය භාවිත කරමින්"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 4KB ප්රකාරයේ ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. නිෂ්පාදන ප්රකාරය නැවත ඇතුල් කිරීම සඳහා, ඔබ උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. වැඩිදුර කියවීමට තට්ටු කරන්න."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 4KB ප්රකාරයේ ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. නිෂ්පාදන ප්රකාරය නැවත ඇතුල් කිරීම සඳහා, ඔබ උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. මෙමඟින් උපාංගයට නැවත කර්මාන්තශාලා යළි සැකසීම සිදු කරන අතර එය නිෂ්පාදන සැකසුම් වෙත ප්රතිසාධනය කරයි. උපාංගය සාර්ථකව Android සමග ආරම්භ වූ පසු, සංවර්ධක විකල්ප තුළ OEM අගුළු හැරීම ක්රියාවිරහිත කරන්න. උපාංගය Android වෙත පණ ගැන්වීමට අපොහොසත් වුවහොත් හෝ අස්ථායී නම්, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> වෙතින් නවතම කර්මාන්තශාලා පින්තූර සමග උපාංගය නැවත ෆ්ලෑෂ් කර; \'උපාංගය පිස දමන්න\', \'අගුළු ආරම්භකය\' සහ \'සියලුම කොටස් ෆ්ලෑෂ් කිරීමට බල කරන්න\' තෝරන්න."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB පිටු-දෘෂ්ටික ප්රකාරය භාවිත කරමින්"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 16KB ප්රකාරයේ ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. නිෂ්පාදන ප්රකාරයට නැවත ඇතුළු වීමට, ඔබ 4K ප්රකාරයට ආපසු මාරු කර උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. වැඩිදුර කියවීමට තට්ටු කරන්න."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 16KB ප්රකාරයේ ය. මෙම ප්රකාරයේ දී මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුළු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තයක් අවදානමට ලක් විය හැක. මෙම ප්රකාර තුළ සමහර විශේෂාංග ක්රියාවිරහිත වනු ඇත, එබැවින් සමහර යෙදුම් ක්රියා නොකරනු ඇත. නිෂ්පාදන ප්රකාරයට නැවත ඇතුළු වීමට, ඔබ 4K ප්රකාරයට ආපසු මාරු කර උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. මෙමඟින් උපාංගයට නැවත කර්මාන්තශාලා යළි සැකසීම සිදු කරන අතර එය නිෂ්පාදන සැකසුම් වෙත ප්රතිසාධනය කරයි. උපාංගය සාර්ථකව Android සමග ආරම්භ වූ පසු, සංවර්ධක විකල්ප තුළ OEM අගුළු හැරීම ක්රියාවිරහිත කරන්න. උපාංගය Android වෙත පණ ගැන්වීමට අපොහොසත් වුවහොත් හෝ අස්ථායී නම්, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> වෙතින් නවතම කර්මාන්තශාලා පින්තූර සමග උපාංගය නැවත ෆ්ලෑෂ් කර; \'උපාංගය පිස දමන්න\', \'අගුළු ආරම්භකය\' සහ \'සියලුම කොටස් ෆ්ලෑෂ් කිරීමට බල කරන්න\' තෝරන්න."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 16KB ප්රකාරයේ ය. මෙම ප්රකාරයේ මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුලු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තක් අවදානමට ලක් වේවි. මෙම ප්රකාර තුළ සමහර විශේෂාංග අබල වෙයි, එබැවින් සමහර යෙදුම් ක්රියා නොකරයි. නිෂ්පාදන ප්රකාරයට නැවත ඇතුළු වීමට, ඔබ 4KB ප්රකාරයට ආපසු මාරු කර උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. වැඩිදුර කියවීමට තට්ටු කරන්න."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"ඔබ සිටින්නේ පිටු-දෘෂ්ටික ප්රකාරයේ 16KB ප්රකාරයේ ය. මෙම ප්රකාරයේ මෘදුකාංග අඛණ්ඩතාව සහතික කළ නොහැකි අතර, ආරම්භකය අගුලු හැර ඇති විට දුරකථනයේ ගබඩා කර ඇති ඕනෑම දත්තක් අවදානමට ලක් වේවි. මෙම ප්රකාර තුළ සමහර විශේෂාංග අබල වෙයි, එබැවින් සමහර යෙදුම් ක්රියා නොකරයි. නිෂ්පාදන ප්රකාරයට නැවත ඇතුළු වීමට, ඔබ 4KB ප්රකාරයට ආපසු මාරු කර උපාංගයේ ආරම්භකය අගුළු දැමිය යුතු ය. මෙමඟින් උපාංගයට නැවත කර්මාන්තශාලා යළි සැකසීම සිදු කරන අතර එය නිෂ්පාදන සැකසුම් වෙත ප්රතිසාධනය කරයි. උපාංගය සාර්ථකව Android සමග ආරම්භ වූ පසු, සංවර්ධක විකල්ප තුළ OEM අගුලු හැරීම අබල කරන්න. උපාංගය Android වෙත පණ ගැන්වීමට අපොහොසත් වුවහොත් හෝ අස්ථායී නම්, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> වෙතින් නවතම කර්මාන්තශාලා පින්තූර සමග උපාංගය නැවත ෆ්ලෑෂ් කර; \'උපාංගය පිස දමන්න\', \'අගුළු ආරම්භකය\' සහ \'සියලුම කොටස් ෆ්ලෑෂ් කිරීමට බල කරන්න\' තෝරන්න."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB පිටු-දෘෂ්ටික ප්රකාරය"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"තව කියවන්න"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"දෝෂ වාර්තා හසුරුවනය"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"යෙදුම ඇමිණීම භාවිත කරන්න"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"සංවර්ධක විකල්ප භාවිත කරන්න"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"මුද්රණ සේවාව භාවිත කරන්න"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"බහු පරිශීලකයින්ට ඉඩ දෙන්න"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"පරිශීලක ස්විචයට ඉඩ දෙන්න"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ඉඩ දෙන්න, බහුවිධ, පරිශීලක, අවසර, බොහෝ"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"බහු, පරිශීලකයෝ, පැතිකඩ, පුද්ගලයෝ, ගිණුම්, මාරු කිඍිම, බොහෝ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"රැහැන් රහිත නිදොස්කරණය භාවිත කරන්න"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"ඔබගේ ටැබ්ලටය ඈඳා ඇති විට ඔබ ඔබගේ තිරය මත දකිනු ඇති දේ තෝරන්න. තිර සුරැකුමක් භාවිත කරන විට ඔබගේ උපාංගය ශක්තිය වැඩියෙන් භාවිත කළ හැකිය."</string>
<string name="customize_button_title" msgid="1110284655990203359">"අභිරුචිකරණය කරන්න"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> අභිරුචිකරණය කරන්න"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"නිදහස් ආකෘති සහාය සබල කිරීමට නැවත පණ ගැන්වීමක් අවශ්ය වේ."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ද්විතීයික සංදර්ශකවල ඩෙස්ක්ටොප් ප්රකාරය බල කිරීමට නැවත පණ ගැන්වීමක් අවශ්ය වේ."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ලෙගසි නිදහස් ආකෘති කවුළු සහාය සබල කිරීමට නැවත පණ ගැන්වීමක් අවශ්ය වේ."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"නිදහස් ආකෘති කවුළු සහාය වෙනස් කිරීමට නැවත පණ ගැන්වීමක් අවශ්ය වේ."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ද්විතියික සංදර්ශක මත නිදහස් ආකෘති කවුළුව බල කිරීමට නැවත පණගැන්වීමක් අවශ්ය වේ."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"දැන් නැවත පණ ගන්වන්න"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"පසුව නැවත පණ ගන්වන්න"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"අවකාශීය ශ්රව්ය"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ක්රියාත්මකයි"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ක්රියාවිරහිතයි"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ක්රියාත්මකයි"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ශ්රව්ය %1$d%% වම, %2$d%% දකුණ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ශ්රව්ය %1$d%% දකුණ, %2$d%% වම"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"ඔබේ උපාංගයේ නම ඔබ ස්ථාපනය කර ඇති යෙදුම්වලට දෘශ්යමාන වේ. ඔබ බ්ලූටූත් උපාංග වෙත සම්බන්ධ වන විට, Wi-Fi ජාලයකට සම්බන්ධ වන විට හෝ Wi-Fi හොට්ස්පොට් එකක් පිහිටුවන විට එය වෙනත් පුද්ගලයන් විසින් ද දැකිය හැක."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"ව්යාකරණමය ලිංගභේදය"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"ව්යාකරණමය ලිංගභේදය තෝරන්න"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"සෙවීමේ සැකසීම්"</string>
</resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index f314f3f..a908bbe 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Večierka"</item>
+ <item msgid="4152450357280759894">"Intenzívne"</item>
+ <item msgid="7096549258219399423">"Pútavé"</item>
+ <item msgid="2760716776980432977">"Spravované"</item>
+ <item msgid="601734478369121764">"Hviezda"</item>
+ <item msgid="6243809315432780521">"Kalendár"</item>
+ <item msgid="4913577903148415331">"Čas"</item>
+ <item msgid="3653377604690057780">"Kino"</item>
+ <item msgid="3843711267408385410">"Kvet"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 841e761..1bf533a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Odpojiť zariadenie?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Spárovať nové zariadenie"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Automaticky zapnúť zajtra"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Nastavenia načúvacieho zariadenia"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Skratka, kompatibilita s načúvadlami"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Predvoľba"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Váš audiológ nenaprogramoval žiadne predvoľby"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Predvoľbu sa nepodarilo aktualizovať"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvukový výstup"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Zvukový výstup"</string>
@@ -281,9 +281,9 @@
<string name="location_settings_title" msgid="8375074508036087178">"Poloha"</string>
<string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Používať polohu"</string>
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuté"</string>
- <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Zapnuté – # aplikácia má prístup k polohe}few{Zapnuté – # aplikácie majú prístup k polohe}many{On / # apps have access to location}other{Zapnuté – # aplikácií má prístup k polohe}}"</string>
+ <string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Zapnuté / # aplikácia má prístup k polohe}few{Zapnuté / # aplikácie majú prístup k polohe}many{On / # apps have access to location}other{Zapnuté / # aplikácií má prístup k polohe}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Načítava sa…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikácie s povolením pre zariadenia v okolí môžu rozpoznať relatívnu pozíciu pripojených zariadení."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikácie s povolením pre zariadenia v okolí môžu rozpoznať relatívnu pozíciu pripojených zariadení."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Prístup aplikácií a služieb k polohe je vypnutý. Poloha zariadenia však stále môže byť odoslaná záchranárom, keď zavoláte na tiesňovú linku alebo na ňu pošlete textovú správu."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Ďalšie informácie o nastaveniach polohy"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Ak chcete vykonať zmenu, prejdite do sekcie Nastavenia systému ChromeOS > Ochrana súkromia a zabezpečenie > Nastavenia ochrany súkromia > Prístup k polohe"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Tvár a hodinky <xliff:g id="WATCH">%s</xliff:g> boli pridané"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Tvár, odtlačok prsta a hodinky <xliff:g id="WATCH">%s</xliff:g> boli pridané"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Tvár, odtlačky prstov a hodinky <xliff:g id="WATCH">%s</xliff:g> boli pridané"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Je to potrebné, pretože je zapnutá kontrola totožnosti"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Odomknutie Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Hodinky boli pridané"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Nastavte si hodinky"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Ďalšie informácie o odomknutí hodinkami"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Pridať hodinky"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Odstrániť hodinky"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Odomknutie odtlačkom prsta a tvárou"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Odomknutie tvárou a odtlačkom prsta"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Odomknutie tvárou a odtlačkom prsta pre prácu"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Vyžaduje sa nastavenie"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Bola pridaná tvár a odtlačky prsta"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Inštalácia aplikácií"</b>\n"Nainštalujte si aplikácie, ktoré chcete vo svojom priestore ponechať súkromné"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Na čo treba pamätať"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Keď uzamknete svoj priestor, aplikácie sa zastavia"</b>\n"Keď uzamknete svoj priestor, aplikácie v ňom sa zastavia a nebudete z nich dostávať upozornenia"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Súkromné priestory nie sú vhodné pre aplikácie, ktoré majú byť spustené na pozadí alebo odosielajú závažné upozornenia. Týka sa to napríklad zdravotníckych aplikácií. Je to tak preto, lebo upozornenia a aktivita na pozadí sa po uzamknutí priestoru zastavia.\n\nKeď je súkromný priestor uzamknutý, aplikácie v ňom sa nezobrazujú v správe povolení, na paneli ochrany súkromia ani v iných nastaveniach.\n\nSúkromný priestor sa nedá preniesť do nového zariadenia. Ak ho chcete používať v inom zariadení, musíte si založiť ďalší.\n\nK vášmu súkromnému priestoru môže získať prístup ktokoľvek, kto pripojí vaše zariadenie k počítaču alebo v ňom nainštaluje škodlivé aplikácie."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Súkromné priestory nie sú vhodné pre aplikácie, ktoré majú byť spustené na pozadí alebo odosielajú závažné upozornenia. Týka sa to napríklad zdravotníckych aplikácií. Je to tak preto, lebo upozornenia a aktivita na pozadí sa po uzamknutí priestoru zastavia.\n\nKeď je súkromný priestor uzamknutý, aplikácie v ňom sa nezobrazujú v správe povolení, na paneli ochrany súkromia ani v iných nastaveniach.\n\nSúkromný priestor sa nedá obnoviť v novom zariadení. Ak ho chcete používať v inom zariadení, musíte si založiť ďalší.\n\nK vášmu súkromnému priestoru môže získať prístup ktokoľvek, kto pripojí vaše zariadenie k počítaču alebo v ňom nainštaluje škodlivé aplikácie."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Ďalšie informácie o súkromnom priestore"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Bude to chvíľu trvať"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavuje sa súkromný priestor…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Chcete zariadenie reštartovať?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Podrobné zaznamenávanie údajov NFC je určené iba na účely vývoja. Ďalšie údaje NFC sú zahrnuté v hláseniach chýb, ktoré môžu obsahovať súkromné informácie. Ak chcete toto nastavenie zmeniť, reštartujte zariadenie."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Reštartovať"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"zrkadliť, externá obrazovka, pripojená obrazovka, obrazovka usb, rozlíšenie, otočenie"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Otočenie"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Štandardné"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -860,7 +874,7 @@
<string name="wifi_display_status_in_use" msgid="5904009697167947449">"Používa sa"</string>
<string name="wifi_display_status_not_available" msgid="8463750208946968594">"Nie je k dispozícii"</string>
<string name="wifi_display_options_title" msgid="7584326966240865043">"Možnosti bezdrôtového zobrazenia"</string>
- <string name="wifi_display_options_forget" msgid="3140558691112356024">"Odstrániť"</string>
+ <string name="wifi_display_options_forget" msgid="3140558691112356024">"Zabudnúť"</string>
<string name="wifi_display_options_done" msgid="7608851767701954020">"Hotovo"</string>
<string name="wifi_display_options_name" msgid="8181334945680312228">"Názov"</string>
<string name="wifi_band_24ghz" msgid="7322286660245127384">"2,4 GHz"</string>
@@ -1034,7 +1048,7 @@
<string name="wifi_connecting" msgid="7450277833386859724">"Pripája sa…"</string>
<string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nepodarilo sa pripojiť k sieti"</string>
<string name="wifi_not_in_range_message" msgid="3885327464037574739">"Sieť nie je v dosahu"</string>
- <string name="wifi_forget" msgid="3485573280364015620">"Odstrániť"</string>
+ <string name="wifi_forget" msgid="3485573280364015620">"Zabudnúť"</string>
<string name="wifi_modify" msgid="5127926476383659412">"Upraviť"</string>
<string name="wifi_save" msgid="2312643132472226807">"Uložiť"</string>
<string name="wifi_failed_save_message" msgid="1830279872341387120">"Nepodarilo sa uložiť sieť"</string>
@@ -1192,6 +1206,7 @@
<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>
@@ -1383,7 +1398,7 @@
<string name="storage_menu_format_public" msgid="5567214442727034630">"Naformátovať ako prenosné"</string>
<string name="storage_menu_format_option" msgid="4886059624052908432">"Formátovať"</string>
<string name="storage_menu_migrate" msgid="2196088149560070193">"Migrovať dáta"</string>
- <string name="storage_menu_forget" msgid="5154017890033638936">"Odstrániť záznam"</string>
+ <string name="storage_menu_forget" msgid="5154017890033638936">"Zabudnúť"</string>
<string name="storage_menu_set_up" msgid="4401074025612064744">"Nastaviť"</string>
<string name="storage_menu_free" msgid="616100170298501673">"Uvoľniť miesto"</string>
<string name="storage_menu_manage" msgid="7465522758801346408">"Spravovať úložisko"</string>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Používať klávesnicu na obrazovke"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Ponechať na obrazovke, keď je aktívna fyzická klávesnica"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Klávesy jedného 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="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="sticky_keys" msgid="7317317044898161747">"Režim uzamknutia klávesa"</string>
<string name="sticky_keys_summary" msgid="1844953803625480623">"Používať skratky stlačením jedného klávesa namiesto viacerých"</string>
+ <string name="mouse_keys" msgid="6237254627808525540">"Klávesy myši"</string>
+ <string name="mouse_keys_summary" msgid="2396247040177734245">"Ovládať myš pomocou fyzickej klávesnice."</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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Zmena farby kurzora na žltú"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Zmena farby kurzora na ružovú"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Zmena farby kurzora na modrú"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Štýl čiary kurzora"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Biely"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Čierny"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Žiadny"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Vybrané používateľom: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Reč"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Rýchlosť kurzora"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Mierka ukazovateľa"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Znížiť mierku ukazovateľa"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Zvýšiť mierku ukazovateľa"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Herné ovládače"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Presmerovať vibrácie"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Posielať vibrácie do herného ovládača, keď je pripojený"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Aj tak pokračovať"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Zrušiť"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavenia priblíženia"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Presunutie jedným prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Lupu presúvajte jedným prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Po obrazovke sa pohybujte presúvaním jedného prsta"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Jedným prstom presuňte oblasť zväčšenia."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Dvoma prstami presuňte oblasť zväčšenia."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nie je k dispozícii iba pri zväčšovaní časti obrazovky"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Na priblíženie klepnite na tlačidlo"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Obrazovku si môžete rýchlo priblížiť, aby bol obsah väčší"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Priblíženie:</b><br/> {0,number,integer}. Skratkou spustite zväčšenie.<br/> {1,number,integer}. Klepnite na obrazovku.<br/> {2,number,integer}. Pohybujte sa po obrazovke presúvaním dvoch prstov.<br/> {3,number,integer}. Priblíženie upravte stiahnutím či roztiahnutím dvoch prstov.<br/> {4,number,integer}. Zväčšenie ukončíte skratkou.<br/><br/> <b>Dočasné priblíženie:</b><br/> {0,number,integer}. Skontrolujte, či je typ zväčšenia nastavený na celú obrazovku.<br/> {1,number,integer}. Skratkou spustite zväčšenie.<br/> {2,number,integer}. Pridržte ľubovoľné miesto na obrazovke.<br/> {3,number,integer}. Pohybujte sa po obrazovke presúvaním prsta.<br/> {4,number,integer}. Zväčšenie ukončíte zdvihnutím prsta."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Ak chcete priblížiť:</b><br/> {0,number,integer}. Skratkou spustite zväčšenie.<br/> {1,number,integer}. Klepnite na obrazovku.<br/> {2,number,integer}. Posúvajte sa po obrazovke presúvaním dvoch prstov.<br/> {3,number,integer}. Priblíženie upravte stiahnutím či roztiahnutím dvoch prstov.<br/> {4,number,integer}. Zväčšenie zastavíte pomocou skratky.<br/><br/> Okrem toho môžete krátkodobo priblížiť a vykonávať ďalšie akcie."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Ak chcete priblížiť:</b><br/> {0,number,integer}. Skratkou spustite zväčšenie.<br/> {1,number,integer}. Klepnite na obrazovku.<br/> {2,number,integer}. Posúvajte sa po obrazovke presúvaním jedného alebo dvoch prstov.<br/> {3,number,integer}. Priblíženie upravte stiahnutím či roztiahnutím dvoch prstov.<br/> {4,number,integer}. Zväčšenie zastavíte pomocou skratky.<br/><br/> Okrem toho môžete krátkodobo priblížiť a vykonávať ďalšie akcie."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Keď je priblíženie zapnuté, môžete si zväčšiť obsah obrazovky.\n\n"<b>"Urobíte to tak"</b>", že spustíte priblíženie a klepnete kamkoľvek na obrazovku.\n"<ul><li>"Zobrazenie posuniete presunutím dvoch alebo viacerých prstov."</li>\n<li>"Priblíženie upravíte stiahnutím dvoch alebo viacerých prstov."</li></ul>\n\n<b>"Ak chcete obsah priblížiť krátkodobo"</b>", spustite priblíženie a pridržte ľubovoľné miesto na obrazovke.\n"<ul><li>"Po obrazovke prechádzate presunutím."</li>\n<li>"Oddialite zdvihnutím prsta."</li></ul>\n\n"Nemôžete priblížiť klávesnicu ani navigačný panel."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. stránka z <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Skratka tlačidla dostupnosti"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žiadne}=1{Bol nastavený 1 plán}few{Boli nastavené # plány}many{# schedules set}other{Bolo nastavených # plánov}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Režim bez vyrušení"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Režimy priority"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Pridať režim"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prijímajte upozornenia iba od dôležitých ľudí a z dôležitých aplikácií"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Vybrať typ aktivácie"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Čas"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Napr. „9:30 – 17:00“."</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendár"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Napr. „Osobný kalendár“."</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Vytvorte režim"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Vlastné"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Obmedzenie vyrušení"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Zapnite režim bez vyrušení"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Budíky a zvuky médií môžu vyrušiť"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Plány"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Odstrániť plány"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Odstrániť"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Premenovať"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Odstrániť"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Chcete odstrániť režim <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Upraviť"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Plány"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Plán"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Pridajte kalendár"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Použiť kalendár"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Rozpis"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Nastavte si plán"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Naplánovať"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Zapínať automaticky"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Plán"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Stlmiť telefón v určitý čas"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Nastavenie pravidiel režimu bez vyrušení"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Povolenie zvukových vyrušení"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokovať vizuálne vyrušenia"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Povoliť vizuálne signály"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Upozornenia, ku ktorým máte prístup"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Nerozptyľujte sa"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Ďalšie akcie"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Vypnuté}=1{Vypnuté / 1 režim sa môže zapínať automaticky}few{Vypnuté / # režimy sa môžu zapínať automaticky}many{Off / # modes can turn on automatically}other{Vypnuté / # režimov sa môže zapínať automaticky}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Nastavenia obrazovky"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Možnosti zobrazenia"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Odfarbenie"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"zapnutie tmavého motívu"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Prepnite operačný systém a aplikácie na preferovaný svetlý text na tmavom pozadí, čo môže byť menej namáhavé pre oči a významne prispeje k úspore batérie v niektorých zariadeniach"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Žiadne zmeny obrazovky}=1{{effect_1}}=2{{effect_1} a {effect_2}}=3{{effect_1}, {effect_2} a {effect_3}}few{{effect_1}, {effect_2} a # ďalšie}many{{effect_1}, {effect_2}, and # more}other{{effect_1}, {effect_2} a # ďalších}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrovanie vyrušení"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nefiltrujú sa žiadne vyrušenia"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Možnosti obrazovky na filtrovanie upozornení"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Keď je zapnutý režim bez vyrušení"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Upozornenia bez zvuku"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"otvoriť upozornenie"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Povoliť stlmenie upozornení"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Bodka upozornení na ikone aplikácie"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Balíky upozornení"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubliny"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubliny"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Zobrazovať túto konverzáciu v bubline"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Táto aplikácia nepodporuje zlepšené nastavenia"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Ďalšie nastavenia"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"V tejto aplikácii sú k dispozícii ďalšie nastavenia"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Stlmenie upozornení"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Použiť na pracovné profily"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Platí pre aplikácie v pracovnom profile"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategórie"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Iné"</string>
<string name="no_channels" msgid="4716199078612071915">"Táto aplikácia ešte neposlala žiadne upozornenia"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Zobrazenie nepoužívaných kategórií"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Ďalšie nastavenia v aplikácii"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Zobraziť nepoužívané kategórie"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Skryť nepoužívané kategórie"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikácie, ktoré môžu vyrušiť"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Vybrané aplikácie"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Žiadne"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Všetky"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Vyberte ďalšie aplikácie"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Žiadne zvuky nemôžu vyrušiť"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nikto nemôže vyrušiť"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Niektorí ľudia môžu vyrušiť"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Všetci ľudia môžu vyrušiť"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Opakované volania"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Povoliť opakované volania"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Zmena v budíkoch iba na hodinu do {time}}few{Zmena v budíkoch iba na # hodiny do {time}}many{Change to alarms only for # hours until {time}}other{Zmena v budíkoch iba na # hodín do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Zmena na možnosť Iba budíky platná do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Zmena na možnosť Vždy prerušiť"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Úprava režimu"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Pridanie 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="warning_button_text" msgid="1274234338874005639">"Upozornenie"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zavrieť"</string>
<string name="device_feedback" msgid="5351614458411688608">"Odoslať spätnú väzbu o zariadení"</string>
@@ -4174,8 +4219,8 @@
<string name="data_saver_on" msgid="7848893946018448793">"Zapnutý"</string>
<string name="data_saver_off" msgid="5891210864117269045">"Vypnutý"</string>
<string name="data_saver_switch_title" msgid="7111538580123722959">"Používať šetrič dát"</string>
- <string name="unrestricted_app_title" msgid="8531936851059106374">"Používať neobmedzené mobilné dáta"</string>
- <string name="unrestricted_app_summary" msgid="8320813971858627624">"Povoliť prístup k neobmedzeným mobilným dátam, keď je zapnutý šetrič dát"</string>
+ <string name="unrestricted_app_title" msgid="8531936851059106374">"Používať mobilné dáta neobmedzene"</string>
+ <string name="unrestricted_app_summary" msgid="8320813971858627624">"Povoliť neobmedzený prístup k mobilným dátam, keď je zapnutý šetrič dát"</string>
<string name="home_app" msgid="6056850504746902747">"Vstupná aplikácia"</string>
<string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Pridať ďalší odtlačok prsta"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Odomknutie pomocou iného odtlačku"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Puzdro"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batéria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel s nastaveniami"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Vynútiť režim pracovnej plochy"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Vynútiť experimentálny režim pracovnej plochy na sekundárnych obrazovkách"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Povolenie meniteľných okien"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Povoľte podporu pre meniteľné okná."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Povoliť meniteľné okná na druhej obrazovke"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Povoľte meniteľné okná iba na sekundárnej obrazovke."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Povoliť v režime viac. okien aplik. bez možn. zmeny veľkosti"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Povoliť v režime viacerých okien aplikácie bez možnosti zmeny veľkosti"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Presadiť tmavý režim"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Dátový oddiel tohto zariadenia je potrebné pred použitím možnosti 16 kB pre vývojárov konvertovať na ext4. 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é. Aktivácia možnosti 16 kB si potom vyžiada ešte jedno reštartovanie. Keď budete v tomto režime, môžete prepínať medzi režimom 4 kB a 16 kB jedným reštartovaním. Niektoré funkcie budú v týchto režimoch vypnuté, takže niektoré aplikácie nemusia fungovať. Ak chcete zariadenie vrátiť do ostrého režimu, musíte prepnúť späť na režim 4 kB a potom uzamknúť zavádzací program systému, čím sa v zariadení obnovia výrobné nastavenia. Po úspešnom zapnutí Androidu v zariadení vypnite odomknutie OEM v sekcii Pre vývojárov. Zariadenie sa trvalo vymaže a systém súborov sa po potvrdení zmení na ext4. Po dokončení tohto kroku sa vráťte a znova zapnite režim 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Vymazať všetky údaje"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Nepodarilo sa zmeniť formát ani trvale vymazať oddiel dát na ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Režim 16 kB vyžaduje odomknutie zavádzacieho programu systému"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Vyžaduje sa odomknutie zavádzacieho programu systému"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Toto zariadenie musí mať pred použitím možnosti pre vývojárov 16 kB odomknutý zavádzací program systému. 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é. Pri aktivácii režimu 16 kB sa vymažú všetky dáta a nastavenia používateľa. Po odomknutí zavádzacieho programu systému si aktivácia možnosti 16 kB vyžiada dve reštartovania. Keď budete v tomto režime, môžete prepínať medzi režimom 4 kB a 16 kB jedným reštartovaním. Niektoré funkcie budú v týchto režimoch vypnuté, takže niektoré aplikácie nemusia fungovať. Ak chcete zariadenie vrátiť do ostrého režimu, musíte prepnúť späť na režim 4 kB a potom uzamknúť OEM alebo zavádzací program systému, čím sa v zariadení obnovia výrobné nastavenia. Odomknite zavádzací program systému a skúste to znova. Postup, ako to vykonať, nájdete na <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Používa sa režim 4 kB, ktorý nezohľadňuje stránkovanie"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ste v režime 4 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 niektoré aplikácie nemusia fungovať. Ak chcete znova vstúpiť do ostrého režimu, musíte uzamknúť zavádzací program systému zariadenia. Klepnutím zobrazíte ďalšie informácie."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ste v režime 4 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 niektoré aplikácie nemusia fungovať. Ak chcete znova vstúpiť do ostrého režimu, musíte 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> alebo prejdite na <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> a vyberte Wipe Device (Trvale vymazať zariadenie), Lock Bootloader (Uzamknúť zavádzací program systému) a Force Flash all partitions (Vynútiť inštaláciu obrazu systému vo všetkých oddieloch)."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Používa sa režim 16 kB, ktorý nezohľadňuje stránkovanie"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 niektoré aplikácie nemusia fungovať. Ak chcete znova vstúpiť do ostrého režimu, musíte prepnúť späť do režimu 4 kB a potom uzamknúť zavádzací program systému zariadenia. Klepnutím zobrazíte ďalšie informácie."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 niektoré aplikácie nemusia fungovať. Ak chcete znova vstúpiť 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> alebo prejdite na <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> a vyberte Wipe Device (Trvale vymazať zariadenie), Lock Bootloader (Uzamknúť zavádzací program systému) a Force Flash all partitions (Vynútiť inštaláciu obrazu systému vo všetkých oddieloch)."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Klepnutím zobrazíte ďalšie informácie."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> alebo prejdite na <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Obsluha hlásení chýb"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Používať pripnutie aplikácie"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Používať nastavenia pre vývojárov"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Používať tlačovú službu"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Povoliť viacero používateľov"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Povoliť prepnutie používateľom"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"povoliť, viacero, používateľ, povolenie, veľa"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"viacerí, používatelia, profily, ľudia, účty, prepnúť, mnoho"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Používať bezdrôtové ladenie"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Vyberte, čo sa bude zobrazovať na vašej obrazovke po vložení tabletu do doku. Zariadenie môže pri používaní šetriča obrazovky spotrebúvať viac energie."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Prispôsobiť"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Prispôsobiť <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Zapnutie podpory funkcie Freeform vyžaduje reštartovanie."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Vynútenie režimu pracovnej plochy na sekundárnych obrazovkách vyžaduje reštartovanie."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Povolenie podpory starých meniteľných okien vyžaduje reštart."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Zmena podpory meniteľných okien vyžaduje reštart."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Vynútenie meniteľných okien na sekundárnych obrazovkách vyžaduje reštart."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Reštartovať"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Reštartovať neskôr"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Priestorový zvuk"</string>
@@ -5139,7 +5187,7 @@
<string name="bluetooth_details_audio_device_type_unknown" msgid="5299284975435974206">"Nenastavené"</string>
<string name="bluetooth_details_audio_device_type_speaker" msgid="3706227767994792124">"Reproduktor"</string>
<string name="bluetooth_details_audio_device_type_headphones" msgid="7644588291215033798">"Slúchadlá"</string>
- <string name="bluetooth_details_audio_device_type_hearing_aid" msgid="6311786545025321187">"Načúvacie zariadenie"</string>
+ <string name="bluetooth_details_audio_device_type_hearing_aid" msgid="6311786545025321187">"Načúvadlo"</string>
<string name="bluetooth_details_audio_device_type_carkit" msgid="1866236563013629394">"Auto"</string>
<string name="bluetooth_details_audio_device_type_other" msgid="7019481234617207563">"Iné"</string>
<string name="ingress_rate_limit_title" msgid="2106694002836274350">"Limit rýchlosti sťahovania v sieti"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Zapnuté"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Vypnuté"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Zapnuté"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Zvuk – ľavé: %1$d%%, pravé: %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Zvuk – pravé: %1$d%%, ľavé: %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Názov zariadenia je viditeľný pre aplikácie, ktoré ste nainštalovali. Keď sa pripojíte k zariadeniam s rozhraním Bluetooth alebo sieti Wi‑Fi, prípadne nastavíte hotspot Wi‑Fi, môžu ho uvidieť aj ďalší ľudia."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gramatický rod"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Výber gramatického rodu"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Nastavenia vyhľadávania"</string>
</resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 7257ead..bd9926a 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Čas za spanje"</item>
+ <item msgid="4152450357280759894">"Vožnja"</item>
+ <item msgid="7096549258219399423">"Poglobljeno"</item>
+ <item msgid="2760716776980432977">"Upravljano"</item>
+ <item msgid="601734478369121764">"Zvezda"</item>
+ <item msgid="6243809315432780521">"Koledar"</item>
+ <item msgid="4913577903148415331">"Čas"</item>
+ <item msgid="3653377604690057780">"Gledališče"</item>
+ <item msgid="3843711267408385410">"Roža"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9c64e81..e847e50 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Prekinitev povezave z napravo?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Seznanitev nove naprave"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Samodejno vklopi jutri"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Nastavitve slušnega aparata"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Bližnjica, združljivost s slušnimi aparati"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Prednastavljeno"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Avdiolog ni programiral nobenih prednastavljenih vrednosti"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Prednastavljenih vrednosti ni bilo mogoče posodobiti"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Zvočni izhod"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"O zvočnem izhodu"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izklopljeno"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Vklopljeno/dostop do lokacije ima # aplikacija}one{Vklopljeno/dostop do lokacije ima # aplikacija}two{Vklopljeno/dostop do lokacije imata # aplikaciji}few{Vklopljeno/dostop do lokacije imajo # aplikacije}other{Vklopljeno/dostop do lokacije ima # aplikacij}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Nalaganje …"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacije z dovoljenjem za naprave v bližini lahko določijo relativno lokacijo povezanih naprav."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacije z dovoljenjem za naprave v bližini lahko določijo relativno lokacijo povezanih naprav."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Dostop do lokacije je izklopljen za aplikacije in storitve. Lokacija naprave bo morda kljub temu poslana službam za nujne primere, ko pokličete številko za klic v sili ali nanjo pošljete sporočilo SMS."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Preberite več o nastavitvah lokacije"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Če želite spremeniti, odprite nastavitve sistema ChromeOS > Zasebnost in varnost > Nastavitve zasebnosti > Dostop do lokacije"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Obraz in <xliff:g id="WATCH">%s</xliff:g> sta dodana"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Obraz, prstni odtis in <xliff:g id="WATCH">%s</xliff:g> so dodani"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Obraz, prstni odtisi in <xliff:g id="WATCH">%s</xliff:g> so dodani"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"To je potrebno, ker je preverjanje identitete vklopljeno"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Odklepanje storitve Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Ura je dodana"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Nastavitev ure"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Preberite več o odklepanju z uro."</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Dodaj uro"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Odstranitev ure"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Odklepanje s prstnim odtisom in obrazom"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Odklepanje z obrazom in prstnim odtisom"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Odklepanje z obrazom in prstnim odtisom za delo"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Potrebna je nastavitev"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Obraz in prstni odtisi so dodani."</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Namestite aplikacije"</b>\n"V zasebnem prostoru namestite aplikacije, za katere želite, da ostanejo zasebne"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Upoštevajte"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacije so ustavljene, ko zaklenete zasebni prostor"</b>\n"Ko zaklenete zasebni prostor, so aplikacije v njem ustavljene in s tem tudi prejemanje njihovih obvestil"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Zasebni prostori niso primerni za aplikacije, ki se morajo izvajati v ozadju ali pošiljajo nujna obvestila. Mednje sodijo na primer zdravstvene aplikacije. To je zato, ker so obvestila in dejavnost v ozadju ustavljeni, kadar je prostor zaklenjen.\n\nAplikacije v zasebnem prostoru ne bodo prikazane v upravitelju dovoljenj, na nadzorni plošči za zasebnost in v drugih nastavitvah, kadar je zasebni prostor zaklenjen.\n\nZasebnega prostora ni mogoče premakniti v novo napravo. Če želite zasebni prostor uporabljati v drugi napravi, morate nastaviti novega.\n\nVsakdo, ki vašo napravo poveže z računalnikom ali v napravo namesti škodljive aplikacije, bo morda lahko dostopal do vašega zasebnega prostora."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Zasebni prostori niso primerni za aplikacije, ki se morajo izvajati v ozadju ali pošiljajo nujna obvestila. Mednje sodijo na primer zdravstvene aplikacije. To je zato, ker so obvestila in dejavnost v ozadju ustavljeni, kadar je prostor zaklenjen.\n\nAplikacije v zasebnem prostoru ne bodo prikazane v upravitelju dovoljenj, na nadzorni plošči za zasebnost in v drugih nastavitvah, kadar je zasebni prostor zaklenjen.\n\nZasebnega prostora ni mogoče obnoviti v novo napravo. Če želite zasebni prostor uporabljati v drugi napravi, morate nastaviti novega.\n\nVsakdo, ki vašo napravo poveže z računalnikom ali v napravo namesti zlonamerne aplikacije, bo morda lahko dostopal do vašega zasebnega prostora."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Preberite več o zasebnem prostoru"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"To bo trajalo nekaj trenutkov"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Nastavljanje zasebnega prostora …"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vnovični zagon?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Podrobno zapisovanje dnevnika za NFC je namenjeno samo za razvoj. Dodatni podatki NFC so vključeni v poročilih o napakah, ki morda vsebujejo zasebne podatke. Če želite spremeniti to nastavitev, znova zaženite napravo."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Zaženi znova"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"zrcaljenje, zunanji zaslon, povezan zaslon, zaslon prek usb, ločljivost, vrtenje"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Vrtenje"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standardno"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Uporabi zaslonsko tipkovnico"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Obdrži na zaslonu, tudi ko je fizična tipkovnica aktivna."</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"V rumeni slog zapolnitve kazalca"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"V rožnati slog zapolnitve kazalca"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"V modri slog zapolnitve kazalca"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Slog poteze kazalca"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Bela"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Črna"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Brez"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Uporabniško izbrano: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Govor"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Hitrost kazalca"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Velikost kazalca"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Zmanjšanje velikosti kazalca"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Povečanje velikosti kazalca"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Krmilnik za igre"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Preusmeritev vibriranja"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Pošiljanje vibriranja v krmilnik za igre, ko je povezan"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Vseeno nadaljuj"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Prekliči"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavitve povečave"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Pomikanje z enim prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Premikanje lupe z enim prstom"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Po zaslonu se pomikate z vlečenjem prsta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Območje povečave premikajte z vlečenjem enega prsta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Območje povečave premikajte z vlečenjem dveh prstov."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ni na voljo pri povečavi samo dela zaslona"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Če želite povečati, se dotaknite gumba"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Hitro povečajte zaslon za povečavo vsebine."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Če želite povečati:</b><br/> {0,number,integer}. Z bližnjico vklopite povečavo.<br/> {1,number,integer}. Dotaknite se zaslona.<br/> {2,number,integer}. Po zaslonu se pomikajte z vlečenjem dveh prstov.<br/> {3,number,integer}. Stopnjo povečave prilagodite tako, da prsta razmaknete ali primaknete.<br/> {4,number,integer}. Z bližnjico izklopite povečavo.<br/><br/> <b>Povečavo začasno vklopite tako:</b><br/> {0,number,integer}. Prepričajte se, da je vrsta povečave nastavljena na celozaslonski način.<br/> {1,number,integer}. Z bližnjico vklopite povečavo.<br/> {2,number,integer}. Dotaknite se poljubne točke na zaslonu in jo pridržite.<br/> {3,number,integer}. Po zaslonu se pomikajte z vlečenjem prsta.<br/> {4,number,integer}. Dvignite prst, da izklopite povečavo."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Če želite povečati:</b><br/> {0,number,integer}. Z bližnjico vklopite povečavo.<br/> {1,number,integer}. Dotaknite se zaslona.<br/> {2,number,integer}. Po zaslonu se pomikajte z vlečenjem dveh prstov.<br/> {3,number,integer}. Stopnjo povečave prilagodite tako, da prsta razmaknete ali primaknete.<br/> {4,number,integer}. Z bližnjico izklopite povečavo.<br/><br/> Povečavo lahko tudi začasno povečate in drugo."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Če želite povečati:</b><br/> {0,number,integer}. Z bližnjico vklopite povečavo.<br/> {1,number,integer}. Dotaknite se zaslona.<br/> {2,number,integer}. Po zaslonu se pomikajte z vlečenjem enega ali dveh prstov.<br/> {3,number,integer}. Stopnjo povečave prilagodite tako, da prsta razmaknete ali primaknete.<br/> {4,number,integer}. Z bližnjico izklopite povečavo.<br/><br/> Povečavo lahko tudi začasno povečate in drugo."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Ko je povečava vklopljena, lahko povečate prikaz na zaslonu.\n\n"<b>"Če želite povečati prikaz"</b>", zaženite povečavo, nato pa se dotaknite poljubnega mesta na zaslonu.\n"<ul><li>"Povlecite z dvema ali več prsti po zaslonu, če se želite pomikati."</li>\n<li>"Primaknite ali razmaknite dva ali več prstov, če želite prilagoditi povečavo."</li></ul>\n\n<b>"Če želite začasno povečati prikaz"</b>", zaženite povečavo ter se dotaknite poljubnega mesta na zaslonu in ga pridržite.\n"<ul><li>"Povlecite, če se želite premikati po zaslonu."</li>\n<li>"Dvignite prst, če želite zmanjšati povečavo."</li></ul>\n\n"Povečava ni mogoča na tipkovnici ali v vrstici za krmarjenje."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. stran od <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Bližnjica gumba za dostopnost"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Noben}=1{Nastavljen je 1 razpored}one{Nastavljen je # razpored}two{Nastavljena sta # razporeda}few{Nastavljeni so # razporedi}other{Nastavljenih je # razporedov}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ne moti"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prednostni načini"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Dodajte način"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prejemajte samo obvestila pomembnih oseb in aplikacij."</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Izbira vrste aktiviranja"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Čas"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Primer: »9.30–17.00«"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Koledar"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Primer: »Osebni koledar«"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Ustvarjanje načina"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Po meri"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omejitev prekinitev"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Vklop načina »Ne moti«"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmi in zvoki predstavnosti lahko preglasijo"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Časovni razporedi"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Izbriši razporede"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Izbriši"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Preimenuj"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Izbriši"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Želite izbrisati način »<xliff:g id="MODE">%1$s</xliff:g>«?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Uredi"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Razporedi"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Razpored"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Dodajte koledar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Uporabite koledar"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Razpored"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Nastavitev razporeda"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Razpored"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Samodejni vklop"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Časovni razpored"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Utišanje telefona ob določenih urah"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Nastavitev pravil za način »Ne moti«"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Dovoljene zvočne motnje"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blokiranje vizualnih motenj"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Dovoli vizualne znake"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Obvestila, za katera ste dosegljivi"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Ostanite zbrani"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Dodatna dejanja"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Izklopljeno}=1{Izklopljeno / 1 način se lahko samodejno vklopi}one{Izklopljeno / # način se lahko samodejno vklopi}two{Izklopljeno / # načina se lahko samodejno vklopita}few{Izklopljeno / # načini se lahko samodejno vklopijo}other{Izklopljeno / # načinov se lahko samodejno vklopi}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Nastavitve zaslona"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Možnosti prikaza"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Sivine"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"omogoči temno temo"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Preklopite nastavitev operacijskega sistema in aplikacij na svetlo besedilo na temnem ozadju, saj je to manj naporno za oči in v nekaterih napravah bistveno prispeva k varčevanju z energijo baterije"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Brez sprememb prikaza}=1{{effect_1}}=2{{effect_1} in {effect_2}}=3{{effect_1}, {effect_2} in {effect_3}}one{{effect_1}, {effect_2} in še #}two{{effect_1}, {effect_2} in še #}few{{effect_1}, {effect_2} in še #}other{{effect_1}, {effect_2} in še #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtriraj prekinitve"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nobene prekinitve niso filtrirane"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Možnosti prikaza za filtrirana obvestila"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Ko je vklopljen način »Ne moti«"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Brez zvočnega opozarjanja na obvestila"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"odpiranje obvestila"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Omogoči prelaganje obvestil"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Obvestilna pika na ikoni aplikacije"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Svežnji obvestil"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Oblački"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Oblački"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Prikaži ta pogovor v oblačku"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ta aplikacija ne podpira naprednih nastavitev."</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Več nastavitev"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Več nastavitev je na voljo v tej aplikaciji."</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Zmanjševanje glasnosti za obvestila"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorije"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Drugo"</string>
<string name="no_channels" msgid="4716199078612071915">"Ta aplikacija ni objavila nobenih obvestil."</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Pokaži neuporabljene kategorije"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Dodatne nastavitve v aplikaciji"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Pokaži neuporabljene kategorije"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Skrij neuporabljene kategorije"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacije, ki lahko zmotijo"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Izbrane aplikacije"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Nobena"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Vse"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Izberite več aplikacij"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nič ne sme preglasiti"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Nihče ne sme preglasiti"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Nekatere osebe lahko preglasijo"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Vsakdo lahko preglasi"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Klicatelji, ki večkrat kličejo"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Dovoli večkratne klicatelje"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Sprememba na samo alarme za eno uro do {time}}one{Sprememba na samo alarme za # uro do {time}}two{Sprememba na samo alarme za # uri do {time}}few{Sprememba na samo alarme za # ure do {time}}other{Sprememba na samo alarme za # ur do {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Sprememba na samo alarme do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Sprememba na vedno prekini"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Urejanje načina"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Dodajanje 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="warning_button_text" msgid="1274234338874005639">"Opozorilo"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Zapri"</string>
<string name="device_feedback" msgid="5351614458411688608">"Povratne informacije o tej napravi"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Ovitek"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterija"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Podokno nastavitev"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Vsili namizni način"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Vsili poskusni namizni način na sekundarnih zaslonih."</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Omogoči okna svobodne oblike"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Omogoči podporo za okna svobodne oblike."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Omogoči okna svobodne oblike na drugem zaslonu"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Omogoči okna svobodne oblike samo na sekundarnem zaslonu."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Omogoči okna nespremenljive velikosti v načinu z več okni"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Omogoča uporabo aplikacij brez možnosti spreminjanja velikosti v načinu z več okni."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Preglasi vsiljenje temnega načina"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Preden začnete uporabljati 16-kilobajtno možnost za razvijalce, je treba podatkovno particijo te naprave pretvoriti v sistem ext4. 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. Aktiviranje 16-kilobajtne možnosti bo po tem vnovičnem zagonu terjalo še enega. Ko ste v tem načinu, lahko preklapljate med 4-kilobajtnim in 16-kilobajtnim načinom z enim vnovičnim zagonom. V teh načinih bodo nekatere funkcije onemogočene, zato nekatere aplikacije morda ne bodo delovale. Če želite napravo povrniti v način za splošno razpoložljivost, morate preklopiti nazaj na 4-kilobajtni način in zakleniti zagonski nalagalnik, s čimer ponastavite napravo na tovarniške nastavitve. Ko se naprava uspešno zažene v sistemu Android, v možnostih za razvijalce onemogočite odklepanje OEM. Podatki v napravi bodo izbrisani in podatkovni sistem bo po potrditvi spremenjen v sistem ext4. Ko se to dokonča, se vrnite in znova omogočite 16-kilobajtni način."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Izbriši vse podatke"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Formatiranje v sistem ext4 in brisanje particije s podatki ni uspelo."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Za 16-kilobajtni način je obvezno odklepanje zagonskega nalagalnika"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Potrebno je odklepanje zagonskega nalagalnika"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Preden začnete uporabljati 16-kilobajtno možnost za razvijalce, morate v tej napravi odkleniti zagonski nalagalnik. Celovitosti programske opreme v tem načinu ni mogoče zajamčiti in vsi podatki, shranjeni v telefonu, medtem ko je zagonski zaganjalnik odklenjen, so morda ogroženi. Vsi podatki uporabnika in nastavitve bodo pri aktiviranju 16-kilobajtnega načina izbrisani. Ko je zagonski nalagalnik odklenjen, aktiviranje 16-kilobajtne možnosti terja dva vnovična zagona. Ko ste v tem načinu, lahko preklapljate med 4-kilobajtnim in 16-kilobajtnim načinom z enim vnovičnim zagonom. V teh načinih bodo nekatere funkcije onemogočene, zato nekatere aplikacije morda ne bodo delovale. Če želite napravo povrniti v način za splošno razpoložljivost, morate preklopiti nazaj na 4-kilobajtni način in nato napravo zakleniti z zaklepanjem OEM oziroma v napravi zakleniti zagonski nalagalnik (s čimer se sproži ponastavitev na tovarniške nastavitve). Odklenite zagonski nalagalnik in poskusite znova. Navodila za ta postopek so na voljo na <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Uporaba 4-kilobajtnega načina, neodvisnega od velikosti strani"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ste v 4-kilobajtnem načinu, neodvisnem 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 želite znova v način za splošno razpoložljivost, morate zakleniti zagonski nalagalnik naprave. Dotaknite se, če želite prebrati več."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ste v 4-kilobajtnem načinu, neodvisnem 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 želite znova v način za splošno razpoložljivost, morate zakleniti zagonski nalagalnik naprave. S tem znova ponastavite napravo 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ali uporabite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> in izberite možnosti »Wipe Device«, »Lock Bootloader« in »Force Flash all partitions.«"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Uporaba 16-kilobajtnega načina, neodvisnega od velikosti strani"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Ste v 16-kilobajtnem načinu, neodvisnem 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 želite znova v način za splošno razpoložljivost, morate preklopiti nazaj na 4-kilobajtni način, nato pa morate zakleniti zagonski nalagalnik naprave. Dotaknite se, če želite prebrati več."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Ste v 16-kilobajtnem načinu, neodvisnem 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 zaganjalnik odklenjen, so morda ogroženi. V teh načinih bodo nekatere funkcije onemogočene, zato nekatere aplikacije morda ne bodo delovale. Če želite znova v tovarniški način, morate preklopiti nazaj na 4-kilobajtni način, nato pa morate zakleniti zagonski nalagalnik naprave. S tem znova ponastavite napravo na tovarniške nastavitve. 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ali uporabite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> in izberite možnosti »Wipe Device«, »Lock Bootloader« in »Force Flash all partitions.«"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Dotaknite se, če želite prebrati več."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ali uporabite <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Rutina za obravnavo poročila o napakah"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Uporabi pripenjanje aplikacije"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Uporabi možnosti za razvijalce"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Uporabi storitev tiskanja"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Dovoli več uporabnikov"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Dovoli preklop uporabnikov"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"dovoli, več, uporabnik, dovoljenje"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"več, uporabniki, profili, osebe, računi, preklopi, veliko"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Uporabi brezžično odpravljanje napak"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Izberite, kaj bo prikazano na zaslonu, ko je tablični računalnik priklopljen na nosilec. Naprava bo med uporabo ohranjevalnika zaslona morda porabljala več energije."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Prilagodi"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Prilagajanje ohranjevalnika zaslona <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Če želite omogočiti podporo za svobodno obliko, morate znova zagnati napravo."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Če želite vsiliti namizni način na sekundarnih zaslonih, morate znova zagnati napravo."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Če želite omogočiti podporo za okna svobodne oblike starejše različice, morate znova zagnati napravo."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Če želite spremeniti podporo za okna svobodne oblike, morate znova zagnati napravo."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Če želite vsiliti okna svobodne oblike na sekundarnih zaslonih, morate znova zagnati napravo."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Znova zaženi"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Znova zaženi pozneje"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Prostorski zvok"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Vklopljeno"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Izklopljeno"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Vklopljeno"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Zvok: %1$d%% levo, %2$d%% desno"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Zvok: %1$d%% desno, %2$d%% levo"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Ime naprave je vidno aplikacijam, ki ste jih namestili. Ko vzpostavite povezavo z napravami Bluetooth ali omrežjem Wi-Fi ali nastavite dostopno točko Wi-Fi, ga bodo morda videle tudi druge osebe."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Slovnični spol"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Izbira slovničnega spola"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Iskanje po nastavitvah"</string>
</resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index c1adaba..e034cc0 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Orari i gjumit"</item>
+ <item msgid="4152450357280759894">"Udhëtim me makinë"</item>
+ <item msgid="7096549258219399423">"Përfshirës"</item>
+ <item msgid="2760716776980432977">"I menaxhuar"</item>
+ <item msgid="601734478369121764">"Yll"</item>
+ <item msgid="6243809315432780521">"Kalendari"</item>
+ <item msgid="4913577903148415331">"Koha"</item>
+ <item msgid="3653377604690057780">"Teatri"</item>
+ <item msgid="3843711267408385410">"Lule"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 4667216..479a4d1 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Të shkëputet pajisja?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Çifto pajisjen e re"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivizo automatikisht 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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Cilësimet e pajisjes ndihmëse për dëgjimin"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shkurtore, përputhshmëria me aparatet e dëgjimit"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Paravendosja"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Nuk ka paravendosje të programuara nga audiologu yt"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Paravendosja nuk mund të përditësohej"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Dalja e audios"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Rreth daljes së audios"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Joaktiv"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Aktive / # aplikacion ka qasje te vendndodhja}other{Aktive / # aplikacione kanë qasje te vendndodhja}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Po ngarkohet…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Aplikacionet me lejen \"Pajisjet në afërsi\" mund të përcaktojnë pozicionin e përafërt të pajisjeve të lidhura."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Aplikacionet me lejen për pajisjet në afërsi mund të përcaktojnë pozicionin e përafërt të pajisjeve të lidhura."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Qasja te vendndodhja është joaktive për aplikacionet dhe shërbimet. Vendndodhja e pajisjes sate mund t\'u dërgohet përsëri personave që përgjigjen në rast urgjence kur telefonon ose dërgon mesazh te një numër urgjence."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Mëso më shumë për \"Cilësimet e vendndodhjes\""</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Për ta ndryshuar, shko te Cilësimet e ChromeOS > Privatësia dhe siguria > Kontrollet e privatësisë > Qasja te vendndodhja"</string>
@@ -383,7 +383,7 @@
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2" msgid="2580899232734177771">"Si funksionon"</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2" msgid="5909924864816776516">"\"Shkyçja me gjurmën e gishtit\" krijon një model unik të gjurmës sate të gishtit për të verifikuar që je ti. Për ta krijuar këtë model të gjurmës së gishtit gjatë konfigurimit, duhet t\'i regjistrosh nga pozicione të ndryshme imazhet e gjurmës sate të gishtit."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2" msgid="3493356605815124807">"\"Shkyçja me gjurmën e gishtit\" krijon një model unik të gjurmës së gishtit të fëmijës tënd për të verifikuar që është ai. Për ta krijuar këtë model të gjurmës së gishtit gjatë konfigurimit, ajo duhet t\'i regjistrojë nga pozicione të ndryshme imazhet e gjurmës sate të gishtit."</string>
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"Për rezultate më të mira, përdor një mbrojtës ekrani që është i certifikuar si i \"Prodhuar për Google\". Me mbrojtës të tjerë ekrani, gjurma jote e gishtit mund të mos funksionojë."</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_6" msgid="5314031490467481499">"Për rezultatet më të mira, përdor një mbrojtës ekrani që është i certifikuar me \"Prodhuar për Google\". Me mbrojtës të tjerë ekrani, gjurma jote e gishtit mund të mos funksionojë."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_6" msgid="3563942520716110478">"Për rezultate më të mira, përdor një mbrojtës ekrani që është i certifikuar nga \"Prodhuar për Google\". Me mbrojtës të tjerë ekrani, gjurma e gishtit e fëmijës tënd mund të mos funksionojë."</string>
<string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more" msgid="5856010507790137793"></string>
<string name="security_settings_activeunlock_preference_title" msgid="4257580421087062228">"Shkyçja me orë"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Fytyra dhe <xliff:g id="WATCH">%s</xliff:g> u shtuan"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Fytyra, gjurma e gishtit dhe <xliff:g id="WATCH">%s</xliff:g> u shtuan"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Fytyra, gjurmët e gishtave dhe <xliff:g id="WATCH">%s</xliff:g> u shtuan"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Kjo nevojitet sepse \"Kontrolli i identitetit\" është aktiv"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Shkyçja me vërtetuesin në distancë"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Ora u shtua"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Konfiguro orën tënde"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Mëso më shumë rreth \"Shkyçjes me orë\""</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Shto orën"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Hiq orën"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Shkyçja me gjurmë gishti dhe me fytyrë"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Shkyçja me fytyrë dhe me gjurmën e gishtit"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Shkyçja me fytyrë dhe gjurmë gishti për profilin e punës"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Nevojitet konfigurimi"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Fytyra dhe gjurmët e gishtave u shtuan"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Instalo aplikacionet"</b>\n"Instalo aplikacionet që dëshiron t\'i mbash private në hapësirën tënde"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Ki parasysh"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Aplikacionet ndalojnë kur ti e kyç hapësirën"</b>\n"Kur e kyç hapësirën, aplikacionet në hapësirën tënde ndalojnë dhe nuk do të marrësh njoftime nga ato"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Hapësirat private nuk janë të përshtatshme për aplikacionet që ekzekutohen në sfond ose që dërgojnë njoftime kritike, si p.sh. për aplikacionet mjekësore. Kjo ndodh sepse njoftimet dhe aktiviteti në sfond ndalojnë kur hapësira jote kyçet.\n\nAplikacionet në hapësirën tënde private nuk do të shfaqen te menaxheri i lejeve, paneli i privatësisë dhe cilësime të tjera kur hapësira jote private kyçet.\n\nHapësira jote private nuk mund të zhvendoset në një pajisje të re. Do të duhet të konfigurosh një hapësirë tjetër private nëse dëshiron ta përdorësh atë në një pajisje tjetër.\n\nÇdo person që e lidh pajisjen tënde me një kompjuter ose instalon aplikacione të dëmshme në pajisjen tënde mund të jetë në gjendje që të qaset në hapësirën tënde private."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Hapësirat private nuk janë të përshtatshme për aplikacionet që ekzekutohen në sfond ose që dërgojnë njoftime kritike, si p.sh. për aplikacionet mjekësore. Kjo ndodh sepse njoftimet dhe aktiviteti në sfond ndalojnë kur hapësira jote kyçet.\n\nAplikacionet në hapësirën tënde private nuk do të shfaqen te menaxheri i lejeve, paneli i privatësisë dhe cilësime të tjera kur hapësira private kyçet.\n\nHapësira jote private nuk mund të restaurohet në një pajisje të re. Do të duhet të konfigurosh një hapësirë tjetër nëse dëshiron ta përdorësh atë në një pajisje tjetër.\n\nÇdo person që e lidh pajisjen tënde me një kompjuter ose instalon aplikacione keqdashëse në pajisjen tënde mund të jetë në gjendje që të qaset në hapësirën tënde private."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Mëso më shumë rreth hapësirës private"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Kjo do të zgjasë disa minuta"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Hapësira private po konfigurohet…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Të riniset pajisja?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Regjistrimi i detajuar i lidhjes NFC është i planifikuar vetëm për qëllime zhvillimi. Të dhënat shtesë të lidhjes NFC përfshihen në raportet e defekteve në kod, të cilat mund të përmbajnë informacione private. Rinise pajisjen tënde për ta ndryshuar këtë cilësim."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Rinis"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"pasqyro, ekrani i jashtëm, ekrani i lidhur, ekrani me usb, rezolucioni, rrotullimi"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rrotullimi"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Përdor tastierën në ekran"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Mbaje në ekran ndërsa tastiera fizike është aktive"</string>
<string name="bounce_keys" msgid="7419450970351743904">"Tastet e kërcimit"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Ndrysho stilin e mbushjes së treguesit në të verdhë"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Ndrysho stilin e mbushjes së treguesit në rozë"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Ndrysho stilin e mbushjes së treguesit në blu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stili i lëvizjes së treguesit"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"E bardhë"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"E zezë"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Asnjë"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Zgjedhur nga përdoruesi: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Ligjërimi"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Shpejtësia e treguesit"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Shkalla e treguesit"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Zvogëlo shkallën e treguesit"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Rrit shkallën e treguesit"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Kontrolluesi i lojës"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Ridrejto dridhjen"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Dërgoji dridhjet te kontrolluesi i lojës kur të lidhet"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Vazhdo gjithsesi"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Anulo"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cilësimet e zmadhimit"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Zgjerimi me një gisht"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Zhvendos zmadhuesin me 1 gisht"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Zvarrit 1 gisht për të lëvizur nëpër ekran"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Zhvendos zonë e zmadhimit duke zvarritur një gisht."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Zhvendos zonën e zmadhimit duke zvarritur dy gishta."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Nuk ofrohet kur zmadhohet vetëm një pjesë e ekranit"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Trokit te një buton për të zmadhuar"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zmadho me shpejtësi në ekran për ta bërë përmbajtjen më të madhe"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Për të zmadhuar:</b><br/> {0,number,integer}. Përdor shkurtoren për të filluar zmadhimin<br/> {1,number,integer}. Trokit në ekran<br/> {2,number,integer}. Zvarrit 2 gishta për të lëvizur nëpër ekran<br/> {3,number,integer}. Bashko 2 gishta për të rregulluar zmadhimin<br/> {4,number,integer}. Përdor shkurtoren për të ndaluar zmadhimin<br/><br/><b>Për ta zmadhuar përkohësisht:</b><br/> {0,number,integer}. Sigurohu që lloji i zmadhimit të jetë caktuar në ekran të plotë<br/> {1,number,integer}. Përdor shkurtoren për të filluar zmadhimin<br/> {2,number,integer}. Prek dhe mbaj shtypur diku në ekran<br/> {3,number,integer}. Zvarrit gishtin për të lëvizur nëpër ekran<br/> {4,number,integer}. Ngrije gishtin për të ndaluar zmadhimin"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Për të zmadhuar:</b><br/> {0,number,integer}. Përdor shkurtoren për të filluar zmadhimin<br/> {1,number,integer}. Trokit në ekran<br/> {2,number,integer}. Zvarrit 2 gishta për të lëvizur nëpër ekran<br/> {3,number,integer}. Bashko 2 gishta për të rregulluar zmadhimin<br/> {4,number,integer}. Përdor shkurtoren për të ndaluar zmadhimin<br/><br/> Mund ta zmadhosh gjithashtu përkohësisht dhe më shumë."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Për të zmadhuar:</b><br/> {0,number,integer}. Përdor shkurtoren për të filluar zmadhimin<br/> {1,number,integer}. Trokit në ekran<br/> {2,number,integer}. Zvarrit 1 ose 2 gishta për të lëvizur nëpër ekran<br/> {3,number,integer}. Bashko 2 gishta për të rregulluar zmadhimin<br/> {4,number,integer}. Përdor shkurtoren për të ndaluar zmadhimin<br/><br/> Mund ta zmadhosh gjithashtu përkohësisht dhe më shumë."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kur aktivizohet zmadhimi, mund të zmadhosh mbi ekranin tënd.\n\n"<b>"Për të zmadhuar"</b>", nis zmadhimin, më pas trokit diku në ekran.\n"<ul><li>"Zvarrit 2 ose më shumë gishta për të lëvizur"</li>\n<li>"Afro 2 ose më shumë gishta për të rregulluar zmadhimin"</li></ul>\n\n<b>"Për të zmadhuar përkohësisht"</b>", nis zmadhimin dhe më pas prek dhe mbaj të shtypur diku në ekran.\n"<ul><li>"Zvarrit për të lëvizur nëpër ekran"</li>\n<li>"Ngri gishtin për të zvogëluar"</li></ul>\n\n"Nuk mund të zmadhosh te tastiera ose shiriti i navigimit."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Faqja <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> nga <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Shkurtorja e butonit të qasshmërisë"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Asnjë}=1{1 orar i caktuar}other{# orare të caktuara}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Mos shqetëso"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Modalitetet e përparësisë"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Shto një modalitet"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Merr njoftime vetëm nga aplikacionet dhe personat e rëndësishëm"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Zgjidh llojin e aktivizimit"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Ora"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Për shembull, \"9:30 - 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendari"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Për shembull, \"Kalendari personal\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Krijo një modalitet"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"I personalizuar"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kufizo ndërprerjet"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivizo \"Mos shqetëso\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarmet dhe tingujt e medias mund ta ndërpresin"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Oraret"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Fshi oraret"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Fshi"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Riemërto"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Fshi"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Të fshihet modaliteti \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Redakto"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Oraret"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Orari"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Shto një kalendar"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Përdor kalendarin tënd"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Orari"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Cakto një orar"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Orari"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> orë e <xliff:g id="MINUTES">%2$d</xliff:g> min."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Aktivizo automatikisht"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Orari"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Vendose telefonin në heshtje në kohë të caktuara"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Cakto rregullat për \"Mos shqetëso\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Lejo ndërprerjet që lëshojnë tinguj"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blloko shqetësimet vizuale"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Lejo sinjalet vizuale"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Njoftimet që mund të marrësh"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Ruaj përqendrimin"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Veprime të tjera"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Joaktiv}=1{Joaktiv / 1 modalitet mund të aktivizohet automatikisht}other{Joaktiv / # modalitete mund të aktivizohen automatikisht}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Cilësimet e ekranit"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Opsionet e paraqitjes"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Nuancat e grisë"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"aktivizo temën e errët"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Bëj që sistemi operativ dhe aplikacionet të preferojnë tekstin e ndriçuar mbi sfond të errët, gjë që mund të jetë më e lehtë për sytë dhe të mundësojë një kursim të konsiderueshëm të baterisë në disa pajisje"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Asnjë ndryshim i paraqitjes}=1{{effect_1}}=2{{effect_1} dhe {effect_2}}=3{{effect_1}, {effect_2} dhe {effect_3}}other{{effect_1}, {effect_2} dhe # të tjera}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtro ndërprerjet"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Nuk filtrohet asnjë ndërprerje"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Opsionet e paraqitjes për njoftimet e filtruara"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kur modaliteti \"Mos shqetëso\" është aktiv"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Asnjë tingull nga njoftimet"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"hap njoftimin"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Lejo shtyrjen e njoftimeve"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Pika e njoftimit në ikonën e aplikacionit"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Paketat e njoftimeve"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Flluskat"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Flluskat"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Vendos bisedën në flluskë"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ky aplikacion nuk i mbështet cilësimet e përmirësuara"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Cilësime të tjera"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Brenda këtij aplikacioni ofrohen cilësime të tjera"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Reduktimi i njoftimeve"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategoritë"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Të tjera"</string>
<string name="no_channels" msgid="4716199078612071915">"Ky aplikacion nuk ka postuar asnjë njoftim"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Shfaq kategoritë e papërdorura"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Cilësime shtesë në aplikacion"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Shfaq kategoritë e papërdorura"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Fshih kategoritë e papërdorura"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Aplikacionet që mund ta ndërpresin"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Aplikacionet e zgjedhura"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Asnjë"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Të gjitha"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Asnjë aplikacion nuk mund të ndërpresë}=1{{app_1} mund të ndërpresë}=2{{app_1} dhe {app_2} mund të ndërpresin}=3{{app_1}, {app_2} dhe {app_3} mund të ndërpresin}other{{app_1}, {app_2} dhe # aplikacione të tjera mund të ndërpresin}}"</string>
+ <string name="zen_mode_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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Zgjidh më shumë aplikacione"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Asgjë nuk mund ta ndërpresë"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Askush nuk mund ta ndërpresë"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Disa persona mund ta ndërpresin"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Të gjithë kontaktet mund ta ndërpresin"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Telefonuesit e përsëritur"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Lejo telefonuesit e përsëritur"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ndrysho vetëm tek alarmet për një orë deri në {time}}other{Ndrysho vetëm tek alarmet për # orë deri në {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ndrysho në gjendjen \"vetëm alarmet\" deri në <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Ndrysho te \"ndërprit gjithmonë\""</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Modifiko modalitetin"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Shto modalitetin"</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="warning_button_text" msgid="1274234338874005639">"Paralajmërim"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Mbyll"</string>
<string name="device_feedback" msgid="5351614458411688608">"Dërgo komente për këtë pajisje"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Kasa"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Bateria"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Paneli i \"Cilësimeve\""</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Detyro \"modalitetin e desktopit\""</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Detyro \"modalitetin e desktopit\" eksperimental në ekrane dytësore"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktivizo dritaret me formë të lirë"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktivizo mbështetjen për dritaret me formë të lirë."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktivizo dritare me formë të lirë në ekran të dytë"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktivizo dritaret me formë të lirë vetëm në ekranin e dytë."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivizo aplikacionet me madhësi jo të ndryshueshme në modalitetin me shumë dritare"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Lejon që aplikacionet me madhësi jo të ndryshueshme të shfaqen në modalitetin me shumë dritare"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Anulo detyrimin e errësimit"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Ndarja e të dhënave të kësaj pajisjeje duhet të konvertohet në ext4 para se të përdoret opsioni i zhvilluesit 16 KB. 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. Aktivizimi i opsioni 16 KB do të kërkojë një rinisje tjetër pas kësaj. Pasi të jesh në këtë modalitet, mund t\'i ndërrosh modalitetet 4 KB dhe 16 KB me vetëm një rinisje. Disa veçori do të çaktivizohen në këto modalitete, kështu që disa aplikacione mund të mos funksionojnë. Për ta kthyer pajisjen në modalitetin e prodhimit, do të duhet që të kthehesh përsëri në modalitetin 4 KB dhe të kyçësh më pas ngarkuesin e fillimit, i cili e rivendos pajisjen në gjendje fabrike. Pasi pajisja të niset me sukses në Android, çaktivizo shkyçjen e OEM-së tek \"Opsionet e zhvilluesit\". Pajisja do të pastrohet dhe sistemi i skedarëve do të ndryshohet në ext4 pas konfirmimit. Pasi të përfundojë kjo, kthehu për të aktivizuar përsëri 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Spastro të gjitha të dhënat"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Riformatimi dhe pastrimi i ndarjes së të dhënave në ext4 dështoi."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Shkyçja e ngarkuesit të fillimit kërkohet për modalitetin 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Kërkohet shkyçja e ngarkuesit të fillimit"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Kjo pajisje duhet ta ketë të shkyçur ngarkuesin e fillimit para se të përdoret opsioni i zhvilluesit 16 KB. 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. Të gjitha të dhënat dhe cilësimet e përdoruesit do të pastrohen kur të aktivizohet modaliteti 16 KB. Kur të shkyçet ngarkuesi i fillimit, aktivizimi i opsionit 16 KB do të kërkojë dy rinisje. Pasi të jesh në këtë modalitet, mund t\'i ndërrosh modalitetet 4 KB dhe 16 KB me vetëm një rinisje. Disa veçori do të çaktivizohen në këto modalitete, kështu që disa aplikacione mund të mos funksionojnë. Për ta kthyer pajisjen në modalitetin e prodhimit, do të duhet që të kthehesh përsëri në modalitetin 4 KB dhe më pas të kyçësh OEM-në/ngarkuesin e fillimit (që e rivendos pajisjen në gjendje fabrike). Shkyçe ngarkuesin e fillimit dhe provo përsëri. Mund t\'i shikosh udhëzimet se si ta bësh këtë në <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Po përdor modalitetin 4 KB të pavarësisë nga madhësia e faqes"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Je në modalitetin 4 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ë kyçësh ngarkuesin e fillimit të pajisjes. Trokit për të lexuar më shumë."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Je në modalitetin 4 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ë 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ose përdor <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dhe zgjidh \"Pastro pajisjen\", \"Kyç ngarkuesin e fillimit\" dhe \"Riinstalo me forcë të gjitha ndarjet\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Po përdor modalitetin 16 KB të pavarësisë nga madhësia e faqes"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Trokit për të lexuar më shumë."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ose përdor <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> dhe zgjidh \"Pastro pajisjen\", \"Kyç ngarkuesin e fillimit\" dhe \"Riinstalo me forcë të gjitha ndarjet\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Trokit për të lexuar më shumë."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> ose përdor <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Administruesi i raportit të defekteve në kod"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Përdor gozhdimin e aplikacionit"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Përdor opsionet e zhvilluesit"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Përdor shërbimin e printimit"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Lejo disa përdorues"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Lejo ndërrimin e përdoruesit"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"lejo, disa, përdorues, leje, shumë"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"disa, përdorues, profile, persona, llogari, shumë"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Përdor korrigjimin përmes Wi-Fi"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Zgjidh se çfarë do të shohësh në ekranin tënd kur tableti të jetë lidhur me stacionin. Pajisja jote mund të përdorë më shumë energji kur përdoret një mbrojtës ekrani."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Personalizo"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Të personalizosh <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Kërkohet të rindizet për të aktivizuar mbështetjen në formë të lirë."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Kërkohet të rindizet për të detyruar modalitetin e desktopit në ekranet dytësore."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Kërkohet rindezja për të aktivizuar mbështetjen për dritaret me formë të lirë të versionit të vjetër."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Kërkohet rindezja për të ndryshuar mbështetjen për dritaret me formë të lirë."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Kërkohet rindezja për të detyruar dritaret me formë të lirë në ekranet dytësore."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Rindize tani"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Rindize më vonë"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Audio hapësinore"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Aktivizuar"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Çaktivizuar"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Aktivizuar"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audioja %1$d%% majtas, %2$d%% djathtas"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audioja %1$d%% djathtas, %2$d%% majtas"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Emri i pajisjes sate është i dukshëm për aplikacionet që ke instaluar. Ai mund të shikohet po ashtu nga persona të tjerë kur lidhesh me pajisje me Bluetooth, kur lidhesh me një rrjet Wi-Fi ose kur konfiguron një zonë të qasjes për internet me Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Gjinia gramatikore"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Zgjidh gjininë gramatikore"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Kërko te cilësimet"</string>
</resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index ad421a1..c85ed85 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Време за спавање"</item>
+ <item msgid="4152450357280759894">"Вожња"</item>
+ <item msgid="7096549258219399423">"Имерзивно"</item>
+ <item msgid="2760716776980432977">"Управљано"</item>
+ <item msgid="601734478369121764">"Звезда"</item>
+ <item msgid="6243809315432780521">"Календар"</item>
+ <item msgid="4913577903148415331">"Време"</item>
+ <item msgid="3653377604690057780">"Позориште"</item>
+ <item msgid="3843711267408385410">"Цвет"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 146d148..014fc87 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Прекидате везу са уређајем?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Упарите нови уређај"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Аутоматски укључи сутра"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Подешавања слушног апарата"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Пречица, компатибилност са слушним апаратима"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Задата подешавања"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Не постоје задата подешавања која је програмирао аудиолог"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ажурирање задатих подешавања није успело"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудио излаз"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"О аудио излазу"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Искључено"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Укључено/# апликација има приступ локацији}one{Укључено/# апликација има приступ локацији}few{Укључено/# апликације имају приступ локацији}other{Укључено/# апликација има приступ локацији}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Учитава се…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Апликације са дозволом за уређаје у близини могу да одреде приближан положај повезаних уређаја."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Апликације са дозволом за уређаје у близини могу да одреде приближни положај повезаних уређаја."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Приступ локацији је искључен за апликације и услуге. Локација уређаја може и даље да се шаље екипама хитних служби када позовете број за хитне случајеве или пошаљете SMS на њега."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Сазнајте више о подешавањима локације"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Да бисте то променили, на ChromeOS-у отворите Подешавања > Безбедност и приватност > Контроле приватности > Приступ локацији"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Додати су лице и <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Додати су лице, отисак прста и <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Додати су лице, отисци прстију и <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"То је потребно јер је укључена провера идентитета"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Откључавање уз Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Сат је додат"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Подесите сат"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Сазнајте више о откључавању сата"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Додај сат"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Уклони сат"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Отисак прста и откључавање лицем"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Откључавање лицем и отиском прста"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Откључавање лицем и отиском прста за посао"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Треба да подесите"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Лице и отисци прста су додати"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Инсталирајте апликације"</b>\n"Апликације за које желите да буду приватне инсталирајте у простору"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Имајте на уму"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Апликације се заустављају када закључате простор"</b>\n"Када закључате простор, апликације у њему се заустављају и не шаљу вам обавештења"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Приватни простори нису погодни за апликације које треба да раде у позадини или шаљу важна обавештења, попут медицинских апликација. Разлог је то што се обавештења и активности у позадини заустављају када је простор закључан.\n\nАпликације у приватном простору се неће приказивати у менаџеру дозвола, на контролној табли за приватност ни у другим подешавањима када је приватан простор закључан.\n\nПриватан простор не можете да преместите на нови уређај. Морате да подесите други приватан простор ако желите да га користите на другом уређају.\n\nСвако ко ваш уређај повеже са рачунаром или на њега инсталира штетне апликације, моћи ће да приступи вашем приватном простору."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Приватни простори нису погодни за апликације које треба да раде у позадини или шаљу важна обавештења, попут медицинских апликација. Разлог је то што се обавештења и активности у позадини заустављају када је простор закључан.\n\nАпликације у приватном простору се неће приказивати у менаџеру дозвола, на контролној табли за приватност ни у другим подешавањима када је приватан простор закључан.\n\nПриватан простор не можете да вратите на нови уређај. Морате да подесите други простор ако желите да га користите на другом уређају.\n\nСвако ко ваш уређај повеже са рачунаром или на њега инсталира злонамерне апликације, моћи ће да приступи вашем приватном простору."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Сазнајте више о приватном простору"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Потрајаће неколико тренутака"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Подешава се приватни простор…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Желите да рестартујете уређај?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"NFC евидентирање детаља је намењено само у сврхе програмирања. Додатни NFC подаци уврштени су у извештаје о грешкама, који могу да садрже приватне податке. Рестартујте уређај да бисте променили ово подешавање."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Рестартуј"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"пресликати, спољни екран, повезани екран, usb екран, резолуција, ротација"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Ротација"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Стандардно"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Користи тастатуру на екрану"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Задржава се на екрану док је физичка тастатура активна"</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> ms"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Промените стил попуне у жуто"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Промените стил попуне у розе"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Промените стил попуне у плаво"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Стил потеза показивача"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Бело"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Црно"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ништа"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Изабрао је корисник: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Говор"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Брзина показивача"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Величина показивача"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Смањите величину показивача"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Повећајте величину показивача"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Контролер за игре"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Преусмери вибрацију"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Преусмери вибрацију на контролер за игре када је повезан"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Ипак настави"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Откажи"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Подешавања увећања"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Померање једним прстом"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Померите лупу 1 прстом"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Превлачите 1 прст за кретање по екрану"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Померајте област за увећање превлачењем једног прста."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Померајте област за увећање превлачењем два прста."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Није доступно када се увећава само део екрана"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Додирните дугме да бисте зумирали"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Брзо увећајте екран да би садржај био већи"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Да бисте увећали:</b><br/> {0,number,integer}. Користите пречицу да бисте покренули увећање<br/> {1,number,integer}. Додирните екран<br/> {2,number,integer}. Превлачите помоћу 2 прста да бисте се кретали по екрану<br/> {3,number,integer}. Скупите 2 прста да бисте прилагодили зумирање<br/> {4,number,integer}. Користите пречицу да бисте зауставили увећање<br/><br/> <b>Да бисте привремено увећали:</b><br/> {0,number,integer}. Уверите се да је тип увећања подешен на цео екран<br/> {1,number,integer}. Користите пречицу да бисте покренули увећање<br/> {2,number,integer}. Додирните и задржите било који део екрана<br/> {3,number,integer}. Превлачите прст да бисте се кретали по екрану<br/> {4,number,integer}. Подигните прст да бисте зауставили увећање"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Да бисте увећали:</b><br/> {0,number,integer}. Користите пречицу да бисте покренули увећање<br/> {1,number,integer}. Додирните екран<br/> {2,number,integer}. Превлачите помоћу 2 прста да бисте се кретали по екрану<br/> {3,number,integer}. Скупите 2 прста да бисте прилагодили зумирање<br/> {4,number,integer}. Користите пречицу да бисте зауставили увећање<br/><br/> Можете привремено да зумирате и друго."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Да бисте увећали:</b><br/> {0,number,integer}. Користите пречицу да бисте покренули увећање<br/> {1,number,integer}. Додирните екран<br/> {2,number,integer}. Превлачите 1 или 2 прста да бисте се кретали по екрану <br/> {3,number,integer}. Скупите 2 прста да бисте прилагодили зумирање<br/> {4,number,integer}. Користите пречицу да бисте зауставили увећање<br/><br/> Можете привремено да зумирате и друго."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Када је увећање укључено, можете да увећате екран.\n\n"<b>"Да бисте зумирали"</b>", покрените увећање, па додирните било који део екрана.\n"<ul><li>"Превлачите помоћу 2 или више прстију да бисте померали приказ"</li>\n<li>"Скупите 2 или више прстију да бисте прилагодили зумирање"</li></ul>\n\n<b>"За привремено зумирање"</b>" покрените увећање, па додирните и задржите било који део екрана.\n"<ul><li>"Превлачите да бисте се кретали по екрану"</li>\n<li>"Подигните прст да бисте умањили приказ"</li></ul>\n\n"Не можете да увећавате тастатуру или траку за навигацију."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. страница од <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Пречица за дугме Приступачност"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниједан}=1{1 распоред је подешен}one{# распоред је подешен}few{# распореда су подешена}other{# распореда је подешено}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не узнемиравај"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Приоритетни режими"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Додај режим"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добијајте обавештења само од важних особа и апликација"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Изаберите тип активирања"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Време"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"На пример „9:30–17:00“"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календар"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"На пример „Лични календар“"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Направите режим"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Прилагођено"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничите прекиде"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Укључите режим Не узнемиравај"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Звукови аларма и медија могу да прекину"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Распореди"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Избриши распореде"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Избриши"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Преименуј"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Избриши"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Желите да избришете режим <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Измени"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Распореди"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Распоред"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Додајте календар"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Користите свој календар"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Распоред"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Подесите распоред"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Распоред"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> с, <xliff:g id="MINUTES">%2$d</xliff:g> мин"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Аутоматски укључи"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Распоред"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Утишајте телефон у одређено време"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Подесите правила за режим „Не узнемиравај“"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Омогућите прекиде који производе звук"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокирај визуелна ометања"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволи визуелне сигнале"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Обавештења која дозвољавате"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Будите присутни"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Додатне радње"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Искључено}=1{Искључено/1 режим може да се укључује аутоматски}one{Искључено/# режим може да се укључује аутоматски}few{Искључено/# режима могу да се укључују аутоматски}other{Искључено/# режима може да се укључује аутоматски}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Подешавања приказа"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Опције приказа"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Сивило"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"омогући тамну тему"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Пребаците ОС и апликације на светао текст на тамној позадини. То може да буде лакше за очи и доводи до знатне уштеде батерије на неким уређајима"</string>
<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}}one{{effect_1}, {effect_2} и још #}few{{effect_1}, {effect_2} и још #}other{{effect_1}, {effect_2} и још #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Филтрирај прекиде"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Ниједан прекид се не филтрира"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"отварање обавештења"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Омогући одлагање обавештења"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Тачка за обавештења на икони апликације"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Скупови обавештења"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Облачићи"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Облачићи"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Прикажи ову конверзацију у облачићу"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ова апликација не подржава побољшана подешавања"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Још подешавања"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Доступно је још подешавања у апликацији"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Утишавање обавештења"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Примени на пословне профиле"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Примените на апликације пословног профила"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категорије"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Другo"</string>
<string name="no_channels" msgid="4716199078612071915">"Ова апликација није поставила ниједно обавештење"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Прикажи некоришћене категорије"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Додатна подешавања у апликацији"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Прикажи некоришћене категорије"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Сакриј некоришћене категорије"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Апликације које могу да прекину функцију Не узнемиравај"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Изабране апликације"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ниједна"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Све"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволи да апликације занемарују"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Апликације које могу да прекидају"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Изаберите још апликација"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништа не може да прекине"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Нико не може да прекине"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Неки људи могу да прекину"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Сви људи могу да прекину"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Поновни позиваоци"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Дозволи поновне позиваоце"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Пређите само на аларме на један сат све до {time}}one{Пређите само на аларме на # сат све до {time}}few{Пређите само на аларме на # сата све до {time}}other{Пређите само на аларме на # сати све до {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Пребацује у режим само са алармима до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Пребацује у режим увек прекидај"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Измените режим"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Додајте режим"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Прилагођени режим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назив режима"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Упозорење"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Затвори"</string>
<string name="device_feedback" msgid="5351614458411688608">"Шаљи повратне информације о уређају"</string>
@@ -4286,7 +4331,7 @@
<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">"Хитна помоћ, медицинске информације, обавештења"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Навигација помоћу покрета"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Да бисте отишли на почетни екран, превуците нагоре од дна екрана. Да бисте прешли са једне апликације на другу, превуците нагоре од дна екрана, задржите, па пустите. Да бисте се вратили назад, превуците од леве или десне ивице."</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Наметни режим рачунара"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Намеће експериментални режим рачунара на секундарним екранима"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Омогући прозоре произвољног формата"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Омогућава подршку за прозоре произвољног формата."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Омогући прозоре произвољног формата на 2. екрану"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Омогућава прозоре произвољног формата само на секундарном екрану."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Омогући апликације непромењиве величине у више прозора"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Омогућава да апликације непромењиве величине буду у више прозора"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Замени функцију наметања тамне теме"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Да би овај уређај могао да користи опцију за програмера од 16 kB, његова партиција података треба да се конвертује у ext4. У овом режиму не може да се гарантује интегритет софтвера, па подаци који сe чувају на телефону док је покретачки програм откључан могу да буду угрожени. Активирање опције од 16 kB захтева још једно рестартовање. Када будете у овом режиму, моћи ћете да прелазите са режима од 4 kB на режим од 16 kB и обратно уз једно рестартовање. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај вратили на производни режим, треба да га вратите на режим од 4 kB и закључате покретачки програм, чиме ће се уређај ресетовати на фабричка подешавања. Када се на уређају укључи Android, онемогућите OEM откључавање у Опцијама за програмера. Уређај ће после потврде бити обрисан, а систем фајлова промењен на ext4. Када се то заврши, вратите се овде да бисте поново омогућили режим од 16 kB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Обриши све податке"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Реформатирање и брисање партиције података на ext4 није успело."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Треба да откључате покретачки програм да бисте користили 16 KB режим"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Треба да откључате покретачки програм"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Да би овај уређај могао да користи опцију за програмера од 16 kB, на њему треба да буде откључан покретачки програм. У овом режиму не може да се гарантује интегритет софтвера, па могу бити угрожени подаци који сe чувају на телефону док је покретачки програм откључан. Када се активира режим од 16 kB, сви подаци и подешавања корисника ће бити избрисани. Када се покретачки програм откључа, активирање опције од 16 kB захтева два рестартовања. Када будете у овом режиму, моћи ћете да прелазите са режима од 4 kB на режим од 16 kB и обратно уз једно рестартовање. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај вратили на производни режим, треба да га вратите на режим од 4 kB и закључате OEM или покретачки програм на уређају (што ће га ресетовати на фабричка подешавања). Откључајте покретачки програм и пробајте поново. Упутства како то да урадите потражите на <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Користите режим од 4 kB независан од величине странице"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Користите режим од 4 kB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па подаци који сe чувају на телефону док је покретачки програм откључан могу да буду угрожени. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да закључате покретачки програм уређаја. Додирните да бисте прочитали више."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Користите режим од 4 kB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па могу бити угрожени подаци који сe чувају на телефону док је покретачки програм откључан. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да закључате покретачки програм уређаја. То ће поново ресетовати уређај на фабричка подешавања и вратити га на производна подешавања. Када се на уређају укључи Android, онемогућите OEM откључавање у Опцијама за програмера. Ако је уређај нестабилан или се на њему не укључи Android, поново га флешујте користећи најновије слике са фабричким подешавањима са <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Можете и да користите <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изаберете Обриши уређај, Закључај покретачки програм и Принудно флешуј све партиције."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Користите режим од 16 kB независан од величине странице"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Користите режим од 16 kB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па подаци који сe чувају на телефону док је покретачки програм откључан могу да буду угрожени. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да га вратите на режим од 4 kB и закључате покретачки програм уређаја. Додирните да бисте прочитали више."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Користите режим од 16 kB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па подаци који сe чувају на телефону док је покретачки програм откључан могу да буду угрожени. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да га вратите на режим од 4 kB и закључате покретачки програм уређаја. То ће поново ресетовати уређај на фабричка подешавања и вратити га на производна подешавања. Када се на уређају укључи Android, онемогућите OEM откључавање у Опцијама за програмера. Ако је уређај нестабилан или се на њему не укључи Android, поново га флешујте користећи најновије слике са фабричким подешавањима са <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Можете и да користите <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изаберете Обриши уређај, Закључај покретачки програм и Принудно флешуј све партиције."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Користите режим од 16 KB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па могу бити угрожени подаци који сe чувају на телефону док је покретачки програм откључан. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да га вратите на режим од 4 KB и закључате покретачки програм уређаја. Додирните да бисте прочитали више."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Користите режим од 16 KB у оквиру режима независног од величине странице. У овом режиму не може да се гарантује интегритет софтвера, па могу бити угрожени подаци који сe чувају на телефону док је покретачки програм откључан. Неке функције су онемогућене у овим режимима, што значи да неке апликације можда неће радити. Да бисте уређај поново вратили у производни режим, морате да га вратите на режим од 4 KB и закључате покретачки програм уређаја. То ће поново ресетовати уређај на фабричка подешавања и вратити га на производна подешавања. Када се на уређају укључи Android, онемогућите OEM откључавање у Опцијама за програмера. Ако је уређај нестабилан или се на њему не укључи Android, поново га флешујте користећи најновије слике са фабричким подешавањима са <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>. Можете и да користите <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> и изаберете Обриши уређај, Закључај покретачки програм и Принудно флешуј све партиције."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим од 16 kB независан од величине странице"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Прочитајте више"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Обрађивач извештаја о грешци"</string>
@@ -5010,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Користи качење апликација"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Користи опције за програмере"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Користи услугу штампања"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Дозволи више корисника"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Омогућите промену корисника"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"омогућити, више, корисник, дозволити, много"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"више, корисници, профили, људи, налози, промена, велики број"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Користи бежично отклањање грешака"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Изаберите шта ћете видети на екрану када је таблет на базној станици. Уређај може да троши више енергије када се користи чувар екрана."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Прилагоди"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Прилагодите <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Морате да рестартујете да бисте омогућили подршку за слободан облик."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Морате да рестартујете да бисте принудно омогућили режим за рачунаре на секундарним екранима."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Морате да рестартујете да бисте омогућили подршку за застареле прозоре произвољног формата."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Морате да рестартујете да бисте променили подршку за прозоре произвољног формата."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Морате да рестартујете да бисте принудно омогућили прозоре произвољног формата на секундарном екрану."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Рестартуј"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Рестартуј касније"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Просторни звук"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Укључено"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Искључено"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Укључено"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Звук: %1$d%% лево, %2$d%% десно"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Звук: %1$d%% десно, %2$d%% лево"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Апликације које сте инсталирали могу да виде назив уређаја. И други људи могу да виде назив уређаја када се повежете са Bluetooth уређајима или WiFi мрежом или подесите WiFi хотспот."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Граматички род"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Изаберите граматички род"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Подешавања претраге"</string>
</resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index c7693ec..8a6fb94 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Läggdags"</item>
+ <item msgid="4152450357280759894">"Körläge"</item>
+ <item msgid="7096549258219399423">"Uppslukande"</item>
+ <item msgid="2760716776980432977">"Hanterade"</item>
+ <item msgid="601734478369121764">"Stjärna"</item>
+ <item msgid="6243809315432780521">"Kalender"</item>
+ <item msgid="4913577903148415331">"Tid"</item>
+ <item msgid="3653377604690057780">"Teater"</item>
+ <item msgid="3843711267408385410">"Blomma"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d7dc9ce..6ed2700 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Ska enheten kopplas från?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Parkoppla en ny enhet"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Aktivera automatiskt i morgon"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Inställningar för hörapparat"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Genväg, kompatibilitet med hörapparat"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Förinställning"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Inga förinställningar har gjorts av din audionom"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Det gick inte att uppdatera förinställningen"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ljudutgång"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Om ljudutgång"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{På – # app har platsåtkomst}other{På – # appar har platsåtkomst}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Läser in …"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Appar med behörighet att upptäcka enheter i närheten kan beräkna anslutna enheters relativa position."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Appar med behörighet att upptäcka enheter i närheten kan beräkna anslutna enheters relativa position."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Platsåtkomst har inaktiverats för appar och tjänster. Enhetens plats kan fortfarande skickas till räddningstjänst när du ringer eller skickar sms till ett nödnummer."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Läs mer om platsinställningar"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Om du vill ändra detta öppnar du ChromeOS-inställningar > Integritet och säkerhet > Integritetsinställningar > Platsåtkomst"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Ansikte och <xliff:g id="WATCH">%s</xliff:g> har lagts till"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Ansikte, fingeravtryck och <xliff:g id="WATCH">%s</xliff:g> har lagts till"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Ansikte, fingeravtryck och <xliff:g id="WATCH">%s</xliff:g> har lagts till"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Detta behövs eftersom identitetskontroll är på"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Upplåsning med fjärrverifierare"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Klockan har lagts till"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Konfigurera klockan"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Läs mer om upplåsning med klockan"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Lägg till klocka"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Ta bort klockan"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Fingeravtryck och ansiktslås"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Ansikts- och fingeravtryckslås"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ansikts- och fingeravtryckslås för jobbprofilen"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Konfigurering krävs"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Ansikte och fingeravtryck har lagts till"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Installera appar"</b>\n"Installera appar som du vill hålla privata i området"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Viktigt att tänka på"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Appar stoppas när du låser ditt privata område"</b>\n"När du låser ditt privata område stoppas apparna i området och du får inga aviseringar från dem"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Privata områden lämpar sig inte för appar som måste köras i bakgrunden eller skicka viktig information, till exempel medicinska appar. Detta beror på att aviseringar och aktivitet i bakgrunden stoppas när du låser området.\n\nAppar som finns i ditt privata område visas inte i behörighetshanteraren, på integritetsöversikten eller i andra inställningar när området är låst.\n\nDet går inte att flytta ditt privata område till en ny enhet. Du måste ställa in ett nytt privat område om du vill använda det på en annan enhet.\n\nAlla som ansluter din enhet till en dator eller installerar skadliga appar på enheten kanske kan få åtkomst till ditt privata område."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Privata områden lämpar sig inte för appar som måste köras i bakgrunden eller skicka viktig information, till exempel medicinska appar. Detta beror på att aviseringar och aktivitet i bakgrunden stoppas när du låser området.\n\nAppar som finns i ditt privata område visas inte i behörighetshanteraren, på integritetsöversikten eller i andra inställningar när området är låst.\n\nDet går inte att återställa ditt privata område på en ny enhet. Du måste ställa in ett nytt område om du vill använda det på en annan enhet.\n\nOm någon ansluter din enhet till en dator eller installerar skadliga appar på enheten kan det hända att hen får åtkomst till ditt privata område."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Läs mer om privat område"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Detta tar en stund"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Ställer in privat område …"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Vill du starta om enheten?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Detaljerad NFC-loggning är endast avsedd för utvecklingssyfte. Ytterligare NFC-data ingår i felrapporterna, vilka kan innehålla privata uppgifter. Starta om enheten för att ändra den här inställningen."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Starta om"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"spegla, extern skärm, ansluten skärm, usb-skärm, upplösning, rotation"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Rotation"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Använd skärmtangentbord"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Ha kvar det på skärmen när det fysiska tangentbordet används"</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="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="sticky_keys" msgid="7317317044898161747">"Tröga tangenter"</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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Ändra markörfyllningen till gul"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Ändra markörfyllningen till rosa"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Ändra markörfyllningen till blå"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Stil på pekardrag"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Vit"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Svart"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Ingen"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Användaren valde <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Tal"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Markörens hastighet"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Skala för muspekare"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Minska skalan för muspekare"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Öka skalan för muspekare"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Spelkontroller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Omdirigera vibration"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Styr vibrationer till spelkontrollen när en sådan är ansluten"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Fortsätt ändå"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Avbryt"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Inställningar för förstoring"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Panorering med ett finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Flytta förstoringsglaset med ett finger"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Navigera på skärmen: dra med ett finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Flytta förstoringsområdet genom att dra med ett finger."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Flytta förstoringsområdet genom att dra med två fingrar."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Inte tillgänglig när bara förstoringsdelen av skärmen visas"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Tryck på en knapp för att zooma"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Zooma in snabbt så att innehåll på skärmen förstoras"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Så här zoomar du in:</b><br/> {0,number,integer}. Starta förstoring med genvägen<br/> {1,number,integer}. Tryck på skärmen<br/> {2,number,integer}. Navigera på skärmen genom att dra med två fingrar<br/> {3,number,integer}. Nyp med två fingrar för att justera zoomnivån<br/> {4,number,integer}. Stoppa förstoringen med genvägen<br/><br/> <b>Så här zoomar du in tillfälligt:</b><br/> {0,number,integer}. Kontrollera att förstoringstyp är inställd som helskärm<br/> {1,number,integer}. Starta förstoring med genvägen<br/> {2,number,integer}. Tryck länge var som helst på skärmen<br/> {3,number,integer}. Navigera på skärmen genom att dra med fingret<br/> {4,number,integer}. Stoppa förstoringen genom att lyfta fingret"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Så här zoomar du in:</b><br/> {0,number,integer}. Starta förstoring med kortkommando<br/> {1,number,integer}. Tryck på skärmen<br/> {2,number,integer}. Navigera på skärmen genom att dra med två fingrar<br/> {3,number,integer}. Nyp med två fingrar för att justera zoomnivån<br/> {4,number,integer}. Stoppa förstoring med kortkommando<br/><br/> Du kan även zooma in tillfälligt med mera."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Så här zoomar du in:</b><br/> {0,number,integer}. Starta förstoring med kortkommando<br/> {1,number,integer}. Tryck på skärmen<br/> {2,number,integer}. Navigera på skärmen genom att dra med ett finger eller två fingrar<br/> {3,number,integer}. Nyp med två fingrar för att justera zoomnivån<br/> {4,number,integer}. Stoppa förstoring med kortkommando<br/><br/> Du kan även zooma in tillfälligt med mera."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"När förstoring har aktiverats kan du zooma in på skärmen.\n\n"<b>"Om du vill zooma"</b>" aktiverar du förstoring och trycker var som helst på skärmen.\n"<ul><li>"Scrolla genom att dra med minst två fingrar."</li>\n<li>"Justera zoomen genom att nypa med minst två fingrar."</li></ul>\n\n<b>"Om du vill zooma tillfälligt"</b>" aktiverar du förstoring och trycker länge var som helst på skärmen.\n"<ul><li>"Flytta runt på skärmen genom att dra."</li>\n<li>"Zooma ut genom att lyfta fingret."</li></ul>\n\n"Det går inte att zooma in på tangentbordet eller navigeringsfältet."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Sida <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> av <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Kortkommando med tillgänglighetsknappen"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Inga}=1{1 schema har ställts in}other{# scheman har ställts in}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Stör ej"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Prioriterade lägen"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Lägg till ett läge"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få bara aviseringar från viktiga personer och appar"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Välj aktiveringstyp"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Tid"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Exempel: 9.30–17.00"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalender"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Exempel: Personlig kalender"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Skapa ett läge"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Anpassa"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begränsa antalet avbrott"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Aktivera Stör ej."</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarm och medieljud får avbryta"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Scheman"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Radera scheman"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Radera"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Byt namn"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Radera"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Vill du radera läget <xliff:g id="MODE">%1$s</xliff:g>?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Redigera"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Scheman"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Schema"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Lägg till en kalender"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Använd kalendern"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Schemalägg"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Ställ in ett schema"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Schemalägg"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Aktivera automatiskt"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Schemalägg"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Stäng av mobilljud vid vissa tider"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Ange regler för Stör ej"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Tillåt avbrott med ljud"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Blockera synliga störningar"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Tillåt synliga signaler"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Aviseringar som kan nå dig"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Håll ett öga på omgivningen"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Fler åtgärder"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Av}=1{Av/1 läge kan aktiveras automatiskt}other{Av/# lägen kan aktiveras automatiskt}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Visningsinställningar"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Skärmalternativ"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Gråskala"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"aktivera mörkt tema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Ändra så att operativsystemet och apparna föredrar ljus text på en mörk bakgrund, vilket kan vara snällare för ögonen och gör så att batteriet sparas på vissa enheter."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Inga skärmändringar}=1{{effect_1}}=2{{effect_1} och {effect_2}}=3{{effect_1}, {effect_2} och {effect_3}}other{{effect_1}, {effect_2} och # till}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Filtrera avbrott"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Inga avbrott filtreras"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Skärmalternativ för filtrerade aviseringar"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"När Stör ej har aktiverats"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Aviseringar hörs inte"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"öppna avisering"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Tillåt att aviseringar snoozas"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Aviseringsprick på appikonen"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Aviseringspaket"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bubblor"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bubblor"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Visa en bubbla för konversationen"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Den här appen har inte stöd för avancerade inställningar"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Fler inställningar"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Fler inställningar är tillgängliga i appen"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Gradvis sänkning – aviseringar"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategorier"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Övrigt"</string>
<string name="no_channels" msgid="4716199078612071915">"Den här appen har inte skickat några aviseringar"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Visa oanvända kategorier"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Fler inställningar i appen"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Visa oanvända kategorier"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Dölj oanvända kategorier"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Appar som får störa dig"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Valda appar"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Ingen"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Alla"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Välj fler appar"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Inget får avbryta"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen får avbryta"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Vissa får avbryta"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Alla får avbryta"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Återuppringning"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Tillåt upprepade samtal"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Ändra till endast alarm i en timme tills {time}}other{Ändra till endast alarm i # timmar tills {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ändra till endast alarm fram till kl. <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Ändra till avbryt alltid"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Redigera läge"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Lägg till 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="warning_button_text" msgid="1274234338874005639">"Varning"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Stäng"</string>
<string name="device_feedback" msgid="5351614458411688608">"Skicka feedback om den här enheten"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Fodral"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batteri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panelen Inställningar"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Tvinga fram skrivbordsläge"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Tvinga fram experimentellt skrivbordsläge på sekundära skärmar"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Aktivera frihandsfönster"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Aktivera stöd för frihandsfönster."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Aktivera frihandsfönster på en sekundär skärm"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Aktivera frihandsfönster på endast en sekundär skärm"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Aktivera appar vars storlek inte kan ändras i flerfönsterläge"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Låter appar vars storlek inte kan ändras finnas i flerfönsterläge"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Åsidosätter tvingat mörkt läge"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Du måste konvertera enhetens datapartition till ext4 innan du använder utvecklaralternativet för 16 kB. 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. Om du aktiverar 16 kB-alternativet måste du starta om en gång till efteråt. När läget är aktiverat kan du byta fram och tillbaka mellan 4 kB och 16 kB genom att starta om. En del funktioner inaktiveras i dessa lägen. Det kan innebära att vissa program inte fungerar. Om du vill återställa produktionsläget på enheten måste du byta tillbaka till 4 kB-läget och låsa starthanteraren. Enheten återställs då till standardinställningarna. När enheten startas med Android ska du inaktivera OEM-upplåsning i utvecklaralternativen. Enheten rensas och filsystemet ändras till ext4 när du har bekräftat. När det är klart kommer du tillbaka för att aktivera 16 kB igen."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Radera all data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Det gick inte att formatera om och rensa datapartionen till ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Starthanteraren måste vara upplåst för 16 kB-läge"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Starthanteraren måste låsas upp"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Starthanteraren måste vara upplåst på den här enheten innan du kan använda utvecklaralternativet för 16 kB. 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. Alla användaruppgifter och inställningar rensas när 16 kB-läget aktiveras. När starthanteraren har låsts upp krävs två omstarter för att aktivera 16 kB-alternativet. När läget är aktiverat kan du byta fram och tillbaka mellan 4 kB och 16 kB genom att starta om. En del funktioner inaktiveras i dessa lägen. Det kan innebära att vissa program inte fungerar. Om du vill återställa produktionsläget på enheten måste du byta tillbaka till 4 kB-läget och låsa OEM/starthanteraren. Enheten återställs då till standardinställningarna. Lås upp starthanteraren och försök igen. Du hittar anvisningar om hur du gör detta på <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 kB-versionen av det sidagnostiska läget används"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Du använder 4 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 låsa starthanteraren på enheten. Tryck för att läsa mer."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Du använder 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> och väljer Rensa enhet, Lås starthanteraren och Tvångsflasha alla partitioner."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 kB-versionen av det sidagnostiska läget används"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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. Tryck för att läsa mer."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> och väljer Rensa enhet, Lås starthanteraren och Tvångsflasha alla partitioner."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Tryck för att läsa mer."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Felrapportshanterare"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Använd fästa appar"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Använd utvecklaralternativ"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Använd utskriftstjänst"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Tillåt flera användare"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Tillåt att användaren byter"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"tillåt, flera, användare, godkänn, många"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"flera, användare, profiler, personer, konton, byta, många"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Använd trådlös felsökning"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Välj vad som ska visas på skärmen när surfplattan har dockats. Energiförbrukningen kan öka när en skärmsläckare används."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Anpassa"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Anpassa <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Du måste starta om enheten för att aktivera stöd för flytande läge."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Du måste starta om enheten om du vill tvinga fram datorläge på sekundära skärmar."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Du måste starta om enheten för att aktivera stöd för äldre frihandsfönster."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Du måste starta om enheten för att ändra stödet för frihandsfönster."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Du måste starta om enheten för att tvinga frihandsfönster på sekundära skärmar."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Starta om nu"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Starta om senare"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Rumsligt ljud"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"På"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Av"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"På"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Ljud %1$d%% vänster, %2$d%% höger"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Ljud %1$d%% höger, %2$d%% vänster"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Enhetens namn är synligt för appar du har installerat. Det kan också vara synligt för andra personer när du ansluter till Bluetooth-enheter eller ett wifi-nätverk, eller om du skapar en wifi-surfzon."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Genus"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Välj genus"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Sökinställningar"</string>
</resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 2bfad67..cd23759 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Wakati wa kulala"</item>
+ <item msgid="4152450357280759894">"Kuendesha gari"</item>
+ <item msgid="7096549258219399423">"Kwa kina"</item>
+ <item msgid="2760716776980432977">"Inadhibitiwa"</item>
+ <item msgid="601734478369121764">"Nyota"</item>
+ <item msgid="6243809315432780521">"Kalenda"</item>
+ <item msgid="4913577903148415331">"Muda"</item>
+ <item msgid="3653377604690057780">"Ukumbi"</item>
+ <item msgid="3843711267408385410">"Ua"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ffb704e..08da6d4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Ungependa kuondoa kifaa?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Unganisha kifaa kipya"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Washa kesho kiotomatiki"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Mipangilio ya vifaa vya kusikilizia"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Njia ya mkato, uoanifu wa kifaa cha kusaidia kusikia"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Mipangilio iliyowekwa mapema"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Hakuna mipangilio iliyowekwa mapema na audiolojia wako"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Imeshindwa kusasisha mipangilio iliyowekwa mapema"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Vifaa vya kutoa sauti"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Kuhusu vifaa vya kutoa sauti"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Umezima"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Imewashwa / programu # ina idhini ya kufikia data ya mahali}other{Imewashwa / programu # zina idhini ya kufikia data ya mahali}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Inapakia…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Programu zenye ruhusa ya Uhamishaji wa Karibu zinaweza kubainisha mahali vilipo vifaa vilivyounganishwa."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Programu zenye ruhusa za kufikia vifaa vilivyo karibu zinaweza kubainisha mahali vilipo vifaa vilivyounganishwa."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Ruhusa za kufikia mahali zimezimwa kwenye programu na huduma. Bado maelezo ya mahali kilipo kifaa chako yanaweza kutumwa kwa wanaoshughulikia matukio ya dharura unapopiga simu au kutuma SMS kwa namba ya dharura."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Pata maelezo zaidi kuhusu Mipangilio ya mahali"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Ili ubadilishe nenda kwenye Mipangilio ya ChromeOS > Faragha na usalama > Vidhibiti vya faragha > Ufikiaji wa maelezo ya mahali"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Umeweka uso na <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Umeweka uso, alama ya kidole na <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Umeweka uso, alama za vidole na <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Hatua hii inahitajika kwa kuwa kipengele cha Kukagua Utambulisho kimewashwa"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Kufungua Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Saa imeoanishwa"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Weka mipangilio ya saa yako"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Pata maelezo zaidi kuhusu Kufungua Kupitia Saa"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Weka saa"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Ondoa saa"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Alama ya Kidole na Kufungua kwa Uso"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Kufungua kwa Alama ya Kidole na Uso"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Kazini: Kufungua kwa Uso na Alama ya Kidole"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Unahitaji kuweka mipangilio"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Uso na alama za vidole zimeongezwa"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Weka programu"</b>\n"Weka programu ambazo ungependa ziwe za faragha katika sehemu yako ya faragha"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Kumbuka"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Programu huacha kufanya kazi ukifunga sehemu yako ya faragha"</b>\n"Ukifunga sehemu yako ya faragha, programu zilizo katika sehemu hiyo zitaacha kufanya kazi na hazitakutumia arifa"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Sehemu za faragha hazifai kwa programu zinazohitaji kutumika chinichini au kutuma arifa muhimu, kama vile programu za matibabu. Hii ni kwa sababu arifa na shughuli za chinichini hukomeshwa wakati sehemu yako imefungwa.\n\nProgramu zilizo kwenye sehemu yako ya faragha hazitaonekana kwenye kidhibiti cha ruhusa, dashibodi ya faragha na mipangilio mingine wakati sehemu yako ya faragha imefungwa.\n\nSehemu yako ya faragha haiwezi kuhamishiwa kwenye kifaa kipya. Utahitaji kuweka mipangilio ya sehemu nyingine ya faragha iwapo ungependa kuitumia kwenye kifaa kingine.\n\nYeyote anayeunganisha kifaa chako na kompyuta au anayeweka programu hatari kwenye kifaa chako huenda akafikia sehemu yako ya faragha."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Sehemu za faragha hazifai kwa programu zinazohitaji kutumika chinichini au kutuma arifa muhimu, kama vile programu za matibabu. Hii ni kwa sababu arifa na shughuli za chinichini hukomeshwa wakati sehemu yako imefungwa.\n\nProgramu zilizo kwenye sehemu yako ya faragha hazitaonekana katika kidhibiti cha ruhusa, dashibodi ya faragha na mipangilio mingine wakati sehemu ya faragha imefungwa.\n\nSehemu yako ya faragha haiwezi kurejeshwa kwenye kifaa kipya. Utahitaji kuweka mipangilio ya sehemu nyingine ya faragha iwapo ungependa kuitumia kwenye kifaa kingine.\n\nYeyote anayeunganisha kifaa chako na kompyuta au kuweka programu hasidi kwenye kifaa chako huenda akafikia sehemu yako ya faragha."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Pata maelezo kuhusu sehemu ya faragha"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Hatua hii itachukua dakika chache"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Inaweka mipangilio ya sehemu ya faragha…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Ungependa kuzima kisha uwashe kifaa?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Uwekaji maelezo ya kumbukumbu ya NFC ni kwa madhumuni ya usanidi pekee. Vilevile data ya NFC inajumuishwa katika ripoti za hitilafu ambazo huenda zikawa na taarifa ya faragha. Zima kisha uwashe kifaa chako ili ubadili mipangilio hii."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Zima kisha uwashe"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"akisi, skrini ya nje, skrini iliyounganishwa, skrini ya USB, ubora, mzunguko"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Mzunguko"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Wastani"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"Digrii 90"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"Digrii 180"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"Digrii 270"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Tumia kibodi ya skrini"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Ionyeshe kwenye skrini wakati kibodi halisi inatumika"</string>
<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="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="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="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>
@@ -1923,12 +1938,16 @@
<string name="trackpad_bottom_right_tap_title" msgid="6275428879042702880">"Mguso wa chini kulia"</string>
<string name="trackpad_bottom_right_tap_summary" msgid="8734094086900680674">"Gusa kona ya upande wa chini kulia wa padi ya kugusa kwa chaguo zaidi"</string>
<string name="trackpad_pointer_speed" msgid="7786579408631352625">"Kasi ya kiashiria"</string>
- <string name="pointer_fill_style" msgid="8413840032931637595">"Muundo wa kielekezi"</string>
+ <string name="pointer_fill_style" msgid="8413840032931637595">"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>
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Badilisha kielekezi kiwe cha njano"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Badilisha kielekezi kiwe cha waridi"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Badilisha kielekezi kiwe cha buluu"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Muundo wa mcharazo wa kielekezi"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Nyeupe"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Nyeusi"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Hamna"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Uliochaguliwa na mtumiaji: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Kutamka"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kasi ya kiashiria"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Ukubwa wa kiashiria"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Punguza ukubwa wa kiashiria"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Ongeza ukubwa wa kiashiria"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Kidhibiti cha Mchezo"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Elekeza mtetemo"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Elekeza mitetemo kwenye kidhibiti cha mchezo wakati kimeunganishwa"</string>
@@ -2020,7 +2042,7 @@
<string name="usage_time_label" msgid="9105343335151559883">"Muda wa utumiaji"</string>
<string name="accessibility_settings" msgid="4713215774904704682">"Ufikivu"</string>
<string name="accessibility_settings_title" msgid="6739115703615065716">"Mipangilio ya ufikiaji"</string>
- <string name="accessibility_settings_summary" msgid="2366627644570558503">"Onyesho, utumiaji, sauti"</string>
+ <string name="accessibility_settings_summary" msgid="2366627644570558503">"Mwonekano, utumiaji, sauti"</string>
<string name="vision_settings_title" msgid="8919983801864103069">"Mipangilio ya Kuona"</string>
<string name="vision_settings_description" msgid="7614894785054441991">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya ufikivu vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
<string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Badilisha ukubwa wa fonti"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Endelea tu"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Ghairi"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mipangilio ya ukuzaji"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Kubuta kwa kidole kimoja"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Sogeza kikuzaji ukitumia kidole 1"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Buruta kidole 1 ili usogeze kwenye skrini"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Sogeza sehemu ya ukuzaji kwa kuburuta kwa kidole kimoja."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Sogeza sehemu ya ukuzaji kwa kuburuta kwa vidole viwili."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Haipatikani unapokuza tu sehemu fulani ya skrini"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Gusa kitufe ili ukuze"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Vuta karibu kwa haraka kwenye skrini ili ufanye maudhui yawe makubwa"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Ili uvute karibu:</b><br/> {0,number,integer}. Tumia njia ya mkato ili uanze kukuza<br/> {1,number,integer}. Gusa skrini<br/> {2,number,integer}. Buruta vidole viwili ili usogeze kwenye skrini<br/> {3,number,integer}. Bana kwa vidole viwili ili ubadilishe ukuzaji<br/> {4,number,integer}. Tumia njia ya mkato ili uache kukuza<br/><br/><b>Ili uvute karibu kwa muda:</b><br/> {0,number,integer}. Hakikisha umechagua aina ya ukuzaji kuwa skrini nzima<br/> {1,number,integer}. Tumia njia ya mkato ili uanze kukuza<br/> {2,number,integer}. Gusa na ushikilie mahali popote kwenye skrini<br/> {3,number,integer}. Buruta kidole ili usogeze kwenye skrini<br/> {4,number,integer}. Inua kidole ili uache kukuza"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Ili uvute karibu:</b><br/> {0,number,integer}. Tumia njia ya mkato ili uanze ukuzaji<br/> {1,number,integer}. Gusa skrini<br/> {2,number,integer}. Buruta vidole 2 ili usogeze kwenye skrini<br/> {3,number,integer}. Bana ukitumia vidole 2 ili ukuze vinginevyo<br/> {4,number,integer}. Tumia njia ya mkato ili uache kukuza<br/><br/> Unaweza pia kuvuta karibu kwa muda mfupi na zaidi."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Ili uvute karibu:</b><br/> {0,number,integer}. Tumia njia ya mkato ili uanze ukuzaji<br/> {1,number,integer}. Gusa skrini<br/> {2,number,integer}. Buruta kidole 1 au 2 ili usogeze kwenye skrini<br/> {3,number,integer}. Bana ukitumia vidole 2 ili ukuze vinginevyo<br/> {4,number,integer}. Tumia njia ya mkato ili uache kukuza<br/><br/> Unaweza pia kuvuta karibu kwa muda mfupi na zaidi."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Ukiwasha ukuzaji, unaweza kuvuta karibu kwenye skrini yako.\n\n"<b>"Ili ukuze"</b>", anzisha ukuzaji kisha uguse mahali popote kwenye skrini.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili urekebishe ukuzaji"</li></ul>\n\n<b>"Ili ukuze kwa muda"</b>", anzisha ukuzaji kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Ukurasa wa <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> kati ya <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Njia ya mkato ya kitufe cha zana za ufikivu"</string>
@@ -2182,7 +2207,7 @@
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="3923122834058574478">"Njia ya mkato kwenye skrini iliyofungwa"</string>
<string name="accessibility_shortcut_description" msgid="2184693606202133549">"Ruhusu kipengele cha njia ya mkato ya kufikia vipengele kiwake kwenye skrini iliyofungwa. Shikilia vitufe vyote viwili vya sauti kwa sekunde chache."</string>
<string name="accessibility_button_title" msgid="5251235485581552614">"Kitufe cha zana za ufikivu"</string>
- <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"Ishara na kitufe cha zana za ufikivu"</string>
+ <string name="accessibility_button_gesture_title" msgid="3573456209050374139">"Usogezaji na vitufe vya zana za ufikivu"</string>
<string name="accessibility_button_intro_text" msgid="80993874471745687">"Fikia vipengele vya ufikivu kwa haraka kutoka kwenye skrini yoyote"</string>
<string name="accessibility_button_about_title" msgid="3581116105084067926">"Kuhusu kitufe cha zana za ufikivu"</string>
<string name="accessibility_button_gesture_about_title" msgid="8468987303602865536">"Kuhusu ishara na kitufe cha zana za ufikivu"</string>
@@ -2191,7 +2216,7 @@
<string name="accessibility_button_summary" msgid="8510939012631455831">"Fikia vipengele vya ufikivu haraka"</string>
<string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>Ili uanze</b><br/> {0,number,integer}. Nenda kwenye mipangilio ya ufikivu<br/> {1,number,integer}. Teua kipengele kisha uguse njia ya mkato<br/> {2,number,integer}. Chagua ikiwa ungependa kutumia kitufe au ishara kufikia kipengele<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>Ili uanze</b><br/> {0,number,integer}. Nenda kwenye mipangilio ya ufikivu<br/> {1,number,integer}. Teua kipengele kisha uguse njia ya mkato<br/> {2,number,integer}. Chagua kitufe ili ufikie kipengele<br/>"</string>
- <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Tumia ishara au kitufe"</string>
+ <string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"Tumia usogezaji au kitufe"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"Mahali"</string>
<string name="accessibility_button_size_title" msgid="5785110470538960881">"Ukubwa"</string>
<string name="accessibility_button_fade_title" msgid="8081993897680588829">"Fifia wakati hakitumiki"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hamna}=1{Pana ratiba moja}other{Pana ratiba #}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Usinisumbue"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Hali za Kipaumbele"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Weka hali"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Pata arifa za watu na programu muhimu pekee"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Chagua aina ya kuwezesha"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Muda"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"K.m. \"Saa 3:30 asubuhi hadi saa 11:00 jioni\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"K.m. \"Kalenda binafsi\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Anzisha hali"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Maalum"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Punguza usumbufu"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Washa kipengele cha Usinisumbue"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Sauti za kengele na maudhui zinaweza kukatiza"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Ratiba"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Futa kanuni"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Futa"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Badilisha jina"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Futa"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Ungependa kufuta hali ya \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Badilisha"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Ratiba"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ratiba"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Weka kalenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Tumia kalenda yako"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Ratiba"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Weka ratiba"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Ratiba"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"Saa <xliff:g id="HOURS">%1$d</xliff:g>, dak <xliff:g id="MINUTES">%2$d</xliff:g>"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Washa kiotomatiki"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ratibu"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Zima simu katika vipindi fulani"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Weka sheria za Usinisumbue"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Ruhusu ukatizwe na vipengele vinavyotoa sauti"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Zuia ukatizaji wa maonyesho"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Ruhusu ishara zinazoonekena"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Arifa zinazoweza kukufikia"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Kuwa makini"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Vitendo vya ziada"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Imezimwa}=1{Imezimwa au Hali 1 inaweza kuwashwa kiotomatiki}other{Imezimwa au Hali # zinaweza kuwashwa kiotomatiki}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Mipangilio ya kuonyesha"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Chaguo za kuonyesha"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Kijivu"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"washa mandhari meusi"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Badili mfumo wa uendeshaji na programu uwe katika hali ya napendelea maandishi mepesi kwenye mandharinyuma meusi\", ambayo yanaweza kuonekana kwa urahisi na yanapelekea uokoaji mkubwa wa betri kwenye baadhi ya vifaa."</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Hakuna mabadiliko kwenye skrini}=1{{effect_1}}=2{{effect_1} na {effect_2}}=3{{effect_1}, {effect_2} na {effect_3}}other{{effect_1}, {effect_2} na # zaidi}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Chuja matukio ya kukatiza"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Hakuna matukio ya kukatiza yaliyochujwa"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Chaguo za kuonyesha arifa zilizochujwa"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Wakati umewasha kipengele cha Usinisumbue"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Arifa zisitoe sauti"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"fungua arifa"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Ruhusu uahirishaji wa arifa"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Kitone cha arifa kwenye aikoni ya programu"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Vifurushi vya arifa"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Viputo"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Viputo"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Yafanye mazungumzo haya yatoe viputo"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Programu hii haitumii mipangilio iliyoboreshwa"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Mipangilio zaidi"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Mipangilio zaidi inapatikana ndani ya programu hii"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Kupungua kwa shughuli ya arifa"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Tumia kwenye wasifu wa kazini"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Inatumika kwa programu zenye wasifu wa kazini"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Aina"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Nyingine"</string>
<string name="no_channels" msgid="4716199078612071915">"Programu hii haijachapisha arifa zozote"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Onyesha aina ambazo hazijatumika"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Mipangilio ya ziada katika programu"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Onyesha aina zisizotumika"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ficha aina zisizotumika"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Programu zinazoweza kukatiza"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Programu zilizochaguliwa"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Hamna"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Zote"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Chagua programu zaidi"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hakuna kinachoweza kukatiza"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Hakuna mtu anayeweza kukatiza"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Baadhi ya watu wanaweza kukatiza"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Watu wote wanaweza kukatiza"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Wanaorudia kupiga simu"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Ruhusu wanaorudia kupiga simu"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Badilisha utumie kengele pekee kwa saa moja hadi {time}}other{Badilisha utumie kengele pekee kwa saa # hadi {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Badilisha utumie hali ya katiza wakati wote"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Badilisha hali"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Weka 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="warning_button_text" msgid="1274234338874005639">"Onyo"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Funga"</string>
<string name="device_feedback" msgid="5351614458411688608">"Tuma maoni kuhusu kifaa hiki"</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Kipochi"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Betri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Kidirisha cha Mipangilio"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Lazimisha hali ya eneo-kazi"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Lazimisha hali ya jaribio la eneo-kazi kwenye maonyesho yasiyo ya msingi"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Kuwasha madirisha yenye muundo huru"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Ruhusu matumizi ya madirisha yenye muundo huru."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Ruhusu matumizi ya madirisha yenye muundo huru kwenye skrini ya pili"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Ruhusu matumizi ya madirisha yenye muundo huru kwenye skrini ya pili pekee."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Ruhusu ukubwa usioweza kubadilishwa katika madirisha mengi"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Huruhusu programu zenye ukubwa usioweza kubadilishwa ziwe katika madirisha mengi"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Badilisha ulazimishaji wa mandhari meusi"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Sehemu ya data ya kifaa hiki inahitaji kugeuzwa kuwa ext4 kabla ya kutumia chaguo la wasanidi programu la KB 16. 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. Hatua ya kuwasha chaguo la KB 16 itahitaji kifaa kiwashwe tena baada ya hatua hii. Ukiwa katika hali hii, unaweza kubadilisha kati ya hali za KB 4 na KB 16 kwa kuwasha tena kifaa. Baadhi ya vipengele vitazimwa katika hali hizi, kwa hivyo huenda baadhi ya programu zisifanye kazi. Ili urudishe kifaa kwenye hali ya toleo la umma, utahitaji kurudi kwenye hali ya KB 4 kisha ufunge programu ya kuwasha mfumo wa uendeshaji, hatua itakayorejesha mipangilio ambayo kifaa kilitoka nayo kiwandani. Baada ya kifaa kuwashwa katika Android, zima mipangilio ya kufungua OEM katika Chaguo za wasanidi programu. Data na mipangilio yote ya kifaa itafutwa na mfumo wa faili utabadilishwa kuwa ext4 baada ya uthibitishaji. Baada ya hili kukamilika, tafadhali rudi ili uwashe tena hali ya KB 16."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Futa data yote"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Imeshindwa kubadilisha muundo na kufuta sehemu ya data kuwa ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Unahitaji Kufungua Programu ya Kuwasha Mfumo wa Uendeshaji katika Hali ya KB 16"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Unahitaji Mbinu ya Kufungua Programu ya Kuwasha Mfumo wa Uendeshaji"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Kifaa hiki kinahitaji programu ya kuwasha mfumo wa uendeshaji ifunguliwe kabla ya kutumia chaguo la wasanidi programu la KB 16. 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. Mipangilio na data yote ya mtumiaji itafutwa hali ya KB 16 ikiwashwa. Baada ya programu ya kuwasha mfumo wa uendeshaji kufunguliwa, hatua ya kuwasha chaguo la KB 16 itahitaji kifaa kuwashwa tena mara mbili. Ukiwa katika hali hii, unaweza kubadilisha kati ya hali za KB 4 na KB 16 kwa kuwasha tena kifaa. Baadhi ya vipengele vitazimwa katika hali hizi, kwa hivyo huenda baadhi ya programu zisifanye kazi. Ili urejeshe kifaa kwenye hali ya toleo la umma, utahitaji kurudi kwenye hali ya KB 4 kisha ufunge programu ya kuwasha mfumo wa uendeshaji au urejeshe mipangilio ya kampuni halisi iliyotengeneza kifaa (OEM), (hatua itakayorejesha mipangilio ambayo kifaa kilitoka nayo kiwandani). Tafadhali fungua programu ya kuwasha mfumo wa uendeshaji kisha ujaribu tena. Unaweza kuona maagizo kuhusu jinsi ya kufanya hivyo katika <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Kutumia hali isiyotegemea ukurasa ya KB 4"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Unatumia hali ya KB 4 kwenye hali isiyotegemea 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, lazima ufunge programu ya kuwasha mfumo wa uendeshaji kwenye kifaa. Gusa ili uendelee kusoma."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Unatumia hali ya KB 4 kwenye hali isiyotegemea 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, lazima 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 faili mpya kabisa za kiwandani kutoka <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> or use <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> kisha uchague \'Futa Data Yote ya Kifaa\', \'Funga Programu ya Kuwasha Mfumo wa Uendeshaji\' na \'Lazimisha Kuweka kwenye sehemu zote\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Kutumia hali ya KB 16 isiyotegemea ukurasa"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Unatumia hali ya KB 16 kwenye hali isiyotegemea 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, lazima urudi katika hali ya 4K kisha ufunge programu ya kuwasha mfumo wa uendeshaji kwenye kifaa. Gusa ili uendelee kusoma."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Unatumia hali ya KB 16 kwenye hali isiyotegemea 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, 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 faili mpya kabisa za kiwandani kutoka <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> au utumie <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> kisha uchague \'Futa Data Yote ya Kifaa\', \'Funga Programu ya Kuwasha Mfumo wa Uendeshaji\' na \'Lazimisha Kuweka kwenye sehemu zote\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Gusa ili uendelee kusoma."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> au utumie <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Kidhibiti cha ripoti ya hitilafu"</string>
@@ -4975,7 +5022,7 @@
<string name="default_active_sim_calls" msgid="2390973682556353558">"simu"</string>
<string name="default_active_sim_sms" msgid="8041498593025994921">"SMS"</string>
<string name="default_active_sim_mobile_data" msgid="6798083892814045301">"data ya mtandao wa simu"</string>
- <string name="wifi_scan_notify_message" msgid="1331238142061476869">"Ili kuboresha hali ya matumizi ya kifaa, programu na huduma zinaweza kutafuta mitandao ya Wi‑Fi wakati wowote, hata wakati umezima Wi‑Fi. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali. Unaweza kubadilisha mipangilio hii katika mipangilio ya kutafuta Wi-Fi."</string>
+ <string name="wifi_scan_notify_message" msgid="1331238142061476869">"Ili kuboresha hali ya matumizi ya kifaa, programu na huduma zinaweza kutafuta mitandao ya Wi‑Fi wakati wowote, hata wakati umezima Wi‑Fi. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali. Unaweza kubadilisha hali hii katika mipangilio ya kutafuta Wi-Fi."</string>
<string name="wifi_scan_change" msgid="8438320311511852918">"Badilisha"</string>
<string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
<string name="mobile_data_connection_active" msgid="2422223108911581552">"Imeunganishwa"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Tumia kipengele cha kubandika programu"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Tumia chaguo za wasanidi programu"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Tumia huduma ya kuchapisha"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Ruhusu watumiaji wengi"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Ruhusu kubadili watumiaji"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ruhusu, kadhaa, mtumiaji, idhinisha, wengi"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"wengi, watumiaji, wasifu, watu, akaunti, badilisha, nyingi"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Tumia kipengele cha utatuzi usiotumia waya"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Chagua utakachokiona kwenye skrini wakati kompyuta kibao yako imeshikiliwa kwenye kiweko. Kifaa chako kinaweza kutumia nishati nyingi zaidi taswira ya skrini inapotumika."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Badilisha upendavyo"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Uweke mapendeleo ya <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Itahitaji kuwashwa tena ili kuruhusu uwezo wa muundo huru."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Itahitaji kuwashwa tena ili kuwezesha hali ya kompyuta ya mezani kwenye skrini nyingine."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Unahitaji kuwasha tena ili kuruhusu matumizi ya madirisha yenye muundo huru yaliyopitwa na wakati."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Unahitaji kuwasha tena ili kubadilisha matumizi ya madirisha yenye muundo huru."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Unahitaji kuwasha tena ili kulazimisha matumizi ya madirisha yenye muundo huru kwenye skrini za pili."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Washa tena sasa"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Washa tena baadaye"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Sauti Inayojirekebisha"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Imewashwa"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Imezimwa"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Imewashwa"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Sauti, kushoto ni %1$d%%, kulia ni %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Sauti, kulia ni %1$d%%, kushoto ni %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Jina la kifaa chako litaonekana kwa programu ambazo umesakinisha. Huenda likaonekana pia na watu wengine unapooanisha na vifaa vyenye Bluetooth, unapounganisha kwenye mtandao wa Wi-Fi au unapoweka mipangilio ya mtandao pepe wa Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Jinsia ya kisarufi"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Chagua Jinsia ya kisarufi"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Mipangilio ya Utafutaji"</string>
</resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 7d00713..35442ce 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"உறக்கநேரம்"</item>
+ <item msgid="4152450357280759894">"வாகனம் ஓட்டுதல்"</item>
+ <item msgid="7096549258219399423">"ஈடுபடவைப்பவை"</item>
+ <item msgid="2760716776980432977">"நிர்வகிக்கப்பட்டது"</item>
+ <item msgid="601734478369121764">"ஸ்டார்"</item>
+ <item msgid="6243809315432780521">"கேலெண்டர்"</item>
+ <item msgid="4913577903148415331">"நேரம்"</item>
+ <item msgid="3653377604690057780">"திரையரங்கம்"</item>
+ <item msgid="3843711267408385410">"பூ"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 4bb9743..7cdcf5c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"சாதனத்தைத் துண்டிக்கவா?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"புதிய சாதனத்தை இணை"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"புளூடூத்"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"தானாகவே நாளை இயக்குதல்"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"செவித்துணைச் சாதன அமைப்புகள்"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ஷார்ட்கட், செவித்துணைக் கருவியுடனான இணக்கத்தன்மை"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"முன்னமைவு"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"முன்னமைவுகள் எதையும் உங்கள் ஆடியாலஜிஸ்ட் திட்டமிடவில்லை"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"முன்னமைவைப் புதுப்பிக்க முடியவில்லை"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ஆடியோ வெளியீடு"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ஆடியோ அவுட்புட் - அறிமுகம்"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ஆஃப்"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ஆன் / # ஆப்ஸ் இருப்பிடத்திற்கான அணுகலைக் கொண்டுள்ளது}other{ஆன் / # ஆப்ஸ் இருப்பிடத்திற்கான அணுகலைக் கொண்டுள்ளன}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"ஏற்றுகிறது…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"இணைக்கப்பட்டுள்ள சாதனங்களின் தூரத்தை \'அருகிலுள்ள சாதனங்களுக்கான\' அனுமதியைப் பெற்ற ஆப்ஸால் தீர்மானிக்க முடியும்."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"இணைக்கப்பட்டுள்ள சாதனங்கள் எவ்வளவு தூரத்தில், எந்தத் திசையில் உள்ளன என்பதை அருகிலுள்ள சாதனங்களைக் கண்டறிவதற்கான அனுமதியைப் பெற்றுள்ள ஆப்ஸால் தீர்மானிக்க முடியும்."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ஆப்ஸுக்கும் சேவைகளுக்கும் இருப்பிட அணுகல் முடக்கப்பட்டுள்ளது. எனினும் அவசர உதவி எண்ணை அழைத்தாலோ அதற்கு மெசேஜ் அனுப்பினாலோ, சாதனத்தின் இருப்பிடம் அவசரக் காலத்தில் உதவிபுரிவோருக்கு அனுப்பப்படக்கூடும்."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"இருப்பிட அமைப்புகள் குறித்து மேலும் அறிக"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"மாற்ற, ChromeOS அமைப்புகள் > தனியுரிமை மற்றும் பாதுகாப்பு > தனியுரிமைக் கட்டுப்பாடுகள் > இருப்பிட அணுகல் என்பதற்குச் செல்லவும்"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"முகம் மற்றும் <xliff:g id="WATCH">%s</xliff:g> சேர்க்கப்பட்டன"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"முகம், கைரேகை மற்றும் <xliff:g id="WATCH">%s</xliff:g> சேர்க்கப்பட்டன"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"முகம், கைரேகைகள் மற்றும் <xliff:g id="WATCH">%s</xliff:g> சேர்க்கப்பட்டன"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"அடையாளச் சரிபார்ப்பு இயக்கத்தில் உள்ளதால் இது தேவை"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticatorரை அன்லாக் செய்தல்"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"வாட்ச் சேர்க்கப்பட்டது"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"உங்கள் வாட்ச்சை அமையுங்கள்"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"வாட்ச் அன்லாக் அம்சம் குறித்து மேலும் அறிக"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"வாட்ச்சைச் சேர்"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"வாட்ச்சை அகற்றும்"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"கைரேகை & முகம் காட்டித் திறத்தல்"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"முகம் & கைரேகை அன்லாக்"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"பணிக்கான முகம் & கைரேகை அன்லாக்"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"அமைவு தேவை"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"முகமும் கைரேகைகளும் சேர்க்கப்பட்டன"</string>
@@ -566,7 +567,7 @@
<string name="private_space_face_enroll_introduction_message" msgid="250239418499081821">"உங்கள் முகத்தைக் காட்டி ரகசிய இடத்தை அன்லாக் செய்யலாம் அல்லது ஆப்ஸில் உள்நுழைதல், பர்ச்சேஸை அங்கீகரித்தல் போன்ற செயல்பாடுகளின்போது அதைச் செய்வது நீங்கள்தான் என்பதை உறுதிப்படுத்தலாம்"</string>
<string name="private_space_face_enroll_introduction_info_looking" msgid="5694757845303924042">"நீங்கள் தற்செயலாக மொபைலைப் பார்க்கும்போதும்கூட ரகசிய இடம் அன்லாக் ஆகிவிடக்கூடும். அதுமட்டுமின்றி, கிட்டத்தட்ட உங்கள் சாயலில் இருப்பவராலோ (எ.கா. ஒரே தோற்றமுடைய உடன்பிறந்தவர்) உங்கள் முகத்திற்கு நேராகச் சாதனத்தைக் காட்டி வேறொருவராலோ உங்கள் ரகசிய இடத்தை அன்லாக் செய்துவிட முடியும்."</string>
<string name="private_space_face_enroll_introduction_info_less_secure" msgid="8460719783943533172">"வலுவான பேட்டர்ன், பின் (PIN) அல்லது கடவுச்சொல்லுடன் ஒப்பிடுகையில், உங்கள் முகத்தைப் பயன்படுத்தி ரகசிய இடத்தை அன்லாக் செய்வது குறைந்த பாதுகாப்புடையதாக இருக்கக்கூடும்"</string>
- <string name="private_space_face_settings_require_attention_details" msgid="2799569069549999689">"ரகசிய இடத்தை அன்லாக் செய்ய, உங்கள் கண்கள் திறந்திருக்க வேண்டும். சிறந்த முடிவுகளுக்கு, கண்ணாடியைக் கழற்றி விடுங்கள்."</string>
+ <string name="private_space_face_settings_require_attention_details" msgid="2799569069549999689">"ரகசிய இடத்தை அன்லாக் செய்ய, உங்கள் கண்கள் திறந்திருக்க வேண்டும். சிறந்த முடிவுகளுக்கு, சன்கிளாஸைக் கழற்றி விடுங்கள்."</string>
<string name="private_space_face_settings_footer" msgid="7722256209563543711">"உங்கள் முகத்தைக் காட்டி ரகசிய இடத்தை அன்லாக் செய்யலாம்.\n\nகவனத்திற்கு:\nஒரு சமயத்தில் ஒரு முகத்தை மட்டுமே அமைக்க முடியும். இன்னொரு முகத்தைச் சேர்க்க வேண்டுமெனில், தற்போது சேர்த்துள்ள முகத்தை நீக்குங்கள்.\n\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும்போதும்கூட ரகசிய இடம் அன்லாக் ஆகிவிடக்கூடும்.\n\nஉங்கள் முகத்திற்கு நேராகச் சாதனத்தைக் காட்டி வேறொருவராலும் உங்கள் ரகசிய இடத்தை அன்லாக் செய்துவிட முடியும்.\n\nகிட்டத்தட்ட உங்கள் சாயலில் இருப்பவராலும் (எ.கா. ஒரே தோற்றமுடைய உடன்பிறந்தவர்) உங்கள் ரகசிய இடத்தை அன்லாக் செய்துவிட முடியும்."</string>
<string name="private_space_face_settings_require_confirmation_details" msgid="5406498664903812249">"முகம் காட்டித் திறக்கும்போதெல்லாம் உறுதிப்படுத்துதல் வழிமுறையும் தேவை"</string>
<string name="private_space_category_ways_to_unlock" msgid="4356631225316950046">"அன்லாக் செய்வதற்கான வழிகள்"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ஆப்ஸை நிறுவுதல்"</b>\n"உங்கள் ரகசிய இடத்தில் தனிப்பட்டதாக வைத்திருக்க விரும்பும் ஆப்ஸை நிறுவுங்கள்"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"நினைவில்கொள்ள வேண்டியவை"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"உங்கள் ரகசிய இடத்தைப் பூட்டியதும் ஆப்ஸ் செயல்படாது"</b>\n"உங்கள் இடத்தைப் பூட்டினால் அதிலுள்ள ஆப்ஸின் செயல்பாடு நிறுத்தப்படுவதோடு அவற்றிலிருந்து அறிவிப்புகளையும் பெறமாட்டீர்கள்"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"ரகசிய இடங்கள் மருத்துவ ஆப்ஸ் போன்ற பின்னணியில் செயல்பட வேண்டிய அல்லது அதிமுக்கிய அறிவிப்புகளை அனுப்ப வேண்டிய ஆப்ஸுக்கு ஏற்றவை அல்ல. உங்கள் இடம் பூட்டப்பட்டிருக்கும்போது அறிவிப்புகள் மற்றும் பின்னணிச் செயல்பாடு நிறுத்தப்படுவதே இதற்குக் காரணம் ஆகும்.\n\nஉங்கள் ரகசிய இடம் பூட்டப்பட்டிருக்கும்போது அனுமதி நிர்வாகம், தனியுரிமை டாஷ்போர்டு, பிற அமைப்புகள் ஆகியவற்றில் ரகசிய இடத்தில் உள்ள ஆப்ஸ் காட்டப்படாது.\n\nஉங்கள் ரகசிய இடத்தைப் புதிய சாதனத்திற்கு மாற்ற முடியாது. வேறொரு சாதனத்தில் அதைப் பயன்படுத்த விரும்பினால் வேறொரு ரகசிய இடத்தை அமைக்க வேண்டும்.\n\nஉங்கள் சாதனத்தைக் கம்ப்யூட்டருடன் இணைத்தோ தீங்கிழைக்கும் ஆப்ஸை உங்கள் சாதனத்தில் நிறுவியோ யார் வேண்டுமானாலும் உங்கள் ரகசிய இடத்தை அணுகக்கூடும்."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"ரகசிய இடங்கள் மருத்துவ ஆப்ஸ் போன்ற பின்னணியில் செயல்பட வேண்டிய அல்லது அதிமுக்கிய அறிவிப்புகளை அனுப்ப வேண்டிய ஆப்ஸுக்கு ஏற்றவை அல்ல. உங்கள் இடம் பூட்டப்பட்டிருக்கும்போது அறிவிப்புகள் மற்றும் பின்னணிச் செயல்பாடு நிறுத்தப்படுவதே இதற்குக் காரணம் ஆகும்.\n\nரகசிய இடம் பூட்டப்பட்டிருக்கும்போது அனுமதி நிர்வாகம், தனியுரிமை டாஷ்போர்டு, பிற அமைப்புகள் ஆகியவற்றில் ரகசிய இடத்தில் உள்ள ஆப்ஸ் காட்டப்படாது.\n\nஉங்கள் ரகசிய இடத்தைப் புதிய சாதனத்தில் மீட்டெடுக்க முடியாது. வேறொரு சாதனத்தில் அதைப் பயன்படுத்த விரும்பினால் வேறொரு ரகசிய இடத்தை அமைக்க வேண்டும்.\n\nஉங்கள் சாதனத்தைக் கம்ப்யூட்டருடன் இணைத்தோ தீங்கிழைக்கும் ஆப்ஸை உங்கள் சாதனத்தில் நிறுவியோ யார் வேண்டுமானாலும் உங்கள் ரகசிய இடத்தை அணுகக்கூடும்."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ரகசிய இடம் குறித்து மேலும் அறிக"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"இதற்குச் சிறிது நேரம் ஆகும்"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"தனிப்பட்ட இடத்தை அமைக்கிறது…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"சாதனத்தை மீண்டும் தொடங்கவா?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"விரிவான NFC பதிவானது மேம்பாட்டு நோக்கங்களுக்காக மட்டுமே உருவாக்கப்பட்டது. பிழை அறிக்கைகளில் கூடுதல் NFC தரவு சேர்க்கப்பட்டுள்ளது. இவற்றில் தனிப்பட்ட தகவல்கள் இருக்கக்கூடும். இந்த அமைப்பை மாற்ற உங்கள் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"மீண்டும் தொடங்கு"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"மிரர், வெளிப்புற டிஸ்ப்ளே, இணைக்கப்பட்ட டிஸ்ப்ளே, USB டிஸ்ப்ளே, தெளிவுத்திறன், சுழற்சி"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"சுழற்சி"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"இயல்புநிலை"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1895,16 +1910,16 @@
<string name="available_virtual_keyboard_category" msgid="6930012948152749337">"கிடைக்கும் ஸ்கிரீன் கீபோர்டு:"</string>
<string name="add_virtual_keyboard" msgid="2515850206289352606">"ஸ்கிரீன் கீபோர்டுகளை நிர்வகியுங்கள்"</string>
<string name="keyboard_options_category" msgid="8040137073401152608">"விருப்பங்கள்"</string>
- <string name="keyboard_a11y_category" msgid="8230758278046841469">"அணுகல்தன்மை"</string>
+ <string name="keyboard_a11y_category" msgid="8230758278046841469">"மாற்றுத்திறன் வசதி"</string>
<string name="physical_keyboard_title" msgid="3328134097512350958">"கைமுறை கீபோர்டு"</string>
- <string name="show_ime" msgid="4334255501724746849">"ஸ்கிரீன் கீபோர்டைப் பயன்படுத்து"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"கைமுறை கீபோர்டு இயக்கத்தில் இருக்கும் போது இதைத் திரையில் வைத்திருக்கும்"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"பாயிண்ட்டர் ஃபில் ஸ்டைலை மஞ்சளாக மாற்றலாம்"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"பாயிண்ட்டர் ஃபில் ஸ்டைலை இளஞ்சிவப்பாக மாற்றலாம்"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"பாயிண்ட்டர் ஃபில் ஸ்டைலை நீலமாக மாற்றலாம்"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"பாயிண்டர் ஸ்ட்ரோக் ஸ்டைல்"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"வெள்ளை"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"கருப்பு"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ஏதுமில்லை"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"பயனர் தேர்ந்தெடுத்தது: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"பேச்சு"</string>
<string name="pointer_speed" msgid="7398649279282675718">"குறிப்பான் வேகம்"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"பாயிண்ட்டர் அளவு"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"பாயிண்ட்டர் அளவைக் குறைக்கும்"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"பாயிண்ட்டர் அளவை அதிகரிக்கும்"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"கேம் கன்ட்ரோலர்"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"அதிர்வைத் திசை திருப்புதல்"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"இணைக்கப்பட்டவுடன், கேம் கண்ட்ரோலருக்கு அதிர்வை அனுப்பு"</string>
@@ -2018,7 +2040,7 @@
<string name="last_time_used_label" msgid="7589377271406011659">"கடைசியாகப் பயன்படுத்தியது"</string>
<string name="last_time_used_never" msgid="2936073559267990034">"எப்போதும் இல்லை"</string>
<string name="usage_time_label" msgid="9105343335151559883">"பயன்படுத்திய நேரம்"</string>
- <string name="accessibility_settings" msgid="4713215774904704682">"அணுகல்தன்மை"</string>
+ <string name="accessibility_settings" msgid="4713215774904704682">"மாற்றுத்திறன் வசதி"</string>
<string name="accessibility_settings_title" msgid="6739115703615065716">"அணுகல்தன்மை அமைப்பு"</string>
<string name="accessibility_settings_summary" msgid="2366627644570558503">"காட்சி, உரையாடல், ஆடியோ"</string>
<string name="vision_settings_title" msgid="8919983801864103069">"காட்சி அமைப்புகள்"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"பரவாயில்லை, தொடர்க"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ரத்துசெய்"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"பெரிதாக்கல் அமைப்புகள்"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ஒரு விரலால் நகர்த்துதல்"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 விரலால் Magnifierரை நகர்த்துங்கள்"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"திரையில் எங்கேனும் நகர்த்த 1 விரலால் இழுங்கள்"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ஒரு விரலால் இழுத்து பெரிதாக்கல் பகுதியை நகர்த்தலாம்."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"இரண்டு விரல்களால் இழுத்து பெரிதாக்கல் பகுதியை நகர்த்தலாம்."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"திரையின் ஒரு பகுதியை மட்டும் பெரிதாக்கும்போது இருக்காது"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"திரையைப் பெரிதாக்க, பட்டனைத் தட்டவும்"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"உள்ளடக்கத்தை மேலும் தெளிவாகக் காட்ட திரையைப் பெரிதாக்கலாம்"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>பெரிதாக்க:</b><br/> {0,number,integer}. பெரிதாக்கத் தொடங்குவதற்கு ஷார்ட்கட்டைப் பயன்படுத்தவும்<br/> {1,number,integer}. திரையைத் தட்டவும்<br/> {2,number,integer}. திரையில் நகர்த்த இரு விரல்களால் இழுக்கவும்<br/> {3,number,integer}. அளவை மாற்ற இரு விரல்களால் பின்ச் செய்யவும்<br/> {4,number,integer}. பெரிதாக்குவதை நிறுத்த ஷார்ட்கட்டைப் பயன்படுத்தவும்<br/><br/> <b>தற்காலிகமாகப் பெரிதாக்க:</b><br/> {0,number,integer}. பெரிதாக்கல் வகை முழுத்திரைக்கு அமைக்கப்பட்டிருப்பதை உறுதிசெய்து கொள்ளவும்<br/> {1,number,integer}. பெரிதாக்கத் தொடங்குவதற்கு ஷார்ட்கட்டைப் பயன்படுத்தவும்<br/> {2,number,integer}. திரையில் எங்கேனும் தொட்டுப் பிடித்திருக்கவும்<br/> {3,number,integer}. திரையில் எங்கேனும் செல்ல விரலை நகர்த்தவும்<br/> {4,number,integer}. பெரிதாக்குவதை நிறுத்த விரலைத் திரையிலிருந்து எடுக்கவும்"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>பெரிதாக்க:</b><br/> {0,number,integer}. பெரிதாக்கலைத் தொடங்க, ஷார்ட்கட் பயன்படுத்தவும்<br/> {1,number,integer}. திரையைத் தட்டவும்<br/> {2,number,integer}. திரையில் எங்கேனும் நகர்த்த 2 விரல்களால் இழுக்கவும்<br/> {3,number,integer}. அளவை மாற்ற 2 விரல்களால் பின்ச் செய்யவும்<br/> {4,number,integer}. பெரிதாக்கலை நிறுத்த, ஷார்ட்கட் பயன்படுத்தவும்<br/><br/> தற்காலிகமாகப் பெரிதாக்கலாம், பலவற்றைச் செய்யலாம்."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>பெரிதாக்க:</b><br/> {0,number,integer}. பெரிதாக்கலைத் தொடங்க, ஷார்ட்கட் பயன்படுத்தவும்<br/> {1,number,integer}. திரையைத் தட்டவும்<br/> {2,number,integer}. திரையில் எங்கேனும் நகர்த்த 1 அல்லது 2 விரல்களால் இழுக்கவும்<br/> {3,number,integer}. அளவை மாற்ற 2 விரல்களால் பின்ச் செய்யவும்<br/> {4,number,integer}. பெரிதாக்கலை நிறுத்த, ஷார்ட்கட் பயன்படுத்தவும்<br/><br/> தற்காலிகமாகப் பெரிதாக்கலாம், பலவற்றைச் செய்யலாம்."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"’பெரிதாக்கல்’ அம்சம் ஆன் செய்யப்பட்டுள்ளபோது திரையைப் பெரிதாக்கிப் பார்க்கலாம்.\n\n"<b>"அதற்கு "</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தட்டவும்.\n"<ul><li>"ஸ்க்ரோல் செய்ய இரண்டு அல்லது மேற்பட்ட விரல்களில் இழுக்கவும்"</li>\n<li>"அளவை மாற்ற இரண்டு அல்லது மேற்பட்ட விரல்களில் பின்ச் செய்யவும்"</li></ul>\n\n<b>"தற்காலிகமாகப் பெரிதாக்க"</b>", இந்த அம்சத்தைத் தொடங்கி திரையில் எங்கு வேண்டுமானாலும் தொட்டுப் பிடிக்கவும்.\n"<ul><li>"திரையில் எங்கு வேண்டுமானாலும் செல்ல இழுக்கவும்"</li>\n<li>"சிறிதாக்க விரல்களால் பின்ச் செய்து மேலே இழுக்கவும்"</li></ul>\n\n"கீபோர்டிலோ வழிசெலுத்தல் பட்டியையோ பெரிதாக்க இயலாது."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"பக்கம் <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"அணுகல்தன்மை பட்டனுக்கான ஷார்ட்கட்"</string>
@@ -2627,7 +2652,7 @@
<string name="battery_level_percentage" msgid="1433178290838842146">"பேட்டரி நிலை சதவீதம்: <xliff:g id="START_PERCENTAGE">%1$s</xliff:g> முதல் <xliff:g id="END_PERCENTAGE">%2$s</xliff:g> வரை"</string>
<string name="battery_usage_breakdown_title_since_last_full_charge" msgid="435006273323199906">"கடைசியாக பேட்டரியை முழுவதுமாகச் சார்ஜ் செய்ததிலிருந்து அதன் உபயோகம் குறித்த விவரம்"</string>
<string name="battery_usage_breakdown_title_for_slot" msgid="4823179483667671406">"<xliff:g id="SLOT">%s</xliff:g>க்கான பேட்டரி உபயோகம்"</string>
- <string name="screen_time_category_last_full_charge" msgid="8856908320256057753">"கடைசியாக முழுமையாகச் சார்ஜ் செய்யப்பட்டதிலிருந்து சாதனத்தைப் பயன்படுத்திய நேரம்"</string>
+ <string name="screen_time_category_last_full_charge" msgid="8856908320256057753">"கடைசி முழு சார்ஜிற்குப் பின்னர் பயன்படுத்திய நேரம்"</string>
<string name="screen_time_category_for_slot" msgid="8287722270554654959">"<xliff:g id="SLOT">%s</xliff:g>க்கான சாதன உபயோக நேரம்"</string>
<string name="battery_usage_spinner_view_by_apps" msgid="8769276544072098082">"ஆப்ஸ் வாரியாகக் காட்டு"</string>
<string name="battery_usage_spinner_view_by_systems" msgid="7904104223212160541">"சிஸ்டங்கள் வாரியாகக் காட்டு"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{எதுவுமில்லை}=1{1 திட்டமிடல் அமைக்கப்பட்டுள்ளது}other{# திட்டமிடல்கள் அமைக்கப்பட்டுள்ளன}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"தொந்தரவு செய்யாதே"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"முன்னுரிமைப் பயன்முறைகள்"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"பயன்முறையைச் சேர்"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"முக்கியமான நபர்கள் மற்றும் ஆப்ஸிலிருந்து மட்டும் அறிவிப்புகளைப் பெறுங்கள்"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"செயல்படுத்துதல் வகையைத் தேர்ந்தெடுங்கள்"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"நேரம்"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"எ.கா. \"9:30 AM – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"கேலெண்டர்"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"எ.கா. \"தனிப்பட்ட கேலெண்டர்\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"பயன்முறையை உருவாக்குதல்"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"பிரத்தியேகம்"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"குறுக்கீடுகளைக் குறைத்தல்"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"தொந்தரவு செய்ய வேண்டாம் என்பதை ஆன் செய்யும்"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"அலாரங்களும் மீடியா ஒலிகளும் குறுக்கிட முடியும்"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"நேர அட்டவணைகள்"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"திட்டமிட்டவைகளை நீக்கு"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"நீக்கு"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"பெயர் மாற்று"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"நீக்கு"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" பயன்முறையை நீக்கவா?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"மாற்று"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"திட்டமிடல்"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"திட்ட அட்டவணை"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"கேலெண்டரைச் சேருங்கள்"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"உங்கள் கேலெண்டரைப் பயன்படுத்துங்கள்"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"திட்டமிடுதல்"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"திட்ட அட்டவணையை அமையுங்கள்"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"திட்டமிடுங்கள்"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ம.நே <xliff:g id="MINUTES">%2$d</xliff:g> நிமி"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"தானாகவே இயக்குதல்"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"நேர அட்டவணை"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"குறிப்பிட்ட நேரத்தில் ஒலி முடக்கு"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'தொந்தரவு செய்ய வேண்டாம்’ விதிகளை அமைத்தல்"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"ஒலியுடன் உள்ள குறுக்கீடுகளை அனுமதி"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"விஷுவல் குறுக்கீடுகளைத் தடு"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"விஷுவல் சிக்னல்களை அனுமதி"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"உங்களுக்கு வரும் அறிவிப்புகள்"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"கவனமாக இருங்கள்"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"கூடுதல் செயல்கள்"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ஆஃப்}=1{ஆஃப் / 1 பயன்முறை தானாக ஆன் ஆகலாம்}other{ஆஃப் / # பயன்முறைகள் தானாக ஆன் ஆகலாம்}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"டிஸ்பிளே அமைப்புகள்"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"டிஸ்பிளே விருப்பங்கள்"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"கிரேஸ்கேல்"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"டார்க் தீமினை இயக்கு"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"டார்க் பின்னணியில் பிரகாசமான வார்த்தைகளைப் பார்ப்பதற்கு ஏற்றவாறு OS மற்றும் ஆப்ஸை மாற்றவும். இது கண்களுக்கான சிரமத்தைக் குறைக்கலாம் மற்றும் சில சாதனங்களில் கணிசமான பேட்டரி சேமிப்பையும் வழங்கலாம்."</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"அறிவிப்புகளை ஃபில்டர் செய்தல்"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"அறிவிப்புகள் எதுவும் ஃபில்டர் செய்யப்படவில்லை"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"அறிவிப்பைத் திறக்கும்"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"அறிவிப்புகளை ஸ்னூஸ் செய்ய அனுமதி"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ஆப்ஸ் ஐகானில் அறிவிப்பு புள்ளி"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"அறிவிப்புத் தொகுப்புகள்"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"குமிழ்கள்"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"குமிழ்கள்"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"இந்த உரையாடலைக் குமிழாக்கு"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"இந்த ஆப்ஸ் மேம்படுத்தப்பட்ட அமைப்புகளை ஆதரிக்காது"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"கூடுதல் அமைப்புகள்"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"இந்த ஆப்ஸில் கூடுதல் அமைப்புகள் உள்ளன"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"அறிவிப்புக்கான கூல்டவுன்"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"பணிக் கணக்குகளுக்குப் பயன்படுத்துதல்"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"பணிக் கணக்கு ஆப்ஸுக்குப் பயன்படுத்தும்"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"வகைகள்"</string>
<string name="notification_channels_other" msgid="18159805343647908">"மற்றவை"</string>
<string name="no_channels" msgid="4716199078612071915">"இந்த ஆப்ஸ் எந்த அறிவிப்புகளையும் இடுகையிடவில்லை"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"பயன்படுத்தப்படாத வகைகளைக் காட்டு"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ஆப்ஸில் உள்ள கூடுதல் அமைப்புகள்"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"பயன்படுத்தப்படாத வகைகளைக் காட்டு"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"பயன்படுத்தப்படாத வகைகளை மறை"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"குறுக்கிட முடிகின்ற ஆப்ஸ்"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"தேர்ந்தெடுக்கப்பட்ட ஆப்ஸ்"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"எதுவுமில்லை"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"அனைத்தும்"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ஆப்ஸை மீறிச் செயல்பட அனுமதிக்கின்றன"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"குறுக்கிட முடிகின்ற ஆப்ஸ்"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"கூடுதல் ஆப்ஸைத் தேர்ந்தெடுங்கள்"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"எதுவும் குறுக்கிட முடியாது"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"யாரும் குறுக்கிட முடியாது"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"சிலரால் குறுக்கிட முடியும்"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"அனைவரும் குறுக்கிட முடியும்"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"மீண்டும் அழைப்பவர்களை அனுமதி"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} வரை ஒரு மணிநேரத்திற்கு மட்டும் அலாரங்கள் என மாற்றும்}other{{time} வரை # மணிநேரத்திற்கு மட்டும் அலாரங்கள் என மாற்றும்}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"எப்போதும் குறுக்கிடு என மாற்று"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"திருத்துதல் பயன்முறை"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"சேர்த்தல் பயன்முறை"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"பிரத்தியேகப் பயன்முறை"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"பயன்முறையின் பெயர்"</string>
<string name="warning_button_text" msgid="1274234338874005639">"எச்சரிக்கும்"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"மூடுக"</string>
<string name="device_feedback" msgid="5351614458411688608">"சாதனம் பற்றி கருத்தை அனுப்புக"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"கட்டாய டெஸ்க்டாப் பயன்முறை"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"இரண்டாம்நிலை திரைகளில் \'கட்டாயப் பரிசோதனை டெஸ்க்டாப்\' பயன்முறை"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"குறிப்பிட்ட வடிவமில்லாத சாளரங்களை இயக்குதல்"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"குறிப்பிட்ட வடிவமில்லாத சாளரங்களுக்கான ஆதரவை இயக்கலாம்."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"குறிப்பிட்ட வடிவமில்லாத சாளரத்தை இரண்டாம் திரையில் இயக்குதல்"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"குறிப்பிட்ட வடிவமில்லாத சாளரத்தை இரண்டாம் நிலைத் திரையில் மட்டும் இயக்குதல்."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"அளவு மாற்ற இயலாதவற்றைப் பல சாளரத்தில் இயக்கு"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"அளவு மாற்ற இயலாத ஆப்ஸைப் பல சாளரத்தில் இயக்க அனுமதிக்கும்"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark அம்சத்தை மீறிச் செயல்படுதல்"</string>
@@ -4860,7 +4907,7 @@
<string name="track_frame_time_keywords" msgid="7885340257945922239">"GPU"</string>
<string name="enable_16k_pages" msgid="8001470927566110689">"16 கி.பை. பக்க அளவுடன் தொடங்குதல்"</string>
<string name="enable_16k_pages_summary" msgid="1964363364670306912">"16 கி.பை. கெர்னல் மூலம் சாதனத்தைத் தொடங்கும்"</string>
- <string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"4 கி.பை. பயன்முறையில் இருந்து 16 கி.பை. பயன்முறைக்கு மாறவா?"</string>
+ <string name="confirm_enable_16k_pages_title" msgid="611010487387251491">"4KB மோடில் இருந்து 16KB மோடிற்கு மாறவா?"</string>
<string name="confirm_enable_16k_pages_text" msgid="6129208614283750541">"4 கி.பை. கெர்னலை இயக்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள் மற்றும் 16 கி.பை. பயன்முறைக்கு மாறுகிறீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இது சாதனத்தை மறுபடி தொடங்கும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குச் சாதனத்தை அமைக்க 4 கி.பை. பயன்முறைக்கு மாறி பூட்லோடரைப் பூட்டவும், இது சாதனத்தை ஆரம்பநிலைக்கு மீட்டமைக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும்."</string>
<string name="confirm_enable_4k_pages_title" msgid="3210360137887034659">"16 கி.பை. பயன்முறையில் இருந்து 4 கி.பை. பயன்முறைக்கு மாறுதல்"</string>
<string name="confirm_enable_4k_pages_text" msgid="155070605667160083">"16 கி.பை. கெர்னலை இயக்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள், 4 கி.பை. பயன்முறைக்கு மாறுகிறீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இது சாதனத்தை மறுபடி தொடங்கும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குச் சாதனத்தை அமைக்க பூட்லோடரைப் பூட்ட வேண்டும், இது சாதனத்தை ஆரம்பநிலைக்கு மீட்டமைக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும்."</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 கி.பை. டெவெலப்பர் விருப்பத்தைப் பயன்படுத்தும் முன்பு இந்தச் சாதனத்தின் தரவுப் பிரிப்பு ext4 ஃபைல் அமைப்பிற்கு மாற்றப்பட வேண்டும். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். 16 கி.பை. விருப்பத்தைச் செயல்படுத்த, இதற்குப் பின் மீண்டும் ஒருமுறை மறுபடி தொடங்க வேண்டும். இந்தப் பயன்முறையில் இருக்கும்போது, ஒருமுறை மறுபடி தொடங்கி 4 கி.பை. மற்றும் 16 கி.பை. இடையே முன்னும் பின்னும் மாறிக்கொள்ளலாம். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குச் சாதனத்தை அமைக்க 4 கி.பை. பயன்முறைக்கு மாறி பூட்லோடரைப் பூட்டுங்கள், இது சாதனத்தை ஆரம்பநிலைக்கு மீட்டமைக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும். சாதனம் படிக்க முடியாதபடி செய்யப்படும் மற்றும் உறுதிசெய்த பின் ஃபைல் அமைப்பு ext4 ஃபைல் அமைப்பிற்கு மாற்றப்படும். இது முடிந்ததும், மீண்டும் வந்து 16 கி.பை பயன்முறையை இயக்க வேண்டும்."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"அனைத்துத் தரவையும் அழி"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"தரவுப் பிரிப்பை ext4 ஃபைல் அமைப்பிற்கு மாற்றியமைக்கவும் படிக்க முடியாதபடி செய்யவும் முடியவில்லை."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 கி.பை. பயன்முறை வேண்டுமெனில் பூட்லோடர் அன்லாக் செய்யப்பட வேண்டும்"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"பூட்லோடர் அன்லாக் தேவை"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 கி.பை. டெவெலப்பர் விருப்பத்தைப் பயன்படுத்தத் தொடங்கும் முன் இந்தச் சாதனத்தில் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்க வேண்டும். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். 16 கி.பை. பயன்முறையைச் செயல்படுத்தும்போது அனைத்துப் பயனர் தரவும் அமைப்புகளும் படிக்க முடியாதபடி செய்யப்படும். பூட்லோடர் அன்லாக் செய்யப்பட்டதும், 16 கி.பை. விருப்பத்தைச் செயல்படுத்த இருமுறை மறுபடி தொடங்க வேண்டும். இந்தப் பயன்முறையில் இருக்கும்போது, ஒருமுறை மறுபடி தொடங்கி 4 கி.பை. மற்றும் 16 கி.பை. இடையே முன்னும் பின்னும் மாறிக்கொள்ளலாம். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குச் சாதனத்தை அமைக்க 4 கி.பை. பயன்முறைக்கு மாற்ற வேண்டும். பின்பு OEM/பூட்லோடர் (சாதனத்தை ஆரம்பநிலைக்கு மீட்டமைக்கும்) சாதனத்தைப் பூட்டும். பூட்லோடரை அன்லாக் செய்து மீண்டும் முயலவும். இங்கே இதைச் செய்யும் வழிமுறையைப் பார்க்கலாம்: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 கி.பை. பக்கம் சாராத பயன்முறையைப் பயன்படுத்துகிறது"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"4 கி.பை. இல் இயங்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். மேலும் படிக்க தட்டவும்."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"4 கி.பை. இல் இயங்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். இது சாதனத்தை மீண்டும் ஆரம்பநிலைக்கு மீட்டமைக்கும் மற்றும் தயாரிப்பு அமைப்புகளுக்கு மீட்டெடுக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும். சாதனம் Androidல் தொடங்கவில்லை அல்லது நிலையற்றதாக இருந்தால் <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> பக்கத்தில் இருந்து சமீபத்திய ஃபேக்டரி பிரதியுடன் சாதனத்தை மீண்டும் ஃபிளாஷ் செய்யவும் அல்லது <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> இணைப்பைப் பயன்படுத்தி \'சாதனத்தைப் படிக்க முடியாதபடி செய்\', \'பூட்லோடரைப் பூட்டு\' மற்றும் \'அனைத்துப் பிரிப்பையும் வேகமாக ஃபிளாஷ் செய்\' என்பதைத் தேர்ந்தெடுக்கவும்."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 கி.பை. பக்கம் சாராத பயன்முறையைப் பயன்படுத்துகிறது"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"16 கி.பை. இல் இயங்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, 4K பயன்முறைக்கு அமைத்து சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். மேலும் படிக்க தட்டவும்."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"16 கி.பை. இல் இயங்கும் பக்கம் சாராத பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, 4K பயன்முறைக்கு அமைத்து சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். இது சாதனத்தை மீண்டும் ஆரம்பநிலைக்கு மீட்டமைக்கும் மற்றும் தயாரிப்பு அமைப்புகளுக்கு மீட்டெடுக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும். சாதனம் Androidல் தொடங்கவில்லை அல்லது நிலையற்றதாக இருந்தால் <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> பக்கத்தில் இருந்து சமீபத்திய ஃபேக்டரி பிரதியுடன் சாதனத்தை மீண்டும் ஃபிளாஷ் செய்யவும் அல்லது <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> இணைப்பைப் பயன்படுத்தி \'சாதனத்தைப் படிக்க முடியாதபடி செய்\', \'பூட்லோடரைப் பூட்டு\' மற்றும் \'அனைத்துப் பிரிப்பையும் வேகமாக ஃபிளாஷ் செய்\' என்பதைத் தேர்ந்தெடுக்கவும்."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"பக்கம் சாராத பயன்முறையின் 16 கி.பை. பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, 4 கி.பை. பயன்முறைக்கு அமைத்து சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். மேலும் படிக்க தட்டவும்."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"பக்கம் சாராத பயன்முறையின் 16 கி.பை. பயன்முறையில் உள்ளீர்கள். இந்தப் பயன்முறையில் மென்பொருளின் முழுமைத்தன்மைக்கு உத்திரவாதம் இல்லை. அத்துடன் பூட்லோடர் அன்லாக் செய்யப்பட்டிருக்கும்போது மொபைலில் சேமிக்கப்பட்ட அனைத்துத் தரவும் ஆபத்தில் இருக்கக்கூடும். இந்தப் பயன்முறைகளில் சில அம்சங்கள் முடக்கப்படும் என்பதால் சில ஆப்ஸ் வேலை செய்யாமல் போகக்கூடும். தயாரிப்புப் பயன்முறைக்குத் திரும்ப, 4 கி.பை. பயன்முறைக்கு அமைத்து சாதனத்தின் பூட்லோடரைப் பூட்ட வேண்டும். இது சாதனத்தை மீண்டும் ஆரம்பநிலைக்கு மீட்டமைக்கும் மற்றும் தயாரிப்பு அமைப்புகளுக்கு மீட்டெடுக்கும். சாதனம் Androidல் தொடங்கியதும், டெவெலப்பர் விருப்பங்களில் OEM அன்லாக்கை முடக்கவும். சாதனம் Androidல் தொடங்கவில்லை அல்லது நிலையற்றதாக இருந்தால் <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> பக்கத்தில் இருந்து சமீபத்திய ஃபேக்டரி பிரதி மூலம் சாதனத்தை மீண்டும் ஃபிளாஷ் செய்யவும் அல்லது <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> இணைப்பைப் பயன்படுத்தி \'சாதனத்தைப் படிக்க முடியாதபடி செய்\', \'பூட்லோடரைப் பூட்டு\' மற்றும் \'அனைத்துப் பார்டிஷன்களையும் வேகமாக ஃபிளாஷ் செய்\' என்பதைத் தேர்ந்தெடுக்கவும்."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 கி.பை. பக்கம் சாராத பயன்முறை"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"மேலும் காட்டு"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"பிழை அறிக்கை ஹேண்ட்லர்"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ஆப்ஸைப் பின் செய்தல் அம்சத்தைப் பயன்படுத்துதல்"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"டெவெலப்பர் விருப்பங்களைப் பயன்படுத்துதல்"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"பிரிண்ட் சேவையைப் பயன்படுத்துதல்"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"பல பயனர்களை அனுமதித்தல்"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"பயனர் மாற்றத்தை அனுமதித்தல்"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"அனுமதி, ஒன்றுக்கும் மேற்பட்ட, பயனர், அனுமதித்தல், பல"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"பல, பயனர்கள், சுயவிவரங்கள், நபர்கள், கணக்குகள், சுவிட்ச், பல"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"வைஃபை பிழைதிருத்தத்தைப் பயன்படுத்துதல்"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"உங்கள் டேப்லெட் டாக் செய்யப்பட்டிருக்கும்போது திரையில் என்ன காட்டப்பட வேண்டும் என்பதைத் தேர்வுசெய்யலாம். ஸ்கிரீன் சேவரைப் பயன்படுத்தும்போது உங்கள் சாதனம் அதிக பேட்டரியைப் பயன்படுத்தக்கூடும்."</string>
<string name="customize_button_title" msgid="1110284655990203359">"தனிப்பயனாக்கு"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> ஐப் பிரத்தியேகமாக்கும்"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"குறிப்பிட்ட வடிவமில்லாத சாளரங்களுக்கான ஆதரவை இயக்க சாதனத்தை மீண்டும் தொடங்கவும்."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"இரண்டாம் நிலைத் திரையில் டெஸ்க்டாப் பயன்முறையைப் பயன்படுத்த, சாதனத்தை மீண்டும் தொடங்குதல் அவசியம்."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"குறிப்பிட்ட வடிவமில்லாத பழைய சாளரத்திற்கான ஆதரவை இயக்க, சாதனத்தை மீண்டும் தொடங்கவும்."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"குறிப்பிட்ட வடிவமில்லாத சாளரத்திற்கான ஆதரவை மாற்ற, சாதனத்தை மீண்டும் தொடங்கவும்."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"இரண்டாம் நிலைத் திரையில் குறிப்பிட்ட வடிவமில்லாத சாளரத்தைப் பயன்படுத்த, சாதனத்தை மீண்டும் தொடங்கவும்."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"இப்போதே மீண்டும் தொடங்கு"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"பிறகு மீண்டும் தொடங்கு"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"சுற்றிலும் கேட்கும் ஆடியோ"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"இயக்கப்பட்டுள்ளது"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"முடக்கப்பட்டுள்ளது"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"இயக்கப்பட்டுள்ளது"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ஆடியோ %1$d%% இடது, %2$d%% வலது"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ஆடியோ %1$d%% வலது, %2$d%% இடது"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"நீங்கள் நிறுவிய ஆப்ஸால் உங்கள் சாதனத்தின் பெயரைப் பார்க்க முடியும். புளூடூத் சாதனங்கள், வைஃபை நெட்வொர்க் ஆகியவற்றுடன் இணைக்கும்போதோ வைஃபை ஹாட்ஸ்பாட்டை அமைக்கும்போதோ அப்பெயர் பிறருக்கும் காட்டப்படக்கூடும்."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"இலக்கணப் பாலினம்"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"இலக்கணப் பாலினத்தைத் தேர்ந்தெடுத்தல்"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"அமைப்புகளைத் தேடுங்கள்"</string>
</resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 81b0df0..81f5c39 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"నిద్రించే సమయం"</item>
+ <item msgid="4152450357280759894">"డ్రైవింగ్"</item>
+ <item msgid="7096549258219399423">"లీనమయ్యే"</item>
+ <item msgid="2760716776980432977">"మేనేజ్ చేయబడిన ఇమేజ్లు"</item>
+ <item msgid="601734478369121764">"స్టార్ పెట్టండి"</item>
+ <item msgid="6243809315432780521">"క్యాలెండర్"</item>
+ <item msgid="4913577903148415331">"సమయం"</item>
+ <item msgid="3653377604690057780">"థియేటర్"</item>
+ <item msgid="3843711267408385410">"పువ్వు"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a15b48e..baae53d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"పరికరం డిస్కనెక్ట్ చేయాలా?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"కొత్త పరికరాన్ని పెయిర్ చేయండి"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"బ్లూటూత్"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"రేపు ఆటోమేటిక్గా ఆన్ చేయండి"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"వినికిడి పరికర సెట్టింగ్లు"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"షార్ట్కట్, వినికిడి పరికరంతో అనుకూలత"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ప్రీసెట్"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"మీ ఆడియాలజిస్ట్ ప్రోగ్రామ్ చేసిన ప్రీసెట్లు ఏవీ లేవు"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ప్రీసెట్ను అప్డేట్ చేయడం సాధ్యపడలేదు"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"ఆడియో అవుట్పుట్"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"ఆడియో అవుట్పుట్ గురించి"</string>
@@ -134,11 +134,11 @@
<string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"బ్లూటూత్ ఆన్ చేయబడింది"</string>
<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_device_details_title" msgid="7618295136015480864">"స్టయిలస్"</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>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ఆఫ్"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{ఆన్లో ఉంది / # యాప్నకు లొకేషన్కు యాక్సెస్ ఉంది}other{ఆన్లో ఉంది / # యాప్లకు లొకేషన్కు యాక్సెస్ ఉంది}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"లోడ్ చేస్తోంది…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"సమీపంలోని పరికరాలను యాక్సెస్ చేసే అనుమతి గల యాప్లు, కనెక్ట్ అయిన పరికరాలు ఎంత దూరంలో ఉన్నాయో తెలుసుకోగలవు."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"సమీప పరికరాల అనుమతి ఉన్న యాప్లు కనెక్ట్ అయిన పరికరాల అంచనా స్థానాన్ని నిర్ణయించగలవు."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"యాప్లు, సర్వీస్లకు లొకేషన్ యాక్సెస్ ఆఫ్ చేయబడింది. మీరు ఎమర్జెన్సీ నంబర్కు కాల్ చేసినా లేదా SMS పంపినా, అత్యవసర సమయాలలో స్పందించే వారికి ఆటోమేటిక్గా మీ పరికర లొకేషన్ పంపబడుతుంది."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"లొకేషన్ సెట్టింగ్ల గురించి మరింత తెలుసుకోండి"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"మార్చడానికి ChromeOS సెట్టింగ్లు > గోప్యత, సెక్యూరిటీ > గోప్యతా కంట్రోల్స్ను > లొకేషన్ యాక్సెస్కు వెళ్లండి"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"ముఖం, <xliff:g id="WATCH">%s</xliff:g> జోడించబడ్డాయి"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"ముఖం, వేలిముద్ర, <xliff:g id="WATCH">%s</xliff:g> జోడించబడ్డాయి"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"ముఖం, వేలిముద్రలు, <xliff:g id="WATCH">%s</xliff:g> జోడించబడ్డాయి"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ఐడెంటిటీ చెక్ ఆన్లో ఉన్నందున ఇలా చేయడం అవసరం"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"రిమోట్ ప్రామాణీకరణదారు అన్లాక్"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"వాచ్ జోడించబడింది"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"మీ వాచ్ను సెటప్ చేయండి"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"వాచ్ అన్లాక్ గురించి మరింత తెలుసుకోండి"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"వాచ్ను జోడించండి"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"వాచ్ను తీసివేయండి"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"వేలిముద్ర & ఫేస్ అన్లాక్"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"ఫేస్ & వేలిముద్ర అన్లాక్"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"వర్క్ ప్రొఫైల్ కోసం ముఖం & వేలిముద్ర అన్లాక్"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"సెటప్ అవసరం"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"ముఖం, వేలిముద్రలు జోడించబడ్డాయి"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"యాప్లను ఇన్స్టాల్ చేయండి"</b>\n"మీ స్పేస్లో మీరు ప్రైవేట్గా ఉంచాలనుకునే యాప్లను ఇన్స్టాల్ చేయండి"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"గుర్తుంచుకోండి"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"మీ స్పేస్ను మీరు లాక్ చేసినప్పుడు యాప్లు ఆగిపోతాయి"</b>\n"మీ స్పేస్ను మీరు లాక్ చేసినప్పుడు, మీ స్పేస్లోని యాప్లు ఆగిపోతాయి, వాటి నుండి మీకు నోటిఫికేషన్లు రావు"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"బ్యాక్గ్రౌండ్లో రన్ చేయాల్సిన లేదా అతి ముఖ్యమైన నోటిఫికేషన్లను పంపే యాప్లకు ప్రైవేట్ స్పేస్లు తగినవి కావు, ఉదాహరణకు, మెడికల్ యాప్లు. ఎందుకంటే మీ స్పేస్ లాక్ చేయబడినప్పుడు నోటిఫికేషన్లతో పాటు, బ్యాక్గ్రౌండ్లో యాక్టివిటీ ఆగిపోతుంది.\n\nమీ ప్రైవేట్ స్పేస్ లాక్ అయినప్పుడు మీ ప్రైవేట్ స్పేస్లోని యాప్లు అనుమతి మేనేజర్, గోప్యతా డ్యాష్బోర్డ్, ఇతర సెట్టింగ్లలో కనిపించవు.\n\nమీ ప్రైవేట్ స్పేస్ను కొత్త పరికరానికి తరలించడం సాధ్యం కాదు. మీరు దానిని మరొక పరికరంలో ఉపయోగించాలంటే, మరొక ప్రైవేట్ స్పేస్ను సెటప్ చేయవలసి ఉంటుంది.\n\nమీ పరికరాన్ని కంప్యూటర్కు కనెక్ట్ చేసే లేదా మీ పరికరంలో హానికరమైన యాప్లను ఇన్స్టాల్ చేసే ఎవరైనా మీ ప్రైవేట్ స్పేస్ను యాక్సెస్ చేయగలరు."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"బ్యాక్గ్రౌండ్లో రన్ చేయాల్సిన లేదా అతి ముఖ్యమైన నోటిఫికేషన్లను పంపే యాప్లకు ప్రైవేట్ స్పేస్లు తగినవి కావు, ఉదాహరణకు, మెడికల్ యాప్లు. ఎందుకంటే మీ స్పేస్ లాక్ చేయబడినప్పుడు నోటిఫికేషన్లతో పాటు, బ్యాక్గ్రౌండ్లో యాక్టివిటీ ఆగిపోతుంది.\n\nమీ ప్రైవేట్ స్పేస్ లాక్ అయినప్పుడు మీ ప్రైవేట్ స్పేస్లోని యాప్లు అనుమతి మేనేజర్, గోప్యతా డ్యాష్బోర్డ్, ఇతర సెట్టింగ్లలో కనిపించవు.\n\nమీ ప్రైవేట్ స్పేస్ను కొత్త పరికరానికి రీస్టోర్ చేయడం సాధ్యం కాదు. మీరు దానిని మరొక పరికరంలో ఉపయోగించాలంటే, మరొక ప్రైవేట్ స్పేస్ను సెటప్ చేయవలసి ఉంటుంది.\n\nమీ పరికరాన్ని కంప్యూటర్కు కనెక్ట్ చేసే లేదా మీ పరికరంలో హానికరమైన యాప్లను ఇన్స్టాల్ చేసే ఎవరైనా మీ ప్రైవేట్ స్పేస్ను యాక్సెస్ చేయగలరు."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ప్రైవేట్ స్పేస్ గూర్చి మరింత తెలుసుకోండి"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"దీనికి కొన్ని క్షణాలు పడుతుంది"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"ప్రైవేట్ స్పేస్ సెటప్ ప్రోగ్రెస్లో ఉంది…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"పరికరాన్ని రీస్టార్ట్ చేయాలా?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"వివరణాత్మక NFC లాగింగ్ అనేది, యాప్ డెవలప్మెంట్ ప్రయోజనాల కోసం మాత్రమే ఉద్దేశించబడింది. బగ్ రిపోర్ట్లలో అదనపు NFC డేటా చేర్చబడుతుంది, ఇందులో ప్రైవేట్ సమాచారం ఉండవచ్చు. ఈ సెట్టింగ్ను మార్చడానికి మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"రీస్టార్ట్ చేయండి"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"మిర్రర్,బాహ్య డిస్ప్లే,కనెక్టెడ్ డిస్ప్లే,USB డిస్ప్లే,రిజల్యూషన్,రొటేషన్"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"రొటేషన్"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"స్టాండర్డ్"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"స్క్రీన్పై కీబోర్డ్ను ఉపయోగించండి"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"ఫిజికల్ కీబోర్డ్ యాక్టివ్గా ఉన్నప్పుడు దీన్ని స్క్రీన్పై ఉంచుతుంది"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"పాయింటర్ ఫిల్ స్టయిల్ను పసుపు రంగుకి మార్చండి"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"పాయింటర్ ఫిల్ స్టయిల్ను గులాబీ రంగుకి మార్చండి"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"పాయింటర్ ఫిల్ స్టయిల్ను నీలం రంగుకి మార్చండి"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"పాయింటర్ స్ట్రోక్ స్టయిల్"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"తెలుపు రంగు"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"నలుపు రంగు"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ఏదీ వద్దు"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"యూజర్ ఎంచుకున్నది: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"స్పీచ్"</string>
<string name="pointer_speed" msgid="7398649279282675718">"పాయింటర్ వేగం"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"పాయింటర్ స్కేల్"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"పాయింటర్ స్కేల్ను తగ్గించండి"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"పాయింటర్ స్కేల్ను పెంచండి"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"గేమ్ కంట్రోలర్"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"వైబ్రేషన్ దారి మళ్లించు"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"కనెక్ట్ చేసినప్పుడు గేమ్ కంట్రోలర్కు వైబ్రేషన్ని పంపు"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ఏదేమైనా కొనసాగించండి"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"రద్దు చేయండి"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"మ్యాగ్నిఫికేషన్ సెట్టింగ్లు"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ఒక వేలుతో ఫ్యాన్ చేయడం"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"మ్యాగ్నిఫయర్ను 1 వేలితో కదపండి"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"స్క్రీన్ చుట్టూ కదిలేందుకు 1 వేలితో లాగండి"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ఒక వేలును లాగడం ద్వారా జూమ్ ప్రాంతాన్ని తరలించండి."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"రెండు వేళ్లతో లాగడం ద్వారా జూమ్ ప్రాంతాన్ని తరలించండి."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"స్క్రీన్లో కొంత భాగాన్ని మాత్రమే మాగ్నిఫై చేస్తున్నప్పుడు అందుబాటులో ఉండదు"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"జూమ్ చేయడం కోసం బటన్ని నొక్కండి"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"కంటెంట్ను పెద్దదిగా చేయడానికి స్క్రీన్పై త్వరగా జూమ్ - ఇన్ చేయండి"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>జూమ్ చేయడానికి:</b><br/> {0,number,integer}. మ్యాగ్నిఫికేషన్ను ప్రారంభించడానికి షార్ట్కట్ను ఉపయోగించండి<br/> {1,number,integer}. స్క్రీన్ను ట్యాప్ చేయండి<br/> {2,number,integer}. స్క్రీన్ చుట్టూ కదిలేందుకు 2 వేళ్లతో లాగండి<br/> {3,number,integer}. జూమ్ చేయడాన్ని సర్దుబాటు చేయడానికి 2 వేళ్లతో స్క్రీన్ను నియంత్రించండి<br/> {4,number,integer}. మ్యాగ్నిఫికేషన్ను ఆపివేయడానికి షార్ట్కట్ను ఉపయోగించండి<br/><br/><b>తాత్కాలికంగా జూమ్ చేయడానికి:</b><br/> {0,number,integer}. మీ మ్యాగ్నిఫికేషన్ రకం ఫుల్ స్క్రీన్కు సెట్ చేయబడిందని నిర్ధారించుకోండి<br/> {1,number,integer}. మ్యాగ్నిఫికేషన్ను ప్రారంభించడానికి షార్ట్కట్ను ఉపయోగించండి<br/> {2,number,integer}. స్క్రీన్పై ఎక్కడైనా తాకి & హోల్డ్ చేయండి<br/> {3,number,integer}. స్క్రీన్ చుట్టూ కదిలేందుకు వేలితో లాగండి<br/> {4,number,integer}. మ్యాగ్నిఫికేషన్ను ఆపివేయడానికి వేలును స్క్రీన్పై నుండి తీసివేయండి"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>జూమ్ - ఇన్ చేయడానికి:</b><br/> {0,number,integer}. మాగ్నిఫికేషన్ను ప్రారంభించడానికి షార్ట్కట్ను ఉపయోగించండి<br/> {1,number,integer}. స్క్రీన్ను ట్యాప్ చేయండి<br/> {2,number,integer}. స్క్రీన్ చుట్టూ కదిలేందుకు 2 వేళ్లతో లాగండి<br/> {3,number,integer}. జూమ్ చేయడాన్ని సర్దుబాటు చేయడానికి 2 వేళ్లతో స్క్రీన్ను నియంత్రించండి<br/> {4,number,integer}. మ్యాగ్నిఫికేషన్ను ఆపడానికి షార్ట్కట్ను ఉపయోగించండి<br/><br/> మీరు తాత్కాలికంగా కూడా జూమ్ - ఇన్ చేయవచ్చు, ఇంకా మరిన్ని చేయవచ్చు."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>జూమ్ - ఇన్ చేయడానికి:</b><br/> {0,number,integer}. మాగ్నిఫికేషన్ను ప్రారంభించడానికి షార్ట్కట్ను ఉపయోగించండి<br/> {1,number,integer}. స్క్రీన్ను ట్యాప్ చేయండి<br/> {2,number,integer}. స్క్రీన్ చుట్టూ కదిలేందుకు 1 వేలితో లేదా 2 వేళ్లతో లాగండి<br/> {3,number,integer}. జూమ్ చేయడాన్ని సర్దుబాటు చేయడానికి 2 వేళ్లతో స్క్రీన్ను నియంత్రించండి<br/> {4,number,integer}. మ్యాగ్నిఫికేషన్ను ఆపడానికి షార్ట్కట్ను ఉపయోగించండి<br/><br/> మీరు తాత్కాలికంగా కూడా జూమ్ - ఇన్ చేయవచ్చు, ఇంకా మరిన్ని చేయవచ్చు."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"మ్యాగ్నిఫికేషన్ను ఆన్ చేసినప్పుడు, మీ స్క్రీన్పైన దగ్గరకు జూమ్ చేయవచ్చు.\n\n"<b>"జూమ్ చేయడానికి"</b>", మ్యాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్పై ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్ను సర్దుబాటు చేయడానికి 2 లేదా అంతకంటే ఎక్కువ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయడానికి"</b>", మ్యాగ్నిఫికేషన్ను ప్రారంభించి, తర్వాత స్క్రీన్ను ఎక్కడైనా తాకి & పట్టుకోండి.\n"<ul><li>"స్క్రీన్ పైన కదలడానికి లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయడానికి వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్లో లేదా నావిగేషన్ బార్లో మీరు దగ్గరగా జూమ్ చేయలేరు."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>లో <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>వ పేజీ"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"యాక్సెసిబిలిటీ బటన్ షార్ట్కట్"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ఏవీ లేవు}=1{1 షెడ్యూల్ సెట్ చేయబడింది}other{# షెడ్యూళ్లు సెట్ చేయబడ్డాయి}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"అంతరాయం కలిగించవద్దు"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ముఖ్యమైన ఫైల్స్ మోడ్స్"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"ఒక మోడ్ను జోడించండి"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"ముఖ్యమైన వ్యక్తులు, యాప్ల నుంచి వచ్చే నోటిఫికేషన్లను మాత్రమే అందించు"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"యాక్టివేషన్ రకాన్ని ఎంచుకోండి"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"సమయం"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"ఉదా. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"క్యాలెండర్"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"ఉదా. \"వ్యక్తిగత క్యాలెండర్\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"మోడ్ను క్రియేట్ చేయండి"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"అనుకూలంగా మార్చు"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"అంతరాయాలను పరిమితం చేయండి"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"అంతరాయం కలిగించవద్దును ఆన్ చేయండి"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"అలారంలు, మీడియా శబ్దాలు అంతరాయం కలిగించగలవు"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"షెడ్యూళ్లు"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"షెడ్యూళ్లను తొలగించండి"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"తొలగించండి"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"పేరుమార్చండి"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"తొలగించండి"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" మోడ్ను తొలగించాలా?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ఎడిట్"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"షెడ్యూళ్లు"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"షెడ్యూల్"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"క్యాలెండర్ను జోడించండి"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"మీ క్యాలెండర్ను ఉపయోగించండి"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"షెడ్యూల్"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"షెడ్యూల్ను సెట్ చేయండి"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"షెడ్యూల్ చేయండి"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> గం., <xliff:g id="MINUTES">%2$d</xliff:g> నిమి."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"ఆటోమేటిక్గా ఆన్ చేయండి"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"షెడ్యూల్"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"కొన్ని సమయాల్లో ఫోన్ని నిశ్శబ్దంగా ఉంచు"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"అంతరాయం కలిగించవద్దు నియమాలు సెట్ చేయండి"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"శబ్దాలు చేసే అంతరాయాలను అనుమతించండి"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"దృశ్య అంతరాయాలను బ్లాక్ చేయండి"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"విజిబిలిటీ సంకేతాలను అనుమతించండి"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"మిమ్మల్ని రీచ్ అవ్వగల నోటిఫికేషన్లు"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"ఫోకస్ పెట్టండి"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"అదనపు చర్యలు"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ఆఫ్లో ఉంది}=1{ఆఫ్ / 1 మోడ్ ఆటోమేటిక్గా ఆన్ అవుతుంది}other{ఆఫ్ / # మోడ్లు ఆటోమేటిక్గా ఆన్ అవుతాయి}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"డిస్ప్లే సెట్టింగ్లు"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"డిస్ప్లే ఆప్షన్లు"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"గ్రేస్కేల్"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"డార్క్ థీమ్ను ఎనేబుల్ చేయండి"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"డార్క్ బ్యాక్గ్రౌండ్లో లైట్ టెక్స్ట్ కోసం OSను, యాప్లను మార్చండి. దీనివల్ల కంటికి హాయిగా ఉండే అవకాశం ఉంది. కొన్ని పరికరాలలో బ్యాటరీ గణనీయంగా సేవ్ అవుతుంది"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"ఫిల్టర్ అంతరాయాలు"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"అంతరాయాలు ఏవీ ఫిల్టర్ చేయబడవు"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"నోటిఫికేషన్ను తెరువు"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"నోటిఫికేషన్లను తాత్కాలికంగా ఆపివేయడాన్ని అనుమతించండి"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"యాప్ చిహ్నంపై నోటిఫికేషన్ డాట్"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"నోటిఫికేషన్ బండిల్స్"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"బబుల్స్"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"బబుల్స్"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"ఈ సంభాషణను బబుల్ చేయండి"</string>
@@ -3523,7 +3564,7 @@
<string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"గోప్యమైన వర్క్ ప్రొఫైల్ నోటిఫికేషన్లు"</string>
<string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"లాక్ అయినప్పుడు గోప్యమైన వర్క్ ప్రొఫైల్ కంటెంట్ను చూపుతుంది"</string>
<string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"మొత్తం నోటిఫికేషన్ కంటెంట్ను చూపించండి"</string>
- <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"గోప్యమైన కంటెంట్ను అన్లాక్లో మాత్రమే చూపండి"</string>
+ <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"గోప్యమైన కంటెంట్ను అన్లాక్లో మాత్రమే చూపుతుంది"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"ఎలాంటి నోటిఫికేషన్లను చూపవద్దు"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6326229471276829730">"మీ లాక్ స్క్రీన్ ఏమి చూపాలని మీరు కోరుకుంటున్నారు?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"లాక్ స్క్రీన్"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"మెరుగుపరిచిన సెట్టింగ్లను ఈ యాప్ సపోర్ట్ చేయదు"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"మరిన్ని సెట్టింగ్లు"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"ఈ యాప్లో మరిన్ని సెట్టింగ్లు అందుబాటులో ఉన్నాయి"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"నోటిఫికేషన్ కూల్డౌన్"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"వర్క్ ప్రొఫైల్లకు వర్తింపజేయండి"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"వర్క్ ప్రొఫైల్ యాప్లకు వర్తింపజేయండి"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"కేటగిరీలు"</string>
<string name="notification_channels_other" msgid="18159805343647908">"ఇతరం"</string>
<string name="no_channels" msgid="4716199078612071915">"ఈ యాప్ ఏ నోటిఫికేషన్లను పోస్ట్ చేయలేదు"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"ఉపయోగించని కేటగిరీలను చూడండి"</string>
<string name="app_settings_link" msgid="6725453466705333311">"యాప్లోని అదనపు సెట్టింగ్లు"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"ఉపయోగించని కేటగిరీలను చూడండి"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ఉపయోగించని కేటగిరీలను దాచండి"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"అంతరాయం కలిగించగల యాప్లు"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"ఎంచుకున్న యాప్లు"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ఏదీ లేదు"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"అన్నీ"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"భర్తీ చేయడానికి యాప్లను అనుమతించండి"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"అంతరాయం కలిగించగల యాప్లు"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"మరిన్ని యాప్లను ఎంచుకోండి"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ఏదీ అంతరాయాన్ని కలిగించలేదు"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ఎవ్వరూ అంతరాయాన్ని కలిగించలేరు"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"కొంతమంది వ్యక్తులు అంతరాయాన్ని కలిగించగలరు"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"వ్యక్తులందరూ అంతరాయం కలిగించగలరు"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"రిపీట్ కాలర్లను అనుమతించండి"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"రిపీట్ కాలర్స్ను అనుమతించండి"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} వరకు ఒక గంట పాటు మాత్రమే అలారాలకు మార్చండి}other{{time} వరకు # గంటల పాటు మాత్రమే అలారాలకు మార్చండి}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> వరకు అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ఎల్లప్పుడూ అంతరాయం కలిగించు ఎంపికకు మార్చుతుంది"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"ఎడిట్ మోడ్"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"యాడ్ మోడ్"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"అనుకూల మోడ్"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"మోడ్ పేరు"</string>
<string name="warning_button_text" msgid="1274234338874005639">"హెచ్చరిక"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"మూసివేయండి"</string>
<string name="device_feedback" msgid="5351614458411688608">"ఈ పరికరంపై ఫీడ్బ్యాక్ ఇవ్వండి"</string>
@@ -4499,8 +4544,8 @@
<string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"శక్తివంతమైన GNSS కొలతలు"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
<string name="input_method_category" msgid="2252659253631639005">"ఇన్పుట్ విధానం"</string>
- <string name="stylus_handwriting" msgid="2154591374132794563">"స్టైలస్ చేతిరాత"</string>
- <string name="stylus_handwriting_summary" msgid="6333425895172696950">"ఎనేబుల్ అయినప్పుడు, ఎడిటర్ ఫోకస్ చేస్తే, ప్రస్తుత ఇన్పుట్ విధానం స్టైలస్ MotionEventను అందుకుంటుంది."</string>
+ <string name="stylus_handwriting" msgid="2154591374132794563">"స్టయిలస్ చేతిరాత"</string>
+ <string name="stylus_handwriting_summary" msgid="6333425895172696950">"ఎనేబుల్ అయినప్పుడు, ఎడిటర్ ఫోకస్ చేస్తే, ప్రస్తుత ఇన్పుట్ విధానం స్టయిలస్ MotionEventను అందుకుంటుంది."</string>
<string name="device_theme" msgid="5027604586494772471">"పరికర రూపం"</string>
<string name="default_theme" msgid="4815428567082263639">"ఆటోమేటిక్"</string>
<string name="show_operator_name_title" msgid="3355910331531144028">"నెట్వర్క్ పేరు"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ఫోర్స్ డెస్క్టాప్ మోడ్"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ఇతర డిస్ప్లేలలో తప్పనిసరి ప్రయోగాత్మక డెస్క్టాప్ మోడ్"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"ఫ్రీఫార్మ్ విండోలను ఎనేబుల్ చేయండి"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"ఫ్రీఫార్మ్ విండోలకు సంబంధించిన సపోర్ట్ను ఎనేబుల్ చేయండి."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"2వ డిస్ప్లేలో ఫ్రీఫార్మ్ విండోయింగ్ ఎనేబుల్ చేయి"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"ఫ్రీఫార్మ్ విండోలను ప్రత్యామ్నాయ డిస్ప్లేలో మాత్రమే ఎనేబుల్ చేయండి."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"మల్టీ-విండోలో సైజ్ మార్చలేని వాటిని ఎనేబుల్ చేయండి"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"సైజ్ మార్చలేని యాప్లను మల్టీ-విండోలో ఉండేందుకు అనుమతిస్తుంది"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ఫోర్స్-డార్క్ను ఓవర్రైడ్ చేయడం"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB డెవలపర్ ఆప్షన్ను ఉపయోగించే ముందు ఈ పరికరం తాలూకు డేటా పార్టిషన్ను ext4కి మార్చాలి. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఇవ్వబడదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ చేయబడిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. 16KB ఆప్షన్ను యాక్టివేట్ చేయడానికి దీని తర్వాత మరొక సారి రీబూట్ చేయాల్సిన అవసరం ఉంది. మీరు ఈ మోడ్లో ఉన్న తర్వాత, మీరు ఒకసారి రీబూట్ చేయడం ద్వారా 4KB, 16KB మోడ్ల మధ్య ముందుకు వెనుకకు మారవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. పరికరాన్ని ప్రొడక్షన్ మోడ్కు అందించడానికి, మీరు 4KB మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరాన్ని ఫ్యాక్టరీ రీసెట్ చేసే బూట్లోడర్ను లాక్ చేయాలి. పరికరం విజయవంతంగా Androidలోకి బూట్ అయిన తర్వాత, డెవలపర్ ఆప్షన్లలో OEM అన్లాకింగ్ను డిజేబుల్ చేయండి. నిర్ధారించిన తర్వాత పరికరం పూర్తిగా తొలగించబడుతుంది, ఫైల్సిస్టమ్ ext4కి మార్చబడుతుంది. ఇది పూర్తయిన తర్వాత, దయచేసి 16KBని మళ్లీ ఎనేబుల్ చేయడానికి తిరిగి రండి."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"మొత్తం డేటాను ఫ్యాక్టరీ రీసెట్ చేయండి"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"డేటా పార్టిషన్ను ext4కి రీఫార్మాట్ చేయడం, పూర్తిగా తొలగించడం విఫలమైంది."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB మోడ్ కోసం బూట్లోడర్ను అన్లాక్ చేయడం అవసరం"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"బూట్లోడర్ అన్లాక్ అవసరం"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"ఈ పరికరంలో 16KB డెవలపర్ ఆప్షన్ను ఉపయోగించే ముందు దాని బూట్లోడర్ను అన్లాక్ చేసి ఉండాలి. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఉండదు, బూట్లోడర్ అన్లాక్ అయినప్పుడు ఫోన్లో స్టోర్ అయిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. 16KB మోడ్ను యాక్టివేట్ చేసినప్పుడు మొత్తం యూజర్ డేటా, సెట్టింగ్లు పూర్తిగా తొలగించబడతాయి. ఒక్కసారి బూట్లోడర్ను అన్లాక్ చేసిన తర్వాత, 16KB ఆప్షన్ను యాక్టివేట్ చేయడానికి రెండుసార్లు రీబూట్ చేయాల్సిన అవసరం ఉంది. మీరు ఈ మోడ్లో ఉన్న తర్వాత, ఒకసారి రీబూట్ చేయడం ద్వారా 4KB, 16KB మోడ్ల మధ్య ముందుకు వెనుకకు మారవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ అవుతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. పరికరాన్ని ప్రొడక్షన్ మోడ్కు అందించడానికి, మీరు 4KB మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరాన్ని OEM/బూట్లోడర్ లాక్ చేయాలి (తద్వారా ఇది ఫ్యాక్టరీ రీసెట్ అవుతుంది). దయచేసి బూట్లోడర్ను అన్లాక్ చేసి, మళ్లీ ట్రై చేయండి. దీన్ని ఎలా చేయాలో తెలిపే సూచనలను <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> లింక్లో చూడవచ్చు"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB పేజీ అగ్నోస్టిక్ మోడ్ను ఉపయోగించడం"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"మీరు పేజీ అగ్నోస్టిక్ మోడ్కు సంబంధించిన 4KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఇవ్వబడదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ చేయబడిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. మరింత చదవడానికి ట్యాప్ చేయండి."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"మీరు పేజీ అగ్నోస్టిక్ మోడ్కు సంబంధించిన 4KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఇవ్వబడదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ చేయబడిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. ఇది పరికరాన్ని మళ్లీ ఫ్యాక్టరీ రీసెట్ చేసి, ప్రొడక్షన్ సెట్టింగ్లకు రీస్టోర్ చేస్తుంది. పరికరం విజయవంతంగా Androidలోకి బూట్ అయిన తర్వాత, డెవలపర్ ఆప్షన్లలో OEM అన్లాకింగ్ను డిజేబుల్ చేయండి. పరికరం Androidలో బూట్ చేయడంలో విఫలమైతే లేదా స్థిరంగా లేకపోతే, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> వెబ్సైట్ నుండి తాజా ఫ్యాక్టరీ ఫర్మ్వేర్ ఇమేజ్లతో పరికరాన్ని మళ్లీ ఫ్లాష్ చేయండి లేదా <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> వెబ్సైట్ను ఉపయోగించండి, అలాగే \'పరికరాన్ని పూర్తిగా తొలగించండి\', \'బూట్లోడర్ను లాక్ చేయండి\', \'అన్ని పార్టిషన్లను బలవంతంగా ఫ్లాష్ చేయండి\' వంటి ఆప్షన్లను ఎంచుకోండి."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB పేజీ అగ్నోస్టిక్ మోడ్ను ఉపయోగించడం"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"మీరు పేజీ అగ్నోస్టిక్ మోడ్కు సంబంధించిన 16KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఇవ్వబడదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ చేయబడిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా 4K మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. మరింత చదవడానికి ట్యాప్ చేయండి."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"మీరు పేజీ అగ్నోస్టిక్ మోడ్కు సంబంధించిన 16KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఖచ్చితత్వానికి హామీ ఇవ్వబడదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ చేయబడిన ఏదైనా డేటా ప్రమాదంలో ఉండవచ్చు. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా 4K మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. ఇది పరికరాన్ని మళ్లీ ఫ్యాక్టరీ రీసెట్ చేసి, ప్రొడక్షన్ సెట్టింగ్లకు రీస్టోర్ చేస్తుంది. పరికరం విజయవంతంగా Androidలోకి బూట్ అయిన తర్వాత, డెవలపర్ ఆప్షన్లలో OEM అన్లాకింగ్ను డిజేబుల్ చేయండి. పరికరం Androidలో బూట్ చేయడంలో విఫలమైతే లేదా స్థిరంగా లేకపోతే, <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> వెబ్సైట్ నుండి తాజా ఫ్యాక్టరీ ఫర్మ్వేర్ ఇమేజ్లతో పరికరాన్ని మళ్లీ ఫ్లాష్ చేయండి లేదా <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> వెబ్సైట్ను ఉపయోగించండి, అలాగే \'పరికరాన్ని పూర్తిగా తొలగించండి\', \'బూట్లోడర్ను లాక్ చేయండి\', \'అన్ని పార్టిషన్లను బలవంతంగా ఫ్లాష్ చేయండి\' వంటి ఆప్షన్లను ఎంచుకోండి."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"మీరు పేజీ సైజ్ ప్రభావం చూపని మోడ్కు సంబంధించిన 16KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఇంటిగ్రిటీకి (ఖచ్చితత్వానికి) హామీ ఉండదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ అయిన ఏదైనా డేటా రిస్క్లో పడే అవకాశం ఉంది. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా 4KB మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. మరింత చదవడానికి ట్యాప్ చేయండి."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"మీరు పేజీ సైజ్ ప్రభావం చూపని మోడ్కు సంబంధించిన 16KB మోడ్లో ఉన్నారు. ఈ మోడ్లో సాఫ్ట్వేర్ ఇంటిగ్రిటీకి (ఖచ్చితత్వానికి) హామీ ఉండదు, బూట్లోడర్ అన్లాక్ చేయబడినప్పుడు ఫోన్లో స్టోర్ అయిన ఏదైనా డేటా రిస్క్లో పడే అవకాశం ఉంది. ఈ మోడ్లలో కొన్ని ఫీచర్లు డిజేబుల్ చేయబడతాయి, కాబట్టి కొన్ని అప్లికేషన్లు పని చేయకపోవచ్చు. ప్రొడక్షన్ మోడ్లోకి మళ్లీ ఎంటర్ అవ్వడానికి, మీరు తప్పనిసరిగా 4KB మోడ్కు స్విచ్ అవ్వాలి, ఆపై పరికరం తాలూకు బూట్లోడర్ను లాక్ చేయాలి. ఇది పరికరాన్ని మళ్లీ ఫ్యాక్టరీ రీసెట్ చేసి, ప్రొడక్షన్ సెట్టింగ్లకు రీస్టోర్ చేస్తుంది. పరికరం విజయవంతంగా Androidలోకి బూట్ అయిన తర్వాత, డెవలపర్ ఆప్షన్లలో OEM అన్లాకింగ్ను డిజేబుల్ చేయండి. పరికరం Androidలో బూట్ చేయడంలో విఫలమైతే లేదా స్థిరంగా లేకపోతే <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> వెబ్సైట్ నుండి తాజా ఫ్యాక్టరీ ఫర్మ్వేర్ ఇమేజ్లతో పరికరాన్ని మళ్లీ ఫ్లాష్ చేయండి లేదా <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> వెబ్సైట్ను ఉపయోగించండి, అలాగే \'పరికరాన్ని పూర్తిగా తొలగించండి\', \'బూట్లోడర్ను లాక్ చేయండి\', \'అన్ని పార్టిషన్లను బలవంతంగా ఫ్లాష్ చేయండి\' వంటి ఆప్షన్లను ఎంచుకోండి."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB పేజీ అగ్నోస్టిక్ మోడ్"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"మరింత చదవండి"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"బగ్ రిపోర్ట్ హ్యాండ్లర్"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"యాప్ను పిన్ చేయడాన్ని ఉపయోగించండి"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"డెవలపర్ ఆప్షన్లను ఉపయోగించండి"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ప్రింట్ సర్వీస్ను ఉపయోగించండి"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"మల్టిపుల్ యూజర్లను అనుమతించండి"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"యూజర్ స్విచ్ను అనుమతించండి"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"అనుమతించు, బహుళ, యూజర్, అనుమతి, అనేకం"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"పలు, యూజర్లు, ప్రొఫైళ్లు, వ్యక్తులు, ఖాతాలు, మారడం, చాలా"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"వైర్లెస్ డీబగ్గింగ్ ఫీచర్ను ఉపయోగించండి"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"మీ టాబ్లెట్ డాక్ చేయబడినప్పుడు మీ స్క్రీన్పై మీకు ఏమి కనిపించాలో ఎంచుకోండి. స్క్రీన్ సేవర్ను ఉపయోగించినప్పుడు మీ పరికరం మరింత పవర్ను ఉపయోగించవచ్చు."</string>
<string name="customize_button_title" msgid="1110284655990203359">"అనుకూలంగా మార్చండి"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>ను అనుకూలంగా మార్చండి"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ఫ్రీఫారమ్ సపోర్ట్ను ఎనేబుల్ చేయడానికి రీబూట్ చేయడం అవసరం."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ద్వితీయ డిస్ప్లేలలో డెస్క్టాప్ మోడ్ను బలవంతంగా ఆన్ చేయడానికి రీబూట్ చేయడం అవసరం."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"లెగసీ ఫ్రీఫార్మ్ విండోయింగ్ సపోర్ట్ను ఎనేబుల్ చేయడానికి రీబూట్ చేయడం అవసరం."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ఫ్రీఫార్మ్ విండోయింగ్ సపోర్ట్ను మార్చడానికి రీబూట్ చేయడం అవసరం."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ప్రత్యామ్నాయ డిస్ప్లేలలో ఫ్రీఫార్మ్ విండోయింగ్ను బలవంతంగా ఆన్ చేయడానికి రీబూట్ చేయడం అవసరం."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ఇప్పుడే రీబూట్ చేయండి"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"తర్వాత రీబూట్ చేయండి"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"స్పేషియల్ ఆడియో"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"ఆన్లో ఉంది"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ఆఫ్లో ఉంది"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"ఆన్లో ఉంది"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"ఆడియో %1$d%% ఎడమ వైపు, %2$d%% కుడి వైపు"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"ఆడియో %1$d%% కుడి వైపు, %2$d%% ఎడమ వైపు"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"మీరు ఇన్స్టాల్ చేసిన యాప్లకు మీ పరికరం పేరు కనిపిస్తుంది. మీరు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేసినప్పుడు, Wi-Fi నెట్వర్క్కు కనెక్ట్ చేసినప్పుడు లేదా Wi-Fi హాట్స్పాట్ను సెటప్ చేసినప్పుడు ఇతర వ్యక్తులకు కూడా కనబడవచ్చు."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"వ్యాకరణ లింగం"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"వ్యాకరణ లింగం ఎంచుకోండి"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"సెట్టింగ్లలో సెర్చ్ చేయండి"</string>
</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e5367c1..9adb943 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"เวลาเข้านอน"</item>
+ <item msgid="4152450357280759894">"การขับขี่"</item>
+ <item msgid="7096549258219399423">"สมจริง"</item>
+ <item msgid="2760716776980432977">"ที่มีการจัดการ"</item>
+ <item msgid="601734478369121764">"ดาว"</item>
+ <item msgid="6243809315432780521">"ปฏิทิน"</item>
+ <item msgid="4913577903148415331">"เวลา"</item>
+ <item msgid="3653377604690057780">"ละครเวที"</item>
+ <item msgid="3843711267408385410">"ดอกไม้"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 15950b1..0da584e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"เลิกเชื่อมต่ออุปกรณ์ไหม"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"จับคู่อุปกรณ์ใหม่"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"บลูทูธ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"เปิดอัตโนมัติในวันพรุ่งนี้"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"การตั้งค่าเครื่องช่วยฟัง"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"ทางลัด ความเข้ากันได้กับเครื่องช่วยฟัง"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"ค่าที่กำหนดล่วงหน้า"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"ไม่มีค่าที่กำหนดล่วงหน้าที่นักโสตสัมผัสวิทยาตั้งโปรแกรมไว้"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"ไม่สามารถอัปเดตค่าที่กำหนดล่วงหน้า"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"เอาต์พุตเสียง"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"เกี่ยวกับเอาต์พุตเสียง"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"ปิด"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{เปิดอยู่/แอป # แอปมีสิทธิ์เข้าถึงตำแหน่ง}other{เปิดอยู่/แอป # แอปมีสิทธิ์เข้าถึงตำแหน่ง}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"กำลังโหลด…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"แอปที่มีสิทธิ์เข้าถึงอุปกรณ์ที่อยู่ใกล้เคียงจะสามารถระบุตำแหน่งซึ่งสัมพันธ์กับอุปกรณ์ที่เชื่อมต่อ"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"แอปที่มีสิทธิ์เข้าถึงอุปกรณ์ที่อยู่ใกล้เคียงจะสามารถระบุตำแหน่งซึ่งสัมพันธ์กับอุปกรณ์ที่เชื่อมต่อได้"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"สิทธิ์เข้าถึงตำแหน่งปิดอยู่สำหรับแอปและบริการต่างๆ ระบบอาจยังส่งตำแหน่งของอุปกรณ์ไปให้หน่วยกู้ภัยฉุกเฉินเมื่อคุณโทรหาหรือส่ง SMS ถึงหมายเลขฉุกเฉิน"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"ดูข้อมูลเพิ่มเติมเกี่ยวกับการตั้งค่าตำแหน่ง"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"หากต้องการเปลี่ยน ให้ไปที่การตั้งค่า ChromeOS > ความเป็นส่วนตัวและความปลอดภัย > การควบคุมความเป็นส่วนตัว > การเข้าถึงตำแหน่ง"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"เพิ่มใบหน้าและ<xliff:g id="WATCH">%s</xliff:g> แล้ว"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"เพิ่มใบหน้า ลายนิ้วมือ และ<xliff:g id="WATCH">%s</xliff:g> แล้ว"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"เพิ่มใบหน้า ลายนิ้วมือ และ<xliff:g id="WATCH">%s</xliff:g> แล้ว"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"ต้องดำเนินการเนื่องจากการตรวจสอบตัวตนเปิดอยู่"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"การปลดล็อก Remote Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"เพิ่มนาฬิกาแล้ว"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"ตั้งค่านาฬิกา"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"ดูข้อมูลเพิ่มเติมเกี่ยวกับการปลดล็อกด้วยนาฬิกา"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"เพิ่มนาฬิกา"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"นำนาฬิกาออก"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"การปลดล็อกด้วยลายนิ้วมือและใบหน้า"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"การปลดล็อกด้วยใบหน้าและลายนิ้วมือ"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"การปลดล็อกด้วยใบหน้าและลายนิ้วมือสำหรับงาน"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"ต้องตั้งค่า"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"เพิ่มใบหน้าและลายนิ้วมือแล้ว"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ติดตั้งแอป"</b>\n"ติดตั้งแอปที่คุณต้องการเก็บไว้เป็นส่วนตัวในพื้นที่ทำงาน"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"ข้อควรจำ"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"แอปหยุดทำงานเมื่อคุณล็อกพื้นที่ทำงาน"</b>\n"เมื่อคุณล็อกพื้นที่ทำงาน จะทำให้แอปในพื้นที่ทำงานดังกล่าวหยุดทำงานโดยไม่มีการแจ้งเตือนคุณ"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"พื้นที่ส่วนตัวไม่เหมาะสำหรับแอปที่ต้องทำงานเบื้องหลังหรือส่งการแจ้งเตือนที่สำคัญมาก เช่น แอปการแพทย์ เนื่องจากการแจ้งเตือนและกิจกรรมเบื้องหลังจะหยุดเมื่อมีการล็อกพื้นที่\n\nแอปในพื้นที่ส่วนตัวจะไม่ปรากฏในเครื่องมือจัดการสิทธิ์ แดชบอร์ดความเป็นส่วนตัว และการตั้งค่าอื่นๆ เมื่อล็อกพื้นที่ส่วนตัวไว้\n\nคุณย้ายพื้นที่ส่วนตัวไปยังอุปกรณ์ใหม่ไม่ได้ และจะต้องตั้งค่าพื้นที่ส่วนตัวอีกแห่งหากต้องการใช้ในอุปกรณ์เครื่องอื่น\n\nใครก็ตามที่เชื่อมต่ออุปกรณ์ของคุณเข้ากับคอมพิวเตอร์หรือติดตั้งแอปที่เป็นอันตรายในอุปกรณ์ดังกล่าวอาจเข้าถึงพื้นที่ส่วนตัวของคุณได้"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"พื้นที่ส่วนตัวไม่เหมาะสำหรับแอปที่ต้องทำงานเบื้องหลังหรือส่งการแจ้งเตือนที่สำคัญมาก เช่น แอปการแพทย์ เนื่องจากการแจ้งเตือนและกิจกรรมเบื้องหลังจะหยุดเมื่อมีการล็อกพื้นที่\n\nแอปในพื้นที่ส่วนตัวจะไม่ปรากฏในเครื่องมือจัดการสิทธิ์ แดชบอร์ดความเป็นส่วนตัว และการตั้งค่าอื่นๆ เมื่อล็อกพื้นที่ส่วนตัวไว้\n\nคุณคืนค่าพื้นที่ส่วนตัวไปยังอุปกรณ์ใหม่ไม่ได้ และจะต้องตั้งค่าพื้นที่อีกแห่งหากต้องการใช้ในอุปกรณ์เครื่องอื่น\n\nใครก็ตามที่เชื่อมต่ออุปกรณ์ของคุณเข้ากับคอมพิวเตอร์หรือติดตั้งแอปที่เป็นอันตรายในอุปกรณ์ดังกล่าวอาจเข้าถึงพื้นที่ส่วนตัวของคุณได้"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"ดูข้อมูลเพิ่มเติมเกี่ยวกับพื้นที่ส่วนตัว"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"การดำเนินการนี้จะใช้เวลาสักครู่"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"กำลังตั้งค่าพื้นที่ส่วนตัว…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"รีสตาร์ทอุปกรณ์ใช่ไหม"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"การบันทึกรายละเอียดของ NFC มีไว้เพื่อการพัฒนาเท่านั้น ข้อมูลเพิ่มเติมของ NFC จะรวมอยู่ในรายงานข้อบกพร่อง ซึ่งอาจมีข้อมูลส่วนตัว รีสตาร์ทอุปกรณ์เพื่อเปลี่ยนการตั้งค่านี้"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"รีสตาร์ท"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"มิเรอร์, จอแสดงผลภายนอก, จอแสดงผลที่เชื่อมต่อ, จอแสดงผล USB, ความละเอียด, การหมุน"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"การหมุน"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"มาตรฐาน"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"ใช้แป้นพิมพ์บนหน้าจอ"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"เปิดทิ้งไว้บนหน้าจอในระหว่างใช้งานแป้นพิมพ์จริง"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"เปลี่ยนรูปแบบการเติมพื้นตัวชี้เป็นสีเหลือง"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"เปลี่ยนรูปแบบการเติมพื้นตัวชี้เป็นสีชมพู"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"เปลี่ยนรูปแบบการเติมพื้นตัวชี้เป็นสีน้ำเงิน"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"รูปแบบเส้นตัวชี้"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"ขาว"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"ดำ"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"ไม่มี"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"ผู้ใช้เลือก: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"เสียงพูด"</string>
<string name="pointer_speed" msgid="7398649279282675718">"ความเร็วของตัวชี้"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"ขนาดของตัวชี้"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"ลดขนาดของตัวชี้"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"เพิ่มขนาดของตัวชี้"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"อุปกรณ์ควบคุมเกม"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"เปลี่ยนเส้นทางการสั่น"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"ส่งการสั่นเตือนไปที่อุปกรณ์ควบคุมเกมเมื่อมีการเชื่อมต่อ"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"ดำเนินการต่อ"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"ยกเลิก"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"การตั้งค่าการขยาย"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"การแพนกล้องด้วยนิ้วเดียว"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"ย้ายแว่นขยายด้วย 1 นิ้ว"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"ใช้ 1 นิ้วลากเพื่อย้ายไปรอบๆ หน้าจอ"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ย้ายพื้นที่ในการขยายโดยลากนิ้วเพียงนิ้วเดียว"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"ย้ายพื้นที่ในการขยายโดยลากนิ้ว 2 นิ้ว"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"ไม่พร้อมใช้งานในขณะที่ขยายเพียงบางส่วนของหน้าจอ"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"แตะปุ่มเพื่อซูม"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"ซูมเข้าอย่างรวดเร็วบนหน้าจอเพื่อทำให้เนื้อหาใหญ่ขึ้น"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>วิธีซูมเข้า</b><br/> {0,number,integer}. ใช้ทางลัดเพื่อเริ่มการขยาย<br/> {1,number,integer}. แตะหน้าจอ<br/> {2,number,integer}. ใช้ 2 นิ้วลากเพื่อย้ายไปรอบๆ หน้าจอ<br/> {3,number,integer}. บีบ 2 นิ้วเพื่อปรับการซูม<br/> {4,number,integer}. ใช้ทางลัดเพื่อหยุดการขยาย<br/><br/> <b>วิธีซูมเข้าชั่วคราว</b><br/> {0,number,integer}. ตรวจสอบว่าตั้งค่าประเภทการขยายเป็นแบบเต็มหน้าจอ<br/> {1,number,integer}. ใช้ทางลัดเพื่อเริ่มการขยาย<br/> {2,number,integer}. แตะที่ใดก็ได้บนหน้าจอค้างไว้<br/> {3,number,integer}. ลากนิ้วเพื่อย้ายไปรอบๆ หน้าจอ<br/> {4,number,integer}. ยกนิ้วขึ้นเพื่อหยุดการขยาย"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>วิธีซูมเข้า</b><br/> {0,number,integer} ใช้ทางลัดเพื่อเริ่มการขยาย<br/> {1,number,integer} แตะหน้าจอ<br/> {2,number,integer} ใช้ 2 นิ้วลากเพื่อย้ายไปรอบๆ หน้าจอ<br/> {3,number,integer} บีบ 2 นิ้วเพื่อปรับการซูม<br/> {4,number,integer} ใช้ทางลัดเพื่อหยุดใช้งานการขยาย<br/><br/> คุณยังซูมเข้าชั่วคราวและอื่นๆ ได้ด้วย"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>วิธีซูมเข้า</b><br/> {0,number,integer} ใช้ทางลัดเพื่อเริ่มการขยาย<br/> {1,number,integer} แตะหน้าจอ<br/> {2,number,integer} ใช้ 1 หรือ 2 นิ้วลากเพื่อย้ายไปรอบๆ หน้าจอ<br/> {3,number,integer}. บีบ 2 นิ้วเพื่อปรับการซูม<br/> {4,number,integer} ใช้ทางลัดเพื่อหยุดใช้งานการขยาย<br/><br/> คุณยังซูมเข้าชั่วคราวและอื่นๆ ได้ด้วย"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"คุณจะซูมหน้าจอเข้าได้เมื่อเปิดการขยาย\n\n"<b>"วิธีซูมคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอ\n"<ul><li>"ลากนิ้วอย่างน้อย 2 นิ้วเพื่อเลื่อน"</li>\n<li>"บีบนิ้วอย่างน้อย 2 นิ้วเพื่อปรับการซูม"</li></ul>\n\n<b>"วิธีซูมชั่วคราวคือ"</b>" เริ่มการขยาย จากนั้นแตะบริเวณที่ต้องการซูมในหน้าจอค้างไว้\n"<ul><li>"ลากเพื่อไปยังส่วนต่างๆ ในหน้าจอ"</li>\n<li>"ยกนิ้วขึ้นเพื่อซูมออก"</li></ul>\n\n"คุณซูมเข้าโดยใช้แป้นพิมพ์หรือแถบนำทางไม่ได้"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"หน้า <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> จาก <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ทางลัดปุ่มการช่วยเหลือพิเศษ"</string>
@@ -2168,7 +2193,7 @@
<string name="accessibility_shortcut_edit_screen_title_two_finger_double_tap" msgid="8952595692906527694">"ใช้ %1$d นิ้วแตะสองครั้ง"</string>
<string name="accessibility_shortcut_edit_screen_summary_two_finger_double_tap" msgid="385404127425496362">"ใช้ %1$d นิ้วแตะหน้าจอเร็วๆ 2 ครั้ง"</string>
<string name="accessibility_shortcut_edit_screen_title_triple_tap" msgid="3314488747597058942">"แตะสามครั้ง"</string>
- <string name="accessibility_shortcut_edit_screen_summary_triple_tap" msgid="4839204951599629871">"แตะหน้าจอเร็วๆ %1$d ครั้ง การดำเนินการนี้อาจทําให้อุปกรณ์ทํางานช้าลง"</string>
+ <string name="accessibility_shortcut_edit_screen_summary_triple_tap" msgid="4839204951599629871">"แตะหน้าจอเร็วๆ %1$d ครั้ง การดำเนินการนี้อาจทําให้อุป&#173;กรณ์ทํางานช้าลง"</string>
<string name="accessibility_shortcut_two_finger_double_tap_keyword" msgid="6271718715836961167">"ใช้ %1$d นิ้วแตะสองครั้ง"</string>
<string name="accessibility_shortcut_edit_dialog_summary_two_finger_double_tap" msgid="8262165091808318538">"ใช้ 2 นิ้วแตะหน้าจอ {0,number,integer} ครั้งเร็วๆ"</string>
<string name="accessibility_shortcut_edit_dialog_title_triple_tap" msgid="6672798007229795841">"แตะหน้าจอ 3 ครั้ง"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ไม่มี}=1{ตั้งกำหนดการแล้ว 1 รายการ}other{ตั้งกำหนดการแล้ว # รายการ}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ห้ามรบกวน"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"โหมดสำคัญ"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"เพิ่มโหมด"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"รับเฉพาะการแจ้งเตือนจากผู้คนและแอปที่สำคัญ"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"เลือกประเภทการเปิดใช้งาน"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"เวลา"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"เช่น \"21:30 น. - 17:00 น.\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"ปฏิทิน"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"เช่น \"ปฏิทินส่วนตัว\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"สร้างโหมด"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"กำหนดเอง"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"จำกัดการรบกวน"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"เปิด \"ห้ามรบกวน\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"ให้เสียงของการแจ้งเตือนและสื่อรบกวนได้"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"กำหนดการ"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"ลบกำหนดการ"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"ลบ"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"เปลี่ยนชื่อ"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"ลบ"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"ลบโหมด \"<xliff:g id="MODE">%1$s</xliff:g>\" ไหม"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"แก้ไข"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"กำหนดการ"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"กำหนดการ"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"เพิ่มปฏิทิน"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"ใช้ปฏิทินของคุณ"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"กำหนดเวลา"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"ตั้งกำหนดเวลา"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"กำหนดเวลา"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> ชั่วโมง <xliff:g id="MINUTES">%2$d</xliff:g> นาที"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"เปิดอัตโนมัติ"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"กำหนดการ"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"ปิดเสียงโทรศัพท์ในบางช่วงเวลา"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"ตั้งกฎห้ามรบกวน"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"อนุญาตการรบกวนที่มีเสียง"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"บล็อกสิ่งรบกวนการมองเห็น"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"อนุญาตสัญญาณที่มองเห็น"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"การแจ้งเตือนที่ส่งถึงคุณได้"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"มีสมาธิอยู่เสมอ"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"การทำงานเพิ่มเติม"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{ปิด}=1{ปิด/1 โหมดสามารถเปิดได้โดยอัตโนมัติ}other{ปิด/# โหมดสามารถเปิดได้โดยอัตโนมัติ}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"การตั้งค่าการแสดงผล"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ตัวเลือกการแสดงผล"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"โทนสีเทา"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"เปิดใช้ธีมมืด"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"สลับระบบปฏิบัติการและแอปเพื่อให้ได้ข้อความสีอ่อนและพื้นหลังสีเข้มตามที่ต้องการ ซึ่งอาจสบายตากว่ารวมถึงประหยัดแบตเตอรี่ได้อย่างมากในอุปกรณ์บางเครื่อง"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"กรองการรบกวน"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"ไม่ได้กรองการรบกวน"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"เปิดการแจ้งเตือน"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"อนุญาตให้เลื่อนการแจ้งเตือน"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"เครื่องหมายจุดแสดงการแจ้งเตือนบนไอคอนแอป"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"กลุ่มการแจ้งเตือน"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"บับเบิล"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"บับเบิล"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"แสดงการสนทนานี้เป็นบับเบิล"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"แอปนี้ไม่รองรับการตั้งค่าที่ปรับปรุง"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"การตั้งค่าเพิ่มเติม"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"สามารถใช้งานการตั้งค่าเพิ่มเติมได้ในแอปนี้"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"การพักการแจ้งเตือน"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"ใช้การพักการแจ้งเตือน"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"ใช้กับโปรไฟล์งาน"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"ใช้กับแอปในโปรไฟล์งาน"</string>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"หมวดหมู่"</string>
<string name="notification_channels_other" msgid="18159805343647908">"อื่นๆ"</string>
<string name="no_channels" msgid="4716199078612071915">"แอปนี้ไม่ได้โพสต์การแจ้งเตือนใดๆ"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"แสดงหมวดหมู่ที่ไม่ได้ใช้"</string>
<string name="app_settings_link" msgid="6725453466705333311">"การตั้งค่าเพิ่มเติมในแอป"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"แสดงหมวดหมู่ที่ไม่ได้ใช้"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"ซ่อนหมวดหมู่ที่ไม่ได้ใช้"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"แอปที่รบกวนคุณได้"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"แอปที่เลือก"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"ไม่มี"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"ทั้งหมด"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"อนุญาตให้แอปลบล้าง"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"แอปที่รบกวนคุณได้"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"เลือกแอปเพิ่มเติม"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"ไม่ให้อะไรรบกวนเลย"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"ไม่ให้ใครรบกวนเลย"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"ให้รบกวนได้แค่บางคน"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"ให้ทุกคนรบกวนได้"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"ผู้โทรซ้ำ"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"อนุญาตผู้โทรซ้ำ"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา 1 ชั่วโมงจนถึง {time}}other{เปลี่ยนเป็นเฉพาะปลุกเท่านั้นเป็นเวลา # ชั่วโมงจนถึง {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"เปลี่ยนเป็นเฉพาะปลุกเท่านั้นจนถึง <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"เปลี่ยนเป็นรบกวนได้เสมอ"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"แก้ไขโหมด"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"เพิ่มโหมด"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"โหมดที่กำหนดเอง"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"ชื่อโหมด"</string>
<string name="warning_button_text" msgid="1274234338874005639">"คำเตือน"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"ปิด"</string>
<string name="device_feedback" msgid="5351614458411688608">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
@@ -3927,7 +3971,7 @@
<string name="usage_access" msgid="5487993885373893282">"การเข้าถึงการใช้งาน"</string>
<string name="permit_usage_access" msgid="179630895262172674">"อนุญาตการเข้าถึงการใช้งาน"</string>
<string name="time_spent_in_app_pref_title" msgid="25327097913383330">"เวลาอยู่หน้าจอ"</string>
- <string name="usage_access_description" msgid="8547716253713890707">"การเข้าถึงการใช้งานทำให้แอปสามารถติดตามว่าคุณกำลังใช้แอปอื่นใดอยู่ ความถี่ในการใช้ รวมทั้งผู้ให้บริการ การตั้งค่าภาษา และรายละเอียดอื่นๆ"</string>
+ <string name="usage_access_description" msgid="8547716253713890707">"การเข้าถึงการใช้งานทำให้แอปสามารถติดตามว่าคุณกำลังใช้แอปอื่นใดอยู่ ความถี่ในการใช้ รวมทั้งผู้ให้บริการ การตั้งค่าภาษา และรายละเอียดอื่นๆ"</string>
<string name="memory_settings_title" msgid="6582588646363308430">"หน่วยความจำ"</string>
<string name="always_running" msgid="9012705720688200252">"ทำงานตลอดเวลา (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
<string name="sometimes_running" msgid="7954947311082655448">"ทำงานบางครั้ง (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -4069,7 +4113,7 @@
<string name="storage_summary" msgid="5903562203143572768">"ใช้ไป <xliff:g id="PERCENTAGE">%1$s</xliff:g> - เหลือ <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="1599453894989339454">"ธีมมืด ขนาดตัวอักษร ความสว่าง"</string>
<string name="memory_summary" msgid="8221954450951651735">"ใช้หน่วยความจำไป <xliff:g id="USED_MEMORY">%1$s</xliff:g> จาก <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> โดยเฉลี่ย"</string>
- <string name="users_summary" msgid="8473589474976307510">"ลงชื่อเข้าใช้ในฐานะ<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+ <string name="users_summary" msgid="8473589474976307510">"ลงชื่อเข้าใช้ในชื่อ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="android_version_summary" msgid="7818952662015042768">"อัปเดตเป็น Android <xliff:g id="VERSION">%1$s</xliff:g> แล้ว"</string>
<string name="android_version_pending_update_summary" msgid="5404532347171027730">"มีเวอร์ชันอัปเดต"</string>
<string name="disabled_by_policy_title" msgid="6852347040813204503">"บล็อกไว้ตามนโยบายการทำงาน"</string>
@@ -4801,8 +4845,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"บังคับใช้โหมดเดสก์ท็อป"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"บังคับใช้โหมดเดสก์ท็อปแบบทดลองในจอแสดงผลรอง"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"เปิดใช้หน้าต่างรูปแบบอิสระ"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"เปิดใช้การรองรับหน้าต่างรูปแบบอิสระ"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"เปิดใช้หน้าต่างรูปแบบอิสระบนจอแสดงผลสำรอง"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"เปิดใช้หน้าต่างรูปแบบอิสระบนจอแสดงผลสำรองเท่านั้น"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"เปิดใช้แอปแบบปรับขนาดไม่ได้ในหลายหน้าต่าง"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"อนุญาตให้แอปแบบปรับขนาดไม่ได้แสดงในหลายหน้าต่าง"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"ลบล้างฟีเจอร์บังคับใช้ธีมมืด"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"ต้องแปลงพาร์ติชันข้อมูลของอุปกรณ์นี้เป็น ext4 ก่อนที่จะใช้ตัวเลือกสำหรับนักพัฒนาแอปแบบ 16KB ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง การเปิดใช้งานตัวเลือก 16KB จะต้องมีการรีบูตอีกครั้งหลังจากนี้ เมื่ออยู่ในโหมดนี้แล้ว คุณจะเปลี่ยนไปมาระหว่างโหมด 4KB กับ 16KB ได้ด้วยการรีบูตครั้งเดียว ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการให้อุปกรณ์กลับสู่โหมดโปรดักชัน คุณต้องเปลี่ยนกลับไปใช้โหมด 4KB จากนั้นล็อก Bootloader ซึ่งจะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้น หลังจากที่อุปกรณ์บูตเข้าสู่ Android ได้สำเร็จ ให้ปิดการปลดล็อก OEM ในตัวเลือกสำหรับนักพัฒนาแอป อุปกรณ์จะถูกล้างข้อมูลและระบบไฟล์จะเปลี่ยนเป็น ext4 หลังจากการยืนยัน หลังจากการดำเนินการนี้เสร็จสมบูรณ์ โปรดกลับมาเปิดใช้โหมด 16KB อีกครั้ง"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"ลบข้อมูลทั้งหมด"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ฟอร์แมตใหม่และล้างพาร์ติชันข้อมูลเป็น ext4 ไม่สำเร็จ"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"ต้องปลดล็อก Bootloader สำหรับโหมด 16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"ต้องปลดล็อก Bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"อุปกรณ์นี้ต้องมีการปลดล็อก Bootloader ก่อนที่จะใช้ตัวเลือกสำหรับนักพัฒนาแอปแบบ 16KB ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ข้อมูลผู้ใช้และการตั้งค่าทั้งหมดจะถูกล้างเมื่อเปิดใช้งานโหมด 16KB เมื่อปลดล็อก Bootloader แล้ว การเปิดใช้งานตัวเลือก 16KB จะต้องมีการรีบูต 2 ครั้ง เมื่ออยู่ในโหมดนี้แล้ว คุณจะเปลี่ยนไปมาระหว่างโหมด 4KB กับ 16KB ได้ด้วยการรีบูตครั้งเดียว ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการให้อุปกรณ์กลับสู่โหมดโปรดักชัน คุณต้องเปลี่ยนกลับไปใช้โหมด 4KB จากนั้นล็อก OEM/Bootloader (ซึ่งจะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้น) โปรดปลดล็อก Bootloader แล้วลองอีกครั้ง ดูวิธีการได้ที่ <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"กำลังใช้โหมด 4KB ในโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"คุณอยู่ในโหมด 4KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องล็อก Bootloader ของอุปกรณ์ แตะเพื่ออ่านเพิ่มเติม"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"คุณอยู่ในโหมด 4KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องล็อก Bootloader ของอุปกรณ์ การดำเนินการนี้จะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้นอีกครั้งและคืนค่าเป็นโหมดโปรดักชัน หลังจากที่อุปกรณ์บูตเข้าสู่ Android ได้สำเร็จ ให้ปิดการปลดล็อก OEM ในตัวเลือกสำหรับนักพัฒนาแอป หากอุปกรณ์ไม่สามารถบูตเข้าสู่ Android หรือไม่เสถียร ให้แฟลชอุปกรณ์อีกครั้งโดยใช้ค่าเริ่มต้นล่าสุดจาก <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> หรือใช้ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> และเลือก \"ล้างข้อมูลอุปกรณ์\" \"ล็อก Bootloader\" และ \"บังคับให้แฟลชทุกพาร์ติชัน\""</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"กำลังใช้โหมด 16KB ในโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"คุณอยู่ในโหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องเปลี่ยนกลับไปใช้โหมด 4K แล้วล็อก Bootloader ของอุปกรณ์ แตะเพื่ออ่านเพิ่มเติม"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"คุณอยู่ในโหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องเปลี่ยนกลับไปใช้โหมด 4K แล้วล็อก Bootloader ของอุปกรณ์ การดำเนินการนี้จะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้นอีกครั้งและคืนค่าเป็นโหมดโปรดักชัน หลังจากที่อุปกรณ์บูตเข้าสู่ Android ได้สำเร็จ ให้ปิดการปลดล็อก OEM ในตัวเลือกสำหรับนักพัฒนาแอป หากอุปกรณ์ไม่สามารถบูตเข้าสู่ Android หรือไม่เสถียร ให้แฟลชอุปกรณ์อีกครั้งโดยใช้ค่าเริ่มต้นล่าสุดจาก <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> หรือใช้ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> และเลือก \"ล้างข้อมูลอุปกรณ์\" \"ล็อก Bootloader\" และ \"บังคับให้แฟลชทุกพาร์ติชัน\""</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"คุณอยู่ในโหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้า ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องเปลี่ยนกลับไปใช้โหมด 4KB แล้วล็อก Bootloader ของอุปกรณ์ แตะเพื่ออ่านเพิ่มเติม"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"คุณอยู่ในโหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้า ไม่รับประกันความสมบูรณ์ของซอฟต์แวร์ในโหมดนี้ และข้อมูลใดๆ ที่จัดเก็บในโทรศัพท์ในขณะที่ Bootloader ไม่ได้ล็อกอยู่อาจมีความเสี่ยง ฟีเจอร์บางอย่างจะถูกปิดใช้ในโหมดเหล่านี้ ดังนั้นบางแอปพลิเคชันจึงอาจไม่ทำงาน หากต้องการกลับสู่โหมดโปรดักชันอีกครั้ง คุณต้องเปลี่ยนกลับไปใช้โหมด 4KB แล้วล็อก Bootloader ของอุปกรณ์ การดำเนินการนี้จะรีเซ็ตอุปกรณ์เป็นค่าเริ่มต้นอีกครั้งและคืนค่าเป็นโหมดโปรดักชัน หลังจากที่อุปกรณ์เปิดเครื่องเพื่อเข้าสู่ Android ได้สำเร็จ ให้ปิดการปลดล็อก OEM ในตัวเลือกสำหรับนักพัฒนาแอป หากอุปกรณ์ไม่สามารถเปิดเครื่องเพื่อเข้าสู่ Android หรือไม่เสถียร ให้แฟลชอุปกรณ์อีกครั้งโดยใช้ค่าเริ่มต้นล่าสุดจาก <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> หรือใช้ <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> และเลือก \"ล้างข้อมูลอุปกรณ์\" \"ล็อก Bootloader\" และ \"บังคับให้แฟลชทุกพาร์ติชัน\""</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"โหมด 16KB ของโหมดไม่คำนึงถึงขนาดหน้าหน่วยความจำ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"อ่านเพิ่มเติม"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"เครื่องจัดการรายงานข้อบกพร่อง"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ใช้การปักหมุดแอป"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ใช้ตัวเลือกสำหรับนักพัฒนาแอป"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"ใช้บริการพิมพ์"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"อนุญาตให้มีผู้ใช้หลายคน"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"อนุญาตให้เปลี่ยนผู้ใช้ได้"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"อนุญาต, หลายคน, ผู้ใช้, อนุมัติ, จำนวนมาก"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"หลายรายการ, ผู้ใช้, โปรไฟล์, ผู้คน, บัญชี, เปลี่ยน, มากมาย"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"ใช้การแก้ไขข้อบกพร่องผ่าน Wi-Fi"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"เลือกสิ่งที่คุณจะเห็นในหน้าจอเมื่อวางแท็บเล็ตบนแท่นชาร์จ อุปกรณ์อาจใช้พลังงานมากขึ้นเมื่อใช้ภาพพักหน้าจอ"</string>
<string name="customize_button_title" msgid="1110284655990203359">"ปรับแต่ง"</string>
<string name="customize_button_description" msgid="7440248477266126231">"ปรับแต่ง <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"ต้องรีบูตเพื่อเปิดใช้การสนับสนุนแบบอิสระ"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"ต้องรีบูตเพื่อบังคับให้จอแสดงผลสำรองใช้โหมดเดสก์ท็อป"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"ต้องรีบูตเพื่อเปิดใช้การรองรับหน้าต่างรูปแบบอิสระแบบเดิม"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"ต้องรีบูตเพื่อเปลี่ยนการรองรับหน้าต่างรูปแบบอิสระ"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ต้องรีบูตเพื่อบังคับให้เปิดใช้หน้าต่างรูปแบบอิสระบนจอแสดงผลสำรอง"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"รีบูตเลย"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"รีบูตภายหลัง"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"เสียงรอบทิศทาง"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"เปิด"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"ปิด"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"เปิด"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"เสียง %1$d%% ซ้าย %2$d%% ขวา"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"เสียง %1$d%% ขวา %2$d%% ซ้าย"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"แอปที่คุณติดตั้งจะเห็นชื่อของอุปกรณ์ และคนอื่นก็อาจเห็นเช่นกันหากคุณเชื่อมต่อกับอุปกรณ์บลูทูธหรือเครือข่าย Wi-Fi หรือตั้งค่าฮอตสปอต Wi-Fi"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"เพศทางไวยากรณ์"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"เลือกเพศทางไวยากรณ์"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"ค้นหาในการตั้งค่า"</string>
</resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 13711b4..519d1db 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Oras ng pagtulog"</item>
+ <item msgid="4152450357280759894">"Pagmamaneho"</item>
+ <item msgid="7096549258219399423">"Immersive"</item>
+ <item msgid="2760716776980432977">"Pinamamahalaan"</item>
+ <item msgid="601734478369121764">"Bituin"</item>
+ <item msgid="6243809315432780521">"Kalendaryo"</item>
+ <item msgid="4913577903148415331">"Oras"</item>
+ <item msgid="3653377604690057780">"Teatro"</item>
+ <item msgid="3843711267408385410">"Bulaklak"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cbd8785..5316f26 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"I-diskonekta ang device?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Magpares ng bagong device"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Awtomatikong i-on bukas"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Mga setting ng hearing device"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Shortcut, compatibility ng hearing aid"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Preset"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Walang preset na na-program ng iyong audiologist"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Hindi ma-update ang preset"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio output"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Tungkol sa audio output"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Naka-off"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Naka-on / # app ang may access sa lokasyon}one{Naka-on / # app ang may access sa lokasyon}other{Naka-on / # na app ang may access sa lokasyon}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Naglo-load…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Matutukoy ng mga app na may pahintulot sa Mga kalapit na device ang relatibong posisyon ng mga nakakonektang device."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Matutukoy ng mga app na may pahintulot sa mga kalapit na device ang relatibong posisyon ng mga nakakonektang device."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Naka-off para sa mga app at serbisyo ang access sa lokasyon. Posibleng ipadala pa rin ang lokasyon ng iyong device sa mga reresponde sa emergency kapag tumawag o nag-text ka sa pang-emergency na numero."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Matuto pa tungkol sa Mga setting ng lokasyon."</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Para palitan, pumunta sa Mga Setting ng ChromeOS > Privacy at seguridad > Mga kontrol sa privacy > Access sa lokasyon"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Naidagdag ang mukha at <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Naidagdag ang mukha, fingerprint, at <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Naidagdag ang mukha, mga fingerprint, at <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Kailangan ito dahil naka-on ang Pagsusuri sa Pagkakakilanlan"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator Unlock"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Idinagdag ang relo"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"I-set up ang iyong relo"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Matuto pa tungkol sa Pag-unlock Gamit ang Relo"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Magdagdag ng relo"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Alisin ang relo"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Pag-unlock Gamit ang Fingerprint at Mukha"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Pag-unlock Gamit ang Mukha at Fingerprint"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Pag-unlock Gamit ang Mukha at Fingerprint para sa trabaho"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Kinakailangan ang pag-set up"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Nagdagdag ng mukha at mga fingerprint"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Mag-install ng mga app"</b>\n"Mag-install ng mga app na gusto mong panatilihing pribado sa iyong space"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Tandaan"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Hihinto ang mga app kapag na-lock mo ang iyong space"</b>\n"Kapag na-lock mo ang iyong space, hihinto ang mga app sa space mo at hindi ka makakatanggap ng mga notification mula sa mga iyon"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Hindi naaangkop ang mga pribadong space para sa mga app na kailangang gumana sa background o magpadala ng mga kritikal na notification, tulad ng mga medikal na app. Ito ay dahil hinihinto ang mga notification at aktibidad sa background kapag na-lock ang iyong space.\n\nHindi lalabas sa manager ng pahintulot, privacy dashboard, at iba pang setting ang mga app sa iyong pribadong space kapag na-lock ang pribadong space mo.\n\nHindi puwedeng ilipat sa bagong device ang iyong pribadong space. Kakailanganin mong mag-set up ng ibang pribadong space kung gusto mo itong gamitin sa ibang device.\n\nPosibleng ma-access ng sinumang magkokonekta ng iyong device sa computer o mag-i-install ng mga mapaminsalang app sa device mo ang iyong pribadong space."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Hindi naaangkop ang mga pribadong space para sa mga app na kailangang gumana sa background o magpadala ng mga kritikal na notification, tulad ng mga medikal na app. Ito ay dahil hinihinto ang mga notification at aktibidad sa background kapag na-lock ang iyong space.\n\nHindi lalabas sa manager ng pahintulot, privacy dashboard, at iba pang setting ang mga app sa iyong pribadong space kapag na-lock ang pribadong space.\n\nHindi puwedeng i-restore sa bagong device ang iyong pribadong space. Kakailanganin mong mag-set up ng ibang space kung gusto mo itong gamitin sa ibang device.\n\nPosibleng ma-access ng sinumang magkokonekta ng iyong device sa computer o mag-i-install ng mga nakakapinsalang app sa device mo ang iyong pribadong space."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Matuto pa tungkol sa pribadong space"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Aabutin ito nang ilang sandali"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Sine-set up ang pribadong space…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"I-restart ang Device?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Idinisenyo lang ang pag-log ng detalye ng NFC para sa pag-develop. Nagsasama ng karagdagang data ng NFC sa mga ulat ng bug, na posibleng may pribadong impormasyon. I-restart ang iyong device para baguhin ang setting na ito."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"I-restart"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"mirror, external na display, nakakonektang display, usb display, resolution, pag-rotate"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Pag-rotate"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standard"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_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 kagustuhan."</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"White balance ng display"</string>
@@ -1897,14 +1912,14 @@
<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">"Aktwal na keyboard"</string>
- <string name="show_ime" msgid="4334255501724746849">"Gumamit ng on-screen na keyboard"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Panatilihin ito sa screen habang aktibo ang pisikal na keyboard"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Gawing dilaw ang fill ng pointer"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Gawing pink ang fill ng pointer"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Gawing asul ang fill ng pointer"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Istilo ng stroke ng pointer"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Puti"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Itim"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Wala"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Napiling user: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Pagsasalita"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Bilis ng pointer"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Scale ng pointer"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Bawasan ang scale ng pointer"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Dagdagdan ang scale ng pointer"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Game Controller"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"I-redirect ang pag-vibrate"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Magpadala ng pag-vibrate sa controller ng laro kapag nakakonekta"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Magpatuloy pa rin"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Kanselahin"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mga setting ng pag-magnify"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"One-finger na pag-pan"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Igalaw ang magnifier gamit ang 1 daliri"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"I-drag ang 1 daliri para gumalaw sa screen"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Galawin ang magnification area sa pag-drag sa 1 daliri."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Galawin ang magnification area sa pag-drag sa 2 daliri."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Hindi available habang naka-magnify ang isang bahagi lang ng screen"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Mag-tap ng button upang mag-zoom"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Mabilisang mag-zoom in sa screen para palakihin ang content"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Para mag-zoom in:</b><br/> {0,number,integer}. Gamitin ang shortcut para simulan ang pag-magnify<br/> {1,number,integer}. I-tap ang screen<br/> {2,number,integer}. I-drag ang 2 daliri para gumalaw sa screen<br/> {3,number,integer}. Mag-pinch gamit ang 2 daliri para i-adjust ang pag-zoom<br/> {4,number,integer}. Gamitin ang shortcut para ihinto ang pag-magnify<br/><br/> <b>Para mag-zoom in nang pansamantala:</b><br/> {0,number,integer}. Tiyaking nakatakda sa full screen ang iyong uri ng pag-magnify<br/> {1,number,integer}. Gamitin ang shortcut para simulan ang pag-magnify<br/> {2,number,integer}. Pumindot nang matagal kahit saan sa screen<br/> {3,number,integer}. I-drag ang daliri para gumalaw sa screen<br/> {4,number,integer}. Iangat ang daliri para ihinto ang pag-magnify"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Para mag-zoom in:</b><br/> {0,number,integer}. Gamitin ang shortcut para simulan ang pag-magnify<br/> {1,number,integer}. I-tap ang screen<br/> {2,number,integer}. I-drag ang 2 daliri para gumalaw sa screen<br/> {3,number,integer}. Mag-pinch gamit ang 2 daliri para i-adjust ang pag-zoom<br/> {4,number,integer}. Gumamit ng shortcut para ihinto ang pag-magnify<br/><br/> Puwede ka ring mag-zoom in pansamantala at higit pa."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Para mag-zoom in:</b><br/> {0,number,integer}. Gamitin ang shortcut para simulan ang pag-magnify<br/> {1,number,integer}. I-tap ang screen<br/> {2,number,integer}. I-drag ang 1 o 2 daliri para gumalaw sa screen<br/> {3,number,integer}. Mag-pinch gamit ang 2 daliri para i-adjust ang pag-zoom<br/> {4,number,integer}. Gumamit ng shortcut para ihinto ang pag-magnify<br/><br/> Puwede ka ring mag-zoom in pansamantala at higit pa."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Kapag naka-on ang pag-magnify, makakapag-zoom in ka sa iyong screen.\n\n"<b>"Para mag-zoom"</b>", simulan ang pag-magnify, pagkatapos ay mag-tap kahit saan sa screen.\n"<ul><li>"Mag-drag ng 2 o higit pang daliri para mag-scroll"</li>\n<li>"Mag-pinch ng 2 o higit pang daliri para isaayos ang pag-zoom"</li></ul>\n\n<b>"Para mag-zoom pansamantala"</b>", simulan ang pag-magnify, pagkatapos ay pumindot nang matagal kahit saan sa screen.\n"<ul><li>"Mag-drag para gumalaw-galaw sa screen"</li>\n<li>"Iangat ang daliri para mag-zoom out"</li></ul>\n\n"Hindi ka makakapag-zoom in sa keyboard o navigation bar."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sa <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Shortcut ng button ng accessibility"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Wala}=1{Naitakda ang 1 iskedyul}one{Naitakda ang # iskedyul}other{Naitakda ang # na iskedyul}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Huwag Istorbohin"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Mga Priyoridad na Mode"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Magdagdag ng mode"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Makakuha lang ng notification mula sa mahahalagang tao at app"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Piliin ang uri ng pag-activate"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Oras"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Hal. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Kalendaryo"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Hal. \"Personal na kalendaryo\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Gumawa ng mode"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Custom"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitahan ang mga pagkaantala"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"I-on ang Huwag Istorbohin"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Puwedeng makaabala ang mga alarm at tunog ng media"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Mga Iskedyul"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"I-delete ang mga iskedyul"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"I-delete"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"I-rename"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"I-delete"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"I-delete ang \"<xliff:g id="MODE">%1$s</xliff:g>\" mode?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"I-edit"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Mga Iskedyul"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Iskedyul"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Magdagdag ng kalendaryo"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Gamitin ang iyong kalendaryo"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Iiskedyul"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Magtakda ng iskedyul"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Iskedyul"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> (na) oras, <xliff:g id="MINUTES">%2$d</xliff:g> (na) minuto"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Awtomatikong i-on"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Iskedyul"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"I-silent ang phone sa ilang panahon"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Magtakda ng mga panuntunan ng Huwag Istorbohin"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Payagan ang mga abalang tumutunog"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"I-block ang visual na abala"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Payagan ang visual na signal"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Mga notification na makakarating sa iyo"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Manatiling naka-focus"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Mga karagdagang pagkilos"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Naka-off}=1{Naka-off / 1 mode ang puwedeng awtomatikong mag-on}one{Naka-off / # mode ang puwedeng awtomatikong mag-on}other{Naka-off / # na mode ang puwedeng awtomatikong mag-on}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Mga setting ng display"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Mga opsyon sa display"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Grayscale"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"i-enable ang madilim na tema"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"I-switch ang OS at mga app para piliin ang maliwanag na text sa madilim na background, na posibleng mas magaan sa mata at mas nakakatipid ng baterya sa ilang device"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Walang pagbabago sa display}=1{{effect_1}}=2{{effect_1} at {effect_2}}=3{{effect_1}, {effect_2}, at {effect_3}}one{{effect_1}, {effect_2}, at # pa}other{{effect_1}, {effect_2}, at # pa}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"I-filter ang mga abala"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Walang fini-filter na abala"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Mga opsyon sa display para sa mga naka-filter na notification"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Kapag naka-on ang Huwag Istorbohin"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Walang tunog mula sa mga notification"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"buksan ang notification"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Payagan ang pag-snooze ng notification"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Notification dot sa icon ng app"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Mga bundle ng notification"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Mga Bubble"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Mga Bubble"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"I-bubble ang pag-uusap na ito"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Hindi sinusuportahan ng app na ito ang mga pinahusay na setting"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Higit pang setting"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"May higit pang setting na available sa loob ng app na ito"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Cooldown sa notification"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Gumamit ng cooldown sa notification"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Mga Kategorya"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Iba Pa"</string>
<string name="no_channels" msgid="4716199078612071915">"Walang anumang notification para sa app na ito"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Ipakita ang mga hindi ginagamit na kategorya"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Mga karagdagang setting sa app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Ipakita ang mga hindi ginagamit"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Itago ang mga hindi ginagamit"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Mga app na puwedeng umabala"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Mga napiling app"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Wala"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Lahat"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Pumili pa ng mga app"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Walang puwedeng makaabala"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Walang taong puwedeng makaabala"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Puwedeng makaabala ang ilang tao"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Puwedeng makaabala ang lahat ng tao"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Mga umulit na tumatawag"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Payagan ang mga umuulit na tumatawag"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Gawing mag-a-alarm lang sa loob ng isang oras hanggang {time}}one{Gawing mag-a-alarm lang sa loob ng # oras hanggang {time}}other{Gawing mag-a-alarm lang sa loob ng # na oras hanggang {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Gawing mag-a-alarm lang hanggang <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Gawing palaging mang-abala"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"I-edit ang mode"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Magdagdag 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="warning_button_text" msgid="1274234338874005639">"Babala"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Isara"</string>
<string name="device_feedback" msgid="5351614458411688608">"Feedback tungkol sa device"</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Case"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Baterya"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Panel ng Mga Setting"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Force desktop mode"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Force experimental desktop mode sa mga pangalawang display"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"I-enable ang mga freeform window"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"I-enable ang suporta para sa mga freeform window."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"I-on ang freeform windowing sa pangalawang display"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Sa pangalawang display lang i-enable ang mga freeform window."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"I-enable ang hindi nare-resize sa multi-window"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Nagpapahintulot sa mga hindi nare-resize na app na lumabas sa multi-window"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"I-override ang force-dark"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Kailangang i-convert sa ext4 ang partition ng data ng device na ito bago magamit ang 16KB na opsyon ng developer. Hindi magagarantiya ang integridad ng software, at posibleng malagay sa panganib ang anumang data na naka-store sa telepono habang naka-unlock ang bootloader. Kailangan ng isa pang pag-reboot pagkatapos nito para sa pag-activate ng 16KB na opsyon. Kapag nasa mode na ito ka na, puwede kang magpalipat-lipat sa 4KB at 16KB mode pagkatapos ng isang pag-reboot lang. Madi-disable ang ilang feature sa mga mode na ito, kaya posibleng hindi gumana ang ilang application. Para ibalik sa production mode ang device, kakailanganin mong bumalik sa 4KB mode at pagkatapos ay i-lock ang bootloader, na magfa-factory reset sa device. Pagkatapos mag-boot ng device sa Android, i-disable ang pag-unlock ng OEM sa Mga opsyon ng developer. Mawa-wipe ang device at gagawing ext4 ang filesystem pagkatapos magkumpirma. Pagkatapos nito, bumalik para i-enable ulit ang 16KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Burahin ang lahat ng data"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Hindi na-reformat at na-wipe ang partition ng data sa ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Kinakailangan ang Pag-unlock ng Bootloader para sa 16KB Mode"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Required ang Pag-unlock ng Bootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Kailangang naka-unlock ang bootloader sa device na ito bago magamit ang 16KB na opsyon ng developer. Hindi magagarantiya ang integridad ng software, at posibleng malagay sa panganib ang anumang data na naka-store sa telepono habang naka-unlock ang bootloader. Mawa-wipe ang lahat ng data at setting ng user kapag ina-activate ang 16KB mode. Kapag na-unlock na ang bootloader, kailangan ng dalawang pag-reboot para sa pag-activate ng 16KB na opsyon. Kapag nasa mode na ito ka na, puwede kang magpalipat-lipat sa 4KB at 16KB mode pagkatapos ng isang pag-reboot lang. Madi-disable ang ilang feature sa mga mode na ito, kaya posibleng hindi gumana ang ilang application. Para ibalik sa production mode ang device, kakailanganin mong bumalik sa 4KB mode at pagkatapos ay i-lock ang OEM/bootloader sa device (na magfa-factory reset nito). I-unlock ang bootloader at subukan ulit. Mahahanap mo ang mga tagubilin kung paano ito gawin sa <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Ginagamit ang 4KB page-agnostic mode"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Nasa 4KB mode ka ng page-agnostic mode. Hindi magagarantiya ang integridad ng software, 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 i-lock ang bootloader ng device. I-tap para magbasa pa."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Nasa 4KB mode ka ng page-agnostic mode. Hindi magagarantiya ang integridad ng software, 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 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 pag-unlock ng OEM 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o gamitin ang <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> at piliin ang \'I-wipe ang Device,\' \'I-lock ang Bootloader,\' at \'Sapilitang I-flash ang lahat ng partition.\'"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Ginagamit ang 16KB page-agnostic mode"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Nasa 16KB mode ka ng page-agnostic mode. Hindi magagarantiya ang integridad ng software, 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 4K mode at pagkatapos ay i-lock ang bootloader ng device. I-tap para magbasa pa."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Nasa 16KB mode ka ng page-agnostic mode. Hindi magagarantiya ang integridad ng software, 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 4K 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 pag-unlock ng OEM 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o gamitin ang <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> at piliin ang \'I-wipe ang Device,\' \'I-lock ang Bootloader,\' at \'Sapilitang I-flash ang lahat ng partition.\'"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. I-tap para magbasa pa."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> o gamitin ang <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Tagapangasiwa ng ulat ng bug"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Gamitin ang pag-pin ng app"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Gamitin ang mga opsyon ng developer"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Gamitin ang serbisyo ng pag-print"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Payagan ang maraming user"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Payagan ang switch ng user"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"payagan, maraming, user, pahintulot, marami"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"maramihan, mga user, mga profile, mga tao, mga account, lumipat, marami"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Gamitin ang wireless na pag-debug"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Piliin ang makikita mo sa iyong screen kapag naka-dock ang iyong tablet. Posibleng gumamit ng mas maraming enerhiya ang iyong device kapag gumagamit ng screen saver."</string>
<string name="customize_button_title" msgid="1110284655990203359">"I-customize"</string>
<string name="customize_button_description" msgid="7440248477266126231">"I-customize ang <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Kinakailangang mag-reboot para ma-enable ang freeform na suporta"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Kinakailangang mag-reboot para sapilitang mailapat ang desktop mode sa mga pangalawang display."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Kailangang mag-reboot para ma-enable ang suporta sa legacy na freeform windowing."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Kailangang mag-reboot para mabago ang suporta sa freeform windowing."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Kailangang mag-reboot para sapilitang ma-enable ang freeform windowing sa mga pangalawang display."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Mag-reboot ngayon"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Mag-reboot sa ibang pagkakataon"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Spatial Audio"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Naka-on"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Naka-off"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Naka-on"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% sa kaliwa, %2$d%% sa kanan"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% sa kanan, %2$d%% sa kaliwa"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Nakikita ang pangalan ng device sa mga app na na-install mo. Puwede rin itong makita ng ibang tao kapag ikaw ay kumonekta sa mga Bluetooth device, kumonekta sa Wi-Fi network, o nag-set up ng Wi-Fi hotspot."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Kasarian para sa grammar"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Pumili ng Kasarian para sa grammar"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"Mga Setting ng Paghahanap"</string>
</resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 0f41472..7d56d4c 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Uyku vakti"</item>
+ <item msgid="4152450357280759894">"Araba kullanma"</item>
+ <item msgid="7096549258219399423">"Etkileyici"</item>
+ <item msgid="2760716776980432977">"Yönetilen"</item>
+ <item msgid="601734478369121764">"Yıldız"</item>
+ <item msgid="6243809315432780521">"Takvim"</item>
+ <item msgid="4913577903148415331">"Saat"</item>
+ <item msgid="3653377604690057780">"Sinema"</item>
+ <item msgid="3843711267408385410">"Çiçek"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f27da7e..2da1a5c 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Cihazla bağlantı kesilsin mi?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Yeni cihaz eşle"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Yarın otomatik olarak aç"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"İşitme cihazı ayarları"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Kısayol, işitme cihazı uyumluluğu"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Hazır Ayar"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Odyoloğunuz tarafından programlanmış ön ayar yok"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Hazır ayar güncellenemedi"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Ses çıkışı"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Ses çıkışı hakkında"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Kapalı"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Açık - # uygulamanın konuma erişimi var}other{Açık - # uygulamanın konuma erişimi var}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Yükleniyor…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Yakındaki cihazlarla bağlanma izni olan uygulamalar, bağlı cihazların göreli konumunu belirleyebilir."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Yakındaki cihazlarla bağlanma izni olan uygulamalar, bağlı cihazların göreli konumunu belirleyebilir."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Uygulamaların ve hizmetlerin konum erişimi kapalı. Yine de arayarak veya mesaj göndererek bir acil durum numarasına ulaştığınızda cihazınızın konumu acil durum müdahale ekiplerine gönderilebilir."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Konum ayarları hakkında daha fazla bilgi edinin"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Değiştirmek için ChromeOS Ayarları > Gizlilik ve güvenlik > Gizlilik denetimleri > Konum erişimi bölümüne gidin"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Yüz ve <xliff:g id="WATCH">%s</xliff:g> eklendi"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Yüz, parmak izi ve <xliff:g id="WATCH">%s</xliff:g> eklendi"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Yüz, parmak izleri ve <xliff:g id="WATCH">%s</xliff:g> eklendi"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Kimlik Kontrolü açık olduğu için bu zorunludur"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Uzaktan Kimlik Doğrulayıcı Kilidini Açma"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Kol saati eklendi"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Kol saatinizi kurma"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Saat ile Kilit Açma hakkında daha fazla bilgi"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Kol saati ekle"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Kol saatini kaldır"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Parmak İzi ve Yüz Tanıma Kilidi"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Yüz Tanıma ve Parmak İzi Kilidi"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"İş profili için Yüz Tanıma ve Parmak İzi Kilidi"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Kurulum gerekiyor"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Yüz ve parmak izleri eklendi"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Uygulamaları yükleyin"</b>\n"Alanınızda gizli tutmak istediğiniz uygulamaları yükleyin"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Unutmayın"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Alanınızı kilitlediğinizde uygulamalar durur"</b>\n"Alanınızı kilitlediğinizde bu alandaki uygulamalar durdurulur ve size artık bildirim göndermez"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Özel alanlar, tıbbi uygulamalar gibi arka planda çalışması ve önemli bildirimler göndermesi gereken uygulamalar için uygun değildir. Bunun nedeni, alanınız kilitlendiğinde bildirimlerin ve arka plandaki etkinliğin durdurulmasıdır.\n\nÖzel alan kilitli olduğunda izin yöneticisi, gizlilik kontrol paneli ve diğer ayarlarda özel alanınızdaki uygulamalar görünmez.\n\nÖzel alanınız yeni bir cihaza taşınamaz. Başka bir cihazda kullanmak istiyorsanız ilgili cihazda yeni bir özel alan kurmanız gerekir.\n\nCihazınızı bilgisayara bağlayan veya cihazınıza zararlı uygulamalar yükleyen kişiler özel alanınıza erişebilir."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Özel alanlar, tıbbi uygulamalar gibi arka planda çalışması ve önemli bildirimler göndermesi gereken uygulamalar için uygun değildir. Bunun nedeni, alanınız kilitlendiğinde bildirimlerin ve arka plandaki etkinliğin durdurulmasıdır.\n\nÖzel alan kilitli olduğunda izin yöneticisi, gizlilik kontrol paneli ve diğer ayarlarda özel alandaki uygulamalar görünmez.\n\nÖzel alanınız yeni bir cihaza geri yüklenemez. Başka bir cihazda kullanmak istiyorsanız ilgili cihazda yeni bir alan kurmanız gerekir.\n\nCihazınızı bilgisayara bağlayan veya cihazınıza kötü amaçlı uygulamalar yükleyen kişiler özel alanınıza erişebilir."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Özel alan hakkında daha fazla bilgi"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Bu işlem birkaç dakika sürecek"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Özel alan kuruluyor…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Cihaz Yeniden Başlatılsın mı?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Ayrıntılı NFC günlük kaydı, yalnızca geliştirme amaçlıdır. Hata raporlarında, özel bilgiler içerebilen ek NFC verileri yer alır. Bu ayarı değiştirmek için cihazınızı yeniden başlatın."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Yeniden başlat"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"yansıtma, harici ekran, bağlı ekran, usb ekranı, çözünürlük, döndürme"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Döndürme"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standart"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Ekran klavyesi kullan"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Fiziksel klavye etkin durumdayken ekranda tut"</string>
<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="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="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 klavyeyi 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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"İşaretçi dolgu stilini sarı yapın"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"İşaretçi dolgu stilini pembe yapın"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"İşaretçi dolgu stilini mavi yapın"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"İşaretçi çizgi stili"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Beyaz"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Siyah"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Yok"</string>
<string name="trackpad_touch_gesture" msgid="8641725062131922497">"Dokunmatik alan hareketlerini öğren"</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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Kullanıcı tarafından <xliff:g id="LAYOUT_LABEL">%s</xliff:g> seçildi"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Konuşma"</string>
<string name="pointer_speed" msgid="7398649279282675718">"İşaretçi hızı"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"İşaretçi boyutu"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"İşaretçi boyutunu küçült"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"İşaretçi boyutunu büyüt"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Oyun Denetleyici"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Titreşimi yönlendir"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Bağlandığında oyun denetleyiciye titreşim gönder"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Yine de devam et"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"İptal"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Büyütme ayarları"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Tek parmakla kaydırma"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Büyüteci 1 parmağınızla hareket ettirin"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Ekranda gezinmek için parmağınızı sürükleyin"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Tek parmağınızı sürükleyerek büyütme alanını taşıyın."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"İki parmağınızı sürükleyerek büyütme alanını taşıyın."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ekranın yalnızca bir kısmını büyütürken kullanılamaz"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Yakınlaştırmak için bir düğmeye dokunun"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"İçerikleri büyütmek için ekranı hızlıca yakınlaştırın"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Yakınlaştırmak için:</b><br/> {0,number,integer}. Büyütmeyi başlatmak için kısayolu kullanın<br/> {1,number,integer}. Ekrana dokunun<br/> {2,number,integer}. Ekranda gezinmek için 2 parmağınızı sürükleyin<br/> {3,number,integer}. Yakınlaştırmayı ayarlamak için 2 parmağınızla sıkıştırın<br/> {4,number,integer}. Büyütmeyi durdurmak için kısayolu kullanın<br/><br/> <b>Geçici bir süreliğine yakınlaştırmak için:</b><br/> {0,number,integer}. Büyütme yönteminin tam ekran olarak ayarlandığından emin olun<br/> {1,number,integer}. Büyütmeyi başlatmak için kısayolu kullanın<br/> {2,number,integer}. Ekranda herhangi bir yere dokunup basılı tutun<br/> {3,number,integer}. Ekranda gezinmek için parmağınızı sürükleyin<br/> {4,number,integer}. Büyütmeyi durdurmak için parmağınızı kaldırın"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Yakınlaştırmak için:</b><br/> {0,number,integer}. Büyütmeyi başlatmak için kısayol kullanın<br/> {1,number,integer}. Ekrana dokunun<br/> {2,number,integer}. Ekranda gezinmek için 2 parmağınızı sürükleyin<br/> {3,number,integer}. Yakınlaştırmayı ayarlamak için 2 parmağınızla sıkıştırın<br/> {4,number,integer}. Büyütmeyi durdurmak için kısayol kullanın<br/><br/> Ayrıca geçici olarak yakınlaştırabilir ve diğer işlemleri yapabilirsiniz."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Yakınlaştırmak için:</b><br/> {0,number,integer}. Büyütmeyi başlatmak için kısayol kullanın<br/> {1,number,integer}. Ekrana dokunun<br/> {2,number,integer}. Ekranda hareket etmek için 1 veya 2 parmağınızı sürükleyin<br/> {3,number,integer}. Yakınlaştırmayı ayarlamak için 2 parmağınızla sıkıştırın<br/> {4,number,integer}. Büyütmeyi durdurmak için kısayol kullanın<br/><br/> Ayrıca geçici olarak yakınlaştırabilir ve diğer işlemleri yapabilirsiniz."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Büyütme açıldığında ekranınızda yakınlaştırma yapabilirsiniz.\n\n"<b>"Yakınlaştırmak için"</b>", büyütmeyi başlatın, ardından ekranda herhangi bir yere dokunun.\n"<ul><li>"Kaydırmak için 2 veya daha fazla parmağınızı sürükleyin"</li>\n<li>"Yakınlaştırmayı ayarlamak için 2 veya daha fazla parmağınızı birbirine yaklaştırın"</li></ul>\n\n<b>"Geçici olarak yakınlaştırmak için"</b>", büyütmeyi başlatın, ardından ekranda herhangi bir yere dokunup basılı tutun.\n"<ul><li>"Ekranda hareket etmek için sürükleyin"</li>\n<li>"Uzaklaştırmak için parmağınızı çekin"</li></ul>\n\n"Klavyede veya gezinme çubuğundayken yakınlaştırma yapamazsınız."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Sayfa <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Erişilebilirlik düğmesi kısayolu"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Yok}=1{1 program ayarlandı}other{# program ayarlandı}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Rahatsız Etmeyin"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Öncelik Modları"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Mod ekleyin"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnızca önemli kişiler ve uygulamalardan gelen bildirimleri alın"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Etkinleştirme türünü seçin"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Süre"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Örnek: \"09:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Takvim"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Örnek: \"Kişisel takvim\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Mod oluşturun"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Özel"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kesintileri sınırlayın"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Rahatsız Etmeyin\'i açın"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Alarm ve medya sesleri kesintiye neden olabilir"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Programlar"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Programları sil"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Sil"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Yeniden adlandır"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Sil"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" modu silinsin mi?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Düzenle"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Programlar"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Programla"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Takvim ekleyin"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Takviminizi kullanın"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Program"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Program ayarlama"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Program"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> sa. <xliff:g id="MINUTES">%2$d</xliff:g> dk."</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Otomatik olarak aç"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Program"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefonun sesini belirli zamanlarda kapat"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Rahatsız Etmeyin kurallarını ayarlayın"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Ses çıkaran kesintilere izin ver"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Görsel bildirimleri engelle"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Görsel sinyallere izin ver"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Alabileceğiniz bildirimler"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Konsantrasyonunuzu koruyun"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Diğer işlemler"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Kapalı}=1{Kapalı/1 mod otomatik olarak açılabilir}other{Kapalı/# mod otomatik olarak açılabilir}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ekran ayarları"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Görüntüleme seçenekleri"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Gri tonlama"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"koyu temayı etkinleştir"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"İşletim sistemini ve uygulamaları, koyu arka plan üzerinde açık renkli metin kullanacak şekilde değiştirin. Böylece gözünüz yorulmaz ve bazı cihazlarda önemli ölçüde pil tasarrufu yapabilirsiniz"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ekranda değişiklik yok}=1{{effect_1}}=2{{effect_1} ve {effect_2}}=3{{effect_1}, {effect_2} ve {effect_3}}other{{effect_1}, {effect_2} ve # ayar daha}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Kesintileri filtrele"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Kesintiler filtrelenmiyor"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Filtrelenen bildirimlerle ilgili ekran seçenekleri"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Rahatsız Etmeyin ayarı açık olduğunda"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirimlerden sesli uyarı yok"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"bildirimi aç"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Bildirimin ertelenmesine izin ver"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Uygulama simgesinde bildirim noktası"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Bildirim paketleri"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Baloncuklar"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Baloncuklar"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bu görüşmeyi baloncuk olarak göster"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Bu uygulama, gelişmiş ayarları desteklemiyor"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Diğer ayarlar"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Bu uygulamada daha fazla ayar mevcut"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Bildirim bekleme süresi"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"İş profillerine uygula"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"İş profili uygulamalarına uygulayın"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Kategoriler"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Diğer"</string>
<string name="no_channels" msgid="4716199078612071915">"Bu uygulama herhangi bir bildirim yayınlamadı"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Kullanılmayan kategorileri göster"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Uygulamadaki ek ayarlar"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Kullanılmayan kategorileri göster"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Kullanılmayan kategorileri gizle"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Kesintiye neden olabilecek uygulamalar"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Seçili uygulamalar"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Yok"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Tümü"</string>
+ <string name="zen_mode_apps_subtext" msgid="1764211974662012877">"{count,plural,offset:2 =0{Hiçbir uygulama kesintiye neden olamaz}=1{{app_1} kesintiye neden olabilir}=2{{app_1} ve {app_2} kesintiye neden olabilir}=3{{app_1}, {app_2} ve {app_3} kesintiye neden olabilir}other{{app_1}, {app_2} ve # uygulama daha kesintiye neden olabilir}}"</string>
+ <string name="zen_mode_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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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">"Kesintiye neden olabilecek uygulamalar"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Daha fazla uygulama seçin"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hiçbir şey kesintiye neden olamaz"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Hiç kimse kesintiye neden olamaz"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Bazı kişiler kesintiye neden olabilir"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Tüm kişiler kesintiye neden olabilir"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Tekrar arayanlar"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Tekrar arayanlara izin ver"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Saat {time} olana kadar bir saat boyunca yalnızca alarmlar seçeneğine geç}other{Saat {time} olana kadar # saat boyunca yalnızca alarmlar seçeneğine geç}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Yalnızca şu saate kadar alarmlara geç: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Her zaman kes seçeneğine değiştir"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Düzenleme modu"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Mod ekleyin"</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="warning_button_text" msgid="1274234338874005639">"Uyarı"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Kapat"</string>
<string name="device_feedback" msgid="5351614458411688608">"Bu cihazla ilgili geri bildirim gönder"</string>
@@ -4025,7 +4070,7 @@
<string name="draw_overlay" msgid="7902083260500573027">"Diğer uyg. üzerinde göster"</string>
<string name="system_alert_window_settings" msgid="6458633954424862521">"Diğer uygulamaların üzerinde göster"</string>
<string name="permit_draw_overlay" msgid="4468994037192804075">"Diğer uygulamalar üzerinde gösterime izin ver"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"Bu uygulamaya, kullandığınız diğer uygulamaların üzerinde gösterme izin verir. Bu uygulama, ekranda nereye dokunduğunuzu görebilecek veya ekranda görüntülenenleri değiştirebilecek."</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"Bu uygulamaya, kullandığınız diğer uygulamaların üzerinde gösterim izni verir. Bu uygulama, ekranda nereye dokunduğunuzu görebilecek veya ekranda görüntülenenleri değiştirebilecek."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"Medya çıkışını değiştir"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"Uygulamanın, medya çıkışını değiştirmesine izin verin"</string>
<string name="allow_media_routing_description" msgid="8343709701298051207">"Bu uygulamanın, diğer uygulamalardan ses veya video oynatabilecek bağlı cihazı seçmesine izin verin. İzin verildiği takdirde bu uygulama, kulaklık ve hoparlör gibi kullanılabilir cihazların listesine erişip ses veya video akışı ya da yayını için kullanılacak çıkış cihazını seçebilir."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Kılıf"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Pil"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Ayarlar Paneli"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Masaüstü modunu zorunlu kıl"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"İkincil ekranlarda deneysel masaüstü modunu zorunlu kıl"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Serbest biçimli pencereleri etkinleştir"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Serbest biçimli pencere desteğini etkinleştir."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"İkincil ekranda serbest biçimli pencerelemeyi etkinleştir"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Serbest biçimli pencereleri yalnızca ikincil ekranda etkinleştir."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Çoklu pencerede yeniden boyutlandırılamayan uygulamalara izin ver"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Çoklu pencerede yeniden boyutlandırılamayan uygulamalara izin verir"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Zorunlu koyu modu geçersiz kıl"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16 KB geliştirici seçeneğini kullanmadan önce bu cihazın veri bölümünün ext4\'e dönüştürülmesi gerekir. Bu modda yazılım bütünlüğü garanti edilemez ve bootloader\'ın kilidi açıkken telefonda saklanan veriler risk altında olabilir. 16 KB seçeneğini etkinleştirdikten sonra bir kez daha yeniden başlatma yapılması gerekir. Bu moddayken tek bir yeniden başlatma işlemiyle 4 KB ve 16 KB modları arasında geçiş yapabilirsiniz. Bu modlarda bazı özellikler devre dışı bırakılacağı için bazı uygulamalar çalışmayabilir. Cihazı üretim moduna döndürmek için 4 KB moduna geri dönmeniz ve bootloader\'ı kilitlemeniz gerekir. Bu durumda cihaz fabrika ayarlarına sıfırlanır. 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. Onayınızın ardından cihaz temizlenecek ve dosya sistemi ext4 olarak değiştirilecektir. Bu işlem tamamlandıktan sonra lütfen geri gelerek 16 KB modunu tekrar etkinleştirin."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Tüm verileri sil"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Veriler temizlenemedi ve ext4 olarak yeniden biçimlendirilemedi."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16 KB modu için bootloader kilidinin açılması gerekir"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader Kilidinin Açılması Gerekiyor"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 KB geliştirici seçeneğini kullanmadan önce bu cihazın bootloader\'ının kilidinin açılması gerekir. Bu modda yazılım bütünlüğü garanti edilemez ve bootloader\'ın kilidi açıkken telefonda saklanan veriler risk altında olabilir. 16 KB modu etkinleştirildiğinde tüm kullanıcı verileri ve ayarlar silinir. Bootloader\'ın kilidi açıldıktan sonra 16 KB seçeneğinin etkinleştirilmesi için iki kez yeniden başlatma yapılması gerekir. Bu moddayken tek bir yeniden başlatma işlemiyle 4 KB ve 16 KB modları arasında geçiş yapabilirsiniz. Bu modlarda bazı özellikler devre dışı bırakılacağı için bazı uygulamalar çalışmayabilir. Cihazı üretim moduna döndürmek için 4 KB moduna geri dönmeniz ve cihazda OEM/bootloader kilidini etkinleştirmeniz gerekir. Bu durumda cihaz fabrika ayarlarına sıfırlanır. Lütfen bootloader\'ın kilidini açıp tekrar deneyin. Bu işlemle ilgili talimatları görmek için <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> adresine gidin."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4 KB sayfadan bağımsız modunu kullanıyorsunuz"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Sayfadan bağımsız moddaki 4 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 bazı uygulamalar çalışmayabilir. Üretim moduna tekrar girmek için cihazın bootloader\'ını kilitlemeniz gerekir. Daha fazla bilgi için dokunun."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Sayfadan bağımsız moddaki 4 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 bazı uygulamalar çalışmayabilir. Üretim moduna tekrar girmek için 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ı <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> adresindeki en güncel fabrika ayarı görüntüleriyle yeniden yükleyin veya <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> adresine gidip \"Cihazı Temizle\", \"Bootloader\'ı Kilitle\" ve \"Tüm bölümleri zorla yükle\"yi seçin."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16 KB sayfadan bağımsız modunu kullanıyorsunuz"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 bazı uygulamalar çalışmayabilir. Üretim moduna tekrar girmek için 4 KB moduna geçtikten sonra cihazın bootloader\'ını kilitlemeniz gerekir. Daha fazla bilgi için dokunun."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 bazı 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ı <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> adresindeki en güncel fabrika ayarı görüntüleriyle yeniden yükleyin veya <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> adresine gidip \"Cihazı Temizle\", \"Bootloader\'ı Kilitle\" ve \"Tüm bölümleri zorla yükle\"yi seçin."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Daha fazla bilgi için dokunun."</string>
+ <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ı <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> adresindeki en güncel fabrika ayarı görüntüleriyle yeniden yükleyin veya <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Hata raporu işleyici"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Uygulama sabitlemeyi kullan"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Geliştirici seçeneklerini kullan"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Yazdırma hizmetini kullan"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Birden çok kullanıcıya izin ver"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Kullanıcı değişikliğine izin ver"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"izin ver, çoklu, kullanıcı, izin birden fazla"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"birden fazla, kullanıcılar, profiller, kişiler, hesaplar, geçiş, birçok"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Kablosuz hata ayıklamayı kullan"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Tabletiniz yuvaya yerleştirildiğinde ekranınızda nelerin görünmesini istediğinizi seçin. Ekran koruyucu kullanıldığında cihazınız daha fazla enerji tüketebilir."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Özelleştir"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Özelleştir <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Serbest biçimli desteğin etkinleştirilmesi için yeniden başlatma gerekir."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"İkincil ekranlarda masaüstü modunu zorlamak için yeniden başlatma gerekir."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Eski serbest biçimli pencereleme desteğinin etkinleştirilmesi için yeniden başlatma gerekir."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Serbest biçimli pencereleme desteğini değiştirmek için yeniden başlatma gerekir."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"İkincil ekranlarda serbest biçimli pencerelemeyi zorlamak için yeniden başlatma gerekir."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Şimdi yeniden başlat"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Sonra yeniden başlat"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Üç Boyutlu Ses"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Açık"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Kapalı"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Açık"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Ses %%%1$d sol, %%%2$d sağ"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Ses %%%1$d sağ, %%%2$d sol"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Yüklediğiniz uygulamalar, cihazınızın adını görebilecek. Cihazınızın adı ayrıca Bluetooth cihazlara bağlandığınızda, kablosuz ağa bağlandığınızda veya kablosuz hotspot oluşturduğunuzda diğer kişiler tarafından görülecektir."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Dil bilgisine uygun cinsiyet"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Dil bilgisine uygun cinsiyet seçin"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"Arama Ayarları"</string>
</resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index cf72bb8..2399e53 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Час сну"</item>
+ <item msgid="4152450357280759894">"Водіння"</item>
+ <item msgid="7096549258219399423">"Реалістичність"</item>
+ <item msgid="2760716776980432977">"Керованість"</item>
+ <item msgid="601734478369121764">"Зірка"</item>
+ <item msgid="6243809315432780521">"Календар"</item>
+ <item msgid="4913577903148415331">"Час"</item>
+ <item msgid="3653377604690057780">"Театр"</item>
+ <item msgid="3843711267408385410">"Квітка"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 170f0dc..c55240b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Від’єднати пристрій?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Підключити новий пристрій"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"Bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Автоматично ввімкнути завтра"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Налаштування слухового апарата"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Ярлик, сумісність зі слуховими апаратами"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Набір налаштувань"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Немає наборів налаштувань, запрограмованих вашим аудіологом"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Не вдалось оновити набір налаштувань"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Аудіовихід"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Про аудіовихід"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Вимкнено"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Увімкнено / # додаток має доступ до геоданих}one{Увімкнено / # додаток має доступ до геоданих}few{Увімкнено / # додатки мають доступ до геоданих}many{Увімкнено / # додатків мають доступ до геоданих}other{Увімкнено / # додатка мають доступ до геоданих}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Завантаження…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Додатки з дозволами на доступ до пристроїв поблизу можуть визначати відносне розташування підключених пристроїв."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Додатки з дозволами на доступ до пристроїв поблизу можуть визначати відносне розташування підключених пристроїв."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Доступ до геоданих вимкнено для додатків і сервісів. Однак дані про місцезнаходження вашого пристрою можуть надсилатися в екстрених випадках, якщо ви зателефонуєте або надішлете SMS на екстрений номер."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Докладніше про доступ до геоданих"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Щоб змінити налаштування, виберіть \"Налаштування ChromeOS\" > \"Конфіденційність і безпека\" > \"Налаштування конфіденційності\" > \"Доступ до геоданих\""</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Додано обличчя та годинник \"<xliff:g id="WATCH">%s</xliff:g>\""</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Додано обличчя, відбиток пальця та годинник \"<xliff:g id="WATCH">%s</xliff:g>\""</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Додано обличчя, відбитки пальців і годинник \"<xliff:g id="WATCH">%s</xliff:g>\""</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Це потрібно, оскільки ввімкнено перевірку особи"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Розблокування (Remote Authenticator)"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Годинник додано"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Налаштуйте свій годинник"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Докладніше про розблокування годинником"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Додати годинник"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Вилучити годинник"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Розблокування відбитком пальця й фейс-контроль"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Фейс-контроль і розблокування відбитком пальця"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Фейс-контроль і відбиток пальця для роботи"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Потрібно налаштувати"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Обличчя й відбитки пальців додано"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Установіть додатки"</b>\n"Установіть додатки, які хочете приватно використовувати у своєму просторі"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Важливо"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Під час блокування простору додатки припиняють роботу"</b>\n"Якщо ви заблокуєте свій простір, включені в нього додатки припинять роботу й ви не отримуватимете сповіщень від них"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Приватні простори не підходять для додатків (наприклад, медичних), які мають працювати у фоновому режимі або надсилати важливі сповіщення. Це пов’язано з тим, що надсилання сповіщень і робота у фоновому режимі припиняються, коли ваш простір заблоковано.\n\nКоли приватний простір заблоковано, його додатки не відображаються в менеджері дозволів, на панелі керування дозволами й в інших налаштуваннях.\n\nПриватний простір не можна перенести на інший пристрій. Якщо ви хочете використовувати приватний простір на іншому пристрої, потрібно налаштувати новий.\n\nЯкщо хтось установить на вашому пристрої шкідливі додатки або підключить його до комп’ютера, то може отримати доступ до вашого приватного простору."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Приватні простори не підходять для додатків (наприклад, медичних), які мають працювати у фоновому режимі або надсилати важливі сповіщення. Це пов’язано з тим, що надсилання сповіщень і робота у фоновому режимі припиняються, коли ваш простір заблоковано.\n\nКоли приватний простір заблоковано, його додатки не відображатимуться в менеджері дозволів, на панелі керування дозволами й в інших налаштуваннях.\n\nПриватний простір не можна відновити на іншому пристрої. Якщо ви хочете використовувати приватний простір на іншому пристрої, потрібно налаштувати новий.\n\nЯкщо хтось установить на вашому пристрої шкідливі додатки або підключить його до комп’ютера, то може отримати доступ до вашого приватного простору."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Докладніше про приватний простір"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Це може зайняти кілька хвилин"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Налаштування приватного простору…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Перезапустити пристрій?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Ведення детальних журналів NFC призначене лише для розробки. Додаткові дані NFC включаються у звіти про помилки, які можуть містити приватну інформацію. Щоб змінити це налаштування, перезапустіть пристрій."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Перезапустити"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"дублювати, зовнішній дисплей, підключений дисплей, usb-дисплей, роздільна здатність, обертання"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Кут обертання"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Cтандартний"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1601,7 +1616,7 @@
<string name="about_settings_summary" msgid="4831942939227432513">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
<string name="legal_information" msgid="7509900979811934843">"Правова інформація"</string>
<string name="manual" msgid="3651593989906084868">"Посібник"</string>
- <string name="regulatory_labels" msgid="5960251403367154270">"Сертифікації"</string>
+ <string name="regulatory_labels" msgid="5960251403367154270">"Нормативні етикетки"</string>
<string name="safety_and_regulatory_info" msgid="8285048080439298528">"Посібник із безпеки й нормативних вимог"</string>
<string name="copyright_title" msgid="83245306827757857">"Автор. право"</string>
<string name="license_title" msgid="8745742085916617540">"Ліцензія"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Використовувати екранну клавіатуру"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Залишати її на екрані, коли активна фізична клавіатура"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Змінити стиль курсора на жовтий"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Змінити стиль курсора на рожевий"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Змінити стиль курсора на синій"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Стиль накреслення вказівника"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Білий"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Чорний"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Немає"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Вибрано користувачем: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Мовлення"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Швидкість курсора"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Розмір курсора"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Зменшити розмір курсора"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Збільшити розмір курсора"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Ігровий контролер"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Переспрямувати вібросигнал"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Надсилати вібросигнал на ігровий контролер, коли є з’єднання"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Усе одно продовжити"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Скасувати"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налаштування збільшення"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Панорамування одним пальцем"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Переміщуйте лупу одним пальцем"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Проводьте одним пальцем, щоб переміщатись екраном"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Переміщуйте область збільшення, перетягуючи одним пальцем."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Переміщуйте область збільшення, перетягуючи двома пальцями."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Недоступно, коли збільшено лише частину екрана"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Торкніться кнопки, щоб збільшити вміст"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Щоб краще роздивитися вміст екрана, його можна наблизити."</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Щоб наблизити зображення:</b><br/> {0,number,integer}. Активуйте збільшення, скориставшись призначеною для цього кнопкою чи відповідним жестом.<br/> {1,number,integer}. Торкніться екрана.<br/> {2,number,integer}. Щоб перейти до іншої області на екрані, потягніть по ньому двома пальцями.<br/> {3,number,integer}. Зведіть або розведіть два пальці, щоб змінити масштаб.<br/> {4,number,integer}. Вимкніть збільшення, скориставшись призначеною для цього кнопкою чи відповідним жестом.<br/><br/> <b>Щоб ненадовго наблизити зображення:</b><br/> {0,number,integer}. Переконайтеся, що вибрано тип збільшення \"На весь екран\".<br/> {1,number,integer}. Активуйте збільшення, скориставшись призначеною для цього кнопкою чи відповідним жестом.<br/> {2,number,integer}. Натисніть і втримуйте будь-яке місце на екрані.<br/> {3,number,integer}. Щоб переглянути іншу область на екрані, пересуньте палець.<br/> {4,number,integer}. Підніміть палець, щоб припинити збільшення."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Для цього:</b><br/> {0,number,integer}. Активуйте збільшення, скориставшись призначеною для цього кнопкою чи відповідним жестом.<br/> {1,number,integer}. Торкніться екрана.<br/> {2,number,integer}. Щоб перейти до іншої області на екрані, проведіть по ньому двома пальцями.<br/> {3,number,integer}. Зведіть два пальці, щоб змінити масштаб.<br/> {4,number,integer}. Вимкніть збільшення за допомогою швидкої команди.<br/><br/> Ви також можете тимчасово збільшувати масштаб і не тільки."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Для цього:</b><br/> {0,number,integer}. Активуйте збільшення, скориставшись призначеною для цього кнопкою чи відповідним жестом.<br/> {1,number,integer}. Торкніться екрана.<br/> {2,number,integer}. Щоб перейти до іншої області на екрані, проведіть по ньому одним або двома пальцями.<br/> {3,number,integer}. Зведіть два пальці, щоб змінити масштаб.<br/> {4,number,integer}. Вимкніть збільшення за допомогою швидкої команди.<br/><br/> Ви також можете тимчасово збільшувати масштаб і не тільки."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Коли функцію збільшення ввімкнено, ви можете наближувати вміст на екрані.\n\n"<b>"Щоб наблизити вміст"</b>", увімкніть збільшення, а потім торкніться будь-якого місця на екрані.\n"<ul><li>"Щоб прокрутити вміст, проведіть по екрану принаймні двома пальцями"</li>\n<li>"Щоб змінити масштаб, стисніть або розведіть принаймні два пальці"</li></ul>\n\n<b>"Щоб тимчасово збільшити вміст"</b>", увімкніть збільшення, а потім натисніть і утримуйте будь-яке місце на екрані.\n"<ul><li>"Пересувайте палець, щоб переміщатись екраном"</li>\n<li>"Підніміть палець, щоб знову зменшити елемент"</li></ul>\n\n"Масштабування не підтримується на клавіатурі та панелі навігації."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Сторінка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Швидка дія кнопкою функцій доступності"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Немає}=1{Налаштовано 1 розклад}one{Налаштовано # розклад}few{Налаштовано # розклади}many{Налаштовано # розкладів}other{Налаштовано # розкладу}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбувати"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Режими пріоритету"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Додати режим"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Отримуйте сповіщення лише від важливих людей і додатків"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Вибрати тип активації"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Час"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Приклад: \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Календар"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Приклад: \"Особистий календар\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Створити режим"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Спеціальний"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Обмеження сповіщень"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Увімкнути режим \"Не турбувати\""</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Звуки будильників і медіа можуть переривати"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Розклад"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Видалити розклади"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Видалити"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Перейменувати"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Видалити"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Видалити режим \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Редагувати"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Розклад"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Розклад"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Додати календар"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Використовувати календар"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Розклад"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Налаштуйте розклад"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Розклад"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> год, <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Вмикати автоматично"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Розклад"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Вимикати звук телефона в певний час"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Налаштувати правила режиму \"Не турбувати\""</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Дозволити сповіщення зі звуком"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Блокувати візуальні сповіщення"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Дозволити візуальні сигнали"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Сповіщення, які ви можете отримувати"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Не відволікайтесь"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Додаткові дії"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Вимкнено}=1{Вимкнено / 1 режим може вмикатись автоматично}one{Вимкнено / # режим може вмикатись автоматично}few{Вимкнено / # режими можуть вмикатись автоматично}many{Вимкнено / # режимів можуть вмикатись автоматично}other{Вимкнено / # режиму можуть вмикатись автоматично}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Налаштування дисплея"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Параметри відображення"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Відтінки сірого"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"увімкнути темну тему"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Змініть налаштування ОС і додатків, щоб використовувати світлий текст на темному фоні. Це може бути комфортніше для очей і допомагає суттєво економити заряд акумулятора на деяких пристроях."</string>
<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}}one{{effect_1}, {effect_2} і ще #}few{{effect_1}, {effect_2} і ще #}many{{effect_1}, {effect_2} і ще #}other{{effect_1}, {effect_2} і ще #}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Фільтрувати сповіщення"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Сповіщення не фільтруються"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"відкрити сповіщення"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Дозволити відкладання сповіщень"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Сповіщення на значках додатків"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Пакети сповіщень"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Спливаючі чати"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Спливаючі чати"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Показувати цей чат у спливаючому сповіщенні"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Цей додаток не підтримує розширені налаштування"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Інші налаштування"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Інші налаштування доступні в цьому додатку"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Зниження гучності сповіщень"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Застосувати до робочих профілів"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Застосувати до додатків робочого профілю"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Категорії"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Інше"</string>
<string name="no_channels" msgid="4716199078612071915">"Цей додаток не надсилав сповіщень"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Показати категорії, що не використовуються"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Розширені налаштування в додатку"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Показати категорії, що не використ."</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Сховати категорії, що не використ."</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Додатки, які можуть переривати"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Вибрані додатки"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Жодний"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Усі"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"Дозволити додаткам замінювати режим \"Не турбувати\""</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"Додатки, які можуть переривати"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Виберіть інші додатки"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ніщо не може переривати"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Ніхто не може переривати"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Деякі люди можуть переривати"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Усі люди можуть переривати"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Повторні вхідні виклики"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Дозволити повторні дзвінки"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Активувати режим \"Лише будильник\" на одну годину до {time}}one{Активувати режим \"Лише будильник\" на # годину до {time}}few{Активувати режим \"Лише будильник\" на # години до {time}}many{Активувати режим \"Лише будильник\" на # годин до {time}}other{Активувати режим \"Лише будильник\" на # години до {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Активувати режим \"Лише будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Вибрати опцію \"Завжди надсилати\""</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Редагувати режим"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Додати режим"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"Спеціальний режим"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"Назва режиму"</string>
<string name="warning_button_text" msgid="1274234338874005639">"Застереження"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Закрити"</string>
<string name="device_feedback" msgid="5351614458411688608">"Надіслати відгук про цей пристрій"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"Примусово застосувати режим робочого столу"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Примусово застосувати експериментальний режим робочого столу на додаткових екранах"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Увімкнути вікна змінного розміру"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Увімкнути підтримку вікон змінного розміру."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Увімкнути вікна змінного розміру на другому екрані"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Увімкнути вікна змінного розміру лише на додатковому екрані."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Дозволити немасштабовані додатки в багатоекранному режимі"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Дає змогу користуватися в багатоекранному режимі додатками, розмір яких не можна змінити"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Замінити примусовий темний режим"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Щоб використовувати режим для розробників зі сторінками розміром 16 КБ, розділ даних на цьому пристрої потрібно відформувати у файловій системі ext4. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Після цього для активації режиму 16 КБ потрібно буде ще раз перезапустити пристрій. Коли ви перейдете в цей режим, то для зміни режиму розміру сторінки з 16 КБ на 4 КБ та навпаки пристрій потрібно буде перезапустити лише один раз. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернути пристрій у виробничий режим, вам буде потрібно повернутися в режим 4 КБ й заблокувати завантажувач операційної системи. Після цього налаштування пристрою буде скинуто. Коли ОС Android завантажиться, вимкніть розблокування завантажувача в параметрах розробника. Після підтвердження на пристрої буде очищено всі дані, а файлову систему буде змінено на ext4. Коли цей процес завершиться, знову ввімкніть режим із розміром сторінок 16 КБ."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Видалити всі дані"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Не вдалося очистити розділ даних і переформатувати на ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Для режиму 16 КБ потрібно розблокувати завантажувач ОС"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Потрібне розблокування завантажувача операційної системи"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Щоб використовувати режим для розробників зі сторінками розміром 16 КБ на цьому пристрої, необхідно розблокувати завантажувач операційної системи. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Під час активації режиму 16 КБ усі дані й налаштування користувача буде очищено. Коли завантажувач операційної системи буде розблоковано, для активації режиму 16 КБ потрібно буде перезапустити пристрій двічі. Коли ви перейдете в цей режим, то для зміни режиму розміру сторінки з 16 КБ на 4 КБ та навпаки пристрій потрібно буде перезапустити лише один раз. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернути пристрій у виробничий режим, вам буде потрібно повернутися в режим 4 КБ й заблокувати завантажувач операційної системи. Після цього налаштування пристрою буде скинуто. Докладні вказівки наведено на сторінці <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Режим, незалежний від розміру сторінок, з ядром 4 КБ"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ви працюєте в режимі, незалежному від розміру сторінок, з ядром 4 КБ. Цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач ОС розблоковано, можуть бути під загрозою. Деякі функції буде вимкнено, тому працюватимуть не всі додатки. Щоб повернутися у виробничий режим, заблокуйте завантажувач ОС пристрою."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ви працюєте в режимі, незалежному від розміру сторінок, з ядром для сторінок 4 КБ. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернутися у виробничий режим, вам потрібно заблокувати завантажувач операційної системи пристрою. Тоді налаштування пристрою знову буде скинуто й відновляться виробничі налаштування. Коли ОС Android завантажиться на пристрій, вимкніть розблокування завантажувача в параметрах розробника. Якщо ОС Android не завантажується на пристрій або працює нестабільно, відновіть на пристрої останні заводські образи (завантаживши їх звідси: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) або перейдіть на сторінку <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і виберіть \"Очистити пристрій\", \"Заблокувати завантажувач операційної системи\" й \"Примусово оновити всі розділи\"."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Режим, незалежний від розміру сторінок, з ядром 16 КБ"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Ви працюєте в режимі, незалежному від розміру сторінок, з ядром 16 КБ. Цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач ОС розблоковано, можуть бути під загрозою. Деякі функції буде вимкнено, тому працюватимуть не всі додатки. Щоб повернутися у виробничий режим, заблокуйте завантажувач ОС пристрою."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Ви працюєте в режимі, незалежному від розміру сторінок, з ядром для сторінок 16 КБ. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернутися у виробничий режим, вам потрібно знову перейти в режим 4 КБ й заблокувати завантажувач операційної системи пристрою. Тоді налаштування пристрою знову буде скинуто й відновляться виробничі налаштування. Коли ОС Android завантажиться, вимкніть розблокування завантажувача в параметрах розробника. Якщо ОС Android не завантажується або працює нестабільно, відновіть мікропрограму, завантаживши останні заводські образи на сайті <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> або перейдіть на сторінку <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і виберіть \"Очистити пристрій\", \"Заблокувати завантажувач операційної системи\" й \"Примусово оновити всі розділи\"."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"Ви працюєте в режимі, що не залежить від розміру сторінки, з ядром для сторінок 16 КБ. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернутися у виробничий режим, вам потрібно знову перейти в режим 4 КБ й заблокувати завантажувач операційної системи пристрою. Торкніться, щоб дізнатися більше."</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"Ви працюєте в режимі, що не залежить від розміру сторінки, з ядром для сторінок 16 КБ. У цьому режимі цілісність програмного забезпечення не гарантується, і будь-які дані, що зберігаються на телефоні, поки завантажувач операційної системи розблоковано, можуть бути під загрозою. Деякі функції в цих режимах буде вимкнено, тому зможуть працювати не всі додатки. Щоб повернутися у виробничий режим, вам потрібно знову перейти в режим 4 КБ й заблокувати завантажувач операційної системи пристрою. Тоді налаштування пристрою знову буде скинуто й відновляться виробничі налаштування. Коли ОС Android завантажиться на пристрій, вимкніть розблокування завантажувача в параметрах розробника. Якщо ОС Android не завантажується на пристрій або працює нестабільно, відновіть на пристрої останні заводські образи (завантаживши їх звідси: <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) або перейдіть на сторінку <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> і виберіть \"Очистити пристрій\", \"Заблокувати завантажувач операційної системи\" й \"Примусово оновити всі розділи\"."</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"Режим, незалежний від розміру сторінок, з ядром для сторінок 16 КБ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"Докладніше"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Обробник звітів про помилки"</string>
@@ -5011,7 +5058,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Використовувати закріплення додатків"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Використовувати Параметри розробника"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Використовувати сервіс друку"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Дозволити кілька користувачів"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Дозволити зміну користувача"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"дозволити, кілька, користувач, дозвіл, багато"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"кілька, користувачі, профілі, люди, облікові записи, змінити, багато"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Використовувати налагодження через Wi-Fi"</string>
@@ -5125,8 +5172,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Виберіть, що має відображатися на екрані, коли планшет у док-станції. Із заставкою ваш пристрій може споживати більше енергії."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Налаштувати"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Налаштувати <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Щоб увімкнути підтримку довільного формату, перезапустіть пристрій."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Щоб примусово застосувати режим робочого столу на додаткових екранах, перезапустіть пристрій."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Щоб увімкнути підтримку старого формату вікон змінного розміру, перезапустіть пристрій."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Щоб змінити підтримку вікон змінного розміру, перезапустіть пристрій."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Щоб примусово ввімкнути вікна змінного розміру на додаткових екранах, перезапустіть пристрій."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Перезапустити зараз"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Перезапустити пізніше"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Просторове звучання"</string>
@@ -5244,6 +5292,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Увімкнено"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Вимкнено"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Увімкнено"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Аудіо: %1$d%% ліворуч, %2$d%% праворуч"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Аудіо: %1$d%% праворуч, %2$d%% ліворуч"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Назва пристрою відображається в установлених додатках. Її також можуть бачити інші користувачі, коли ви підключаєтеся до пристроїв із Bluetooth чи мережі Wi-Fi або налаштовуєте точку доступу Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Граматичний рід"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Виберіть граматичний рід"</string>
@@ -5355,4 +5405,5 @@
<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="homepage_search" msgid="6759334912284663559">"Шукати в налаштуваннях"</string>
</resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index bf3531d..239a61c 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"سونے کا وقت"</item>
+ <item msgid="4152450357280759894">"ڈرائیونگ"</item>
+ <item msgid="7096549258219399423">"عمیق"</item>
+ <item msgid="2760716776980432977">"زیر انتظام"</item>
+ <item msgid="601734478369121764">"ستارہ"</item>
+ <item msgid="6243809315432780521">"کیلنڈر"</item>
+ <item msgid="4913577903148415331">"وقت"</item>
+ <item msgid="3653377604690057780">"تھیٹر"</item>
+ <item msgid="3843711267408385410">"پھول"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 6cdb093..2332326 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"آلہ کو غیر منسلک کریں؟"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"نئے آلہ کا جوڑا بنائیں"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"بلوٹوتھ"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"خودکار طور پر کل آن کریں"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"سماعت کے آلے کی ترتیبات"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"شارٹ کٹ، سماعتی آلہ کی موافقت"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"پہلے سے ترتیب شدہ"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"آپ کے آڈیولوجسٹ کے ذریعہ کوئی پہلے سے ترتیب شدہ پروگرام نہیں ہے"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"پہلے سے ترتیب شدہ کو اپ ڈیٹ نہیں کر سکے"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"آڈیو کا آؤٹ پُٹ"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"آڈیو آؤٹ پٹ کے بارے میں"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"آف ہے"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{آن ہے / # ایپ کو مقام تک رسائی حاصل ہے}other{آن ہے / # ایپس کو مقام تک رسائی حاصل ہے}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"لوڈ ہو رہی ہے…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"قریبی آلات کی اجازت والی ایپس منسلک آلات کی متعلقہ پوزیشن کا تعین کر سکتی ہیں۔"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"قریبی آلات کی اجازت والی ایپس منسلک آلات کی متعلقہ پوزیشن کا تعین کر سکتی ہیں۔"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"ایپس اور سروسز کے لیے مقام تک رسائی آف ہے۔ آپ کے ایمرجنسی نمبر پر کال کرنے یا ٹیکسٹ پیغام بھیجنے پر بھی ایمرجنسی مدد فراہم کنندگان کو آپ کے آلے کا مقام بھیجا جا سکتا ہے۔"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"مقام کی ترتیبات کے بارے میں مزید جانیں"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"تبدیل کرنے کے لیے، ChromeOS کی ترتیبات > رازداری اور سیکیورٹی > رازداری سے متعلق کنٹرولز > مقام تک رسائی پر جائیں"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"چہرہ اور <xliff:g id="WATCH">%s</xliff:g> شامل کیے گئے"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"چہرہ، فنگر پرنٹ اور <xliff:g id="WATCH">%s</xliff:g> شامل کیے گئے"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"چہرہ، فنگر پرنٹس اور <xliff:g id="WATCH">%s</xliff:g> شامل کیے گئے"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"یہ ضروری ہے کیونکہ شناخت چیک آن ہے"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator کو غیر مقفل کریں"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"گھڑی کو شامل کیا گیا"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"اپنی گھڑی سیٹ اپ کریں"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"واچ اَن لاک کے بارے میں مزید جانیں"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"گھڑی شامل کریں"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"گھڑی ہٹائیں"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"فنگر پرنٹ اور فیس انلاک"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"فیس اور فنگر پرنٹ اَن لاک"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"کام کے لیے فیس اور فنگر پرنٹ اَن لاک"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"سیٹ اپ درکار ہے"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"چہرے اور فنگر پرنٹس کو شامل کیا گیا"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"ایپس انسٹال کریں"</b>\n"وہ ایپس انسٹال کریں جنہیں آپ اپنی اسپیس میں نجی رکھنا چاہتے ہیں"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"یاد رکھیں"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"آپ کے اپنی اسپیس کو مقفل کرنے پر ایپس بند ہو جاتی ہیں"</b>\n"آپ کے اپنی اسپیس کو مقفل کرنے پر، آپ کی اسپیس میں موجود ایپس بند ہو جاتی ہیں اور آپ ان سے اطلاعات وصول نہیں کر سکیں گے"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"پرائیویٹ اسپیسز ان ایپس کے لیے موزوں نہیں ہیں جنہیں بیک گراؤنڈ میں چلانے یا طبی ایپس جیسی اہم اطلاعات بھیجنے کی ضرورت ہوتی ہے۔ اس کی وجہ یہ ہے کہ جب آپ کی اسپیس مقفل ہوتی ہے تو اطلاعات اور پس منظر کی سرگرمی روک دی جاتی ہے۔\n\nپرائیویٹ اسپیس مقفل ہونے پر، آپ کی پرائیویٹ اسپیس میں موجود ایپس اجازتوں کے مینیجر، پرائیویسی ڈیش بورڈ اور دیگر ترتیبات میں دکھائی نہیں دیں گی۔\n\nآپ کی پرائیویٹ اسپیس کو کسی نئے آلے پر منتقل نہیں کیا جا سکتا۔ اگر آپ اسے کسی دوسرے آلے پر استعمال کرنا چاہتے ہیں تو آپ کو ایک اور نجی اسپیس سیٹ اپ کرنے کی ضرورت ہوگی۔\n\nکوئی بھی جو آپ کے آلے کو کمپیوٹر سے منسلک کرتا ہے یا آپ کے آلے پر نقصان دہ ایپس انسٹال کرتا ہے وہ آپ کی نجی اسپیس تک رسائی حاصل کر سکتا ہے۔"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"پرائیویٹ اسپیسز ان ایپس کے لیے موزوں نہیں ہیں جنہیں بیک گراؤنڈ میں چلانے یا طبی ایپس جیسی اہم اطلاعات بھیجنے کی ضرورت ہوتی ہے۔ اس کی وجہ یہ ہے کہ جب آپ کی اسپیس مقفل ہوتی ہے تو اطلاعات اور پس منظر کی سرگرمی روک دی جاتی ہے۔\n\nپرائیویٹ اسپیس مقفل ہونے پر، آپ کی پرائیویٹ اسپیس میں موجود ایپس اجازتوں کے مینیجر، پرائیویسی ڈیش بورڈ اور دیگر ترتیبات میں دکھائی نہیں دیں گی۔\n\nآپ کی پرائیویٹ اسپیس کو کسی نئے آلے پر بحال نہیں کیا جا سکتا۔ اگر آپ اسپیس کو کسی دوسرے آلے پر استعمال کرنا چاہتے ہیں تو آپ کو ایک اور اسپیس سیٹ اپ کرنے کی ضرورت پڑے گی۔\n\nآپ کے آلے کو کسی کمپیوٹر سے منسلک کرنے یا آپ کے آلے پر نقصان دہ ایپس انسٹال کرنے والا کوئی بھی شخص آپ کی پرائیویٹ اسپیس تک رسائی حاصل کر سکتا ہے۔"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"پرائیویٹ اسپیس کے بارے میں مزید جانیں"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"اس میں کچھ وقت لگے گا"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"نجی اسپیس سیٹ اپ کی جا رہی ہے…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"آلہ ری اسٹارٹ کریں؟"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"تفصیلی NFC لاگنگ صرف ڈویلپمنٹ مقاصد کے لیے ہے۔ اضافی NFC ڈیٹا بگ رپورٹس میں شامل کیا جاتا ہے جس میں نجی معلومات شامل ہو سکتی ہیں۔ اس ترتیب کو تبدیل کرنے کے لیے اپنا آلہ ری اسٹارٹ کریں۔"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"ری اسٹارٹ کریں"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"مرر، بیرونی ڈسپلے، منسلک ڈسپلے، usb ڈسپلے، ریزولیوشن، گھمانا"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"گھمانا"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"معیاری"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"آن اسکرین کی بورڈ کا استعمال کریں"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"جب فزیکل کی بورڈ فعال ہو تو اس کو اسکرین پر رکھیں"</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> ms کے اندر ایک ہی کلید کو فوری طور پر بار بار دبائے جانے کو نظر انداز کرتا ہے"</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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"پوائنٹر فِل اسٹائل کو پیلے میں بدلیں"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"پوائنٹر فِل اسٹائل کو گلابی میں بدلیں"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"پوائنٹر فِل اسٹائل کو نیلے میں بدلیں"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"پوائنٹر اسٹروک اسٹائل"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"سفید"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"سیاہ"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"کوئی نہیں"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"صارف کا منتخب کردہ: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"اسپیچ"</string>
<string name="pointer_speed" msgid="7398649279282675718">"پوائنٹر کی رفتار"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"پوائنٹر اسکیل"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"پوائنٹر اسکیل کو کم کریں"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"پوائنٹر اسکیل کو بڑھائیں"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"گیم کنٹرولر"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"وائبریشن کو ری ڈائریکٹ کریں"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"منسلک ہونے پر گیم کنٹرولر کو وائبریشن بھیجیں"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"بہر حال جاری رکھیں"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"منسوخ کریں"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"میگنیفکیشن کی ترتیبات"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"ایک انگلی سے پین کرنا"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"1 انگلی سے میگنیفائر کو حرکت دیں"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"اسکرین کے ارد گرد گھمانے کیلئے 1 انگلی سے گھسیٹیں"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"ایک انگلی گھسیٹ کر میگنیفیکیشن ایریا کو منتقل کریں۔"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"دو انگلیوں کو گھسیٹ کر میگنیفیکیشن ایریا کو منتقل کریں۔"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"اسکرین کے صرف میگنفائی کرنے والے حصے کے دوران دستیاب نہیں ہے"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"زوم کرنے کیلئے ایک بٹن پر تھپتھپائیں"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"مواد کو بڑا کرنے کے لیے اسکرین پر فوری طور پر زوم ان کریں"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>زوم ان کرنے کے لیے:</b><br/> {0,number,integer}۔ میگنیفکیشن شروع کرنے کے لیے شارٹ کٹ کا استعمال کریں<br/> {1,number,integer}۔ اسکرین پر تھپتھپائیں<br/> {2,number,integer}۔ اسکرین پر اِدھر اُدھر حرکت کرنے کے لیے 2 انگلیوں سے گھسیٹیں<br/> {3,number,integer}۔ زوم کو ایڈجسٹ کرنے کے لیے 2 انگلیوں سے چٹکی بھریں<br/> {4,number,integer}۔ میگنیفکیشن بند کرنے کے لیے شارٹ کٹ کا استعمال کریں<br/><br/> <b> عارضی طور پر زوم ان کرنے کے لیے:</b><br/> {0,number,integer}۔ یقینی بنائیں کہ آپ کی میگنیفیکیشن کی قسم فُل اسکرین پر سیٹ ہے<br/> {1,number,integer}۔ میگنیفکیشن شروع کرنے کے لیے شارٹ کٹ کا استعمال کریں<br/> {2,number,integer}۔ اسکرین پر کسی بھی جگہ پر ٹچ کریں اور دبائیں رکھیں<br/> {3,number,integer}۔ اسکرین پر اِدھر اُدھر حرکت کرنے کے لیے انگلی کو گھسیٹیں<br/> {4,number,integer}۔ میگنیفکیشن بند کرنے کے لیے انگلی اٹھائيں"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>زوم ان کرنے کے لیے:</b><br/> {0,number,integer}۔ میگنیفکیشن شروع کرنے کے لیے شارٹ کٹ کا استعمال کریں<br/> {1,number,integer}۔ اسکرین پر تھپتھپائیں<br/> {2,number,integer}۔ اسکرین پر اِدھر اُدھر حرکت کرنے کے لیے 2 انگلیوں سے گھسیٹیں<br/> {3,number,integer}۔ زوم کو ایڈجسٹ کرنے کے لیے 2 انگلیوں سے چٹکی بھریں<br/> {4,number,integer}۔ میگنیفکیشن کو بند کرنے کے لیے شارٹ کٹ استعمال کریں<br/><br/> آپ عارضی طور پر زوم ان بھی کر سکتے ہیں اور بہت کچھ کر سکتے ہیں۔"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>زوم ان کرنے کے لیے:</b><br/> {0,number,integer}۔ میگنیفکیشن شروع کرنے کے لیے شارٹ کٹ کا استعمال کریں<br/> {1,number,integer}۔ اسکرین پر تھپتھپائیں<br/> {2,number,integer}۔ اسکرین پر اِدھر اُدھر حرکت کرنے کے لیے 1 یا 2 انگلیوں سے گھسیٹیں<br/> {3,number,integer}۔ زوم کو ایڈجسٹ کرنے کے لیے 2 انگلیوں سے چٹکی بھریں<br/> {4,number,integer}۔ میگنیفکیشن کو بند کرنے کے لیے شارٹ کٹ استعمال کریں<br/><br/> آپ عارضی طور پر زوم ان بھی کر سکتے ہیں اور بہت کچھ کر سکتے ہیں۔"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"جب میگنیفکیشن آن ہو، تو آپ اپنی اسکرین پر زوم ان کرسکتے ہیں۔\n\n"<b>"زوم کرنے کے لیے"</b>"، میگنیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی تھپتھپائیں۔\n"<ul><li>" اسکرول کرنے کے لیے 2 یا زائد انگلیوں سے گھسیٹیں"</li>\n<li>"زوم ایڈجیسٹ کرنے کے لیے 2 یا زائد انگلیوں سے چٹکی بھریں"</li></ul>\n\n<b>"عارضی طور پر زوم کرنے کے لیے"</b>"، میگنیفکیشن شروع کریں، پھر اسکرین پر کہیں بھی ٹچ اور ہولڈ کریں۔\n"<ul><li>"اسکرین کے اردگرد منتقل کرنے کے لیے گھسیٹیں"</li>\n<li>"زوم آؤٹ کرنے کے لیے انگلی اٹھائیں"</li></ul>\n\n"آپ کی بورڈ یا نیویگیشن بار پر زوم ان نہیں کرسکتے۔"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"صفحہ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> از <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"ایکسیسبیلٹی بٹن کا شارٹ کٹ"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{کوئی نہیں}=1{1 شیڈول سیٹ ہے}other{# شیڈول سیٹ ہیں}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"ڈسٹرب نہ کریں"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"ترجیحی وضع"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"موڈ شامل کریں"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"صرف اہم لوگوں اور ایپس کی جانب سے اطلاعات حاصل کریں"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"فعالیت کی قسم منتخب کریں"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"وقت"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"جیسے \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"کیلنڈر"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"جیسے \"ذاتی کیلنڈر\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"موڈ تخلیق کریں"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"حسب ضرورت"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"مداخلتوں کی حد مقرر کریں"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\'ڈسٹرب نہ کریں\' کو آن کریں"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"الارم اور میڈیا کی آوازیں رکاوٹ ڈال سکتی ہیں"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"شیڈولز"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"شیڈولز حذف کریں"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"حذف کریں"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"نام تبدیل کریں"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"حذف کریں"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" موڈ کو حذف کریں؟"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"ترمیم کریں"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"شیڈولز"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"شیڈول کریں"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"کیلنڈر شامل کریں"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"اپنا کیلنڈر استعمال کریں"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"شیڈول کریں"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"شیڈول سیٹ کریں"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"شیڈول کریں"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> گھنٹہ، <xliff:g id="MINUTES">%2$d</xliff:g> منٹ"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"خودکار طور پر آن کریں"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"شیڈول"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"مخصوص اوقات میں فون خاموش کر دیں"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\'ڈسٹرب نہ کریں\' اصول سیٹ کریں"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"آواز پیدا کرنے والی مداخلتوں کو اجازت دیں"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"بصری مداخلتیں مسدود کریں"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"بصری سگنلز کی اجازت دیں"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"وہ اطلاعات جو آپ تک پہنچ سکتی ہیں"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"فوکس رہیں"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"اضافی کارروائیاں"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{آف}=1{آف / 1 موڈ خودکار طور پر آن ہو سکتا ہے}other{آف / # موڈز خودکار طور پر آن ہو سکتے ہیں}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"ڈسپلے کی ترتیبات"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"ڈسپلے کے اختیارات"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"خاکستری"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"گہری تھیم کو فعال کریں"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"تاریک پس منظر پر ہلکے رنگ کے ٹیکسٹ کو ترجیح دینے کے لیے OS اور ایپس کو سوئچ کریں۔ یہ آنکھوں کیلئے زیادہ آرام دہ ہوتا ہے اور کچھ آلات پر بیٹری کی کافی بچت کرتا ہے"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"مداخلتیں فلٹر کریں"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"کوئی مداخلت فلٹر نہیں کی گئی ہے"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"اطلاع کھولیں"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"اطلاع کی اسنوزنگ کی اجازت دیں"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"ایپ آئیکن پر اطلاعاتی ڈاٹ"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"اطلاع بنڈلز"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"بلبلے"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"بلبلے"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"یہ گفتگو ببل کریں"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"یہ ایپ بہتر کردہ ترتیبات کو سپورٹ نہیں کرتی ہے"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"مزید ترتیبات"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"اس ایپ کے اندر مزید ترتیبات دستیاب ہیں"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"نوٹیفکیشن کول ڈاؤن"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"دفتری پروفائلز پر لاگو کریں"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"دفتری پروفائل ایپس پر لاگو کریں"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"زمرے"</string>
<string name="notification_channels_other" msgid="18159805343647908">"دیگر"</string>
<string name="no_channels" msgid="4716199078612071915">"اس ایپ نے کوئی اطلاعات شائع نہیں کی ہیں"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"غیر استعمال شدہ زمرے دکھائیں"</string>
<string name="app_settings_link" msgid="6725453466705333311">"ایپ میں اضافی ترتیبات"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"غیر استعمال شدہ زمرے دکھائیں"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"غیر استعمال شدہ زمرے چھپائیں"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"ایپس جو مداخلت کر سکتی ہیں"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"منتخب کردہ ایپس"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"کوئی نہیں"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"سبھی"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"ایپس کو اوور رائیڈ کرنے کی اجازت دیں"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"ایپس جو مداخلت کر سکتی ہیں"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"مزید ایپس منتخب کریں"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"کوئی چیز رکاوٹ نہیں ڈال سکتی"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"کوئی بھی رکاوٹ نہیں ڈال سکتا"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"کچھ لوگ رکاوٹ ڈال سکتے ہیں"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"سبھی لوگ رکاوٹ ڈال سکتے ہیں"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"بار بار کال کرنے والے"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"دوبارہ کال کرنے والوں کو اجازت دیں"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{{time} تک صرف ایک گھنٹے کیلئے الارمز میں تبدیل کریں}other{{time} تک صرف # گھنٹوں کیلئے الارمز میں تبدیل کریں}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> تک کیلئے صرف الارمز میں تبدیل کریں"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"ہمیشہ مداخلت کریں میں تبدیل کریں"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"موڈ ترمیم کریں"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"موڈ شامل کریں"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"حسب ضرورت موڈ"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"موڈ کا نام"</string>
<string name="warning_button_text" msgid="1274234338874005639">"وارننگ"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"بند کریں"</string>
<string name="device_feedback" msgid="5351614458411688608">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"ڈیسک ٹاپ موڈ فورس کریں"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"ثانوی ڈسپلیز پر تجرباتی ڈیسک ٹاپ موڈ فورس کریں"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"فری فارم ونڈوز فعال کریں"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"فریفارم ونڈوز کے لیے سپورٹ کو فعال کریں۔"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"دوسرے ڈسپلے پر فریفارم ونڈونگ کو فعال کریں"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"فریفارم ونڈوز کو صرف ثانوی ڈسپلے پر فعال کریں۔"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"ملٹی ونڈو میں سائز کی ناقابل تبدیلی کو فعال کریں"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"ناقابل تبدیل سائز والی ایپس کو ملٹی ونڈو میں ہونے کی اجازت ہوتی ہے"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"force-dark کو اوور رائیڈ کریں"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB ڈویلپر اختیار استعمال کرنے سے پہلے اس آلہ کے ڈیٹا پارٹیشن کو ext4 میں تبدیل کرنے کی ضرورت ہے۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ 16KB اختیار کو فعال کرنے کے لیے اس کے بعد ایک اور ریبوٹ کی ضرورت ہوگی۔ اس موڈ میں آنے کے بعد آپ ایک ہی ریبوٹ میں 4KB اور 16KB موڈ کے درمیان سوئچ کر سکتے ہیں۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ آلہ کو پروڈکشن موڈ میں واپس کرنے کے لیے، آپ کو 4KB موڈ پر واپس جانا ہوگا اور پھر بوٹ لوڈر کو لاک کرنا ہوگا، جو فیکٹری آلہ کو ری سیٹ کرتا ہے۔ آلہ کے Android میں کامیابی کے ساتھ بوٹ ہونے کے بعد، ڈیولپر کے اختیارات میں OEM انلاکنگ کو غیر فعال کریں۔ آلہ کو صاف کر دیا جائے گا اور تصدیق کے بعد فائل سسٹم کو ext4 میں تبدیل کر دیا جائے گا۔ اس کے مکمل ہونے کے بعد، براہ کرم 16KB کو دوبارہ فعال کرنے کے لیے واپس آئیں۔"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"سبھی ڈیٹا مٹائیں"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ڈیٹا پارٹیشن کو ext4 پر دوبارہ فارمیٹ کرنے اور صاف کرنے میں ناکام۔"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"16KB موڈ کے لیے بوٹ لوڈر انلاک درکار ہے"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"بوٹ لوڈر ان لاک درکار ہے"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"اس آلہ کو 16KB ڈویلپر اختیار استعمال کرنے سے پہلے بوٹ لوڈر کو غیر مقفل کرنے کی ضرورت ہے۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ 16KB موڈ کو فعال کرنے پر صارف کا تمام ڈیٹا اور ترتیبات صاف کر دی جائیں گی۔ بوٹ لوڈر غیر مقفل ہونے کے بعد 16KB اختیار کو چالو کرنے کے لیے دو بار ریبوٹس کی ضرورت ہوگی۔ اس موڈ میں آنے کے بعد آپ ایک ہی ریبوٹ میں 4KB اور 16KB موڈ کے درمیان سوئچ کر سکتے ہیں۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ آلہ کو پروڈکشن موڈ میں واپس کرنے کے لیے، آپ کو 4KB موڈ پر واپس جانا ہوگا اور پھر OEM/بوٹ لوڈر کو لاک کرنا ہوگا (جو آلہ کو فیکٹری ری سیٹ کرتا ہے)۔ براہ کرم بوٹ لوڈر کو غیر مقفل کریں اور دوبارہ کوشش کریں۔ آپ اسے کرنے کے طریقے سے متعلق ہدایات یہاں دیکھ سکتے ہیں: <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"4KB صفحہ ایگنوسٹک موڈ کا استعمال"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"آپ صفحہ ایگنوسٹک موڈ کے 4KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو آلے کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ مزید پڑھنے کیلئے تھپتھپائیں۔"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"آپ صفحہ ایگنوسٹک موڈ کے 4KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو آلے کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ یہ آلہ کو دوبارہ فیکٹری ری سیٹ کر دے گا اور اسے پروڈکشن ترتیبات پر بحال کر دے گا۔ آلہ کے Android میں کامیابی کے ساتھ بوٹ ہونے کے بعد، ڈیولپر کے اختیارات میں OEM انلاکنگ کو غیر فعال کریں۔ اگر آلہ Android میں بوٹ ہونے میں ناکام ہو جاتا ہے یا غیر مستحکم ہو جاتا ہے، تو <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> سے تازہ ترین فیکٹری امیجز کے ساتھ آلہ کو دوبارہ فلیش کریں یا <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> استعمال کریں اور \'آلہ کو صاف کریں\'، \'بوٹ لوڈر کو مقفل کریں\' اور \'سبھی پارٹیشنز کو فورس فلیش کریں\' کو منتخب کریں۔"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"16KB صفحہ ایگنوسٹک موڈ کا استعمال"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"آپ صفحہ ایگنوسٹک موڈ کے 16KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو 4K موڈ پر واپس جانا ہوگا اور پھر آلہ کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ مزید پڑھنے کیلئے تھپتھپائیں۔"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"آپ صفحہ ایگنوسٹک موڈ کے 16KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی ہے، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کوئی بھی ڈیٹا خطرے میں ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اس لیے ہو سکتا ہے کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو 4K موڈ پر واپس جانا ہوگا اور پھر آلہ کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ یہ آلہ کو دوبارہ فیکٹری ری سیٹ کر دے گا اور اسے پروڈکشن ترتیبات پر بحال کر دے گا۔ آلہ کے Android میں کامیابی کے ساتھ بوٹ ہونے کے بعد، ڈیولپر کے اختیارات میں OEM انلاکنگ کو غیر فعال کریں۔ اگر آلہ Android میں بوٹ ہونے میں ناکام ہو جاتا ہے یا غیر مستحکم ہو جاتا ہے، تو <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> سے تازہ ترین فیکٹری امیجز کے ساتھ آلہ کو دوبارہ فلیش کریں یا <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> استعمال کریں اور \'آلہ کو صاف کریں\'، \'بوٹ لوڈر کو مقفل کریں\' اور \'سبھی پارٹیشنز کو فورس فلیش کریں\' کو منتخب کریں۔"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"آپ صفحہ ایگنوسٹک موڈ کے 16KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کسی بھی ڈیٹا کو خطرہ لاحق ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اسلئے ہو سکتا ہے کہ کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو 4KB موڈ پر واپس جانا ہوگا اور پھر آلہ کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ مزید پڑھنے کیلئے تھپتھپائیں۔"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"آپ صفحہ ایگنوسٹک موڈ کے 16KB موڈ میں ہیں۔ اس موڈ میں سافٹ ویئر کی درستگی کی ضمانت نہیں دی جا سکتی، اور بوٹ لوڈر کے غیر مقفل ہونے کے دوران فون پر اسٹور کردہ کسی بھی ڈیٹا کو خطرہ لاحق ہو سکتا ہے۔ ان موڈز میں کچھ خصوصیات غیر فعال ہو جائیں گی، اسلئے ہو سکتا ہے کہ کچھ ایپلیکیشنز کام نہ کریں۔ پروڈکشن موڈ میں دوبارہ داخل ہونے کے لیے، آپ کو 4KB موڈ پر واپس جانا ہوگا اور پھر آلہ کے بوٹ لوڈر کو مقفل کرنا ہوگا۔ یہ آلہ کو دوبارہ فیکٹری ری سیٹ کر دے گا اور اسے پروڈکشن ترتیبات پر بحال کر دے گا۔ آلے کے Android میں کامیابی کے ساتھ بوٹ ہونے کے بعد، ڈویلپر کے اختیارات میں OEM انلاکنگ کو غیر فعال کریں۔ اگر آلہ Android میں بوٹ ہونے میں ناکام ہو جاتا ہے یا غیر مستحکم ہو جاتا ہے، تو <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> سے تازہ ترین فیکٹری امیجز کے ساتھ آلہ کو دوبارہ فلیش کریں یا <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> استعمال کریں اور \'آلہ کو صاف کریں\'، \'بوٹ لوڈر کو مقفل کریں\' اور \'سبھی پارٹیشنز کو فورس فلیش کریں\' کو منتخب کریں۔"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB صفحہ ایگنوسٹک موڈ"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"مزید پڑھیں"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"بگ رپورٹ کا ہینڈلر"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"ایپ کو پن کرنے کی سہولت کا استعمال کریں"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"ڈویلپر کے اختیارات کا استعمال کریں"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"پرنٹ سروس کا استعمال کریں"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"متعدد صارفین کو اجازت دیں"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"صارف سوئچ کی اجازت دیں"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"اجازت دیں، متعدد، صارف، اجازت، بہت سے"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"متعدد، صارفین، پروفائلز، لوگ، اکاؤنٹس، سوئچ، بہت کچھ"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"وائرلیس ڈیبگنگ کا استعمال کریں"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"منتخب کریں کہ آپ کے ٹیبلیٹ کو ڈاک سے منسلک کئے جانے پر آپ کو اپنی اسکرین پر کیا دکھائی دے۔ اسکرین سیور کا استعمال کرنے پر آپ کا آلہ زیادہ توانائی استعمال کر سکتا ہے۔"</string>
<string name="customize_button_title" msgid="1110284655990203359">"حسب ضرورت بنائیں"</string>
<string name="customize_button_description" msgid="7440248477266126231">"<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g> کو حسب ضرورت بنائیں"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"فری فارم سپورٹ کو فعال کرنے کے لیے ریبوٹ درکار ہے۔"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"سیکنڈری ڈسپلیز پر ڈیسک ٹاپ موڈ فورس کرنے کے لیے ریبوٹ درکار ہے۔"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"legacy فریفارم ونڈونگ سپورٹ کو فعال کرنے کے لیے ریبوٹ درکار ہے۔"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"فری فارم ونڈوئنگ سپورٹ تبدیل کرنے کے لیے ریبوٹ درکار ہے۔"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"ثانوی ڈسپلیز پر زبردستی فری فارم ونڈوئینگ کے لیے ریبوٹ درکار ہے۔"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"ابھی ریبوٹ کریں"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"بعد میں ریبوٹ کریں"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"اسپیشیئل آڈیو"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"آن ہے"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"آف ہے"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"آن ہے"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"آڈیو %1$d%% بائیں، %2$d%% دائیں"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"آڈیو %1$d%% دائیں، %2$d%% بائیں"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"آپ کے آلے کا نام آپ کی انسٹال کردہ ایپس میں دکھائی دیتا ہے۔ آپ کے بلوٹوتھ آلات سے منسلک ہونے، Wi-Fi نیٹ ورک سے منسلک ہونے یا Wi-Fi ہاٹ اسپاٹ کو سیٹ اپ کرنے پر دوسرے لوگ بھی اسے دیکھ سکتے ہیں۔"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"قواعد سے متعلق صنف"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"قواعد سے متعلق صنف منتخب کریں"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"تلاش کی ترتیبات"</string>
</resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 37e6546..2fff628 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Uyqu vaqti"</item>
+ <item msgid="4152450357280759894">"Avtomobilda"</item>
+ <item msgid="7096549258219399423">"Immersiv"</item>
+ <item msgid="2760716776980432977">"Boshqarilayotgan"</item>
+ <item msgid="601734478369121764">"Yulduzcha bilan belgilash"</item>
+ <item msgid="6243809315432780521">"Taqvim"</item>
+ <item msgid="4913577903148415331">"Vaqt"</item>
+ <item msgid="3653377604690057780">"Teatr"</item>
+ <item msgid="3843711267408385410">"Gul"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 6b57ba0..7a4b845 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Qurilma uzib qo‘yilsinmi?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Yangi qurilmani juftlash"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Ertaga avtomatik yoqilsin"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Eshitish qurilmasi sozlamalari"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Tezkor tugma, eshitish apparati bilan moslik"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Andoza"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Audiolog dasturlagan andozalar topilmadi"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Andoza yangilanmadi"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Audio chiqishi"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Audio chiqishi haqida"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Oʻchiq"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Yoniq / # ta ilova joylashuvdan foydalanadi}other{Yoniq / # ta ilova joylashuvdan foydalanadi}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Yuklanmoqda…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Yaqin-atrofdagi qurilmalarga ruxsati bor ilovalar ulangan qurilmalarning nisbiy holatini aniqlay oladi."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Yaqin-atrofdagi qurilmalarga ruxsati bor ilovalar ulangan qurilmalarning nisbiy holatini aniqlay oladi."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Ilovalar va xizmatlar uchun joylashuv axborotiga ruxsat yoqilmagan. Favqulodda holatlar raqamiga murojaat qilganingizda, qurilmangiz favqulodda xizmatlarga joylashuvingizni yuborishi mumkin."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Joylashuv sozlamalari haqida batafsil"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Oʻzgartirish uchun ChromeOS sozlamalari > Maxfiylik va xavfsizlik > Maxfiylik sozlamalari > Joylashuv axborotiga ruxsat sahifasini oching"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Yuz va <xliff:g id="WATCH">%s</xliff:g> qoʻshildi"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Yuz, barmoq izi va <xliff:g id="WATCH">%s</xliff:g> qoʻshildi"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Yuz, barmoq izlari va <xliff:g id="WATCH">%s</xliff:g> qoʻshildi"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Bu shaxsni tasdiqlash yoniqligi uchun talab etiladi"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Masofaviy Authenticator qulfini ochish"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Soat kiritildi"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Soatingizni sozlang"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Soat bilan ochish haqida batafsil"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Soat kiritish"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Soatni olib tashlash"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Barmoq izi va yuz bilan ochish"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Yuz va barmoq izi bilan ochish"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ish uchun Yuz va Barmoq izi bilan ochish"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Sozlash talab etiladi"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Yuz va barmoq izlari kiritildi"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Ilovalarni oʻrnating"</b>\n"Makoningizda maxfiy saqlamoqchi boʻlgan ilovalarni oʻrnating."</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Yodda tuting"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Makonni qulflaganingizda ilovalar toʻxtatiladi"</b>\n"Makoningizni qulflaganingizda xonadagi ilovalar toʻxtatiladi va ulardan bildirishnomalar olmaysiz"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Maxfiy makon fonda ishlaydigan yoki tibbiy ilovalar kabi muhim bildirishnoma yuboradigan ilovalar uchun muvofiq emas. Chunki, makon qulflanganda bildirishnomalar va fondagi jarayonlar toʻxtatiladi.\n\nMaxfiy makon qulflanganda undagi ilovalar ruxsatlar menejeri, maxfiylik paneli va boshqa sozlamalarda chiqmaydi.\n\nMaxfiy makon boshqa qurilmaga oʻtkazilmaydi. Boshqa qurilmada ishlatish uchun boshqa maxfiy joy sozlanishi kerak.\n\nQurilmani kompyuterga ulash yoki unga zararli ilova oʻrnatish ruxsati bor shaxslar maxfiy makonga ruxsat olishi mumkin."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Maxfiy makon fonda ishlaydigan yoki tibbiy ilovalar kabi muhim bildirishnoma yuboradigan ilovalar uchun muvofiq emas. Chunki, makon qulflanganda bildirishnomalar va fondagi jarayonlar toʻxtatiladi.\n\nMaxfiy makon qulflanganda undagi ilovalar ruxsatlar menejeri, maxfiylik paneli va boshqa sozlamalarda chiqmaydi.\n\nMaxfiy makon boshqa qurilmaga tiklanmaydi. Boshqa qurilmada ishlatish uchun boshqa makon sozlashingiz kerak boʻladi.\n\nQurilmangizni kompyuterga ulagan yoki qurilmangizga zararli ilovalarni oʻrnatgan har bir kishi maxfiy makoningizga kirishi mumkin."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Maxfiy makon haqida batafsil"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Bu bir necha daqiqa vaqt oladi"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Maxfiy joy sozlanmoqda…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Qurilma qayta ishga tushirilsinmi?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Tafsilotli NFC jurnali faqat ishlab chiqish maqsadlari uchun moʻljallangan. Qoʻshimcha NFC maʼlumotlari shaxsiy maʼlumotlar bor xato hisobotlariga kiritilgan. Bu sozlamani oʻzgartirish uchun qurilmangizni qayta ishga tushiring."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Qayta yoqish"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"aks, tashqi displey, ulangan displey, usb displey, aniqlik, burish"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Burish"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Standart"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"Ekrandagi klaviaturadan foydalanish"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Tashqi klaviatura ulanganida ekranda chiqib turadi"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Kursor ichini sariqqa boʻyash"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Kursor ichini pushtiga boʻyash"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Kursor ichini koʻkka boʻyash"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Kursor chiziqlari uslubi"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Oq"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Qora"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Hech qanday"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Foydalanuvchi tanlagan: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Nutq"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Kursor tezligi"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Kursor hajmi"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Kursor hajmini kamaytirish"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Kursor hajmini oshirish"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"O‘yin qurilmasi"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Tebranishni uzatish"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"O‘yin qurilmasi ulanganda tebranish yuborish"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Baribir davom ettirilsin"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Bekor qilish"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Kattalashtirish sozlamalari"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Bitta barmoq bilan sudrash"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Lupani 1 barmoq bilan suring"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Ekranda kezish uchun 1 barmoqni sudrang"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Kattalashtirish hududini bitta barmoq bilan suring."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Kattalashtirish hududini ikkita barmoq bilan suring."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Faqat ekran qismini kattalashtirishda ishlamaydi"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Kattalashtirish uchun tugmani bosing"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Kontentni kattaroq koʻrish uchun ekranni tezkor yaqinlashtiring"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Kattalashtirish uchun:</b><br/> {0,number,integer}. Kattalashtirish tugmasini bosing<br/> {1,number,integer}. Ekranga bosing<br/> {2,number,integer}. Ekranni 2 ta barmoq bilan suring<br/> {3,number,integer}. Moslash uchun 2 ta barmoq bilan chimding<br/> {4,number,integer}. Yakunlash uchun kattalashtirish tugmasini bosing<br/><br/><b>Vaqtincha kattalashtirish uchun:</b><br/> {0,number,integer}. Kattalashtirish rejimi butun ekranga tatbiq etilganiga ishonch hosil qiling.<br/> {1,number,integer}. Kattalashtirish tugmasini bosing<br/> {2,number,integer}. Ekranning istalgan qismini bosib turing<br/> {3,number,integer}. Ekranni barmoq bilan suring<br/> {4,number,integer}. Yakunlash uchun barmoqni ekrandan oling"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Yaqinlashtirish:</b><br/> {0,number,integer}. Kattalashtirish tugmasini bosing<br/> {1,number,integer}. Ekranga bosing<br/> {2,number,integer}. Ekranda kezish uchun 2 barmoq bilan suring<br/> {3,number,integer}. Moslash uchun 2 barmoq bilan chimding<br/> {4,number,integer}. Kattalashtirishni toʻxtatish tugmasini bosing<br/><br/> Vaqtinchalik yaqinlashtirish va hokazolar ham mumkin."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Yaqinlashtirish:</b><br/> {0,number,integer}. Kattalashtirish tugmasini bosing<br/> {1,number,integer}. Ekranga bosing<br/> {2,number,integer}. Ekranda kezish uchun 1 yoki 2 barmoq bilan suring<br/> {3,number,integer}. Moslash uchun 2 barmoq bilan chimding<br/> {4,number,integer}. Kattalashtirishni toʻxtatish tugmasini bosing<br/><br/> Vaqtinchalik yaqinlashtirish va hokazolar ham mumkin."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Agar kattalashtirish yoqilsa, ekrandagi maʼlumotlarni kattalashtirish mumkin.\n\n"<b>"Kattalashtirish"</b>" uchun zum tugmasini bosib, ekranning istalgan joyini bosing.\n"<ul><li>"Siljitish uchun bir nechta barmogʻingiz bilan suring"</li>\n<li>"Masshtabini oʻzgartirish uchun bir nechta barmogʻingizni jipslashtiring"</li></ul>\n\n<b>"Vaqtinchalik kattalashtirish uchun"</b>" zum tugmasini bosib, ekranning istalgan joyini bosing va ushlab turing.\n"<ul><li>"Ekran boʻylab harakatlanish uchun suring"</li>\n<li>"Oʻz holatiga qaytarish uchun barmoqni qoʻyib yuboring"</li></ul>\n\n"Klaviatura yoki navigatsiya paneli orqali kattalashtirib boʻlmaydi."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Sahifa: <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Qulayliklar tugmasi buyrugʻi"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hech qanday}=1{1 ta reja sozlangan}other{# ta reja sozlangan}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Bezovta qilinmasin"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Muhim rejimlar"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Rejim qoʻshish"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Faqat muhim odamlar va ilovalardan bildirishnomalarni olish"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Faollashtirish turini tanlash"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Vaqt"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Misol: \"9:30 – 17:00\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Taqvim"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Misol: \"Shaxsiy taqvim\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Rejim yarating"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Maxsus"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Bildirishnomalarni kamaytirish"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Bezovta qilinmasin rejimini yoqing"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Bezovta qilinmasin rejimi signal va media tovushlari uchun ishlamaydi"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Jadvallar"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Jadvallarni oʻchirish"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Oʻchirish"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Qayta nomlash"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Oʻchirish"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"\"<xliff:g id="MODE">%1$s</xliff:g>\" rejimi oʻchirilsinmi?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Tahrirlash"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Jadvallar"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Jadval"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Taqvim qoʻshish"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Taqvimingizdan foydalanish"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Jadval"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Jadval tuzing"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Jadval"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> soat <xliff:g id="MINUTES">%2$d</xliff:g> daqiqa"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Avtomatik yoqish"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Jadval"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Muayyan vaqtlarda ovozsiz qilish"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Bezovta qilmaslik qoidalari"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Tovush chiqarishga ruxsat"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vizual bildirishnomalarni bloklash"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vizual signallarga ruxsat"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Sizga kelishi mumkin bildirishnomalar"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Diqqatni jamlang"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Qoʻshimcha amallar"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Oʻchiq}=1{Oʻchiq / 1 ta rejim avtomatik yonishi mumkin}other{Oʻchiq / # ta rejim avtomatik yonishi mumkin}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Ekran sozlamalari"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Ekran parametrlari"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Kulrang tus"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"tungi mavzuni yoqish"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Operatsion tizim va ilovalar sozlamalarini qorongʻi fonda yorqin matn chiqarish tanlovi bilan almashtiring, bunda koʻzlar qiynalmaydi va ayrim qurilmalarda batareya sezilarli tejaladi"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Ekran oʻzgarishlarsiz}=1{{effect_1}}=2{{effect_1} va {effect_2}}=3{{effect_1}, {effect_2} va {effect_3}}other{{effect_1}, {effect_2} va yana # ta}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Tanaffuslarni filtrlash"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Hech qanday tanaffus filtrlanmagan"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Bildirishnomalarni filtrlab chiqarish parametrlari"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Bezovta qilinmasin rejimida"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Bildirishnomalar tovushsiz keladi"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"bildirishnomani ochish"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Bildirishnomalarni keyinga qoldirish"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ilova belgisi ustida bildirishnoma belgisi"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Bildirishnoma jamlanmalari"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bulutchalar"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bulutchalar"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Bu suhbatni bulutchaga chiqarish"</string>
@@ -3613,11 +3654,9 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Bu ilovada kengaytirilgan sozlamalar ishlamaydi"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Boshqa sozlamalar"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Boshqa sozlamalar bu ilova ichida joylashgan"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
- <skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Bildirishnomalarni cheklash"</string>
+ <string name="notification_polite_main_control_title" msgid="5812529809151927149">"Bildirishnomalarni sekinlatishdan foydalanish"</string>
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"Ish profillariga tatbiq qilinsin"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"Ish profilidagi ilovalar uchun qoʻllash"</string>
@@ -3665,6 +3704,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Turkumlar"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Boshqa"</string>
<string name="no_channels" msgid="4716199078612071915">"Bu ilova hech qanday bildirishnoma joylamagan"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Nofaol turkumlarni chiqarish"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Ilovadagi boshqa sozlamalar"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Nofaol turkumlarni chiqarish"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Nofaol turkumlarni berkitish"</string>
@@ -3773,7 +3813,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Bezovta qilinmasin rejimi ishlamaydigan ilovalar"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Tanlangan ilovalar"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Hech biri"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Hammasi"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Boshqa ilovalarni tanlang"</string>
@@ -3791,6 +3835,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Bezovta qilinmasin rejimi barcha xabar va chaqiruvlar uchun ishlaydi"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Bezovta qilinmasin rejimi ayrim foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Bezovta qilinmasin rejimi foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Qayta chaqiruvlar"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Qayta chaqiruvlar"</string>
@@ -3810,12 +3856,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Signallarni faqat {time} ga bir soat qolgungacha faol qilish}other{Signallarni faqat {time} ga # soat qolgungacha faol qilish}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"“Faqat signallar” rejimini <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> gacha faol bo‘ladigan qilib yoqish"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Har doim bezovta qilinaversin"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Tahrirlash rejimi"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Rejim qoʻshish"</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="warning_button_text" msgid="1274234338874005639">"Diqqat"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Yopish"</string>
<string name="device_feedback" msgid="5351614458411688608">"Qurilma haqida fikr-mulohaza"</string>
@@ -4286,7 +4330,7 @@
<string name="system_navigation_title" msgid="4890381153527184636">"Navigatsiya rejimi"</string>
<string name="swipe_up_to_switch_apps_title" msgid="6677266952021118342">"2 tugmali navigatsiya"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="1415457307836359560">"Bir ilovadan boshqasiga almashish uchun bosh ekran tugmasi ustida tepaga suring. Barcha ilovalarni koʻrish uchun yana tepaga suring. Avvalgi ekranga qaytish uchun esa Orqaga tugmasini bosing."</string>
- <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Xavfsizlik va favqulodda holatlar"</string>
+ <string name="emergency_settings_preference_title" msgid="6183455153241187148">"Jismoniy xavfsizlik va favqulodda holatlar"</string>
<string name="emergency_dashboard_summary" msgid="401033951074039302">"Favqulodda yordam, tibbiy axborot, ogohlantiruvlar"</string>
<string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Ishorali navigatsiya"</string>
<string name="edge_to_edge_navigation_summary" msgid="818109176611921504">"Bosh ekranga qaytish uchun ekranning pastidan tepaga qarab suring. Bir ilovadan boshqasiga oʻtish uchun pastdan tepaga surib, bosib turing va qoʻyib yuboring. Orqaga qaytish uchun chap yoki oʻng burchakdan teskari tomonga suring."</string>
@@ -4801,8 +4845,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Quvvatlash gʻilofi"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Batareya"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Sozlamalar paneli"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Desktop rejimini majburiy ochish"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Ikkilamchi displeylarda tajribaviy desktop rejimini majburiy ochish"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Erkin shakldagi oynalarni yoqish"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Erkin shakldagi oynalar uchun dastaklashni yoqish"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Ikkinchi ekranda erkin shakldagi oynalarni yoqish"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Faqat ikkinchi ekranda erkin shakldagi oynalarni yoqish"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Koʻp oynali hajmi oʻzgarmas ilovalarni yoqish"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Hajmi oʻzgarmas ilovalar koʻp oynali rejimda ochilishiga ruxsat beradi."</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Tungi mavzuni yoqish ustidan yozadi"</string>
@@ -4870,14 +4916,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"16KB dasturchi variantidan foydalanishdan oldin ushbu qurilmaning maʼlumotlar boʻlimi ext4 tizimiga oʻgirilishi kerak. Ushbu rejimda dasturning yaxlitligini kafolatlab boʻlmaydi va bootloader qulfdan chiqarilganda telefonda saqlangan har qanday maʼlumotlar xavf ostida qolishi mumkin. 16 KB rejim faollashtirilgandan keyin yana bir marta qayta yoqishni talab qiladi. Ushbu rejimga almashtirganingizdan keyin bir marta qayta yoqish bilan 4 KB va 16 KB rejimlari orasida almashtirishingiz mumkin. Ayrim funksiyalar bu rejimlarda faolsizlantiriladi, shu sababdan ayrim ilovalar ishlamasligi mumkin. Qurilmani ishchi rejimiga qaytarish uchun siz 4 KB rejimiga qaytishingiz va qurilmani zavod sozlamalariga qaytaradigan bootloaderni qulflashingiz kerak. Qurilma Android tizimiga muvaffaqiyatli yuklangandan keyin Dasturchi sozlamalarida OEM qulfini ochish funksiyasini faolsizlantiring. Tasdiqlangandan keyin qurilma tozalanadi va fayl ext4 tizimiga oʻzgartiriladi. Buni tugatgandan keyin 16 KB rejimni qayta yoqish uchun qaytib keling."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Hamma narsani tozalash"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"ext4 tizimida qayta formatlanmadi va axborot segmentlari tozalanmadi."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Bootloader qulfini ochish 16 KB rejimi uchun talab qilinadi"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Bootloader qulfini ochish zarur"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"16 KB dasturchi variantidan foydalanishdan oldin bu qurilma bootloaderni qulfdan chiqarishi kerak. Ushbu rejimda dasturning yaxlitligini kafolatlab boʻlmaydi va bootloader qulfdan chiqarilganda telefonda saqlangan har qanday maʼlumotlar xavf ostida qolishi mumkin. 16 KB rejimi faollashtirilganda barcha foydalanuvchi maʼlumotlari va sozlamalari tozalab tashlanadi. Bootloader qulfdan chiqarilgandan keyin 16 KB rejimni faollashtirish uchun ikki marta qayta yoqish kerak boʻladi. Ushbu rejimga almashtirganingizdan keyin bir marta qayta yoqish bilan 4 KB va 16 KB rejimlari orasida almashtirishingiz mumkin. Ayrim funksiyalar bu rejimlarda faolsizlantiriladi, shu sababdan ayrim ilovalar ishlamasligi mumkin. Qurilmani ishchi rejimiga qaytarish uchun siz 4 KB rejimiga qaytishingiz va qurilmani zavod sozlamalariga qaytaradigan OEM/bootloaderni qulflashingiz kerak. Bootloaderni qulfdan chiqaring va qaytadan urining. Buni qanday qilish haqida koʻrsatmalar bilan <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a> sahifasi orqali tanishib chiqishingiz mumkin."</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Sahifadan mustaqil 4 KB rejimdan foydalanilmoqda"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Siz sahifadan mustaqil 4 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 qurilmaning bootloaderini qulflashingiz kerak. Batafsil axborot olish uchun bosing."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Siz sahifadan mustaqil 4 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 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> orqali olib qayta yuklang yoki <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ishlating va “Qurilmani tozalash”, “Bootloaderni qulflash” va “Barcha boʻlimlarni majburiy fleshlash” bandlarini tanlang."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Sahifadan mustaqil 16 KB rejimdan foydalanilmoqda"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"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 4K rejimiga qaytishingiz va keyin qurilmaning bootloaderini qulflashingiz kerak. Batafsil axborot olish uchun bosing."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"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 4K 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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> orqali olib qayta yuklang yoki <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> ishlating va “Qurilmani tozalash”, “Bootloaderni qulflash” va “Barcha boʻlimlarni majburiy fleshlash” bandlarini tanlang."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Batafsil axborot olish uchun bosing."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> orqali olib qayta yuklang yoki <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Xatoliklarni xabar qilish vositasi"</string>
@@ -5009,7 +5055,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Ilovani mahkamlashdan foydalanish"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Dasturchi sozlamalaridan foydalanish"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Chop etish xizmatidan foydalanish"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Bir nechta foydalanuvchiga ruxsat berish"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Foydalanuvchini almashtirishga ruxsat"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"ruxsat, bir nechta, foydalanuvchi, ruxsat berish, koʻp"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"bir nechta, foydalanuvchilar, profillar, odamlar, hisoblar, almashtirish, koʻp"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Wi-Fi orqali debagging"</string>
@@ -5123,8 +5169,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Planshet dokka joylanganda ekranda nima chiqishini tanlang. Ekranda lavhasi chiqsa, qurilmangiz koʻproq quvvat sarflashi mumkin."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Moslash"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Moslash: <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Erkin shakllarni yoqish uchun qayta ishga tushirish zarur."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Ikkilamchi displeylar majburan ish stoli rejimida ishlashi uchun qayta ishga tushirish zarur."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Eskirgan erkin shakldagi oynalarni dastaklashni yoqish uchun qayta yoqish talab etiladi."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Erkin shakldagi oynalarni dastaklashni oʻzgartirish uchun qayta yoqish talab etiladi."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Erkin shakldagi oynalarni ikkilamchi displeylarda majburan ochish uchun qayta yoqish talab etiladi."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Hozir qayta ishga tushirish"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Keyinroq qayta ishga tushirish"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Qamrovli ovoz"</string>
@@ -5242,6 +5289,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Yoniq"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Oʻchiq"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Yoniq"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Audio %1$d%% chap, %2$d%% oʻng"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Audio %1$d%% oʻng, %2$d%% chap"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Qurilma nomi siz oʻrnatgan ilovalarga koʻrinadi. Bluetooth qurilmalarga yoki Wi-Fi tarmoqqa ulanganingizda, Wi-Fi hotspot sozlaganingizda boshqalarga ham koʻrinishi mumkin."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Grammatik jins"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Grammatik jinsni tanlang"</string>
@@ -5353,4 +5402,5 @@
<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="homepage_search" msgid="6759334912284663559">"Qidiruv sozlamalari"</string>
</resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 3f83b3d..34ed335 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Giờ đi ngủ"</item>
+ <item msgid="4152450357280759894">"Lái xe"</item>
+ <item msgid="7096549258219399423">"Sống động"</item>
+ <item msgid="2760716776980432977">"Được quản lý"</item>
+ <item msgid="601734478369121764">"Sao"</item>
+ <item msgid="6243809315432780521">"Lịch"</item>
+ <item msgid="4913577903148415331">"Thời gian"</item>
+ <item msgid="3653377604690057780">"Nhà hát"</item>
+ <item msgid="3843711267408385410">"Hoa"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9efb9c4..30ae12a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Ngắt kết nối thiết bị?"</string>
<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>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Tự động bật vào ngày mai"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Cài đặt thiết bị trợ thính"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Phím tắt, khả năng tương thích với thiết bị trợ thính"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Chế độ đặt sẵn"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Không có chế độ đặt sẵn do chuyên gia thính học lập trình"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Không cập nhật được giá trị đặt trước"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Đầu ra âm thanh"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Giới thiệu về đầu ra âm thanh"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Đang tắt"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Đang bật / # ứng dụng có quyền truy cập vào thông tin vị trí}other{Đang bật / # ứng dụng có quyền truy cập vào thông tin vị trí}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Đang tải…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Những ứng dụng có quyền đối với các Thiết bị ở gần có thể xác định vị trí tương đối của các thiết bị đã kết nối."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Những ứng dụng có quyền đối với các thiết bị ở gần có thể xác định vị trí tương đối của các thiết bị đã kết nối."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Các ứng dụng và dịch vụ sẽ không có quyền truy cập vào thông tin vị trí. Khi bạn gọi điện hoặc nhắn tin đến một số khẩn cấp, nhân viên ứng cứu khẩn cấp vẫn có thể nhận được thông tin vị trí thiết bị của bạn."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Tìm hiểu thêm về chế độ Cài đặt vị trí"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Để thay đổi, hãy chuyển đến phần Cài đặt ChromeOS > Quyền riêng tư và bảo mật > Chế độ kiểm soát quyền riêng tư > Quyền truy cập thông tin vị trí"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Đã thêm khuôn mặt và <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Đã thêm khuôn mặt, vân tay và <xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Đã thêm khuôn mặt, vân tay và <xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Điều này là cần thiết vì tính năng Kiểm tra danh tính đang bật"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Mở khoá từ xa bằng Authenticator"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Đã thêm đồng hồ"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Thiết lập đồng hồ"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Tìm hiểu thêm về tính năng Mở khoá bằng đồng hồ"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Thêm đồng hồ"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Xoá đồng hồ"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Mở khoá bằng vân tay và Mở khoá bằng khuôn mặt"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Mở khóa bằng khuôn mặt và vân tay"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Mở khoá bằng khuôn mặt và vân tay cho công việc"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Cần thiết lập"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Đã thêm khuôn mặt và các vân tay"</string>
@@ -575,7 +576,7 @@
<string name="private_space_new_lock_message" msgid="3117703578905489206">"Bạn sẽ cần nhập mã PIN, hình mở khoá hoặc mật khẩu của thiết bị trên màn hình tiếp theo"</string>
<string name="private_space_auto_lock_title" msgid="8663409382910601261">"Tự động khoá không gian riêng tư"</string>
<string name="private_space_auto_lock_page_summary" msgid="8679844515655838654">"Bạn có thể tự động khoá không gian riêng tư của mình nếu không sử dụng thiết bị trong một khoảng thời gian"</string>
- <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Mỗi khi khoá thiết bị"</string>
+ <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"Mỗi khi thiết bị khoá"</string>
<string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"5 phút sau thời gian chờ khoá màn hình"</string>
<string name="private_space_auto_lock_after_device_restart" msgid="288755768725895029">"Chỉ sau khi khởi động lại thiết bị"</string>
<string name="private_space_hide_page_title" msgid="3364639176511877414">"Ẩn không gian riêng tư"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Cài đặt ứng dụng"</b>\n"Cài đặt những ứng dụng bạn muốn giữ riêng tư trong không gian của mình"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Lưu ý"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Các ứng dụng sẽ bị dừng khi bạn khoá không gian của mình"</b>\n"Khi bạn khoá không gian của mình, các ứng dụng trong đó sẽ bị dừng và bạn sẽ không nhận được thông báo từ các ứng dụng đó"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Không gian riêng tư không phù hợp với những ứng dụng cần chạy trong nền hoặc gửi các thông báo nguy cấp, chẳng hạn như ứng dụng về sức khoẻ. Điều này là do các thông báo và hoạt động trong chế độ nền sẽ dừng lại khi không gian của bạn bị khoá.\n\nKhi không gian riêng tư của bạn bị khoá, các ứng dụng trong không gian này sẽ không xuất hiện trong trình quản lý quyền, bảng tổng quan về quyền riêng tư và những chế độ cài đặt khác.\n\nBạn không thể chuyển không gian riêng tư của mình sang một thiết bị mới. Nếu muốn dùng không gian đó trên một thiết bị khác, bạn sẽ cần thiết lập một không gian riêng tư khác.\n\nBất cứ ai kết nối thiết bị của bạn với một máy tính hoặc cài đặt các ứng dụng gây hại trên thiết bị này đều có thể truy cập vào không gian riêng tư của bạn."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Không gian riêng tư không phù hợp với những ứng dụng cần chạy trong nền hoặc gửi các thông báo nguy cấp, chẳng hạn như ứng dụng về sức khoẻ. Điều này là do các thông báo và hoạt động trong chế độ nền sẽ dừng lại khi không gian của bạn bị khoá.\n\nKhi không gian riêng tư của bạn bị khoá, các ứng dụng trong không gian này sẽ không xuất hiện trong trình quản lý quyền, bảng tổng quan về quyền riêng tư và những chế độ cài đặt khác.\n\nBạn không thể khôi phục không gian riêng tư của mình sang một thiết bị mới. Nếu muốn dùng không gian đó trên một thiết bị khác, bạn sẽ cần thiết lập một không gian khác.\n\nBất cứ ai kết nối thiết bị của bạn với một máy tính hoặc cài đặt các ứng dụng độc hại trên thiết bị này đều có thể truy cập vào không gian riêng tư của bạn."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Tìm hiểu thêm về không gian riêng tư"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Quá trình này sẽ mất vài phút"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Đang thiết lập không gian riêng tư…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Khởi động lại thiết bị?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Chế độ ghi nhật ký chi tiết về Giao tiếp phạm vi gần (NFC) chỉ dành cho mục đích phát triển. Dữ liệu bổ sung về NFC sẽ được đưa vào báo cáo lỗi. Dữ liệu này có thể chứa thông tin riêng tư. Hãy khởi động lại thiết bị để thay đổi chế độ cài đặt này."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Khởi động lại"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"phản chiếu, màn hình ngoài, màn hình được kết nối, màn hình usb, độ phân giải, góc xoay"</string>
+ <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>
+ <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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Góc xoay"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Tiêu chuẩn"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Sử dụng bàn phím ảo"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Hiện bàn phím ảo trên màn hình trong khi bàn phím vật lý đang hoạt động"</string>
<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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Đổi màu nền con trỏ thành màu vàng"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Đổi màu nền con trỏ thành màu hồng"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Đổi màu nền con trỏ thành xanh lam"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Kiểu nét vẽ của con trỏ"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Trắng"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Đen"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Không có"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Người dùng đã chọn: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Lời nói"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Tốc độ con trỏ"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Kích thước con trỏ"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Giảm kích thước con trỏ"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Tăng kích thước con trỏ"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Trình điều khiển trò chơi"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Chuyển hướng rung"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Chuyển hướng rung sang bộ điều khiển trò chơi khi được kết nối."</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Vẫn tiếp tục"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Huỷ"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cài đặt phóng to"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"Di chuyển vùng phóng to bằng một ngón tay"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Di chuyển kính lúp bằng 1 ngón tay"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Kéo 1 ngón tay để di chuyển xung quanh màn hình."</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Di chuyển vùng phóng to bằng cách kéo một ngón tay."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Di chuyển vùng phóng to bằng cách kéo hai ngón tay."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Không dùng được khi chỉ phóng to một phần màn hình"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Nhấn vào nút để thu phóng"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Nhanh chóng phóng to màn hình để hiển thị nội dung lớn hơn"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Cách phóng to:</b><br/> {0,number,integer}. Dùng phím tắt để bắt đầu phóng to<br/> {1,number,integer}. Nhấn vào màn hình<br/> {2,number,integer}. Kéo 2 ngón tay để di chuyển xung quanh màn hình<br/> {3,number,integer}. Chụm 2 ngón tay để điều chỉnh mức thu phóng<br/> {4,number,integer}. Dùng phím tắt để dừng phóng to<br/><br/> <b>Cách phóng to tạm thời:</b><br/> {0,number,integer}. Hãy nhớ đặt kiểu phóng to thành toàn màn hình<br/> {1,number,integer}. Dùng phím tắt để bắt đầu phóng to<br/> {2,number,integer}. Chạm và giữ một vị trí bất kỳ trên màn hình<br/> {3,number,integer}. Kéo ngón tay để di chuyển xung quanh màn hình<br/> {4,number,integer}. Nhấc ngón tay lên để dừng phóng to"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Cách phóng to:</b><br/> {0,number,integer}. Dùng lối tắt để bắt đầu phóng to<br/> {1,number,integer}. Nhấn vào màn hình<br/> {2,number,integer}. Kéo 2 ngón tay để di chuyển xung quanh màn hình<br/> {3,number,integer}. Chụm 2 ngón tay để điều chỉnh mức thu phóng<br/> {4,number,integer}. Dùng lối tắt để dừng phóng to<br/><br/> Bạn có thể dùng tính năng phóng to tạm thời cùng nhiều tính năng khác."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Cách phóng to:</b><br/> {0,number,integer}. Dùng lối tắt để bắt đầu phóng to<br/> {1,number,integer}. Nhấn vào màn hình<br/> {2,number,integer}. Kéo 1 hoặc 2 ngón tay để di chuyển xung quanh màn hình<br/> {3,number,integer}. Chụm 2 ngón tay để điều chỉnh mức thu phóng<br/> {4,number,integer}. Dùng lối tắt để dừng phóng to<br/><br/> Bạn có thể dùng tính năng phóng to tạm thời cùng nhiều tính năng khác."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Khi tính năng phóng to đang bật, bạn có thể phóng to trên màn hình.\n\n"<b>"Để thu phóng"</b>", hãy mở tính năng phóng to rồi nhấn vào vị trí bất kỳ trên màn hình.\n"<ul><li>"Kéo 2 hoặc nhiều ngón tay để cuộn"</li>\n<li>"Chụm 2 hoặc nhiều ngón tay để điều chỉnh mức thu phóng"</li></ul>\n\n<b>"Để thu phóng tạm thời"</b>", hãy mở tính năng phóng to rồi chạm và giữ vị trí bất kỳ trên màn hình.\n"<ul><li>"Kéo để di chuyển quanh màn hình"</li>\n<li>"Nhấc ngón tay để thu nhỏ"</li></ul>\n\n"Bạn không thể phóng to trên bàn phím hoặc thanh điều hướng."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Trang <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Phím tắt cho nút hỗ trợ tiếp cận"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Không có}=1{Đã đặt 1 lịch biểu}other{Đã đặt # lịch biểu}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Không làm phiền"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Chế độ ưu tiên"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Thêm chế độ"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Chỉ nhận thông báo của những người và ứng dụng quan trọng"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Chọn loại quy trình kích hoạt"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Thời gian"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Ví dụ: \"9:30 – 5:00 CH\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Lịch"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Ví dụ: \"Lịch cá nhân\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Tạo một chế độ"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Tuỳ chỉnh"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hạn chế bị gián đoạn"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Bật chế độ Không làm phiền"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Chuông báo và âm thanh đa phương tiện có thể làm gián đoạn"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Lịch biểu"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Xóa lịch biểu"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Xóa"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Đổi tên"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Xoá"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Xoá chế độ \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Chỉnh sửa"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Lịch biểu"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Lịch biểu"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Thêm lịch"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Dùng lịch của bạn"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Lịch biểu"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Đặt lịch biểu"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Lịch biểu"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> tiếng <xliff:g id="MINUTES">%2$d</xliff:g> phút"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Tự động bật"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Lên lịch"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Tắt tiếng điện thoại vào thời gian nhất định"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Đặt quy tắc Không làm phiền"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Cho phép các hoạt động phát ra âm thanh có thể làm gián đoạn"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Ngăn gián đoạn hình ảnh"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Cho phép tín hiệu hình ảnh"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Những thông báo mà bạn có thể nhận được"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Luôn tập trung"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Thao tác khác"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Đang tắt}=1{Đang tắt/1 chế độ có thể tự động bật}other{Đang tắt/# chế độ có thể tự động bật}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Chế độ cài đặt màn hình"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Lựa chọn hiển thị"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Thang màu xám"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"bật giao diện tối"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Chuyển đổi hệ điều hành và ứng dụng để ưu tiên dùng văn bản sáng trên nền tối, chế độ này có thể dễ nhìn hơn và giúp tiết kiệm pin đáng kể trên một số thiết bị"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Không thay đổi chế độ hiển thị}=1{{effect_1}}=2{{effect_1} và {effect_2}}=3{{effect_1}, {effect_2} và {effect_3}}other{{effect_1}, {effect_2} và # chế độ khác}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Lọc hoạt động gây gián đoạn"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Chưa lọc hoạt động gây gián đoạn nào"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Các lựa chọn hiển thị đối với thông báo được lọc"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Khi chế độ Không làm phiền đang bật"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Không phát âm thanh khi có thông báo"</string>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"mở thông báo"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Cho phép tạm hoãn thông báo"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Dấu chấm thông báo trên biểu tượng ứng dụng"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Gói thông báo"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Bong bóng"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Bong bóng"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Hiện cuộc trò chuyện này ở dạng bong bóng"</string>
@@ -3592,7 +3633,7 @@
<string name="nls_feature_read_summary" msgid="1064698238110273593">"Ứng dụng này có thể đọc các thông báo của bạn, bao gồm cả thông tin cá nhân như người liên hệ, tin nhắn và ảnh."</string>
<string name="nls_feature_reply_title" msgid="7925455553821362039">"Trả lời tin nhắn"</string>
<string name="nls_feature_reply_summary" msgid="4492543411395565556">"Ứng dụng này có thể trả lời tin nhắn và thao tác với các nút trong thông báo, bao gồm cả tạm ẩn hoặc loại bỏ thông báo và trả lời cuộc gọi."</string>
- <string name="nls_feature_settings_title" msgid="8208164329853194414">"Thay đổi các chế độ cài đặt"</string>
+ <string name="nls_feature_settings_title" msgid="8208164329853194414">"Thay đổi chế độ cài đặt"</string>
<string name="nls_feature_settings_summary" msgid="3770028705648985689">"Ứng dụng này có thể bật hoặc tắt chế độ Không làm phiền và thay đổi các chế độ cài đặt liên quan."</string>
<string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Nếu bạn tắt quyền truy cập thông báo của <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, quyền truy cập chế độ Không làm phiền cũng có thể bị tắt."</string>
<string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Tắt"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Ứng dụng này không hỗ trợ chế độ cài đặt nâng cao"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Chế độ cài đặt khác"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Các chế độ cài đặt khác có sẵn trong ứng dụng này"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Giảm dần âm lượng cho thông báo"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Danh mục"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Khác"</string>
<string name="no_channels" msgid="4716199078612071915">"Ứng dụng này chưa đăng bất kỳ thông báo nào"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Hiện các danh mục không dùng đến"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Chế độ cài đặt bổ sung trong ứng dụng"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Hiện các danh mục không dùng"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Ẩn các danh mục không dùng"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Các ứng dụng có thể làm gián đoạn"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Các ứng dụng được chọn"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Không có"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Tất cả"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Chọn ứng dụng khác"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Không âm thanh nào có thể làm gián đoạn"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Không ai có thể làm gián đoạn"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Một số người có thể làm gián đoạn"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Tất cả mọi người có thể gián đoạn"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Người gọi nhiều lần"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Cho phép người gọi nhiều lần"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Đổi sang chế độ chỉ báo thức trong 1 giờ cho đến {time}}other{Đổi sang chế độ chỉ báo thức trong # giờ cho đến {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Đổi sang báo thức chỉ đến khi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Đổi sang luôn làm gián đoạn"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Chỉnh sửa chế độ"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Thêm 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="warning_button_text" msgid="1274234338874005639">"Cảnh báo"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Đóng"</string>
<string name="device_feedback" msgid="5351614458411688608">"Gửi ý kiến phản hồi về thiết bị này"</string>
@@ -4025,7 +4070,7 @@
<string name="draw_overlay" msgid="7902083260500573027">"Hiện trên các ứng dụng khác"</string>
<string name="system_alert_window_settings" msgid="6458633954424862521">"Hiện trên các ứng dụng khác"</string>
<string name="permit_draw_overlay" msgid="4468994037192804075">"Cho phép hiện trên các ứng dụng khác"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"Cho phép ứng dụng này hiển thị trên các ứng dụng khác mà bạn đang dùng. Ứng dụng này có thể xem vị trí mà bạn nhấn vào hoặc thay đổi nội dung hiển thị trên màn hình."</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"Cho phép ứng dụng này hiện trên các ứng dụng khác mà bạn đang dùng. Ứng dụng này có thể xem vị trí mà bạn nhấn vào hoặc thay đổi nội dung hiển thị trên màn hình."</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"Thay đổi đầu ra đa phương tiện"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"Cho ứng dụng chuyển đổi đầu ra đa phương tiện"</string>
<string name="allow_media_routing_description" msgid="8343709701298051207">"Cho phép ứng dụng này chọn thiết bị được kết nối sẽ phát âm thanh hoặc video từ các ứng dụng khác. Nếu được cho phép, ứng dụng này sẽ truy cập được danh sách thiết bị hiện có (như tai nghe và loa), và có thể chọn thiết bị đầu ra nào sẽ được dùng để phát trực tuyến hoặc truyền âm thanh hoặc video."</string>
@@ -4801,8 +4846,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Hộp sạc"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Pin"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Bảng Cài đặt"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Buộc chạy chế độ máy tính"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Buộc chạy chế độ máy tính thử nghiệm trên màn hình phụ"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Bật cửa sổ có thể đổi kích thước"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Bật tính năng hỗ trợ cửa sổ có thể đổi kích thước."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Bật kết xuất c.sổ hiện tại có thể đổi k.thước trên màn hình phụ"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Chỉ bật cửa sổ có thể đổi kích thước trên màn hình phụ."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Bật tùy chọn không thay đổi kích thước trong nhiều cửa sổ"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Cho phép các ứng dụng không thể thay đổi kích thước xuất hiện trong nhiều cửa sổ"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Vô hiệu hoá tính năng buộc dùng chế độ tối"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Bạn phải chuyển đổi phân vùng dữ liệu của thiết bị này sang ext4 thì mới có thể dùng tuỳ chọn 16 KB cho nhà phát triển. Ở 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á. Nếu kích hoạt chế độ 16 KB, bạn sẽ phải khởi động lại một lần nữa sau lần này. Khi đã ở chế độ này, bạn chỉ cần khởi động lại một lần là có thể chuyển qua lại giữa chế độ 4 KB và 16 KB. Một số tính năng bị tắt ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn cần quay lại chế độ 4 KB rồi khoá trình tải khởi động (thao tác này sẽ đặt lại thiết bị về trạng thái ban đầu). 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. Sau khi bạn xác nhận, dữ liệu trên thiết bị sẽ được xoá sạch và hệ thống tệp sẽ được thay đổi thành ext4. Sau khi quá trình này hoàn thành, vui lòng quay lại để bật lại chế độ 16 KB."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Xoá hết dữ liệu"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Không định dạng lại được phân vùng dữ liệu về ext4 và không xoá sạch được phân vùng dữ liệu."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Cần mở khoá trình tải khởi động để dùng chế độ 16 KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Cần mở khoá trình tải khởi động"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Bạn cần phải mở khoá trình tải khởi động cho thiết bị này thì mới dùng được tuỳ chọn 16 KB cho nhà phát triển. Ở 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á. Tất cả dữ liệu người dùng và các chế độ cài đặt sẽ bị xoá sạch khi bạn kích hoạt chế độ 16 KB. Sau khi trình tải khởi động được mở khoá, bạn cần khởi động lại 2 lần thì mới kích hoạt được chế độ 16 KB. Khi đã ở chế độ này, bạn chỉ cần khởi động lại một lần là có thể chuyển qua lại giữa chế độ 4 KB và 16 KB. Một số tính năng bị tắt ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn cần quay lại chế độ 4 KB, sau đó khoá OEM/trình tải khởi động (thao tác này sẽ đặt lại thiết bị về trạng thái ban đầu). Hãy mở khoá trình tải khởi động rồi thử lại. Bạn có thể xem hướng dẫn về cách thực hiện việc này tại <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Dùng chế độ 4 KB của chế độ không xác định kích thước trang"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Bạn đang ở chế độ 4 KB của chế độ không xác định 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 ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn phải khoá trình tải khởi động của thiết bị. Hãy nhấn để đọc thêm."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Bạn đang ở chế độ 4 KB của chế độ không phụ thuộc 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 ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn phả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ừ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> hoặc sử dụng <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> rồi chọn \"Wipe Device\" (Xoá thiết bị), \"Lock Bootloader\" (Khoá trình tải khởi động) và \"Force Flash all partitions\" (Buộc cài đặt ROM cho mọi phân vùng)."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Dùng chế độ 16 KB của chế độ không phụ thuộc kích thước trang"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Bạn đang ở chế độ 16 KB của chế độ không xác định 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 ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn phải quay lại chế độ 4K rồi khoá trình tải khởi động của thiết bị. Hãy nhấn để đọc thêm."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Bạn đang ở chế độ 16 KB của chế độ không phụ thuộc 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 ở các chế độ này nên có thể một vài ứng dụng sẽ không hoạt động. Để đặt lại thiết bị về chế độ cài đặt gốc, bạn phải quay lại 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ừ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> hoặc sử dụng <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> rồi chọn \"Wipe Device\" (Xoá thiết bị), \"Lock Bootloader\" (Khoá trình tải khởi động) và \"Force Flash all partitions\" (Buộc cài đặt ROM cho mọi phân vùng)."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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ị. Hãy nhấn để đọc thêm."</string>
+ <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ừ <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> hoặc sử dụng <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Trình xử lý báo cáo lỗi"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Sử dụng tính năng ghim ứng dụng"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Sử dụng tùy chọn cho nhà phát triển"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Dùng dịch vụ in"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Cho phép nhiều người dùng"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Cho phép chuyển đổi người dùng"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"cho phép, nhiều, người dùng"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"nhiều, người dùng, hồ sơ, mọi người, tài khoản, chuyển"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Sử dụng tính năng gỡ lỗi qua Wi-Fi"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Chọn nội dung bạn sẽ thấy trên màn hình khi máy tính bảng được cắm vào đế sạc. Thiết bị có thể tiêu hao nhiều năng lượng hơn khi bạn dùng trình bảo vệ màn hình."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Tuỳ chỉnh"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Tuỳ chỉnh <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Cần phải khởi động lại để bật tuỳ chọn hỗ trợ dạng tự do."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Cần phải khởi động lại để buộc chạy chế độ máy tính trên màn hình phụ."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Bạn cần phải khởi động lại để bật tính năng hỗ trợ kết xuất cửa sổ hiện tại có thể đổi kích thước (cũ)."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Bạn cần phải khởi động lại để thay đổi tính năng hỗ trợ kết xuất cửa sổ có thể đổi kích thước."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Bạn cần phải khởi động lại để buộc bật chế độ kết xuất cửa sổ có thể đổi kích thước trên màn hình phụ."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Khởi động lại ngay"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Khởi động lại sau"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Âm thanh không gian"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Đang bật"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Đang tắt"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Đang bật"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Âm thanh: trái %1$d%%, phải %2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Âm thanh: phải %1$d%%, trái %2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Các ứng dụng bạn đã cài đặt sẽ biết được tên thiết bị của bạn. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth, một mạng Wi-Fi hoặc thiết lập một điểm phát sóng Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Giống trong ngữ pháp"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Chọn giống trong ngữ pháp"</string>
@@ -5353,4 +5403,5 @@
<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 dùng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> để quét mã QR của luồng âm thanh mà bạn muốn nghe"</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="homepage_search" msgid="6759334912284663559">"Tìm kiếm trong phần Cài đặt"</string>
</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 486d9f7..f01a72c 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"睡眠时间"</item>
+ <item msgid="4152450357280759894">"驾车"</item>
+ <item msgid="7096549258219399423">"沉浸"</item>
+ <item msgid="2760716776980432977">"受管理"</item>
+ <item msgid="601734478369121764">"星形"</item>
+ <item msgid="6243809315432780521">"日历"</item>
+ <item msgid="4913577903148415331">"时间"</item>
+ <item msgid="3653377604690057780">"剧院"</item>
+ <item msgid="3843711267408385410">"花朵"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8920759..01ca252 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"要断开与该设备的连接吗？"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"与新设备配对"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"蓝牙"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自动开启"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"助听装置设置"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"快捷键、助听器兼容性"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"预设"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"您的听觉矫正专家未设定任何预设"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"无法更新预设"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音频输出"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"音频输出简介"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"已关闭"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{已开启 / # 个应用有权访问位置信息}other{已开启 / # 个应用有权访问位置信息}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"正在加载…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"具有附近设备权限的应用可以确定已连接的设备的相对位置。"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"具有附近设备权限的应用可以确定已连接设备的相对位置。"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"应用和服务的位置信息使用权处于关闭状态。在您拨打紧急电话号码或向该号码发送短信时，系统可能仍会将您的设备位置信息发送给紧急救援人员。"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"详细了解位置信息设置"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"如要进行更改，请依次前往 ChromeOS 的“设置”>“隐私和安全”>“隐私控制”>“位置信息使用权”"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"已添加面孔和“<xliff:g id="WATCH">%s</xliff:g>”"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"已添加面孔、指纹和“<xliff:g id="WATCH">%s</xliff:g>”"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"已添加面孔、指纹和“<xliff:g id="WATCH">%s</xliff:g>”"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"由于开启了身份验证，因此需要提供此信息"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"远程身份验证器解锁"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"已添加手表"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"设置手表"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"详细了解“手表解锁”功能"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"添加手表"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"移除手表"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"指纹解锁和人脸解锁"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"人脸解锁和指纹解锁"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"用于工作资料的人脸解锁和指纹解锁"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"需要设置"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"已添加面孔和多个指纹"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"安装应用"</b>\n"将您不想公开的应用安装在私密空间中"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"注意事项"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"锁定您的私密空间后，应用将停止运行"</b>\n"在您锁定自己的私密空间后，其中的应用将停止运行，您也不会再收到来自这些应用的通知"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"私密空间不适合需要在后台运行或发送重要通知的应用，如医疗应用。这是因为，当私密空间处于锁定状态时，通知和后台活动将停止运行。\n\n私密空间处于锁定状态时，私密空间中的应用不会显示在权限管理器、隐私信息中心和其他设置中。\n\n私密空间无法转移到新设备。若要在其他设备上使用私密空间，您需要在该设备上再设置一个私密空间。\n\n如果有人将您的设备连接到计算机，或在您的设备上安装了有害应用，他们或许能够访问您的私密空间。"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"私密空间不适合需要在后台运行或发送重要通知的应用，如医疗应用。这是因为，当私密空间处于锁定状态时，通知和后台活动将停止运行。\n\n私密空间处于锁定状态时，私密空间中的应用不会显示在权限管理器、隐私信息中心和其他设置中。\n\n私密空间无法恢复到新设备。若要在其他设备上使用私密空间，您需要在该设备上再设置一个私密空间。\n\n如果有人将您的设备连接到计算机，或在您的设备上安装了恶意应用，他们或许能够访问您的私密空间。"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"详细了解私密空间"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"这将需要一点时间"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"正在设置私密空间…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"要重启设备吗？"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"详细 NFC 日志记录仅用于开发目的。错误报告中包含其他 NFC 数据，其中可能包含私密信息。如需更改此设置，请重启设备。"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"重启"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"镜像, 外接显示器, 已连接的显示器, USB 显示器, 分辨率, 旋转角度, mirror, external display, connected display, usb display, resolution, rotation"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"旋转角度"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"标准"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"使用屏幕键盘"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"连接到实体键盘时，在屏幕上显示一个虚拟键盘"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"将指针填充样式更改为黄色"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"将指针填充样式更改为粉色"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"将指针填充样式更改为蓝色"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"指针描边样式"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"白色"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"黑色"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"无"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"用户选择的布局：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"语音"</string>
<string name="pointer_speed" msgid="7398649279282675718">"指针速度"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"指针比例"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"减小指针比例"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"增大指针比例"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"游戏控制器"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"重定向振动"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"连接后将振动传到游戏控制器"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"仍然继续"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"取消"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大设置"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"一根手指平移"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"用 1 根手指拖动即可移动放大区域"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"用 1 根手指拖动即可在画面上四处移动"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"拖动一根手指即可移动放大区域。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"拖动两根手指即可移动放大区域。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"如果仅放大局部屏幕，则无法使用此功能"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"点按按钮即可放大"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"快速放大屏幕，更清晰地查看内容"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>如需放大屏幕，请执行以下操作：</b><br/> {0,number,integer}. 使用快捷方式启动放大功能<br/> {1,number,integer}. 点按屏幕<br/> {2,number,integer}. 拖动双指在屏幕上四处移动<br/> {3,number,integer}. 张合双指以调整缩放比例<br/> {4,number,integer}. 使用快捷方式停止放大功能<br/><br/> <b>如需暂时放大屏幕，请执行以下操作：</b><br/> {0,number,integer}. 确保已将放大类型设为“全屏”<br/> {1,number,integer}. 使用快捷方式启动放大功能<br/> {2,number,integer}. 轻触并按住屏幕上的任意位置<br/> {3,number,integer}. 拖动单指在屏幕上四处移动<br/> {4,number,integer}. 抬起手指以停止放大功能"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>如需放大画面，请按以下步骤操作：</b><br/>{0,number,integer}. 使用快捷手势开始放大<br/> {1,number,integer}. 点按画面<br/> {2,number,integer}. 拖动 2 指在画面上四处移动<br/> {3,number,integer}. 张合 2 指以调整缩放比例<br/> {4,number,integer}. 使用快捷手势停止放大<br/><br/> 您还可以暂时放大画面及执行其他操作。"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>如需放大画面，请按以下步骤操作：</b><br/>{0,number,integer}. 使用快捷手势开始放大<br/> {1,number,integer}. 点按画面<br/> {2,number,integer}. 拖动 1 或 2 根手指在画面上四处移动<br/> {3,number,integer}. 张合 2 指以调整缩放比例<br/> {4,number,integer}. 使用快捷手势停止放大<br/><br/> 您还可以暂时放大画面及执行其他操作。"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"开启放大功能后，您就可以放大屏幕上的内容。\n\n"<b>"要放大内容"</b>"，请先启动放大功能，然后点按屏幕上的任意位置。\n"<ul><li>"拖动双指或多指即可进行滚动"</li>\n<li>"张合双指或多指即可调整缩放级别"</li></ul>\n\n<b>"要暂时性放大内容"</b>"，请先启动放大功能，然后轻触并按住屏幕上的任意位置。\n"<ul><li>"拖动手指即可在屏幕上四处移动"</li>\n<li>"松开手指即可缩小回原来的状态"</li></ul>\n\n"您无法针对键盘或导航栏使用放大功能。"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 页，共 <xliff:g id="NUM_PAGES">%2$d</xliff:g> 页"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"“无障碍”按钮快捷方式"</string>
@@ -2183,7 +2208,7 @@
<string name="accessibility_shortcut_description" msgid="2184693606202133549">"允许在屏幕锁定时开启功能快捷方式。同时按住两个音量键几秒钟即可开启。"</string>
<string name="accessibility_button_title" msgid="5251235485581552614">"“无障碍”按钮"</string>
<string name="accessibility_button_gesture_title" msgid="3573456209050374139">"“无障碍”按钮和手势"</string>
- <string name="accessibility_button_intro_text" msgid="80993874471745687">"在任意屏幕画面上都能快速使用无障碍功能"</string>
+ <string name="accessibility_button_intro_text" msgid="80993874471745687">"在任意界面上都能快速使用无障碍功能"</string>
<string name="accessibility_button_about_title" msgid="3581116105084067926">"关于“无障碍”按钮"</string>
<string name="accessibility_button_gesture_about_title" msgid="8468987303602865536">"关于“无障碍”按钮和无障碍功能启动手势"</string>
<string name="accessibility_button_gesture_footer_learn_more_content_description" msgid="4144803517680297869">"详细了解“无障碍”按钮和无障碍功能启动手势"</string>
@@ -3159,7 +3184,7 @@
<string name="app_and_notification_dashboard_summary" msgid="8047683010984186106">"最近使用的应用、默认应用"</string>
<string name="notification_settings_work_profile" msgid="6076211850526353975">"工作资料中的应用无法访问通知。"</string>
<string name="account_dashboard_title" msgid="8228773251948253914">"密码和账号"</string>
- <string name="account_dashboard_default_summary" msgid="7976899924144356939">"登录和自动填充方面的建议"</string>
+ <string name="account_dashboard_default_summary" msgid="7976899924144356939">"登录和自动填充建议"</string>
<string name="app_default_dashboard_title" msgid="4071015747629103216">"默认应用"</string>
<string name="cloned_apps_dashboard_title" msgid="5542076801222950921">"克隆应用"</string>
<string name="desc_cloned_apps_intro_text" msgid="1369621522882622476">"创建应用的第二个实例，这样您就可以同时使用两个账号。"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{无}=1{已设置 1 个时间表}other{已设置 # 个时间表}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"勿扰模式"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"优先模式"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"添加模式"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"仅接收来自重要联系人和重要应用的通知"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"选择激活类型"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"时间"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"例如：“上午 9:30 至下午 5:00”"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"日历"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"例如：“个人日历”"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"创建模式"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"自定义"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"限制打扰"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"开启勿扰模式"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"闹钟和媒体音效例外"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"时间表"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"删除时间表"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"删除"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"重命名"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"删除"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"要删除“<xliff:g id="MODE">%1$s</xliff:g>”模式吗？"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"修改"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"时间表"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"时间表"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"添加日程表"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"使用您的日程表"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"日程"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"设置时间表"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"时间表"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> 小时 <xliff:g id="MINUTES">%2$d</xliff:g> 分钟"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"自动开启"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"时间表"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"在特定的时间将手机设为静音"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"设置“勿扰”规则"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"可以发出声音的例外项"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"屏蔽视觉打扰"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允许视觉信号"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"您可以收到的通知"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"保持专注"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"其他操作"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{关闭}=1{关闭/1 个模式可以自动开启}other{关闭/# 个模式可以自动开启}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"显示设置"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"显示选项"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"灰度模式"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"启用深色主题"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"将操作系统和应用设置切换到首选深色背景配浅色文本，这样可以减轻眼睛负担，并且在某些设备上能够显著节省电池电量"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"滤除干扰"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"未滤除任何干扰"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"打开通知"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"允许显示通知延后选项"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"应用图标上的通知圆点"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"通知包"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"消息气泡"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"消息气泡"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"以消息气泡形式显示此对话"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"此应用不支持增强型设置"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"更多设置"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"您可以在此应用中使用更多设置"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"通知音量渐降"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"应用于工作资料"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"应用至工作资料应用"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"类别"</string>
<string name="notification_channels_other" msgid="18159805343647908">"其他"</string>
<string name="no_channels" msgid="4716199078612071915">"此应用未发布任何通知"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"显示未使用的类别"</string>
<string name="app_settings_link" msgid="6725453466705333311">"应用中的其他设置"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"显示未使用的类别"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"隐藏未使用的类别"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"例外的应用"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"所选应用"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"无"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"全部"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允许应用覆盖"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外的应用"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"选择更多应用"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"任何音效均不能例外"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"任何人均不能例外"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"部分人例外"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"重复来电者"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"不屏蔽重复来电者"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{更改为仅限闹钟并持续 1 小时，直到 {time}}other{更改为仅限闹钟并持续 # 小时，直到 {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"更改为仅限闹钟（到<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>）"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"更改为一律允许打扰"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"修改模式"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"添加模式"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自定义模式"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名称"</string>
<string name="warning_button_text" msgid="1274234338874005639">"警告"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"关闭"</string>
<string name="device_feedback" msgid="5351614458411688608">"发送有关此设备的反馈"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"强制使用桌面模式"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"在辅助显示屏上强制使用桌面模式这一实验性功能"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"启用可自由调整的窗口"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"实现对可自由调整的窗口的支持。"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"在第二显示器上启用可自由调整的窗口"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"仅在第二显示器上启用可自由调整的窗口。"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允许以多窗口模式显示不可调整大小的应用"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允许通过多窗口模式显示不可调整大小的应用"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"覆盖“强制启用 SmartDark 功能”的设置"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"需要先将此设备的数据分区转换成 ext4，然后才能使用 16KB 开发者选项。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在此之后，需要再重启设备一次，才能启用 16KB 选项。进入该模式后，您只需重启设备 1 次便可在 4KB 模式和 16KB 模式之间来回切换。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想让设备返回到生产模式，您需要切换回 4KB 模式并锁定引导加载程序，这样就会将设备恢复出厂设置。待设备成功启动到 Android 系统后，在开发者选项中停用 OEM 解锁。当您确认后，设备上的所有数据都会被擦除，而且文件系统会被更改为 ext4。完成以上步骤后，请再次返回启用 16KB 模式。"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"清除所有数据"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"未能擦除数据分区并重新格式化为 ext4。"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"必须解锁引导加载程序，才能使用 16KB 模式"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"必须解锁引导加载程序"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"需要先为此设备解锁引导加载程序，然后才能使用 16KB 开发者选项。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。启用 16KB 模式后，所有用户数据及设置都会被擦除。待引导加载程序解锁后，需要进行 2 次重新启动才能启用 16KB 选项。进入该模式后，您只需重启设备 1 次便可在 4KB 模式和 16KB 模式之间来回切换。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想让设备返回到生产模式，您将需要切换回 4KB 模式并锁定 OEM/引导加载程序，这样就会将设备恢复出厂设置。请解锁引导加载程序，然后重试。如要查看详细操作说明，请访问：<a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"正在使用 4KB 页面通用模式"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"您正处于 4KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须锁定设备的引导加载程序。点按即可了解详情。"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"您正处于 4KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须锁定设备的引导加载程序。这样会再次将设备恢复出厂设置，使其还原为生产设置。待设备成功启动到 Android 系统后，在开发者选项中停用 OEM 解锁。如果设备未能启动到 Android 系统或不稳定，请使用最新出厂映像 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) 重新刷写设备，或者前往 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 选择“擦除设备数据”>“锁定引导加载程序”>“强制刷写所有分区”。"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"目前使用 16KB 页面通用模式"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"您正处于 16KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须切换回 4KB 模式并锁定设备的引导加载程序。点按即可了解详情。"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"您正处于 16KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须切换回 4KB 模式并锁定设备的引导加载程序。这样会再次将设备恢复出厂设置，使其还原为生产设置。待设备成功启动到 Android 系统后，请在开发者选项中停用 OEM 解锁功能。如果设备未能启动到 Android 系统或不稳定，请使用最新出厂映像 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) 重新刷写设备，或者前往 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 并选择“Wipe Device”“Lock Bootloader”和“Force Flash all partitions”。"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"您正处于 16KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须切换回 4KB 模式并锁定设备的引导加载程序。点按即可了解详情。"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"您正处于 16KB 页面通用模式。在该模式下，无法保证软件完整性；而且在引导加载程序处于解锁状态时，存储在手机上的所有数据都可能会面临风险。在这些模式下，某些功能会被停用，所以某些应用可能无法正常运作。如果想重新进入生产模式，您必须切换回 4KB 模式并锁定设备的引导加载程序。这样会再次将设备恢复出厂设置，使其还原为生产设置。待设备成功启动到 Android 系统后，在开发者选项中停用 OEM 解锁。如果设备未能启动到 Android 系统或不稳定，请使用最新出厂映像 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) 重新刷写设备，或者前往 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 选择“擦除设备数据”>“锁定引导加载程序”>“强制刷写所有分区”。"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16KB 页面通用模式"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"了解详情"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"Bug 报告处理程序"</string>
@@ -5009,14 +5056,14 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"使用“固定应用”"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"启用开发者选项"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"使用打印服务"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"允许多人设备共用"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"允许用户切换"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"允许, 多位, 用户, 许可, 多个, allow, multiple, user, permit, many"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"多个, 用户, 个人资料, 人员, 账号, 切换, 很多, multiple, users, profiles, people, accounts, switch, many"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"使用“无线调试”"</string>
<string name="graphics_driver_main_switch_title" msgid="6125172901855813790">"使用“显卡驱动程序偏好设置”"</string>
<string name="night_light_main_switch_title" msgid="3428298022467805219">"启用护眼模式"</string>
<string name="nfc_main_switch_title" msgid="6295839988954817432">"使用 NFC"</string>
- <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"使用自适应亮度"</string>
+ <string name="adaptive_brightness_main_switch_title" msgid="2681666805191642737">"启用自适应亮度"</string>
<string name="wifi_calling_main_switch_title" msgid="4070224008346815634">"使用“WLAN 通话”"</string>
<string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有应用"</string>
<string name="smart_forwarding_title" msgid="8368634861971949799">"智能转接"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"选择平板电脑插入基座时屏幕上显示的内容。使用屏保时，设备可能会比较耗电。"</string>
<string name="customize_button_title" msgid="1110284655990203359">"自定义"</string>
<string name="customize_button_description" msgid="7440248477266126231">"自定义“<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>”"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"您必须重新启动设备，才能启用任意形式的支持。"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"您必须重新启动设备，才能在辅助屏幕上强制使用桌面模式。"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"必须重新启动，才能实现对旧版可自由调整的窗口的支持。"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"必须重新启动，才能更改可自由调整的窗口的支持功能。"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"必须重新启动，才能在第二显示器上强制启用可自由调整的窗口。"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"立即重新启动"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"稍后重新启动"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"空间音频"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"已开启"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"已关闭"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"已开启"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"音频向左%1$d%%，向右%2$d%%"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"音频向右%1$d%%，向左%2$d%%"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"您安装的应用可以查看您的设备名称。此外，当您连接到蓝牙设备、连接到 WLAN 网络或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"语法性别"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"选择语法性别"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"在设置中搜索"</string>
</resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 221f39a..28c71fb 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"睡眠時間"</item>
+ <item msgid="4152450357280759894">"駕駛"</item>
+ <item msgid="7096549258219399423">"身歷其境"</item>
+ <item msgid="2760716776980432977">"受管理"</item>
+ <item msgid="601734478369121764">"星星"</item>
+ <item msgid="6243809315432780521">"日曆"</item>
+ <item msgid="4913577903148415331">"時間"</item>
+ <item msgid="3653377604690057780">"劇院"</item>
+ <item msgid="3843711267408385410">"花"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e9ada5e..ea58a92 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"要解除連結裝置嗎？"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"配對新裝置"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"藍牙"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自動開啟"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"助聽器設定"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"捷徑、助聽器兼容性"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"預設"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"沒有聽力師的預設設定"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"無法更新預設"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音訊輸出裝置"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"關於音訊輸出"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{開啟/ # 個應用程式可存取位置資訊}other{開啟/ # 個應用程式可存取位置資訊}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"正在載入…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"應用程式如可存取附近的裝置，就能判斷已連接裝置的相對位置。"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"應用程式如可存取附近的裝置，就能判斷已連接裝置的相對位置。"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"應用程式和服務的位置權限已關閉。當你打電話或發短訊到緊急電話號碼時，系統仍會將你的裝置位置資料傳送給救援人員。"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"進一步瞭解「位置設定」"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"如要變更設定，請前往 ChromeOS 設定 > [私隱與安全] > [私隱權設定] > [位置資料存取權]"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"已新增面孔和<xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"已新增面孔、指紋和<xliff:g id="WATCH">%s</xliff:g>"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"已新增面孔、指紋和<xliff:g id="WATCH">%s</xliff:g>"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"「身分檢查」功能已開啟，因此需要執行此步驟"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator 解鎖"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"已新增手錶"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"設定手錶"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"進一步瞭解「手錶解鎖」"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"新增手錶"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"移除手錶"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"指紋及面孔解鎖"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"面孔和指紋解鎖"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"用於工作設定檔的面孔和指紋解鎖"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"需要設定"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"已新增面孔和指紋"</string>
@@ -575,7 +576,7 @@
<string name="private_space_new_lock_message" msgid="3117703578905489206">"你需要在下一個畫面輸入裝置 PIN、圖案或密碼"</string>
<string name="private_space_auto_lock_title" msgid="8663409382910601261">"自動鎖定私人空間"</string>
<string name="private_space_auto_lock_page_summary" msgid="8679844515655838654">"裝置可在閒置一段時間後自動鎖定私人空間"</string>
- <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"每當裝置鎖定"</string>
+ <string name="private_space_auto_lock_every_time" msgid="1215061855836002830">"每當裝置鎖定時"</string>
<string name="private_space_auto_lock_after_inactivity" msgid="7107814517866649733">"螢幕逾時 5 分鐘後"</string>
<string name="private_space_auto_lock_after_device_restart" msgid="288755768725895029">"只在裝置重新啟動後"</string>
<string name="private_space_hide_page_title" msgid="3364639176511877414">"隱藏私人空間"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"安裝應用程式"</b>\n"在私人空間中安裝你想設定為私人的應用程式"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"注意事項"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"應用程式在私人空間鎖定後停止運作"</b>\n"私人空間鎖定後，當中的應用程式會停止運作，因此你不會收到這些應用程式的通知"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"私人空間不適用於需要在背景執行或傳送重要通知的應用程式，例如醫療應用程式。因為當空間鎖定時，通知和背景活動亦會隨之停止。\n\n私人空間鎖定時，當中的應用程式不會在權限管理工具、私隱資訊主頁和其他設定中顯示。\n\n私人空間無法移至新裝置。如要在其他裝置上使用私人空間，請重新設定。\n\n如果有人將裝置連接電腦，或在裝置上安裝有害的應用程式，或許能存取你的私人空間。"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"私人空間不適用於需要在背景執行或傳送重要通知的應用程式，例如醫療應用程式。因為當空間鎖定時，通知和背景活動亦會隨之停止。\n\n私人空間鎖定時，當中的應用程式不會在權限管理工具、私隱資訊主頁和其他設定中顯示。\n\n私人空間無法在新裝置上還原。如要在其他裝置上使用私人空間，請重新設定。\n\n如果有人將裝置連接電腦，或在裝置上安裝惡意應用程式，或許可存取你的私人空間。"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"進一步瞭解私人空間"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"過程需時數分鐘"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"正在設定私人空間…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"要重新啟動裝置嗎？"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"詳細 NFC 記錄僅適用於開發用途。錯誤報告中有其他 NFC 資料，可能包含私人資料。重新啟動裝置即可變更此設定。"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"重新啟動"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"鏡像, 外部顯示屏, 已連接的顯示屏, usb 顯示屏, 解像度, 旋轉"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"旋轉"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"標準"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"使用屏幕鍵盤"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"當實體鍵盤處於連接狀態時，保持在畫面上顯示"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"變更游標填滿樣式至黃色"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"變更游標填滿樣式至粉紅色"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"變更游標填滿樣式至藍色"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"游標筆劃樣式"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"白色"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"黑色"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"無"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"已選取使用者：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"語音"</string>
<string name="pointer_speed" msgid="7398649279282675718">"游標速度"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"游標比例"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"縮小游標比例"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"放大游標比例"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"遊戲控制器"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"產生震動"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"連接時令遊戲控制器產生震動"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"仍要繼續"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"取消"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大設定"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"單指平移"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"以 1 隻手指移動放大鏡"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"拖曳 1 隻手指便可在螢幕上移動"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"拖曳一隻手指即可移動放大範圍。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"拖曳兩隻手指即可移動放大範圍。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"無法用於只放大部分畫面"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"輕按按鈕即可縮放"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"快速放大螢幕畫面中的內容"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>放大螢幕畫面：</b><br/> {0,number,integer}. 用捷徑開始放大<br/> {1,number,integer}. 輕按螢幕<br/> {2,number,integer}. 用兩指拖曳畫面即可四處移動<br/> {3,number,integer}. 用兩指縮放即可調整縮放比例<br/> {4,number,integer}. 用捷徑即可停止放大<br/><br/><b>暫時放大螢幕畫面：</b><br/> {0,number,integer}. 確定放大類型已設為全螢幕<br/> {1,number,integer}. 用捷徑開始放大<br/> {2,number,integer}. 按住畫面上任何地方<br/> {3,number,integer}. 用兩指拖曳畫面即可四處移動<br/> {4,number,integer}. 提起手指即可停止放大"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>按照下列步驟放大螢幕畫面：</b><br/> {0,number,integer}。用快速鍵啟用放大功能<br/> {1,number,integer}。輕按螢幕<br/> {2,number,integer}。拖曳 2 指就可以在畫面上移動<br/> {3,number,integer}。用 2 指縮放就可以調整縮放程度<br/> {4,number,integer}。以快速鍵停用放大功能<br/><br/>你亦可以暫時放大畫面及執行其他操作。"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>按照下列步驟放大螢幕畫面：</b><br/> {0,number,integer}。用快速鍵啟用放大功能<br/> {1,number,integer}。輕按螢幕<br/> {2,number,integer}。拖曳 1 指或 2 指就可以在畫面上移動<br/> {3,number,integer}.用 2 指縮放就可以調整縮放程度<br/> {4,number,integer}。以快速鍵停用放大功能<br/><br/>你亦可以暫時放大畫面及執行其他操作。"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"開啟放大功能後，你可放大畫面。\n\n"<b>"如要縮放"</b>"，請開啟放大功能，然後輕按螢幕任何地方。\n"<ul><li>"用 2 隻或多隻手指拖曳，即可捲動螢幕"</li>\n<li>"用 2 隻或多隻手指縮放，即可調整縮放程度"</li></ul>\n\n<b>"如要暫時縮放"</b>"，請開啟放大功能，再按住螢幕任何地方。\n"<ul><li>"拖曳即可在螢幕上移動"</li>\n<li>"提起手指即可縮小至原大"</li></ul>\n\n"你無法在鍵盤或導覽列上使用放大功能。"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g> 頁中嘅第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 頁"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"無障礙功能按鈕捷徑"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"請勿騷擾"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"優先模式"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"新增模式"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"只接收重要聯絡人和應用程式的通知"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"選擇啟用類型"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"時間"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"例如：「上午 9:30 至下午 5:00」"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"日曆"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"例如：「個人日曆」"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"建立模式"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"自訂"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"減少干擾"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"開啟「請勿騷擾」模式"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"鬧鐘和媒體音效可打擾"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"時間表"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"刪除時間表"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"刪除"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"重新命名"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"刪除"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"要刪除「<xliff:g id="MODE">%1$s</xliff:g>」模式嗎？"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"編輯"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"時間表"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"預定時間"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"新增日曆"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"使用日曆"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"時間表"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"設定時間表"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"時間表"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"自動開啟"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"預定時間"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"在特定時間將手機設為靜音"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"設定「請勿騷擾」規則"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"允許發出音效的干擾"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"封鎖視覺干擾"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允許視覺訊號"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"可收到的通知"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"保持專注"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"更多操作"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{關閉}=1{關閉/可自動開啟 1 個模式}other{關閉/可自動開啟 # 個模式}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"顯示設定"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"顯示選項"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"灰階螢幕"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"啟用深色主題背景"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"將 OS 和應用程式偏好設定切換成「淺色文字配搭深色背景」。此設定或許可減少眼睛疲勞，且在部分裝置上還能節省大量電力"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"過濾干擾"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"不會過濾任何干擾"</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>
@@ -3484,6 +3524,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"開啟通知"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"允許通知延後"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"應用程式圖示上的通知圓點"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"通知組合"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"對話氣泡"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"對話氣泡"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"以對話氣泡顯示此對話"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"此應用程式不支援進階設定"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"更多設定"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"你可在應用程式中使用更多設定"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"通知緩和功能"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"套用至工作設定檔"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"套用至工作設定檔應用程式"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"類別"</string>
<string name="notification_channels_other" msgid="18159805343647908">"其他"</string>
<string name="no_channels" msgid="4716199078612071915">"此應用程式未發佈任何通知"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"顯示未使用的類別"</string>
<string name="app_settings_link" msgid="6725453466705333311">"應用程式中的其他設定"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"顯示未使用的類別"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"隱藏未使用的類別"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"可打擾的應用程式"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"選取的應用程式"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"無"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"全部"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式取代「請勿騷擾」"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外可打擾的應用程式"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"選擇更多應用程式"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"全部均不可打擾"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"沒有使用者可打擾"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"部分使用者可打擾"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"所有使用者均可打擾"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"重複來電"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"允許重複來電者"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{改為只限鬧鐘模式同埋持續 1 個鐘，直至 {time} 為止}other{改為只限鬧鐘模式同埋持續 # 個鐘，直至 {time} 為止}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"響 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>前改為只允許鬧鐘"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"變更為永遠允許干擾"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"編輯模式"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"新增模式"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自訂模式"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名稱"</string>
<string name="warning_button_text" msgid="1274234338874005639">"警告"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"關閉"</string>
<string name="device_feedback" msgid="5351614458411688608">"傳送你對這部裝置的意見"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"強制執行桌面模式"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"在次要顯示屏強制執行實驗版桌面模式"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"啟用自由形態視窗"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"啟用自由形態視窗的支援功能。"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"在次要螢幕上啟用自由形態視窗"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"只在次要螢幕上啟用自由形態視窗"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允許多重視窗模式顯示無法調整大小的應用程式"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允許透過多重視窗模式顯示無法調整大小的應用程式"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"蓋過強制深色模式"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"你需要先將此裝置的資料分區轉換為 ext4，才能使用 16 KB 開發人員選項。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在此之後需要再重新啟動一次，才能啟用 16 KB 選項。當你處於此模式時，可以在 4 KB 和 16 KB 模式之間來回切換，每次切換都要重新啟動一次。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要將裝置返回實際工作環境模式，你需要切換回 4 KB 模式並鎖定啟動程式，然後裝置就會回復原廠設定。裝置成功啟動 Android 後，請在開發人員選項中停用 OEM 解鎖設定。裝置資料將會抹除，檔案系統會在確認後變更為 ext4。完成此步驟之後，請再次返回啟用 16 KB。"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"清除所有資料"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"無法重新格式化並將資料分區抹除，變更為 ext4 檔案系統。"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"需要解鎖啟動程式才可使用 16 KB 模式"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"需要解鎖啟動程式"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"你需要先將此裝置的啟動程式解鎖，才能使用 16 KB 開發人員選項。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。啟用 16 KB 模式時，所有使用者資料和設定都將抹除。啟動程式解鎖後需要經過兩次重新啟動，才能啟用 16 KB 選項。當你處於此模式時，可以在 4 KB 和 16 KB 模式之間來回切換，每次切換都要重新啟動一次。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要將裝置返回實際工作環境模式，你需要切換回 4 KB 模式，然後原始設備製造商 (OEM)/啟動程式就會鎖定裝置 (此操作會將裝置回復原廠設定)。請解鎖啟動程式，然後再試一次。如需有關的操作指示，請瀏覽 <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"使用 4 KB 頁面通用模式"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"你目前處於頁面通用模式的 4 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須鎖定裝置的啟動程式。輕按即可閱讀更多。"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"你目前處於頁面通用模式的 4 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須鎖定裝置的啟動程式。此操作會再次將裝置回復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 後，請在開發人員選項中停用 OEM 解鎖設定。如裝置無法啟動 Android 或不穩定，請透過以下其中一種方式更新裝置：使用 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> 中的最新原廠映像，或使用 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 工具，只要選取 [抹除裝置資料]、[鎖定啟動程式] 及 [強制更新所有分區] 即可。"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"使用 16 KB 頁面通用模式"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"你目前處於頁面通用模式的 16 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須切換回 4 KB 模式，然後鎖定裝置的啟動程式。輕按即可閱讀更多。"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"你目前處於頁面通用模式的 16 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須切換回 4 KB 模式，然後鎖定裝置的啟動程式。此操作會再次將裝置回復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 後，請在開發人員選項中停用 OEM 解鎖設定。如裝置無法啟動 Android 或不穩定，請透過以下其中一種方式更新裝置：使用 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> 中的最新原廠映像，或使用 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 工具，只要選取 [抹除裝置資料]、[鎖定啟動程式] 及 [強制更新所有分區] 即可。"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"你目前處於頁面通用模式的 16 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須切換回 4 KB 模式，然後鎖定裝置的啟動程式。輕按即可閱讀更多。"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"你目前處於頁面通用模式的 16 KB 模式。在此模式中無法保證軟件完整性，在啟動程式解鎖時，儲存在手機上的任何資料都可能面臨風險。在這類模式中，部分功能會停用，因此部分應用程式無法運作。如要再次進入實際工作環境模式，你必須切換回 4 KB 模式，然後鎖定裝置的啟動程式。此操作會再次將裝置回復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 後，請在開發人員選項中停用 OEM 解鎖設定。如裝置無法啟動 Android 或不穩定，請透過以下其中一種方式更新裝置：使用 <a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a> 中的最新原廠映像，或使用 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 工具，只要選取 [抹除裝置資料]、[鎖定啟動程式] 及 [強制更新所有分區] 即可。"</string>
<string name="page_agnostic_notification_channel_name" msgid="1658444283036376361">"16 KB 頁面通用模式"</string>
<string name="page_agnostic_notification_action" msgid="2309805437430150456">"閱讀更多"</string>
<string name="bug_report_handler_title" msgid="713439959113250125">"錯誤報告處理常式"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"使用「固定應用程式」功能"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"使用開發人員選項"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"使用列印服務"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"允許多位使用者"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"允許切換使用者"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"允許, 多個, 使用者, 批准, 很多"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"多位, 使用者, 個人檔案, 人, 帳戶, 切換, 多人"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"使用「無線偵錯」功能"</string>
@@ -5123,8 +5170,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"選擇平板電腦放上插座時螢幕上顯示的內容。如果裝置使用螢幕保護程式，可能會比較耗電。"</string>
<string name="customize_button_title" msgid="1110284655990203359">"自訂"</string>
<string name="customize_button_description" msgid="7440248477266126231">"自訂<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"你需要重新開機，才能啟用任意形式的支援。"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"你需要重新開機，才能在次要螢幕上強制執行桌面模式。"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"必須重新開機，才能啟用舊的自由形態視窗支援功能"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"必須重新開機，才能變更自由形態視窗的支援功能。"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"必須重新開機，才能在次要螢幕上強制執行自由形態視窗。"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"立即重新開機"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"稍後重新開機"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"空間音訊"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"已啟用"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"已停用"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"已啟用"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"音訊 %1$d%% 左，%2$d%% 右"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"音訊 %1$d%% 右，%2$d%% 左"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"你安裝的應用程式可以取得你的裝置名稱。當你連接藍牙裝置或 Wi-Fi 網絡，或設定 Wi-Fi 熱點時，其他人亦可能會看到你的裝置名稱。"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"語法性別"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"選取語法性別"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
</resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7eccb5c..c40e6cd 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"就寢時間"</item>
+ <item msgid="4152450357280759894">"開車"</item>
+ <item msgid="7096549258219399423">"沉浸"</item>
+ <item msgid="2760716776980432977">"受管理"</item>
+ <item msgid="601734478369121764">"星星"</item>
+ <item msgid="6243809315432780521">"日曆"</item>
+ <item msgid="4913577903148415331">"時間"</item>
+ <item msgid="3653377604690057780">"劇院"</item>
+ <item msgid="3843711267408385410">"花朵"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8e597a5..57ffa8d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"要取消連結裝置嗎？"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"配對新裝置"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"藍牙"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"明天自動開啟"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"助聽器設定"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"捷徑、助聽器相容性"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"預設設定"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"沒有由聽力師預設的設定"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"無法更新預設設定"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"音訊輸出裝置"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"關於音訊輸出"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{已開啟/# 個應用程式可存取位置資訊}other{已開啟/# 個應用程式可存取位置資訊}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"載入中…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"如果應用程式具有鄰近裝置權限，就能判斷已連結裝置的相對位置。"</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"如果應用程式具有鄰近裝置權限，就能判斷連結裝置的相對位置。"</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"應用程式和服務的位置存取權已關閉。當你撥打或傳訊息到緊急電話號碼時，系統仍會將你的裝置位置資訊傳送給緊急應變人員。"</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"進一步瞭解位置資訊設定"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"如要變更，請前往 ChromeOS 設定 >「隱私權和安全性」>「隱私權控制項」>「位置資訊存取權」"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"已新增臉孔和「<xliff:g id="WATCH">%s</xliff:g>」"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"已新增臉孔、指紋和「<xliff:g id="WATCH">%s</xliff:g>」"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"已新增臉孔、指紋和「<xliff:g id="WATCH">%s</xliff:g>」"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"身分檢查已開啟，因此必須進行生物特徵辨識驗證"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Remote Authenticator 解鎖"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"已新增智慧手錶"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"設定智慧手錶"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"進一步瞭解「智慧手錶解鎖」功能"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"新增智慧手錶"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"移除智慧手錶"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"指紋與人臉解鎖"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"人臉和指紋解鎖"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"人臉和指紋解鎖 (工作資料夾)"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"需要設定"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"已新增臉孔和指紋"</string>
@@ -567,7 +568,7 @@
<string name="private_space_face_enroll_introduction_info_looking" msgid="5694757845303924042">"只要看著手機，就可能會讓私人空間意外解鎖。此外，長相與你十分相似的人 (例如孿生兄弟姐妹)，或有人將裝置拿到你的面前，都有可能會將私人空間解鎖。"</string>
<string name="private_space_face_enroll_introduction_info_less_secure" msgid="8460719783943533172">"使用複雜的圖案、PIN 碼或密碼解鎖私人空間，可能比使用人臉解鎖來得安全"</string>
<string name="private_space_face_settings_require_attention_details" msgid="2799569069549999689">"眼睛必須睜開，才能解鎖私人空間。為求順利解鎖，建議取下太陽眼鏡。"</string>
- <string name="private_space_face_settings_footer" msgid="7722256209563543711">"臉孔可用於解鎖私人空間。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將裝置對著你的臉，私人空間可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的私人空間。"</string>
+ <string name="private_space_face_settings_footer" msgid="7722256209563543711">"你可以用臉孔解鎖私人空間。\n\n注意事項：\n一次只能設定一張臉孔。如要新增其他臉孔，請刪除目前設定的臉孔。\n\n看著手機時，可能會意外解鎖手機。\n\n如果有人將裝置對著你的臉，私人空間也可能會因此解鎖。\n\n長相與你十分相似的人 (例如孿生兄弟姐妹) 或許可以解鎖你的私人空間。"</string>
<string name="private_space_face_settings_require_confirmation_details" msgid="5406498664903812249">"使用人臉解鎖功能時，一律執行確認步驟"</string>
<string name="private_space_category_ways_to_unlock" msgid="4356631225316950046">"解鎖方式"</string>
<string name="private_space_screen_lock_summary" msgid="394837965365561070">"與裝置螢幕鎖定相同"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"安裝應用程式"</b>\n"在空間中安裝想保密的應用程式"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"注意事項"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"應用程式會在空間鎖定後停止運作"</b>\n"空間鎖定之後，當中的應用程式將停止運作，你不會收到這些應用程式的通知"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"私人空間不適用於需要在背景執行或傳送重要通知的應用程式，例如醫療應用程式。因為當空間鎖定時，通知和背景活動也會隨之停止。\n\n私人空間鎖定時，其中的應用程式不會顯示在權限管理工具、隱私資訊主頁和其他設定中。\n\n私人空間無法移到新裝置。如要在其他裝置上使用私人空間，請重新設定。\n\n如果有人將裝置接上電腦，或在裝置上安裝有害的應用程式，或許能夠存取你的私人空間。"</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"私人空間不適用於需要在背景執行或傳送重要通知的應用程式，例如醫療應用程式。因為當空間鎖定時，通知和背景活動也會隨之停止。\n\n私人空間鎖定時，其中的應用程式不會顯示在權限管理工具、隱私資訊主頁和其他設定中。\n\n私人空間無法在新裝置上還原。如要在其他裝置上使用私人空間，請重新設定。\n\n如果有人將裝置接上電腦，或在裝置上安裝惡意應用程式，或許能夠存取你的私人空間。"</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"進一步瞭解私人空間"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"請稍待片刻"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"正在設定私人空間…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"要重新啟動裝置嗎？"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"詳細 NFC 記錄僅適用於開發用途。錯誤報告中含有其他 NFC 資料，其中可能包含私人資訊。重新啟動裝置即可變更這項設定。"</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"重新啟動"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"鏡像, 外接螢幕, 已連線的螢幕, usb 螢幕, 解析度, 旋轉"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"旋轉"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"標準"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,7 +1206,8 @@
<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_description" msgid="6807117118142381193">"系統會根據你的所在環境和從事的活動自動調整螢幕亮度。你可以手動移動滑桿，協助自動調整亮度功能記憶你所偏好的亮度。"</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>
<string name="display_white_balance_title" msgid="2624544323029364713">"螢幕白平衡"</string>
@@ -1897,14 +1912,14 @@
<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="show_ime" msgid="4334255501724746849">"使用螢幕小鍵盤"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"使用實體鍵盤時仍繼續顯示螢幕小鍵盤"</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="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="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="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>
@@ -1929,6 +1944,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"將指標填滿樣式變更為黃色"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"將指標填滿樣式變更為粉紅色"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"將指標填滿樣式變更為藍色"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"游標軌跡樣式"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"白色"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"黑色"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"無"</string>
<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>
@@ -1972,6 +1991,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"使用者選取：<xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"語音"</string>
<string name="pointer_speed" msgid="7398649279282675718">"游標速度"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"指標比例"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"縮小指標比例"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"放大指標比例"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"遊戲控制器"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"產生震動"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"連接時使遊戲控制器產生震動"</string>
@@ -2094,7 +2116,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"仍要繼續"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"取消"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大功能設定"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"單指平移"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"用 1 指移動放大鏡"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"用 1 指在畫面上拖曳放大區域"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"拖曳單指即可移動放大區域。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"拖曳雙指即可移動放大區域。"</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"只放大部分畫面時無法使用"</string>
@@ -2118,6 +2141,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"輕觸按鈕即可縮放"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"快速放大螢幕畫面中的內容"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>放大螢幕畫面的方法如下：</b><br/> {0,number,integer}. 使用捷徑啟動放大功能<br/> {1,number,integer}. 輕觸螢幕<br/> {2,number,integer}. 拖曳 2 指即可四處移動畫面<br/> {3,number,integer}. 使用 2 指撥動即可調整縮放等級<br/> {4,number,integer}. 使用捷徑關閉放大功能<br/><br/> <b>暫時放大螢幕畫面的方法如下：</b><br/> {0,number,integer}. 確認放大類型已設為全螢幕<br/> {1,number,integer}. 使用捷徑啟動放大功能<br/> {2,number,integer}. 按住螢幕上的任一處<br/> {3,number,integer}. 拖曳手指即可四處移動畫面<br/> {4,number,integer}. 移開手指即可關閉放大功能"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>放大畫面的方法如下：</b><br/>{0,number,integer}. 使用捷徑啟動放大功能<br/>{1,number,integer}. 輕觸螢幕<br/>{2,number,integer}. 用 2 指在畫面上拖曳放大區域<br/>{3,number,integer}. 用 2 指撥動調整縮放等級<br/>{4,number,integer}. 使用捷徑關閉放大功能<br/><br/>你也可以暫時放大畫面及執行其他操作。"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>放大畫面的方法如下：</b><br/>{0,number,integer}. 使用捷徑啟動放大功能<br/>{1,number,integer}. 輕觸螢幕<br/>{2,number,integer}. 用 1 或 2 指在畫面上拖曳放大區域<br/> {3,number,integer}. 用 2 指撥動調整縮放等級<br/>{4,number,integer}. 使用捷徑關閉放大功能<br/><br/>你也可以暫時放大畫面及執行其他操作。"</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"放大功能啟用後，你可以放大畫面上的內容。\n\n"<b>"如要進行縮放"</b>"，請開啟放大功能，然後輕觸畫面上的任何位置。\n"<ul><li>"使用兩指或多指以拖曳的方式捲動畫面"</li>\n<li>"使用兩指或多指撥動以調整縮放大小"</li></ul>\n\n<b>"如要暫時放大畫面"</b>"，請開啟放大功能，然後按住畫面上的任何位置。\n"<ul><li>"使用手指拖曳可瀏覽畫面的不同部分"</li>\n<li>"放開手指即可縮小"</li></ul>\n\n"你無法放大鍵盤和導覽列部分。"</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"第 <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> 頁，共 <xliff:g id="NUM_PAGES">%2$d</xliff:g> 頁"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"無障礙工具按鈕捷徑"</string>
@@ -2189,7 +2214,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">"<b>詳細步驟</b><br/> {0,number,integer}. 開啟無障礙設定<br/> {1,number,integer}. 選取功能並輕觸捷徑<br/> {2,number,integer}. 選擇是否要透過按鈕或手勢執行該功能<br/>"</string>
+ <string name="accessibility_button_gesture_description" msgid="1141723096904904336">"<b>詳細步驟</b><br/> {0,number,integer}. 開啟無障礙設定<br/> {1,number,integer}. 選取功能並輕觸捷徑<br/> {2,number,integer}. 選擇你要用按鈕或手勢來啟動該功能<br/>"</string>
<string name="accessibility_button_description" msgid="7669538706120092399">"<b>詳細步驟</b><br/> {0,number,integer}. 開啟無障礙設定<br/> {1,number,integer}. 選取功能並輕觸捷徑<br/> {2,number,integer}. 選擇要用來執行該功能的按鈕<br/>"</string>
<string name="accessibility_button_or_gesture_title" msgid="3510075963401163529">"使用按鈕或手勢"</string>
<string name="accessibility_button_location_title" msgid="7182107846092304942">"位置"</string>
@@ -3314,7 +3339,7 @@
<string name="live_caption_title" msgid="8617086825712756983">"即時字幕"</string>
<string name="live_caption_summary" msgid="2898451867595161809">"自動產生媒體字幕"</string>
<string name="spatial_audio_wired_headphones" msgid="2237355789145828648">"有線耳機"</string>
- <string name="spatial_audio_text" msgid="8201387855375146000">"相容媒體裝置可提供更有臨場感的音效"</string>
+ <string name="spatial_audio_text" msgid="8201387855375146000">"相容媒體裝置音效更具臨場感"</string>
<string name="spatial_summary_off" msgid="8272678804629774378">"已關閉"</string>
<string name="spatial_summary_on_one" msgid="6239933399496282994">"已開啟/<xliff:g id="OUTPUT_DEVICE">%1$s</xliff:g>"</string>
<string name="spatial_summary_on_two" msgid="4526919818832483883">"已開啟/<xliff:g id="OUTPUT_DEVICE_0">%1$s</xliff:g>和<xliff:g id="OUTPUT_DEVICE_1">%2$s</xliff:g>"</string>
@@ -3323,13 +3348,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"零打擾"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"優先模式"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"新增模式"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"僅接收重要聯絡人和應用程式的通知"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"選取啟動類型"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"時間"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"例如：「上午 9:30 – 下午 5:00」"</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"日曆"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"例如：「個人日曆」"</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"建立模式"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"自訂"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"降低干擾"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"開啟「零打擾」模式"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"鬧鐘和媒體音效例外"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"排程"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"刪除排程"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"刪除"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"重新命名"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"刪除"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"要刪除「<xliff:g id="MODE">%1$s</xliff:g>」模式嗎？"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"編輯"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"排程"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"排程"</string>
@@ -3337,12 +3376,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"新增日曆"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"使用日曆"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"安排時間"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"設定時間表"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"安排時間"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"<xliff:g id="HOURS">%1$d</xliff:g> 小時 <xliff:g id="MINUTES">%2$d</xliff:g> 分鐘"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"自動開啟"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"排程"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"在特定時間將手機設為靜音"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"設定「零打擾」規則"</string>
@@ -3352,8 +3389,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"允許發出音效的干擾"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"封鎖視覺干擾"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"允許視覺信號"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"可收到的通知"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"保持專注"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"其他動作"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{關閉}=1{關閉/可自動開啟 1 個模式}other{關閉/可自動開啟 # 個模式}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"顯示設定"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"顯示選項"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"灰階"</string>
@@ -3369,6 +3407,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"啟用深色主題"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"將作業系統和應用程式偏好設定切換成「淺色文字搭配深色背景」。這項設定或許可以降低眼睛負擔，而且在某些裝置上還能節省大量電力"</string>
<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="mode_notification_filter_title" msgid="443728483176031977">"篩選干擾"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"不篩選任何干擾"</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>
@@ -3459,7 +3499,7 @@
<string name="conversation_notifs_category" msgid="2549844862379963273">"對話"</string>
<string name="general_notification_header" msgid="3669031068980713359">"管理"</string>
<string name="app_notification_field" msgid="3208079070539894909">"應用程式通知"</string>
- <string name="app_notification_field_summary" msgid="5981393613897713471">"控管個別應用程式的通知"</string>
+ <string name="app_notification_field_summary" msgid="5981393613897713471">"管理個別應用程式的通知"</string>
<string name="advanced_section_header" msgid="6478709678084326738">"一般"</string>
<string name="profile_section_header" msgid="4970209372372610799">"工作通知"</string>
<string name="profile_section_header_for_advanced_privacy" msgid="8385775428904838579">"工作資料夾"</string>
@@ -3473,7 +3513,7 @@
<string name="asst_importance_reset_summary" msgid="684794589254282667">"重設使用者變更的重要設定，並允許通知助理優先處理"</string>
<string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議採取的動作和回覆"</string>
<string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議採取的動作和回覆"</string>
- <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期通知和已延後的通知"</string>
+ <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期和延後的通知"</string>
<string name="notification_history" msgid="8663811361243456201">"通知記錄"</string>
<string name="notification_history_toggle" msgid="9093762294928569030">"使用通知記錄"</string>
<string name="notification_history_off_title_extended" msgid="853807652537281601">"通知記錄已關閉"</string>
@@ -3482,8 +3522,9 @@
<string name="history_toggled_on_summary" msgid="9034278971358282728">"近期通知和已延後的通知會顯示在這裡"</string>
<string name="notification_history_view_settings" msgid="5269317798670449002">"查看通知設定"</string>
<string name="notification_history_open_notification" msgid="2655071846911258371">"開啟通知"</string>
- <string name="snooze_options_title" msgid="2109795569568344617">"允許顯示通知延後選項"</string>
- <string name="notification_badging_title" msgid="5469616894819568917">"應用程式圖示上的通知圓點"</string>
+ <string name="snooze_options_title" msgid="2109795569568344617">"顯示延後通知"</string>
+ <string name="notification_badging_title" msgid="5469616894819568917">"顯示應用程式圖示的通知圓點"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"通知組合"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"對話框"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"對話框"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"以對話框形式顯示這個對話"</string>
@@ -3504,7 +3545,7 @@
<string name="bubble_app_setting_bubble_conversation" msgid="1461981680982964285">"開啟這個對話的對話框功能"</string>
<string name="swipe_direction_ltr" msgid="5137180130142633085">"向右滑動即可關閉，向左滑動即可顯示選單"</string>
<string name="swipe_direction_rtl" msgid="1707391213940663992">"向左滑動即可關閉，向右滑動即可顯示選單"</string>
- <string name="silent_notifications_status_bar" msgid="6113307620588767516">"在狀態列隱藏設為靜音的通知"</string>
+ <string name="silent_notifications_status_bar" msgid="6113307620588767516">"在狀態列隱藏靜音通知"</string>
<string name="notification_pulse_title" msgid="8013178454646671529">"閃爍燈光"</string>
<string name="lock_screen_notifications_title" msgid="2876323153692406203">"隱私設定"</string>
<string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過螢幕鎖定畫面"</string>
@@ -3516,10 +3557,10 @@
<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>
- <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"隱藏已設為靜音的對話和通知"</string>
+ <string name="lock_screen_notifs_show_alerting" msgid="6584682657382684566">"隱藏設為靜音的對話和通知"</string>
<string name="lock_screen_notifs_show_none" msgid="1941044980403067101">"不要顯示任何通知"</string>
<string name="lock_screen_notifs_redact" msgid="9024158855454642296">"敏感通知"</string>
- <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"鎖定時顯示敏感內容"</string>
+ <string name="lock_screen_notifs_redact_summary" msgid="1395483766035470612">"螢幕鎖定時顯示敏感內容"</string>
<string name="lock_screen_notifs_redact_work" msgid="3833920196569208430">"敏感工作資料夾通知"</string>
<string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"鎖定時顯示敏感工作資料夾內容"</string>
<string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"顯示所有通知內容"</string>
@@ -3577,9 +3618,9 @@
<string name="notifications_sent_weekly" msgid="7895656213187555346">"{count,plural, =1{每週約 # 則通知}other{每週約 # 則通知}}"</string>
<string name="notifications_sent_never" msgid="9081278709126812062">"永遠不要"</string>
<string name="manage_notification_access_title" msgid="4154723216570646451">"閱讀、回覆及控制通知"</string>
- <string name="manage_notification_access_summary" msgid="2907135226478903997">"控管可以讀取通知的應用程式和裝置"</string>
+ <string name="manage_notification_access_summary" msgid="2907135226478903997">"管理可讀取通知的應用程式和裝置"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"管理員已禁止存取工作資料夾通知"</string>
- <string name="notification_assistant_title" msgid="5889201903272393099">"加強型通知"</string>
+ <string name="notification_assistant_title" msgid="5889201903272393099">"進階通知"</string>
<string name="notification_assistant_summary" msgid="1957783114840908887">"接收建議的操作、回覆等內容"</string>
<string name="no_notification_assistant" msgid="2533323397091834096">"無"</string>
<string name="no_notification_listeners" msgid="2839354157349636000">"最近沒有已安裝的應用程式要求「通知」存取權。"</string>
@@ -3613,11 +3654,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"這個應用程式不支援加強型設定"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"更多設定"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"應用程式內提供更多設定"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"通知緩和功能"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<string name="notification_polite_work" msgid="8823596456640216391">"套用至工作資料夾"</string>
<string name="notification_polite_work_summary" msgid="5014189280132951378">"套用到工作資料夾應用程式"</string>
@@ -3665,6 +3705,7 @@
<string name="notification_channels" msgid="1502969522886493799">"類別"</string>
<string name="notification_channels_other" msgid="18159805343647908">"其他"</string>
<string name="no_channels" msgid="4716199078612071915">"這個應用程式未發布任何通知"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"顯示未使用的類別"</string>
<string name="app_settings_link" msgid="6725453466705333311">"應用程式中的其他設定"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"顯示未使用的類別"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"隱藏未使用的類別"</string>
@@ -3773,7 +3814,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"例外的應用程式"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"所選應用程式"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"無"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"全部"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<string name="zen_mode_bypassing_apps" msgid="625309443389126481">"允許應用程式覆寫"</string>
<string name="zen_mode_bypassing_apps_header" msgid="60083006963906906">"例外的應用程式"</string>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"選取更多應用程式"</string>
@@ -3791,6 +3836,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"沒有音效例外"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"沒有人例外"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"某些人例外"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"重複來電者"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"允許顯示重複來電者"</string>
@@ -3810,12 +3857,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{變更為僅限鬧鐘模式並持續 1 小時，結束時間為 {time}}other{變更為僅限鬧鐘模式並持續 # 小時，結束時間為 {time}}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"變更為僅允許鬧鐘模式，結束時間為 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"變更為一律允許干擾模式"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"編輯模式"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"新增模式"</string>
+ <string name="zen_mode_new_custom_default_name" msgid="2778307946775085105">"自訂模式"</string>
+ <string name="zen_mode_edit_name_hint" msgid="4584652062167540536">"模式名稱"</string>
<string name="warning_button_text" msgid="1274234338874005639">"警告"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"關閉"</string>
<string name="device_feedback" msgid="5351614458411688608">"傳送你對這個裝置的意見"</string>
@@ -4022,10 +4067,10 @@
<string name="ignore_optimizations_off_desc" msgid="3324571675983286177">"建議使用以延長電池續航力"</string>
<string name="app_list_preference_none" msgid="1635406344616653756">"無"</string>
<string name="work_profile_usage_access_warning" msgid="3477719910927319122">"即使關閉此應用程式的使用記錄存取功能，你的管理員仍可存取工作資料夾中應用程式的數據用量"</string>
- <string name="draw_overlay" msgid="7902083260500573027">"顯示在其他應用程式上層"</string>
- <string name="system_alert_window_settings" msgid="6458633954424862521">"顯示在其他應用程式上層"</string>
- <string name="permit_draw_overlay" msgid="4468994037192804075">"允許顯示在其他應用程式上層"</string>
- <string name="allow_overlay_description" msgid="1607235723669496298">"允許這個應用程式顯示在畫面上層，遮住其他的應用程式。該應用程式將可知道你輕觸的位置或變更畫面上顯示的內容。"</string>
+ <string name="draw_overlay" msgid="7902083260500573027">"重疊顯示於其他應用程式上方"</string>
+ <string name="system_alert_window_settings" msgid="6458633954424862521">"重疊顯示於其他應用程式上方"</string>
+ <string name="permit_draw_overlay" msgid="4468994037192804075">"允許重疊顯示於其他應用程式上方"</string>
+ <string name="allow_overlay_description" msgid="1607235723669496298">"允許這個應用程式重疊顯示在其他正在使用的應用程式上方。這個應用程式將能偵測你輕觸的位置，或變更畫面上顯示的內容。"</string>
<string name="media_routing_control_title" msgid="6402800638960066807">"變更媒體輸出"</string>
<string name="allow_media_routing_control" msgid="4907036637509360616">"允許應用程式切換媒體輸出"</string>
<string name="allow_media_routing_description" msgid="8343709701298051207">"允許這個應用程式選擇要使用哪一部連結的裝置播放其他應用程式的音訊或影片。如果允許，這個應用程式可以存取清單中的可用裝置 (例如耳機和音箱)，並選擇要使用哪一部輸出裝置串流播放或投放音訊或影片。"</string>
@@ -4041,7 +4086,7 @@
<string name="media_management_apps_description" msgid="8000565658455268524">"如果允許，這個應用程式就能直接修改或刪除使用其他應用程式建立的媒體檔案，不用事先取得你的同意。應用程式必須先獲得權限才能存取檔案和媒體。"</string>
<string name="keywords_media_management_apps" msgid="7499959607583088690">"媒體, 檔案, 管理, 管理員, 編輯, 編輯器, 應用程式, 程式"</string>
<string name="keywords_vr_listener" msgid="902737490270081131">"vr 虛擬實境 接聽器 音響 小幫手 服務"</string>
- <string name="overlay_settings" msgid="2030836934139139469">"顯示在其他應用程式上層"</string>
+ <string name="overlay_settings" msgid="2030836934139139469">"重疊顯示於其他應用程式上方"</string>
<string name="filter_overlay_apps" msgid="2483998217116789206">"具備權限的應用程式"</string>
<string name="app_permission_summary_allowed" msgid="1155115629167757278">"允許"</string>
<string name="app_permission_summary_not_allowed" msgid="2673793662439097900">"不允許"</string>
@@ -4801,8 +4846,10 @@
<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="force_desktop_mode" msgid="1336913605091334238">"強制使用桌面模式"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"在次要顯示器上強制使用桌面模式實驗性功能"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"啟用自由形式視窗"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"啟用自由形式視窗支援功能。"</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"在第二個螢幕上啟用自由形式視窗功能"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"只在第二個螢幕上啟用自由形式視窗功能。"</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"允許多視窗模式顯示無法調整大小的應用程式"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"允許透過多視窗模式顯示無法調整大小的應用程式"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"覆寫強制使用深色模式的功能"</string>
@@ -4870,14 +4917,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"必須先將這部裝置的資料分區轉換為 ext4，才能使用 16KB 開發人員選項。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。在此之後還必須再重新啟動一次，才能啟用 16KB 選項。當你處於此模式時，可以在 4KB 和 16KB 模式之間來回切換，每次切換都要重新啟動一次。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要返回實際工作環境模式，必須切換回 4KB 模式並鎖定系統啟動載入程式，裝置就會恢復原廠設定。裝置成功啟動 Android 系統後，請在開發人員選項中停用 OEM 解鎖設定。裝置資料將會抹除，檔案系統會在確認後變更為 ext4。完成此步驟之後，請再次返回啟用 16KB。"</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"清除所有資料"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"無法抹除資料分區並重新格式化為 ext4。"</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"如要啟用 16KB 模式，需解鎖系統啟動載入程式"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"必須解鎖系統啟動載入程式"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"必須先將這部裝置的系統啟動載入程式解鎖，才能使用 16KB 開發人員選項。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。啟用 16KB 模式時，所有使用者資料和設定都將抹除。系統啟動載入程式解鎖後，需要經過兩次重新啟動，才能啟用 16KB 選項。當你處於此模式時，可以在 4KB 和 16KB 模式之間來回切換，每次切換都要重新啟動一次。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要返回實際工作環境模式，必須切換回 4KB 模式，OEM/系統啟動載入程式就會鎖定裝置，裝置也將恢復原廠設定。請解鎖系統啟動載入程式，然後再試一次。操作方法如以下網址說明：<a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"目前使用 4KB 可變頁面模式"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"你目前處於可變頁面模式的 4KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，你必須鎖定裝置的系統啟動載入程式。輕觸即可閱讀更多內容。"</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"你目前處於可變頁面模式的 4KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，你必須鎖定裝置的系統啟動載入程式。這樣做會使裝置再次恢復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 系統後，請在開發人員選項中停用 OEM 解鎖設定。如果裝置無法啟動 Android 或狀態不穩，可透過以下任一方式重新刷新裝置：使用最新原廠映像檔 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) 或 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 工具，依序選取「Wipe Device」、「Lock Bootloader」和「Force Flash all partitions」。"</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"目前使用 16KB 可變頁面模式"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"你目前處於可變頁面模式的 16KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，你必須切換回 4K 模式，然後鎖定裝置的系統啟動載入程式。輕觸即可閱讀更多內容。"</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"你目前處於可變頁面模式的 16KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能面臨風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，你必須切換回 4K 模式，然後鎖定裝置的系統啟動載入程式。這樣做會使裝置再次恢復原廠設定，並將裝置還原為實際工作環境設定。裝置成功啟動 Android 系統後，請在開發人員選項中停用 OEM 解鎖設定。如果裝置無法啟動 Android 或狀態不穩，可透過以下任一方式重新刷新裝置：使用最新原廠映像檔 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>) 或 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 工具，依序選取「Wipe Device」、「Lock Bootloader」和「Force Flash all partitions」。"</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"你目前處於可變頁面模式的 16KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能會有風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，必須切換回 4KB 模式，然後鎖定裝置的系統啟動載入程式。輕觸即可閱讀完整內容。"</string>
+ <string name="page_agnostic_16k_pages_text" msgid="2999817238546170627">"你目前處於可變頁面模式的 16KB 模式。此模式無法保證軟體完整性，且系統啟動載入程式解鎖時，手機上的資料可能會有風險。在這類模式中，部分功能會停用，因此有些應用程式可能無法運作。如要再次進入實際工作環境模式，必須切換回 4KB 模式，然後鎖定裝置的系統啟動載入程式。這樣做會使裝置再次恢復原廠設定，並還原為實際工作環境設定。裝置成功啟動 Android 系統後，請停用「開發人員選項」中的「OEM 解鎖」設定。如果裝置無法啟動 Android 或狀態不穩，可透過以下任一方式重新刷新裝置：使用最新原廠映像檔 (<a href=\"https://developers.google.com/android/images\">https://developers.google.com/android/images</a>)，或前往 <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 使用工具，依序選取「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="bug_report_handler_title" msgid="713439959113250125">"錯誤報告處理常式"</string>
@@ -5009,7 +5056,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"使用應用程式固定功能"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"使用開發人員選項"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"使用列印服務"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"允許多位使用者"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"允許切換使用者"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"允許, 多位, 使用者, 許可, 數位"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"多位, 使用者, 個人資料, 人, 帳戶, 切換, 多人"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"使用無線偵錯功能"</string>
@@ -5123,12 +5170,13 @@
<string name="dream_setup_description" msgid="7508547154038580296">"選擇平板電腦插入座架時螢幕上要顯示的內容。請注意，如果裝置使用螢幕保護程式，可能會比較耗電。"</string>
<string name="customize_button_title" msgid="1110284655990203359">"自訂"</string>
<string name="customize_button_description" msgid="7440248477266126231">"自訂「<xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>」"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"必須重新啟動才能啟用任意形式的支援。"</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"必須重新啟動才能在次要螢幕上強制執行桌面模式。"</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"必須重新啟動，才能啟用舊版自由形式視窗支援功能。"</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"必須重新啟動，才能變更自由形式視窗支援功能。"</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"必須重新啟動，才能強制在第二個螢幕上使用自由形式視窗功能。"</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"立即重新啟動"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"稍後重新啟動"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"空間音訊"</string>
- <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"相容媒體裝置可提供更有臨場感的音效"</string>
+ <string name="bluetooth_details_spatial_audio_summary" msgid="5026859623681482668">"相容媒體裝置音效更具臨場感"</string>
<string name="bluetooth_details_head_tracking_title" msgid="5416972521040337799">"頭部追蹤"</string>
<string name="bluetooth_details_head_tracking_summary" msgid="3942238746595985395">"音訊會隨著你轉動頭部而變化，因此聽起來更自然"</string>
<string name="bluetooth_details_permissions_sync_title" msgid="7277580382321003521">"同步處理手機的權限"</string>
@@ -5242,6 +5290,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"已啟用"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"已停用"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"已啟用"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"音訊 %1$d%% 左，%2$d%% 右"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"音訊 %1$d%% 右，%2$d%% 左"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"你安裝的應用程式會取得裝置名稱。如果你連上藍牙裝置、Wi-Fi 網路或者設定 Wi-Fi 無線基地台，其他人也可能會看到裝置名稱。"</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"語法性別"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"選取語法性別"</string>
@@ -5353,4 +5403,5 @@
<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="homepage_search" msgid="6759334912284663559">"搜尋設定"</string>
</resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 353c8ef..85fd081 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -498,4 +498,17 @@
<!-- no translation found for private_space_auto_lock_options:0 (551584871228110817) -->
<!-- no translation found for private_space_auto_lock_options:1 (3263162333754809690) -->
<!-- no translation found for private_space_auto_lock_options:2 (1575103586471380629) -->
+ <string-array name="zen_mode_icon_options_descriptions">
+ <item msgid="6386593780953863398">"Isikhathi sokulala"</item>
+ <item msgid="4152450357280759894">"Ukushayela"</item>
+ <item msgid="7096549258219399423">"Okugxilile"</item>
+ <item msgid="2760716776980432977">"Kuphethwe"</item>
+ <item msgid="601734478369121764">"Inkanyezi"</item>
+ <item msgid="6243809315432780521">"Ikhalenda"</item>
+ <item msgid="4913577903148415331">"Isikhathi"</item>
+ <item msgid="3653377604690057780">"Itiyetha"</item>
+ <item msgid="3843711267408385410">"Imbali"</item>
+ </string-array>
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 88c23d2..44eee6b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -65,8 +65,7 @@
<string name="bluetooth_disconnect_title" msgid="4581951246357823044">"Nqamula idivayisi?"</string>
<string name="bluetooth_pairing_pref_title" msgid="3497193027590444598">"Bhangqa idivayisi entsha"</string>
<string name="keywords_add_bt_device" msgid="4533191164203174011">"i-bluetooth"</string>
- <!-- no translation found for bluetooth_screen_auto_on_title (2203993262483477532) -->
- <skip />
+ <string name="bluetooth_screen_auto_on_title" msgid="2203993262483477532">"Vula ngokuzenzekelayo kusasa"</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>
@@ -77,6 +76,7 @@
<string name="bluetooth_hearing_device_settings_title" msgid="6060072560486755057">"Amasethingi ensizakuzwa"</string>
<string name="bluetooth_hearing_device_settings_summary" msgid="3822646075744075158">"Isinqamuleli, ukuhambisana kwensiza yokuzwa"</string>
<string name="bluetooth_hearing_aids_presets" msgid="4615094985857156388">"Ukusetha ngaphambilini"</string>
+ <string name="bluetooth_hearing_aids_presets_empty_list_message" msgid="4240241268432643259">"Akukho ukusethwa ngaphambilini okuhlelwe i-audiologist yakho"</string>
<string name="bluetooth_hearing_aids_presets_error" msgid="2095249829735188484">"Ayikwazanga ukubuyekeza ukusetha ngaphambilini"</string>
<string name="bluetooth_audio_routing_title" msgid="5541729245424856226">"Okukhishwayo komsindo"</string>
<string name="bluetooth_audio_routing_about_title" msgid="5773336779246891954">"Mayelana nokuphumayo komsindo"</string>
@@ -283,7 +283,7 @@
<string name="location_settings_summary_location_off" msgid="4797932754681162262">"Valiwe"</string>
<string name="location_settings_summary_location_on" msgid="4273299717586679786">"{count,plural, =1{Ivuliwe / i-app e-# enokufinyelela endaweni}one{Ivuliwe / ama-app angu-# anokufinyelela endaweni}other{Ivuliwe / ama-app angu-# anokufinyelela endaweni}}"</string>
<string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Iyalayisha…"</string>
- <string name="location_settings_footer_general" msgid="1040507068701188821">"Ama-app anemvume Yamadivayisi aeseduze angakhetha indawo ehambelanayo yamadivayisi axhunyiwe."</string>
+ <string name="location_settings_footer_general" msgid="3447585552176173502">"Ama-app anamadivayisi anemvume eseduze anganquma indawo ehambelanayo yamadivayisi axhunyiwe."</string>
<string name="location_settings_footer_location_off" msgid="8568995909147566720">"Ukufinyelela kwendawo kuvaliwe mayelana nama-app namasevisi. Indawo yedivayisi yakho isengathunyelwa kubaphenduli besimo esiphuthumayo uma ushaya ikholi noma uthumela umbhalo kwinombolo ephuthumayo."</string>
<string name="location_settings_footer_learn_more_content_description" msgid="349380666660145540">"Funda kabanzi Ngamasethingi wendawo"</string>
<string name="location_settings_tooltip_text_for_chrome" msgid="5781821709250544575">"Ukuze ushintshe iya kokuthi Amasethingi e-ChromeOS bese uya kokuthi Ubumfihlo nokuvikeleka bese uya kokuthi Izilawulo zobumfihlo bese uya kokuthi Ukufinyelela indawo"</string>
@@ -410,6 +410,7 @@
<string name="security_settings_face_watch_preference_summary" msgid="5817376447253802793">"Ubuso ne-<xliff:g id="WATCH">%s</xliff:g> zingeziwe"</string>
<string name="security_settings_fingerprint_single_face_watch_preference_summary" msgid="764951912234638192">"Ubuso, isigxivizo somunwe, ne-<xliff:g id="WATCH">%s</xliff:g> kungeziwe"</string>
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary" msgid="3935500711366489380">"Ubuso, izigxivizo zomunwe, ne-<xliff:g id="WATCH">%s</xliff:g> kungeziwe"</string>
+ <string name="mandatory_biometrics_prompt_description" msgid="5461737411954922392">"Lokhu kuyadingeka njengoba Ukuhlola Ubuwena kuvuliwe"</string>
<string name="security_settings_remoteauth_preference_title" msgid="8319680328086089533">"Ukuvula Isiqinisekisi Serimothi"</string>
<string name="security_settings_remoteauth_preference_summary" msgid="1507004469316635196">"Iwashi lifakiwe"</string>
<string name="security_settings_remoteauth_enroll_introduction_title" msgid="2151004795778999671">"Setha iwashi lakho"</string>
@@ -437,7 +438,7 @@
<string name="security_settings_remoteauth_settings_learn_more" msgid="5653556124819260050">"Funda kabanzi mayelana Nokuvula Iwashi"</string>
<string name="security_settings_remoteauth_settings_register_new_authenticator" msgid="9191331738306527887">"Faka iwashi"</string>
<string name="security_settings_remoteauth_settings_remove_device" msgid="2436226120578851282">"Susa iwashi"</string>
- <string name="security_settings_biometric_preference_title" msgid="5012627247749093938">"Isigxivizo somunwe Nokuvula Ngobuso"</string>
+ <string name="security_settings_biometric_preference_title" msgid="298146483579539448">"Ukuvula ngobuso nangesigxivizo somunwe"</string>
<string name="security_settings_work_biometric_preference_title" msgid="3121755615533533585">"Ukuvula Ngobuso Nangesigxivizo Somunwe emsebenzini"</string>
<string name="security_settings_biometric_preference_summary_none_enrolled" msgid="213377753727694575">"Ukusetha kuyadingeka"</string>
<string name="security_settings_biometric_preference_summary_both_fp_multiple" msgid="4821859306609955966">"Ubuso nezigxivizo zeminwe kungeziwe"</string>
@@ -614,10 +615,8 @@
<string name="private_space_install_apps_text" msgid="8072027796190028830"><b>"Faka ama-app"</b>\n"Faka ama-app ofuna ukuwagcina ayimfihlo esikhaleni sakho"</string>
<string name="private_space_keep_in_mind_text" msgid="7721081172657563800">"Khumbula"</string>
<string name="private_space_apps_stopped_text" msgid="4034574118911250169"><b>"Ama-app ayama uma ukhiya isikhala sakho"</b>\n"Uma ukhiya isikhala sakho, ama-app asesikhaleni sakho ayamiswa futhi ngeke ukwazi ukuthola izaziso ezivela kuwo"</string>
- <!-- no translation found for private_space_apps_permission_text (4416201648436201393) -->
- <skip />
- <!-- no translation found for private_space_settings_footer_text (3742468470394835356) -->
- <skip />
+ <string name="private_space_apps_permission_text" msgid="4416201648436201393">"Izindawo zangasese azifanele ama-app adinga ukusebenza ngemuva noma ukuthumela izaziso ezibucayi, njengama-app ezokwelapha. Lokhu kungenxa yokuthi izaziso nomsebenzi wangemuva kuyamiswa uma isikhala sakho sikhiyiwe.\n\nAma-app asendaweni yakho engasese ngeke avele kumphathi wemvume, edeshibhodini yobumfihlo, namanye amasethingi uma indawo yakho engasese ikhiyiwe.\n\nIndawo yakho engasese ayikwazi ukuyiswa edivayisini entsha. Uzodinga ukumisa esinye isikhala esigodliwe uma ufuna ukusisebenzisa kwenye idivayisi.\n\nNoma ngubani oxhuma idivayisi yakho ekhompyutheni noma ofaka ama-app ayingozi edivayisini yakho angakwazi ukufinyelela endaweni yakho engasese."</string>
+ <string name="private_space_settings_footer_text" msgid="3742468470394835356">"Izindawo zangasese azifanele ama-app adinga ukusebenza ngemuva noma ukuthumela izaziso ezibucayi, njengama-app ezokwelapha. Lokhu kungenxa yokuthi izaziso nomsebenzi wangemuva kuyamiswa uma isikhala sakho sikhiyiwe.\n\nAma-app asendaweni yakho yangasese ngeke avele kumphathi wemvume, kudeshibhodi yobumfihlo, namanye amasethingi uma indawo yangasese ikhiyiwe.\n\nIndawo yakho engasese ayikwazi ukubuyiselwa edivayisini entsha. Kuzomele usethe esinye isikhala uma ufuna ukusisebenzisa kwenye idivayisi.\n\nNoma ngubani oxhuma idivayisi yakho ekhompyutheni noma ofaka ama-app anonya edivayisini yakho angakwazi ukufinyelela endaweni yakho engasese."</string>
<string name="private_space_learn_more_text" msgid="5314198983263277586">"Funda kabanzi mayelana nendawo engasese"</string>
<string name="private_space_few_moments_text" msgid="7166883272914424011">"Lokhu kuzothatha izikhathi ezimbalwa"</string>
<string name="private_space_setting_up_text" msgid="8458035555212009528">"Isetha isikhala esigodliwe…"</string>
@@ -851,6 +850,21 @@
<string name="nfc_reboot_dialog_title" msgid="2033983438635768169">"Qalisa kabusha idivayisi?"</string>
<string name="nfc_reboot_dialog_message" msgid="4929353168157966992">"Ukungena kwe-NFC okuningiliziwe kuhloselwe izinjongo zokuthuthukiswa kuphela. Idatha ye-NFC eyengeziwe ifakwe phakathi kwimibiko yeziphazamisi, engase ibe nolwazi olugodliwe. Qala kabusha idivayisi ukuze ushintshe le sethingi."</string>
<string name="nfc_reboot_dialog_confirm" msgid="4769763632008584567">"Qala kabusha"</string>
+ <string name="keywords_external_display" msgid="4181375057920134909">"fanisa, ukubonisa kwangaphandle, ukubonisa okuxhunyiwe, ukubonisa kwe-usb, ukucaca, ukuzungezisa"</string>
+ <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="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>
+ <string name="external_display_rotation" msgid="7160062306817490204">"Ukuzungezisa"</string>
+ <string name="external_display_standard_rotation" msgid="545969032327487219">"Okujwayelekile"</string>
+ <string name="external_display_rotation_90" msgid="7371530414227542947">"90°"</string>
+ <string name="external_display_rotation_180" msgid="6469137724447819841">"180°"</string>
+ <string name="external_display_rotation_270" msgid="7819322302457740514">"270°"</string>
+ <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="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>
@@ -1192,6 +1206,7 @@
<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>
@@ -1494,7 +1509,7 @@
<string name="reset_mobile_network_settings_title" msgid="5616713931258506842">"Setha kabusha Amasethingi Enethiwekhi Yeselula"</string>
<string name="reset_mobile_network_settings_desc" msgid="7292636387692165727">"Lokhu kuzosetha kabusha wonke amasethingi enethiwekhi yeselula"</string>
<string name="reset_mobile_network_settings_confirm_title" msgid="7510965634669511241">"Setha kabusha Amasethingi Enethiwekhi Yeselula?"</string>
- <string name="reset_bluetooth_wifi_title" msgid="4113071322344697317">"Setha kabusha i-Bluetooth ne-Wi-Fi"</string>
+ <string name="reset_bluetooth_wifi_title" msgid="4113071322344697317">"Setha kabusha iBluetooth ne-Wi-Fi"</string>
<string name="reset_bluetooth_wifi_desc" msgid="4030295669083059711">"Lokhu kuzosetha kabusha yonke i-Wi-Fi namasethingi e-Bluetooth. Awukwazi ukuhlehlisa lesi senzo."</string>
<string name="reset_bluetooth_wifi_button_text" msgid="3974098137045963639">"Setha kabusha"</string>
<string name="reset_bluetooth_wifi_complete_toast" msgid="5893439291030574365">"I-Bluetooth ne-Wi-Fi zisethwe kabusha"</string>
@@ -1898,14 +1913,14 @@
<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>
- <string name="show_ime" msgid="4334255501724746849">"Sebenzisa ikhibhodi ekuskrini"</string>
- <string name="show_ime_summary" msgid="7293345791727205975">"Yigcine kusikrini ngenkathi kusebenza ikhibhodi ephathekayo"</string>
<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="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="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="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>
@@ -1930,6 +1945,10 @@
<string name="pointer_fill_style_yellow_button" msgid="5025969961559379024">"Shintsha isitayela sokugcwalisa isikhombi sibe phuzi"</string>
<string name="pointer_fill_style_pink_button" msgid="4106218142489635673">"Shintsha isitayela sokugcwalisa isikhombi sibe phinki"</string>
<string name="pointer_fill_style_blue_button" msgid="5594958078854032785">"Shintsha isitayela sokugcwalisa isikhombi sibe luhlaza okwesibhakabhaka"</string>
+ <string name="pointer_stroke_style" msgid="1886986630216050665">"Isitayela sepointer stroke"</string>
+ <string name="pointer_stroke_style_name_white" msgid="673686194443825383">"Mhlophe"</string>
+ <string name="pointer_stroke_style_name_black" msgid="4655806167067437330">"Mnyama"</string>
+ <string name="pointer_stroke_style_name_none" msgid="8953927511729800247">"Lutho"</string>
<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>
@@ -1973,6 +1992,9 @@
<string name="user_selected_keyboard_layout_label" msgid="154742505924555156">"Umsebenzisi ukhethiwe: <xliff:g id="LAYOUT_LABEL">%s</xliff:g>"</string>
<string name="speech_category_title" msgid="5995161659186229742">"Inkulumo"</string>
<string name="pointer_speed" msgid="7398649279282675718">"Ijubane lesikhombi"</string>
+ <string name="pointer_scale" msgid="4941564570571663964">"Ubukhulu besikhombisi"</string>
+ <string name="pointer_scale_decrease_content_description" msgid="4479646756230008068">"Nciphisa ubukhulu besikhombisi"</string>
+ <string name="pointer_scale_increase_content_description" msgid="1049632123702664450">"Khulisa ubukhulu besikhombisi"</string>
<string name="game_controller_settings_category" msgid="8557472715034961918">"Isilawuli somdlalo"</string>
<string name="vibrate_input_devices" msgid="5192591087864449142">"Qondisa kabusha ukudlidliza"</string>
<string name="vibrate_input_devices_summary" msgid="8791680891376689823">"Thumela ukudlidliza kwesilawuli segeyimu uma kuxhunyiwe"</string>
@@ -2095,7 +2117,8 @@
<string name="accessibility_magnification_triple_tap_warning_positive_button" msgid="8712304035901450010">"Qhubeka noma kunjalo"</string>
<string name="accessibility_magnification_triple_tap_warning_negative_button" msgid="2028849736366584733">"Khansela"</string>
<string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Izilungiselelo zokukhuliswa"</string>
- <string name="accessibility_magnification_one_finger_panning_title" msgid="4503949739883092989">"I-panning yomunwe owodwa"</string>
+ <string name="accessibility_magnification_one_finger_panning_title" msgid="1338811559457209339">"Hambisa imagnifier ngomunwe ongu-1"</string>
+ <string name="accessibility_magnification_one_finger_panning_summary" msgid="1861473044337453019">"Hudula umunwe ongu-1 ukuze uhambe esikrinini"</string>
<string name="accessibility_magnification_one_finger_panning_summary_on" msgid="9133125894310777539">"Hambisa indawo yokukhuliswa ngokuhudula umunwe owodwa."</string>
<string name="accessibility_magnification_one_finger_panning_summary_off" msgid="8979146350396559805">"Hambisa indawo yokukhuliswa ngokuhudula iminwe emibili."</string>
<string name="accessibility_magnification_one_finger_panning_summary_unavailable" msgid="4302567514781245318">"Ayitholakali ngenkathi ikhulisa kuphela ingxenye yesikrini"</string>
@@ -2119,6 +2142,8 @@
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Thepha inkinobho ukuze usondeze"</string>
<string name="accessibility_screen_magnification_intro_text" msgid="3856180549393526339">"Sondeza isithombe ngokushesha ukuze wenze okuqukethwe kube kukhudlwana"</string>
<string name="accessibility_screen_magnification_summary" msgid="8267672508057326959">"<b>Ukuze usondeze isithombe:<br/><br/> {0,number,integer}. Sebenzisa isinqamuleli ukuqalisa ukukhuliswa</b><br/> {1,number,integer}. Thepha isikrini</b><br/> {2,number,integer}. Hudula iminwe emi-2 ukuze uhambe esikrinini</b><br/> {3,number,integer}. Ncinza ngeminwe emi-2 ukuze ulungise ukusondeza</b><br/> {4,number,integer}. Sebenzisa isinqamuleli ukuze umise ukukhuliswa<br/><br/> <b>Ukuze usondeze isithombe okwesikhashana:</b><br/> {0,number,integer}. Qiniseka ukuthi uhlobo lwakho lokukhulisa lusethwe esikrinini esigcwele</b><br/> {1,number,integer}. Sebenzisa isinqamuleli ukuqalisa ukukhuliswa</b><br/> {2,number,integer}. Thinta futhi ubambe noma kuphi esikrinini</b><br/> {3,number,integer}. Hudula umunwe ukuze uhambahambe esikrinini</b><br/> {4,number,integer}. Phakamisa umunwe ukuze umise ukukhuliswa"</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off" msgid="1779959623535122324">"<b>Ukuze usondeze isithombe:<br/><br/> {0,number,integer}. Sebenzisa isinqamuleli ukuqalisa ukukhuliswa</b><br/> {1,number,integer}. Thepha isikrini</b><br/> {2,number,integer}. Hudula iminwe engu-2 ukuze uhambahambe esikrinini</b><br/> {3,number,integer}. Ncinza ngeminwe engu-2 ukuze ulungise ukusondeza</b><br/> {4,number,integer}. Sebenzisa isinqamuleli ukuze umise ukukhuliswa<br/><br/> Ungaphinda usondeze isithombe okwesikhashana nokuningi."</string>
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on" msgid="7323930759240678965">"<b>Ukuze usondeze isithombe:<br/><br/> {0,number,integer}. Sebenzisa isinqamuleli ukuqalisa ukukhuliswa</b><br/> {1,number,integer}. Thepha isikrini</b><br/> {2,number,integer}. Hudula iminwe engu-1 noma 2 ukuze uhambahambe esikrinini<br/> {3,number,integer}. Ncinza ngeminwe engu-2 ukuze ulungise ukusondeza</b><br/> {4,number,integer}. Sebenzisa isinqamuleli ukuze umise ukukhuliswa<br/><br/> Ungaphinda usondeze isithombe okwesikhashana nokuningi."</string>
<string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Uma ukukhulisa kuvuliwe, ungasondeza isikrini sakho.\n\n"<b>"Ukuze usondeze"</b>", qala ukukhulisa, thepha noma yikuphi kusikrini.\n"<ul><li>"Hudula iminwe engu-2 noma ngaphezulu ukuze uskrole"</li>\n<li>"Ncinza iminwe engu-2 noma ngaphezulu ukuze ulungisa ukusondela"</li></ul>\n\n<b>"Ukuze usondeze okwesikhashana"</b>", qalisaukukhulisa, bese uthinte futhi ubambe noma yokuhi esikrinini.\n"<ul><li>"Hudula ukuze uhambahambe esikrinini"</li>\n<li>"Phakamisa umunwe ukuze uhlehlise isithombe"</li></ul>\n\n"Awukwazi ukusondeza kwikhibhodi noma kwibha yokuzula."</string>
<string name="accessibility_tutorial_pager" msgid="8461939455728454061">"Ikhasi elingu-<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> kwangu-<xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
<string name="accessibility_tutorial_dialog_title_button" msgid="1924337057649065884">"Isinqamuleli senkinobho yokufinyeleleka"</string>
@@ -3324,13 +3349,27 @@
<string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Lutho}=1{ishejuli esethiwe e-1}one{amashejuli asethiwe angu-#}other{amashejuli asethiwe angu-#}}"</string>
<string name="zen_mode_settings_title" msgid="682676757791334259">"Ungaphazamisi"</string>
<string name="zen_modes_list_title" msgid="5138745349253275428">"Amamodi Abalulekile"</string>
+ <string name="zen_modes_add_mode" msgid="4806287336036228772">"Faka imodi"</string>
<string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yaziswa kuphela abantu ababalulekile nezinhlelo zokusebenza"</string>
+ <string name="zen_mode_select_schedule" msgid="5135520719771212697">"Khetha uhlobo lokwenza kusebenze"</string>
+ <string name="zen_mode_select_schedule_time" msgid="1761728920617757652">"Isikhathi"</string>
+ <string name="zen_mode_select_schedule_time_example" msgid="3071816060919446355">"Isb. \"9:30 – 5:00 PM\""</string>
+ <string name="zen_mode_select_schedule_calendar" msgid="4320676795917533667">"Ikhalenda"</string>
+ <string name="zen_mode_select_schedule_calendar_example" msgid="6549820995975678001">"Isb. \"Ikhalenda yomuntu siqu\""</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>
+ <string name="zen_mode_new_title" msgid="4934720193004330740">"Sungula imodi"</string>
+ <string name="zen_mode_new_option_custom" msgid="1060993879440003341">"Okumuntu ngamunye"</string>
<string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Khawulela ukuphazamisa"</string>
<string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Vula ukungaphazamisi"</string>
<string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Ama-alamu nemisindo yemidiya kungaphazamisa"</string>
<string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Amashejuli"</string>
<string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Susa amashejuli"</string>
<string name="zen_mode_schedule_delete" msgid="5383420576833765114">"Susa"</string>
+ <string name="zen_mode_menu_rename_mode" msgid="4681802125016390837">"Qamba kabusha"</string>
+ <string name="zen_mode_menu_delete_mode" msgid="5380084696402157428">"Sula"</string>
+ <string name="zen_mode_delete_mode_confirmation" msgid="7594340592051947392">"Sula imodi ethi \"<xliff:g id="MODE">%1$s</xliff:g>\"?"</string>
<string name="zen_mode_rule_name_edit" msgid="1053237022416700481">"Hlela"</string>
<string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Amashejuli"</string>
<string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Ishejuli"</string>
@@ -3338,12 +3377,10 @@
<string name="zen_mode_set_calendar_title" msgid="7216665046452644450">"Engeza ikhalenda"</string>
<string name="zen_mode_set_calendar_link" msgid="5694504696975898068">"Sebenzisa ikhalenda yakho"</string>
<string name="zen_mode_set_calendar_category_title" msgid="4860286061420133360">"Shejula"</string>
- <!-- no translation found for zen_mode_set_schedule_title (8023100831320026233) -->
- <skip />
- <!-- no translation found for zen_mode_set_schedule_link (2534032127923435737) -->
- <skip />
- <!-- no translation found for zen_mode_schedule_duration (299332195675875111) -->
- <skip />
+ <string name="zen_mode_set_schedule_title" msgid="8023100831320026233">"Setha ishejuli"</string>
+ <string name="zen_mode_set_schedule_link" msgid="2534032127923435737">"Shejula"</string>
+ <string name="zen_mode_schedule_duration" msgid="299332195675875111">"Ihora elingu-<xliff:g id="HOURS">%1$d</xliff:g>, nemizuzu engu-<xliff:g id="MINUTES">%2$d</xliff:g>"</string>
+ <string name="zen_mode_configuration_link_title" msgid="4718358055721023371">"Vula ngokuzenzekelayo"</string>
<string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Ishejuli"</string>
<string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Thulisa ifoni ngezinye izikhathi"</string>
<string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Setha imithetho yokuthi ungaphazamisi"</string>
@@ -3353,8 +3390,9 @@
<string name="zen_mode_settings_category" msgid="3794956668816783447">"Vumela iziphazamiso ezenza umsindo"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Vimbela ukuphazamiseka okubonakalayo"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Vumela amasignali okubuka"</string>
- <string name="mode_interruption_filter_title" msgid="6657431939996264417">"Izaziso ezingafinyelela kuwe"</string>
+ <string name="mode_interruption_filter_title" msgid="3343846700214702347">"Hlala ugxilile"</string>
<string name="mode_device_effects_title" msgid="5857008332618433744">"Izenzo ezengeziwe"</string>
+ <string name="modes_sound_summary_off" msgid="6972648204528227879">"{count,plural, =0{Kuvaliwe}=1{Kuvaliwe / imodi eyodwa ingavuleka ngokuzenzakalelayo}one{Kuvaliwe / amamodi angu-# angavuleka ngokuzenzakalelayo}other{Kuvaliwe / amamodi angu-# angavuleka ngokuzenzakalelayo}}"</string>
<string name="mode_display_settings_title" msgid="8132825978346535472">"Bonisa amasethingi"</string>
<string name="mode_display_options_section" msgid="5151597748243866532">"Okungakhethwa kukho kokubonisa"</string>
<string name="mode_grayscale_title" msgid="6027553257331235461">"Indawo engathi imnyama"</string>
@@ -3370,6 +3408,8 @@
<string name="mode_dark_theme_title_secondary_list" msgid="4761262694149772845">"nika amandla itimu emnyama"</string>
<string name="mode_dark_theme_summary" msgid="8428887193785431898">"Shintsha i-OS nama-app ukuze uncamele umbhalo okhanyayo kungemuva elimnyama, okungenzeka kube lula emehlweni futhi kunikeza ukulondoloza okubalulekile kwebhethri kwamanye amadivayisi"</string>
<string name="mode_display_settings_summary" msgid="5929234706883482380">"{count,plural,offset:2 =0{Azikho izinguquko zokubonisa}=1{I-{effect_1}}=2{I-{effect_1} ne-{effect_2}}=3{I-{effect_1}, i-{effect_2}, ne-{effect_3}}one{I-{effect_1}, i-{effect_2}, nokungu-# ngaphezulu}other{I-{effect_1}, i-{effect_2}, nokungu-# ngaphezulu}}"</string>
+ <string name="mode_notification_filter_title" msgid="443728483176031977">"Iziphazamiso zokuhlunga"</string>
+ <string name="mode_no_notification_filter" msgid="7119188047783404890">"Azikho iziphazamiso ezihlungiwe"</string>
<string name="zen_mode_restrict_notifications_title" msgid="4926944083757096458">"Bonisa okungakhethwa kukho kwezaziso ezihlungiwe"</string>
<string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Uma Ukungaphazamisi kuvuliwe"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Awukho umsindo kusukela kuzaziso"</string>
@@ -3485,6 +3525,7 @@
<string name="notification_history_open_notification" msgid="2655071846911258371">"vula isaziso"</string>
<string name="snooze_options_title" msgid="2109795569568344617">"Vumela ukusnuza kwesaziso"</string>
<string name="notification_badging_title" msgid="5469616894819568917">"Ichashazi lesaziso kusithonjana sohlelo lokusebenza"</string>
+ <string name="notification_bundles" msgid="3614044525822580826">"Iqoqo lezaziso"</string>
<string name="notification_bubbles_title" msgid="5681506665322329301">"Amabhamuza"</string>
<string name="bubbles_app_toggle_title" msgid="5319021259954576150">"Amabhamuza"</string>
<string name="bubbles_conversation_toggle_title" msgid="5225039214083311316">"Yenza ibhamuza le ngxoxo"</string>
@@ -3614,11 +3655,10 @@
<string name="notif_listener_not_migrated" msgid="6265206376374278226">"Le app ayisekeli amasethingi athuthukisiwe"</string>
<string name="notif_listener_more_settings" msgid="1348409392307208921">"Amanye amasethingi"</string>
<string name="notif_listener_more_settings_desc" msgid="7995492074281663658">"Amasethingi engeziwe ayatholakala ngaphakathi kwale app"</string>
- <!-- no translation found for notification_polite_title (4737150709382859870) -->
+ <string name="notification_polite_title" msgid="6121016426991791557">"Isikhathi sokuphola sezaziso"</string>
+ <!-- no translation found for notification_polite_main_control_title (5812529809151927149) -->
<skip />
- <!-- no translation found for notification_polite_main_control_title (7267191551379543859) -->
- <skip />
- <!-- no translation found for notification_polite_description (7749280535620291610) -->
+ <!-- no translation found for notification_polite_description (5497748284893832854) -->
<skip />
<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>
@@ -3666,6 +3706,7 @@
<string name="notification_channels" msgid="1502969522886493799">"Izigaba"</string>
<string name="notification_channels_other" msgid="18159805343647908">"Okunye"</string>
<string name="no_channels" msgid="4716199078612071915">"le-app ayizange ithumele izasiso"</string>
+ <string name="no_recent_channels" msgid="5068574296267584043">"Bonisa izigaba ezingasetshenzisiwe"</string>
<string name="app_settings_link" msgid="6725453466705333311">"Amasethingi angeziwe ku-app"</string>
<string name="show_unused_channels" msgid="4956292847964439078">"Bonisa izigaba ezingasetshenzisiwe"</string>
<string name="hide_unused_channels" msgid="2019739275175707170">"Fihla izigaba ezingasetshenzisiwe"</string>
@@ -3774,7 +3815,11 @@
<string name="zen_mode_apps_category" msgid="4082380323683889391">"Ama-app angaphazamisa"</string>
<string name="zen_mode_apps_priority_apps" msgid="7386196048313716076">"Ama-app akhethiwe"</string>
<string name="zen_mode_apps_none_apps" msgid="2493642312793604327">"Lutho"</string>
- <string name="zen_mode_apps_all_apps" msgid="705700582778445484">"Konke"</string>
+ <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>
+ <!-- no translation found for zen_mode_plus_n_items (6136713354369243421) -->
+ <skip />
<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>
<string name="zen_mode_bypassing_apps_add_header" msgid="3201829605075172536">"Khetha ama-app amaningi"</string>
@@ -3792,6 +3837,8 @@
<string name="zen_mode_sounds_none" msgid="6557474361948269420">"Akukho okungaphazamisa"</string>
<string name="zen_mode_people_none" msgid="4613147461974255046">"Akekho ongaphazamisa"</string>
<string name="zen_mode_people_some" msgid="9101872681298810281">"Abantu abathile bangaphazamisa"</string>
+ <!-- no translation found for zen_mode_people_repeat_callers (4499084111069828761) -->
+ <skip />
<string name="zen_mode_people_all" msgid="311036110283015205">"Bonke abantu bangaphazamisa"</string>
<string name="zen_mode_repeat_callers" msgid="2270356100287792138">"Phinda abafonayo"</string>
<string name="zen_mode_repeat_callers_title" msgid="8016699240338264781">"Vumela abashayi abaphindayo"</string>
@@ -3811,12 +3858,10 @@
<string name="zen_mode_summary_alarms_only_by_hour" msgid="7400910210950788163">"{count,plural, =1{Shintshela kuma-alamu ihora elilodwa kuze kube {time}}one{Shintshela kuma-alamu kuphela amahora angu-# (kuze kube {time})}other{Shintshela kuma-alamu kuphela amahora angu-# (kuze kube {time})}}"</string>
<string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Guqulela kuma-alamu kuphela kuze kube ngumhla ka-<xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
<string name="zen_mode_summary_always" msgid="722093064250082317">"Guqulela kuhlala uphazamisa"</string>
- <!-- no translation found for zen_mode_action_change_name (766639614789907016) -->
- <skip />
- <!-- no translation found for zen_mode_action_change_icon (6192187791750301778) -->
- <skip />
- <!-- no translation found for zen_mode_icon_picker_title (6845490379143557472) -->
- <skip />
+ <string name="zen_mode_rename_title" msgid="8146882272966214558">"Imodi yokuhlela"</string>
+ <string name="zen_mode_new_custom_title" msgid="321750898430776191">"Faka 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="warning_button_text" msgid="1274234338874005639">"Isexwayiso"</string>
<string name="suggestion_button_close" msgid="6865170855573283759">"Vala"</string>
<string name="device_feedback" msgid="5351614458411688608">"Thumela impendulo mayelana nale divayisi"</string>
@@ -4802,8 +4847,10 @@
<string name="bluetooth_middle_name" msgid="3909371955137442319">"Isimo"</string>
<string name="bluetooth_header_battery_content_description" msgid="3804237436331504879">"Ibhethri"</string>
<string name="settings_panel_title" msgid="346363079938069215">"Iphaneli yezilungiselelo"</string>
- <string name="force_desktop_mode" msgid="1336913605091334238">"Phoqelela imodi yedeskithophu"</string>
- <string name="force_desktop_mode_summary" msgid="4587416867846930479">"Phoqelela imodi yedeskithophu yokuhlola esibukisweni sesibili"</string>
+ <string name="enable_desktop_mode" msgid="5644818402534562302">"Nika amandla amawindi efreeform"</string>
+ <string name="enable_desktop_mode_summary" msgid="7606643229185242771">"Nika amandla usekelo lwamawindi efreeform."</string>
+ <string name="force_desktop_mode" msgid="8292039809783522466">"Nika amandla iwindi lefreeform esibonisini sesibili"</string>
+ <string name="force_desktop_mode_summary" msgid="6534513232678335875">"Nika amandla amawindi kuphela esibonisini sesibili."</string>
<string name="enable_non_resizable_multi_window" msgid="6832903754625404477">"Nika amandla okungashintsheki usayizi emawindini amaningi"</string>
<string name="enable_non_resizable_multi_window_summary" msgid="3275763753261901999">"Ivumela izinhlelo zokusebenza ezingashintsheki usayizi ukuthi zibe emawindini amaningi"</string>
<string name="hwui_force_dark_title" msgid="4256904905631994219">"Bhala ngaphezulu isici sokuphoqelela okumnyama"</string>
@@ -4871,14 +4918,14 @@
<string name="confirm_format_ext4_text" msgid="7940372488624630214">"Ukuhlukaniswa kwedatha yale divayisi kudinga ukuguqulelwa ku-ext4 ngaphambi kokusebenzisa okungakhethwa kukho konjiniyela kuka-16KB. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwini ngenkathi i-bootloader ivuliwe ingaba sengozini. Ukwenza kusebenze okukhethwa kukho kuka-16KB kuzodinga ukuqalisa okukodwa ngemva kwalokhu. Uma ukule modi, ungashintsha uye emuva naphambili phakathi kwemodi ka-4KB ne-16KB ngokuqalisa okukodwa. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze ubuyisele idivayisi kumodi yokukhiqiza, uzodinga ukushintshela kumodi ye-4KB bese ukhiya i-bootloader, esetha idivayisi kabusha njengasekuqaleni. Ngemuva kokuthi idivayisi iqale ngempumelelo ku-Android, khubaza ukuvula kwe-OEM Kokungakhethwa kukho konjiniyela. Idivayisi izosulwa futhi isistimu yefayela izoshintshelwa ku-ext4 ngemva kokuqinisekisa. Ngemva kokuqeda lokhu, sicela ubuye ukuze unike amandla u-16KB futhi."</string>
<string name="confirm_ext4_button_text" msgid="6045501984773738407">"Sula yonke idatha"</string>
<string name="format_ext4_failure_toast" msgid="8059453995800471549">"Yehlulekile ukufometha kabusha nokusula ukuhlukaniswa kwedatha ku-ext4."</string>
- <string name="confirm_oem_unlock_for_16k_title" msgid="5374451262432025419">"Kudingeka Ukuvula I-Bootloader Kumodi ka-16KB"</string>
+ <string name="confirm_oem_unlock_for_16k_title" msgid="6062041826568112078">"Kudingeka Ukuvula IBootloader"</string>
<string name="confirm_oem_unlock_for_16k_text" msgid="3583604865119937957">"Le divayisi idinga ukuthi ibootloader ivulwe ngaphambi kokusebenzisa okungakhethwa kukho konjiniyela kuka-16KB. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwini ngenkathi ibootloader ivuliwe ingaba sengozini. Yonke idatha yomsebenzisi namasethingi azosulwa uma wenza kusebenze imodi ka-16KB. Uma ibootloader isivuliwe, ukuvula okukhethwa kukho kuka-16KB kuzodinga ukuqalisa okubili. Uma ukule modi, ungashintsha uye emuva naphambili phakathi kwemodi ka-4KB ne-16KB ngokuqalisa okukodwa. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze ubuyisele idivayisi kumodi yokukhiqiza, uzodinga ukushintshela kumodi ka-4KB bese kuba ukukhiya i-OEM/ibootloader (esetha kabusha njengasekuqaleni) idivayisi. Sicela uvule ibootloader bese uyazama futhi. Ungabona imiyalelo yokuthi ungakwenza kanjani lokhu kokuthi <a href=\"https://source.android.com/docs/core/architecture/bootloader/locking_unlocking\">https://source.android.com/docs/core/architecture/bootloader/locking_unlocking</a>"</string>
<string name="page_agnostic_4k_pages_title" msgid="1184703958249093215">"Ukusebenzisa i-4KB page-agnostic"</string>
<string name="page_agnostic_4k_pages_text_short" msgid="2894243902906666242">"Ukumodi ka-16KB yemodi ye-page-agnostic. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwini ngenkathi i-bootloader ivuliwe ingaba sengozini. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze uphinde ufake imodi yokukhiqiza, kufanele ukhiye i-bootloader yedivayisi. Thepha ukuze ufunde kabanzi."</string>
<string name="page_agnostic_4k_pages_text" msgid="8284806650260868833">"Ukumodi ka-16KB yemodi ye-page-agnostic. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwini ngenkathi i-bootloader ivuliwe ingaba sengozini. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze uphinde ufake imodi yokukhiqiza, kufanele ukhiye i-bootloader yedivayisi. Lokhu kuzosetha kabusha njengasekuqaleni idivayisi futhi nokuyibuyisela kumasethingi okukhiqiza. Ngemuva 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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> noma sebenzisa okuthi <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> bese ukhetha okuthi \'Sula Idivayisi\', \'Khiya I-Bootloader\' kanye nokuthi \'Phoqelela I-Flash ezingxenyeni zonke\'."</string>
<string name="page_agnostic_16k_pages_title" msgid="7762533464569818498">"Ukusebenzisa imodi ye-16KB page-agnostic"</string>
- <string name="page_agnostic_16k_pages_text_short" msgid="269039281591806585">"Ukumodi ka-16KB yemodi ye-page-agnostic. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonwini ngenkathi i-bootloader ivuliwe ingaba sengozini. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze uphinde ufake imodi yokukhiqiza, kufanele, ushintshele emuva kumodi ka-4K bese ukhiya i-bootloader yedivayisi. Thepha ukuze ufunde kabanzi."</string>
- <string name="page_agnostic_16k_pages_text" msgid="6208765386837706582">"Ukumodi ye-16KB page-agnostic. Ubuqotho besofthiwe abukwazi ukuqinisekiswa kule modi, futhi noma iyiphi idatha egcinwe efonini ngenkathi ibootloader ivuliwe ingaba sengozini. Ezinye izakhi zizokhutshazwa kulawa mamodi, ngakho-ke amanye ama-app angase angasebenzi. Ukuze uphinde ufake imodi yokukhiqiza, kufanele, ushintshele emuva kumodi ye4K bese ukhiya ibootloader yedivayisi. Lokhu kuzosetha kabusha njengasekuqaleni idivayisi futhi nokuyibuyisela kumasethingi okukhiqiza. Ngemuva 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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> noma sebenzisa okuthi <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> bese ukhetha okuthi \'Sula Idivayisi\', \'Khiya IBootloader\' kanye nokuthi \'Phoqelela IFlash ezingxenyeni zonke\'."</string>
+ <string name="page_agnostic_16k_pages_text_short" msgid="3282018880292691631">"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. Thepha ukuze ufunde kabanzi."</string>
+ <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 <a href=\"https://developers.google.com/android/images\">https://developers .google.com/android/images</a> noma usebenzise okuthi <a href=\"https://flash.android.com/back-to-public\">https://flash.android.com/back-to-public</a> 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="bug_report_handler_title" msgid="713439959113250125">"Isibambi sombiko wesiphazamiso"</string>
@@ -5010,7 +5057,7 @@
<string name="app_pinning_main_switch_title" msgid="5465506660064032876">"Sebenzisa ukuphina i-app"</string>
<string name="developer_options_main_switch_title" msgid="1720074589554152501">"Sebenzisa izinkinobho zikanjiniyela"</string>
<string name="default_print_service_main_switch_title" msgid="4697133737128324036">"Sebenzisa isevisi yokuphrinta"</string>
- <string name="multiple_users_main_switch_title" msgid="6686858308083037810">"Vumela abasebenzisi abaningi"</string>
+ <string name="multiple_users_main_switch_title" msgid="9158796544835843201">"Vumela ukushintsha komsebenzisi"</string>
<string name="multiple_users_main_switch_keywords" msgid="4845954458094134356">"vumela, eziningi, umsebenzisi, vumela, eziningi"</string>
<string name="multiple_users_title_keywords" msgid="2395593167746225172">"okuningi, abasebenzisi, amaphrofayela, abantu, ama-akhawunti, shintsha, okuningi"</string>
<string name="wireless_debugging_main_switch_title" msgid="8463499572781441719">"Sebenzisa ukususa ibhagi nge-Wi-Fi"</string>
@@ -5124,8 +5171,9 @@
<string name="dream_setup_description" msgid="7508547154038580296">"Khetha ozokubona esikrinini sakho uma ithebulethi yakho idokhiwe. Idivayisi yakho ingase isebenzise amandla engeziwe uma kusetshenziswa isilondolozi sesikrini."</string>
<string name="customize_button_title" msgid="1110284655990203359">"Enza ngendlela oyifisayo"</string>
<string name="customize_button_description" msgid="7440248477266126231">"Enza ngendlela oyifisayo <xliff:g id="SCREENSAVER_NAME">%1$s</xliff:g>"</string>
- <string name="reboot_dialog_enable_freeform_support" msgid="6412591361284929149">"Ukuqalisa kabusha kuyadingeka ukunika amandla usekelo lwefomu yamahhala."</string>
- <string name="reboot_dialog_force_desktop_mode" msgid="2021839270403432948">"Ukuqalisa kabusha kuyadingeka ukuphoqelela imodi yedeskithophu kuzibonisi zesibili."</string>
+ <string name="reboot_dialog_enable_freeform_support" msgid="5526979569538289810">"Kudingeka ukuqala kabusha ukuze unike amandla ifa lokweseka iwindi lefreeform."</string>
+ <string name="reboot_dialog_override_desktop_mode" msgid="1557714416232280288">"Kudingeka ukuqala kabusha ukuze ushintshe ukweseka iwindi lefreeform."</string>
+ <string name="reboot_dialog_force_desktop_mode" msgid="3647484086248450029">"Kudingeka ukuqala kabusha ukuze uphoqe iwindi lefreeform esibonisini sesibili."</string>
<string name="reboot_dialog_reboot_now" msgid="235616015988522355">"Qalisa manje"</string>
<string name="reboot_dialog_reboot_later" msgid="4261717094186904568">"Qalisa ngokuhamba kwesikhathi"</string>
<string name="bluetooth_details_spatial_audio_title" msgid="1368071116994002707">"Umsindo Wokulalelwayo"</string>
@@ -5243,6 +5291,8 @@
<string name="show_captions_enabled" msgid="7089043007924626">"Vuliwe"</string>
<string name="live_caption_disabled" msgid="3562035026547887366">"Valiwe"</string>
<string name="live_caption_enabled" msgid="5269360946200718949">"Vuliwe"</string>
+ <string name="audio_seek_bar_state_left_first" msgid="8814986910920838972">"Okulalelwayo %1$d%% kwesobunxele, %2$d%% kwesokudla"</string>
+ <string name="audio_seek_bar_state_right_first" msgid="1999368979633398876">"Okulalelwayo %1$d%% kwesokudla, %2$d%% kwesobunxele"</string>
<string name="about_phone_device_name_warning" msgid="3243226572404472381">"Igama ledivayisi yakho liyabonakala kuma-app owafakile. Lingase futhi libonwe ngabanye abantu lapho uxhuma kumadivayisi e-Bluetooth, uxhuma kunethiwekhi ye-Wi-Fi noma usetha i-hotspot ye-Wi-Fi."</string>
<string name="grammatical_gender_title" msgid="8584242850477270828">"Ubulili bohlelo lolimi"</string>
<string name="grammatical_gender_dialog_title" msgid="8754048592099871587">"Khetha ubulili Bohlelo lolimi"</string>
@@ -5354,4 +5404,5 @@
<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="homepage_search" msgid="6759334912284663559">"Amasethingi Okusesha"</string>
</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index adaea1b..4680936 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1552,4 +1552,8 @@
<item>Theater</item>
<item>Flower</item>
</string-array>
+
+ <!-- Packages that will not show Display over other apps permission -->
+ <string-array name="display_over_apps_permission_change_exempt">
+ </string-array>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 4b638b2..065d28a 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -235,9 +235,6 @@
Can be overridden for specific product builds if the target device does not support it -->
<bool name="config_media_vibration_supported">true</bool>
- <!-- Whether to show Keyboard vibration settings in the vibration and haptics screen. -->
- <bool name="config_keyboard_vibration_supported">false</bool>
-
<!--
Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
Default to true as not all devices support contextual cards.
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d972e13..5158ed6 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -179,6 +179,10 @@
<dimen name="pointer_fill_style_circle_padding">8dp</dimen>
<dimen name="pointer_fill_style_shape_default_stroke">1dp</dimen>
<dimen name="pointer_fill_style_shape_hovered_stroke">3dp</dimen>
+ <dimen name="pointer_stroke_style_padding">8dp</dimen>
+ <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>
<!-- RemoteAuth-->
<dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>
@@ -499,7 +503,18 @@
<dimen name="audio_streams_qrcode_preview_radius">30dp</dimen>
<!-- Zen Modes -->
+ <dimen name="zen_mode_header_size">136dp</dimen>
+ <dimen name="zen_mode_header_inner_icon_size">64dp</dimen>
+ <dimen name="zen_mode_blurb_text_size">16sp</dimen>
+ <dimen name="zen_mode_icon_list_header_circle_diameter">90dp</dimen>
+ <dimen name="zen_mode_icon_list_header_icon_size">48dp</dimen>
<dimen name="zen_mode_icon_list_item_size">96dp</dimen>
- <dimen name="zen_mode_icon_list_circle_diameter">56dp</dimen>
- <dimen name="zen_mode_icon_list_icon_size">32dp</dimen>
+ <dimen name="zen_mode_icon_list_item_circle_diameter">56dp</dimen>
+ <dimen name="zen_mode_icon_list_item_icon_size">32dp</dimen>
+ <!-- For the items in the CircularIconsPreference (contacts, apps, sound channels). -->
+ <dimen name="zen_mode_circular_icon_diameter">32dp</dimen>
+ <dimen name="zen_mode_circular_icon_inner_icon_size">20dp</dimen>
+ <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>
</resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index f62ccae..5427cdd 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -36,4 +36,8 @@
<integer name="enrollment_progress_minimum_time_display">0</integer>
<!-- The time (in millis) to wait to collect messages in fingerprint enrollment before displaying it. -->
<integer name="enrollment_collect_time">0</integer>
+
+ <!-- PointerIcon Settings -->
+ <integer name="pointer_scale_seek_bar_start">0</integer>
+ <integer name="pointer_scale_seek_bar_end">3</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2d5a671..31372ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -78,6 +78,8 @@
<!-- Content description for preview pager. [CHAR LIMIT=NONE] -->
<string name="preview_pager_content_description">Preview</string>
+ <!-- Content description for qrcode image. [CHAR LIMIT=none]-->
+ <string name="qr_code_content_description">QR code</string>
<!-- Description for the button that makes interface elements smaller. [CHAR_LIMIT=NONE] -->
<string name="font_size_make_smaller_desc">Make smaller</string>
@@ -156,6 +158,8 @@
<string name="bluetooth_hearing_device_settings_summary">Shortcut, hearing aid compatibility</string>
<!-- Connected devices settings. Title for hearing aids presets. A preset is a set of hearing aid settings. User can apply different settings in different environments (e.g. Outdoor, Restaurant, Home) [CHAR LIMIT=60] [BACKUP_MESSAGE_ID=5429761844739722885] -->
<string name="bluetooth_hearing_aids_presets">Preset</string>
+ <!-- Connected devices settings. Summary of the preference when no preset info is obtained from the remote device [CHAR LIMIT=60] -->
+ <string name="bluetooth_hearing_aids_presets_empty_list_message">There are no presets programmed by your audiologist</string>
<!-- Message when selecting hearing aids presets failed. [CHAR LIMIT=NONE] -->
<string name="bluetooth_hearing_aids_presets_error">Couldn\u2019t update preset</string>
<!-- Connected devices settings. Title of the preference to show the entrance of the audio output page. It can change different types of audio are played on phone or other bluetooth devices. [CHAR LIMIT=35] -->
@@ -653,7 +657,7 @@
<string name="location_settings_loading_app_permission_stats">Loading\u2026</string>
<!-- Location settings footer warning text when location is on [CHAR LIMIT=NONE] -->
<string name="location_settings_footer_general">
- Apps with the Nearby devices permission can determine the
+ Apps with the nearby devices permission can determine the
relative position of connected devices.
</string>
<!-- Location settings footer warning text when location is off [CHAR LIMIT=NONE] -->
@@ -932,7 +936,8 @@
<string name="security_settings_fingerprint_single_face_watch_preference_summary">Face, fingerprint, and <xliff:g id="watch" example="Dani's Watch">%s</xliff:g> added</string>
<!-- Message showing that multiple fingerprints, face, and the current watch is set up. Shown for a menu item that launches fingerprint, face, and active unlock settings or enrollment. [CHAR LIMIT=80]-->
<string name="security_settings_fingerprint_multiple_face_watch_preference_summary">Face, fingerprints, and <xliff:g id="watch" example="Dani's Watch">%s</xliff:g> added</string>
-
+ <!-- Description for mandatory biometrics prompt-->
+ <string name="mandatory_biometrics_prompt_description">This is needed since Identity Check is on</string>
<!-- RemoteAuth unlock enrollment and settings --><skip />
<!-- Title shown for menu item that launches watch unlock settings. [CHAR LIMIT=40] -->
<string name ="security_settings_remoteauth_preference_title">Remote Authenticator Unlock</string>
@@ -995,7 +1000,7 @@
<!-- Biometric settings --><skip />
<!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->
- <string name="security_settings_biometric_preference_title">Fingerprint & Face Unlock</string>
+ <string name="security_settings_biometric_preference_title">Face & Fingerprint Unlock</string>
<!-- Title shown for work menu item that launches biometric settings. [CHAR LIMIT=66] -->
<string name="security_settings_work_biometric_preference_title">Face & Fingerprint Unlock for work</string>
<!-- Message shown in summary field of biometric settings. [CHAR LIMIT=66] -->
@@ -1893,6 +1898,35 @@
<!-- Nfc developer settings: The confirm button of the popup dialog. [CHAR_LIMIT=60] -->
<string name="nfc_reboot_dialog_confirm">Restart</string>
+ <!-- External Display settings. When external display is enabled. [CHAR LIMIT=40] -->
+ <string name="external_display_on">On</string>
+ <!-- External Display settings. When external display is disabled. [CHAR LIMIT=40] -->
+ <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>
+ <!-- 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] -->
+ <string name="external_display_resolution_settings_title">Display resolution</string>
+ <!-- External Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+ <string name="external_display_not_found">External display is disconnected</string>
+ <!-- External Display settings. Rotation of the external display -->
+ <string name="external_display_rotation">Rotation</string>
+ <!-- External Display settings. Standard rotation of the external display -->
+ <string name="external_display_standard_rotation">Standard</string>
+ <!-- External Display settings. 90 rotation of the external display -->
+ <string name="external_display_rotation_90">90°</string>
+ <!-- External Display settings. 180 rotation of the external display -->
+ <string name="external_display_rotation_180">180°</string>
+ <!-- External Display settings. 180 rotation of the external display -->
+ <string name="external_display_rotation_270">270°</string>
+ <!-- External Display settings. Footer title -->
+ <string name="external_display_change_resolution_footer_title">Changing rotation or resolution may stop any apps that are currently running</string>
+ <!-- External Display settings. No Displays footer title -->
+ <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>
+
<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
<string name="wifi_display_settings_title">Cast</string>
<!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
@@ -2753,6 +2787,9 @@
<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] -->
@@ -4402,10 +4439,6 @@
<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 'show virtual keyboard' preference switch. [CHAR LIMIT=35] -->
- <string name="show_ime">Use on-screen keyboard</string>
- <!-- Summary text for the 'add virtual keyboard' preference sub-screen. [CHAR LIMIT=100] -->
- <string name="show_ime_summary">Keep it on screen while physical keyboard is active</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] -->
@@ -4418,6 +4451,10 @@
<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>
+ <!-- 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>
<!-- 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] -->
@@ -4468,6 +4505,14 @@
<string name="pointer_fill_style_pink_button">Change pointer fill style to pink</string>
<!-- Content description for blue pointer fill style. [CHAR LIMIT=60] -->
<string name="pointer_fill_style_blue_button">Change pointer fill style to blue</string>
+ <!-- Title text for mouse pointer stroke style. [CHAR LIMIT=35] -->
+ <string name="pointer_stroke_style">Pointer stroke style</string>
+ <!-- White value for pointer stroke style. [CHAR LIMIT=35] -->
+ <string name="pointer_stroke_style_name_white">White</string>
+ <!-- Black value pointer stroke style. [CHAR LIMIT=35] -->
+ <string name="pointer_stroke_style_name_black">Black</string>
+ <!-- None value for pointer stroke style. [CHAR LIMIT=35] -->
+ <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>
<!-- Search keywords for "touchpad" -->
@@ -4571,6 +4616,12 @@
<!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->
<string name="pointer_speed">Pointer speed</string>
+ <!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
+ <string name="pointer_scale">Pointer scale</string>
+ <!-- Content description for decreasing pointer scale. [CHAR LIMIT=35] -->
+ <string name="pointer_scale_decrease_content_description">Decrease pointer scale</string>
+ <!-- Setting for mouse pointer scale. [CHAR LIMIT=35] -->
+ <string name="pointer_scale_increase_content_description">Increase pointer scale</string>
<!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
<string name="game_controller_settings_category">Game Controller</string>
@@ -4841,8 +4892,10 @@
<string name="accessibility_magnification_triple_tap_warning_negative_button">Cancel</string>
<!-- Title for the accessibility preference screen to enable screen magnification settings. [CHAR LIMIT=35] -->
<string name="accessibility_magnification_service_settings_title">Magnification settings</string>
- <!-- Title for accessibility magnification preference where user can move the magnification area by dragging one finger instead of two. [CHAR LIMIT=60] -->
- <string name="accessibility_magnification_one_finger_panning_title">One-finger panning</string>
+ <!-- Title for accessibility magnification preference where user can move the magnification area by dragging one finger. [CHAR LIMIT=60] -->
+ <string name="accessibility_magnification_one_finger_panning_title">Move magnifier with 1 finger</string>
+ <!-- Summary for accessibility magnification one finger panning feature where user can move the magnification area by dragging one finger. [CHAR LIMIT=60] -->
+ <string name="accessibility_magnification_one_finger_panning_summary">Drag 1 finger to move around the screen</string>
<!-- Summary for accessibility magnification preference when one finger panning feature is turned on.
The feature when enabled allows user to move the magnification area by dragging one finger instead of two. [CHAR LIMIT=60] -->
<string name="accessibility_magnification_one_finger_panning_summary_on">Move the magnification area by dragging one finger.</string>
@@ -4906,6 +4959,30 @@
{4,number,integer}. Lift finger to stop magnification
]]>
</string>
+ <!-- Instructions on the accessibility preference screen teaching the user how to interact with screen magnification when one finger panning feature is turned off. [CHAR LIMIT=none] -->
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_off">
+ <![CDATA[
+ <b>To zoom in:</b><br/>
+ {0,number,integer}. Use shortcut to start magnification<br/>
+ {1,number,integer}. Tap the screen<br/>
+ {2,number,integer}. Drag 2 fingers to move around the screen<br/>
+ {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/>
+ {4,number,integer}. Use shortcut to stop magnification<br/><br/>
+ You can also zoom in temporarily and more.
+ ]]>
+ </string>
+ <!-- Instructions on the accessibility preference screen teaching the user how to interact with screen magnification when one finger panning feature is turned on. [CHAR LIMIT=none] -->
+ <string name="accessibility_screen_magnification_summary_one_finger_panning_on">
+ <![CDATA[
+ <b>To zoom in:</b><br/>
+ {0,number,integer}. Use shortcut to start magnification<br/>
+ {1,number,integer}. Tap the screen<br/>
+ {2,number,integer}. Drag 1 or 2 fingers to move around the screen<br/>
+ {3,number,integer}. Pinch with 2 fingers to adjust zoom<br/>
+ {4,number,integer}. Use shortcut to stop magnification<br/><br/>
+ You can also zoom in temporarily and more.
+ ]]>
+ </string>
<!-- Summary for the accessibility preference screen to enable screen magnification via the nav bar. [CHAR LIMIT=none] -->
<string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, you can zoom in on your screen.\n\n<b>To zoom</b>, start magnification, then tap anywhere on the screen.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, start magnification, then touch & hold anywhere on the screen.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>
<!-- Accessibility label for paging indicator in accessibility tutorial page. [CHAR LIMIT=NONE] -->
@@ -4980,10 +5057,6 @@
<string name="accessibility_shortcut_edit_dialog_title_software_by_gesture">Accessibility gesture</string>
<!-- Summary for software shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<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 & hold the accessibility button.</string>
- <!-- Summary for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation is enabled. [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_summary_software_gesture">Swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.</string>
- <!-- Summary for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation and touch exploration are enabled [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback">Swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold.</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.}
@@ -5013,8 +5086,6 @@
<string name="accessibility_shortcut_hardware_keyword">volume keys</string>
<!-- Summary for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_summary_hardware">Press & hold both volume keys</string>
- <!-- Title for two finger double tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_title_two_finger_double_tap">Two-finger double-tap screen</string>
<!-- Title for 2-finger double tap shortcut in accessibility edit shortcut screen. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_screen_title_two_finger_double_tap">%1$d-finger double tap</string>
<!-- Summary for 2-finger double tap shortcut in accessibility edit shortcut screen. [CHAR LIMIT=NONE] -->
@@ -5025,14 +5096,8 @@
<string name="accessibility_shortcut_edit_screen_summary_triple_tap">Quickly tap the screen %1$d times. This may slow down your device.</string>
<!-- 2-finger double tap is shown as part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_two_finger_double_tap_keyword">%1$d-finger double tap</string>
- <!-- Summary for two finger double tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_summary_two_finger_double_tap">Quickly tap screen {0,number,integer} times with two fingers</string>
- <!-- Title for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_title_triple_tap">Triple-tap screen</string>
<!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_triple_tap_keyword">triple tap</string>
- <!-- Summary for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_shortcut_edit_dialog_summary_triple_tap">Quickly tap screen {0,number,integer} times. This shortcut may slow down your device</string>
<!-- Title for the accessibility edit shortcut dialog to save the preference when user clicks it. [CHAR LIMIT=20] -->
<string name="accessibility_shortcut_edit_dialog_title_advance">Advanced</string>
<!-- Summary text appearing on the accessibility preference screen to enable screen magnification from the nav bar when the feature is enabled, but the accessibility button is not configured correctly for the feature to be used [CHAR LIMIT=none] -->
@@ -5400,6 +5465,8 @@
<string name="daltonizer_mode_grayscale_title">Grayscale</string>
<!-- Title shown for settings that controls color correction saturation level [CHAR LIMIT=45] -->
<string name="daltonizer_saturation_title">Intensity</string>
+ <!-- The summary shown for settings that controls color correction intensity/saturation level. It is shown when intensity slider is grayed out and is not usable and it explains why it's not usable to the user. [CHAR LIMIT=NONE] -->
+ <string name="daltonizer_saturation_unavailable_summary">Unavailable for grayscale mode or when color correction is disabled</string>
<!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
<string name="daltonizer_mode_deuteranomaly_summary">Green weak, deuteranomaly</string>
<!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
@@ -5520,12 +5587,6 @@
<string name="color_magenta">Magenta</string>
<!-- Label for custom colors, formats as a HTML color. -->
<string name="color_custom" translatable="false">#%1$02X%2$02X%3$02X</string>
-
- <!-- Title for a warning about security implications of enabling an accessibility
- service. [CHAR LIMIT=NONE] -->
- <string name="enable_service_title">Allow
- <xliff:g id="service" example="TalkBack">%1$s</xliff:g> to have full control of your
- device?</string>
<!-- Title for the list of capabilities of an accessibility service. -->
<string name="capabilities_list_title"><xliff:g id="service" example="TalkBack">%1$s</xliff:g>
needs to:</string>
@@ -5535,35 +5596,6 @@
<string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
can’t verify your response.</string>
- <!-- Warning that explains that accessibility services have a lot of access to user data [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_warning"><xliff:g id="service"
- example="TalkBack">%1$s</xliff:g> is requesting full control of this device. The service
- can read the screen and act on behalf of users with accessibility needs.
- This level of control is not appropriate for most apps.
- </string>
-
- <!-- Warning description that explains that it's appropriate for accessibility
- services to have full control to help users with accessibility needs. [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_warning_description">Full control is appropriate for apps
- that help you with accessibility needs, but not for most apps.
- </string>
-
- <!-- Title for the screen control in accessibility dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_screen_control_title">View and control screen</string>
-
- <!-- Description for the screen control in accessibility dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_screen_control_description">It can read all content on the
- screen and display content over other apps.
- </string>
-
- <!-- Title for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_action_perform_title">View and perform actions</string>
-
- <!-- Description for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->
- <string name="accessibility_service_action_perform_description">It can track your interactions
- with an app or a hardware sensor, and interact with apps on your behalf.
- </string>
-
<!-- String for the allow button in accessibility permission dialog. [CHAR LIMIT=10] -->
<string name="accessibility_dialog_button_allow">Allow</string>
<!-- String for the deny button in accessibility permission dialog. [CHAR LIMIT=10] -->
@@ -7268,6 +7300,8 @@
<string name="help_url_install_certificate" translatable="false"></string>
<!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
<string name="help_url_nfc_payment" translatable="false"></string>
+ <!-- Help URL, External display [DO NOT TRANSLATE] -->
+ <string name="help_url_external_display" translatable="false"></string>
<!-- Help URL, Remote display [DO NOT TRANSLATE] -->
<string name="help_url_remote_display" translatable="false"></string>
<!-- Help URL, Face [DO NOT TRANSLATE] -->
@@ -7927,6 +7961,37 @@
<!-- Zen Modes: Summary for the Do not Disturb option and associated settings page. [CHAR LIMIT=240]-->
<string name="zen_mode_settings_summary">Only get notified by important people and apps</string>
+ <!-- Zen Modes: Option to add an automatic schedule for a mode. [CHAR_LIMIT=40] -->
+ <string name="zen_mode_select_schedule">Select activation type</string>
+
+ <!-- Priority Modes: Option to choose a time-based schedule for a mode. [CHAR_LIMIT=40] -->
+ <string name="zen_mode_select_schedule_time">Time</string>
+ <!-- Priority Modes: Example text for the option to choose a time-based schedule for a mode. [CHAR_LIMIT=60] -->
+ <string name="zen_mode_select_schedule_time_example">Ex. \"9:30 – 5:00 PM\"</string>
+
+ <!-- Priority Modes: Option to choose a calendar-events-based schedule for a mode. [CHAR_LIMIT=40] -->
+ <string name="zen_mode_select_schedule_calendar">Calendar</string>
+ <!-- Priority Modes: Example text for the option to choose a calendar-events-based schedule for a mode. [CHAR_LIMIT=60] -->
+ <string name="zen_mode_select_schedule_calendar_example">Ex. \"Personal calendar\"</string>
+
+ <!-- Priority Modes: Short text that indicates that a mode is currently on (active). [CHAR_LIMIT=10] -->
+ <string name="zen_mode_active_text">ON</string>
+
+ <!-- Priority Modes: Format string for the "current state + trigger description summary for rules in the list. [CHAR_LIMIT=10] -->
+ <string name="zen_mode_format_status_and_trigger" translatable="false"><xliff:g id="current_status" example="ON">%1$s</xliff:g> • <xliff:g id="trigger_description" example="Mon-Fri, 23:00-7:00">%2$s</xliff:g></string>
+
+ <!-- Priority Modes: Indicates that a mode is disabled and needs to be configured. [CHAR_LIMIT=40] -->
+ <string name="zen_mode_disabled_needs_setup">Not set</string>
+
+ <!-- Priority Modes: Indicates that a mode is disabled by the user. [CHAR_LIMIT=40] -->
+ <string name="zen_mode_disabled_by_user">Disabled</string>
+
+ <!-- Priority Modes: Title of the "Create a mode" dialog, to choose the mode type. [CHAR_LIMIT=30] -->
+ <string name="zen_mode_new_title">Create a mode</string>
+
+ <!-- Priority Modes: Option to add a "custom" mode in the "Add a mode" dialog. [CHAR_LIMIT=20] -->
+ <string name="zen_mode_new_option_custom">Custom</string>
+
<!-- Subtitle for the Do not Disturb slice. [CHAR LIMIT=50]-->
<string name="zen_mode_slice_subtitle">Limit interruptions</string>
@@ -7942,9 +8007,18 @@
<!-- Do not disturb: Title for dialog that allows users to delete DND rules/schedules[CHAR LIMIT=40] -->
<string name="zen_mode_delete_automatic_rules">Delete schedules</string>
- <!-- Do not disturb: Delete text button presented in a dialog to confirm the user would like to delete the selected DND rules. [CHAR LIMIT=30] -->
+ <!-- Do not disturb: Delete text button presented in a dialog to confirm the user would like to delete the selected DND rules. [CHAR LIMIT=30] -->
<string name="zen_mode_schedule_delete">Delete</string>
+ <!-- Priority Modes: Menu option for renaming a mode on its configuration page [CHAR LIMIT=40] -->
+ <string name="zen_mode_menu_rename_mode">Rename</string>
+
+ <!-- Do not disturb: Menu option for deleting a mode on its configuration page [CHAR LIMIT=40] -->
+ <string name="zen_mode_menu_delete_mode">Delete</string>
+
+ <!-- Do not disturb: Confirmation dialog asking the user whether they would like to delete the named mode [CHAR LIMIT: 40] -->
+ <string name="zen_mode_delete_mode_confirmation">Delete \"<xliff:g id="mode" example="My Schedule">%1$s</xliff:g>\" mode?</string>
+
<!-- Do not disturb: Edit label for button that allows user to edit the dnd schedule name. [CHAR LIMIT=30] -->
<string name="zen_mode_rule_name_edit">Edit</string>
@@ -7975,6 +8049,9 @@
<!-- Duration in hours and minutes for the length of a Do Not Disturb schedule. For example "1 hr, 22 min" -->
<string name="zen_mode_schedule_duration"><xliff:g example="10" id="hours">%1$d</xliff:g> hr, <xliff:g example="20" id="minutes">%2$d</xliff:g> min</string>
+ <!-- Priority Modes: Label for switch to enable/disable a rule turning on automatically; links to an app-provided configuration page [CHAR LIMIT=40] -->
+ <string name="zen_mode_configuration_link_title">Turn on automatically</string>
+
<!-- Do not disturb: Title do not disturb settings representing automatic (scheduled) do not disturb rules. [CHAR LIMIT=30] -->
<string name="zen_mode_schedule_category_title">Schedule</string>
@@ -8002,11 +8079,19 @@
<!-- Do not disturb: Subtitle for the Visual signals option to toggle on/off visual signals/alerts when the screen is on/when screen is off. [CHAR LIMIT=30] -->
<string name="zen_mode_visual_signals_settings_subtitle">Allow visual signals</string>
- <!-- Do not disturb: mode page section title [CHAR LIMIT=80] -->
- <string name="mode_interruption_filter_title">Notifications that can reach you</string>
- <!-- Do not disturb: mode page section title [CHAR LIMIT=80] -->
+ <!-- Priority Modes: mode page section title [CHAR LIMIT=80] -->
+ <string name="mode_interruption_filter_title">Stay focused</string>
+ <!-- Priority Modes: mode page section title [CHAR LIMIT=80] -->
<string name="mode_device_effects_title">Additional actions</string>
+ <!-- Summary for the Sound Do not Disturb option when DND isn't currently on. [CHAR LIMIT=NONE]-->
+ <string name="modes_sound_summary_off">
+ {count, plural,
+ =0 {Off}
+ =1 {Off / 1 mode can turn on automatically}
+ other {Off / # modes can turn on automatically}
+ }
+ </string>
<!-- Do not disturb: display settings title [CHAR LIMIT=80] -->
<string name="mode_display_settings_title">Display settings</string>
@@ -8047,7 +8132,10 @@
other {{effect_1}, {effect_2}, and # more}
}
</string>
-
+ <!-- Modes: setting for whether the mode should filter (silence/hide) notifications/volume streams -->
+ <string name="mode_notification_filter_title">Filter interruptions</string>
+ <!-- Modes: subtext when a mode is not filtering (silence/hide) notifications/volume streams -->
+ <string name="mode_no_notification_filter">No interruptions are filtered</string>
<!-- Do not disturb: restrict notifications settings title [CHAR LIMIT=80] -->
<string name="zen_mode_restrict_notifications_title">Display options for filtered
@@ -8369,6 +8457,9 @@
<!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=50 BACKUP_MESSAGE_ID=5125022693565388760] -->
<string name="notification_badging_title">Notification dot on app icon</string>
+ <!-- App Info > Notifications: Title for section where notifications bundles can be configured [CHAR LIMIT=80]-->
+ <string name="notification_bundles">Notification bundles</string>
+
<!-- Configure Notifications: Title for the notification bubbles option. [CHAR LIMIT=60] -->
<string name="notification_bubbles_title">Bubbles</string>
<!-- Title for the toggle shown on the app-level bubbles page [CHAR LIMIT=60] -->
@@ -8735,9 +8826,10 @@
<string name="notif_listener_more_settings_desc">More settings are available inside this app</string>
<!-- Title for Polite Notifications setting [CHAR LIMIT=45]-->
- <string name="notification_polite_title">Adaptive Notifications</string>
- <string name="notification_polite_main_control_title">Use adaptive notifications</string>
- <string name="notification_polite_description">When you get many notifications within a short time, your phone will lower volume and minimize pop-ups on screen for up to two minutes. Calls, alarms, and priority conversations still vibrate, make a sound, or show up on the screen, and all notifications are easy to find when you pull down from the top of the screen.</string>
+ <string name="notification_polite_title">Notification cooldown</string>
+ <string name="notification_polite_main_control_title">Use notification cooldown</string>
+ <string name="notification_polite_description">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">Apply to work profiles</string>
<string name="notification_polite_work_summary">Apply to work profile apps</string>
@@ -8907,6 +8999,9 @@
<!-- [CHAR LIMIT=NONE] App notification settings: no channels -->
<string name="no_channels">This app has not posted any notifications</string>
+ <!-- [CHAR LIMIT=NONE] App notification settings: has channels, but hasn't sent notifications recently -->
+ <string name="no_recent_channels">Show unused categories</string>
+
<!-- [CHAR LIMIT=NONE] App notification settings: link to app notification settings-->
<string name="app_settings_link">Additional settings in the app</string>
@@ -9212,8 +9307,6 @@
<string name="zen_mode_apps_priority_apps">Selected apps</string>
<!-- [CHAR LIMIT=60] Zen mode settings: no apps will be able to bypass dnd -->
<string name="zen_mode_apps_none_apps">None</string>
- <!-- [CHAR LIMIT=60] Zen mode settings: all apps will be able to bypass dnd -->
- <string name="zen_mode_apps_all_apps">All</string>
<!-- [CHAR LIMIT=NONE] Zen mode settings: Lists apps that can bypass DND. For example, "Nest, Messages, and 2 more can interrupt". -->
<string name="zen_mode_apps_subtext">
{count, plural, offset:2
@@ -9224,6 +9317,12 @@
other {{app_1}, {app_2}, and # more can interrupt}
}
</string>
+ <!-- Priority 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>
+ <!-- Priority 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>
<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND -->
<string name="zen_mode_bypassing_apps">Allow apps to override</string>
@@ -9280,6 +9379,8 @@
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
<string name="zen_mode_people_some">Some people can interrupt</string>
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
+ <string name="zen_mode_people_repeat_callers">Repeat callers can interrupt</string>
+ <!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
<string name="zen_mode_people_all">All people can interrupt</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
@@ -9325,14 +9426,60 @@
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
<string name="zen_mode_summary_always">Change to always interrupt</string>
- <!-- [CHAR LIMIT=20] Caption of the action button to change the name of a mode. -->
- <string name="zen_mode_action_change_name">Rename</string>
+ <!-- Priority Modes: Title for the "rename mode" screen [CHAR LIMIT=20] -->
+ <string name="zen_mode_rename_title">Edit mode</string>
- <!-- [CHAR LIMIT=20] Caption of the action button to change the icon of a mode. -->
- <string name="zen_mode_action_change_icon">Change icon</string>
+ <!-- Priority Modes: Title for the "add mode" screen [CHAR LIMIT=20] -->
+ <string name="zen_mode_new_custom_title">Add mode</string>
- <!-- [CHAR LIMIT=40] Zen mode settings: Title for the "choose mode icon" screen -->
- <string name="zen_mode_icon_picker_title">Change icon</string>
+ <!-- Priority Modes: Default name for new custom modes [CHAR LIMIT=30] -->
+ <string name="zen_mode_new_custom_default_name">Custom mode</string>
+
+ <!-- Priority Modes: Hint for the EditText for editing a mode's name [CHAR LIMIT=30] -->
+ <string name="zen_mode_edit_name_hint">Mode name</string>
+
+ <!-- Priority Modes: Trigger title for modes of type SCHEDULE_CALENDAR. [CHAR LIMIT=30] -->
+ <string name="zen_mode_trigger_title_schedule_calendar">Calendar events</string>
+ <!-- Priority Modes: Trigger title for modes of type BEDTIME. [CHAR LIMIT=30] -->
+ <string name="zen_mode_trigger_title_bedtime">Sleep schedule</string>
+ <!-- Priority Modes: Trigger title for modes of type DRIVING. [CHAR LIMIT=30] -->
+ <string name="zen_mode_trigger_title_driving">While driving</string>
+ <!-- Priority Modes: Generic trigger title for modes of other types [CHAR LIMIT=30] -->
+ <string name="zen_mode_trigger_title_generic">Linked to app</string>
+ <!-- Priority Modes: Generic trigger summary for modes where the owner app did not provide a triggerDescription but did provide a configurationActivity to call [CHAR LIMIT=60] -->
+ <string name="zen_mode_trigger_summary_settings_in_app">Info and settings in <xliff:g id="app_name" example="The Awesome App">%1$s</xliff:g></string>
+ <!-- Priority Modes: Generic trigger summary for modes where the owner app did not provide neither a triggerDescription nor a configurationActivity to call [CHAR LIMIT=60] -->
+ <string name="zen_mode_trigger_summary_managed_by_app">Managed by <xliff:g id="app_name" example="The Awesome App">%1$s</xliff:g></string>
+
+ <!-- Priority Modes: Title of the confirmation dialog for disabling an enabled mode [CHAR LIMIT=30] -->
+ <string name="zen_mode_confirm_disable_title">Disable Mode</string>
+ <!-- Priority Modes: Message body of the confirmation dialog for disabling an enabled mode [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_confirm_disable_message">If you disable this feature, the mode will no longer work as intended and its settings will be hidden.</string>
+ <!-- Priority Modes: Button to disable a mode [CHAR LIMIT=20] -->
+ <string name="zen_mode_action_disable">Disable</string>
+ <!-- Priority Modes: Title of the confirmation dialog for enabling a disabled mode [CHAR LIMIT=30] -->
+ <string name="zen_mode_confirm_enable_title">Enable Mode</string>
+ <!-- Priority Modes: Message body of the confirmation dialog for enabling a disabled mode [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_confirm_enable_message">If you enable this feature, the mode will activate automatically according to its schedule.</string>
+ <!-- Priority Modes: Button to disable a mode [CHAR LIMIT=20] -->
+ <string name="zen_mode_action_enable">Enable</string>
+
+ <!-- Priority Modes: Blurb for a mode that activates during a fixed time schedule (e.g. 9:00-17:00). [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_schedule_time">Set a mode that follows a regular schedule</string>
+ <!-- Priority Modes: Blurb for a mode that activates during calendar events. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_schedule_calendar">Set a mode to sync with calendar events and invite responses</string>
+ <!-- Priority Modes: Blurb for a mode of type BEDTIME. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_bedtime">Design a calming sleep routine. Set alarms, dim the screen, and block notifications.</string>
+ <!-- Priority Modes: Blurb for a mode of type DRIVING. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_driving">Prioritize safety on the road for a focused and distraction-free drive</string>
+ <!-- Priority Modes: Blurb for a mode of type IMMERSIVE. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_immersive">Block distractions or interruptions from your device to gain focus</string>
+ <!-- Priority Modes: Blurb for a mode of type THEATER. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_theater">Eliminate all distractions for a quiet environment</string>
+ <!-- Priority Modes: Blurb for a mode of type MANAGED. [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_managed">Personalize device experiences and settings for different users</string>
+ <!-- Priority Modes: Blurb for modes that are not of a specific type (OTHER, UNKNOWN). [CHAR LIMIT=NONE] -->
+ <string name="zen_mode_blurb_generic">Minimize interruptions by only allowing important people and apps to reach you</string>
<!-- Content description for help icon button [CHAR LIMIT=20] -->
<string name="warning_button_text">Warning</string>
@@ -12091,10 +12238,12 @@
<!-- Default title for the settings panel [CHAR LIMIT=NONE] -->
<string name="settings_panel_title">Settings Panel</string>
- <!-- UI debug setting: force desktop mode [CHAR LIMIT=50] -->
- <string name="force_desktop_mode">Force desktop mode</string>
- <!-- UI debug setting: force desktop mode summary [CHAR LIMIT=NONE] -->
- <string name="force_desktop_mode_summary">Force experimental desktop mode on secondary displays</string>
+ <!-- Title for a toggle that enables freeform windowing experiences. Freeform windowing experiences are features involving apps running in resizable windows. [CHAR LIMIT=50] -->
+ <string name="enable_desktop_mode">Enable freeform windowing experiences</string>
+
+ <!-- Title for a toggle that enables desktop mode on secondary display. [CHAR LIMIT=50] -->
+ <string name="enable_desktop_mode_on_secondary_display">Enable desktop mode on secondary display</string>
+
<!-- UI debug setting: enable non-resizables in multi window [CHAR LIMIT=60] -->
<string name="enable_non_resizable_multi_window">Enable non-resizable in multi window</string>
<!-- UI debug setting: enable non-resizables in multi window summary [CHAR LIMIT=NONE] -->
@@ -12549,9 +12698,6 @@
<!-- Provider Model: Link text to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->
<string name="wifi_scan_change">Change</string>
- <!-- Summary text separator for preferences including a short description
- (eg. "Connected / 5G"). [CHAR LIMIT=50] -->
- <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>
<!-- Provider Model:
Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
<string name="mobile_data_connection_active">Connected</string>
@@ -12627,7 +12773,7 @@
<string name="default_print_service_main_switch_title">Use print service</string>
<!-- Title for multiple users main switch. [CHAR LIMIT=50] -->
- <string name="multiple_users_main_switch_title">Allow multiple users</string>
+ <string name="multiple_users_main_switch_title">Allow user switch</string>
<!-- Search keywords for the "Allow Multiple Users" section in Multiple Users Screen. [CHAR LIMIT=NONE] -->
<string name="multiple_users_main_switch_keywords">allow, multiple, user, permit, many</string>
<!-- Search keywords for the Users Screen. [CHAR LIMIT=NONE] -->
@@ -13056,14 +13202,12 @@
<!-- The content description for accessibility tools of the customize button. It specifies which screensaver the user is customizing [CHAR LIMIT=NONE] -->
<string name="customize_button_description">Customize <xliff:g id="screensaver_name" example="Art Gallery">%1$s</xliff:g></string>
- <!-- Dialog body text used to explain a reboot is required after enabling freeform support for
- it to work [CHAR LIMIT=none] -->
- <string name="reboot_dialog_enable_freeform_support">A reboot is required to enable freeform
- support.</string>
- <!-- Dialog body text used to explain a reboot is required after forcing desktop mode on
- secondary dislays. [CHAR LIMIT=none] -->
- <string name="reboot_dialog_force_desktop_mode">A reboot is required to force desktop mode on
- secondary displays.</string>
+ <!-- Dialog body text used to explain a reboot is required after enabling freeform window support for it to work. Freeform window is when an app runs in a resizable window. [CHAR LIMIT=none] -->
+ <string name="reboot_dialog_enable_freeform_support">A reboot is required to enable freeform window support.</string>
+ <!-- Dialog body text used to explain a reboot is required after updating availability of freeform windowing experiences. Freeform windowing experiences are features involving apps running in resizable windows. [CHAR LIMIT=none] -->
+ <string name="reboot_dialog_override_desktop_mode">A reboot is required to update availability of freeform windowing experiences.</string>
+ <!-- Dialog body text used to explain a reboot is required after enabling desktop mode on secondary displays. [CHAR LIMIT=none] -->
+ <string name="reboot_dialog_enable_desktop_mode_on_secondary_display">A reboot is required to enable desktop mode on secondary displays.</string>
<!-- Text on the dialog button to reboot the device now [CHAR LIMIT=50] -->
<string name="reboot_dialog_reboot_now">Reboot now</string>
<!-- Text on the dialog button to reboot the device later [CHAR LIMIT=50] -->
@@ -13344,6 +13488,10 @@
<string name="live_caption_disabled">Off</string>
<!-- Summary of the Live Caption enabled state. -->
<string name="live_caption_enabled">On</string>
+ <!-- State description for the Audio Balance seek bar, with left reported before right. -->
+ <string name="audio_seek_bar_state_left_first">Audio %1$d%% left, %2$d%% right</string>
+ <!-- State description for the Audio Balance seek bar, with right reported before left. -->
+ <string name="audio_seek_bar_state_right_first">Audio %1$d%% right, %2$d%% left</string>
<!-- Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
<string name="about_phone_device_name_warning">Your device name is visible to apps you installed. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
@@ -13584,8 +13732,13 @@
<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] -->
<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>
+ <!-- Text for audio sharing qrcode scanner [CHAR LIMIT=none]-->
+ <string name="audio_streams_qr_code_scanner_label">QR code scanner</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>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0bd0406..c02378e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -955,11 +955,16 @@
<item name="biometricsEnrollProgressHelpWithTalkback">@color/udfps_enroll_progress_help_with_talkback</item>
</style>
- <style name="ScreenLockPasswordHintTextFontStyle">
+ <style name="ScreenLockPasswordHintTextFontStyleError">
<item name="android:textColor">?android:attr/colorError</item>
<item name="android:fontFamily">google-sans-text</item>
</style>
+ <style name="ScreenLockPasswordHintTextFontStyle">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:fontFamily">google-sans-text</item>
+ </style>
+
<style name="PrivateSpaceSetupTextFontStyle" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-text</item>
@@ -982,14 +987,15 @@
</style>
<style name="PrivateSpaceBulletPointTextFontStyle" parent="@style/PrivateSpaceSetupTextFontStyle">
- <item name="android:paddingLeft">16dp</item>
+ <item name="android:paddingStart">16dp</item>
<item name="android:textSize">16sp</item>
+ <item name="android:textAlignment">viewStart</item>
</style>
<style name="PrivateSpaceBulletPointIconStyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_alignParentLeft">true</item>
+ <item name="android:layout_alignParentStart">true</item>
<item name="android:layout_alignParentTop">true</item>
</style>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 1f77030..8dc5f3b 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -32,24 +32,28 @@
android:key="daltonizer_mode_deuteranomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_deuteranomaly_summary"
- android:title="@string/daltonizer_mode_deuteranomaly_title" />
+ android:title="@string/daltonizer_mode_deuteranomaly_title"
+ settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_protanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_protanomaly_summary"
- android:title="@string/daltonizer_mode_protanomaly_title" />
+ android:title="@string/daltonizer_mode_protanomaly_title"
+ settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_tritanomaly"
android:persistent="false"
android:summary="@string/daltonizer_mode_tritanomaly_summary"
- android:title="@string/daltonizer_mode_tritanomaly_title" />
+ android:title="@string/daltonizer_mode_tritanomaly_title"
+ settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settingslib.widget.SelectorWithWidgetPreference
android:key="daltonizer_mode_grayscale"
android:persistent="false"
- android:title="@string/daltonizer_mode_grayscale_title" />
+ android:title="@string/daltonizer_mode_grayscale_title"
+ settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />
<com.android.settings.widget.SeekBarPreference
android:key="daltonizer_saturation"
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index f96a375..1eee0cb 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -50,11 +50,22 @@
settings:controller="com.android.settings.notification.app.BubbleSummaryPreferenceController">
</Preference>
+ <!-- Bundles added here -->
+ <PreferenceCategory
+ android:key="bundles"
+ android:title="@string/notification_bundles"
+ android:visibility="gone" />
+
<!-- Channels/Channel groups added here -->
<PreferenceCategory
android:key="channels"
android:layout="@layout/empty_view" />
+ <Preference
+ android:key="more"
+ android:title="@string/no_recent_channels"
+ android:icon="@drawable/ic_expand"/>
+
<!-- Importance toggle -->
<com.android.settingslib.RestrictedSwitchPreference
android:key="allow_sound"
diff --git a/res/xml/bluetooth_audio_streams_dialog.xml b/res/xml/bluetooth_audio_streams_dialog.xml
index 8b20a14..d2b3933 100644
--- a/res/xml/bluetooth_audio_streams_dialog.xml
+++ b/res/xml/bluetooth_audio_streams_dialog.xml
@@ -45,6 +45,7 @@
<TextView
android:id="@+id/dialog_title"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Headline"
+ android:textColor="?android:attr/textColorPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
@@ -54,6 +55,7 @@
<TextView
android:id="@+id/dialog_subtitle"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+ android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -65,6 +67,7 @@
<TextView
android:id="@+id/dialog_subtitle_2"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+ android:textColor="?android:attr/textColorSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index b673a083..1e5b241 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -135,6 +135,15 @@
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
/>
+ <com.android.settingslib.RestrictedPreference
+ android:key="modes_notifications"
+ android:order="18"
+ android:title="@string/zen_modes_list_title"
+ settings:useAdminDisabledSummary="true"
+ android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+ settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
+ />
+
<SwitchPreferenceCompat
android:key="lock_screen_show_only_unseen_notifs"
android:order="19"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 866a529..88abadb 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -738,14 +738,16 @@
android:summary="@string/force_resizable_activities_summary" />
<SwitchPreferenceCompat
+ android:key="override_desktop_mode_features"
+ android:title="@string/enable_desktop_mode" />
+
+ <SwitchPreferenceCompat
android:key="enable_freeform_support"
- android:title="@string/enable_freeform_support"
- android:summary="@string/enable_freeform_support_summary" />
+ android:title="@string/enable_freeform_support" />
<SwitchPreferenceCompat
android:key="force_desktop_mode_on_external_displays"
- android:title="@string/force_desktop_mode"
- android:summary="@string/force_desktop_mode_summary" />
+ android:title="@string/enable_desktop_mode_on_secondary_display"/>
<SwitchPreferenceCompat
android:key="enable_non_resizable_multi_window"
diff --git a/res/xml/external_display_resolution_settings.xml b/res/xml/external_display_resolution_settings.xml
new file mode 100644
index 0000000..6ac6b1a
--- /dev/null
+++ b/res/xml/external_display_resolution_settings.xml
@@ -0,0 +1,20 @@
+<?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/external_display_resolution_settings_title">
+</PreferenceScreen>
diff --git a/res/xml/external_display_settings.xml b/res/xml/external_display_settings.xml
new file mode 100644
index 0000000..e4dc5bb
--- /dev/null
+++ b/res/xml/external_display_settings.xml
@@ -0,0 +1,21 @@
+<?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/external_display_settings_title">
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 167f9d9..4613cb0 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/languages_settings">
+ android:title="@string/languages_settings"
+ android:key="languages_settings">
<PreferenceCategory
android:key="languages_category"
android:title="@string/locale_picker_category_title">
@@ -68,4 +69,4 @@
android:fragment="com.android.settings.tts.TextToSpeechSettings"
settings:searchable="false"/>
</PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/languages.xml b/res/xml/languages.xml
index 844b7fa..d478aa1 100644
--- a/res/xml/languages.xml
+++ b/res/xml/languages.xml
@@ -18,7 +18,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/language_picker_title">
+ android:title="@string/language_picker_title"
+ android:key="system_languages">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/desc_introduction_of_language_picker"
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index eb9f442..51cbbe6 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -85,13 +85,9 @@
android:summary="@string/auto_data_switch_summary"
settings:controller="com.android.settings.network.telephony.AutoDataSwitchPreferenceController"/>
- <com.android.settingslib.RestrictedSwitchPreference
+ <com.android.settings.spa.preference.ComposePreference
android:key="button_roaming_key"
android:title="@string/roaming"
- android:persistent="false"
- android:summaryOn="@string/roaming_enable"
- android:summaryOff="@string/roaming_disable"
- settings:userRestriction="no_data_roaming"
settings:controller="com.android.settings.network.telephony.RoamingPreferenceController"/>
<Preference
diff --git a/res/xml/modes_display_settings.xml b/res/xml/modes_display_settings.xml
index 53268ec..98db7b8 100644
--- a/res/xml/modes_display_settings.xml
+++ b/res/xml/modes_display_settings.xml
@@ -24,22 +24,27 @@
android:title="@string/mode_display_options_section">
<Preference
android:key="notification_visibility"
- android:title="@string/zen_mode_restrict_notifications_title" />
+ android:title="@string/zen_mode_restrict_notifications_title"
+ android:icon="@drawable/ic_zen_mode_category_display" />
<SwitchPreferenceCompat
android:key="effect_greyscale"
android:title="@string/mode_grayscale_title"
- android:summary="@string/mode_grayscale_summary"/>
+ android:summary="@string/mode_grayscale_summary"
+ android:icon="@drawable/ic_zen_mode_display_grayscale" />
<SwitchPreferenceCompat
android:key="effect_aod"
android:title="@string/mode_aod_title"
- android:summary="@string/mode_aod_summary"/>
+ android:summary="@string/mode_aod_summary"
+ android:icon="@drawable/ic_zen_mode_display_aod" />
<SwitchPreferenceCompat
android:key="effect_wallpaper"
android:title="@string/mode_wallpaper_title"
- android:summary="@string/mode_wallpaper_summary"/>
+ android:summary="@string/mode_wallpaper_summary"
+ android:icon="@drawable/ic_zen_mode_display_wallpaper" />
<SwitchPreferenceCompat
android:key="effect_dark_theme"
android:title="@string/mode_dark_theme_title"
- android:summary="@string/mode_dark_theme_summary"/>
+ android:summary="@string/mode_dark_theme_summary"
+ android:icon="@drawable/ic_zen_mode_display_dark_theme" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/modes_icon_picker.xml b/res/xml/modes_edit_name_icon.xml
similarity index 71%
rename from res/xml/modes_icon_picker.xml
rename to res/xml/modes_edit_name_icon.xml
index cb0ff30..2109c77 100644
--- a/res/xml/modes_icon_picker.xml
+++ b/res/xml/modes_edit_name_icon.xml
@@ -18,20 +18,30 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="zen_mode_icon_picker_page"
+ android:key="zen_mode_edit_name_icon"
settings:searchable="false"
- android:title="@string/zen_mode_icon_picker_title">
+ android:title="@string/zen_mode_rename_title">
<com.android.settingslib.widget.LayoutPreference
- android:key="current_icon"
+ android:key="chosen_icon"
android:layout="@layout/settings_entity_header" />
<com.android.settings.applications.SpacePreference
android:layout_height="16dp" />
<com.android.settingslib.widget.LayoutPreference
+ android:key="name"
+ android:layout="@layout/modes_edit_name" />
+
+ <com.android.settings.applications.SpacePreference
+ android:layout_height="32dp" />
+
+ <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="done"
+ android:layout="@layout/modes_edit_done_button" />
</PreferenceScreen>
diff --git a/res/xml/modes_people_settings.xml b/res/xml/modes_people_settings.xml
index 136a357..d58b2d7 100644
--- a/res/xml/modes_people_settings.xml
+++ b/res/xml/modes_people_settings.xml
@@ -26,10 +26,12 @@
<Preference
android:key="zen_mode_people_messages"
- android:title="@string/zen_mode_messages_title"/>
+ android:title="@string/zen_mode_messages_title"
+ android:icon="@drawable/ic_zen_mode_people_messages" />
<Preference
android:key="zen_mode_people_calls"
- android:title="@string/zen_mode_calls_title"/>
+ android:title="@string/zen_mode_calls_title"
+ android:icon="@drawable/ic_zen_mode_people_calls" />
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/modes_rule_settings.xml b/res/xml/modes_rule_settings.xml
index cf090be..d2f573c 100644
--- a/res/xml/modes_rule_settings.xml
+++ b/res/xml/modes_rule_settings.xml
@@ -23,37 +23,59 @@
android:key="header"
android:layout="@layout/settings_entity_header" />
+ <com.android.settings.applications.SpacePreference
+ android:layout_height="16dp" />
+
+ <com.android.settings.notification.modes.ZenModeBlurbPreference
+ android:key="mode_blurb" />
+
+ <com.android.settings.applications.SpacePreference
+ android:layout_height="8dp" />
+
<com.android.settingslib.widget.LayoutPreference
android:key="activate"
android:selectable="false"
android:layout="@layout/modes_activation_button"/>
- <com.android.settingslib.widget.ActionButtonsPreference
- android:key="actions"
- android:selectable="true" />
-
- <PreferenceCategory
- android:title="@string/mode_interruption_filter_title"
- android:key="modes_filters">
- <Preference
- android:key="zen_mode_people"
- android:title="@string/zen_category_people"/>
-
- <Preference
- android:key="zen_mode_apps"
- android:title="@string/zen_category_apps" />
-
- <Preference
- android:key="zen_other_settings"
- android:title="@string/zen_category_exceptions" />
- </PreferenceCategory>
+ <com.android.settings.applications.SpacePreference
+ android:layout_height="16dp" />
<!-- automatic trigger section; preference changes programmatically depending on type -->
<PreferenceCategory
android:key="zen_automatic_trigger_category"
android:title="@string/zen_mode_automatic_trigger_title">
+ <!-- For configuring the trigger on tap and enabling/disabling the mode with the switch. -->
<com.android.settingslib.PrimarySwitchPreference
android:key="zen_automatic_trigger_settings" />
+ <!-- For adding a trigger for custom manual modes (no switch). -->
+ <Preference
+ android:key="zen_add_automatic_trigger"
+ android:title="@string/zen_mode_select_schedule"
+ android:icon="@drawable/ic_add_24dp" />
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:title="@string/mode_interruption_filter_title"
+ android:key="modes_filters">
+
+ <SwitchPreferenceCompat
+ android:key="allow_filtering"
+ android:title="@string/mode_notification_filter_title"/>
+
+ <com.android.settings.notification.modes.CircularIconsPreference
+ android:key="zen_mode_people"
+ android:title="@string/zen_category_people"
+ android:icon="@drawable/ic_zen_mode_category_people" />
+
+ <com.android.settings.notification.modes.CircularIconsPreference
+ android:key="zen_mode_apps"
+ android:title="@string/zen_category_apps"
+ android:icon="@drawable/ic_zen_mode_category_apps" />
+
+ <com.android.settings.notification.modes.CircularIconsPreference
+ android:key="zen_other_settings"
+ android:title="@string/zen_category_exceptions"
+ android:icon="@drawable/ic_zen_mode_category_other" />
</PreferenceCategory>
<PreferenceCategory
@@ -61,6 +83,12 @@
android:key="modes_additional_actions">
<Preference
android:key="mode_display_settings"
- android:title="@string/mode_display_settings_title" />
+ android:title="@string/mode_display_settings_title"
+ android:icon="@drawable/ic_zen_mode_category_display" />
+
+ <Preference
+ android:key="mode_manual_duration"
+ android:title="@string/zen_category_duration"
+ android:icon="@drawable/ic_zen_mode_category_duration" />
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml
index 5b545bb..2063618 100644
--- a/res/xml/physical_keyboard_settings.xml
+++ b/res/xml/physical_keyboard_settings.xml
@@ -21,12 +21,6 @@
<PreferenceCategory
android:key="keyboard_options_category"
android:title="@string/keyboard_options_category">
- <SwitchPreferenceCompat
- android:key="show_virtual_keyboard_switch"
- android:title="@string/show_ime"
- android:summary="@string/show_ime_summary"
- android:defaultValue="false" />
-
<Preference
android:key="keyboard_shortcuts_helper"
android:title="@string/keyboard_shortcuts_helper"
@@ -59,5 +53,11 @@
android:title="@string/slow_keys"
android:defaultValue="false" />
+ <SwitchPreferenceCompat
+ android:key="accessibility_mouse_keys"
+ android:title="@string/mouse_keys"
+ android:summary="@string/mouse_keys_summary"
+ android:defaultValue="false" />
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/polite_notifications_settings.xml b/res/xml/polite_notifications_settings.xml
index 3baf88f..c0b3980 100644
--- a/res/xml/polite_notifications_settings.xml
+++ b/res/xml/polite_notifications_settings.xml
@@ -17,20 +17,20 @@
<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_polite_title">
<com.android.settingslib.widget.TopIntroPreference
android:key="polite_notification_desc"
android:title="@string/notification_polite_description"/>
-<!-- TODO(b/330606963): add the illustration back when animation is ready-->
-<!-- <com.android.settingslib.widget.IllustrationPreference-->
-<!-- android:key="bubbles_illustration"-->
-<!-- settings:searchable="false"-->
-<!-- android:selectable="false"-->
-<!-- app:lottie_rawRes="@raw/lottie_bubbles"-->
-<!-- app:lottie_cacheComposition="false"-->
-<!-- settings:dynamicColor="true" />-->
+ <com.android.settingslib.widget.IllustrationPreference
+ android:key="notification_cooldown_illustration"
+ settings:searchable="false"
+ android:selectable="false"
+ app:lottie_rawRes="@raw/lottie_notification_cooldown"
+ app:lottie_cacheComposition="false"
+ settings:dynamicColor="true"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="polite_notification_global_pref"
diff --git a/res/xml/private_space_hide_locked.xml b/res/xml/private_space_hide_locked.xml
index d166b73..56dd151 100644
--- a/res/xml/private_space_hide_locked.xml
+++ b/res/xml/private_space_hide_locked.xml
@@ -21,7 +21,8 @@
<com.android.settingslib.widget.IllustrationPreference
android:key="private_space_hide_illustration"
settings:searchable="false"
- settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"/>
+ settings:lottie_rawRes="@raw/private_space_hide_when_locked_illustration"
+ settings:controller="com.android.settings.privatespace.HidePrivateSpaceIllustrationController"/>
<com.android.settingslib.widget.MainSwitchPreference
android:key="hide_when_locked"
@@ -35,7 +36,9 @@
settings:searchable="false" />
<PreferenceCategory
- android:title="@string/private_space_access_header">
+ android:key="private_space_access"
+ android:title="@string/private_space_access_header"
+ settings:controller="com.android.settings.privatespace.HidePrivateSpaceCategoryController">
<Preference
android:key="search_when_locked_footer"
diff --git a/res/xml/regional_preference_main_page.xml b/res/xml/regional_preference_main_page.xml
index 2746caa..5c46f8c 100644
--- a/res/xml/regional_preference_main_page.xml
+++ b/res/xml/regional_preference_main_page.xml
@@ -16,7 +16,8 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/regional_preferences_title">
+ android:title="@string/regional_preferences_title"
+ android:key="regional_preferences">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_main_page_sub_title"
diff --git a/res/xml/regional_preference_numbering_system_page.xml b/res/xml/regional_preference_numbering_system_page.xml
index 9263c09..b15dd8a 100644
--- a/res/xml/regional_preference_numbering_system_page.xml
+++ b/res/xml/regional_preference_numbering_system_page.xml
@@ -13,4 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" />
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="regional_preference_numbering_system"/>
diff --git a/res/xml/regional_preferences_first_day_of_week.xml b/res/xml/regional_preferences_first_day_of_week.xml
index 2d0bec3..d9de5e5 100644
--- a/res/xml/regional_preferences_first_day_of_week.xml
+++ b/res/xml/regional_preferences_first_day_of_week.xml
@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/first_day_of_week_preferences_title">
+ android:title="@string/first_day_of_week_preferences_title"
+ android:key="regional_preference_first_day_of_week">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_option_page_sub_title"
diff --git a/res/xml/regional_preferences_temperature.xml b/res/xml/regional_preferences_temperature.xml
index 547dd38..2519dfa 100644
--- a/res/xml/regional_preferences_temperature.xml
+++ b/res/xml/regional_preferences_temperature.xml
@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/temperature_preferences_title">
+ android:title="@string/temperature_preferences_title"
+ android:key="regional_preference_temperature">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/regional_preferences_option_page_sub_title"
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index c220e99..f1556d6 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -140,13 +140,13 @@
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<com.android.settingslib.RestrictedPreference
- android:key="fingerprint_settings_profile"
- android:title="@string/security_settings_work_fingerprint_preference_title"
+ android:key="face_settings_profile"
+ android:title="@string/security_settings_face_profile_preference_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference
- android:key="face_settings_profile"
- android:title="@string/security_settings_face_profile_preference_title"
+ android:key="fingerprint_settings_profile"
+ android:title="@string/security_settings_work_fingerprint_preference_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference
diff --git a/res/xml/security_settings_combined_biometric_profile.xml b/res/xml/security_settings_combined_biometric_profile.xml
index 1ab4106..42078f5 100644
--- a/res/xml/security_settings_combined_biometric_profile.xml
+++ b/res/xml/security_settings_combined_biometric_profile.xml
@@ -27,19 +27,19 @@
android:title="@string/biometric_settings_category_ways_to_unlock">
<com.android.settingslib.RestrictedPreference
- android:key="biometric_fingerprint_settings_profile"
- android:title="@string/security_settings_work_fingerprint_preference_title"
- android:summary="@string/summary_placeholder"
- settings:keywords="@string/keywords_fingerprint_settings"
- settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
-
- <com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_profile_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />
+ <com.android.settingslib.RestrictedPreference
+ android:key="biometric_fingerprint_settings_profile"
+ android:title="@string/security_settings_work_fingerprint_preference_title"
+ android:summary="@string/summary_placeholder"
+ settings:keywords="@string/keywords_fingerprint_settings"
+ settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 6225f4f..621a325 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -39,7 +39,7 @@
<Preference
android:key="trackpad_settings"
- android:title="@string/trackpad_settings"
+ android:title="@string/trackpad_mouse_settings"
android:summary="@string/trackpad_settings_summary"
android:icon="@drawable/ic_settings_trackpad"
android:order="-254"
diff --git a/res/xml/terms_of_address.xml b/res/xml/terms_of_address.xml
index a29a55c3..90cbe52 100644
--- a/res/xml/terms_of_address.xml
+++ b/res/xml/terms_of_address.xml
@@ -17,7 +17,8 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/terms_of_address_title">
+ android:title="@string/terms_of_address_title"
+ android:key="terms_of_address">
<com.android.settingslib.widget.TopIntroPreference
android:title="@string/terms_of_address_intro_title"
diff --git a/res/xml/trackpad_settings.xml b/res/xml/trackpad_settings.xml
index 1eb16b7..52a32b2 100644
--- a/res/xml/trackpad_settings.xml
+++ b/res/xml/trackpad_settings.xml
@@ -18,7 +18,7 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:title="@string/trackpad_settings">
+ android:title="@string/trackpad_mouse_settings">
<Preference
android:key="trackpad_gesture_settings"
android:title="@string/trackpad_touchpad_gesture_title"
@@ -66,9 +66,25 @@
android:key="pointer_fill_style"
android:title="@string/pointer_fill_style"
android:order="50"
- android:dialogTitle="@string/pointer_fill_style"
settings:controller="com.android.settings.inputmethod.PointerFillStylePreferenceController"/>
+ <com.android.settings.inputmethod.PointerStrokeStylePreference
+ android:key="pointer_stroke_style"
+ android:title="@string/pointer_stroke_style"
+ android:order="60"
+ settings:controller="com.android.settings.inputmethod.PointerStrokeStylePreferenceController"/>
+
+ <com.android.settings.widget.LabeledSeekBarPreference
+ android:key="pointer_scale"
+ android:title="@string/pointer_scale"
+ android:order="70"
+ android:max="@integer/pointer_scale_seek_bar_end"
+ settings:iconStart="@drawable/ic_remove_24dp"
+ settings:iconStartContentDescription="@string/pointer_scale_decrease_content_description"
+ settings:iconEnd="@drawable/ic_add_24dp"
+ settings:iconEndContentDescription="@string/pointer_scale_increase_content_description"
+ settings:controller="com.android.settings.inputmethod.PointerScaleSeekBarController" />
+
<com.android.settingslib.widget.ButtonPreference
android:key="trackpad_touch_gesture"
android:title="@string/trackpad_touch_gesture"
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 518b65d..da4ea5a 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -35,6 +35,11 @@
android:icon="@drawable/ic_info_outline_24dp"
android:selectable="false"/>
+ <com.android.settingslib.widget.BannerMessagePreference
+ android:key="wep_less_secure_warning"
+ android:title="@string/wep_network_less_secure_warning_title"
+ settings:controller="com.android.settings.wifi.WepLessSecureWarningController"/>
+
<!-- Buttons -->
<com.android.settingslib.widget.ActionButtonsPreference
android:key="buttons"
diff --git a/res/xml/zen_mode_apps_settings.xml b/res/xml/zen_mode_apps_settings.xml
index 4ee14e4..a452143 100644
--- a/res/xml/zen_mode_apps_settings.xml
+++ b/res/xml/zen_mode_apps_settings.xml
@@ -34,11 +34,6 @@
android:title="@string/zen_mode_apps_none_apps"
settings:searchable="false"/>
- <com.android.settingslib.widget.SelectorWithWidgetPreference
- android:key="zen_mode_apps_all"
- android:title="@string/zen_mode_apps_all_apps"
- settings:searchable="false"/>
-
</PreferenceCategory>
</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java
index 0639037..9dadcb9 100644
--- a/src/com/android/settings/MainClear.java
+++ b/src/com/android/settings/MainClear.java
@@ -99,6 +99,7 @@
static final int KEYGUARD_REQUEST = 55;
@VisibleForTesting
static final int CREDENTIAL_CONFIRM_REQUEST = 56;
+ static final int BIOMETRICS_REQUEST = 57;
private static final String KEY_SHOW_ESIM_RESET_CHECKBOX =
"masterclear.allow_retain_esim_profiles_after_fdr";
@@ -156,7 +157,8 @@
@VisibleForTesting
boolean isValidRequestCode(int requestCode) {
- return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
+ return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST)
+ && (requestCode != BIOMETRICS_REQUEST));
}
@Override
@@ -179,9 +181,21 @@
return;
}
+ if (requestCode == KEYGUARD_REQUEST) {
+ final int userId = getActivity().getUserId();
+ if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
+ false /* biometricsSuccessfullyAuthenticated */,
+ false /* biometricsAuthenticationRequested */,
+ userId)) {
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRICS_REQUEST,
+ userId);
+ return;
+ }
+ }
+
Intent intent = null;
// If returning from a Keyguard request, try to show an account confirmation request if
- // applciable.
+ // applicable.
if (CREDENTIAL_CONFIRM_REQUEST != requestCode
&& (intent = getAccountConfirmationIntent()) != null) {
showAccountCredentialConfirmation(intent);
diff --git a/src/com/android/settings/MainClearConfirm.java b/src/com/android/settings/MainClearConfirm.java
index 042c5c2..a5fbebf 100644
--- a/src/com/android/settings/MainClearConfirm.java
+++ b/src/com/android/settings/MainClearConfirm.java
@@ -89,8 +89,7 @@
final PersistentDataBlockManager pdbManager;
// pre-flight check hardware support PersistentDataBlockManager
if (!SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("")) {
- pdbManager = (PersistentDataBlockManager)
- getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+ pdbManager = getActivity().getSystemService(PersistentDataBlockManager.class);
} else {
pdbManager = null;
}
@@ -152,6 +151,11 @@
return false;
}
+ // Do not try to erase factory reset protection data if the protection is alive.
+ if (pdbManager.isFactoryResetProtectionActive()) {
+ return false;
+ }
+
// The persistent data block will persist if the device is still being provisioned.
if (isDeviceStillBeingProvisioned()) {
return false;
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index c91ef5c..c1e3494 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -52,6 +52,7 @@
import com.android.settings.network.telephony.EuiccRacConnectivityDialogActivity;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
+import com.android.settings.system.reset.ResetNetworkConfirm;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import java.util.ArrayList;
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
deleted file mode 100644
index c707b96..0000000
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Looper;
-import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.network.ResetNetworkOperationBuilder;
-import com.android.settings.network.ResetNetworkRestrictionViewBuilder;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Confirm and execute a reset of the network settings to a clean "just out of the box"
- * state. Multiple confirmations are required: first, a general "are you sure
- * you want to do this?" prompt, followed by a keyguard pattern trace if the user
- * has defined one, followed by a final strongly-worded "THIS WILL RESET EVERYTHING"
- * prompt. If at any time the phone is allowed to go to sleep, is
- * locked, et cetera, then the confirmation sequence is abandoned.
- *
- * This is the confirmation screen.
- */
-public class ResetNetworkConfirm extends InstrumentedFragment {
- private static final String TAG = "ResetNetworkConfirm";
-
- @VisibleForTesting View mContentView;
- @VisibleForTesting ResetNetworkTask mResetNetworkTask;
- @VisibleForTesting Activity mActivity;
- @VisibleForTesting ResetNetworkRequest mResetNetworkRequest;
- private ProgressDialog mProgressDialog;
- private AlertDialog mAlertDialog;
- @VisibleForTesting ResetSubscriptionContract mResetSubscriptionContract;
- private OnSubscriptionsChangedListener mSubscriptionsChangedListener;
-
- /**
- * Async task used to do all reset task. If error happens during
- * erasing eSIM profiles or timeout, an error msg is shown.
- */
- private class ResetNetworkTask extends AsyncTask<Void, Void, Boolean> {
- private static final String TAG = "ResetNetworkTask";
-
- private final Context mContext;
-
- ResetNetworkTask(Context context) {
- mContext = context;
- }
-
- @Override
- protected Boolean doInBackground(Void... params) {
- final AtomicBoolean resetEsimSuccess = new AtomicBoolean(true);
-
- String resetEsimPackageName = mResetNetworkRequest.getResetEsimPackageName();
- ResetNetworkOperationBuilder builder = mResetNetworkRequest
- .toResetNetworkOperationBuilder(mContext, Looper.getMainLooper());
- if (resetEsimPackageName != null) {
- // Override reset eSIM option for the result of reset operation
- builder = builder.resetEsim(resetEsimPackageName,
- success -> { resetEsimSuccess.set(success); }
- );
- }
- builder.build().run();
-
- boolean isResetSucceed = resetEsimSuccess.get();
- Log.d(TAG, "network factoryReset complete. succeeded: "
- + String.valueOf(isResetSucceed));
- return isResetSucceed;
- }
-
- @Override
- protected void onPostExecute(Boolean succeeded) {
- if (mProgressDialog != null && mProgressDialog.isShowing()) {
- mProgressDialog.dismiss();
- }
-
- if (succeeded) {
- Toast.makeText(mContext, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
- .show();
- } else {
- mAlertDialog = new AlertDialog.Builder(mContext)
- .setTitle(R.string.reset_esim_error_title)
- .setMessage(R.string.reset_esim_error_msg)
- .setPositiveButton(android.R.string.ok, null /* listener */)
- .show();
- }
- }
- }
-
- /**
- * The user has gone through the multiple confirmation, so now we go ahead
- * and reset the network settings to its factory-default state.
- */
- @VisibleForTesting
- Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- if (Utils.isMonkeyRunning()) {
- return;
- }
-
- // abandon execution if subscription no longer active
- Integer subId = mResetSubscriptionContract.getAnyMissingSubscriptionId();
- if (subId != null) {
- Log.w(TAG, "subId " + subId + " no longer active");
- getActivity().onBackPressed();
- return;
- }
-
- // Should dismiss the progress dialog firstly if it is showing
- // Or not the progress dialog maybe not dismissed in fast clicking.
- if (mProgressDialog != null && mProgressDialog.isShowing()) {
- mProgressDialog.dismiss();
- }
-
- mProgressDialog = getProgressDialog(mActivity);
- mProgressDialog.show();
-
- mResetNetworkTask = new ResetNetworkTask(mActivity);
- mResetNetworkTask.execute();
- }
- };
-
- private ProgressDialog getProgressDialog(Context context) {
- final ProgressDialog progressDialog = new ProgressDialog(context);
- progressDialog.setIndeterminate(true);
- progressDialog.setCancelable(false);
- progressDialog.setMessage(
- context.getString(R.string.main_clear_progress_text));
- return progressDialog;
- }
-
- /**
- * Configure the UI for the final confirmation interaction
- */
- private void establishFinalConfirmationState() {
- mContentView.findViewById(R.id.execute_reset_network)
- .setOnClickListener(mFinalClickListener);
- }
-
- @VisibleForTesting
- void setSubtitle() {
- if (mResetNetworkRequest.getResetEsimPackageName() != null) {
- ((TextView) mContentView.findViewById(R.id.reset_network_confirm))
- .setText(R.string.reset_network_final_desc_esim);
- }
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View view = (new ResetNetworkRestrictionViewBuilder(mActivity)).build();
- if (view != null) {
- mResetSubscriptionContract.close();
- Log.w(TAG, "Access deny.");
- return view;
- }
- mContentView = inflater.inflate(R.layout.reset_network_confirm, null);
- establishFinalConfirmationState();
- setSubtitle();
- return mContentView;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Bundle args = getArguments();
- if (args == null) {
- args = savedInstanceState;
- }
- mResetNetworkRequest = new ResetNetworkRequest(args);
-
- mActivity = getActivity();
-
- mResetSubscriptionContract = new ResetSubscriptionContract(getContext(),
- mResetNetworkRequest) {
- @Override
- public void onSubscriptionInactive(int subscriptionId) {
- // close UI if subscription no longer active
- Log.w(TAG, "subId " + subscriptionId + " no longer active.");
- getActivity().onBackPressed();
- }
- };
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- mResetNetworkRequest.writeIntoBundle(outState);
- }
-
- @Override
- public void onDestroy() {
- if (mResetNetworkTask != null) {
- mResetNetworkTask.cancel(true /* mayInterruptIfRunning */);
- mResetNetworkTask = null;
- }
- if (mResetSubscriptionContract != null) {
- mResetSubscriptionContract.close();
- mResetSubscriptionContract = null;
- }
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- }
- if (mAlertDialog != null) {
- mAlertDialog.dismiss();
- }
- super.onDestroy();
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.RESET_NETWORK_CONFIRM;
- }
-}
diff --git a/src/com/android/settings/ResetNetworkRequest.java b/src/com/android/settings/ResetNetworkRequest.java
index 7632ea0..8df67e7 100644
--- a/src/com/android/settings/ResetNetworkRequest.java
+++ b/src/com/android/settings/ResetNetworkRequest.java
@@ -271,12 +271,12 @@
builder.resetIms(mSubscriptionIdToResetIms);
}
// Reset phone process and RILD may impact above components, keep them at the end
- if ((mResetOptions & RESET_PHONE_PROCESS) != 0) {
- builder.restartPhoneProcess();
- }
if ((mResetOptions & RESET_RILD) != 0) {
builder.restartRild();
}
+ if ((mResetOptions & RESET_PHONE_PROCESS) != 0) {
+ builder.restartPhoneProcess();
+ }
return builder;
}
}
diff --git a/src/com/android/settings/ResetSubscriptionContract.java b/src/com/android/settings/ResetSubscriptionContract.java
deleted file mode 100644
index 528a16d..0000000
--- a/src/com/android/settings/ResetSubscriptionContract.java
+++ /dev/null
@@ -1,157 +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;
-
-import android.content.Context;
-import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.IntStream;
-
-/**
- * A Class monitoring the availability of subscription IDs provided within reset request.
- *
- * This is to detect the situation when user changing SIM card during the presenting of
- * confirmation UI.
- */
-public class ResetSubscriptionContract implements AutoCloseable {
- private static final String TAG = "ResetSubscriptionContract";
-
- private final Context mContext;
- private ExecutorService mExecutorService;
- private final int [] mResetSubscriptionIds;
- @VisibleForTesting
- protected OnSubscriptionsChangedListener mSubscriptionsChangedListener;
- private AtomicBoolean mSubscriptionsUpdateNotify = new AtomicBoolean();
-
- /**
- * Constructor
- * @param context Context
- * @param resetRequest the request object for perform network reset operation.
- */
- public ResetSubscriptionContract(Context context, ResetNetworkRequest resetRequest) {
- mContext = context;
- // Only keeps specific subscription ID required to perform reset operation
- IntStream subIdStream = IntStream.of(
- resetRequest.getResetTelephonyAndNetworkPolicyManager(),
- resetRequest.getResetApnSubId(), resetRequest.getResetImsSubId());
- mResetSubscriptionIds = subIdStream.sorted().distinct()
- .filter(id -> SubscriptionManager.isUsableSubscriptionId(id))
- .toArray();
-
- if (mResetSubscriptionIds.length <= 0) {
- return;
- }
-
- // Monitoring callback through background thread
- mExecutorService = Executors.newSingleThreadExecutor();
- startMonitorSubscriptionChange();
- }
-
- /**
- * A method for detecting if there's any subscription under monitor no longer active.
- * @return subscription ID which is no longer active.
- */
- public Integer getAnyMissingSubscriptionId() {
- if (mResetSubscriptionIds.length <= 0) {
- return null;
- }
- SubscriptionManager mgr = getSubscriptionManager();
- if (mgr == null) {
- Log.w(TAG, "Fail to access subscription manager");
- return mResetSubscriptionIds[0];
- }
- for (int idx = 0; idx < mResetSubscriptionIds.length; idx++) {
- int subId = mResetSubscriptionIds[idx];
- if (mgr.getActiveSubscriptionInfo(subId) == null) {
- Log.w(TAG, "SubId " + subId + " no longer active.");
- return subId;
- }
- }
- return null;
- }
-
- /**
- * Async callback when detecting if there's any subscription under monitor no longer active.
- * @param subscriptionId subscription ID which is no longer active.
- */
- public void onSubscriptionInactive(int subscriptionId) {}
-
- @VisibleForTesting
- protected SubscriptionManager getSubscriptionManager() {
- return mContext.getSystemService(SubscriptionManager.class);
- }
-
- @VisibleForTesting
- protected OnSubscriptionsChangedListener getChangeListener() {
- return new OnSubscriptionsChangedListener() {
- @Override
- public void onSubscriptionsChanged() {
- /**
- * Reducing the processing time on main UI thread through a flag.
- * Once flag get into false, which means latest callback has been
- * processed.
- */
- mSubscriptionsUpdateNotify.set(true);
-
- // Back to main UI thread
- mContext.getMainExecutor().execute(() -> {
- // Remove notifications and perform checking.
- if (mSubscriptionsUpdateNotify.getAndSet(false)) {
- Integer subId = getAnyMissingSubscriptionId();
- if (subId != null) {
- onSubscriptionInactive(subId);
- }
- }
- });
- }
- };
- }
-
- private void startMonitorSubscriptionChange() {
- SubscriptionManager mgr = getSubscriptionManager();
- if (mgr == null) {
- return;
- }
- // update monitor listener
- mSubscriptionsChangedListener = getChangeListener();
-
- mgr.addOnSubscriptionsChangedListener(
- mExecutorService, mSubscriptionsChangedListener);
- }
-
- // Implementation of AutoCloseable
- public void close() {
- if (mExecutorService == null) {
- return;
- }
- // Stop monitoring subscription change
- SubscriptionManager mgr = getSubscriptionManager();
- if (mgr != null) {
- mgr.removeOnSubscriptionsChangedListener(mSubscriptionsChangedListener);
- }
- // Release Executor
- mExecutorService.shutdownNow();
- mExecutorService = null;
- }
-}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 3367bf1..24d9525 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -18,6 +18,8 @@
import static android.provider.Settings.ACTION_PRIVACY_SETTINGS;
+import android.annotation.FlaggedApi;
+import android.app.Flags;
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.os.Bundle;
@@ -301,6 +303,7 @@
public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessDetailsActivity extends SettingsActivity { /* empty */ }
+ public static class ManageAdaptiveNotificationsActivity extends SettingsActivity { /* empty */ }
public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
public static class PremiumSmsAccessActivity extends SettingsActivity { /* empty */ }
public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
@@ -317,11 +320,13 @@
public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }
public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
- public static class ZenModeBehaviorSettingsActivity extends SettingsActivity { /* empty */ }
- public static class ZenModeBlockedEffectsSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeScheduleRuleSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenModeEventRuleSettingsActivity extends SettingsActivity { /* empty */ }
+ @FlaggedApi(Flags.FLAG_MODES_UI)
+ public static class ModeSettingsActivity extends SettingsActivity { /* empty */ }
+ @FlaggedApi(Flags.FLAG_MODES_UI)
+ public static class ModesSettingsActivity extends SettingsActivity { /* empty */ }
public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
public static class ConfigureNotificationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ConversationListSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 7d5d2c7..5b052f2 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -31,6 +31,7 @@
import com.android.settings.biometrics.fingerprint2.BiometricsEnvironment;
import com.android.settings.core.instrumentation.ElapsedTimeUtils;
import com.android.settings.development.DeveloperOptionsActivityLifecycle;
+import com.android.settings.flags.Flags;
import com.android.settings.fuelgauge.BatterySettingsStorage;
import com.android.settings.homepage.SettingsHomepageActivity;
import com.android.settings.localepicker.LocaleNotificationDataManager;
@@ -49,7 +50,7 @@
public class SettingsApplication extends Application {
private WeakReference<SettingsHomepageActivity> mHomeActivity = new WeakReference<>(null);
- private BiometricsEnvironment mBiometricsEnvironment;
+ @Nullable private BiometricsEnvironment mBiometricsEnvironment;
@Override
protected void attachBaseContext(Context base) {
@@ -73,7 +74,9 @@
// Set Spa environment.
setSpaEnvironment();
- mBiometricsEnvironment = new BiometricsEnvironment(this);
+ if (Flags.fingerprintV2Enrollment()) {
+ mBiometricsEnvironment = new BiometricsEnvironment(this);
+ }
if (ActivityEmbeddingUtils.isSettingsSplitEnabled(this)
&& FeatureFlagUtils.isEnabled(this,
diff --git a/src/com/android/settings/SettingsPreferenceFragmentBase.java b/src/com/android/settings/SettingsPreferenceFragmentBase.java
new file mode 100644
index 0000000..dd2e287
--- /dev/null
+++ b/src/com/android/settings/SettingsPreferenceFragmentBase.java
@@ -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;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.search.Indexable;
+
+/**
+ * Base class for fragment suitable for unit testing.
+ */
+public abstract class SettingsPreferenceFragmentBase extends SettingsPreferenceFragment
+ implements Indexable {
+ @Override
+ @SuppressWarnings({"RequiresNullabilityAnnotation"})
+ public void onCreate(final Bundle icicle) {
+ super.onCreate(icicle);
+ onCreateCallback(icicle);
+ }
+
+ @Override
+ @SuppressWarnings({"RequiresNullabilityAnnotation"})
+ public void onActivityCreated(final Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ onActivityCreatedCallback(savedInstanceState);
+ }
+
+ @Override
+ public void onSaveInstanceState(@NonNull final Bundle outState) {
+ super.onSaveInstanceState(outState);
+ onSaveInstanceStateCallback(outState);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ onStartCallback();
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ onStopCallback();
+ }
+
+ protected Activity getCurrentActivity() {
+ return getActivity();
+ }
+
+ /**
+ * Callback called from {@link #onCreate}
+ */
+ public abstract void onCreateCallback(@Nullable Bundle icicle);
+
+ /**
+ * Callback called from {@link #onActivityCreated}
+ */
+ public abstract void onActivityCreatedCallback(@Nullable Bundle savedInstanceState);
+
+ /**
+ * Callback called from {@link #onStart}
+ */
+ public abstract void onStartCallback();
+
+ /**
+ * Callback called from {@link #onStop}
+ */
+ public abstract void onStopCallback();
+
+ /**
+ * Callback called from {@link #onSaveInstanceState}
+ */
+ public void onSaveInstanceStateCallback(@NonNull final Bundle outState) {
+ // Do nothing.
+ }
+}
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 7ed6ba0..add5604 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -24,6 +24,9 @@
import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
+import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_AUTHENTICATORS;
+import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT;
+
import android.app.ActionBar;
import android.app.Activity;
import android.app.ActivityManager;
@@ -54,6 +57,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.VectorDrawable;
+import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.SensorProperties;
import android.hardware.face.Face;
import android.hardware.face.FaceManager;
@@ -122,6 +126,7 @@
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
import com.android.settingslib.widget.ActionBarShadowController;
import com.android.settingslib.widget.AdaptiveIcon;
@@ -1418,13 +1423,15 @@
public static void setupEdgeToEdge(@NonNull FragmentActivity activity) {
ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content),
(v, windowInsets) -> {
- Insets insets = windowInsets.getInsets(
+ final Insets insets = windowInsets.getInsets(
WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime()
| WindowInsetsCompat.Type.displayCutout());
- int statusBarHeight = activity.getWindow().getDecorView().getRootWindowInsets()
- .getInsets(WindowInsetsCompat.Type.statusBars()).top;
+ int newInsetsTop = activity.getWindow().getDecorView().getRootWindowInsets()
+ .getInsets(WindowInsetsCompat.Type.statusBars()
+ | WindowInsetsCompat.Type.captionBar()).top;
+
// Apply the insets paddings to the view.
- v.setPadding(insets.left, statusBarHeight, insets.right, insets.bottom);
+ v.setPadding(insets.left, newInsetsTop, insets.right, insets.bottom);
// Return CONSUMED if you don't want the window insets to keep being
// passed down to descendant views.
@@ -1478,6 +1485,60 @@
disableComponent(pm, new ComponentName(context, Settings.CreateShortcutActivity.class));
}
+ /**
+ * Request biometric authentication if all requirements for mandatory biometrics is satisfied.
+ *
+ * @param context of the corresponding activity/fragment
+ * @param biometricsSuccessfullyAuthenticated if the user has already authenticated using
+ * biometrics
+ * @param biometricsAuthenticationRequested if the activity/fragment has already requested for
+ * biometric prompt
+ * @param userId user id for the authentication request
+ * @return true if all requirements for mandatory biometrics is satisfied
+ */
+ public static boolean requestBiometricAuthenticationForMandatoryBiometrics(
+ @NonNull Context context,
+ boolean biometricsSuccessfullyAuthenticated,
+ boolean biometricsAuthenticationRequested, int userId) {
+ final BiometricManager biometricManager = context.getSystemService(BiometricManager.class);
+ if (biometricManager == null) {
+ Log.e(TAG, "Biometric Manager is null.");
+ return false;
+ }
+ final int status = biometricManager.canAuthenticate(userId,
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+ return android.hardware.biometrics.Flags.mandatoryBiometrics()
+ && status == BiometricManager.BIOMETRIC_SUCCESS
+ && !biometricsSuccessfullyAuthenticated
+ && !biometricsAuthenticationRequested;
+ }
+
+ /**
+ * Launch biometric prompt for mandatory biometrics. Call
+ * {@link #requestBiometricAuthenticationForMandatoryBiometrics(Context, boolean, boolean, int)}
+ * to check if all requirements for mandatory biometrics is satisfied
+ * before launching biometric prompt.
+ *
+ * @param fragment corresponding fragment of the surface
+ * @param requestCode for starting the new activity
+ * @param userId user id for the authentication request
+ */
+ public static void launchBiometricPromptForMandatoryBiometrics(@NonNull Fragment fragment,
+ int requestCode, int userId) {
+ final Intent intent = new Intent();
+ intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+ intent.putExtra(BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT,
+ fragment.getString(R.string.cancel));
+ intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION,
+ fragment.getString(R.string.mandatory_biometrics_prompt_description));
+ intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, true);
+ intent.putExtra(EXTRA_USER_ID, userId);
+ intent.setClassName(SETTINGS_PACKAGE_NAME,
+ ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
+ fragment.startActivityForResult(intent, requestCode);
+ }
+
private static void disableComponent(PackageManager pm, ComponentName componentName) {
pm.setComponentEnabledSetting(componentName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
diff --git a/src/com/android/settings/accessibility/AccessibilityDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
index ca3a7b1..a1f59c8 100644
--- a/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityDialogUtils.java
@@ -19,53 +19,22 @@
import static com.android.settings.accessibility.ItemInfoArrayAdapter.ItemInfo;
import android.app.Dialog;
-import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.icu.text.MessageFormat;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ImageSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
import android.widget.AbsListView;
import android.widget.AdapterView;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ScrollView;
-import android.widget.TextView;
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.annotation.RawRes;
import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
-
-import com.android.server.accessibility.Flags;
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.utils.AnnotationSpan;
-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;
import java.util.List;
-
/**
* Utility class for creating the edit dialog.
*/
@@ -75,25 +44,20 @@
/** Denotes the dialog emuns for show dialog. */
@Retention(RetentionPolicy.SOURCE)
public @interface DialogEnums {
-
- /** OPEN: Settings > Accessibility > Any toggle service > Shortcut > Settings. */
- int EDIT_SHORTCUT = 1;
-
- /** OPEN: Settings > Accessibility > Magnification > Shortcut > Settings. */
- int MAGNIFICATION_EDIT_SHORTCUT = 1001;
-
/**
* OPEN: Settings > Accessibility > Downloaded toggle service > Toggle use service to
* enable service.
*/
int ENABLE_WARNING_FROM_TOGGLE = 1002;
- /** OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox. */
+ /**
+ * OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut options
+ * settings.
+ */
int ENABLE_WARNING_FROM_SHORTCUT = 1003;
/**
- * OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut checkbox
- * toggle.
+ * OPEN: Settings > Accessibility > Downloaded toggle service > Shortcut toggle
*/
int ENABLE_WARNING_FROM_SHORTCUT_TOGGLE = 1004;
@@ -128,83 +92,6 @@
}
/**
- * IntDef enum for dialog type that indicates different dialog for user to choose the shortcut
- * type.
- */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({
- DialogType.EDIT_SHORTCUT_GENERIC,
- DialogType.EDIT_SHORTCUT_GENERIC_SUW,
- DialogType.EDIT_SHORTCUT_MAGNIFICATION,
- DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW,
- })
-
- public @interface DialogType {
- int EDIT_SHORTCUT_GENERIC = 0;
- int EDIT_SHORTCUT_GENERIC_SUW = 1;
- int EDIT_SHORTCUT_MAGNIFICATION = 2;
- int EDIT_SHORTCUT_MAGNIFICATION_SUW = 3;
- }
-
- /**
- * Method to show the edit shortcut dialog.
- *
- * @param context A valid context
- * @param dialogType The type of edit shortcut dialog
- * @param dialogTitle The title of edit shortcut dialog
- * @param listener The listener to determine the action of edit shortcut dialog
- * @return A edit shortcut dialog for showing
- */
- public static AlertDialog showEditShortcutDialog(Context context, int dialogType,
- CharSequence dialogTitle, DialogInterface.OnClickListener listener) {
- final AlertDialog alertDialog = createDialog(context, dialogType, dialogTitle, listener);
- alertDialog.show();
- setScrollIndicators(alertDialog);
- return alertDialog;
- }
-
- /**
- * Updates the shortcut content in edit shortcut dialog.
- *
- * @param context A valid context
- * @param editShortcutDialog Need to be a type of edit shortcut dialog
- * @return True if the update is successful
- */
- public static boolean updateShortcutInDialog(Context context,
- Dialog editShortcutDialog) {
- final View container = editShortcutDialog.findViewById(R.id.container_layout);
- if (container != null) {
- initSoftwareShortcut(context, container);
- initHardwareShortcut(context, container);
- return true;
- }
- return false;
- }
-
- private static AlertDialog createDialog(Context context, int dialogType,
- CharSequence dialogTitle, DialogInterface.OnClickListener listener) {
-
- final AlertDialog alertDialog = new AlertDialog.Builder(context)
- .setView(createEditDialogContentView(context, dialogType))
- .setTitle(dialogTitle)
- .setPositiveButton(R.string.save, listener)
- .setNegativeButton(R.string.cancel,
- (DialogInterface dialog, int which) -> dialog.dismiss())
- .create();
-
- return alertDialog;
- }
-
- /**
- * Sets the scroll indicators for dialog view. The indicators appears while content view is
- * out of vision for vertical scrolling.
- */
- private static void setScrollIndicators(AlertDialog dialog) {
- final ScrollView scrollView = dialog.findViewById(R.id.container_layout);
- setScrollIndicators(scrollView);
- }
-
- /**
* Sets the scroll indicators for dialog view. The indicators appear while content view is
* out of vision for vertical scrolling.
*
@@ -218,284 +105,6 @@
}
/**
- * Get a content View for the edit shortcut dialog.
- *
- * @param context A valid context
- * @param dialogType The type of edit shortcut dialog
- * @return A content view suitable for viewing
- */
- private static View createEditDialogContentView(Context context, int dialogType) {
- final LayoutInflater inflater = (LayoutInflater) context.getSystemService(
- Context.LAYOUT_INFLATER_SERVICE);
-
- View contentView = null;
-
- switch (dialogType) {
- case DialogType.EDIT_SHORTCUT_GENERIC:
- contentView = inflater.inflate(
- R.layout.accessibility_edit_shortcut, null);
- initSoftwareShortcut(context, contentView);
- initHardwareShortcut(context, contentView);
- break;
- case DialogType.EDIT_SHORTCUT_GENERIC_SUW:
- contentView = inflater.inflate(
- R.layout.accessibility_edit_shortcut, null);
- initSoftwareShortcutForSUW(context, contentView);
- initHardwareShortcut(context, contentView);
- break;
- case DialogType.EDIT_SHORTCUT_MAGNIFICATION:
- contentView = inflater.inflate(
- R.layout.accessibility_edit_shortcut_magnification, null);
- initSoftwareShortcut(context, contentView);
- initHardwareShortcut(context, contentView);
- if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- initTwoFingerDoubleTapMagnificationShortcut(context, contentView);
- }
- initMagnifyShortcut(context, contentView);
- initAdvancedWidget(contentView);
- break;
- case DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW:
- contentView = inflater.inflate(
- R.layout.accessibility_edit_shortcut_magnification, null);
- initSoftwareShortcutForSUW(context, contentView);
- initHardwareShortcut(context, contentView);
- if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- initTwoFingerDoubleTapMagnificationShortcut(context, contentView);
- }
- initMagnifyShortcut(context, contentView);
- initAdvancedWidget(contentView);
- break;
- default:
- throw new IllegalArgumentException();
- }
-
- return contentView;
- }
-
- private static void setupShortcutWidget(View view, CharSequence titleText,
- CharSequence summaryText, @DrawableRes int imageResId) {
- setupShortcutWidgetWithTitleAndSummary(view, titleText, summaryText);
- setupShortcutWidgetWithImageResource(view, imageResId);
- }
-
- private static void setupShortcutWidgetWithImageRawResource(Context context,
- View view, CharSequence titleText,
- CharSequence summaryText, @RawRes int imageRawResId) {
- setupShortcutWidgetWithTitleAndSummary(view, titleText, summaryText);
- setupShortcutWidgetWithImageRawResource(context, view, imageRawResId);
- }
-
- private static void setupShortcutWidgetWithTitleAndSummary(View view, CharSequence titleText,
- CharSequence summaryText) {
- final CheckBox checkBox = view.findViewById(R.id.checkbox);
- checkBox.setText(titleText);
-
- final TextView summary = view.findViewById(R.id.summary);
- if (TextUtils.isEmpty(summaryText)) {
- summary.setVisibility(View.GONE);
- } else {
- summary.setText(summaryText);
- summary.setMovementMethod(LinkMovementMethod.getInstance());
- summary.setFocusable(false);
- }
- }
-
- private static void setupShortcutWidgetWithImageResource(View view,
- @DrawableRes int imageResId) {
- final ImageView imageView = view.findViewById(R.id.image);
- imageView.setImageResource(imageResId);
- }
-
- private static void setupShortcutWidgetWithImageRawResource(Context context, View view,
- @RawRes int imageRawResId) {
- final LottieAnimationView lottieView = view.findViewById(R.id.image);
- lottieView.setFailureListener(
- result -> Log.w(TAG, "Invalid image raw resource id: " + imageRawResId,
- result));
- lottieView.setAnimation(imageRawResId);
- lottieView.setRepeatCount(LottieDrawable.INFINITE);
- LottieColorUtils.applyDynamicColors(context, lottieView);
- lottieView.playAnimation();
- }
-
- private static void initSoftwareShortcutForSUW(Context context, View view) {
- final View dialogView = view.findViewById(R.id.software_shortcut);
- final CharSequence title = context.getText(
- R.string.accessibility_shortcut_edit_dialog_title_software);
- final TextView summary = dialogView.findViewById(R.id.summary);
- final int lineHeight = summary.getLineHeight();
-
- setupShortcutWidget(dialogView, title,
- retrieveSoftwareShortcutSummaryForSUW(context, lineHeight),
- retrieveSoftwareShortcutImageResId(context));
- }
-
- private static void initSoftwareShortcut(Context context, View view) {
- final View dialogView = view.findViewById(R.id.software_shortcut);
- final TextView summary = dialogView.findViewById(R.id.summary);
- final int lineHeight = summary.getLineHeight();
-
- setupShortcutWidget(dialogView,
- retrieveTitle(context),
- retrieveSoftwareShortcutSummary(context, lineHeight),
- retrieveSoftwareShortcutImageResId(context));
- }
-
- private static void initHardwareShortcut(Context context, View view) {
- final View dialogView = view.findViewById(R.id.hardware_shortcut);
- final CharSequence title = context.getText(
- R.string.accessibility_shortcut_edit_dialog_title_hardware);
- final CharSequence summary = context.getText(
- R.string.accessibility_shortcut_edit_dialog_summary_hardware);
- setupShortcutWidget(dialogView, title, summary,
- R.drawable.a11y_shortcut_type_hardware);
- }
-
- private static void initMagnifyShortcut(Context context, View view) {
- final View dialogView = view.findViewById(R.id.triple_tap_shortcut);
- final CharSequence title = context.getText(
- R.string.accessibility_shortcut_edit_dialog_title_triple_tap);
- String summary = context.getString(
- R.string.accessibility_shortcut_edit_dialog_summary_triple_tap);
- // Format the number '3' in the summary.
- final Object[] arguments = {3};
- summary = MessageFormat.format(summary, arguments);
-
- setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary,
- R.raw.a11y_shortcut_type_triple_tap);
- }
-
- private static void initTwoFingerDoubleTapMagnificationShortcut(Context context, View view) {
- // TODO(b/306153204): Update shortcut string and image when UX provides them
- final View dialogView = view.findViewById(R.id.two_finger_triple_tap_shortcut);
- final CharSequence title = context.getText(
- R.string.accessibility_shortcut_edit_dialog_title_two_finger_double_tap);
- String summary = context.getString(
- R.string.accessibility_shortcut_edit_dialog_summary_two_finger_double_tap);
- // Format the number '2' in the summary.
- final Object[] arguments = {2};
- summary = MessageFormat.format(summary, arguments);
-
- setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary,
- R.raw.a11y_shortcut_type_triple_tap);
-
- dialogView.setVisibility(View.VISIBLE);
- }
-
- private static void initAdvancedWidget(View view) {
- final LinearLayout advanced = view.findViewById(R.id.advanced_shortcut);
- final View tripleTap = view.findViewById(R.id.triple_tap_shortcut);
- advanced.setOnClickListener((View v) -> {
- advanced.setVisibility(View.GONE);
- tripleTap.setVisibility(View.VISIBLE);
- });
- }
-
- private static CharSequence retrieveSoftwareShortcutSummaryForSUW(Context context,
- int lineHeight) {
- final SpannableStringBuilder sb = new SpannableStringBuilder();
- if (!AccessibilityUtil.isFloatingMenuEnabled(context)) {
- sb.append(getSummaryStringWithIcon(context, lineHeight));
- }
- return sb;
- }
-
- private static CharSequence retrieveTitle(Context context) {
- int resId;
- if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
- resId = R.string.accessibility_shortcut_edit_dialog_title_software;
- } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
- resId = R.string.accessibility_shortcut_edit_dialog_title_software_by_gesture;
- } else {
- resId = R.string.accessibility_shortcut_edit_dialog_title_software;
- }
- return context.getText(resId);
- }
-
- private static CharSequence retrieveSoftwareShortcutSummary(Context context, int lineHeight) {
- final SpannableStringBuilder sb = new SpannableStringBuilder();
- if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
- sb.append(getCustomizeAccessibilityButtonLink(context));
- } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
- final int resId = AccessibilityUtil.isTouchExploreEnabled(context)
- ? R.string.accessibility_shortcut_edit_dialog_summary_software_gesture_talkback
- : R.string.accessibility_shortcut_edit_dialog_summary_software_gesture;
- sb.append(context.getText(resId));
- sb.append("\n\n");
- sb.append(getCustomizeAccessibilityButtonLink(context));
- } else {
- sb.append(getSummaryStringWithIcon(context, lineHeight));
- sb.append("\n\n");
- sb.append(getCustomizeAccessibilityButtonLink(context));
- }
- return sb;
- }
-
- private static int retrieveSoftwareShortcutImageResId(Context context) {
- int resId;
- if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
- resId = R.drawable.a11y_shortcut_type_software_floating;
- } else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
- resId = AccessibilityUtil.isTouchExploreEnabled(context)
- ? R.drawable.a11y_shortcut_type_software_gesture_talkback
- : R.drawable.a11y_shortcut_type_software_gesture;
- } else {
- resId = R.drawable.a11y_shortcut_type_software;
- }
- return resId;
- }
-
- private static CharSequence getCustomizeAccessibilityButtonLink(Context context) {
- final View.OnClickListener linkListener = v -> new SubSettingLauncher(context)
- .setDestination(AccessibilityButtonFragment.class.getName())
- .setSourceMetricsCategory(
- SettingsEnums.SWITCH_SHORTCUT_DIALOG_ACCESSIBILITY_BUTTON_SETTINGS)
- .launch();
- final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
- AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION, linkListener);
- return AnnotationSpan.linkify(context.getText(
- R.string.accessibility_shortcut_edit_dialog_summary_software_floating), linkInfo);
- }
-
- private static SpannableString getSummaryStringWithIcon(Context context, int lineHeight) {
- final String summary = context
- .getString(R.string.accessibility_shortcut_edit_dialog_summary_software);
- final SpannableString spannableMessage = SpannableString.valueOf(summary);
-
- // Icon
- final int indexIconStart = summary.indexOf("%s");
- final int indexIconEnd = indexIconStart + 2;
- final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
- final ImageSpan imageSpan = new ImageSpan(icon);
- imageSpan.setContentDescription("");
- icon.setBounds(0, 0, lineHeight, lineHeight);
- spannableMessage.setSpan(
- imageSpan, indexIconStart, indexIconEnd,
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- return spannableMessage;
- }
-
- /**
- * Returns the color associated with the specified attribute in the context's theme.
- */
- @ColorInt
- private static int getThemeAttrColor(final Context context, final int attributeColor) {
- final int colorResId = getAttrResourceId(context, attributeColor);
- return ContextCompat.getColor(context, colorResId);
- }
-
- /**
- * Returns the identifier of the resolved resource assigned to the given attribute.
- */
- private static int getAttrResourceId(final Context context, final int attributeColor) {
- final int[] attrs = {attributeColor};
- final TypedArray typedArray = context.obtainStyledAttributes(attrs);
- final int colorResId = typedArray.getResourceId(0, 0);
- typedArray.recycle();
- return colorResId;
- }
-
- /**
* Creates a dialog with the given view.
*
* @param context A valid context
diff --git a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
index e82cd96..8a3f22d 100644
--- a/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
@@ -21,6 +21,7 @@
import android.os.Bundle;
import android.os.Handler;
+import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -42,6 +43,7 @@
private boolean mNeedsQSTooltipReshow = false;
/** Returns the accessibility tile component name. */
+ @Nullable
abstract ComponentName getTileComponentName();
/** Returns the accessibility tile tooltip content. */
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 8441c2a..92bf125 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -16,6 +16,8 @@
package com.android.settings.accessibility;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.DEFAULT;
+
import android.accessibilityservice.AccessibilityServiceInfo;
import android.accessibilityservice.AccessibilityShortcutInfo;
import android.app.settings.SettingsEnums;
@@ -73,7 +75,8 @@
private static final String CATEGORY_AUDIO = "audio_category";
private static final String CATEGORY_SPEECH = "speech_category";
private static final String CATEGORY_DISPLAY = "display_category";
- private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_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";
@@ -152,7 +155,7 @@
};
@VisibleForTesting
- final AccessibilitySettingsContentObserver mSettingsContentObserver;
+ AccessibilitySettingsContentObserver mSettingsContentObserver;
private final Map<String, PreferenceCategory> mCategoryToPrefCategoryMap =
new ArrayMap<>();
@@ -166,9 +169,14 @@
private boolean mIsForeground = true;
public AccessibilitySettings() {
+ mSettingsContentObserver = new AccessibilitySettingsContentObserver(mHandler);
+ }
+
+ private void initializeSettingsContentObserver() {
// Observe changes to anything that the shortcut can toggle, so we can reflect updates
final Collection<AccessibilityShortcutController.FrameworkFeatureInfo> features =
- AccessibilityShortcutController.getFrameworkShortcutFeaturesMap().values();
+ AccessibilityShortcutController
+ .getFrameworkShortcutFeaturesMap().values();
final List<String> shortcutFeatureKeys = new ArrayList<>(features.size());
for (AccessibilityShortcutController.FrameworkFeatureInfo feature : features) {
final String key = feature.getSettingKey();
@@ -186,7 +194,6 @@
shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_STICKY_KEYS);
shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SLOW_KEYS);
shortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BOUNCE_KEYS);
- mSettingsContentObserver = new AccessibilitySettingsContentObserver(mHandler);
mSettingsContentObserver.registerKeysToObserverCallback(shortcutFeatureKeys,
key -> onContentChanged());
}
@@ -211,6 +218,7 @@
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ initializeSettingsContentObserver();
initializeAllPreferences();
updateAllPreferences();
mNeedPreferencesUpdate = false;
@@ -283,7 +291,7 @@
info.getResolveInfo().serviceInfo.packageName,
info.getResolveInfo().serviceInfo.name);
final boolean shortcutEnabled = AccessibilityUtil.getUserShortcutTypesFromSettings(
- context, componentName) != AccessibilityUtil.UserShortcutType.EMPTY;
+ context, componentName) != DEFAULT;
serviceState = shortcutEnabled
? context.getText(R.string.accessibility_summary_shortcut_enabled)
: context.getText(R.string.generic_accessibility_feature_shortcut_off);
@@ -295,7 +303,7 @@
final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());
final String stateSummaryCombo = context.getString(
- R.string.preference_summary_default_combination,
+ com.android.settingslib.R.string.preference_summary_default_combination,
serviceState, serviceSummary);
return TextUtils.isEmpty(serviceSummary) ? serviceState : stateSummaryCombo;
@@ -373,6 +381,7 @@
}
protected void updateServicePreferences() {
+ final AccessibilityManager a11yManager = AccessibilityManager.getInstance(getPrefContext());
// Since services category is auto generated we have to do a pass
// to generate it since services can come and go and then based on
// the global accessibility state to decided whether it is enabled.
@@ -403,8 +412,18 @@
AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM,
mCategoryToPrefCategoryMap.get(CATEGORY_INTERACTION_CONTROL));
- final List<RestrictedPreference> preferenceList = getInstalledAccessibilityList(
- getPrefContext());
+ final List<AccessibilityShortcutInfo> installedShortcutList =
+ a11yManager.getInstalledAccessibilityShortcutListAsUser(getPrefContext(),
+ UserHandle.myUserId());
+ final List<AccessibilityServiceInfo> modifiableInstalledServiceList =
+ new ArrayList<>(a11yManager.getInstalledAccessibilityServiceList());
+ final List<RestrictedPreference> preferenceList = getInstalledAccessibilityPreferences(
+ getPrefContext(), installedShortcutList, modifiableInstalledServiceList);
+
+ if (Flags.checkPrebundledIsPreinstalled()) {
+ removeNonPreinstalledComponents(mPreBundledServiceComponentToCategoryMap,
+ installedShortcutList, modifiableInstalledServiceList);
+ }
final PreferenceCategory downloadedServicesCategory =
mCategoryToPrefCategoryMap.get(CATEGORY_DOWNLOADED_SERVICES);
@@ -449,13 +468,21 @@
updatePreferenceCategoryVisibility(CATEGORY_KEYBOARD_OPTIONS);
}
- private List<RestrictedPreference> getInstalledAccessibilityList(Context context) {
- final AccessibilityManager a11yManager = AccessibilityManager.getInstance(context);
+ /**
+ * Gets a list of {@link RestrictedPreference}s for the provided a11y shortcuts and services.
+ *
+ * <p>{@code modifiableInstalledServiceList} may be modified to remove any entries with
+ * matching package name and label as an entry in {@code installedShortcutList}.
+ *
+ * @param installedShortcutList A list of installed {@link AccessibilityShortcutInfo}s.
+ * @param modifiableInstalledServiceList A modifiable list of installed
+ * {@link AccessibilityServiceInfo}s.
+ */
+ private List<RestrictedPreference> getInstalledAccessibilityPreferences(Context context,
+ List<AccessibilityShortcutInfo> installedShortcutList,
+ List<AccessibilityServiceInfo> modifiableInstalledServiceList) {
final RestrictedPreferenceHelper preferenceHelper = new RestrictedPreferenceHelper(context);
- final List<AccessibilityShortcutInfo> installedShortcutList =
- a11yManager.getInstalledAccessibilityShortcutListAsUser(context,
- UserHandle.myUserId());
final List<AccessibilityActivityPreference> activityList =
preferenceHelper.createAccessibilityActivityPreferenceList(installedShortcutList);
final Set<Pair<String, CharSequence>> packageLabelPairs =
@@ -464,16 +491,14 @@
a11yActivityPref.getPackageName(), a11yActivityPref.getLabel())
).collect(Collectors.toSet());
- // Remove duplicate item here, new a ArrayList to copy unmodifiable list result
- // (getInstalledAccessibilityServiceList).
- final List<AccessibilityServiceInfo> installedServiceList = new ArrayList<>(
- a11yManager.getInstalledAccessibilityServiceList());
+ // Remove duplicate A11yServices that are already shown as A11yActivities.
if (!packageLabelPairs.isEmpty()) {
- installedServiceList.removeIf(
+ modifiableInstalledServiceList.removeIf(
target -> containsPackageAndLabelInList(packageLabelPairs, target));
}
final List<RestrictedPreference> serviceList =
- preferenceHelper.createAccessibilityServicePreferenceList(installedServiceList);
+ preferenceHelper.createAccessibilityServicePreferenceList(
+ modifiableInstalledServiceList);
final List<RestrictedPreference> preferenceList = new ArrayList<>();
preferenceList.addAll(activityList);
@@ -482,6 +507,22 @@
return preferenceList;
}
+ private static void removeNonPreinstalledComponents(
+ Map<ComponentName, PreferenceCategory> componentToCategory,
+ List<AccessibilityShortcutInfo> shortcutInfos,
+ List<AccessibilityServiceInfo> serviceInfos) {
+ for (AccessibilityShortcutInfo info : shortcutInfos) {
+ if (!info.getActivityInfo().applicationInfo.isSystemApp()) {
+ componentToCategory.remove(info.getComponentName());
+ }
+ }
+ for (AccessibilityServiceInfo info : serviceInfos) {
+ if (!info.getResolveInfo().serviceInfo.applicationInfo.isSystemApp()) {
+ componentToCategory.remove(info.getComponentName());
+ }
+ }
+ }
+
private boolean containsPackageAndLabelInList(
Set<Pair<String, CharSequence>> packageLabelPairs,
AccessibilityServiceInfo targetServiceInfo) {
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 92259ac..e92c86b 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -16,6 +16,10 @@
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.ToggleFeaturePreferenceFragment.KEY_GENERAL_CATEGORY;
import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_QS_TOOLTIP_TYPE;
@@ -35,7 +39,6 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager;
-import android.widget.CheckBox;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -43,6 +46,7 @@
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;
@@ -61,19 +65,13 @@
public abstract class AccessibilityShortcutPreferenceFragment extends RestrictedDashboardFragment
implements ShortcutPreference.OnClickCallback {
private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
- protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow";
- protected static final int NOT_SET = -1;
- // Save user's shortcutType value when savedInstance has value (e.g. device rotated).
- protected int mSavedCheckBoxValue = NOT_SET;
protected ShortcutPreference mShortcutPreference;
protected Dialog mDialog;
private AccessibilityManager.TouchExplorationStateChangeListener
mTouchExplorationStateChangeListener;
private AccessibilitySettingsContentObserver mSettingsContentObserver;
- private CheckBox mSoftwareTypeCheckBox;
- private CheckBox mHardwareTypeCheckBox;
private AccessibilityQuickSettingsTooltipWindow mTooltipWindow;
private boolean mNeedsQSTooltipReshow = false;
private int mNeedsQSTooltipType = QuickSettingsTooltipType.GUIDE_TO_EDIT;
@@ -100,10 +98,6 @@
// Restore the user shortcut type and tooltip.
if (savedInstanceState != null) {
- if (savedInstanceState.containsKey(KEY_SAVED_USER_SHORTCUT_TYPE)) {
- mSavedCheckBoxValue = savedInstanceState.getInt(KEY_SAVED_USER_SHORTCUT_TYPE,
- NOT_SET);
- }
if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) {
mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW);
}
@@ -148,7 +142,6 @@
getPreferenceScreen().addPreference(mShortcutPreference);
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
- removeDialog(DialogEnums.EDIT_SHORTCUT);
mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
};
@@ -180,8 +173,6 @@
mSettingsContentObserver.register(getContentResolver());
updateShortcutPreferenceData();
updateShortcutPreference();
-
- updateEditShortcutDialogIfNeeded();
}
@Override
@@ -195,10 +186,6 @@
@Override
public void onSaveInstanceState(Bundle outState) {
- final int value = getShortcutTypeCheckBoxValue();
- if (value != NOT_SET) {
- outState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, value);
- }
final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
if (mNeedsQSTooltipReshow || isTooltipWindowShowing) {
outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true);
@@ -210,15 +197,6 @@
@Override
public Dialog onCreateDialog(int dialogId) {
switch (dialogId) {
- case DialogEnums.EDIT_SHORTCUT:
- final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
- ? AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC_SUW :
- AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC;
- mDialog = AccessibilityDialogUtils.showEditShortcutDialog(
- getPrefContext(), dialogType, getShortcutTitle(),
- this::callOnAlertDialogCheckboxClicked);
- setupEditShortcutDialog(mDialog);
- return mDialog;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
mDialog = AccessibilityShortcutsTutorial
@@ -245,8 +223,6 @@
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
- case DialogEnums.EDIT_SHORTCUT:
- return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_EDIT_SHORTCUT;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
return SettingsEnums.DIALOG_ACCESSIBILITY_TUTORIAL;
default:
@@ -256,17 +232,13 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- if (Flags.editShortcutsInFullScreen()) {
- EditShortcutsPreferenceFragment.showEditShortcutScreen(
- getContext(),
- getMetricsCategory(),
- getShortcutTitle(),
- getComponentName(),
- getIntent()
- );
- } else {
- showDialog(DialogEnums.EDIT_SHORTCUT);
- }
+ EditShortcutsPreferenceFragment.showEditShortcutScreen(
+ getContext(),
+ getMetricsCategory(),
+ getShortcutTitle(),
+ getComponentName(),
+ getIntent()
+ );
}
@Override
@@ -296,38 +268,6 @@
return KEY_SHORTCUT_PREFERENCE;
}
- @VisibleForTesting
- void setupEditShortcutDialog(Dialog dialog) {
- final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
- mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
-
- final View dialogHardwareView = dialog.findViewById(R.id.hardware_shortcut);
- mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
-
- updateEditShortcutDialogCheckBox();
- }
-
- /**
- * Returns accumulated {@link AccessibilityUtil.UserShortcutType} checkbox value or
- * {@code NOT_SET} if checkboxes did not exist.
- */
- protected int getShortcutTypeCheckBoxValue() {
- if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
- return NOT_SET;
- }
-
- int value = AccessibilityUtil.UserShortcutType.EMPTY;
- if (mSoftwareTypeCheckBox.isChecked()) {
- value |= AccessibilityUtil.UserShortcutType.SOFTWARE;
- }
- if (mHardwareTypeCheckBox.isChecked()) {
- value |= AccessibilityUtil.UserShortcutType.HARDWARE;
- }
- return value;
- }
-
/**
* Returns the shortcut type list which has been checked by user.
*/
@@ -359,35 +299,6 @@
showQuickSettingsTooltipIfNeeded();
}
- /**
- * This method will be invoked when a button in the edit shortcut dialog is clicked.
- *
- * @param dialog The dialog that received the click
- * @param which The button that was clicked
- */
- protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
- if (getComponentName() == null) {
- return;
- }
-
- final int value = getShortcutTypeCheckBoxValue();
- saveNonEmptyUserShortcutType(value);
- AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), value, getComponentName());
- AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~value, getComponentName());
- final boolean shortcutAssigned = value != AccessibilityUtil.UserShortcutType.EMPTY;
- mShortcutPreference.setChecked(shortcutAssigned);
- mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
-
- if (mHardwareTypeCheckBox.isChecked()) {
- AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(getPrefContext());
- }
-
- // Show the quick setting tooltip if the shortcut assigned in the first time
- if (shortcutAssigned) {
- showQuickSettingsTooltipIfNeeded();
- }
- }
-
@VisibleForTesting
void initGeneralCategory() {
final PreferenceCategory generalCategory = new PreferenceCategory(getPrefContext());
@@ -397,24 +308,6 @@
getPreferenceScreen().addPreference(generalCategory);
}
- private void updateEditShortcutDialogIfNeeded() {
- if (mDialog == null || !mDialog.isShowing()) {
- return;
- }
- AccessibilityDialogUtils.updateShortcutInDialog(getContext(), mDialog);
- }
-
- @VisibleForTesting
- void saveNonEmptyUserShortcutType(int type) {
- if (type == AccessibilityUtil.UserShortcutType.EMPTY) {
- return;
- }
-
- final PreferredShortcut shortcut = new PreferredShortcut(
- getComponentName().flattenToString(), type);
- PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
- }
-
/**
* Overrides to return customized description for general category above shortcut
*
@@ -437,11 +330,6 @@
return false;
}
- private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
- final View dialogTextArea = dialogView.findViewById(R.id.container);
- dialogTextArea.setOnClickListener(v -> checkBox.toggle());
- }
-
protected CharSequence getShortcutTypeSummary(Context context) {
if (!mShortcutPreference.isSettingsEditable()) {
return context.getText(R.string.accessibility_shortcut_edit_dialog_title_hardware);
@@ -456,16 +344,16 @@
// LINT.IfChange(shortcut_type_ui_order)
final List<CharSequence> list = new ArrayList<>();
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.QUICK_SETTINGS)) {
+ 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, AccessibilityUtil.UserShortcutType.SOFTWARE)) {
+ if (hasShortcutType(shortcutTypes, SOFTWARE)) {
list.add(getSoftwareShortcutTypeSummary(context));
}
- if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.HARDWARE)) {
+ if (hasShortcutType(shortcutTypes, HARDWARE)) {
final CharSequence hardwareTitle = context.getText(
R.string.accessibility_shortcut_hardware_keyword);
list.add(hardwareTitle);
@@ -481,29 +369,7 @@
null, LocaleUtils.getConcatenatedString(list));
}
- private void updateEditShortcutDialogCheckBox() {
- // If it is during onConfigChanged process then restore the value, or get the saved value
- // when shortcutPreference is checked.
- int value = restoreOnConfigChangedValue();
- if (value == NOT_SET) {
- final int lastNonEmptyUserShortcutType = getUserPreferredShortcutTypes();
- value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
- : AccessibilityUtil.UserShortcutType.EMPTY;
- }
-
- mSoftwareTypeCheckBox.setChecked(
- hasShortcutType(value, AccessibilityUtil.UserShortcutType.SOFTWARE));
- mHardwareTypeCheckBox.setChecked(
- hasShortcutType(value, AccessibilityUtil.UserShortcutType.HARDWARE));
- }
-
- private int restoreOnConfigChangedValue() {
- final int savedValue = mSavedCheckBoxValue;
- mSavedCheckBoxValue = NOT_SET;
- return savedValue;
- }
-
- private boolean hasShortcutType(int value, @AccessibilityUtil.UserShortcutType int type) {
+ private boolean hasShortcutType(int value, @UserShortcutType int type) {
return (value & type) == type;
}
@@ -514,7 +380,7 @@
final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(
getPrefContext(), getComponentName());
- if (shortcutTypes != AccessibilityUtil.UserShortcutType.EMPTY) {
+ if (shortcutTypes != DEFAULT) {
final PreferredShortcut shortcut = new PreferredShortcut(
getComponentName().flattenToString(), shortcutTypes);
PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
index e286c63..8d908ac 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutsTutorial.java
@@ -19,7 +19,11 @@
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
-import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+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.app.settings.SettingsEnums;
import android.content.Context;
@@ -171,7 +175,7 @@
AlertDialog dialog, List<TutorialPage> pages, int selectedPageIndex) {
final Button button = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
final int pageType = pages.get(selectedPageIndex).getType();
- final int buttonVisibility = pageType == UserShortcutType.SOFTWARE ? VISIBLE : GONE;
+ final int buttonVisibility = (pageType == SOFTWARE) ? VISIBLE : GONE;
button.setVisibility(buttonVisibility);
if (buttonVisibility == VISIBLE) {
final int textResId = AccessibilityUtil.isFloatingMenuEnabled(dialog.getContext())
@@ -393,7 +397,7 @@
}
private static TutorialPage createSoftwareTutorialPage(@NonNull Context context) {
- final int type = UserShortcutType.SOFTWARE;
+ final int type = SOFTWARE;
final CharSequence title = getSoftwareTitle(context);
final View image = createSoftwareImage(context);
final CharSequence instruction = getSoftwareInstruction(context);
@@ -405,7 +409,7 @@
}
private static TutorialPage createHardwareTutorialPage(@NonNull Context context) {
- final int type = UserShortcutType.HARDWARE;
+ final int type = HARDWARE;
final CharSequence title =
context.getText(R.string.accessibility_tutorial_dialog_title_volume);
final View image =
@@ -420,7 +424,7 @@
}
private static TutorialPage createTripleTapTutorialPage(@NonNull Context context) {
- final int type = UserShortcutType.TRIPLETAP;
+ final int type = TRIPLETAP;
final CharSequence title =
context.getText(R.string.accessibility_tutorial_dialog_title_triple);
final View image =
@@ -436,7 +440,7 @@
}
private static TutorialPage createTwoFingerTripleTapTutorialPage(@NonNull Context context) {
- final int type = UserShortcutType.TWOFINGER_DOUBLETAP;
+ final int type = TWOFINGER_DOUBLETAP;
final int numFingers = 2;
final CharSequence title = context.getString(
R.string.accessibility_tutorial_dialog_title_two_finger_double, numFingers);
@@ -454,7 +458,7 @@
private static TutorialPage createQuickSettingsTutorialPage(
@NonNull Context context, @NonNull CharSequence featureName, boolean inSetupWizard) {
- final int type = UserShortcutType.QUICK_SETTINGS;
+ final int type = QUICK_SETTINGS;
final CharSequence title =
context.getText(R.string.accessibility_tutorial_dialog_title_quick_setting);
final View image =
@@ -494,28 +498,28 @@
// LINT.IfChange(shortcut_type_ui_order)
final List<TutorialPage> tutorialPages = new ArrayList<>();
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if ((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
- == UserShortcutType.QUICK_SETTINGS) {
+ if ((shortcutTypes & QUICK_SETTINGS)
+ == QUICK_SETTINGS) {
tutorialPages.add(
createQuickSettingsTutorialPage(context, featureName, inSetupWizard));
}
}
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
tutorialPages.add(createSoftwareTutorialPage(context));
}
- if ((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
+ if ((shortcutTypes & HARDWARE) == HARDWARE) {
tutorialPages.add(createHardwareTutorialPage(context));
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if ((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
- == UserShortcutType.TWOFINGER_DOUBLETAP) {
+ if ((shortcutTypes & TWOFINGER_DOUBLETAP)
+ == TWOFINGER_DOUBLETAP) {
tutorialPages.add(createTwoFingerTripleTapTutorialPage(context));
}
}
- if ((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP) {
+ if ((shortcutTypes & TRIPLETAP) == TRIPLETAP) {
tutorialPages.add(createTripleTapTutorialPage(context));
}
// LINT.ThenChange(/res/xml/accessibility_edit_shortcuts.xml:shortcut_type_ui_order)
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index afc7b84..5bf2a3e 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -21,6 +21,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.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 android.accessibilityservice.AccessibilityServiceInfo;
import android.content.ComponentName;
import android.content.Context;
@@ -41,6 +47,7 @@
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
+import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
import com.android.internal.accessibility.util.ShortcutUtils;
import java.lang.annotation.Retention;
@@ -82,41 +89,6 @@
new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
/**
- * Annotation for different user shortcut type UI type.
- *
- * {@code EMPTY} for displaying default value.
- * {@code SOFTWARE} for displaying specifying the accessibility services or features which
- * choose accessibility button in the navigation bar as preferred shortcut.
- * {@code HARDWARE} for displaying specifying the accessibility services or features which
- * choose accessibility shortcut as preferred shortcut.
- * {@code TRIPLETAP} for displaying specifying magnification to be toggled via quickly
- * tapping screen 3 times as preferred shortcut.
- * {@code TWOFINGER_DOUBLETAP} for displaying specifying magnification to be toggled via
- * quickly tapping screen 2 times with two fingers as preferred shortcut.
- * {@code QUICK_SETTINGS} for displaying specifying the accessibility services or features which
- * choose Quick Settings as preferred shortcut.
- */
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({
- UserShortcutType.EMPTY,
- UserShortcutType.SOFTWARE,
- UserShortcutType.HARDWARE,
- UserShortcutType.TRIPLETAP,
- UserShortcutType.TWOFINGER_DOUBLETAP,
- UserShortcutType.QUICK_SETTINGS,
- })
-
- /** Denotes the user shortcut type. */
- public @interface UserShortcutType {
- int EMPTY = 0;
- int SOFTWARE = 1;
- int HARDWARE = 1 << 1;
- int TRIPLETAP = 1 << 2;
- int TWOFINGER_DOUBLETAP = 1 << 3;
- int QUICK_SETTINGS = 1 << 4;
- }
-
- /**
* Denotes the quick setting tooltip type.
*
* {@code GUIDE_TO_EDIT} for QS tiles that need to be added by editing.
@@ -230,11 +202,11 @@
return;
}
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- optInValueToSettings(context, UserShortcutType.SOFTWARE, componentName);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ optInValueToSettings(context, SOFTWARE, componentName);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- optInValueToSettings(context, UserShortcutType.HARDWARE, componentName);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ optInValueToSettings(context, HARDWARE, componentName);
}
}
@@ -301,11 +273,11 @@
return;
}
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- optOutValueFromSettings(context, UserShortcutType.SOFTWARE, componentName);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ optOutValueFromSettings(context, SOFTWARE, componentName);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- optOutValueFromSettings(context, UserShortcutType.HARDWARE, componentName);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ optOutValueFromSettings(context, HARDWARE, componentName);
}
}
@@ -364,16 +336,16 @@
static boolean hasValuesInSettings(Context context, int shortcutTypes,
@NonNull ComponentName componentName) {
boolean exist = false;
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- exist = hasValueInSettings(context, UserShortcutType.SOFTWARE, componentName);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ exist = hasValueInSettings(context, SOFTWARE, componentName);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- exist |= hasValueInSettings(context, UserShortcutType.HARDWARE, componentName);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ exist |= hasValueInSettings(context, HARDWARE, componentName);
}
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if ((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
- == UserShortcutType.QUICK_SETTINGS) {
- exist |= hasValueInSettings(context, UserShortcutType.QUICK_SETTINGS,
+ if ((shortcutTypes & QUICK_SETTINGS)
+ == QUICK_SETTINGS) {
+ exist |= hasValueInSettings(context, QUICK_SETTINGS,
componentName);
}
}
@@ -427,16 +399,16 @@
*/
static int getUserShortcutTypesFromSettings(Context context,
@NonNull ComponentName componentName) {
- int shortcutTypes = UserShortcutType.EMPTY;
- if (hasValuesInSettings(context, UserShortcutType.SOFTWARE, componentName)) {
- shortcutTypes |= UserShortcutType.SOFTWARE;
+ int shortcutTypes = DEFAULT;
+ if (hasValuesInSettings(context, SOFTWARE, componentName)) {
+ shortcutTypes |= SOFTWARE;
}
- if (hasValuesInSettings(context, UserShortcutType.HARDWARE, componentName)) {
- shortcutTypes |= UserShortcutType.HARDWARE;
+ if (hasValuesInSettings(context, HARDWARE, componentName)) {
+ shortcutTypes |= HARDWARE;
}
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (hasValuesInSettings(context, UserShortcutType.QUICK_SETTINGS, componentName)) {
- shortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ if (hasValuesInSettings(context, QUICK_SETTINGS, componentName)) {
+ shortcutTypes |= QUICK_SETTINGS;
}
}
@@ -455,11 +427,11 @@
}
switch (shortcutType) {
- case UserShortcutType.SOFTWARE:
+ case SOFTWARE:
return Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
- case UserShortcutType.HARDWARE:
+ case HARDWARE:
return Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
- case UserShortcutType.TRIPLETAP:
+ case TRIPLETAP:
return Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
default:
throw new IllegalArgumentException(
diff --git a/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java
index ad1ae96..19db266 100644
--- a/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizard.java
@@ -27,11 +27,13 @@
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;
@@ -41,10 +43,14 @@
*/
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(
@@ -78,4 +84,15 @@
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/AvailableHearingDeviceUpdater.java b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
index f600b03..31d069a 100644
--- a/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
+++ b/src/com/android/settings/accessibility/AvailableHearingDeviceUpdater.java
@@ -27,7 +27,7 @@
*/
public class AvailableHearingDeviceUpdater extends AvailableMediaBluetoothDeviceUpdater {
- private static final String PREF_KEY = "connected_hearing_device";
+ private static final String PREF_KEY_PREFIX = "connected_hearing_device_";
public AvailableHearingDeviceUpdater(Context context,
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
@@ -42,7 +42,7 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
}
diff --git a/src/com/android/settings/accessibility/BalanceSeekBar.java b/src/com/android/settings/accessibility/BalanceSeekBar.java
index 19301ae..7441d6f 100644
--- a/src/com/android/settings/accessibility/BalanceSeekBar.java
+++ b/src/com/android/settings/accessibility/BalanceSeekBar.java
@@ -20,6 +20,7 @@
import static com.android.settings.Utils.isNightMode;
+import android.annotation.StringRes;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
@@ -86,6 +87,14 @@
Settings.System.putFloatForUser(mContext.getContentResolver(),
Settings.System.MASTER_BALANCE, balance, UserHandle.USER_CURRENT);
}
+ final int max = getMax();
+ if (Flags.audioBalanceStateDescription() && max > 0) {
+ seekBar.setStateDescription(createStateDescription(mContext,
+ R.string.audio_seek_bar_state_left_first,
+ R.string.audio_seek_bar_state_right_first,
+ progress,
+ max));
+ }
// If fromUser is false, the call is a set from the framework on creation or on
// internal update. The progress may be zero, ignore (don't change system settings).
@@ -161,5 +170,19 @@
canvas.restore();
super.onDraw(canvas);
}
+
+ private static CharSequence createStateDescription(Context context,
+ @StringRes int resIdLeftFirst, @StringRes int resIdRightFirst,
+ int progress, float max) {
+ final boolean isLayoutRtl = context.getResources().getConfiguration().getLayoutDirection()
+ == LAYOUT_DIRECTION_RTL;
+ final int rightPercent = (int) (100 * (progress / max));
+ final int leftPercent = 100 - rightPercent;
+ if (rightPercent > leftPercent || (rightPercent == leftPercent && isLayoutRtl)) {
+ return context.getString(resIdRightFirst, rightPercent, leftPercent);
+ } else {
+ return context.getString(resIdLeftFirst, leftPercent, rightPercent);
+ }
+ }
}
diff --git a/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
index 74cb534..700a013 100644
--- a/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
+++ b/src/com/android/settings/accessibility/CaptioningAppearancePreferenceController.java
@@ -42,7 +42,8 @@
@Override
public CharSequence getSummary() {
- return mContext.getString(R.string.preference_summary_default_combination,
+ return mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
geFontScaleSummary(), getPresetSummary());
}
diff --git a/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java b/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
index 75d9229..296536c 100644
--- a/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
+++ b/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceController.java
@@ -19,17 +19,21 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
import android.provider.Settings;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
-import androidx.lifecycle.LifecycleObserver;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.DefaultLifecycleObserver;
+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.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import com.google.common.primitives.Ints;
@@ -39,41 +43,36 @@
/** Controller class that control radio button of accessibility daltonizer settings. */
public class DaltonizerRadioButtonPreferenceController extends BasePreferenceController implements
- LifecycleObserver, SelectorWithWidgetPreference.OnClickListener {
- private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
+ DefaultLifecycleObserver, SelectorWithWidgetPreference.OnClickListener {
+ private static final String DALTONIZER_TYPE_SETTINGS_KEY =
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
// pair the preference key and daltonizer value.
private final Map<String, Integer> mAccessibilityDaltonizerKeyToValueMap = new HashMap<>();
// RadioButtonPreference key, each preference represent a daltonizer value.
private final ContentResolver mContentResolver;
+ private final ContentObserver mSettingsContentObserver;
private final Resources mResources;
- private DaltonizerRadioButtonPreferenceController.OnChangeListener mOnChangeListener;
private SelectorWithWidgetPreference mPreference;
- private int mAccessibilityDaltonizerValue;
public DaltonizerRadioButtonPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
-
mContentResolver = context.getContentResolver();
mResources = context.getResources();
+ mSettingsContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange) {
+ if (mPreference != null) {
+ updateState(mPreference);
+ }
+ }
+ };
}
- public DaltonizerRadioButtonPreferenceController(Context context, Lifecycle lifecycle,
- String preferenceKey) {
- super(context, preferenceKey);
-
- mContentResolver = context.getContentResolver();
- mResources = context.getResources();
-
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver,
- String name) {
- final String daltonizerStringValue = Settings.Secure.getString(resolver, name);
+ protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver) {
+ final String daltonizerStringValue = Settings.Secure.getString(
+ resolver, DALTONIZER_TYPE_SETTINGS_KEY);
if (daltonizerStringValue == null) {
return AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
}
@@ -82,13 +81,8 @@
: daltonizerIntValue;
}
- public void setOnChangeListener(
- DaltonizerRadioButtonPreferenceController.OnChangeListener listener) {
- mOnChangeListener = listener;
- }
-
private Map<String, Integer> getDaltonizerValueToKeyMap() {
- if (mAccessibilityDaltonizerKeyToValueMap.size() == 0) {
+ if (mAccessibilityDaltonizerKeyToValueMap.isEmpty()) {
final String[] daltonizerKeys = mResources.getStringArray(
R.array.daltonizer_mode_keys);
@@ -104,12 +98,8 @@
return mAccessibilityDaltonizerKeyToValueMap;
}
- private void putSecureString(String name, String value) {
- Settings.Secure.putString(mContentResolver, name, value);
- }
-
private void handlePreferenceChange(String value) {
- putSecureString(TYPE, value);
+ Settings.Secure.putString(mContentResolver, DALTONIZER_TYPE_SETTINGS_KEY, value);
}
@Override
@@ -124,44 +114,38 @@
screen.findPreference(getPreferenceKey());
mPreference.setOnClickListener(this);
mPreference.setAppendixVisibility(View.GONE);
- updateState(mPreference);
}
@Override
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
final int value = getDaltonizerValueToKeyMap().get(mPreferenceKey);
handlePreferenceChange(String.valueOf(value));
- if (mOnChangeListener != null) {
- mOnChangeListener.onCheckedChanged(mPreference);
- }
}
private int getAccessibilityDaltonizerValue() {
- final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver,
- TYPE);
+ final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver);
return daltonizerValue;
}
- protected void updatePreferenceCheckedState(int value) {
- if (mAccessibilityDaltonizerValue == value) {
- mPreference.setChecked(true);
- }
- }
-
@Override
public void updateState(Preference preference) {
super.updateState(preference);
- mAccessibilityDaltonizerValue = getAccessibilityDaltonizerValue();
-
- // reset RadioButton
- mPreference.setChecked(false);
+ final int daltonizerValueInSetting = getAccessibilityDaltonizerValue();
final int preferenceValue = getDaltonizerValueToKeyMap().get(mPreference.getKey());
- updatePreferenceCheckedState(preferenceValue);
+ mPreference.setChecked(preferenceValue == daltonizerValueInSetting);
}
- /** Listener interface handles checked event. */
- public interface OnChangeListener {
- /** A hook that is called when preference checked. */
- void onCheckedChanged(Preference preference);
+ @Override
+ public void onResume(@NonNull LifecycleOwner owner) {
+ mContentResolver.registerContentObserver(
+ Settings.Secure.getUriFor(DALTONIZER_TYPE_SETTINGS_KEY),
+ /* notifyForDescendants= */ false,
+ mSettingsContentObserver
+ );
+ }
+
+ @Override
+ public void onPause(@NonNull LifecycleOwner owner) {
+ mContentResolver.unregisterContentObserver(mSettingsContentObserver);
}
}
diff --git a/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java b/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java
index 7dcd661..2997185 100644
--- a/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java
+++ b/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java
@@ -17,26 +17,50 @@
import android.content.ContentResolver;
import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
import android.provider.Settings;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.accessibility.Flags;
+import com.android.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
/**
* The controller of the seekbar preference for the saturation level of color correction.
*/
-public class DaltonizerSaturationSeekbarPreferenceController extends SliderPreferenceController {
+public class DaltonizerSaturationSeekbarPreferenceController
+ extends SliderPreferenceController
+ implements DefaultLifecycleObserver {
private static final int DEFAULT_SATURATION_LEVEL = 7;
private static final int SATURATION_MAX = 10;
- private static final int SATURATION_MIN = 0;
+ private static final int SATURATION_MIN = 1;
private int mSliderPosition;
private final ContentResolver mContentResolver;
+ @Nullable
+ private SeekBarPreference mPreference;
+
+ public final ContentObserver mContentObserver = new ContentObserver(
+ new Handler(Looper.getMainLooper())) {
+ @Override
+ public void onChange(boolean selfChange) {
+ if (mPreference != null) {
+ updateState(mPreference);
+ }
+ }
+ };
+
public DaltonizerSaturationSeekbarPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
@@ -50,9 +74,32 @@
}
@Override
+ public void onStart(@NonNull LifecycleOwner owner) {
+ if (!isAvailable()) return;
+ mContentResolver.registerContentObserver(
+ Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER),
+ true,
+ mContentObserver
+ );
+ mContentResolver.registerContentObserver(
+ Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED),
+ true,
+ mContentObserver
+ );
+ }
+
+ @Override
+ public void onStop(@NonNull LifecycleOwner owner) {
+ if (!isAvailable()) return;
+ mContentResolver.unregisterContentObserver(mContentObserver);
+ mPreference = null;
+ }
+
+ @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
SeekBarPreference preference = screen.findPreference(getPreferenceKey());
+ mPreference = preference;
preference.setMax(getMax());
preference.setMin(getMin());
preference.setProgress(mSliderPosition);
@@ -62,7 +109,7 @@
@Override
public int getAvailabilityStatus() {
if (Flags.enableColorCorrectionSaturation()) {
- return AVAILABLE;
+ return shouldSeekBarEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}
return CONDITIONALLY_UNAVAILABLE;
}
@@ -86,6 +133,21 @@
}
@Override
+ public void updateState(Preference preference) {
+ if (preference == null) {
+ return;
+ }
+
+ var shouldSeekbarEnabled = shouldSeekBarEnabled();
+ // setSummary not working yet on SeekBarPreference.
+ String summary = shouldSeekbarEnabled
+ ? ""
+ : mContext.getString(R.string.daltonizer_saturation_unavailable_summary);
+ preference.setSummary(summary);
+ preference.setEnabled(shouldSeekbarEnabled);
+ }
+
+ @Override
public int getMax() {
return SATURATION_MAX;
}
@@ -94,4 +156,16 @@
public int getMin() {
return SATURATION_MIN;
}
+
+ private boolean shouldSeekBarEnabled() {
+ int enabled = Settings.Secure.getInt(
+ mContentResolver, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0);
+ int mode = Settings.Secure.getInt(
+ mContentResolver, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, -1);
+
+ // enabled == 0 is disabled and also default.
+ // mode == 0 is gray scale where saturation level isn't applicable.
+ // mode == -1 is disabled and also default.
+ return enabled != 0 && mode != -1 && mode != 0;
+ }
}
diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index eb7b27d..9c8560b 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -17,7 +17,6 @@
package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.DialogInterface;
import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -63,17 +62,4 @@
super.onAllowButtonFromShortcutToggleClicked();
AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, true);
}
-
- /**
- * {@inheritDoc}
- *
- * Enables accessibility service when shortcutPreference is checked.
- */
- @Override
- protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
- super.callOnAlertDialogCheckboxClicked(dialog, which);
-
- final boolean enabled = mShortcutPreference.isChecked();
- AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
- }
}
diff --git a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
index 21800b9..3ba0f0d 100644
--- a/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
@@ -111,9 +111,8 @@
@Override
public int getAvailabilityStatus() {
if (Flags.keyboardCategoryEnabled()
- && mContext.getResources().getBoolean(R.bool.config_keyboard_vibration_supported)
- && mContext.getResources().getFloat(
- com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude) > 0) {
+ && mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_keyboardVibrationSettingsSupported)) {
return AVAILABLE;
}
return UNSUPPORTED_ON_DEVICE;
@@ -155,8 +154,8 @@
}
private boolean isKeyboardVibrationSwitchEnabled() {
- return Settings.System.getInt(mContext.getContentResolver(), KEYBOARD_VIBRATION_ENABLED,
- mVibrator.isDefaultKeyboardVibrationEnabled() ? ON : OFF) == ON;
+ return Settings.System.getInt(
+ mContext.getContentResolver(), KEYBOARD_VIBRATION_ENABLED, ON) == ON;
}
private boolean updateKeyboardVibrationSetting(boolean enable) {
diff --git a/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceController.java b/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceController.java
index 3e3b8d9..a6d87f2 100644
--- a/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceController.java
@@ -28,6 +28,7 @@
import android.provider.Settings;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -103,16 +104,10 @@
@Override
public CharSequence getSummary() {
- if (!mSwitchPreference.isEnabled()) {
- return mContext.getString(
- R.string.accessibility_magnification_one_finger_panning_summary_unavailable);
- }
-
- return (isChecked())
- ? mContext.getString(
- R.string.accessibility_magnification_one_finger_panning_summary_on)
- : mContext.getString(
- R.string.accessibility_magnification_one_finger_panning_summary_off);
+ @StringRes int resId = mSwitchPreference.isEnabled()
+ ? R.string.accessibility_magnification_one_finger_panning_summary
+ : R.string.accessibility_magnification_one_finger_panning_summary_unavailable;
+ return mContext.getString(resId);
}
@Override
diff --git a/src/com/android/settings/accessibility/PreferredShortcut.java b/src/com/android/settings/accessibility/PreferredShortcut.java
index 1654992..c26960e 100644
--- a/src/com/android/settings/accessibility/PreferredShortcut.java
+++ b/src/com/android/settings/accessibility/PreferredShortcut.java
@@ -19,7 +19,7 @@
import android.content.ComponentName;
import android.text.TextUtils;
-import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
import com.google.common.base.Objects;
diff --git a/src/com/android/settings/accessibility/PreferredShortcuts.java b/src/com/android/settings/accessibility/PreferredShortcuts.java
index 895430a..c3e64ab 100644
--- a/src/com/android/settings/accessibility/PreferredShortcuts.java
+++ b/src/com/android/settings/accessibility/PreferredShortcuts.java
@@ -16,6 +16,10 @@
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;
import android.content.Context;
import android.content.SharedPreferences;
@@ -27,8 +31,8 @@
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;
-import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import java.util.HashSet;
import java.util.Map;
@@ -43,18 +47,18 @@
/**
* Retrieves the user preferred shortcut types for the given {@code componentName} from
* SharedPreferences. If the user doesn't have a preferred shortcut,
- * {@link ShortcutConstants.UserShortcutType.SOFTWARE} is returned.
+ * {@link SOFTWARE} is returned.
*
* @param context {@link Context} to access the {@link SharedPreferences}
* @param componentName Name of the service or activity, should be the format of {@link
* ComponentName#flattenToString()}.
- * @return {@link ShortcutConstants.UserShortcutType}
+ * @return {@link UserShortcutType}
*/
- @ShortcutConstants.UserShortcutType
+ @UserShortcutType
public static int retrieveUserShortcutType(
@NonNull Context context, @NonNull String componentName) {
return retrieveUserShortcutType(
- context, componentName, ShortcutConstants.UserShortcutType.SOFTWARE);
+ context, componentName, SOFTWARE);
}
/**
@@ -66,13 +70,13 @@
* ComponentName#flattenToString()}.
* @param defaultTypes The default shortcut types to use if the user doesn't have a
* preferred shortcut.
- * @return {@link ShortcutConstants.UserShortcutType}
+ * @return {@link UserShortcutType}
*/
- @ShortcutConstants.UserShortcutType
+ @UserShortcutType
public static int retrieveUserShortcutType(
@NonNull Context context,
@NonNull String componentName,
- @ShortcutConstants.UserShortcutType int defaultTypes) {
+ @UserShortcutType int defaultTypes) {
// Create a mutable set to modify
final Set<String> info = new HashSet<>(getFromSharedPreferences(context));
@@ -121,7 +125,7 @@
final Map<Integer, Set<String>> shortcutTypeToTargets = new ArrayMap<>();
for (int shortcutType : ShortcutConstants.USER_SHORTCUT_TYPES) {
if (!Flags.a11yQsShortcut()
- && shortcutType == ShortcutConstants.UserShortcutType.QUICK_SETTINGS) {
+ && shortcutType == QUICK_SETTINGS) {
// Skip saving quick setting as preferred shortcut option when flag is not enabled
continue;
}
@@ -132,14 +136,14 @@
}
for (String target : components) {
- int shortcutTypes = ShortcutConstants.UserShortcutType.DEFAULT;
+ int shortcutTypes = DEFAULT;
for (Map.Entry<Integer, Set<String>> entry : shortcutTypeToTargets.entrySet()) {
if (entry.getValue().contains(target)) {
shortcutTypes |= entry.getKey();
}
}
- if (shortcutTypes != ShortcutConstants.UserShortcutType.DEFAULT) {
+ if (shortcutTypes != DEFAULT) {
final PreferredShortcut shortcut = new PreferredShortcut(
target, shortcutTypes);
PreferredShortcuts.saveUserShortcutType(context, shortcut);
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
index 3ca089c..e7f59f4 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
@@ -29,6 +29,7 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.annotation.Nullable;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -125,9 +126,14 @@
mContext.getContentResolver().unregisterContentObserver(mSettingsContentObserver);
}
+ @Nullable
@Override
protected ComponentName getTileComponentName() {
- return REDUCE_BRIGHT_COLORS_TILE_SERVICE_COMPONENT_NAME;
+ // 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
diff --git a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
index 645d091..1de9c72 100644
--- a/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
+++ b/src/com/android/settings/accessibility/SavedHearingDeviceUpdater.java
@@ -29,7 +29,7 @@
*/
public class SavedHearingDeviceUpdater extends SavedBluetoothDeviceUpdater {
- private static final String PREF_KEY = "saved_hearing_device";
+ private static final String PREF_KEY_PREFIX = "saved_hearing_device_";
public SavedHearingDeviceUpdater(Context context,
DevicePreferenceCallback devicePreferenceCallback, int metricsCategory) {
@@ -47,7 +47,7 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index a79098b..e41d857 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -40,7 +40,6 @@
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
-import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.CompoundButton;
@@ -411,17 +410,6 @@
}
}
- private void onDialogButtonFromEnableToggleClicked(View view) {
- final int viewId = view.getId();
- if (viewId == R.id.permission_enable_allow_button) {
- onAllowButtonFromEnableToggleClicked();
- } else if (viewId == R.id.permission_enable_deny_button) {
- onDenyButtonFromEnableToggleClicked();
- } else {
- throw new IllegalArgumentException("Unexpected view id");
- }
- }
-
private void onDialogButtonFromUninstallClicked() {
mWarningDialog.dismiss();
final Intent uninstallIntent = createUninstallPackageActivityIntent();
@@ -491,17 +479,6 @@
mWarningDialog.dismiss();
}
- void onDialogButtonFromShortcutToggleClicked(View view) {
- final int viewId = view.getId();
- if (viewId == R.id.permission_enable_allow_button) {
- onAllowButtonFromShortcutToggleClicked();
- } else if (viewId == R.id.permission_enable_deny_button) {
- onDenyButtonFromShortcutToggleClicked();
- } else {
- throw new IllegalArgumentException("Unexpected view id");
- }
- }
-
void onAllowButtonFromShortcutToggleClicked() {
mShortcutPreference.setChecked(true);
@@ -526,17 +503,13 @@
private void onAllowButtonFromShortcutClicked() {
mIsDialogShown.set(false);
- if (Flags.editShortcutsInFullScreen()) {
- EditShortcutsPreferenceFragment.showEditShortcutScreen(
- getContext(),
- getMetricsCategory(),
- getShortcutTitle(),
- mComponentName,
- getIntent()
- );
- } else {
- showPopupDialog(DialogEnums.EDIT_SHORTCUT);
- }
+ EditShortcutsPreferenceFragment.showEditShortcutScreen(
+ getContext(),
+ getMetricsCategory(),
+ getShortcutTitle(),
+ mComponentName,
+ getIntent()
+ );
if (mWarningDialog != null) {
mWarningDialog.dismiss();
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 0cfa756..52f1695 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -24,8 +24,6 @@
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
-import android.content.Context;
-import android.content.res.Resources;
import android.os.Bundle;
import android.provider.Settings;
import android.view.LayoutInflater;
@@ -33,14 +31,11 @@
import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SettingsMainSwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
@@ -48,40 +43,18 @@
/** Settings for daltonizer. */
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
- implements DaltonizerRadioButtonPreferenceController.OnChangeListener {
+public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment {
private static final String TAG = "ToggleDaltonizerPreferenceFragment";
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String KEY_PREVIEW = "daltonizer_preview";
- @VisibleForTesting
- static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";
- @VisibleForTesting
- static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";
- @VisibleForTesting
- static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";
- @VisibleForTesting
- static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";
+ private static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";
+ 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_SATURATION = "daltonizer_saturation";
- private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
-
- private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- Lifecycle lifecycle) {
- if (sControllers.size() == 0) {
- final Resources resources = context.getResources();
- final String[] daltonizerKeys = resources.getStringArray(
- R.array.daltonizer_mode_keys);
-
- for (String daltonizerKey : daltonizerKeys) {
- sControllers.add(new DaltonizerRadioButtonPreferenceController(
- context, lifecycle, daltonizerKey));
- }
- }
- return sControllers;
- }
-
@Override
protected void registerKeysToObserverCallback(
AccessibilitySettingsContentObserver contentObserver) {
@@ -117,13 +90,6 @@
}
}
- @Override
- public void onCheckedChanged(Preference preference) {
- for (AbstractPreferenceController controller : sControllers) {
- controller.updateState(preference);
- }
- }
-
private void updateFooterPreference() {
final String title = getPrefContext()
.getString(R.string.accessibility_daltonizer_about_title);
@@ -155,21 +121,6 @@
public void onResume() {
super.onResume();
updateSwitchBarToggleSwitch();
- for (AbstractPreferenceController controller :
- buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
- ((DaltonizerRadioButtonPreferenceController) controller).setOnChangeListener(this);
- ((DaltonizerRadioButtonPreferenceController) controller).displayPreference(
- getPreferenceScreen());
- }
- }
-
- @Override
- public void onPause() {
- for (AbstractPreferenceController controller :
- buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
- ((DaltonizerRadioButtonPreferenceController) controller).setOnChangeListener(null);
- }
- super.onPause();
}
@Override
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index a57b459..0ac29bc 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -16,6 +16,10 @@
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 android.app.Activity;
@@ -43,7 +47,6 @@
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
-import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ImageView;
@@ -55,11 +58,10 @@
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.SettingsActivity;
-import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
-import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.flags.Flags;
@@ -84,11 +86,9 @@
public static final String KEY_GENERAL_CATEGORY = "general_categories";
public static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
- public static final int NOT_SET = -1;
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_USER_SHORTCUT_TYPE = "shortcut_type";
protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow";
protected static final String KEY_SAVED_QS_TOOLTIP_TYPE = "qs_tooltip_type";
protected static final String KEY_ANIMATED_IMAGE = "animated_image";
@@ -101,6 +101,7 @@
protected SettingsMainSwitchPreference mToggleServiceSwitchPreference;
protected ShortcutPreference mShortcutPreference;
protected Preference mSettingsPreference;
+ @Nullable protected AccessibilityFooterPreference mHtmlFooterPreference;
protected AccessibilityFooterPreferenceController mFooterPreferenceController;
protected String mPreferenceKey;
protected Dialog mDialog;
@@ -112,15 +113,10 @@
protected Uri mImageUri;
protected CharSequence mHtmlDescription;
protected CharSequence mTopIntroTitle;
- // Save user's shortcutType value when savedInstance has value (e.g. device rotated).
- protected int mSavedCheckBoxValue = NOT_SET;
private CharSequence mDescription;
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
private AccessibilitySettingsContentObserver mSettingsContentObserver;
- private CheckBox mSoftwareTypeCheckBox;
- private CheckBox mHardwareTypeCheckBox;
-
private AccessibilityQuickSettingsTooltipWindow mTooltipWindow;
private boolean mNeedsQSTooltipReshow = false;
private int mNeedsQSTooltipType = QuickSettingsTooltipType.GUIDE_TO_EDIT;
@@ -143,10 +139,6 @@
onProcessArguments(getArguments());
// Restore the user shortcut type and tooltip.
if (savedInstanceState != null) {
- if (savedInstanceState.containsKey(KEY_SAVED_USER_SHORTCUT_TYPE)) {
- mSavedCheckBoxValue = savedInstanceState.getInt(KEY_SAVED_USER_SHORTCUT_TYPE,
- NOT_SET);
- }
if (savedInstanceState.containsKey(KEY_SAVED_QS_TOOLTIP_RESHOW)) {
mNeedsQSTooltipReshow = savedInstanceState.getBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW);
}
@@ -204,7 +196,6 @@
updateToggleServiceTitle(mToggleServiceSwitchPreference);
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
- removeDialog(DialogEnums.EDIT_SHORTCUT);
mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
};
@@ -215,14 +206,6 @@
@Override
public Dialog onCreateDialog(int dialogId) {
switch (dialogId) {
- case DialogEnums.EDIT_SHORTCUT:
- final int dialogType = isAnySetupWizard()
- ? DialogType.EDIT_SHORTCUT_GENERIC_SUW : DialogType.EDIT_SHORTCUT_GENERIC;
- mDialog = AccessibilityDialogUtils.showEditShortcutDialog(
- getPrefContext(), dialogType, getShortcutTitle(),
- this::callOnAlertDialogCheckboxClicked);
- setupEditShortcutDialog(mDialog);
- return mDialog;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
if (isAnySetupWizard()) {
mDialog = AccessibilityShortcutsTutorial
@@ -273,8 +256,6 @@
mSettingsContentObserver.register(getContentResolver());
updateShortcutPreferenceData();
updateShortcutPreference();
-
- updateEditShortcutDialogIfNeeded();
}
@Override
@@ -288,10 +269,6 @@
@Override
public void onSaveInstanceState(Bundle outState) {
- final int value = getShortcutTypeCheckBoxValue();
- if (value != NOT_SET) {
- outState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, value);
- }
final boolean isTooltipWindowShowing = mTooltipWindow != null && mTooltipWindow.isShowing();
if (mNeedsQSTooltipReshow || isTooltipWindowShowing) {
outState.putBoolean(KEY_SAVED_QS_TOOLTIP_RESHOW, /* value= */ true);
@@ -313,8 +290,6 @@
@Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
- case DialogEnums.EDIT_SHORTCUT:
- return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_EDIT_SHORTCUT;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
return SettingsEnums.DIALOG_ACCESSIBILITY_TUTORIAL;
default:
@@ -589,27 +564,40 @@
}
private void initHtmlTextPreference() {
- if (TextUtils.isEmpty(mHtmlDescription)) {
+ if (TextUtils.isEmpty(getCurrentHtmlDescription())) {
return;
}
final PreferenceScreen screen = getPreferenceScreen();
- final CharSequence htmlDescription = Html.fromHtml(mHtmlDescription.toString(),
- Html.FROM_HTML_MODE_COMPACT, mImageGetter, /* tagHandler= */ null);
- final AccessibilityFooterPreference htmlFooterPreference =
+ mHtmlFooterPreference =
new AccessibilityFooterPreference(screen.getContext());
- htmlFooterPreference.setKey(KEY_HTML_DESCRIPTION_PREFERENCE);
- htmlFooterPreference.setSummary(htmlDescription);
- screen.addPreference(htmlFooterPreference);
+ mHtmlFooterPreference.setKey(KEY_HTML_DESCRIPTION_PREFERENCE);
+ updateHtmlTextPreference();
+ screen.addPreference(mHtmlFooterPreference);
// TODO(b/171272809): Migrate to DashboardFragment.
final String title = getString(R.string.accessibility_introduction_title, mPackageName);
mFooterPreferenceController = new AccessibilityFooterPreferenceController(
- screen.getContext(), htmlFooterPreference.getKey());
+ screen.getContext(), mHtmlFooterPreference.getKey());
mFooterPreferenceController.setIntroductionTitle(title);
mFooterPreferenceController.displayPreference(screen);
}
+ protected void updateHtmlTextPreference() {
+ if (mHtmlFooterPreference == null) {
+ return;
+ }
+
+ String description = getCurrentHtmlDescription().toString();
+ final CharSequence htmlDescription = Html.fromHtml(description,
+ Html.FROM_HTML_MODE_COMPACT, mImageGetter, /* tagHandler= */ null);
+ mHtmlFooterPreference.setSummary(htmlDescription);
+ }
+
+ CharSequence getCurrentHtmlDescription() {
+ return mHtmlDescription;
+ }
+
private void initFooterPreference() {
if (!TextUtils.isEmpty(mDescription)) {
createFooterPreference(getPreferenceScreen(), mDescription,
@@ -617,7 +605,6 @@
}
}
-
/**
* Creates {@link AccessibilityFooterPreference} and append into {@link PreferenceScreen}
*
@@ -639,69 +626,10 @@
mFooterPreferenceController.displayPreference(screen);
}
- @VisibleForTesting
- void setupEditShortcutDialog(Dialog dialog) {
- final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
- mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
-
- final View dialogHardwareView = dialog.findViewById(R.id.hardware_shortcut);
- mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
-
- updateEditShortcutDialogCheckBox();
- }
-
- private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
- final View dialogTextArea = dialogView.findViewById(R.id.container);
- dialogTextArea.setOnClickListener(v -> checkBox.toggle());
- }
-
- private void updateEditShortcutDialogCheckBox() {
- // If it is during onConfigChanged process then restore the value, or get the saved value
- // when shortcutPreference is checked.
- int value = restoreOnConfigChangedValue();
- if (value == NOT_SET) {
- final int lastNonEmptyUserShortcutType = getUserPreferredShortcutTypes();
- value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
- : UserShortcutType.EMPTY;
- }
-
- mSoftwareTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.SOFTWARE));
- mHardwareTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.HARDWARE));
- }
-
- private int restoreOnConfigChangedValue() {
- final int savedValue = mSavedCheckBoxValue;
- mSavedCheckBoxValue = NOT_SET;
- return savedValue;
- }
-
private boolean hasShortcutType(int value, @UserShortcutType int type) {
return (value & type) == type;
}
- /**
- * Returns accumulated {@link UserShortcutType} checkbox value or {@code NOT_SET} if checkboxes
- * did not exist.
- */
- protected int getShortcutTypeCheckBoxValue() {
- if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
- return NOT_SET;
- }
-
- int value = UserShortcutType.EMPTY;
- if (mSoftwareTypeCheckBox.isChecked()) {
- value |= UserShortcutType.SOFTWARE;
- }
- if (mHardwareTypeCheckBox.isChecked()) {
- value |= UserShortcutType.HARDWARE;
- }
- return value;
- }
-
protected CharSequence getShortcutTypeSummary(Context context) {
if (!mShortcutPreference.isSettingsEditable()) {
return context.getText(R.string.accessibility_shortcut_edit_dialog_title_hardware);
@@ -717,16 +645,16 @@
final List<CharSequence> list = new ArrayList<>();
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (hasShortcutType(shortcutTypes, UserShortcutType.QUICK_SETTINGS)) {
+ 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, UserShortcutType.SOFTWARE)) {
+ if (hasShortcutType(shortcutTypes, SOFTWARE)) {
list.add(getSoftwareShortcutTypeSummary(context));
}
- if (hasShortcutType(shortcutTypes, UserShortcutType.HARDWARE)) {
+ if (hasShortcutType(shortcutTypes, HARDWARE)) {
final CharSequence hardwareTitle = context.getText(
R.string.accessibility_shortcut_hardware_keyword);
list.add(hardwareTitle);
@@ -765,35 +693,6 @@
showQuickSettingsTooltipIfNeeded();
}
- /**
- * This method will be invoked when a button in the edit shortcut dialog is clicked.
- *
- * @param dialog The dialog that received the click
- * @param which The button that was clicked
- */
- protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
- if (mComponentName == null) {
- return;
- }
-
- final int value = getShortcutTypeCheckBoxValue();
- saveNonEmptyUserShortcutType(value);
- AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), value, mComponentName);
- AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~value, mComponentName);
- final boolean shortcutAssigned = value != UserShortcutType.EMPTY;
- mShortcutPreference.setChecked(shortcutAssigned);
- mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
-
- if (mHardwareTypeCheckBox.isChecked()) {
- AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(getPrefContext());
- }
-
- // Show the quick setting tooltip if the shortcut assigned in the first time
- if (shortcutAssigned) {
- showQuickSettingsTooltipIfNeeded();
- }
- }
-
protected void updateShortcutPreferenceData() {
if (mComponentName == null) {
return;
@@ -801,7 +700,7 @@
final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(
getPrefContext(), mComponentName);
- if (shortcutTypes != UserShortcutType.EMPTY) {
+ if (shortcutTypes != DEFAULT) {
final PreferredShortcut shortcut = new PreferredShortcut(
mComponentName.flattenToString(), shortcutTypes);
PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
@@ -844,13 +743,9 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- if (com.android.settings.accessibility.Flags.editShortcutsInFullScreen()) {
- EditShortcutsPreferenceFragment.showEditShortcutScreen(
- requireContext(), getMetricsCategory(), getShortcutTitle(),
- mComponentName, getIntent());
- } else {
- showDialog(DialogEnums.EDIT_SHORTCUT);
- }
+ EditShortcutsPreferenceFragment.showEditShortcutScreen(
+ requireContext(), getMetricsCategory(), getShortcutTitle(),
+ mComponentName, getIntent());
}
/**
@@ -887,24 +782,6 @@
}
}
- private void updateEditShortcutDialogIfNeeded() {
- if (mDialog == null || !mDialog.isShowing()) {
- return;
- }
- AccessibilityDialogUtils.updateShortcutInDialog(getContext(), mDialog);
- }
-
- @VisibleForTesting
- void saveNonEmptyUserShortcutType(int type) {
- if (type == UserShortcutType.EMPTY) {
- return;
- }
-
- final PreferredShortcut shortcut = new PreferredShortcut(
- mComponentName.flattenToString(), type);
- PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
- }
-
/**
* Shows the quick settings tooltip if the quick settings feature is assigned. The tooltip only
* shows once.
@@ -983,7 +860,7 @@
*/
@ShortcutConstants.UserShortcutType
protected int getDefaultShortcutTypes() {
- return ShortcutConstants.UserShortcutType.SOFTWARE;
+ return SOFTWARE;
}
/**
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index fc75cde..a030a0a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -18,6 +18,12 @@
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.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 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;
@@ -27,7 +33,6 @@
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.icu.text.CaseMap;
import android.icu.text.MessageFormat;
@@ -42,21 +47,20 @@
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
-import android.widget.CheckBox;
import androidx.annotation.Nullable;
+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.annotations.VisibleForTesting;
import com.android.server.accessibility.Flags;
import com.android.settings.DialogCreatable;
import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
-import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;
import com.android.settings.utils.LocaleUtils;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -85,12 +89,11 @@
// TODO(b/147021230): Move duplicated functions with android/internal/accessibility into util.
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
- private CheckBox mSoftwareTypeCheckBox;
- private CheckBox mHardwareTypeCheckBox;
- private CheckBox mTripleTapTypeCheckBox;
- @Nullable private CheckBox mTwoFingerTripleTapTypeCheckBox;
private DialogCreatable mDialogDelegate;
+ @Nullable
+ MagnificationOneFingerPanningPreferenceController mOneFingerPanningPreferenceController;
+
private boolean mInSetupWizard;
@Override
@@ -109,7 +112,6 @@
.appendPath(String.valueOf(R.raw.a11y_magnification_banner))
.build();
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
- removeDialog(DialogEnums.EDIT_SHORTCUT);
mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
};
@@ -174,15 +176,6 @@
case DialogEnums.GESTURE_NAVIGATION_TUTORIAL:
return AccessibilityShortcutsTutorial
.showAccessibilityGestureTutorialDialog(getPrefContext());
- case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:
- final CharSequence dialogTitle = getShortcutTitle();
- final int dialogType = mInSetupWizard
- ? DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW
- : DialogType.EDIT_SHORTCUT_MAGNIFICATION;
- mDialog = AccessibilityDialogUtils.showEditShortcutDialog(getPrefContext(),
- dialogType, dialogTitle, this::callOnAlertDialogCheckboxClicked);
- setupMagnificationEditShortcutDialog(mDialog);
- return mDialog;
default:
return super.onCreateDialog(dialogId);
}
@@ -236,7 +229,8 @@
context.getString(R.string.accessibility_screen_magnification_intro_text));
}
- if (!arguments.containsKey(AccessibilitySettings.EXTRA_HTML_DESCRIPTION)) {
+ if (!arguments.containsKey(AccessibilitySettings.EXTRA_HTML_DESCRIPTION)
+ && !Flags.enableMagnificationOneFingerPanningGesture()) {
String summary = MessageFormat.format(
context.getString(R.string.accessibility_screen_magnification_summary),
new Object[]{1, 2, 3, 4, 5});
@@ -308,12 +302,12 @@
MagnificationOneFingerPanningPreferenceController.PREF_KEY);
generalCategory.addPreference(oneFingerPanningPreference);
- var oneFingerPanningPreferenceController =
+ mOneFingerPanningPreferenceController =
new MagnificationOneFingerPanningPreferenceController(getContext());
- oneFingerPanningPreferenceController.setInSetupWizard(mInSetupWizard);
- getSettingsLifecycle().addObserver(oneFingerPanningPreferenceController);
- oneFingerPanningPreferenceController.displayPreference(getPreferenceScreen());
- addPreferenceController(oneFingerPanningPreferenceController);
+ mOneFingerPanningPreferenceController.setInSetupWizard(mInSetupWizard);
+ getSettingsLifecycle().addObserver(mOneFingerPanningPreferenceController);
+ mOneFingerPanningPreferenceController.displayPreference(getPreferenceScreen());
+ addPreferenceController(mOneFingerPanningPreferenceController);
}
private void addJoystickSetting(PreferenceCategory generalCategory) {
@@ -354,95 +348,6 @@
mDialogDelegate = delegate;
}
- @Override
- protected int getShortcutTypeCheckBoxValue() {
- if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
- return NOT_SET;
- }
-
- int value = UserShortcutType.EMPTY;
- if (mSoftwareTypeCheckBox.isChecked()) {
- value |= UserShortcutType.SOFTWARE;
- }
- if (mHardwareTypeCheckBox.isChecked()) {
- value |= UserShortcutType.HARDWARE;
- }
- if (mTripleTapTypeCheckBox.isChecked()) {
- value |= UserShortcutType.TRIPLETAP;
- }
- if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (mTwoFingerTripleTapTypeCheckBox.isChecked()) {
- value |= UserShortcutType.TWOFINGER_DOUBLETAP;
- }
- }
- return value;
- }
-
- @VisibleForTesting
- void setupMagnificationEditShortcutDialog(Dialog dialog) {
- final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
- mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
-
- final View dialogHardwareView = dialog.findViewById(R.id.hardware_shortcut);
- mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
-
- if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- final View dialogTwoFignerTripleTapView =
- dialog.findViewById(R.id.two_finger_triple_tap_shortcut);
- mTwoFingerTripleTapTypeCheckBox = dialogTwoFignerTripleTapView.findViewById(
- R.id.checkbox);
- setDialogTextAreaClickListener(
- dialogTwoFignerTripleTapView, mTwoFingerTripleTapTypeCheckBox);
- }
-
- final View dialogTripleTapView = dialog.findViewById(R.id.triple_tap_shortcut);
- mTripleTapTypeCheckBox = dialogTripleTapView.findViewById(R.id.checkbox);
- setDialogTextAreaClickListener(dialogTripleTapView, mTripleTapTypeCheckBox);
-
- final View advancedView = dialog.findViewById(R.id.advanced_shortcut);
- if (mTripleTapTypeCheckBox.isChecked()) {
- advancedView.setVisibility(View.GONE);
- dialogTripleTapView.setVisibility(View.VISIBLE);
- }
-
- updateMagnificationEditShortcutDialogCheckBox();
- }
-
- private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
- final View dialogTextArea = dialogView.findViewById(R.id.container);
- dialogTextArea.setOnClickListener(v -> checkBox.toggle());
- }
-
- private void updateMagnificationEditShortcutDialogCheckBox() {
- // If it is during onConfigChanged process then restore the value, or get the saved value
- // when shortcutPreference is checked.
- int value = restoreOnConfigChangedValue();
- if (value == NOT_SET) {
- final int lastNonEmptyUserShortcutType = getUserPreferredShortcutTypes();
- value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
- : UserShortcutType.EMPTY;
- }
-
- mSoftwareTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.SOFTWARE));
- mHardwareTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.HARDWARE));
- mTripleTapTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.TRIPLETAP));
- if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- mTwoFingerTripleTapTypeCheckBox.setChecked(
- hasShortcutType(value, UserShortcutType.TWOFINGER_DOUBLETAP));
- }
- }
-
- private int restoreOnConfigChangedValue() {
- final int savedValue = mSavedCheckBoxValue;
- mSavedCheckBoxValue = NOT_SET;
- return savedValue;
- }
-
private boolean hasShortcutType(int value, @UserShortcutType int type) {
return (value & type) == type;
}
@@ -471,6 +376,12 @@
);
contentObserver.registerKeysToObserverCallback(keysToObserve,
key -> updatePreferencesState());
+
+ if (Flags.enableMagnificationOneFingerPanningGesture()) {
+ contentObserver.registerKeysToObserverCallback(
+ List.of(Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED),
+ key -> updateHtmlTextPreference());
+ }
}
private void updatePreferencesState() {
@@ -481,6 +392,25 @@
}
@Override
+ CharSequence getCurrentHtmlDescription() {
+ CharSequence origin = super.getCurrentHtmlDescription();
+ if (!TextUtils.isEmpty(origin)) {
+ // If in ToggleFeaturePreferenceFragment we already have a fixed html description, we
+ // should use the fixed one, otherwise we'll dynamically decide the description.
+ return origin;
+ }
+
+ Context context = getContext();
+ if (mOneFingerPanningPreferenceController != null && context != null) {
+ @StringRes int resId = mOneFingerPanningPreferenceController.isChecked()
+ ? R.string.accessibility_screen_magnification_summary_one_finger_panning_on
+ : R.string.accessibility_screen_magnification_summary_one_finger_panning_off;
+ return MessageFormat.format(context.getString(resId), new Object[]{1, 2, 3, 4, 5});
+ }
+ return "";
+ }
+
+ @Override
protected List<String> getShortcutFeatureSettingsKeys() {
final List<String> shortcutKeys = super.getShortcutFeatureSettingsKeys();
shortcutKeys.add(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
@@ -499,28 +429,28 @@
// LINT.IfChange(shortcut_type_ui_order)
final List<CharSequence> list = new ArrayList<>();
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (hasShortcutType(shortcutTypes, UserShortcutType.QUICK_SETTINGS)) {
+ 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, UserShortcutType.SOFTWARE)) {
+ if (hasShortcutType(shortcutTypes, SOFTWARE)) {
list.add(getSoftwareShortcutTypeSummary(context));
}
- if (hasShortcutType(shortcutTypes, UserShortcutType.HARDWARE)) {
+ if (hasShortcutType(shortcutTypes, HARDWARE)) {
final CharSequence hardwareTitle = context.getText(
R.string.accessibility_shortcut_hardware_keyword);
list.add(hardwareTitle);
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGER_DOUBLETAP)) {
+ 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, UserShortcutType.TRIPLETAP)) {
+ if (hasShortcutType(shortcutTypes, TRIPLETAP)) {
final CharSequence tripleTapTitle = context.getText(
R.string.accessibility_shortcut_triple_tap_keyword);
list.add(tripleTapTitle);
@@ -537,22 +467,6 @@
}
@Override
- protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
- final int value = getShortcutTypeCheckBoxValue();
-
- saveNonEmptyUserShortcutType(value);
- optInAllMagnificationValuesToSettings(getPrefContext(), value);
- optOutAllMagnificationValuesFromSettings(getPrefContext(), ~value);
- mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
- mShortcutPreference.setSummary(
- getShortcutTypeSummary(getPrefContext()));
-
- if (mHardwareTypeCheckBox.isChecked()) {
- AccessibilityUtil.skipVolumeShortcutDialogTimeoutRestriction(getPrefContext());
- }
- }
-
- @Override
public int getHelpResource() {
return R.string.help_url_magnification;
}
@@ -577,8 +491,6 @@
return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_GESTURE_NAVIGATION;
case DialogEnums.ACCESSIBILITY_BUTTON_TUTORIAL:
return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_ACCESSIBILITY_BUTTON;
- case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:
- return SettingsEnums.DIALOG_MAGNIFICATION_EDIT_SHORTCUT;
default:
return super.getDialogMetricsCategory(dialogId);
}
@@ -628,22 +540,18 @@
@Override
public void onSettingsClicked(ShortcutPreference preference) {
- if (com.android.settings.accessibility.Flags.editShortcutsInFullScreen()) {
- EditShortcutsPreferenceFragment.showEditShortcutScreen(
- requireContext(),
- getMetricsCategory(),
- getShortcutTitle(),
- MAGNIFICATION_COMPONENT_NAME,
- getIntent());
- } else {
- showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
- }
+ EditShortcutsPreferenceFragment.showEditShortcutScreen(
+ requireContext(),
+ getMetricsCategory(),
+ getShortcutTitle(),
+ MAGNIFICATION_COMPONENT_NAME,
+ getIntent());
}
@Override
protected void updateShortcutPreferenceData() {
final int shortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
- if (shortcutTypes != UserShortcutType.EMPTY) {
+ if (shortcutTypes != DEFAULT) {
final PreferredShortcut shortcut = new PreferredShortcut(
MAGNIFICATION_CONTROLLER_NAME, shortcutTypes);
PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
@@ -677,37 +585,26 @@
}
@VisibleForTesting
- void saveNonEmptyUserShortcutType(int type) {
- if (type == UserShortcutType.EMPTY) {
- return;
- }
-
- final PreferredShortcut shortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, type);
- PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
- }
-
- @VisibleForTesting
static void optInAllMagnificationValuesToSettings(Context context, int shortcutTypes) {
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- optInMagnificationValueToSettings(context, UserShortcutType.SOFTWARE);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ optInMagnificationValueToSettings(context, SOFTWARE);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- optInMagnificationValueToSettings(context, UserShortcutType.HARDWARE);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ optInMagnificationValueToSettings(context, HARDWARE);
}
- if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
- optInMagnificationValueToSettings(context, UserShortcutType.TRIPLETAP);
+ if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
+ optInMagnificationValueToSettings(context, TRIPLETAP);
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
- == UserShortcutType.TWOFINGER_DOUBLETAP)) {
- optInMagnificationValueToSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP);
+ if (((shortcutTypes & TWOFINGER_DOUBLETAP)
+ == TWOFINGER_DOUBLETAP)) {
+ optInMagnificationValueToSettings(context, TWOFINGER_DOUBLETAP);
}
}
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
- == UserShortcutType.QUICK_SETTINGS)) {
- optInMagnificationValueToSettings(context, UserShortcutType.QUICK_SETTINGS);
+ if (((shortcutTypes & QUICK_SETTINGS)
+ == QUICK_SETTINGS)) {
+ optInMagnificationValueToSettings(context, QUICK_SETTINGS);
}
}
}
@@ -727,14 +624,14 @@
return;
}
- if (shortcutType == UserShortcutType.TRIPLETAP) {
+ if (shortcutType == TRIPLETAP) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
return;
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
+ if (shortcutType == TWOFINGER_DOUBLETAP) {
Settings.Secure.putInt(
context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
@@ -760,7 +657,7 @@
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 == UserShortcutType.SOFTWARE
+ if (shortcutType == SOFTWARE
&& Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
FloatingMenuSizePreferenceController.Size.UNKNOWN)
@@ -774,25 +671,25 @@
@VisibleForTesting
static void optOutAllMagnificationValuesFromSettings(Context context,
int shortcutTypes) {
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- optOutMagnificationValueFromSettings(context, UserShortcutType.SOFTWARE);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ optOutMagnificationValueFromSettings(context, SOFTWARE);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- optOutMagnificationValueFromSettings(context, UserShortcutType.HARDWARE);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ optOutMagnificationValueFromSettings(context, HARDWARE);
}
- if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
- optOutMagnificationValueFromSettings(context, UserShortcutType.TRIPLETAP);
+ if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
+ optOutMagnificationValueFromSettings(context, TRIPLETAP);
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
- == UserShortcutType.TWOFINGER_DOUBLETAP)) {
- optOutMagnificationValueFromSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP);
+ if (((shortcutTypes & TWOFINGER_DOUBLETAP)
+ == TWOFINGER_DOUBLETAP)) {
+ optOutMagnificationValueFromSettings(context, TWOFINGER_DOUBLETAP);
}
}
if (android.view.accessibility.Flags.a11yQsShortcut()) {
- if (((shortcutTypes & UserShortcutType.QUICK_SETTINGS)
- == UserShortcutType.QUICK_SETTINGS)) {
- optOutMagnificationValueFromSettings(context, UserShortcutType.QUICK_SETTINGS);
+ if (((shortcutTypes & QUICK_SETTINGS)
+ == QUICK_SETTINGS)) {
+ optOutMagnificationValueFromSettings(context, QUICK_SETTINGS);
}
}
}
@@ -812,14 +709,14 @@
return;
}
- if (shortcutType == UserShortcutType.TRIPLETAP) {
+ if (shortcutType == TRIPLETAP) {
Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
return;
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
+ if (shortcutType == TWOFINGER_DOUBLETAP) {
Settings.Secure.putInt(
context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
@@ -854,20 +751,20 @@
static boolean hasMagnificationValuesInSettings(Context context, int shortcutTypes) {
boolean exist = false;
- if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
- exist = hasMagnificationValueInSettings(context, UserShortcutType.SOFTWARE);
+ if ((shortcutTypes & SOFTWARE) == SOFTWARE) {
+ exist = hasMagnificationValueInSettings(context, SOFTWARE);
}
- if (((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE)) {
- exist |= hasMagnificationValueInSettings(context, UserShortcutType.HARDWARE);
+ if (((shortcutTypes & HARDWARE) == HARDWARE)) {
+ exist |= hasMagnificationValueInSettings(context, HARDWARE);
}
- if (((shortcutTypes & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP)) {
- exist |= hasMagnificationValueInSettings(context, UserShortcutType.TRIPLETAP);
+ if (((shortcutTypes & TRIPLETAP) == TRIPLETAP)) {
+ exist |= hasMagnificationValueInSettings(context, TRIPLETAP);
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (((shortcutTypes & UserShortcutType.TWOFINGER_DOUBLETAP)
- == UserShortcutType.TWOFINGER_DOUBLETAP)) {
+ if (((shortcutTypes & TWOFINGER_DOUBLETAP)
+ == TWOFINGER_DOUBLETAP)) {
exist |= hasMagnificationValueInSettings(context,
- UserShortcutType.TWOFINGER_DOUBLETAP);
+ TWOFINGER_DOUBLETAP);
}
}
return exist;
@@ -875,13 +772,13 @@
private static boolean hasMagnificationValueInSettings(Context context,
@UserShortcutType int shortcutType) {
- if (shortcutType == UserShortcutType.TRIPLETAP) {
+ if (shortcutType == TRIPLETAP) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (shortcutType == UserShortcutType.TWOFINGER_DOUBLETAP) {
+ if (shortcutType == TWOFINGER_DOUBLETAP) {
return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED,
OFF) == ON;
@@ -907,19 +804,19 @@
}
private static int getUserShortcutTypeFromSettings(Context context) {
- int shortcutTypes = UserShortcutType.EMPTY;
- if (hasMagnificationValuesInSettings(context, UserShortcutType.SOFTWARE)) {
- shortcutTypes |= UserShortcutType.SOFTWARE;
+ int shortcutTypes = DEFAULT;
+ if (hasMagnificationValuesInSettings(context, SOFTWARE)) {
+ shortcutTypes |= SOFTWARE;
}
- if (hasMagnificationValuesInSettings(context, UserShortcutType.HARDWARE)) {
- shortcutTypes |= UserShortcutType.HARDWARE;
+ if (hasMagnificationValuesInSettings(context, HARDWARE)) {
+ shortcutTypes |= HARDWARE;
}
- if (hasMagnificationValuesInSettings(context, UserShortcutType.TRIPLETAP)) {
- shortcutTypes |= UserShortcutType.TRIPLETAP;
+ if (hasMagnificationValuesInSettings(context, TRIPLETAP)) {
+ shortcutTypes |= TRIPLETAP;
}
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
- if (hasMagnificationValuesInSettings(context, UserShortcutType.TWOFINGER_DOUBLETAP)) {
- shortcutTypes |= UserShortcutType.TWOFINGER_DOUBLETAP;
+ if (hasMagnificationValuesInSettings(context, TWOFINGER_DOUBLETAP)) {
+ shortcutTypes |= TWOFINGER_DOUBLETAP;
}
}
return shortcutTypes;
@@ -934,11 +831,12 @@
// Get the user shortcut type from settings provider.
final int userShortcutType = getUserShortcutTypeFromSettings(context);
final CharSequence featureState =
- (userShortcutType != AccessibilityUtil.UserShortcutType.EMPTY)
+ (userShortcutType != DEFAULT)
? 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(R.string.preference_summary_default_combination,
+ return context.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
featureState, featureSummary);
}
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index eccfbce..11aa565 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -16,12 +16,14 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.HARDWARE;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.os.Bundle;
import android.view.View;
+import com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType;
import com.android.settings.R;
/**
@@ -44,7 +46,7 @@
mShortcutPreference.setSummary(hardwareTitle);
mShortcutPreference.setSettingsEditable(false);
- setAllowedPreferredShortcutType(UserShortcutType.HARDWARE);
+ setAllowedPreferredShortcutType(HARDWARE);
}
@Override
@@ -56,9 +58,9 @@
final boolean hasRequestAccessibilityButtonFlag =
(info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0;
if (hasRequestAccessibilityButtonFlag && isServiceOn) {
- shortcutTypes |= UserShortcutType.SOFTWARE;
+ shortcutTypes |= SOFTWARE;
} else {
- shortcutTypes &= (~UserShortcutType.SOFTWARE);
+ shortcutTypes &= (~SOFTWARE);
}
return shortcutTypes;
diff --git a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
index 9e1290e..bdf7857 100644
--- a/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
@@ -60,7 +60,6 @@
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;
@@ -199,8 +198,7 @@
Activity activity = getActivity();
if (!activity.getIntent().getAction().equals(
- Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS)
- || !Flags.editShortcutsInFullScreen()) {
+ Settings.ACTION_ACCESSIBILITY_SHORTCUT_SETTINGS)) {
return;
}
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index f4c928c..72a0f08 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -43,7 +43,6 @@
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroductionInternal;
-import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.core.FeatureFlags;
import com.android.settings.homepage.DeepLinkHomepageActivity;
import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
@@ -51,6 +50,7 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockPattern;
import com.android.settings.privatespace.PrivateSpaceSetupActivity;
+import com.android.settings.privatespace.delete.PrivateSpaceDeleteActivity;
import com.android.settings.remoteauth.RemoteAuthActivity;
import com.android.settings.remoteauth.RemoteAuthActivityInternal;
@@ -255,8 +255,6 @@
.buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);
addActivityFilter(activityFilters, searchIntent);
}
- addActivityFilter(activityFilters, FingerprintEnrollmentActivity.class);
- addActivityFilter(activityFilters, FingerprintEnrollmentActivity.InternalActivity.class);
addActivityFilter(activityFilters, FingerprintEnrollIntroduction.class);
addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);
addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);
@@ -266,6 +264,9 @@
addActivityFilter(activityFilters, RemoteAuthActivityInternal.class);
addActivityFilter(activityFilters, ChooseLockPattern.class);
addActivityFilter(activityFilters, PrivateSpaceSetupActivity.class);
+ if (android.multiuser.Flags.fixLargeDisplayPrivateSpaceSettings()) {
+ addActivityFilter(activityFilters, PrivateSpaceDeleteActivity.class);
+ }
String action = mContext.getString(R.string.config_avatar_picker_action);
addActivityFilter(activityFilters, new Intent(action));
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index e45657f..0f52053 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -324,9 +324,11 @@
private void initMoveDialog() {
final Context context = getActivity();
final StorageManager storage = context.getSystemService(StorageManager.class);
-
- final List<VolumeInfo> candidates = context.getPackageManager()
- .getPackageCandidateVolumes(mAppEntry.info);
+ final PackageManager pm = context.getPackageManager();
+ final List<VolumeInfo> candidates =
+ mAppEntry != null && pm != null
+ ? pm.getPackageCandidateVolumes(mAppEntry.info)
+ : Collections.emptyList();
if (candidates.size() > 1) {
Collections.sort(candidates, VolumeInfo.getDescriptionComparator());
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 556ab72..73760a4 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -28,19 +28,30 @@
/** Backup agent for Settings APK */
public class SettingsBackupHelper extends BackupAgentHelper {
public static final String SOUND_BACKUP_HELPER = "SoundSettingsBackup";
+ public static final String ACCESSIBILITY_APPEARANCE_BACKUP_HELPER =
+ "AccessibilityAppearanceSettingsBackup";
@Override
public void onCreate() {
super.onCreate();
BackupRestoreStorageManager.getInstance(this).addBackupAgentHelpers(this);
+ OnboardingFeatureProvider onboardingFeatureProvider =
+ FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider();
+
if (Flags.enableSoundBackup()) {
- OnboardingFeatureProvider onboardingFeatureProvider =
- FeatureFactory.getFeatureFactory().getOnboardingFeatureProvider();
if (onboardingFeatureProvider != null) {
addHelper(SOUND_BACKUP_HELPER, onboardingFeatureProvider.
getSoundBackupHelper(this, this.getBackupRestoreEventLogger()));
}
}
+
+ if (Flags.accessibilityAppearanceSettingsBackupEnabled()) {
+ if (onboardingFeatureProvider != null) {
+ addHelper(ACCESSIBILITY_APPEARANCE_BACKUP_HELPER,
+ onboardingFeatureProvider.getAccessibilityAppearanceBackupHelper(
+ this, this.getBackupRestoreEventLogger()));
+ }
+ }
}
@Override
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 335d0b9..37ada23 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -68,6 +68,8 @@
public static final String EXTRA_FINISHED_ENROLL_FACE = "finished_enrolling_face";
public static final String EXTRA_FINISHED_ENROLL_FINGERPRINT = "finished_enrolling_fingerprint";
public static final String EXTRA_LAUNCHED_POSTURE_GUIDANCE = "launched_posture_guidance";
+ public static final String EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY =
+ "biometrics_authenticated_successfully";
/**
* Used by the choose fingerprint wizard to indicate the wizard is
@@ -115,6 +117,7 @@
public static final int LEARN_MORE_REQUEST = 3;
public static final int CONFIRM_REQUEST = 4;
public static final int ENROLL_REQUEST = 5;
+ public static final int BIOMETRIC_AUTH_REQUEST = 6;
/**
* Request code when starting another biometric enrollment from within a biometric flow. For
diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
index 3376d86..09b2dba 100644
--- a/src/com/android/settings/biometrics/BiometricUtils.java
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -16,7 +16,6 @@
package com.android.settings.biometrics;
-import static android.util.FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT;
import android.annotation.IntDef;
import android.app.Activity;
@@ -33,7 +32,6 @@
import android.os.storage.StorageManager;
import android.text.BidiFormatter;
import android.text.SpannableStringBuilder;
-import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Surface;
@@ -50,7 +48,6 @@
import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
-import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -254,17 +251,8 @@
public static Intent getFingerprintFindSensorIntent(@NonNull Context context,
@NonNull Intent activityIntent) {
final boolean isSuw = WizardManagerHelper.isAnySetupWizard(activityIntent);
- final Intent intent;
- if (FeatureFlagUtils.isEnabled(context, SETTINGS_BIOMETRICS2_ENROLLMENT)) {
- intent = new Intent(context, isSuw
- ? FingerprintEnrollmentActivity.SetupActivity.class
- : FingerprintEnrollmentActivity.class);
- intent.putExtra(BiometricEnrollActivity.EXTRA_SKIP_INTRO, true);
- } else {
- intent = new Intent(context, isSuw
- ? SetupFingerprintEnrollFindSensor.class
- : FingerprintEnrollFindSensor.class);
- }
+ final Intent intent = new Intent(context, isSuw
+ ? SetupFingerprintEnrollFindSensor.class : FingerprintEnrollFindSensor.class);
if (isSuw) {
SetupWizardUtils.copySetupExtras(activityIntent, intent);
}
@@ -279,16 +267,8 @@
public static Intent getFingerprintIntroIntent(@NonNull Context context,
@NonNull Intent activityIntent) {
final boolean isSuw = WizardManagerHelper.isAnySetupWizard(activityIntent);
- final Intent intent;
- if (FeatureFlagUtils.isEnabled(context, SETTINGS_BIOMETRICS2_ENROLLMENT)) {
- intent = new Intent(context, isSuw
- ? FingerprintEnrollmentActivity.SetupActivity.class
- : FingerprintEnrollmentActivity.class);
- } else {
- intent = new Intent(context, isSuw
- ? SetupFingerprintEnrollIntroduction.class
- : FingerprintEnrollIntroduction.class);
- }
+ final Intent intent = new Intent(context, isSuw
+ ? SetupFingerprintEnrollIntroduction.class : FingerprintEnrollIntroduction.class);
if (isSuw) {
WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
}
diff --git a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
index b174788..835f3a8 100644
--- a/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
+++ b/src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java
@@ -65,6 +65,8 @@
static final int CONFIRM_REQUEST = 2001;
private static final int CHOOSE_LOCK_REQUEST = 2002;
protected static final int ACTIVE_UNLOCK_REQUEST = 2003;
+ @VisibleForTesting
+ static final int BIOMETRIC_AUTH_REQUEST = 2004;
private static final String SAVE_STATE_CONFIRM_CREDETIAL = "confirm_credential";
private static final String DO_NOT_FINISH_ACTIVITY = "do_not_finish_activity";
@@ -72,10 +74,15 @@
static final String RETRY_PREFERENCE_KEY = "retry_preference_key";
@VisibleForTesting
static final String RETRY_PREFERENCE_BUNDLE = "retry_preference_bundle";
+ private static final String BIOMETRICS_AUTH_REQUESTED = "biometrics_auth_requested";
+ private static final String BIOMETRICS_AUTHENTICATED_SUCCESSFULLY =
+ "biometrics_authenticated_successfully";
protected int mUserId;
protected long mGkPwHandle;
private boolean mConfirmCredential;
+ private boolean mBiometricsAuthenticationRequested;
+ private boolean mBiometricsSuccessfullyAuthenticated;
@Nullable private FaceManager mFaceManager;
@Nullable private FingerprintManager mFingerprintManager;
// Do not finish() if choosing/confirming credential, showing fp/face settings, or launching
@@ -113,6 +120,9 @@
mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
}
+ mBiometricsSuccessfullyAuthenticated = getIntent().getBooleanExtra(
+ BIOMETRICS_AUTHENTICATED_SUCCESSFULLY, false);
+
if (savedInstanceState != null) {
mConfirmCredential = savedInstanceState.getBoolean(SAVE_STATE_CONFIRM_CREDETIAL);
mDoNotFinishActivity = savedInstanceState.getBoolean(DO_NOT_FINISH_ACTIVITY);
@@ -123,11 +133,21 @@
mGkPwHandle = savedInstanceState.getLong(
ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE);
}
+ mBiometricsAuthenticationRequested = savedInstanceState.getBoolean(
+ BIOMETRICS_AUTH_REQUESTED);
+ mBiometricsSuccessfullyAuthenticated = savedInstanceState.getBoolean(
+ BIOMETRICS_AUTHENTICATED_SUCCESSFULLY);
}
if (mGkPwHandle == 0L && !mConfirmCredential) {
mConfirmCredential = true;
launchChooseOrConfirmLock();
+ } else if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(
+ getActivity(), mBiometricsSuccessfullyAuthenticated,
+ mBiometricsAuthenticationRequested, mUserId)) {
+ mBiometricsAuthenticationRequested = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
+ mUserId);
}
updateUnlockPhonePreferenceSummary();
@@ -141,6 +161,13 @@
@Override
public void onResume() {
super.onResume();
+ if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
+ mBiometricsSuccessfullyAuthenticated, mBiometricsAuthenticationRequested, mUserId)
+ && mGkPwHandle != 0L) {
+ mBiometricsAuthenticationRequested = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
+ mUserId);
+ }
if (!mConfirmCredential) {
mDoNotFinishActivity = false;
}
@@ -177,6 +204,9 @@
extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
extras.putInt(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
extras.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
+ extras.putBoolean(
+ BiometricEnrollBase.EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY,
+ mBiometricsSuccessfullyAuthenticated);
onFaceOrFingerprintPreferenceTreeClick(preference);
} catch (IllegalStateException e) {
if (retry) {
@@ -206,6 +236,9 @@
final Bundle extras = preference.getExtras();
extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
extras.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
+ extras.putBoolean(
+ BiometricEnrollBase.EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY,
+ mBiometricsSuccessfullyAuthenticated);
onFaceOrFingerprintPreferenceTreeClick(preference);
} catch (IllegalStateException e) {
if (retry) {
@@ -288,6 +321,10 @@
outState.putString(RETRY_PREFERENCE_KEY, mRetryPreferenceKey);
outState.putBundle(RETRY_PREFERENCE_BUNDLE, mRetryPreferenceExtra);
}
+ outState.putBoolean(BIOMETRICS_AUTH_REQUESTED,
+ mBiometricsAuthenticationRequested);
+ outState.putBoolean(BIOMETRICS_AUTHENTICATED_SUCCESSFULLY,
+ mBiometricsSuccessfullyAuthenticated);
}
@Override
@@ -315,6 +352,13 @@
}
mRetryPreferenceKey = null;
mRetryPreferenceExtra = null;
+ } else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
+ mBiometricsAuthenticationRequested = false;
+ if (resultCode == RESULT_OK) {
+ mBiometricsSuccessfullyAuthenticated = true;
+ } else {
+ finish();
+ }
}
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 8884ce3..305d670 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -20,8 +20,10 @@
import static android.app.admin.DevicePolicyResources.Strings.Settings.FACE_SETTINGS_FOR_WORK_TITLE;
import static com.android.settings.Utils.isPrivateProfile;
+import static com.android.settings.biometrics.BiometricEnrollBase.BIOMETRIC_AUTH_REQUEST;
import static com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST;
import static com.android.settings.biometrics.BiometricEnrollBase.ENROLL_REQUEST;
+import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY;
import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED;
import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_TIMEOUT;
@@ -66,6 +68,8 @@
private static final String TAG = "FaceSettings";
private static final String KEY_TOKEN = "hw_auth_token";
private static final String KEY_RE_ENROLL_FACE = "re_enroll_face_unlock";
+ private static final String KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED =
+ "biometrics_successfully_authenticated";
private static final String PREF_KEY_DELETE_FACE_DATA =
"security_settings_face_delete_faces_container";
@@ -93,6 +97,8 @@
private FaceFeatureProvider mFaceFeatureProvider;
private boolean mConfirmingPassword;
+ private boolean mBiometricsAuthenticationRequested;
+ private boolean mBiometricsSuccessfullyAuthenticated;
private final FaceSettingsRemoveButtonPreferenceController.Listener mRemovalListener = () -> {
@@ -144,6 +150,8 @@
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putByteArray(KEY_TOKEN, mToken);
+ outState.putBoolean(KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED,
+ mBiometricsSuccessfullyAuthenticated);
}
@Override
@@ -163,6 +171,8 @@
mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
mSensorId = getIntent().getIntExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, -1);
mChallenge = getIntent().getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, 0L);
+ mBiometricsSuccessfullyAuthenticated = getIntent().getBooleanExtra(
+ EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY, false);
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
@@ -231,6 +241,8 @@
if (savedInstanceState != null) {
mToken = savedInstanceState.getByteArray(KEY_TOKEN);
+ mBiometricsSuccessfullyAuthenticated = savedInstanceState.getBoolean(
+ KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED);
}
}
@@ -276,6 +288,12 @@
Log.e(TAG, "Password not set");
finish();
}
+ } else if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
+ mBiometricsSuccessfullyAuthenticated, mBiometricsAuthenticationRequested,
+ mUserId)) {
+ mBiometricsAuthenticationRequested = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
+ mUserId);
} else {
mAttentionController.setToken(mToken);
mEnrollController.setToken(mToken);
@@ -318,6 +336,13 @@
setResult(resultCode, data);
finish();
}
+ } else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
+ mBiometricsAuthenticationRequested = false;
+ if (resultCode == RESULT_OK) {
+ mBiometricsSuccessfullyAuthenticated = true;
+ } else {
+ finish();
+ }
}
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 795f999..b32ab4f 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -74,6 +74,7 @@
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.display.DisplayDensityUtils;
+import com.android.systemui.unfold.compat.ScreenSizeFoldProvider;
import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieComposition;
@@ -89,7 +90,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
-import java.util.function.Function;
/**
* Activity which handles the actual enrolling for fingerprint.
@@ -197,8 +197,10 @@
private OrientationEventListener mOrientationEventListener;
private int mPreviousRotation = 0;
- @NonNull
- private SfpsEnrollmentFeature mSfpsEnrollmentFeature = new EmptySfpsEnrollmentFeature();
+ private boolean mIsFolded = false;
+
+ private SfpsEnrollmentFeature mSfpsEnrollmentFeature;
+
@Nullable
private UdfpsEnrollCalibrator mCalibrator;
@@ -386,6 +388,7 @@
@Override
protected void onStart() {
super.onStart();
+ setupScreenFoldCallbackWhenNecessary();
updateProgress(false /* animate */);
updateTitleAndDescription(true);
if (mRestoring) {
@@ -393,6 +396,19 @@
}
}
+ private void setupScreenFoldCallbackWhenNecessary() {
+ if (mCanAssumeSfps) {
+ // These two fields will be cleaned up in BiometricEnrollBase#onStop.
+ mScreenSizeFoldProvider = new ScreenSizeFoldProvider(getApplicationContext());
+ mFoldCallback = isFolded -> {
+ mIsFolded = isFolded;
+ maybeHideSfpsText(getResources().getConfiguration());
+ };
+ // The callback will be unregistered in BiometricEnrollBase#onStop.
+ mScreenSizeFoldProvider.registerCallback(mFoldCallback, getMainExecutor());
+ }
+ }
+
@Override
public void onEnterAnimationComplete() {
super.onEnterAnimationComplete();
@@ -1156,13 +1172,12 @@
private void maybeHideSfpsText(@NonNull Configuration newConfig) {
final HeaderMixin headerMixin = getLayout().getMixin(HeaderMixin.class);
final DescriptionMixin descriptionMixin = getLayout().getMixin(DescriptionMixin.class);
- final boolean isLandscape = newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE;
if (mCanAssumeSfps) {
// hide the description
descriptionMixin.getTextView().setVisibility(View.GONE);
headerMixin.getTextView().setHyphenationFrequency(HYPHENATION_FREQUENCY_NONE);
- if (isLandscape) {
+ if (mSfpsEnrollmentFeature.shouldAdjustHeaderText(newConfig, mIsFolded)) {
headerMixin.setAutoTextSizeEnabled(true);
headerMixin.getTextView().setMinLines(0);
headerMixin.getTextView().setMaxLines(10);
@@ -1209,32 +1224,4 @@
}
}
- private static class EmptySfpsEnrollmentFeature implements SfpsEnrollmentFeature {
- private final String exceptionStr = "Assume sfps but no SfpsEnrollmentFeature impl.";
-
- @Override
- public int getCurrentSfpsEnrollStage(int progressSteps, Function<Integer, Integer> mapper) {
- throw new IllegalStateException(exceptionStr);
- }
-
- @Override
- public int getFeaturedStageHeaderResource(int stage) {
- throw new IllegalStateException(exceptionStr);
- }
-
- @Override
- public int getSfpsEnrollLottiePerStage(int stage) {
- throw new IllegalStateException(exceptionStr);
- }
-
- @Override
- public float getEnrollStageThreshold(@NonNull Context context, int index) {
- throw new IllegalStateException(exceptionStr);
- }
-
- @Override
- public Animator getHelpAnimator(@NonNull View target) {
- throw new IllegalStateException(exceptionStr);
- }
- }
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index 73eccdc..2737d38 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -23,6 +23,7 @@
import android.util.Log;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.android.settings.core.InstrumentedFragment;
@@ -51,7 +52,8 @@
}
}
- private FingerprintManager.RemovalCallback
+ @VisibleForTesting
+ FingerprintManager.RemovalCallback
mRemoveCallback = new FingerprintManager.RemovalCallback() {
@Override
public void onRemovalSucceeded(Fingerprint fingerprint, int remaining) {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index db87c0f..83bc0e6 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -23,6 +23,7 @@
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;
@@ -44,7 +45,6 @@
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImeAwareEditText;
@@ -69,8 +69,6 @@
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.biometrics.GatekeeperPasswordProvider;
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest;
-import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.dashboard.DashboardFragment;
@@ -218,12 +216,17 @@
"security_settings_fingerprint_unlock_category";
private static final String KEY_FINGERPRINT_UNLOCK_FOOTER =
"security_settings_fingerprint_footer";
+ private static final String KEY_BIOMETRICS_AUTHENTICATION_REQUESTED =
+ "biometrics_authentication_requested";
+ private static final String KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED =
+ "biometrics_successfully_authenticated";
private static final int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
private static final int MSG_FINGER_AUTH_SUCCESS = 1001;
private static final int MSG_FINGER_AUTH_FAIL = 1002;
private static final int MSG_FINGER_AUTH_ERROR = 1003;
private static final int MSG_FINGER_AUTH_HELP = 1004;
+ private static final int MSG_RELOAD_FINGERPRINT_TEMPLATES = 1005;
private static final int CONFIRM_REQUEST = 101;
@VisibleForTesting
@@ -251,6 +254,8 @@
private boolean mInFingerprintLockout;
private byte[] mToken;
private boolean mLaunchedConfirm;
+ private boolean mBiometricsAuthenticationRequested;
+ private boolean mBiometricsSuccessfullyAuthenticated;
private boolean mHasFirstEnrolled = true;
private Drawable mHighlightDrawable;
private int mUserId;
@@ -309,6 +314,8 @@
if (activity != null) {
Toast.makeText(activity, errString, Toast.LENGTH_SHORT);
}
+ mHandler.obtainMessage(MSG_RELOAD_FINGERPRINT_TEMPLATES)
+ .sendToTarget();
updateDialog();
}
@@ -327,11 +334,7 @@
switch (msg.what) {
case MSG_REFRESH_FINGERPRINT_TEMPLATES:
removeFingerprintPreference(msg.arg1);
- updateAddPreference();
- if (isSfps()) {
- updateFingerprintUnlockCategoryVisibility();
- }
- updatePreferences();
+ updatePreferencesAfterFingerprintRemoved();
break;
case MSG_FINGER_AUTH_SUCCESS:
highlightFingerprintItem(msg.arg1);
@@ -343,6 +346,9 @@
case MSG_FINGER_AUTH_ERROR:
handleError(msg.arg1 /* errMsgId */, (CharSequence) msg.obj /* errStr */);
break;
+ case MSG_RELOAD_FINGERPRINT_TEMPLATES:
+ updatePreferencesAfterFingerprintRemoved();
+ break;
case MSG_FINGER_AUTH_HELP: {
// Not used
}
@@ -356,6 +362,11 @@
*/
protected void handleError(int errMsgId, CharSequence msg) {
switch (errMsgId) {
+ case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
+ case FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED:
+ // Only happens if we get preempted by another activity, or canceled by the
+ // user (e.g. swipe up to home). Ignored.
+ return;
case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT:
mInFingerprintLockout = true;
// We've been locked out. Reset after 30s.
@@ -418,6 +429,8 @@
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
mChallenge = activity.getIntent()
.getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, -1L);
+ mBiometricsSuccessfullyAuthenticated = getIntent().getBooleanExtra(
+ BiometricEnrollBase.EXTRA_BIOMETRICS_AUTHENTICATED_SUCCESSFULLY, false);
mAuthenticateSidecar = (FingerprintAuthenticateSidecar)
getFragmentManager().findFragmentByTag(TAG_AUTHENTICATE_SIDECAR);
@@ -459,6 +472,10 @@
mIsEnrolling = savedInstanceState.getBoolean(KEY_IS_ENROLLING, mIsEnrolling);
mHasFirstEnrolled = savedInstanceState.getBoolean(KEY_HAS_FIRST_ENROLLED,
mHasFirstEnrolled);
+ mBiometricsSuccessfullyAuthenticated = savedInstanceState.getBoolean(
+ KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED);
+ mBiometricsAuthenticationRequested = savedInstanceState.getBoolean(
+ KEY_BIOMETRICS_AUTHENTICATION_REQUESTED);
}
// (mLaunchedConfirm or mIsEnrolling) means that we are waiting an activity result.
@@ -467,6 +484,12 @@
if (mToken == null) {
mLaunchedConfirm = true;
launchChooseOrConfirmLock();
+ } else if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
+ mBiometricsSuccessfullyAuthenticated, mBiometricsAuthenticationRequested,
+ mUserId)) {
+ mBiometricsAuthenticationRequested = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
+ mUserId);
} else if (!mHasFirstEnrolled) {
mIsEnrolling = true;
addFirstFingerprint(null);
@@ -549,6 +572,7 @@
protected void removeFingerprintPreference(int fingerprintId) {
String name = genKey(fingerprintId);
+ Log.e(TAG, "removeFingerprintPreference : " + fingerprintId);
Preference prefToRemove = findPreference(name);
if (prefToRemove != null) {
if (!getPreferenceScreen().removePreference(prefToRemove)) {
@@ -673,6 +697,14 @@
});
}
+ private void updatePreferencesAfterFingerprintRemoved() {
+ updateAddPreference();
+ if (isSfps()) {
+ updateFingerprintUnlockCategoryVisibility();
+ }
+ updatePreferences();
+ }
+
private void updateAddPreference() {
if (getActivity() == null) {
return; // Activity went away
@@ -746,6 +778,14 @@
mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider()
.getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null, null);
+
+ if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
+ mBiometricsSuccessfullyAuthenticated, mBiometricsAuthenticationRequested,
+ mUserId)) {
+ mBiometricsAuthenticationRequested = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this,
+ BIOMETRIC_AUTH_REQUEST, mUserId);
+ }
}
private void updatePreferences() {
@@ -793,6 +833,10 @@
outState.putSerializable("mFingerprintsRenaming", mFingerprintsRenaming);
outState.putBoolean(KEY_IS_ENROLLING, mIsEnrolling);
outState.putBoolean(KEY_HAS_FIRST_ENROLLED, mHasFirstEnrolled);
+ outState.putBoolean(KEY_BIOMETRICS_AUTHENTICATION_REQUESTED,
+ mBiometricsAuthenticationRequested);
+ outState.putBoolean(KEY_BIOMETRICS_SUCCESSFULLY_AUTHENTICATED,
+ mBiometricsSuccessfullyAuthenticated);
}
@Override
@@ -801,15 +845,8 @@
if (KEY_FINGERPRINT_ADD.equals(key)) {
mIsEnrolling = true;
Intent intent = new Intent();
- if (FeatureFlagUtils.isEnabled(getContext(),
- FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)) {
- intent.setClassName(SETTINGS_PACKAGE_NAME,
- FingerprintEnrollmentActivity.InternalActivity.class.getName());
- intent.putExtra(EnrollmentRequest.EXTRA_SKIP_FIND_SENSOR, true);
- } else {
- intent.setClassName(SETTINGS_PACKAGE_NAME,
- FingerprintEnrollEnrolling.class.getName());
- }
+ intent.setClassName(SETTINGS_PACKAGE_NAME,
+ FingerprintEnrollEnrolling.class.getName());
intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
if (mCalibrator != null) {
@@ -1013,6 +1050,13 @@
mIsEnrolling = false;
mHasFirstEnrolled = true;
updateAddPreference();
+ } else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
+ mBiometricsAuthenticationRequested = false;
+ if (resultCode == RESULT_OK) {
+ mBiometricsSuccessfullyAuthenticated = true;
+ } else {
+ finish();
+ }
}
}
@@ -1087,12 +1131,7 @@
private void addFirstFingerprint(@Nullable Long gkPwHandle) {
Intent intent = new Intent();
intent.setClassName(SETTINGS_PACKAGE_NAME,
- FeatureFlagUtils.isEnabled(getActivity(),
- FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)
- ? FingerprintEnrollmentActivity.InternalActivity.class.getName()
- : FingerprintEnrollIntroductionInternal.class.getName()
- );
-
+ FingerprintEnrollIntroductionInternal.class.getName());
intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true);
intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,
SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE);
@@ -1158,7 +1197,7 @@
@Override
public int getMetricsCategory() {
- return SettingsEnums.DIALOG_FINGERPINT_EDIT;
+ return SettingsEnums.DIALOG_FINGERPRINT_DELETE;
}
@Override
@@ -1320,7 +1359,7 @@
@Override
public int getMetricsCategory() {
- return SettingsEnums.DIALOG_FINGERPINT_EDIT;
+ return SettingsEnums.DIALOG_FINGERPRINT_RENAME;
}
}
diff --git a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeature.java b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeature.java
index bdf9530..2d31b0c 100644
--- a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeature.java
+++ b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeature.java
@@ -18,6 +18,7 @@
import android.animation.Animator;
import android.content.Context;
+import android.content.res.Configuration;
import android.view.View;
import androidx.annotation.NonNull;
@@ -114,4 +115,13 @@
* @param remaining remaining
*/
default void handleOnEnrollmentProgressChange(int steps, int remaining) {}
+
+ /**
+ * Indicates if the properties of header text view like auto text size or min / max lines
+ * should be adjusted.
+ * @param conf the current configuration
+ * @param isFolded is the device folded
+ * @return true if should adjust auto size and max lines of header; otherwise false
+ */
+ boolean shouldAdjustHeaderText(@NonNull Configuration conf, boolean isFolded);
}
diff --git a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
index 60ced6e..bf97478 100644
--- a/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
+++ b/src/com/android/settings/biometrics/fingerprint/feature/SfpsEnrollmentFeatureImpl.java
@@ -26,6 +26,7 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.content.Context;
+import android.content.res.Configuration;
import android.hardware.fingerprint.FingerprintManager;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
@@ -107,4 +108,9 @@
help.setAutoCancel(false);
return help;
}
+
+ @Override
+ public boolean shouldAdjustHeaderText(@NonNull Configuration conf, boolean isFolded) {
+ return conf.orientation == Configuration.ORIENTATION_LANDSCAPE;
+ }
}
diff --git a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
index 215692a..9bc920a 100644
--- a/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/BiometricsEnvironment.kt
@@ -16,7 +16,9 @@
package com.android.settings.biometrics.fingerprint2
+import android.content.pm.PackageManager
import android.hardware.fingerprint.FingerprintManager
+import android.os.ServiceManager.ServiceNotFoundException
import android.view.MotionEvent
import android.view.accessibility.AccessibilityManager
import androidx.fragment.app.FragmentActivity
@@ -74,8 +76,15 @@
private val backgroundDispatcher = executorService.asCoroutineDispatcher()
private val applicationScope = MainScope()
private val gateKeeperPasswordProvider = GatekeeperPasswordProvider(LockPatternUtils(context))
- private val fingerprintManager =
- context.getSystemService(FragmentActivity.FINGERPRINT_SERVICE) as FingerprintManager?
+ private val fingerprintManager = try {
+ if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+ context.getSystemService(FragmentActivity.FINGERPRINT_SERVICE) as FingerprintManager?
+ } else {
+ null
+ }
+ } catch (exception: ServiceNotFoundException){
+ null
+ }
private val fingerprintSensorRepository: FingerprintSensorRepository =
FingerprintSensorRepositoryImpl(fingerprintManager, backgroundDispatcher, applicationScope)
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
index 46f64de..cb36721 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintDeletionDialog.kt
@@ -42,7 +42,7 @@
lateinit var onCancelListener: DialogInterface.OnCancelListener
override fun getMetricsCategory(): Int {
- return SettingsEnums.DIALOG_FINGERPINT_EDIT
+ return SettingsEnums.DIALOG_FINGERPRINT_DELETE
}
override fun onCancel(dialog: DialogInterface) {
diff --git a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
index 9fef0c5..2f251de 100644
--- a/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
+++ b/src/com/android/settings/biometrics/fingerprint2/ui/settings/fragment/FingerprintSettingsRenameDialog.kt
@@ -95,7 +95,7 @@
}
override fun getMetricsCategory(): Int {
- return SettingsEnums.DIALOG_FINGERPINT_EDIT
+ return SettingsEnums.DIALOG_FINGERPRINT_RENAME
}
companion object {
diff --git a/src/com/android/settings/biometrics2/OWNERS b/src/com/android/settings/biometrics2/OWNERS
deleted file mode 100644
index ac806eb..0000000
--- a/src/com/android/settings/biometrics2/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-# The Android Biometric team should approve all changes to biometrics2 subdirectories.
-set noparent
-
-include /src/com/android/settings/biometrics/OWNERS
diff --git a/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java b/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java
deleted file mode 100644
index 6a9892a..0000000
--- a/src/com/android/settings/biometrics2/data/repository/FingerprintRepository.java
+++ /dev/null
@@ -1,151 +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.biometrics2.data.repository;
-
-import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.res.Resources;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.R;
-import com.android.settings.biometrics.ParentalControlsUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-
-import java.util.List;
-
-/**
- * This repository is used to call all APIs in {@link FingerprintManager}
- */
-public class FingerprintRepository {
-
- private static final String TAG = "FingerprintRepository";
- @NonNull
- private final FingerprintManager mFingerprintManager;
-
- private List<FingerprintSensorPropertiesInternal> mSensorPropertiesCache;
-
- public FingerprintRepository(@NonNull FingerprintManager fingerprintManager) {
- mFingerprintManager = fingerprintManager;
- mFingerprintManager.addAuthenticatorsRegisteredCallback(
- new IFingerprintAuthenticatorsRegisteredCallback.Stub() {
- @Override
- public void onAllAuthenticatorsRegistered(
- List<FingerprintSensorPropertiesInternal> sensors) {
- mSensorPropertiesCache = sensors;
- }
- });
- }
-
- /**
- * The first sensor type is UDFPS sensor or not
- */
- public boolean canAssumeUdfps() {
- FingerprintSensorPropertiesInternal prop = getFirstFingerprintSensorPropertiesInternal();
- return prop != null && prop.isAnyUdfpsType();
- }
-
- /**
- * The first sensor type is Side fps sensor or not
- */
- public boolean canAssumeSfps() {
- FingerprintSensorPropertiesInternal prop = getFirstFingerprintSensorPropertiesInternal();
- return prop != null && prop.isAnySidefpsType();
- }
-
- /**
- * Get max possible number of fingerprints for a user
- */
- public int getMaxFingerprints() {
- FingerprintSensorPropertiesInternal prop = getFirstFingerprintSensorPropertiesInternal();
- return prop != null ? prop.maxEnrollmentsPerUser : 0;
- }
-
- /**
- * Get number of fingerprints that this user enrolled.
- */
- public int getNumOfEnrolledFingerprintsSize(int userId) {
- final List<Fingerprint> list = mFingerprintManager.getEnrolledFingerprints(userId);
- return list != null ? list.size() : 0;
- }
-
- /**
- * Get maximum possible fingerprints in setup wizard flow
- */
- public int getMaxFingerprintsInSuw(@NonNull Resources resources) {
- return resources.getInteger(R.integer.suw_max_fingerprints_enrollable);
- }
-
- /**
- * Gets the first FingerprintSensorPropertiesInternal from FingerprintManager
- */
- @Nullable
- public FingerprintSensorPropertiesInternal getFirstFingerprintSensorPropertiesInternal() {
- final List<FingerprintSensorPropertiesInternal> props = mSensorPropertiesCache;
- if (props == null) {
- // Handle this case if it really happens
- Log.e(TAG, "Sensor properties cache is null");
- return null;
- }
- return props.size() > 0 ? props.get(0) : null;
- }
-
- /**
- * Call FingerprintManager to generate challenge for first sensor
- */
- public void generateChallenge(int userId,
- @NonNull FingerprintManager.GenerateChallengeCallback callback) {
- mFingerprintManager.generateChallenge(userId, callback);
- }
-
- /**
- * Get parental consent required or not during enrollment process
- */
- public boolean isParentalConsentRequired(@NonNull Context context) {
- return ParentalControlsUtils.parentConsentRequired(context, TYPE_FINGERPRINT) != null;
- }
-
- /**
- * Get fingerprint is disable by admin or not
- */
- public boolean isDisabledByAdmin(@NonNull Context context, int userId) {
- return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
- context, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, userId) != null;
- }
-
- /**
- * Get fingerprint enroll stage threshold
- */
- public float getEnrollStageThreshold(int index) {
- return mFingerprintManager.getEnrollStageThreshold(index);
- }
-
- /**
- * Get fingerprint enroll stage count
- */
- public int getEnrollStageCount() {
- return mFingerprintManager.getEnrollStageCount();
- }
-}
diff --git a/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProvider.java b/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProvider.java
deleted file mode 100644
index fdc5745..0000000
--- a/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProvider.java
+++ /dev/null
@@ -1,36 +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.biometrics2.factory;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-
-/**
- * Interface for BiometricsRepositoryProvider
- */
-public interface BiometricsRepositoryProvider {
-
- /**
- * Get FingerprintRepository
- */
- @Nullable
- FingerprintRepository getFingerprintRepository(@NonNull Application application);
-}
diff --git a/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProviderImpl.java b/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProviderImpl.java
deleted file mode 100644
index 22409c8..0000000
--- a/src/com/android/settings/biometrics2/factory/BiometricsRepositoryProviderImpl.java
+++ /dev/null
@@ -1,55 +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.biometrics2.factory;
-
-import android.app.Application;
-import android.hardware.fingerprint.FingerprintManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.Utils;
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-
-/**
- * Implementation for BiometricsRepositoryProvider
- */
-public class BiometricsRepositoryProviderImpl implements BiometricsRepositoryProvider {
-
- private static volatile FingerprintRepository sFingerprintRepository;
-
- /**
- * Get FingerprintRepository
- */
- @Nullable
- @Override
- public FingerprintRepository getFingerprintRepository(@NonNull Application application) {
- final FingerprintManager fingerprintManager =
- Utils.getFingerprintManagerOrNull(application);
- if (fingerprintManager == null) {
- return null;
- }
- if (sFingerprintRepository == null) {
- synchronized (FingerprintRepository.class) {
- if (sFingerprintRepository == null) {
- sFingerprintRepository = new FingerprintRepository(fingerprintManager);
- }
- }
- }
- return sFingerprintRepository;
- }
-}
diff --git a/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java b/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java
deleted file mode 100644
index 516f471..0000000
--- a/src/com/android/settings/biometrics2/factory/BiometricsViewModelFactory.java
+++ /dev/null
@@ -1,140 +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.biometrics2.factory;
-
-import android.app.Application;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModel;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory;
-import androidx.lifecycle.viewmodel.CreationExtras;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.biometrics.fingerprint.FingerprintUpdater;
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-import com.android.settings.biometrics2.ui.model.CredentialModel;
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest;
-import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel.ChallengeGenerator;
-import com.android.settings.biometrics2.ui.viewmodel.DeviceFoldedViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.DeviceRotationViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel;
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollmentViewModel;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.systemui.unfold.compat.ScreenSizeFoldProvider;
-
-/**
- * View model factory for biometric enrollment fragment
- */
-public class BiometricsViewModelFactory implements ViewModelProvider.Factory {
-
- private static final String TAG = "BiometricsViewModelFactory";
-
- public static final CreationExtras.Key<ChallengeGenerator> CHALLENGE_GENERATOR_KEY =
- new CreationExtras.Key<ChallengeGenerator>() {};
- public static final CreationExtras.Key<EnrollmentRequest> ENROLLMENT_REQUEST_KEY =
- new CreationExtras.Key<EnrollmentRequest>() {};
- public static final CreationExtras.Key<CredentialModel> CREDENTIAL_MODEL_KEY =
- new CreationExtras.Key<CredentialModel>() {};
-
- @NonNull
- @Override
- @SuppressWarnings("unchecked")
- public <T extends ViewModel> T create(@NonNull Class<T> modelClass,
- @NonNull CreationExtras extras) {
- final Application application = extras.get(AndroidViewModelFactory.APPLICATION_KEY);
-
- if (application == null) {
- Log.w(TAG, "create, null application");
- return create(modelClass);
- }
- final FeatureFactory featureFactory = FeatureFactory.getFeatureFactory();
- final BiometricsRepositoryProvider provider =
- featureFactory.getBiometricsRepositoryProvider();
-
- if (modelClass.isAssignableFrom(AutoCredentialViewModel.class)) {
- final LockPatternUtils lockPatternUtils =
- featureFactory.getSecurityFeatureProvider().getLockPatternUtils(application);
- final ChallengeGenerator challengeGenerator = extras.get(CHALLENGE_GENERATOR_KEY);
- final CredentialModel credentialModel = extras.get(CREDENTIAL_MODEL_KEY);
- if (challengeGenerator != null && credentialModel != null) {
- return (T) new AutoCredentialViewModel(application, lockPatternUtils,
- challengeGenerator, credentialModel);
- }
- } else if (modelClass.isAssignableFrom(DeviceFoldedViewModel.class)) {
- return (T) new DeviceFoldedViewModel(new ScreenSizeFoldProvider(application),
- application.getMainExecutor());
- } else if (modelClass.isAssignableFrom(DeviceRotationViewModel.class)) {
- return (T) new DeviceRotationViewModel(application);
- } else if (modelClass.isAssignableFrom(FingerprintEnrollFindSensorViewModel.class)) {
- final EnrollmentRequest request = extras.get(ENROLLMENT_REQUEST_KEY);
- if (request != null) {
- return (T) new FingerprintEnrollFindSensorViewModel(application, request.isSuw());
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollIntroViewModel.class)) {
- final FingerprintRepository repository = provider.getFingerprintRepository(application);
- final EnrollmentRequest request = extras.get(ENROLLMENT_REQUEST_KEY);
- final CredentialModel credentialModel = extras.get(CREDENTIAL_MODEL_KEY);
- if (repository != null && request != null && credentialModel != null) {
- return (T) new FingerprintEnrollIntroViewModel(application, repository, request,
- credentialModel.getUserId());
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollmentViewModel.class)) {
- final FingerprintRepository repository = provider.getFingerprintRepository(application);
- final EnrollmentRequest request = extras.get(ENROLLMENT_REQUEST_KEY);
- if (repository != null && request != null) {
- return (T) new FingerprintEnrollmentViewModel(application, repository, request);
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollProgressViewModel.class)) {
- final CredentialModel credentialModel = extras.get(CREDENTIAL_MODEL_KEY);
- if (credentialModel != null) {
- return (T) new FingerprintEnrollProgressViewModel(application,
- new FingerprintUpdater(application), credentialModel.getUserId());
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollEnrollingViewModel.class)) {
- final CredentialModel credentialModel = extras.get(CREDENTIAL_MODEL_KEY);
- final FingerprintRepository fingerprint = provider.getFingerprintRepository(
- application);
- if (fingerprint != null && credentialModel != null) {
- return (T) new FingerprintEnrollEnrollingViewModel(application,
- credentialModel.getUserId(), fingerprint);
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollFinishViewModel.class)) {
- final CredentialModel credentialModel = extras.get(CREDENTIAL_MODEL_KEY);
- final EnrollmentRequest request = extras.get(ENROLLMENT_REQUEST_KEY);
- final FingerprintRepository fingerprint = provider.getFingerprintRepository(
- application);
- if (fingerprint != null && credentialModel != null && request != null) {
- return (T) new FingerprintEnrollFinishViewModel(application,
- credentialModel.getUserId(), request, fingerprint);
- }
- } else if (modelClass.isAssignableFrom(FingerprintEnrollErrorDialogViewModel.class)) {
- final EnrollmentRequest request = extras.get(ENROLLMENT_REQUEST_KEY);
- if (request != null) {
- return (T) new FingerprintEnrollErrorDialogViewModel(application, request.isSuw());
- }
- }
- return create(modelClass);
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/model/CredentialModel.kt b/src/com/android/settings/biometrics2/ui/model/CredentialModel.kt
deleted file mode 100644
index 5350733..0000000
--- a/src/com/android/settings/biometrics2/ui/model/CredentialModel.kt
+++ /dev/null
@@ -1,108 +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.biometrics2.ui.model
-
-import android.content.Intent.EXTRA_USER_ID
-import android.os.Bundle
-import android.os.UserHandle
-import androidx.annotation.VisibleForTesting
-import com.android.settings.biometrics.BiometricEnrollBase.EXTRA_KEY_CHALLENGE
-import com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN
-import com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE
-import java.time.Clock
-
-/**
- * Secret credential data including
- * 1. userId
- * 2. challenge
- * 3. token
- * 4. gkPwHandle
- */
-class CredentialModel(bundle: Bundle?, private val clock: Clock) {
-
- private val mInitMillis = clock.millis()
-
- /** userId for this credential */
- val userId: Int = (bundle ?: Bundle()).getInt(EXTRA_USER_ID, UserHandle.myUserId())
-
- private var clearGkPwHandleMillis: Long? = null
-
- /** Gatekeeper password handle */
- var gkPwHandle: Long = (bundle ?: Bundle()).getLong(EXTRA_KEY_GK_PW_HANDLE, INVALID_GK_PW_HANDLE)
- private set
-
- val isValidGkPwHandle: Boolean
- get() = gkPwHandle != INVALID_GK_PW_HANDLE
-
- /** Clear gatekeeper password handle data */
- fun clearGkPwHandle() {
- clearGkPwHandleMillis = clock.millis()
- gkPwHandle = INVALID_GK_PW_HANDLE
- }
-
- /** Check user id is valid or not */
- val isValidUserId: Boolean
- get() = userId != UserHandle.USER_NULL
-
- private var updateChallengeMillis: Long? = null
-
- var challenge: Long = (bundle ?: Bundle()).getLong(EXTRA_KEY_CHALLENGE, INVALID_CHALLENGE)
- set(value) {
- updateChallengeMillis = clock.millis()
- field = value
- }
-
- val isValidChallenge: Boolean
- get() = challenge != INVALID_CHALLENGE
-
- private var updateTokenMillis: Long? = null
-
- /** Challenge token */
- var token: ByteArray? = (bundle ?: Bundle()).getByteArray(EXTRA_KEY_CHALLENGE_TOKEN)
- set(value) {
- updateTokenMillis = clock.millis()
- field = value
- }
-
- val isValidToken: Boolean
- get() = token != null
-
- /** Returns a string representation of the object */
- override fun toString(): String {
- val gkPwHandleLen = "$gkPwHandle".length
- val tokenLen = token?.size ?: 0
- val challengeLen = "$challenge".length
- return (javaClass.simpleName + ":{initMillis:$mInitMillis"
- + ", userId:$userId"
- + ", challenge:{len:$challengeLen"
- + ", updateMillis:$updateChallengeMillis}"
- + ", token:{len:$tokenLen, isValid:$isValidToken"
- + ", updateMillis:$updateTokenMillis}"
- + ", gkPwHandle:{len:$gkPwHandleLen, isValid:$isValidGkPwHandle"
- + ", clearMillis:$clearGkPwHandleMillis}"
- + " }")
- }
-
- companion object {
- /** Default value for an invalid challenge */
- @VisibleForTesting
- const val INVALID_CHALLENGE = -1L
-
- /** Default value if GkPwHandle is invalid */
- @VisibleForTesting
- const val INVALID_GK_PW_HANDLE = 0L
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/model/EnrollmentProgress.kt b/src/com/android/settings/biometrics2/ui/model/EnrollmentProgress.kt
deleted file mode 100644
index 7b35a68..0000000
--- a/src/com/android/settings/biometrics2/ui/model/EnrollmentProgress.kt
+++ /dev/null
@@ -1,33 +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.biometrics2.ui.model
-
-/** Biometric Enrollment progress */
-class EnrollmentProgress(val steps: Int, val remaining: Int) {
-
- val isInitialStep: Boolean
- get() = steps == INITIAL_STEPS
-
- override fun toString(): String {
- return ("${javaClass.simpleName}@${Integer.toHexString(hashCode())}"
- + "{steps:$steps, remaining:$remaining}")
- }
-
- companion object {
- const val INITIAL_STEPS = -1
- const val INITIAL_REMAINING = 0
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/model/EnrollmentRequest.kt b/src/com/android/settings/biometrics2/ui/model/EnrollmentRequest.kt
deleted file mode 100644
index 4696c62..0000000
--- a/src/com/android/settings/biometrics2/ui/model/EnrollmentRequest.kt
+++ /dev/null
@@ -1,78 +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.biometrics2.ui.model
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import com.android.settings.SetupWizardUtils
-import com.android.settings.biometrics.BiometricEnrollActivity.EXTRA_SKIP_INTRO
-import com.google.android.setupcompat.util.WizardManagerHelper
-import com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW
-
-/**
- * Biometric enrollment generic intent data, which includes
- * 1. isSuw
- * 2. isAfterSuwOrSuwSuggestedAction
- * 3. theme
- * 4. isFromSettingsSummery
- * 5. isSkipIntro
- * 6. isSkipFindSensor
- * 7. a helper method, getSetupWizardExtras
- */
-class EnrollmentRequest(
- intent: Intent,
- context: Context,
- isSetupActivity: Boolean
-) {
- val isSuw: Boolean = isSetupActivity && WizardManagerHelper.isAnySetupWizard(intent)
-
- val isAfterSuwOrSuwSuggestedAction = (isSetupActivity
- && (WizardManagerHelper.isDeferredSetupWizard(intent)
- || WizardManagerHelper.isPortalSetupWizard(intent)
- || intent.getBooleanExtra(EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW, false)))
-
- private val _suwExtras = getSuwExtras(isSuw, intent)
-
- val isSkipIntro = intent.getBooleanExtra(EXTRA_SKIP_INTRO, false)
-
- val isSkipFindSensor = intent.getBooleanExtra(EXTRA_SKIP_FIND_SENSOR, false)
-
- val theme = SetupWizardUtils.getTheme(context, intent)
-
- val suwExtras: Bundle
- get() = Bundle(_suwExtras)
-
- /**
- * Returns a string representation of the object
- */
- override fun toString(): String {
- return (javaClass.simpleName + ":{isSuw:" + isSuw
- + ", isAfterSuwOrSuwSuggestedAction:" + isAfterSuwOrSuwSuggestedAction
- + "}")
- }
-
- companion object {
- const val EXTRA_SKIP_FIND_SENSOR = "skip_find_sensor"
- private fun getSuwExtras(isSuw: Boolean, intent: Intent): Bundle {
- val toIntent = Intent()
- if (isSuw) {
- SetupWizardUtils.copySetupExtras(intent, toIntent)
- }
- return toIntent.extras ?: Bundle()
- }
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/model/EnrollmentStatusMessage.kt b/src/com/android/settings/biometrics2/ui/model/EnrollmentStatusMessage.kt
deleted file mode 100644
index 6dd0c5c..0000000
--- a/src/com/android/settings/biometrics2/ui/model/EnrollmentStatusMessage.kt
+++ /dev/null
@@ -1,27 +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.biometrics2.ui.model
-
-/** Enrolling status message (help or error) */
-class EnrollmentStatusMessage(val msgId: Int, string: CharSequence?) {
-
- /** Status string */
- val str: CharSequence = string ?: ""
-
- override fun toString(): String {
- return "${javaClass.simpleName}@${Integer.toHexString(hashCode())}{id:$msgId, str:$str}"
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/model/FingerprintEnrollIntroStatus.kt b/src/com/android/settings/biometrics2/ui/model/FingerprintEnrollIntroStatus.kt
deleted file mode 100644
index 4cbaffa..0000000
--- a/src/com/android/settings/biometrics2/ui/model/FingerprintEnrollIntroStatus.kt
+++ /dev/null
@@ -1,49 +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.biometrics2.ui.model
-
-
-enum class FingerprintEnrollable {
- // Unconfirmed case, this value is invalid, and view shall bypass this value
- FINGERPRINT_ENROLLABLE_UNKNOWN,
- // User is allowed to enrolled a new fingerprint
- FINGERPRINT_ENROLLABLE_OK,
- // User is not allowed to enroll because the number has reached maximum
- FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
-}
-
-/**
- * Fingerprint onboarding introduction page data, it contains following information which needs
- * to be passed from view model to view.
- * 1. mEnrollableStatus: User is allowed to enroll a new fingerprint or not.
- * 2. mHasScrollToBottom: User has scrolled to the bottom of this page or not.
- */
-class FingerprintEnrollIntroStatus(
- private val mHasScrollToBottom: Boolean,
- /** Enrollable status. It means that user is allowed to enroll a new fingerprint or not. */
- val enrollableStatus: FingerprintEnrollable
-) {
- /** Get info for this onboarding introduction page has scrolled to bottom or not */
- fun hasScrollToBottom(): Boolean {
- return mHasScrollToBottom
- }
-
- override fun toString(): String {
- return ("${javaClass.simpleName}@${Integer.toHexString(hashCode())}"
- + "{scrollToBottom:$mHasScrollToBottom"
- + ", enrollableStatus:$enrollableStatus}")
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt
deleted file mode 100644
index 9f99d17..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingIconTouchDialog.kt
+++ /dev/null
@@ -1,41 +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.biometrics2.ui.view
-
-import android.app.Dialog
-import android.content.Context
-import android.content.DialogInterface
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import com.android.settings.R
-
-/**
- * Icon Touch dialog
- */
-class FingerprintEnrollEnrollingIconTouchDialog : DialogFragment() {
- override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
- requireActivity().bindFingerprintEnrollEnrollingIconTouchDialog()
-}
-
-fun Context.bindFingerprintEnrollEnrollingIconTouchDialog(): AlertDialog =
- AlertDialog.Builder(this, R.style.Theme_AlertDialog)
- .setTitle(R.string.security_settings_fingerprint_enroll_touch_dialog_title)
- .setMessage(R.string.security_settings_fingerprint_enroll_touch_dialog_message)
- .setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok) {
- dialog: DialogInterface?, _: Int -> dialog?.dismiss()
- }
- .create()
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
deleted file mode 100644
index 2530628..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingRfpsFragment.kt
+++ /dev/null
@@ -1,513 +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.biometrics2.ui.view
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.drawable.Animatable2
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
-import android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL
-import android.os.Bundle
-import android.text.TextUtils
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AnimationUtils.loadInterpolator
-import android.view.animation.Interpolator
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-import kotlinx.coroutines.launch
-
-/**
- * Fragment is used to handle enrolling process for rfps
- */
-class FingerprintEnrollEnrollingRfpsFragment : Fragment() {
-
- private var _enrollingViewModel: FingerprintEnrollEnrollingViewModel? = null
- private val enrollingViewModel: FingerprintEnrollEnrollingViewModel
- get() = _enrollingViewModel!!
-
- private var _progressViewModel: FingerprintEnrollProgressViewModel? = null
- private val progressViewModel: FingerprintEnrollProgressViewModel
- get() = _progressViewModel!!
-
- private var _errorDialogViewModel: FingerprintEnrollErrorDialogViewModel? = null
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel
- get() = _errorDialogViewModel!!
-
- private var fastOutSlowInInterpolator: Interpolator? = null
- private var linearOutSlowInInterpolator: Interpolator? = null
- private var fastOutLinearInInterpolator: Interpolator? = null
-
- private var isAnimationCancelled = false
-
- private var enrollingView: GlifLayout? = null
- private val progressBar: ProgressBar
- get() = enrollingView!!.findViewById(R.id.fingerprint_progress_bar)!!
-
- private var progressAnim: ObjectAnimator? = null
-
- private val errorText: TextView
- get() = enrollingView!!.findViewById(R.id.error_text)!!
-
- private val iconAnimationDrawable: AnimatedVectorDrawable?
- get() = (progressBar.background as LayerDrawable)
- .findDrawableByLayerId(R.id.fingerprint_animation) as AnimatedVectorDrawable?
-
- private val iconBackgroundBlinksDrawable: AnimatedVectorDrawable?
- get() = (progressBar.background as LayerDrawable)
- .findDrawableByLayerId(R.id.fingerprint_background) as AnimatedVectorDrawable?
-
- private var iconTouchCount = 0
-
- private val touchAgainRunnable = Runnable {
- showError(
- // Use enrollingView to getString to prevent activity is missing during rotation
- enrollingView!!.context.getString(
- R.string.security_settings_fingerprint_enroll_lift_touch_again
- )
- )
- }
-
- private val onSkipClickListener = View.OnClickListener { _: View? ->
- enrollingViewModel.setOnSkipPressed()
- cancelEnrollment(true)
- }
-
- private var enrollingCancelSignal: Any? = null
-
- private val progressObserver = Observer { progress: EnrollmentProgress? ->
- if (progress != null && progress.steps >= 0) {
- onEnrollmentProgressChange(progress)
- }
- }
-
- private val helpMessageObserver = Observer { helpMessage: EnrollmentStatusMessage? ->
- helpMessage?.let { onEnrollmentHelp(it) }
- }
-
- private val errorMessageObserver = Observer { errorMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "errorMessageObserver($errorMessage)")
- errorMessage?.let { onEnrollmentError(it) }
- }
-
- private val canceledSignalObserver = Observer { canceledSignal: Any? ->
- canceledSignal?.let { onEnrollmentCanceled(it) }
- }
-
- private val onBackPressedCallback: OnBackPressedCallback =
- object : OnBackPressedCallback(true) {
- override fun handleOnBackPressed() {
- isEnabled = false
- enrollingViewModel.setOnBackPressed()
- cancelEnrollment(true)
- }
- }
-
- override fun onAttach(context: Context) {
- ViewModelProvider(requireActivity()).let { provider ->
- _enrollingViewModel = provider[FingerprintEnrollEnrollingViewModel::class.java]
- _progressViewModel = provider[FingerprintEnrollProgressViewModel::class.java]
- _errorDialogViewModel = provider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
- super.onAttach(context)
- requireActivity().onBackPressedDispatcher.addCallback(onBackPressedCallback)
- }
-
- override fun onDetach() {
- onBackPressedCallback.isEnabled = false
- super.onDetach()
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View {
- enrollingView = inflater.inflate(
- R.layout.fingerprint_enroll_enrolling, container, false
- ) as GlifLayout
- return enrollingView!!
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- iconAnimationDrawable!!.registerAnimationCallback(iconAnimationCallback)
-
- progressBar.setOnTouchListener { _: View?, event: MotionEvent ->
- if (event.actionMasked == MotionEvent.ACTION_DOWN) {
- iconTouchCount++
- if (iconTouchCount == ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN) {
- showIconTouchDialog()
- } else {
- progressBar.postDelayed(
- showDialogRunnable,
- ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN
- )
- }
- } else if (event.actionMasked == MotionEvent.ACTION_CANCEL
- || event.actionMasked == MotionEvent.ACTION_UP
- ) {
- progressBar.removeCallbacks(showDialogRunnable)
- }
- true
- }
-
- requireActivity().bindFingerprintEnrollEnrollingRfpsView(
- view = enrollingView!!,
- onSkipClickListener = onSkipClickListener
- )
-
- fastOutSlowInInterpolator =
- loadInterpolator(requireContext(), android.R.interpolator.fast_out_slow_in)
- linearOutSlowInInterpolator =
- loadInterpolator(requireContext(), android.R.interpolator.linear_out_slow_in)
- fastOutLinearInInterpolator =
- loadInterpolator(requireContext(), android.R.interpolator.fast_out_linear_in)
-
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.triggerRetryFlow.collect { retryEnrollment() }
- }
- }
- }
-
- private fun retryEnrollment() {
- isAnimationCancelled = false
- startIconAnimation()
- startEnrollment()
-
- clearError()
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- updateTitleAndDescription()
- }
-
- override fun onStart() {
- super.onStart()
-
- val isEnrolling = progressViewModel.isEnrolling
- val isErrorDialogShown = errorDialogViewModel.isDialogShown
- Log.d(TAG, "onStart(), isEnrolling:$isEnrolling, isErrorDialog:$isErrorDialogShown")
- if (!isErrorDialogShown) {
- isAnimationCancelled = false
- startIconAnimation()
- startEnrollment()
- }
-
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- updateTitleAndDescription()
- }
-
- private fun startIconAnimation() {
- iconAnimationDrawable?.start()
- }
-
- private fun stopIconAnimation() {
- isAnimationCancelled = true
- iconAnimationDrawable?.stop()
- }
-
- override fun onStop() {
- stopIconAnimation()
- removeEnrollmentObservers()
- val isEnrolling = progressViewModel.isEnrolling
- val isConfigChange = requireActivity().isChangingConfigurations
- Log.d(TAG, "onStop(), enrolling:$isEnrolling isConfigChange:$isConfigChange")
- if (isEnrolling && !isConfigChange) {
- cancelEnrollment(false)
- }
- super.onStop()
- }
-
- private fun removeEnrollmentObservers() {
- progressViewModel.errorMessageLiveData.removeObserver(errorMessageObserver)
- progressViewModel.progressLiveData.removeObserver(progressObserver)
- progressViewModel.helpMessageLiveData.removeObserver(helpMessageObserver)
- }
-
- private fun cancelEnrollment(waitForLastCancelErrMsg: Boolean) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "cancelEnrollment(), failed because isEnrolling is false")
- return
- }
- removeEnrollmentObservers()
- if (waitForLastCancelErrMsg) {
- progressViewModel.canceledSignalLiveData.observe(this, canceledSignalObserver)
- } else {
- enrollingCancelSignal = null
- }
- val cancelResult: Boolean = progressViewModel.cancelEnrollment()
- if (!cancelResult) {
- Log.e(TAG, "cancelEnrollment(), failed to cancel enrollment")
- }
- }
-
- private fun startEnrollment() {
- enrollingCancelSignal = progressViewModel.startEnrollment(ENROLL_ENROLL)
- if (enrollingCancelSignal == null) {
- Log.e(TAG, "startEnrollment(), failed")
- } else {
- Log.d(TAG, "startEnrollment(), success")
- }
- progressViewModel.progressLiveData.observe(this, progressObserver)
- progressViewModel.helpMessageLiveData.observe(this, helpMessageObserver)
- progressViewModel.errorMessageLiveData.observe(this, errorMessageObserver)
- }
-
- private fun onEnrollmentHelp(helpMessage: EnrollmentStatusMessage) {
- Log.d(TAG, "onEnrollmentHelp($helpMessage)")
- val helpStr: CharSequence = helpMessage.str
- if (!TextUtils.isEmpty(helpStr)) {
- errorText.removeCallbacks(touchAgainRunnable)
- showError(helpStr)
- }
- }
-
- private fun onEnrollmentError(errorMessage: EnrollmentStatusMessage) {
- stopIconAnimation()
-
- cancelEnrollment(true)
- lifecycleScope.launch {
- Log.d(TAG, "newDialog $errorMessage")
- errorDialogViewModel.newDialog(errorMessage.msgId)
- }
- }
-
- private fun onEnrollmentCanceled(canceledSignal: Any) {
- Log.d(
- TAG,
- "onEnrollmentCanceled enrolling:$enrollingCancelSignal, canceled:$canceledSignal"
- )
- if (enrollingCancelSignal === canceledSignal) {
- progressViewModel.canceledSignalLiveData.removeObserver(canceledSignalObserver)
- progressViewModel.clearProgressLiveData()
- if (enrollingViewModel.onBackPressed) {
- enrollingViewModel.onCancelledDueToOnBackPressed()
- } else if (enrollingViewModel.onSkipPressed) {
- enrollingViewModel.onCancelledDueToOnSkipPressed()
- }
- }
- }
-
- private fun onEnrollmentProgressChange(progress: EnrollmentProgress) {
- updateProgress(true /* animate */, progress)
- updateTitleAndDescription()
- animateFlash()
- errorText.removeCallbacks(touchAgainRunnable)
- errorText.postDelayed(touchAgainRunnable, HINT_TIMEOUT_DURATION.toLong())
- }
-
- private fun updateProgress(animate: Boolean, enrollmentProgress: EnrollmentProgress) {
- val progress = getProgress(enrollmentProgress)
- Log.d(TAG, "updateProgress($animate, $enrollmentProgress), old:${progressBar.progress}"
- + ", new:$progress")
-
- // Only clear the error when progress has been made.
- // TODO (b/234772728) Add tests.
- if (progressBar.progress < progress) {
- clearError()
- }
- if (animate) {
- animateProgress(progress)
- } else {
- progressBar.progress = progress
- if (progress >= PROGRESS_BAR_MAX) {
- delayedFinishRunnable.run()
- }
- }
- }
-
- private fun getProgress(progress: EnrollmentProgress): Int {
- if (progress.steps == -1) {
- return 0
- }
- val displayProgress = 0.coerceAtLeast(progress.steps + 1 - progress.remaining)
- return PROGRESS_BAR_MAX * displayProgress / (progress.steps + 1)
- }
-
- private fun showError(error: CharSequence) {
- errorText.text = error
- if (errorText.visibility == View.INVISIBLE) {
- errorText.visibility = View.VISIBLE
- errorText.translationY = enrollingView!!.context.resources.getDimensionPixelSize(
- R.dimen.fingerprint_error_text_appear_distance
- ).toFloat()
- errorText.alpha = 0f
- errorText.animate()
- .alpha(1f)
- .translationY(0f)
- .setDuration(200)
- .setInterpolator(linearOutSlowInInterpolator)
- .start()
- } else {
- errorText.animate().cancel()
- errorText.alpha = 1f
- errorText.translationY = 0f
- }
- if (isResumed && enrollingViewModel.isAccessibilityEnabled) {
- enrollingViewModel.vibrateError(javaClass.simpleName + "::showError")
- }
- }
-
- private fun clearError() {
- if (errorText.visibility == View.VISIBLE) {
- errorText.animate()
- .alpha(0f)
- .translationY(
- resources.getDimensionPixelSize(
- R.dimen.fingerprint_error_text_disappear_distance
- ).toFloat()
- )
- .setDuration(100)
- .setInterpolator(fastOutLinearInInterpolator)
- .withEndAction { errorText.visibility = View.INVISIBLE }
- .start()
- }
- }
-
- private fun animateProgress(progress: Int) {
- progressAnim?.cancel()
- val anim = ObjectAnimator.ofInt(
- progressBar /* target */,
- "progress" /* propertyName */,
- progressBar.progress /* values[0] */,
- progress /* values[1] */
- )
- anim.addListener(progressAnimationListener)
- anim.interpolator = fastOutSlowInInterpolator
- anim.setDuration(ANIMATION_DURATION)
- anim.start()
- progressAnim = anim
- }
-
- private fun animateFlash() {
- iconBackgroundBlinksDrawable?.start()
- }
-
- private fun updateTitleAndDescription() {
- val progressLiveData: EnrollmentProgress = progressViewModel.progressLiveData.value!!
- GlifLayoutHelper(activity!!, enrollingView!!).setDescriptionText(
- enrollingView!!.context.getString(
- if (progressLiveData.steps == -1)
- R.string.security_settings_fingerprint_enroll_start_message
- else
- R.string.security_settings_fingerprint_enroll_repeat_message
- )
- )
- }
-
- private fun showIconTouchDialog() {
- iconTouchCount = 0
- enrollingViewModel.showIconTouchDialog()
- }
-
- private val showDialogRunnable = Runnable { showIconTouchDialog() }
-
- private val progressAnimationListener: Animator.AnimatorListener =
- object : Animator.AnimatorListener {
- override fun onAnimationStart(animation: Animator) {
- startIconAnimation()
- }
-
- override fun onAnimationRepeat(animation: Animator) {}
- override fun onAnimationEnd(animation: Animator) {
- stopIconAnimation()
- if (progressBar.progress >= PROGRESS_BAR_MAX) {
- progressBar.postDelayed(delayedFinishRunnable, ANIMATION_DURATION)
- }
- }
-
- override fun onAnimationCancel(animation: Animator) {}
- }
-
- // Give the user a chance to see progress completed before jumping to the next stage.
- private val delayedFinishRunnable = Runnable { enrollingViewModel.onEnrollingDone() }
-
- private val iconAnimationCallback: Animatable2.AnimationCallback =
- object : Animatable2.AnimationCallback() {
- override fun onAnimationEnd(d: Drawable) {
- if (isAnimationCancelled) {
- return
- }
-
- // Start animation after it has ended.
- progressBar.post { startIconAnimation() }
- }
- }
-
- companion object {
- private const val DEBUG = false
- private const val TAG = "FingerprintEnrollEnrollingRfpsFragment"
- private const val PROGRESS_BAR_MAX = 10000
- private const val ANIMATION_DURATION = 250L
- private const val ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN: Long = 500
- private const val ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN = 3
-
- /**
- * If we don't see progress during this time, we show an error message to remind the users that
- * they need to lift the finger and touch again.
- */
- private const val HINT_TIMEOUT_DURATION = 2500
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollEnrollingRfpsView(
- view: GlifLayout,
- onSkipClickListener: View.OnClickListener
-) {
- GlifLayoutHelper(this, view).let {
- it.setDescriptionText(
- getString(
- R.string.security_settings_fingerprint_enroll_start_message
- )
- )
- it.setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title)
- }
-
- view.findViewById<ProgressBar>(R.id.fingerprint_progress_bar)!!
- .progressBackgroundTintMode = PorterDuff.Mode.SRC
-
- view.getMixin(FooterBarMixin::class.java).secondaryButton =
- FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
- .setListener(onSkipClickListener)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
deleted file mode 100644
index 7faeeac..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.kt
+++ /dev/null
@@ -1,669 +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.biometrics2.ui.view
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.annotation.RawRes
-import android.content.Context
-import android.content.res.ColorStateList
-import android.content.res.Configuration
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.AnimationUtils
-import android.view.animation.Interpolator
-import android.widget.ProgressBar
-import android.widget.RelativeLayout
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.airbnb.lottie.LottieAnimationView
-import com.airbnb.lottie.LottieComposition
-import com.airbnb.lottie.LottieCompositionFactory
-import com.airbnb.lottie.LottieProperty
-import com.airbnb.lottie.model.KeyPath
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-import com.google.android.setupdesign.template.DescriptionMixin
-import com.google.android.setupdesign.template.HeaderMixin
-import kotlin.math.roundToInt
-import kotlinx.coroutines.launch
-
-/**
- * Fragment is used to handle enrolling process for sfps
- */
-class FingerprintEnrollEnrollingSfpsFragment : Fragment() {
-
- private var _enrollingViewModel: FingerprintEnrollEnrollingViewModel? = null
- private val enrollingViewModel: FingerprintEnrollEnrollingViewModel
- get() = _enrollingViewModel!!
-
- private var _progressViewModel: FingerprintEnrollProgressViewModel? = null
- private val progressViewModel: FingerprintEnrollProgressViewModel
- get() = _progressViewModel!!
-
- private var _errorDialogViewModel: FingerprintEnrollErrorDialogViewModel? = null
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel
- get() = _errorDialogViewModel!!
-
- private val fastOutSlowInInterpolator: Interpolator
- get() = AnimationUtils.loadInterpolator(
- activity,
- androidx.appcompat.R.interpolator.fast_out_slow_in,
- )
-
- private var enrollingView: GlifLayout? = null
-
- private val progressBar: ProgressBar
- get() = enrollingView!!.findViewById(R.id.fingerprint_progress_bar)!!
-
- private var progressAnim: ObjectAnimator? = null
-
- private val progressAnimationListener: Animator.AnimatorListener =
- object : Animator.AnimatorListener {
- override fun onAnimationStart(animation: Animator) {}
- override fun onAnimationRepeat(animation: Animator) {}
- override fun onAnimationEnd(animation: Animator) {
- if (progressBar.progress >= PROGRESS_BAR_MAX) {
- progressBar.postDelayed(delayedFinishRunnable, PROGRESS_ANIMATION_DURATION)
- }
- }
-
- override fun onAnimationCancel(animation: Animator) {}
- }
-
- private val illustrationLottie: LottieAnimationView
- get() = enrollingView!!.findViewById(R.id.illustration_lottie)!!
-
- private var haveShownSfpsNoAnimationLottie = false
- private var haveShownSfpsCenterLottie = false
- private var haveShownSfpsTipLottie = false
- private var haveShownSfpsLeftEdgeLottie = false
- private var haveShownSfpsRightEdgeLottie = false
-
- private var helpAnimation: ObjectAnimator? = null
-
- private var iconTouchCount = 0
-
- private val showIconTouchDialogRunnable = Runnable { showIconTouchDialog() }
-
- private var enrollingCancelSignal: Any? = null
-
- // Give the user a chance to see progress completed before jumping to the next stage.
- private val delayedFinishRunnable = Runnable { enrollingViewModel.onEnrollingDone() }
-
- private val onSkipClickListener = View.OnClickListener { _: View? ->
- enrollingViewModel.setOnSkipPressed()
- cancelEnrollment(true)
- }
-
- private val progressObserver = Observer { progress: EnrollmentProgress? ->
- if (progress != null && progress.steps >= 0) {
- onEnrollmentProgressChange(progress)
- }
- }
-
- private val helpMessageObserver = Observer { helpMessage: EnrollmentStatusMessage? ->
- helpMessage?.let { onEnrollmentHelp(it) }
- }
-
- private val errorMessageObserver = Observer { errorMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "errorMessageObserver($errorMessage)")
- errorMessage?.let { onEnrollmentError(it) }
- }
-
- private val canceledSignalObserver = Observer { canceledSignal: Any? ->
- Log.d(TAG, "canceledSignalObserver($canceledSignal)")
- canceledSignal?.let { onEnrollmentCanceled(it) }
- }
-
- private val onBackPressedCallback: OnBackPressedCallback =
- object : OnBackPressedCallback(true) {
- override fun handleOnBackPressed() {
- isEnabled = false
- enrollingViewModel.setOnBackPressed()
- cancelEnrollment(true)
- }
- }
-
- override fun onAttach(context: Context) {
- ViewModelProvider(requireActivity()).let { provider ->
- _enrollingViewModel = provider[FingerprintEnrollEnrollingViewModel::class.java]
- _progressViewModel = provider[FingerprintEnrollProgressViewModel::class.java]
- _errorDialogViewModel = provider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
- super.onAttach(context)
- requireActivity().onBackPressedDispatcher.addCallback(onBackPressedCallback)
- }
-
- override fun onDetach() {
- onBackPressedCallback.isEnabled = false
- super.onDetach()
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View? {
- enrollingView = inflater.inflate(
- R.layout.sfps_enroll_enrolling,
- container, false
- ) as GlifLayout
- return enrollingView
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- requireActivity().bindFingerprintEnrollEnrollingSfpsView(
- view = enrollingView!!,
- onSkipClickListener = onSkipClickListener
- )
-
- // setHelpAnimation()
- helpAnimation = ObjectAnimator.ofFloat(
- enrollingView!!.findViewById<RelativeLayout>(R.id.progress_lottie)!!,
- "translationX" /* propertyName */,
- 0f,
- HELP_ANIMATION_TRANSLATION_X,
- -1 * HELP_ANIMATION_TRANSLATION_X,
- HELP_ANIMATION_TRANSLATION_X,
- 0f
- ).also {
- it.interpolator = AccelerateDecelerateInterpolator()
- it.setDuration(HELP_ANIMATION_DURATION)
- it.setAutoCancel(false)
- }
-
- progressBar.setOnTouchListener { _: View?, event: MotionEvent ->
- if (event.actionMasked == MotionEvent.ACTION_DOWN) {
- iconTouchCount++
- if (iconTouchCount == ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN) {
- showIconTouchDialog()
- } else {
- progressBar.postDelayed(
- showIconTouchDialogRunnable,
- ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN
- )
- }
- } else if (event.actionMasked == MotionEvent.ACTION_CANCEL
- || event.actionMasked == MotionEvent.ACTION_UP
- ) {
- progressBar.removeCallbacks(showIconTouchDialogRunnable)
- }
- true
- }
-
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.triggerRetryFlow.collect { retryEnrollment() }
- }
- }
- }
-
- private fun retryEnrollment() {
- startEnrollment()
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- }
-
- override fun onStart() {
- super.onStart()
- val isEnrolling = progressViewModel.isEnrolling
- val isErrorDialogShown = errorDialogViewModel.isDialogShown
- Log.d(TAG, "onStart(), isEnrolling:$isEnrolling, isErrorDialog:$isErrorDialogShown")
- if (!isErrorDialogShown) {
- startEnrollment()
- }
-
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- progressViewModel.helpMessageLiveData.value.let {
- if (it != null) {
- onEnrollmentHelp(it)
- } else {
- clearError()
- updateTitleAndDescription()
- }
- }
- }
-
- override fun onStop() {
- removeEnrollmentObservers()
- val isEnrolling = progressViewModel.isEnrolling
- val isConfigChange = requireActivity().isChangingConfigurations
- Log.d(TAG, "onStop(), enrolling:$isEnrolling isConfigChange:$isConfigChange")
- if (isEnrolling && !isConfigChange) {
- cancelEnrollment(false)
- }
- super.onStop()
- }
-
- private fun removeEnrollmentObservers() {
- progressViewModel.errorMessageLiveData.removeObserver(errorMessageObserver)
- progressViewModel.progressLiveData.removeObserver(progressObserver)
- progressViewModel.helpMessageLiveData.removeObserver(helpMessageObserver)
- }
-
- private fun cancelEnrollment(waitForLastCancelErrMsg: Boolean) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "cancelEnrollment(), failed because isEnrolling is false")
- return
- }
- removeEnrollmentObservers()
- if (waitForLastCancelErrMsg) {
- progressViewModel.canceledSignalLiveData.observe(this, canceledSignalObserver)
- } else {
- enrollingCancelSignal = null
- }
- val cancelResult: Boolean = progressViewModel.cancelEnrollment()
- if (!cancelResult) {
- Log.e(TAG, "cancelEnrollment(), failed to cancel enrollment")
- }
- }
-
- private fun startEnrollment() {
- enrollingCancelSignal = progressViewModel.startEnrollment(ENROLL_ENROLL)
- if (enrollingCancelSignal == null) {
- Log.e(TAG, "startEnrollment(), failed")
- } else {
- Log.d(TAG, "startEnrollment(), success")
- }
- progressViewModel.progressLiveData.observe(this, progressObserver)
- progressViewModel.helpMessageLiveData.observe(this, helpMessageObserver)
- progressViewModel.errorMessageLiveData.observe(this, errorMessageObserver)
- }
-
- private fun configureEnrollmentStage(description: CharSequence, @RawRes lottie: Int) {
- GlifLayoutHelper(requireActivity(), enrollingView!!).setDescriptionText(description)
- LottieCompositionFactory.fromRawRes(activity, lottie)
- .addListener { c: LottieComposition ->
- illustrationLottie.setComposition(c)
- illustrationLottie.visibility = View.VISIBLE
- illustrationLottie.playAnimation()
- }
- }
-
- private val currentSfpsStage: Int
- get() {
- val progressLiveData: EnrollmentProgress =
- progressViewModel.progressLiveData.value
- ?: return STAGE_UNKNOWN
- val progressSteps: Int = progressLiveData.steps - progressLiveData.remaining
- return if (progressSteps < getStageThresholdSteps(0)) {
- SFPS_STAGE_NO_ANIMATION
- } else if (progressSteps < getStageThresholdSteps(1)) {
- SFPS_STAGE_CENTER
- } else if (progressSteps < getStageThresholdSteps(2)) {
- SFPS_STAGE_FINGERTIP
- } else if (progressSteps < getStageThresholdSteps(3)) {
- SFPS_STAGE_LEFT_EDGE
- } else {
- SFPS_STAGE_RIGHT_EDGE
- }
- }
-
- private fun onEnrollmentHelp(helpMessage: EnrollmentStatusMessage) {
- Log.d(TAG, "onEnrollmentHelp($helpMessage)")
- val helpStr: CharSequence = helpMessage.str
- if (helpStr.isNotEmpty()) {
- showError(helpStr)
- }
- }
-
- private fun onEnrollmentError(errorMessage: EnrollmentStatusMessage) {
- cancelEnrollment(true)
- lifecycleScope.launch {
- Log.d(TAG, "newDialog $errorMessage")
- errorDialogViewModel.newDialog(errorMessage.msgId)
- }
- }
-
- private fun onEnrollmentCanceled(canceledSignal: Any) {
- Log.d(
- TAG,
- "onEnrollmentCanceled enrolling:$enrollingCancelSignal, canceled:$canceledSignal"
- )
- if (enrollingCancelSignal === canceledSignal) {
- progressViewModel.canceledSignalLiveData.removeObserver(canceledSignalObserver)
- progressViewModel.clearProgressLiveData()
- if (enrollingViewModel.onBackPressed) {
- enrollingViewModel.onCancelledDueToOnBackPressed()
- } else if (enrollingViewModel.onSkipPressed) {
- enrollingViewModel.onCancelledDueToOnSkipPressed()
- }
- }
- }
-
- private fun announceEnrollmentProgress(announcement: CharSequence) {
- enrollingViewModel.sendAccessibilityEvent(announcement)
- }
-
- private fun onEnrollmentProgressChange(progress: EnrollmentProgress) {
- updateProgress(true /* animate */, progress)
- if (enrollingViewModel.isAccessibilityEnabled) {
- val percent: Int =
- ((progress.steps - progress.remaining).toFloat() / progress.steps.toFloat() * 100).toInt()
- val announcement: CharSequence = getString(
- R.string.security_settings_sfps_enroll_progress_a11y_message, percent
- )
- announceEnrollmentProgress(announcement)
- illustrationLottie.contentDescription =
- getString(R.string.security_settings_sfps_animation_a11y_label, percent)
- }
- updateTitleAndDescription()
- }
-
- private fun updateProgress(animate: Boolean, enrollmentProgress: EnrollmentProgress) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "Enrollment not started yet")
- return
- }
-
- val progress = getProgress(enrollmentProgress)
- Log.d(TAG, "updateProgress($animate, $enrollmentProgress), old:${progressBar.progress}"
- + ", new:$progress")
-
- // Only clear the error when progress has been made.
- // TODO (b/234772728) Add tests.
- if (progressBar.progress < progress) {
- clearError()
- }
- if (animate) {
- animateProgress(progress)
- } else {
- progressBar.progress = progress
- if (progress >= PROGRESS_BAR_MAX) {
- delayedFinishRunnable.run()
- }
- }
- }
-
- private fun getProgress(progress: EnrollmentProgress): Int {
- if (progress.steps == -1) {
- return 0
- }
- val displayProgress = 0.coerceAtLeast(progress.steps + 1 - progress.remaining)
- return PROGRESS_BAR_MAX * displayProgress / (progress.steps + 1)
- }
-
- private fun showError(error: CharSequence) {
- enrollingView!!.let {
- it.headerText = error
- it.headerTextView.contentDescription = error
- GlifLayoutHelper(requireActivity(), it).setDescriptionText("")
- }
-
- if (isResumed && !helpAnimation!!.isRunning) {
- helpAnimation!!.start()
- }
- applySfpsErrorDynamicColors(true)
- if (isResumed && enrollingViewModel.isAccessibilityEnabled) {
- enrollingViewModel.vibrateError(javaClass.simpleName + "::showError")
- }
- }
-
- private fun clearError() {
- applySfpsErrorDynamicColors(false)
- }
-
- private fun animateProgress(progress: Int) {
- progressAnim?.cancel()
- progressAnim = ObjectAnimator.ofInt(
- progressBar,
- "progress",
- progressBar.progress,
- progress
- ).also {
- it.addListener(progressAnimationListener)
- it.interpolator = fastOutSlowInInterpolator
- it.setDuration(PROGRESS_ANIMATION_DURATION)
- it.start()
- }
- }
-
- /**
- * Applies dynamic colors corresponding to showing or clearing errors on the progress bar
- * and finger lottie for SFPS
- */
- private fun applySfpsErrorDynamicColors(isError: Boolean) {
- progressBar.applyProgressBarDynamicColor(requireContext(), isError)
- illustrationLottie.applyLottieDynamicColor(requireContext(), isError)
- }
-
- private fun getStageThresholdSteps(index: Int): Int {
- val progressLiveData: EnrollmentProgress? =
- progressViewModel.progressLiveData.value
- if (progressLiveData == null || progressLiveData.steps == -1) {
- Log.w(TAG, "getStageThresholdSteps: Enrollment not started yet")
- return 1
- }
- return (progressLiveData.steps
- * enrollingViewModel.getEnrollStageThreshold(index)).roundToInt()
- }
-
- private fun updateTitleAndDescription() {
- val helper = GlifLayoutHelper(requireActivity(), enrollingView!!)
- if (enrollingViewModel.isAccessibilityEnabled) {
- enrollingViewModel.clearTalkback()
- helper.glifLayout.descriptionTextView.accessibilityLiveRegion =
- View.ACCESSIBILITY_LIVE_REGION_POLITE
- }
- val stage = currentSfpsStage
- if (DEBUG) {
- Log.d(
- TAG, "updateTitleAndDescription, stage:" + stage
- + ", noAnimation:" + haveShownSfpsNoAnimationLottie
- + ", center:" + haveShownSfpsCenterLottie
- + ", tip:" + haveShownSfpsTipLottie
- + ", leftEdge:" + haveShownSfpsLeftEdgeLottie
- + ", rightEdge:" + haveShownSfpsRightEdgeLottie
- )
- }
- when (stage) {
- SFPS_STAGE_NO_ANIMATION -> {
- helper.setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title)
- if (!haveShownSfpsNoAnimationLottie) {
- haveShownSfpsNoAnimationLottie = true
- illustrationLottie.contentDescription =
- getString(R.string.security_settings_sfps_animation_a11y_label, 0)
- configureEnrollmentStage(
- getString(R.string.security_settings_sfps_enroll_start_message),
- R.raw.sfps_lottie_no_animation
- )
- }
- }
-
- SFPS_STAGE_CENTER -> {
- helper.setHeaderText(R.string.security_settings_sfps_enroll_finger_center_title)
- if (!haveShownSfpsCenterLottie) {
- haveShownSfpsCenterLottie = true
- configureEnrollmentStage(
- getString(R.string.security_settings_sfps_enroll_start_message),
- R.raw.sfps_lottie_pad_center
- )
- }
- }
-
- SFPS_STAGE_FINGERTIP -> {
- helper.setHeaderText(R.string.security_settings_sfps_enroll_fingertip_title)
- if (!haveShownSfpsTipLottie) {
- haveShownSfpsTipLottie = true
- configureEnrollmentStage("", R.raw.sfps_lottie_tip)
- }
- }
-
- SFPS_STAGE_LEFT_EDGE -> {
- helper.setHeaderText(R.string.security_settings_sfps_enroll_left_edge_title)
- if (!haveShownSfpsLeftEdgeLottie) {
- haveShownSfpsLeftEdgeLottie = true
- configureEnrollmentStage("", R.raw.sfps_lottie_left_edge)
- }
- }
-
- SFPS_STAGE_RIGHT_EDGE -> {
- helper.setHeaderText(R.string.security_settings_sfps_enroll_right_edge_title)
- if (!haveShownSfpsRightEdgeLottie) {
- haveShownSfpsRightEdgeLottie = true
- configureEnrollmentStage("", R.raw.sfps_lottie_right_edge)
- }
- }
-
- STAGE_UNKNOWN -> {
- // Don't use BiometricEnrollBase#setHeaderText, since that invokes setTitle,
- // which gets announced for a11y upon entering the page. For SFPS, we want to
- // announce a different string for a11y upon entering the page.
- helper.setHeaderText(R.string.security_settings_sfps_enroll_find_sensor_title)
- helper.setDescriptionText(
- getString(R.string.security_settings_sfps_enroll_start_message)
- )
- val description: CharSequence = getString(
- R.string.security_settings_sfps_enroll_find_sensor_message
- )
- helper.glifLayout.headerTextView.contentDescription = description
- helper.activity.title = description
- }
-
- else -> {
- helper.setHeaderText(R.string.security_settings_sfps_enroll_find_sensor_title)
- helper.setDescriptionText(
- getString(R.string.security_settings_sfps_enroll_start_message)
- )
- val description: CharSequence = getString(
- R.string.security_settings_sfps_enroll_find_sensor_message
- )
- helper.glifLayout.headerTextView.contentDescription = description
- helper.activity.title = description
- }
- }
- }
-
- private fun showIconTouchDialog() {
- iconTouchCount = 0
- enrollingViewModel.showIconTouchDialog()
- }
-
- companion object {
- private val TAG = FingerprintEnrollEnrollingSfpsFragment::class.java.simpleName
- private const val DEBUG = false
- private const val PROGRESS_BAR_MAX = 10000
- private const val HELP_ANIMATION_DURATION = 550L
- private const val HELP_ANIMATION_TRANSLATION_X = 40f
- private const val PROGRESS_ANIMATION_DURATION = 250L
- private const val ICON_TOUCH_DURATION_UNTIL_DIALOG_SHOWN: Long = 500
- private const val ICON_TOUCH_COUNT_SHOW_UNTIL_DIALOG_SHOWN = 3
- private const val STAGE_UNKNOWN = -1
- private const val SFPS_STAGE_NO_ANIMATION = 0
- private const val SFPS_STAGE_CENTER = 1
- private const val SFPS_STAGE_FINGERTIP = 2
- private const val SFPS_STAGE_LEFT_EDGE = 3
- private const val SFPS_STAGE_RIGHT_EDGE = 4
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollEnrollingSfpsView(
- view: GlifLayout,
- onSkipClickListener: View.OnClickListener
-) {
- GlifLayoutHelper(this, view).setDescriptionText(
- getString(R.string.security_settings_fingerprint_enroll_start_message)
- )
-
- view.getMixin(FooterBarMixin::class.java).secondaryButton = FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
- .setListener(onSkipClickListener)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
-
- view.findViewById<ProgressBar>(R.id.fingerprint_progress_bar)!!.progressBackgroundTintMode =
- PorterDuff.Mode.SRC
-
- view.findViewById<ProgressBar>(R.id.fingerprint_progress_bar)!!
- .applyProgressBarDynamicColor(this, false)
-
- view.findViewById<LottieAnimationView>(R.id.illustration_lottie)!!
- .applyLottieDynamicColor(this, false)
-
- view.maybeHideSfpsText(resources.configuration.orientation)
-}
-
-private fun ProgressBar.applyProgressBarDynamicColor(context: Context, isError: Boolean) {
- progressTintList = ColorStateList.valueOf(
- context.getColor(
- if (isError)
- R.color.sfps_enrollment_progress_bar_error_color
- else
- R.color.sfps_enrollment_progress_bar_fill_color
- )
- )
- progressTintMode = PorterDuff.Mode.SRC
- invalidate()
-}
-
-fun LottieAnimationView.applyLottieDynamicColor(context: Context, isError: Boolean) {
- addValueCallback(
- KeyPath(".blue100", "**"),
- LottieProperty.COLOR_FILTER
- ) {
- PorterDuffColorFilter(
- context.getColor(
- if (isError)
- R.color.sfps_enrollment_fp_error_color
- else
- R.color.sfps_enrollment_fp_captured_color
- ),
- PorterDuff.Mode.SRC_ATOP
- )
- }
- invalidate()
-}
-
-fun GlifLayout.maybeHideSfpsText(@Configuration.Orientation orientation: Int) {
- val headerMixin: HeaderMixin = getMixin(HeaderMixin::class.java)
- val descriptionMixin: DescriptionMixin = getMixin(DescriptionMixin::class.java)
-
- val isLandscape = (orientation == Configuration.ORIENTATION_LANDSCAPE)
- headerMixin.setAutoTextSizeEnabled(isLandscape)
- if (isLandscape) {
- headerMixin.textView.minLines = 0
- headerMixin.textView.maxLines = 10
- descriptionMixin.textView.minLines = 0
- descriptionMixin.textView.maxLines = 10
- } else {
- headerMixin.textView.setLines(4)
- // hide the description
- descriptionMixin.textView.setLines(0)
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt
deleted file mode 100644
index 7e754ac..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.kt
+++ /dev/null
@@ -1,707 +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.biometrics2.ui.view
-
-import android.annotation.RawRes
-import android.content.Context
-import android.hardware.biometrics.BiometricFingerprintConstants
-import android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.Surface
-import android.view.Surface.ROTATION_270
-import android.view.Surface.ROTATION_90
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.airbnb.lottie.LottieAnimationView
-import com.airbnb.lottie.LottieComposition
-import com.airbnb.lottie.LottieCompositionFactory
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
-import com.android.settings.biometrics2.ui.viewmodel.DeviceRotationViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.android.settings.biometrics2.ui.widget.UdfpsEnrollView
-import com.android.settingslib.display.DisplayDensityUtils
-import kotlinx.coroutines.launch
-import kotlin.math.roundToInt
-
-/**
- * Fragment is used to handle enrolling process for udfps
- */
-class FingerprintEnrollEnrollingUdfpsFragment : Fragment() {
-
- private var _enrollingViewModel: FingerprintEnrollEnrollingViewModel? = null
- private val enrollingViewModel: FingerprintEnrollEnrollingViewModel
- get() = _enrollingViewModel!!
-
- private var _rotationViewModel: DeviceRotationViewModel? = null
- private val rotationViewModel: DeviceRotationViewModel
- get() = _rotationViewModel!!
-
- private var _progressViewModel: FingerprintEnrollProgressViewModel? = null
- private val progressViewModel: FingerprintEnrollProgressViewModel
- get() = _progressViewModel!!
-
- private var _errorDialogViewModel: FingerprintEnrollErrorDialogViewModel? = null
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel
- get() = _errorDialogViewModel!!
-
- private var illustrationLottie: LottieAnimationView? = null
-
- private var haveShownTipLottie = false
- private var haveShownLeftEdgeLottie = false
- private var haveShownRightEdgeLottie = false
- private var haveShownCenterLottie = false
- private var haveShownGuideLottie = false
-
- private var enrollingView: RelativeLayout? = null
-
- private val titleText: TextView
- get() = enrollingView!!.findViewById(R.id.suc_layout_title)!!
-
- private val subTitleText: TextView
- get() = enrollingView!!.findViewById(R.id.sud_layout_subtitle)!!
-
- private val udfpsEnrollView: UdfpsEnrollView
- get() = enrollingView!!.findViewById(R.id.udfps_animation_view)!!
-
- private val skipBtn: Button
- get() = enrollingView!!.findViewById(R.id.skip_btn)!!
-
- private val icon: ImageView
- get() = enrollingView!!.findViewById(R.id.sud_layout_icon)!!
-
- private val shouldShowLottie: Boolean
- get() {
- val displayDensity = DisplayDensityUtils(requireContext())
- val currentDensityIndex: Int = displayDensity.currentIndexForDefaultDisplay
- val currentDensity: Int =
- displayDensity.defaultDisplayDensityValues[currentDensityIndex]
- val defaultDensity: Int = displayDensity.defaultDensityForDefaultDisplay
- return defaultDensity == currentDensity
- }
-
- private val isAccessibilityEnabled
- get() = enrollingViewModel.isAccessibilityEnabled
-
- private var rotation = -1
-
- private var enrollingCancelSignal: Any? = null
-
- private val onSkipClickListener = View.OnClickListener { _: View? ->
- enrollingViewModel.setOnSkipPressed()
- cancelEnrollment(true) // TODO Add test after b/273640000 fixed
- }
-
- private val progressObserver = Observer { progress: EnrollmentProgress? ->
- if (progress != null && progress.steps >= 0) {
- onEnrollmentProgressChange(progress)
- }
- }
-
- private val helpMessageObserver = Observer { helpMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "helpMessageObserver($helpMessage)")
- helpMessage?.let { onEnrollmentHelp(it) }
- }
-
- private val errorMessageObserver = Observer { errorMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "errorMessageObserver($errorMessage)")
- errorMessage?.let { onEnrollmentError(it) }
- }
-
- private val canceledSignalObserver = Observer { canceledSignal: Any? ->
- Log.d(TAG, "canceledSignalObserver($canceledSignal)")
- canceledSignal?.let { onEnrollmentCanceled(it) }
- }
-
- private val acquireObserver =
- Observer { isAcquiredGood: Boolean? -> isAcquiredGood?.let { onAcquired(it) } }
-
- private val pointerDownObserver =
- Observer { sensorId: Int? -> sensorId?.let { onPointerDown(it) } }
-
- private val pointerUpObserver =
- Observer { sensorId: Int? -> sensorId?.let { onPointerUp(it) } }
-
- private val rotationObserver =
- Observer { rotation: Int? -> rotation?.let { onRotationChanged(it) } }
-
- private val onBackPressedCallback: OnBackPressedCallback =
- object : OnBackPressedCallback(true) {
- override fun handleOnBackPressed() {
- isEnabled = false
- enrollingViewModel.setOnBackPressed()
- cancelEnrollment(true)
- }
- }
-
- // Give the user a chance to see progress completed before jumping to the next stage.
- private val delayedFinishRunnable = Runnable { enrollingViewModel.onEnrollingDone() }
-
- override fun onAttach(context: Context) {
- ViewModelProvider(requireActivity()).let { provider ->
- _enrollingViewModel = provider[FingerprintEnrollEnrollingViewModel::class.java]
- _rotationViewModel = provider[DeviceRotationViewModel::class.java]
- _progressViewModel = provider[FingerprintEnrollProgressViewModel::class.java]
- _errorDialogViewModel = provider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
- super.onAttach(context)
- requireActivity().onBackPressedDispatcher.addCallback(onBackPressedCallback)
- }
-
- override fun onDetach() {
- onBackPressedCallback.isEnabled = false
- super.onDetach()
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View = (inflater.inflate(
- R.layout.udfps_enroll_enrolling_v2, container, false
- ) as RelativeLayout).also {
- enrollingView = it
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- rotation = rotationViewModel.liveData.value!!
- updateIllustrationLottie(rotation)
-
- requireActivity().bindFingerprintEnrollEnrollingUdfpsView(
- view = enrollingView!!,
- sensorProperties = enrollingViewModel.firstFingerprintSensorPropertiesInternal!!,
- rotation = rotation,
- onSkipClickListener = onSkipClickListener,
- )
-
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.triggerRetryFlow.collect { retryEnrollment() }
- }
- }
- }
-
- private fun retryEnrollment() {
- reattachUdfpsEnrollView()
-
- startEnrollment()
-
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- progressViewModel.helpMessageLiveData.value.let {
- if (it != null) {
- onEnrollmentHelp(it)
- } else {
- updateTitleAndDescription()
- }
- }
- }
-
- override fun onStart() {
- super.onStart()
- val isEnrolling = progressViewModel.isEnrolling
- val isErrorDialogShown = errorDialogViewModel.isDialogShown
- Log.d(TAG, "onStart(), isEnrolling:$isEnrolling, isErrorDialog:$isErrorDialogShown")
- if (!isErrorDialogShown) {
- startEnrollment()
- }
-
- updateProgress(false /* animate */, progressViewModel.progressLiveData.value!!)
- progressViewModel.helpMessageLiveData.value.let {
- if (it != null) {
- onEnrollmentHelp(it)
- } else {
- updateTitleAndDescription()
- }
- }
- }
-
- private fun reattachUdfpsEnrollView() {
- enrollingView!!.let {
- val newUdfpsView = LayoutInflater.from(requireActivity()).inflate(
- R.layout.udfps_enroll_enrolling_v2_udfps_view,
- null
- )
- val index = it.indexOfChild(udfpsEnrollView)
- val lp = udfpsEnrollView.layoutParams
-
- it.removeView(udfpsEnrollView)
- it.addView(newUdfpsView, index, lp)
- udfpsEnrollView.setSensorProperties(
- enrollingViewModel.firstFingerprintSensorPropertiesInternal
- )
- }
-
- // Clear lottie status
- haveShownTipLottie = false
- haveShownLeftEdgeLottie = false
- haveShownRightEdgeLottie = false
- haveShownCenterLottie = false
- haveShownGuideLottie = false
- illustrationLottie?.let {
- it.contentDescription = ""
- it.visibility = View.GONE
- }
- }
-
- override fun onResume() {
- super.onResume()
- rotationViewModel.liveData.observe(this, rotationObserver)
- }
-
- override fun onPause() {
- rotationViewModel.liveData.removeObserver(rotationObserver)
- super.onPause()
- }
-
- override fun onStop() {
- removeEnrollmentObservers()
- val isEnrolling = progressViewModel.isEnrolling
- val isConfigChange = requireActivity().isChangingConfigurations
- Log.d(TAG, "onStop(), enrolling:$isEnrolling isConfigChange:$isConfigChange")
- if (isEnrolling && !isConfigChange) {
- cancelEnrollment(false)
- }
- super.onStop()
- }
-
- private fun removeEnrollmentObservers() {
- progressViewModel.errorMessageLiveData.removeObserver(errorMessageObserver)
- progressViewModel.progressLiveData.removeObserver(progressObserver)
- progressViewModel.helpMessageLiveData.removeObserver(helpMessageObserver)
- progressViewModel.acquireLiveData.removeObserver(acquireObserver)
- progressViewModel.pointerDownLiveData.removeObserver(pointerDownObserver)
- progressViewModel.pointerUpLiveData.removeObserver(pointerUpObserver)
- }
-
- private fun cancelEnrollment(waitForLastCancelErrMsg: Boolean) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "cancelEnrollment(), failed because isEnrolling is false")
- return
- }
- removeEnrollmentObservers()
- if (waitForLastCancelErrMsg) {
- progressViewModel.canceledSignalLiveData.observe(this, canceledSignalObserver)
- } else {
- enrollingCancelSignal = null
- }
- val cancelResult: Boolean = progressViewModel.cancelEnrollment()
- if (!cancelResult) {
- Log.e(TAG, "cancelEnrollment(), failed to cancel enrollment")
- }
- }
-
- private fun startEnrollment() {
- enrollingCancelSignal = progressViewModel.startEnrollment(ENROLL_ENROLL)
- if (enrollingCancelSignal == null) {
- Log.e(TAG, "startEnrollment(), failed")
- } else {
- Log.d(TAG, "startEnrollment(), success")
- }
- progressViewModel.progressLiveData.observe(this, progressObserver)
- progressViewModel.helpMessageLiveData.observe(this, helpMessageObserver)
- progressViewModel.errorMessageLiveData.observe(this, errorMessageObserver)
- progressViewModel.acquireLiveData.observe(this, acquireObserver)
- progressViewModel.pointerDownLiveData.observe(this, pointerDownObserver)
- progressViewModel.pointerUpLiveData.observe(this, pointerUpObserver)
- }
-
- private fun updateProgress(animate: Boolean, enrollmentProgress: EnrollmentProgress) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "Enrollment not started yet")
- return
- }
-
- val progress = getProgress(enrollmentProgress)
- Log.d(TAG, "updateProgress($animate, $enrollmentProgress), progress:$progress")
-
- if (enrollmentProgress.steps != -1) {
- udfpsEnrollView.onEnrollmentProgress(
- enrollmentProgress.remaining,
- enrollmentProgress.steps
- )
- }
-
- if (progress >= PROGRESS_BAR_MAX) {
- if (animate) {
- // Wait animations to finish, then proceed to next page
- activity!!.mainThreadHandler.postDelayed(delayedFinishRunnable, 400L)
- } else {
- delayedFinishRunnable.run()
- }
- }
- }
-
- private fun getProgress(progress: EnrollmentProgress): Int {
- if (progress.steps == -1) {
- return 0
- }
- val displayProgress = 0.coerceAtLeast(progress.steps + 1 - progress.remaining)
- return PROGRESS_BAR_MAX * displayProgress / (progress.steps + 1)
- }
-
- private fun updateTitleAndDescription() {
- Log.d(TAG, "updateTitleAndDescription($currentStage)")
- when (currentStage) {
- STAGE_CENTER -> {
- titleText.setText(R.string.security_settings_fingerprint_enroll_repeat_title)
- if (isAccessibilityEnabled || illustrationLottie == null) {
- subTitleText.setText(R.string.security_settings_udfps_enroll_start_message)
- } else if (!haveShownCenterLottie) {
- haveShownCenterLottie = true
- // Note: Update string reference when differentiate in between udfps & sfps
- illustrationLottie!!.contentDescription = getString(R.string.security_settings_sfps_enroll_finger_center_title)
- configureEnrollmentStage(R.raw.udfps_center_hint_lottie)
- }
- }
-
- STAGE_GUIDED -> {
- titleText.setText(R.string.security_settings_fingerprint_enroll_repeat_title)
- if (isAccessibilityEnabled || illustrationLottie == null) {
- subTitleText.setText(
- R.string.security_settings_udfps_enroll_repeat_a11y_message
- )
- } else if (!haveShownGuideLottie) {
- haveShownGuideLottie = true
- illustrationLottie!!.contentDescription =
- getString(R.string.security_settings_fingerprint_enroll_repeat_message)
- // TODO(b/228100413) Could customize guided lottie animation
- configureEnrollmentStage(R.raw.udfps_center_hint_lottie)
- }
- }
-
- STAGE_FINGERTIP -> {
- titleText.setText(R.string.security_settings_udfps_enroll_fingertip_title)
- if (!haveShownTipLottie && illustrationLottie != null) {
- haveShownTipLottie = true
- illustrationLottie!!.contentDescription =
- getString(R.string.security_settings_udfps_tip_fingerprint_help)
- configureEnrollmentStage(R.raw.udfps_tip_hint_lottie)
- }
- }
-
- STAGE_LEFT_EDGE -> {
- titleText.setText(R.string.security_settings_udfps_enroll_left_edge_title)
- if (!haveShownLeftEdgeLottie && illustrationLottie != null) {
- haveShownLeftEdgeLottie = true
- illustrationLottie!!.contentDescription =
- getString(R.string.security_settings_udfps_side_fingerprint_help)
- configureEnrollmentStage(R.raw.udfps_left_edge_hint_lottie)
- } else if (illustrationLottie == null) {
- if (isStageHalfCompleted) {
- subTitleText.setText(
- R.string.security_settings_fingerprint_enroll_repeat_message
- )
- } else {
- subTitleText.setText(R.string.security_settings_udfps_enroll_edge_message)
- }
- }
- }
-
- STAGE_RIGHT_EDGE -> {
- titleText.setText(R.string.security_settings_udfps_enroll_right_edge_title)
- if (!haveShownRightEdgeLottie && illustrationLottie != null) {
- haveShownRightEdgeLottie = true
- illustrationLottie!!.contentDescription =
- getString(R.string.security_settings_udfps_side_fingerprint_help)
- configureEnrollmentStage(R.raw.udfps_right_edge_hint_lottie)
- } else if (illustrationLottie == null) {
- if (isStageHalfCompleted) {
- subTitleText.setText(
- R.string.security_settings_fingerprint_enroll_repeat_message
- )
- } else {
- subTitleText.setText(R.string.security_settings_udfps_enroll_edge_message)
- }
- }
- }
-
- STAGE_UNKNOWN -> {
- titleText.setText(R.string.security_settings_fingerprint_enroll_udfps_title)
- subTitleText.setText(R.string.security_settings_udfps_enroll_start_message)
- val description: CharSequence = getString(
- R.string.security_settings_udfps_enroll_a11y
- )
- requireActivity().title = description
- }
-
- else -> {
- titleText.setText(R.string.security_settings_fingerprint_enroll_udfps_title)
- subTitleText.setText(R.string.security_settings_udfps_enroll_start_message)
- val description: CharSequence = getString(
- R.string.security_settings_udfps_enroll_a11y
- )
- requireActivity().title = description
- }
- }
- }
-
- private fun updateIllustrationLottie(@Surface.Rotation rotation: Int) {
- if (rotation == ROTATION_90 || rotation == ROTATION_270) {
- illustrationLottie = null
- } else if (shouldShowLottie) {
- illustrationLottie =
- enrollingView!!.findViewById(R.id.illustration_lottie)
- }
- }
-
- private val currentStage: Int
- get() {
- val progress = progressViewModel.progressLiveData.value!!
- if (progress.steps == -1) {
- return STAGE_UNKNOWN
- }
- val progressSteps: Int = progress.steps - progress.remaining
- return if (progressSteps < getStageThresholdSteps(0)) {
- STAGE_CENTER
- } else if (progressSteps < getStageThresholdSteps(1)) {
- STAGE_GUIDED
- } else if (progressSteps < getStageThresholdSteps(2)) {
- STAGE_FINGERTIP
- } else if (progressSteps < getStageThresholdSteps(3)) {
- STAGE_LEFT_EDGE
- } else {
- STAGE_RIGHT_EDGE
- }
- }
-
- private val isStageHalfCompleted: Boolean
- get() {
- val progress: EnrollmentProgress = progressViewModel.progressLiveData.value!!
- if (progress.steps == -1) {
- return false
- }
- val progressSteps: Int = progress.steps - progress.remaining
- var prevThresholdSteps = 0
- for (i in 0 until enrollingViewModel.getEnrollStageCount()) {
- val thresholdSteps = getStageThresholdSteps(i)
- if (progressSteps in prevThresholdSteps until thresholdSteps) {
- val adjustedProgress = progressSteps - prevThresholdSteps
- val adjustedThreshold = thresholdSteps - prevThresholdSteps
- return adjustedProgress >= adjustedThreshold / 2
- }
- prevThresholdSteps = thresholdSteps
- }
-
- // After last enrollment step.
- return true
- }
-
- private fun getStageThresholdSteps(index: Int): Int {
- val progress: EnrollmentProgress = progressViewModel.progressLiveData.value!!
- if (progress.steps == -1) {
- Log.w(TAG, "getStageThresholdSteps: Enrollment not started yet")
- return 1
- }
- return (progress.steps * enrollingViewModel.getEnrollStageThreshold(index)).roundToInt()
- }
-
- private fun configureEnrollmentStage(@RawRes lottie: Int) {
- subTitleText.text = ""
- LottieCompositionFactory.fromRawRes(activity, lottie)
- .addListener { c: LottieComposition ->
- illustrationLottie?.let {
- it.setComposition(c)
- it.visibility = View.VISIBLE
- it.playAnimation()
- }
- }
- }
-
- private fun onEnrollmentProgressChange(progress: EnrollmentProgress) {
- updateProgress(true /* animate */, progress)
- updateTitleAndDescription()
- if (isAccessibilityEnabled) {
- val steps: Int = progress.steps
- val remaining: Int = progress.remaining
- val percent = ((steps - remaining).toFloat() / steps.toFloat() * 100).toInt()
- val announcement: CharSequence = activity!!.getString(
- R.string.security_settings_udfps_enroll_progress_a11y_message, percent
- )
- enrollingViewModel.sendAccessibilityEvent(announcement)
- }
- }
-
- private fun onEnrollmentHelp(helpMessage: EnrollmentStatusMessage) {
- Log.d(TAG, "onEnrollmentHelp($helpMessage)")
- val helpStr: CharSequence = helpMessage.str
- if (helpStr.isNotEmpty()) {
- showError(helpStr)
- udfpsEnrollView.onEnrollmentHelp()
- }
- }
-
- private fun onEnrollmentError(errorMessage: EnrollmentStatusMessage) {
- cancelEnrollment(true)
- lifecycleScope.launch {
- Log.d(TAG, "newDialog $errorMessage")
- errorDialogViewModel.newDialog(errorMessage.msgId)
- }
- }
-
- private fun onEnrollmentCanceled(canceledSignal: Any) {
- Log.d(
- TAG,
- "onEnrollmentCanceled enrolling:$enrollingCancelSignal, canceled:$canceledSignal"
- )
- if (enrollingCancelSignal === canceledSignal) {
- progressViewModel.canceledSignalLiveData.removeObserver(canceledSignalObserver)
- progressViewModel.clearProgressLiveData()
- if (enrollingViewModel.onBackPressed) {
- enrollingViewModel.onCancelledDueToOnBackPressed()
- } else if (enrollingViewModel.onSkipPressed) {
- enrollingViewModel.onCancelledDueToOnSkipPressed()
- }
- }
- }
-
- private fun onAcquired(isAcquiredGood: Boolean) {
- udfpsEnrollView.onAcquired(isAcquiredGood)
- }
-
- private fun onPointerDown(sensorId: Int) {
- udfpsEnrollView.onPointerDown(sensorId)
- }
-
- private fun onPointerUp(sensorId: Int) {
- udfpsEnrollView.onPointerUp(sensorId)
- }
-
- private fun showError(error: CharSequence) {
- titleText.text = error
- titleText.contentDescription = error
- subTitleText.contentDescription = ""
- }
-
- private fun onRotationChanged(newRotation: Int) {
- if ((newRotation + 2) % 4 == rotation) {
- rotation = newRotation
- requireContext().configLayout(newRotation, titleText, subTitleText, icon, skipBtn)
- }
- }
-
- companion object {
- private val TAG = "FingerprintEnrollEnrollingUdfpsFragment"
- private const val PROGRESS_BAR_MAX = 10000
- private const val STAGE_UNKNOWN = -1
- private const val STAGE_CENTER = 0
- private const val STAGE_GUIDED = 1
- private const val STAGE_FINGERTIP = 2
- private const val STAGE_LEFT_EDGE = 3
- private const val STAGE_RIGHT_EDGE = 4
- }
-}
-
-
-fun FragmentActivity.bindFingerprintEnrollEnrollingUdfpsView(
- view: RelativeLayout,
- sensorProperties: FingerprintSensorPropertiesInternal,
- @Surface.Rotation rotation: Int,
- onSkipClickListener: View.OnClickListener
-) {
- view.findViewById<UdfpsEnrollView>(R.id.udfps_animation_view)!!.setSensorProperties(
- sensorProperties
- )
-
- val titleText = view.findViewById<TextView>(R.id.suc_layout_title)!!
- val subTitleText = view.findViewById<TextView>(R.id.sud_layout_subtitle)!!
- val icon = view.findViewById<ImageView>(R.id.sud_layout_icon)!!
- val skipBtn = view.findViewById<Button>(R.id.skip_btn)!!.also {
- it.setOnClickListener(onSkipClickListener)
- }
- configLayout(rotation, titleText, subTitleText, icon, skipBtn)
-}
-
-private fun Context.configLayout(
- @Surface.Rotation newRotation: Int,
- titleText: TextView,
- subTitleText: TextView,
- icon: ImageView,
- skipBtn: Button
-) {
- if (newRotation == ROTATION_270) {
- val iconLP = RelativeLayout.LayoutParams(-2, -2)
- iconLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- iconLP.addRule(RelativeLayout.END_OF, R.id.udfps_animation_view)
- iconLP.topMargin = convertDpToPixel(76.64f)
- iconLP.leftMargin = convertDpToPixel(151.54f)
- icon.layoutParams = iconLP
- val titleLP = RelativeLayout.LayoutParams(-1, -2)
- titleLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- titleLP.addRule(RelativeLayout.END_OF, R.id.udfps_animation_view)
- titleLP.topMargin = convertDpToPixel(138f)
- titleLP.leftMargin = convertDpToPixel(144f)
- titleText.layoutParams = titleLP
- val subtitleLP = RelativeLayout.LayoutParams(-1, -2)
- subtitleLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- subtitleLP.addRule(RelativeLayout.END_OF, R.id.udfps_animation_view)
- subtitleLP.topMargin = convertDpToPixel(198f)
- subtitleLP.leftMargin = convertDpToPixel(144f)
- subTitleText.layoutParams = subtitleLP
- } else if (newRotation == ROTATION_90) {
- val metrics = resources.displayMetrics
- val iconLP = RelativeLayout.LayoutParams(-2, -2)
- iconLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- iconLP.addRule(RelativeLayout.ALIGN_PARENT_START)
- iconLP.topMargin = convertDpToPixel(76.64f)
- iconLP.leftMargin = convertDpToPixel(71.99f)
- icon.layoutParams = iconLP
- val titleLP = RelativeLayout.LayoutParams(
- metrics.widthPixels / 2, -2
- )
- titleLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- titleLP.addRule(RelativeLayout.ALIGN_PARENT_START, R.id.udfps_animation_view)
- titleLP.topMargin = convertDpToPixel(138f)
- titleLP.leftMargin = convertDpToPixel(66f)
- titleText.layoutParams = titleLP
- val subtitleLP = RelativeLayout.LayoutParams(
- metrics.widthPixels / 2, -2
- )
- subtitleLP.addRule(RelativeLayout.ALIGN_PARENT_TOP)
- subtitleLP.addRule(RelativeLayout.ALIGN_PARENT_START)
- subtitleLP.topMargin = convertDpToPixel(198f)
- subtitleLP.leftMargin = convertDpToPixel(66f)
- subTitleText.layoutParams = subtitleLP
- }
- if (newRotation == ROTATION_90 || newRotation == ROTATION_270) {
- val skipBtnLP = skipBtn.layoutParams as RelativeLayout.LayoutParams
- skipBtnLP.topMargin = convertDpToPixel(26f)
- skipBtnLP.leftMargin = convertDpToPixel(54f)
- skipBtn.requestLayout()
- }
-}
-
-fun Context.convertDpToPixel(dp: Float): Int {
- return (dp * resources.displayMetrics.density).toInt()
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt
deleted file mode 100644
index 882cbcf..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollErrorDialog.kt
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 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.biometrics2.ui.view
-
-import android.app.Dialog
-import android.content.Context
-import android.content.DialogInterface
-import android.hardware.biometrics.BiometricConstants
-import android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_UNABLE_TO_PROCESS
-import android.hardware.fingerprint.FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE
-import android.os.Bundle
-import android.util.Log
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import com.android.settings.R
-import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getErrorMessage
-import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getErrorTitle
-import com.android.settings.biometrics.fingerprint.FingerprintErrorDialog.getSetupErrorMessage
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintErrorDialogSetResultAction.FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintErrorDialogSetResultAction.FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_TIMEOUT
-import kotlinx.coroutines.launch
-
-/**
- * Fingerprint error dialog, will be shown when an error occurs during fingerprint enrollment.
- */
-class FingerprintEnrollErrorDialog : DialogFragment() {
-
- private val viewModel: FingerprintEnrollErrorDialogViewModel?
- get() = activity?.let {
- ViewModelProvider(it)[FingerprintEnrollErrorDialogViewModel::class.java]
- }
-
- override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
- val errorMsgId: Int = requireArguments().getInt(KEY_ERROR_MSG_ID)
- val okButtonSetResultAction =
- if (errorMsgId == BiometricConstants.BIOMETRIC_ERROR_TIMEOUT)
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_TIMEOUT
- else
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH
- return requireActivity().bindFingerprintEnrollEnrollingErrorDialog(
- errorMsgId = errorMsgId,
- isSuw = viewModel!!.isSuw,
- tryAgainButtonClickListener = { dialog: DialogInterface?, _: Int ->
- activity?.lifecycleScope?.launch {
- Log.d(TAG, "tryAgain flow")
- viewModel?.triggerRetry()
- dialog?.dismiss()
- }
- },
- okButtonClickListener = { dialog: DialogInterface?, _: Int ->
- activity?.lifecycleScope?.launch {
- Log.d(TAG, "ok flow as $okButtonSetResultAction")
- viewModel?.setResultAndFinish(okButtonSetResultAction)
- dialog?.dismiss()
- }
- }
- )
- }
-
- companion object {
- private const val TAG = "FingerprintEnrollErrorDialog"
- private const val KEY_ERROR_MSG_ID = "error_msg_id"
-
- fun newInstance(errorMsgId: Int): FingerprintEnrollErrorDialog {
- val dialog = FingerprintEnrollErrorDialog()
- val args = Bundle()
- args.putInt(KEY_ERROR_MSG_ID, errorMsgId)
- dialog.arguments = args
- return dialog
- }
- }
-}
-
-fun Context.bindFingerprintEnrollEnrollingErrorDialog(
- errorMsgId: Int,
- isSuw: Boolean,
- tryAgainButtonClickListener: DialogInterface.OnClickListener,
- okButtonClickListener: DialogInterface.OnClickListener
-): AlertDialog = AlertDialog.Builder(this)
- .setTitle(getString(getErrorTitle(errorMsgId)))
- .setMessage(
- getString(
- if (isSuw)
- getSetupErrorMessage(errorMsgId)
- else
- getErrorMessage(errorMsgId)
- )
- )
- .setCancelable(false).apply {
- if (errorMsgId == FINGERPRINT_ERROR_UNABLE_TO_PROCESS) {
- setPositiveButton(
- R.string.security_settings_fingerprint_enroll_dialog_try_again,
- tryAgainButtonClickListener
- )
- setNegativeButton(
- R.string.security_settings_fingerprint_enroll_dialog_ok,
- okButtonClickListener
- )
- } else {
- setPositiveButton(
- R.string.security_settings_fingerprint_enroll_dialog_ok,
- okButtonClickListener
- )
- }
- }
- .create()
- .apply { setCanceledOnTouchOutside(false) }
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
deleted file mode 100644
index be24fc6..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindRfpsFragment.kt
+++ /dev/null
@@ -1,295 +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.biometrics2.ui.view
-
-import android.content.Context
-import android.hardware.fingerprint.FingerprintManager.ENROLL_FIND_SENSOR
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.Surface
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
-import com.android.settings.biometrics.fingerprint.FingerprintFindSensorAnimation
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
-import com.android.settings.biometrics2.ui.viewmodel.DeviceRotationViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-import kotlinx.coroutines.launch
-
-/**
- * Fragment explaining the side fingerprint sensor location for fingerprint enrollment.
- * It interacts with ProgressViewModel, and FingerprintFindSensorAnimation.
- * <pre>
- * | Has | UDFPS | SFPS | Other (Rear FPS) |
- * |---------------------|-------|------|------------------|
- * | Primary button | Yes | No | No |
- * | Illustration Lottie | Yes | Yes | No |
- * | Animation | No | No | Depend on layout |
- * | Progress ViewModel | No | Yes | Yes |
- * | Orientation detect | No | Yes | No |
- * | Foldable detect | No | Yes | No |
- * </pre>
- */
-class FingerprintEnrollFindRfpsFragment : Fragment() {
-
- private var _viewModel: FingerprintEnrollFindSensorViewModel? = null
- private val viewModel: FingerprintEnrollFindSensorViewModel
- get() = _viewModel!!
-
- private var _progressViewModel: FingerprintEnrollProgressViewModel? = null
- private val progressViewModel: FingerprintEnrollProgressViewModel
- get() = _progressViewModel!!
-
- private var _rotationViewModel: DeviceRotationViewModel? = null
- private val rotationViewModel: DeviceRotationViewModel
- get() = _rotationViewModel!!
-
- private var _errorDialogViewModel: FingerprintEnrollErrorDialogViewModel? = null
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel
- get() = _errorDialogViewModel!!
-
- private var findRfpsView: GlifLayout? = null
-
- private val onSkipClickListener =
- View.OnClickListener { _: View? -> viewModel.onSkipButtonClick() }
-
- private var animation: FingerprintFindSensorAnimation? = null
-
- private var enrollingCancelSignal: Any? = null
-
- @Surface.Rotation
- private var lastRotation = -1
-
- private val progressObserver = Observer { progress: EnrollmentProgress? ->
- if (progress != null && !progress.isInitialStep) {
- cancelEnrollment(true)
- }
- }
-
- private val errorMessageObserver = Observer { errorMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "errorMessageObserver($errorMessage)")
- errorMessage?.let { onEnrollmentError(it) }
- }
-
- private val canceledSignalObserver = Observer { canceledSignal: Any? ->
- canceledSignal?.let { onEnrollmentCanceled(it) }
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View {
- findRfpsView = inflater.inflate(
- R.layout.fingerprint_enroll_find_sensor,
- container,
- false
- ) as GlifLayout
-
- val animationView = findRfpsView!!.findViewById<View>(
- R.id.fingerprint_sensor_location_animation
- )
- if (animationView is FingerprintFindSensorAnimation) {
- animation = animationView
- }
-
- return findRfpsView!!
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- requireActivity().bindFingerprintEnrollFindRfpsView(
- view = findRfpsView!!,
- onSkipClickListener = onSkipClickListener
- )
-
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.triggerRetryFlow.collect { retryLookingForFingerprint() }
- }
- }
- }
-
- private fun retryLookingForFingerprint() {
- startEnrollment()
- animation?.let {
- Log.d(TAG, "retry, start animation")
- it.startAnimation()
- }
- }
-
- override fun onStart() {
- super.onStart()
- val isErrorDialogShown = errorDialogViewModel.isDialogShown
- Log.d(TAG, "onStart(), isEnrolling:${progressViewModel.isEnrolling}"
- + ", isErrorDialog:$isErrorDialogShown")
- if (!isErrorDialogShown) {
- startEnrollment()
- }
- }
-
- override fun onResume() {
- val rotationLiveData: LiveData<Int> = rotationViewModel.liveData
- lastRotation = rotationLiveData.value!!
- if (!errorDialogViewModel.isDialogShown) {
- animation?.let {
- Log.d(TAG, "onResume(), start animation")
- it.startAnimation()
- }
- }
- super.onResume()
- }
-
- override fun onPause() {
- animation?.let {
- if (DEBUG) {
- Log.d(TAG, "onPause(), pause animation")
- }
- it.pauseAnimation()
- }
- super.onPause()
- }
-
- override fun onStop() {
- super.onStop()
- removeEnrollmentObservers()
- val isEnrolling = progressViewModel.isEnrolling
- val isConfigChange = requireActivity().isChangingConfigurations
- Log.d(TAG, "onStop(), enrolling:$isEnrolling isConfigChange:$isConfigChange")
- if (isEnrolling && !isConfigChange) {
- cancelEnrollment(false)
- }
- }
-
- private fun removeEnrollmentObservers() {
- progressViewModel.progressLiveData.removeObserver(progressObserver)
- progressViewModel.helpMessageLiveData.removeObserver(errorMessageObserver)
- }
-
- private fun startEnrollment() {
- enrollingCancelSignal = progressViewModel.startEnrollment(ENROLL_FIND_SENSOR)
- if (enrollingCancelSignal == null) {
- Log.e(TAG, "startEnrollment(), failed to start enrollment")
- } else {
- Log.d(TAG, "startEnrollment(), success")
- }
- progressViewModel.progressLiveData.observe(this, progressObserver)
- progressViewModel.errorMessageLiveData.observe(this, errorMessageObserver)
- }
-
- private fun cancelEnrollment(waitForLastCancelErrMsg: Boolean) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "cancelEnrollment(), failed because isEnrolling is false")
- return
- }
- removeEnrollmentObservers()
- if (waitForLastCancelErrMsg) {
- progressViewModel.canceledSignalLiveData.observe(this, canceledSignalObserver)
- } else {
- enrollingCancelSignal = null
- }
- val cancelResult: Boolean = progressViewModel.cancelEnrollment()
- if (!cancelResult) {
- Log.e(TAG, "cancelEnrollment(), failed to cancel enrollment")
- }
- }
-
- private fun onEnrollmentError(errorMessage: EnrollmentStatusMessage) {
- cancelEnrollment(false)
- lifecycleScope.launch {
- Log.d(TAG, "newDialogFlow as $errorMessage")
- errorDialogViewModel.newDialog(errorMessage.msgId)
- }
- }
-
- private fun onEnrollmentCanceled(canceledSignal: Any) {
- Log.d(
- TAG,
- "onEnrollmentCanceled enrolling:$enrollingCancelSignal, canceled:$canceledSignal"
- )
- if (enrollingCancelSignal === canceledSignal) {
- val progress: EnrollmentProgress? = progressViewModel.progressLiveData.value
- progressViewModel.canceledSignalLiveData.removeObserver(canceledSignalObserver)
- progressViewModel.clearProgressLiveData()
- if (progress != null && !progress.isInitialStep) {
- viewModel.onStartButtonClick()
- }
- }
- }
-
- override fun onDestroy() {
- animation?.let {
- if (DEBUG) {
- Log.d(TAG, "onDestroy(), stop animation")
- }
- it.stopAnimation()
- }
- super.onDestroy()
- }
-
- override fun onAttach(context: Context) {
- ViewModelProvider(requireActivity()).let { provider ->
- _viewModel = provider[FingerprintEnrollFindSensorViewModel::class.java]
- _progressViewModel = provider[FingerprintEnrollProgressViewModel::class.java]
- _rotationViewModel = provider[DeviceRotationViewModel::class.java]
- _errorDialogViewModel = provider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
- super.onAttach(context)
- }
-
- companion object {
- private const val DEBUG = false
- private const val TAG = "FingerprintEnrollFindRfpsFragment"
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollFindRfpsView(
- view: GlifLayout,
- onSkipClickListener: View.OnClickListener,
-) {
- GlifLayoutHelper(this, view).let {
- it.setHeaderText(
- R.string.security_settings_fingerprint_enroll_find_sensor_title
- )
- it.setDescriptionText(
- getText(R.string.security_settings_fingerprint_enroll_find_sensor_message)
- )
- }
-
- view.getMixin(FooterBarMixin::class.java).secondaryButton =
- FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
- .also {
- it.setOnClickListener(onSkipClickListener)
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
deleted file mode 100644
index 7455be1..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindSfpsFragment.kt
+++ /dev/null
@@ -1,319 +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.biometrics2.ui.view
-
-import android.content.Context
-import android.hardware.fingerprint.FingerprintManager.ENROLL_FIND_SENSOR
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.Surface
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.RawRes
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage
-import com.android.settings.biometrics2.ui.viewmodel.DeviceFoldedViewModel
-import com.android.settings.biometrics2.ui.viewmodel.DeviceRotationViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.android.settingslib.widget.LottieColorUtils
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-import kotlinx.coroutines.launch
-
-/**
- * Fragment explaining the side fingerprint sensor location for fingerprint enrollment.
- * It interacts with ProgressViewModel, FoldCallback (for different lottie), and
- * LottieAnimationView.
- * <pre>
- * | Has | UDFPS | SFPS | Other (Rear FPS) |
- * |---------------------|-------|------|------------------|
- * | Primary button | Yes | No | No |
- * | Illustration Lottie | Yes | Yes | No |
- * | Animation | No | No | Depend on layout |
- * | Progress ViewModel | No | Yes | Yes |
- * | Orientation detect | No | Yes | No |
- * | Foldable detect | No | Yes | No |
- * </pre>
- */
-class FingerprintEnrollFindSfpsFragment : Fragment() {
-
- private var _viewModel: FingerprintEnrollFindSensorViewModel? = null
- private val viewModel: FingerprintEnrollFindSensorViewModel
- get() = _viewModel!!
-
- private var _progressViewModel: FingerprintEnrollProgressViewModel? = null
- private val progressViewModel: FingerprintEnrollProgressViewModel
- get() = _progressViewModel!!
-
- private var _rotationViewModel: DeviceRotationViewModel? = null
- private val rotationViewModel: DeviceRotationViewModel
- get() = _rotationViewModel!!
-
- private var _foldedViewModel: DeviceFoldedViewModel? = null
- private val foldedViewModel: DeviceFoldedViewModel
- get() = _foldedViewModel!!
-
- private var _errorDialogViewModel: FingerprintEnrollErrorDialogViewModel? = null
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel
- get() = _errorDialogViewModel!!
-
- private var findSfpsView: GlifLayout? = null
-
- private val onSkipClickListener =
- View.OnClickListener { _: View? -> viewModel.onSkipButtonClick() }
-
- private val illustrationLottie: LottieAnimationView
- get() = findSfpsView!!.findViewById(R.id.illustration_lottie)!!
-
- private var enrollingCancelSignal: Any? = null
-
- @Surface.Rotation
- private var animationRotation = -1
-
- private val rotationObserver = Observer { rotation: Int? ->
- rotation?.let { onRotationChanged(it) }
- }
-
- private val progressObserver = Observer { progress: EnrollmentProgress? ->
- if (progress != null && !progress.isInitialStep) {
- cancelEnrollment(true)
- }
- }
-
- private val errorMessageObserver = Observer{ errorMessage: EnrollmentStatusMessage? ->
- Log.d(TAG, "errorMessageObserver($errorMessage)")
- errorMessage?.let { onEnrollmentError(it) }
- }
-
- private val canceledSignalObserver = Observer { canceledSignal: Any? ->
- canceledSignal?.let { onEnrollmentCanceled(it) }
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View = (inflater.inflate(
- R.layout.sfps_enroll_find_sensor_layout,
- container,
- false
- ) as GlifLayout).also {
- findSfpsView = it
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- requireActivity().bindFingerprintEnrollFindSfpsView(
- view = findSfpsView!!,
- onSkipClickListener = onSkipClickListener
- )
-
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.triggerRetryFlow.collect { startEnrollment() }
- }
- }
- }
-
- override fun onStart() {
- super.onStart()
- val isErrorDialogShown = errorDialogViewModel.isDialogShown
- Log.d(TAG, "onStart(), isEnrolling:${progressViewModel.isEnrolling}"
- + ", isErrorDialog:$isErrorDialogShown")
- if (!isErrorDialogShown) {
- startEnrollment()
- }
- }
-
- override fun onResume() {
- super.onResume()
- val rotationLiveData: LiveData<Int> = rotationViewModel.liveData
- playLottieAnimation(rotationLiveData.value!!)
- rotationLiveData.observe(this, rotationObserver)
- }
-
- override fun onPause() {
- rotationViewModel.liveData.removeObserver(rotationObserver)
- super.onPause()
- }
-
- override fun onStop() {
- super.onStop()
- val isEnrolling = progressViewModel.isEnrolling
- val isConfigChange = requireActivity().isChangingConfigurations
- Log.d(TAG, "onStop(), enrolling:$isEnrolling isConfigChange:$isConfigChange")
- if (isEnrolling && !isConfigChange) {
- cancelEnrollment(false)
- }
- }
-
- private fun removeEnrollmentObservers() {
- progressViewModel.errorMessageLiveData.removeObserver(errorMessageObserver)
- progressViewModel.progressLiveData.removeObserver(progressObserver)
- }
-
- private fun startEnrollment() {
- enrollingCancelSignal = progressViewModel.startEnrollment(ENROLL_FIND_SENSOR)
- if (enrollingCancelSignal == null) {
- Log.e(TAG, "startEnrollment(), failed to start enrollment")
- } else {
- Log.d(TAG, "startEnrollment(), success")
- }
- progressViewModel.progressLiveData.observe(this, progressObserver)
- progressViewModel.errorMessageLiveData.observe(this, errorMessageObserver)
- }
-
- private fun cancelEnrollment(waitForLastCancelErrMsg: Boolean) {
- if (!progressViewModel.isEnrolling) {
- Log.d(TAG, "cancelEnrollment(), failed because isEnrolling is false")
- return
- }
- removeEnrollmentObservers()
- if (waitForLastCancelErrMsg) {
- progressViewModel.canceledSignalLiveData.observe(this, canceledSignalObserver)
- } else {
- enrollingCancelSignal = null
- }
- val cancelResult: Boolean = progressViewModel.cancelEnrollment()
- if (!cancelResult) {
- Log.e(TAG, "cancelEnrollment(), failed to cancel enrollment")
- }
- }
-
- private fun onRotationChanged(@Surface.Rotation newRotation: Int) {
- if (DEBUG) {
- Log.d(TAG, "onRotationChanged() from $animationRotation to $newRotation")
- }
- if ((newRotation + 2) % 4 == animationRotation) {
- // Fragment not changed, we just need to play correct rotation animation
- playLottieAnimation(newRotation)
- }
- }
-
- private fun onEnrollmentError(errorMessage: EnrollmentStatusMessage) {
- progressViewModel.cancelEnrollment()
- lifecycleScope.launch {
- Log.d(TAG, "newDialogFlow as $errorMessage")
- errorDialogViewModel.newDialog(errorMessage.msgId)
- }
- }
-
- private fun onEnrollmentCanceled(canceledSignal: Any) {
- Log.d(
- TAG,
- "onEnrollmentCanceled enrolling:$enrollingCancelSignal, canceled:$canceledSignal"
- )
- if (enrollingCancelSignal === canceledSignal) {
- val progress: EnrollmentProgress? = progressViewModel.progressLiveData.value
- progressViewModel.canceledSignalLiveData.removeObserver(canceledSignalObserver)
- progressViewModel.clearProgressLiveData()
- if (progress != null && !progress.isInitialStep) {
- viewModel.onStartButtonClick()
- }
- }
- }
-
- private fun playLottieAnimation(@Surface.Rotation rotation: Int) {
- @RawRes val animationRawRes = getSfpsLottieAnimationRawRes(rotation)
- Log.d(
- TAG,
- "play lottie animation $animationRawRes, previous rotation:$animationRotation"
- + ", new rotation:" + rotation
- )
- animationRotation = rotation
- illustrationLottie.setAnimation(animationRawRes)
- LottieColorUtils.applyDynamicColors(activity, illustrationLottie)
- illustrationLottie.visibility = View.VISIBLE
- illustrationLottie.playAnimation()
- }
-
- @RawRes
- private fun getSfpsLottieAnimationRawRes(@Surface.Rotation rotation: Int): Int {
- val isFolded = java.lang.Boolean.FALSE != foldedViewModel.liveData.value
- return when (rotation) {
- Surface.ROTATION_90 ->
- if (isFolded)
- R.raw.fingerprint_edu_lottie_folded_top_left
- else
- R.raw.fingerprint_edu_lottie_portrait_top_left
- Surface.ROTATION_180 ->
- if (isFolded)
- R.raw.fingerprint_edu_lottie_folded_bottom_left
- else
- R.raw.fingerprint_edu_lottie_landscape_bottom_left
- Surface.ROTATION_270 ->
- if (isFolded)
- R.raw.fingerprint_edu_lottie_folded_bottom_right
- else
- R.raw.fingerprint_edu_lottie_portrait_bottom_right
- else ->
- if (isFolded)
- R.raw.fingerprint_edu_lottie_folded_top_right
- else
- R.raw.fingerprint_edu_lottie_landscape_top_right
- }
- }
-
- override fun onAttach(context: Context) {
- ViewModelProvider(requireActivity()).let { provider ->
- _viewModel = provider[FingerprintEnrollFindSensorViewModel::class.java]
- _progressViewModel = provider[FingerprintEnrollProgressViewModel::class.java]
- _rotationViewModel = provider[DeviceRotationViewModel::class.java]
- _foldedViewModel = provider[DeviceFoldedViewModel::class.java]
- _errorDialogViewModel = provider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
- super.onAttach(context)
- }
-
- companion object {
- private const val DEBUG = false
- private const val TAG = "FingerprintEnrollFindSfpsFragment"
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollFindSfpsView(
- view: GlifLayout,
- onSkipClickListener: View.OnClickListener
-) {
- view.getMixin(FooterBarMixin::class.java).let {
- it.secondaryButton = FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
- it.secondaryButton.setOnClickListener(onSkipClickListener)
- }
-
- GlifLayoutHelper(this, view).let {
- it.setHeaderText(R.string.security_settings_sfps_enroll_find_sensor_title)
- it.setDescriptionText(
- getText(R.string.security_settings_sfps_enroll_find_sensor_message)
- )
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
deleted file mode 100644
index 3dce99c..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFindUdfpsFragment.kt
+++ /dev/null
@@ -1,125 +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.biometrics2.ui.view
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.ViewModelProvider
-import com.airbnb.lottie.LottieAnimationView
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-
-/**
- * Fragment explaining the under-display fingerprint sensor location for fingerprint enrollment.
- * It interacts with Primary button, and LottieAnimationView.
- * <pre>
- * | Has | UDFPS | SFPS | Other (Rear FPS) |
- * |---------------------|-------|------|------------------|
- * | Primary button | Yes | No | No |
- * | Illustration Lottie | Yes | Yes | No |
- * | Animation | No | No | Depend on layout |
- * | Progress ViewModel | No | Yes | Yes |
- * | Orientation detect | No | Yes | No |
- * | Foldable detect | No | Yes | No |
- * </pre>
- */
-class FingerprintEnrollFindUdfpsFragment : Fragment() {
-
- private var _viewModel: FingerprintEnrollFindSensorViewModel? = null
- private val mViewModel: FingerprintEnrollFindSensorViewModel
- get() = _viewModel!!
-
- private var findUdfpsView: GlifLayout? = null
-
- private val mOnSkipClickListener =
- View.OnClickListener { _: View? -> mViewModel.onSkipButtonClick() }
-
- private val mOnStartClickListener =
- View.OnClickListener { _: View? -> mViewModel.onStartButtonClick() }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View = (inflater.inflate(
- R.layout.udfps_enroll_find_sensor_layout,
- container,
- false
- ) as GlifLayout).also {
- findUdfpsView = it
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- requireActivity().bindFingerprintEnrollFindUdfpsView(
- view = findUdfpsView!!,
- isAccessibilityEnabled = mViewModel.isAccessibilityEnabled,
- onSkipClickListener = mOnSkipClickListener,
- onStartClickListener = mOnStartClickListener
- )
- }
-
- override fun onAttach(context: Context) {
- _viewModel = ViewModelProvider(requireActivity())[
- FingerprintEnrollFindSensorViewModel::class.java
- ]
- super.onAttach(context)
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollFindUdfpsView(
- view: GlifLayout,
- isAccessibilityEnabled: Boolean,
- onSkipClickListener: View.OnClickListener,
- onStartClickListener: View.OnClickListener,
-) {
- GlifLayoutHelper(this, view).let { helper ->
- helper.setHeaderText(R.string.security_settings_udfps_enroll_find_sensor_title)
- helper.setDescriptionText(
- getText(R.string.security_settings_udfps_enroll_find_sensor_message)
- )
- }
-
- view.getMixin(FooterBarMixin::class.java)!!.let {
- it.secondaryButton = FooterButton.Builder(this)
- .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
- it.secondaryButton.setOnClickListener(onSkipClickListener)
-
- it.primaryButton = FooterButton.Builder(this)
- .setText(R.string.security_settings_udfps_enroll_find_sensor_start_button)
- .setButtonType(FooterButton.ButtonType.NEXT)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
- .build()
- it.primaryButton.setOnClickListener(onStartClickListener)
- }
-
- view.findViewById<LottieAnimationView>(R.id.illustration_lottie)!!.let {
- it.setOnClickListener(onStartClickListener)
- if (isAccessibilityEnabled) {
- it.setAnimation(R.raw.udfps_edu_a11y_lottie)
- }
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
deleted file mode 100644
index 2af2dee..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollFinishFragment.kt
+++ /dev/null
@@ -1,117 +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.biometrics2.ui.view
-
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.ViewModelProvider
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-
-/**
- * Fragment which concludes fingerprint enrollment.
- */
-class FingerprintEnrollFinishFragment : Fragment() {
-
- private var _viewModel: FingerprintEnrollFinishViewModel? = null
- private val viewModel: FingerprintEnrollFinishViewModel
- get() = _viewModel!!
-
- private val addButtonClickListener =
- View.OnClickListener { _: View? -> viewModel.onAddButtonClick() }
-
- private val nextButtonClickListener =
- View.OnClickListener { _: View? -> viewModel.onNextButtonClick() }
- override fun onAttach(context: Context) {
- super.onAttach(context)
- _viewModel = ViewModelProvider(requireActivity())[
- FingerprintEnrollFinishViewModel::class.java
- ]
- }
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ) : View = (inflater.inflate(
- if (viewModel.canAssumeSfps())
- R.layout.sfps_enroll_finish
- else
- R.layout.fingerprint_enroll_finish,
- container,
- false
- ) as GlifLayout).also {
- requireActivity().bindFingerprintEnrollFinishFragment(
- view = it,
- isSuw = viewModel.request.isSuw,
- canAssumeSfps = viewModel.canAssumeSfps(),
- isAnotherFingerprintEnrollable = viewModel.isAnotherFingerprintEnrollable,
- nextButtonClickListener = nextButtonClickListener,
- addButtonClickListener = addButtonClickListener
- )
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollFinishFragment(
- view: GlifLayout,
- isSuw: Boolean,
- canAssumeSfps: Boolean,
- isAnotherFingerprintEnrollable: Boolean,
- nextButtonClickListener: View.OnClickListener,
- addButtonClickListener: View.OnClickListener
-) {
- GlifLayoutHelper(this, view).apply {
- setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title)
- setDescriptionText(
- getString(
- if (canAssumeSfps && isAnotherFingerprintEnrollable)
- R.string.security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message
- else
- R.string.security_settings_fingerprint_enroll_finish_v2_message
- )
- )
- }
-
- view.getMixin(FooterBarMixin::class.java).also { footer ->
- footer.primaryButton = FooterButton.Builder(this)
- .setText(
- if (isSuw)
- R.string.next_label
- else
- R.string.security_settings_fingerprint_enroll_done
- )
- .setListener(nextButtonClickListener)
- .setButtonType(FooterButton.ButtonType.NEXT)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
- .build()
- if (isAnotherFingerprintEnrollable) {
- footer.secondaryButton = FooterButton.Builder(this)
- .setText(R.string.fingerprint_enroll_button_add)
- .setListener(addButtonClickListener)
- .setButtonType(FooterButton.ButtonType.SKIP)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
- .build()
- }
- }
-
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
deleted file mode 100644
index d1b3799..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt
+++ /dev/null
@@ -1,329 +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.biometrics2.ui.view
-
-import android.app.admin.DevicePolicyManager
-import android.app.admin.DevicePolicyResources.Strings.Settings.FINGERPRINT_UNLOCK_DISABLED
-import android.content.Context
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.os.Bundle
-import android.text.Html
-import android.text.method.LinkMovementMethod
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.ScrollView
-import android.widget.TextView
-import androidx.annotation.StringRes
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollIntroStatus
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_OK
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_UNKNOWN
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroViewModel
-import com.google.android.setupcompat.template.FooterBarMixin
-import com.google.android.setupcompat.template.FooterButton
-import com.google.android.setupdesign.GlifLayout
-import com.google.android.setupdesign.template.RequireScrollMixin
-import com.google.android.setupdesign.util.DeviceHelper
-import com.google.android.setupdesign.util.DynamicColorPalette
-import com.google.android.setupdesign.util.DynamicColorPalette.ColorType.ACCENT
-import java.util.function.Supplier
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-
-/**
- * Fingerprint intro onboarding page fragment implementation
- */
-class FingerprintEnrollIntroFragment : Fragment() {
-
- private val viewModelProvider: ViewModelProvider
- get() = ViewModelProvider(requireActivity())
-
- private var _viewModel: FingerprintEnrollIntroViewModel? = null
- private val viewModel: FingerprintEnrollIntroViewModel
- get() = _viewModel!!
-
- private var introView: GlifLayout? = null
-
- private var primaryFooterButton: FooterButton? = null
-
- private var secondaryFooterButton: FooterButton? = null
-
- private val onNextClickListener =
- View.OnClickListener { _: View? ->
- activity?.lifecycleScope?.let {
- viewModel.onNextButtonClick(it)
- }
- }
-
- private val onSkipOrCancelClickListener =
- View.OnClickListener { _: View? ->
- activity?.lifecycleScope?.let {
- viewModel.onSkipOrCancelButtonClick(it)
- }
- }
-
- override fun onCreateView(
- inflater: LayoutInflater,
- container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View {
- introView = inflater.inflate(
- R.layout.fingerprint_enroll_introduction,
- container,
- false
- ) as GlifLayout
- return introView!!
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
- requireActivity().bindFingerprintEnrollIntroView(
- view = introView!!,
- canAssumeUdfps = viewModel.canAssumeUdfps,
- isBiometricUnlockDisabledByAdmin = viewModel.isBiometricUnlockDisabledByAdmin,
- isParentalConsentRequired = viewModel.isParentalConsentRequired,
- descriptionDisabledByAdminSupplier = { getDescriptionDisabledByAdmin(view.context) }
- )
- }
-
- override fun onStart() {
- val context: Context = requireContext()
- val footerBarMixin: FooterBarMixin = footerBarMixin
- viewModel.updateEnrollableStatus(lifecycleScope)
- initPrimaryFooterButton(context, footerBarMixin)
- initSecondaryFooterButton(context, footerBarMixin)
- collectPageStatusFlowIfNeed()
- super.onStart()
- }
-
- private fun initPrimaryFooterButton(
- context: Context,
- footerBarMixin: FooterBarMixin
- ) {
- if (footerBarMixin.primaryButton != null) {
- return
- }
- primaryFooterButton = FooterButton.Builder(context)
- .setText(R.string.security_settings_fingerprint_enroll_introduction_agree)
- .setButtonType(FooterButton.ButtonType.OPT_IN)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
- .build()
- .also {
- it.setOnClickListener(onNextClickListener)
- footerBarMixin.primaryButton = it
- }
- }
-
- private fun initSecondaryFooterButton(
- context: Context,
- footerBarMixin: FooterBarMixin
- ) {
- if (footerBarMixin.secondaryButton != null) {
- return
- }
- secondaryFooterButton = FooterButton.Builder(context)
- .setText(
- if (viewModel.request.isAfterSuwOrSuwSuggestedAction)
- R.string.security_settings_fingerprint_enroll_introduction_cancel
- else
- R.string.security_settings_fingerprint_enroll_introduction_no_thanks
- )
- .setButtonType(FooterButton.ButtonType.NEXT)
- .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
- .build()
- .also {
- it.setOnClickListener(onSkipOrCancelClickListener)
- footerBarMixin.setSecondaryButton(it, true /* usePrimaryStyle */)
- }
- }
-
- private fun collectPageStatusFlowIfNeed() {
- lifecycleScope.launch {
- val status = viewModel.pageStatusFlow.first()
- Log.d(TAG, "collectPageStatusFlowIfNeed status:$status")
- if (status.hasScrollToBottom()
- || status.enrollableStatus === FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
- ) {
- // Update once and do not requireScrollWithButton() again when page has
- // scrolled to bottom or User has enrolled at least a fingerprint, because if
- // we requireScrollWithButton() again, primary button will become "More" after
- // scrolling.
- updateFooterButtons(status)
- } else {
- introView!!.getMixin(RequireScrollMixin::class.java).let {
- it.requireScrollWithButton(
- requireActivity(),
- primaryFooterButton!!,
- moreButtonTextRes,
- onNextClickListener
- )
- it.setOnRequireScrollStateChangedListener { scrollNeeded: Boolean ->
- viewModel.setHasScrolledToBottom(!scrollNeeded, lifecycleScope)
- }
- }
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- viewModel.pageStatusFlow.collect(
- this@FingerprintEnrollIntroFragment::updateFooterButtons
- )
- }
- }
- }
- }
-
- override fun onAttach(context: Context) {
- _viewModel = viewModelProvider[FingerprintEnrollIntroViewModel::class.java]
- super.onAttach(context)
- }
-
- private val footerBarMixin: FooterBarMixin
- get() = introView!!.getMixin(FooterBarMixin::class.java)
-
- private fun getDescriptionDisabledByAdmin(context: Context): String? {
- val defaultStrId: Int =
- R.string.security_settings_fingerprint_enroll_introduction_message_unlock_disabled
- val devicePolicyManager: DevicePolicyManager =
- checkNotNull(requireActivity().getSystemService(DevicePolicyManager::class.java))
-
- return devicePolicyManager.resources.getString(FINGERPRINT_UNLOCK_DISABLED) {
- context.getString(defaultStrId)
- }
- }
-
- private fun updateFooterButtons(status: FingerprintEnrollIntroStatus) {
- if (DEBUG) {
- Log.d(TAG, "updateFooterButtons($status)")
- }
- primaryFooterButton!!.setText(
- context,
- if (status.enrollableStatus === FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX)
- R.string.done
- else if (status.hasScrollToBottom())
- R.string.security_settings_fingerprint_enroll_introduction_agree
- else
- moreButtonTextRes
- )
- secondaryFooterButton!!.visibility =
- if (status.hasScrollToBottom()
- && status.enrollableStatus !== FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
- )
- View.VISIBLE
- else
- View.INVISIBLE
-
- view!!.requireViewById<TextView>(R.id.error_text).let {
- when (status.enrollableStatus) {
- FINGERPRINT_ENROLLABLE_OK -> {
- it.text = null
- it.visibility = View.GONE
- }
-
- FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX -> {
- it.setText(R.string.fingerprint_intro_error_max)
- it.visibility = View.VISIBLE
- }
-
- FINGERPRINT_ENROLLABLE_UNKNOWN -> {}
- }
- }
- }
-
- @get:StringRes
- private val moreButtonTextRes: Int
- get() = R.string.security_settings_face_enroll_introduction_more
-
- companion object {
- private const val TAG = "FingerprintEnrollIntroFragment"
- private const val DEBUG = false
- }
-}
-
-fun FragmentActivity.bindFingerprintEnrollIntroView(
- view: GlifLayout,
- canAssumeUdfps: Boolean,
- isBiometricUnlockDisabledByAdmin: Boolean,
- isParentalConsentRequired: Boolean,
- descriptionDisabledByAdminSupplier: Supplier<String?>
-) {
- val context = view.context
-
- val iconFingerprint = view.findViewById<ImageView>(R.id.icon_fingerprint)!!
- val iconDeviceLocked = view.findViewById<ImageView>(R.id.icon_device_locked)!!
- val iconTrashCan = view.findViewById<ImageView>(R.id.icon_trash_can)!!
- val iconInfo = view.findViewById<ImageView>(R.id.icon_info)!!
- val iconShield = view.findViewById<ImageView>(R.id.icon_shield)!!
- val iconLink = view.findViewById<ImageView>(R.id.icon_link)!!
- val footerMessage6 = view.findViewById<TextView>(R.id.footer_message_6)!!
-
- PorterDuffColorFilter(
- DynamicColorPalette.getColor(context, ACCENT),
- PorterDuff.Mode.SRC_IN
- ).let { colorFilter ->
- iconFingerprint.drawable.colorFilter = colorFilter
- iconDeviceLocked.drawable.colorFilter = colorFilter
- iconTrashCan.drawable.colorFilter = colorFilter
- iconInfo.drawable.colorFilter = colorFilter
- iconShield.drawable.colorFilter = colorFilter
- iconLink.drawable.colorFilter = colorFilter
- }
-
- view.findViewById<TextView>(R.id.footer_learn_more)!!.let { learnMore ->
- learnMore.movementMethod = LinkMovementMethod.getInstance()
- val footerLinkStr: String = context.getString(
- R.string.security_settings_fingerprint_v2_enroll_introduction_message_learn_more,
- Html.FROM_HTML_MODE_LEGACY
- )
- learnMore.text = Html.fromHtml(footerLinkStr)
- }
-
- if (canAssumeUdfps) {
- footerMessage6.visibility = View.VISIBLE
- iconShield.visibility = View.VISIBLE
- } else {
- footerMessage6.visibility = View.GONE
- iconShield.visibility = View.GONE
- }
- val glifLayoutHelper = GlifLayoutHelper(this, view)
- if (isBiometricUnlockDisabledByAdmin && !isParentalConsentRequired) {
- glifLayoutHelper.setHeaderText(
- R.string.security_settings_fingerprint_enroll_introduction_title_unlock_disabled
- )
- glifLayoutHelper.setDescriptionText(descriptionDisabledByAdminSupplier.get())
- } else {
- glifLayoutHelper.setHeaderText(
- R.string.security_settings_fingerprint_enroll_introduction_title
- )
- glifLayoutHelper.setDescriptionText(
- getString(
- R.string.security_settings_fingerprint_enroll_introduction_v3_message,
- DeviceHelper.getDeviceName(context)
- )
- )
- }
-
- view.findViewById<ScrollView>(com.google.android.setupdesign.R.id.sud_scroll_view)
- ?.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
deleted file mode 100644
index ec96597..0000000
--- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollmentActivity.kt
+++ /dev/null
@@ -1,633 +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.biometrics2.ui.view
-
-import android.annotation.StyleRes
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.content.res.Configuration
-import android.content.res.Resources.Theme
-import android.graphics.Color
-import android.os.Bundle
-import android.os.SystemClock
-import android.util.Log
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.annotation.ColorInt
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.lifecycle.viewmodel.CreationExtras
-import androidx.lifecycle.viewmodel.MutableCreationExtras
-import com.android.settings.R
-import com.android.settings.Utils
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics2.factory.BiometricsViewModelFactory
-import com.android.settings.biometrics2.factory.BiometricsViewModelFactory.CHALLENGE_GENERATOR_KEY
-import com.android.settings.biometrics2.factory.BiometricsViewModelFactory.CREDENTIAL_MODEL_KEY
-import com.android.settings.biometrics2.factory.BiometricsViewModelFactory.ENROLLMENT_REQUEST_KEY
-import com.android.settings.biometrics2.ui.model.CredentialModel
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest
-import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel
-import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel.FingerprintChallengeGenerator
-import com.android.settings.biometrics2.ui.viewmodel.CredentialAction
-import com.android.settings.biometrics2.ui.viewmodel.DeviceFoldedViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_ACTION_DONE
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FingerprintEnrollEnrollingAction
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollErrorDialogViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FingerprintEnrollFindSensorAction
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel.FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel.FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel.FingerprintEnrollFinishAction
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollProgressViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollmentViewModel
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintErrorDialogSetResultAction.FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintErrorDialogSetResultAction.FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_TIMEOUT
-import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
-import com.google.android.setupdesign.util.ThemeHelper
-import kotlinx.coroutines.launch
-
-/**
- * Fingerprint enrollment activity implementation
- */
-open class FingerprintEnrollmentActivity : FragmentActivity() {
- /** SetupWizard activity*/
- class SetupActivity : FingerprintEnrollmentActivity()
-
- /** Internal activity for FingerprintSettings */
- class InternalActivity : FingerprintEnrollmentActivity()
-
- private val viewModelProvider: ViewModelProvider by lazy {
- ViewModelProvider(this)
- }
-
- private val viewModel: FingerprintEnrollmentViewModel by lazy {
- viewModelProvider[FingerprintEnrollmentViewModel::class.java]
- }
-
- private val autoCredentialViewModel: AutoCredentialViewModel by lazy {
- viewModelProvider[AutoCredentialViewModel::class.java]
- }
-
- private val introViewModel: FingerprintEnrollIntroViewModel by lazy {
- viewModelProvider[FingerprintEnrollIntroViewModel::class.java]
- }
-
- private val findSensorViewModel: FingerprintEnrollFindSensorViewModel by lazy {
- viewModelProvider[FingerprintEnrollFindSensorViewModel::class.java]
- }
-
- private val progressViewModel: FingerprintEnrollProgressViewModel by lazy {
- viewModelProvider[FingerprintEnrollProgressViewModel::class.java]
- }
-
- private val enrollingViewModel: FingerprintEnrollEnrollingViewModel by lazy {
- viewModelProvider[FingerprintEnrollEnrollingViewModel::class.java]
- }
-
- private val finishViewModel: FingerprintEnrollFinishViewModel by lazy {
- viewModelProvider[FingerprintEnrollFinishViewModel::class.java]
- }
-
- private val errorDialogViewModel: FingerprintEnrollErrorDialogViewModel by lazy {
- viewModelProvider[FingerprintEnrollErrorDialogViewModel::class.java]
- }
-
- private var isFirstFragmentAdded = false
-
- private val findSensorActionObserver = Observer<Int?> { action ->
- if (DEBUG) {
- Log.d(TAG, "findSensorActionObserver($action)")
- }
- action?.let { onFindSensorAction(it) }
- }
-
- private val enrollingActionObserver = Observer<Int?> { action ->
- if (DEBUG) {
- Log.d(TAG, "enrollingActionObserver($action)")
- }
- action?.let { onEnrollingAction(it) }
- }
-
- private val finishActionObserver = Observer<Int?> { action ->
- if (DEBUG) {
- Log.d(TAG, "finishActionObserver($action)")
- }
- action?.let { onFinishAction(it) }
- }
-
- private val chooseLockResultCallback: ActivityResultCallback<ActivityResult> =
- ActivityResultCallback { result ->
- onChooseOrConfirmLockResult(true /* isChooseLock */, result)
- }
-
- private val chooseLockLauncher: ActivityResultLauncher<Intent> =
- registerForActivityResult(StartActivityForResult(), chooseLockResultCallback)
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
-
- // Theme
- setTheme(viewModel.request.theme)
- ThemeHelper.trySetDynamicColor(this)
- window.statusBarColor = Color.TRANSPARENT
-
- // fragment
- setContentView(R.layout.biometric_enrollment_container)
- val fragment: Fragment? = supportFragmentManager.findFragmentById(
- R.id.fragment_container_view
- )
- Log.d(
- TAG,
- "onCreate() has savedInstance:$(savedInstanceState != null), fragment:$fragment"
- )
-
- isFirstFragmentAdded = (savedInstanceState != null)
- if (fragment == null) {
- checkCredential()
- if (viewModel.request.isSkipFindSensor) {
- startEnrollingFragment()
- } else if (viewModel.request.isSkipIntro) {
- startFindSensorFragment()
- } else {
- startIntroFragment()
- }
- } else {
- val tag: String? = fragment.tag
- if (INTRO_TAG == tag) {
- attachIntroViewModel()
- } else if (FIND_SENSOR_TAG == tag) {
- attachFindSensorViewModel()
- attachIntroViewModel()
- } else if (ENROLLING_TAG == tag) {
- attachEnrollingViewModel()
- attachFindSensorViewModel()
- attachIntroViewModel()
- } else if (FINISH_TAG == tag) {
- attachFinishViewModel()
- attachFindSensorViewModel()
- attachIntroViewModel()
- } else {
- Log.e(TAG, "fragment tag $tag not found")
- finish()
- return
- }
- }
-
- collectFlows()
- }
-
- private fun collectFlows() {
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- viewModel.setResultFlow.collect {
- Log.d(TAG, "setResultLiveData($it)")
- onSetActivityResult(it)
- }
- }
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- autoCredentialViewModel.generateChallengeFailedFlow.collect {
- Log.d(TAG, "generateChallengeFailedFlow($it)")
- onSetActivityResult(ActivityResult(RESULT_CANCELED, null))
- }
- }
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.newDialogFlow.collect {
- Log.d(TAG, "newErrorDialogFlow($it)")
- FingerprintEnrollErrorDialog.newInstance(it).show(
- supportFragmentManager,
- ERROR_DIALOG_TAG
- )
- }
- }
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- errorDialogViewModel.setResultFlow.collect {
- Log.d(TAG, "errorDialogSetResultFlow($it)")
- when (it) {
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH -> onSetActivityResult(
- ActivityResult(BiometricEnrollBase.RESULT_FINISHED, null)
- )
-
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_TIMEOUT -> onSetActivityResult(
- ActivityResult(BiometricEnrollBase.RESULT_TIMEOUT, null)
- )
- }
- }
- }
- }
- }
-
- private fun startFragment(fragmentClass: Class<out Fragment>, tag: String) {
- if (!isFirstFragmentAdded) {
- supportFragmentManager.beginTransaction()
- .setReorderingAllowed(true)
- .replace(R.id.fragment_container_view, fragmentClass, null, tag)
- .commit()
- isFirstFragmentAdded = true
- } else {
- supportFragmentManager.beginTransaction()
- .setReorderingAllowed(true)
- .setCustomAnimations(
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit
- )
- .replace(R.id.fragment_container_view, fragmentClass, null, tag)
- .addToBackStack(tag)
- .commit()
- }
- }
-
- private fun startIntroFragment() {
- attachIntroViewModel()
- startFragment(FingerprintEnrollIntroFragment::class.java, INTRO_TAG)
- }
-
- private fun attachIntroViewModel() {
- val request: EnrollmentRequest = viewModel.request
- if (request.isSkipIntro || request.isSkipFindSensor) {
- return
- }
- lifecycleScope.launch {
- repeatOnLifecycle(Lifecycle.State.STARTED) {
- introViewModel.actionFlow.collect(this@FingerprintEnrollmentActivity::onIntroAction)
- }
- }
- }
-
- // We need to make sure token is valid before entering find sensor page
- private fun startFindSensorFragment() {
- // Always setToken into progressViewModel even it is not necessary action for UDFPS
- progressViewModel.setToken(autoCredentialViewModel.token)
- attachFindSensorViewModel()
- val fragmentClass: Class<out Fragment> = if (viewModel.canAssumeUdfps) {
- FingerprintEnrollFindUdfpsFragment::class.java
- } else if (viewModel.canAssumeSfps) {
- FingerprintEnrollFindSfpsFragment::class.java
- } else {
- FingerprintEnrollFindRfpsFragment::class.java
- }
- startFragment(fragmentClass, FIND_SENSOR_TAG)
- }
-
- private fun attachFindSensorViewModel() {
- if (viewModel.request.isSkipFindSensor) {
- return
- }
- findSensorViewModel.let {
- // Clear ActionLiveData in FragmentViewModel to prevent getting previous action during
- // recreate, like press 'Start' then press 'back' in FingerprintEnrollEnrolling
- // activity.
- it.clearActionLiveData()
- it.actionLiveData.observe(this, findSensorActionObserver)
- }
- }
-
- private fun startEnrollingFragment() {
- // Always setToken into progressViewModel even it is not necessary action for SFPS or RFPS
- progressViewModel.setToken(autoCredentialViewModel.token)
- attachEnrollingViewModel()
- val fragmentClass: Class<out Fragment> = if (viewModel.canAssumeUdfps) {
- FingerprintEnrollEnrollingUdfpsFragment::class.java
- } else if (viewModel.canAssumeSfps) {
- FingerprintEnrollEnrollingSfpsFragment::class.java
- } else {
- FingerprintEnrollEnrollingRfpsFragment::class.java
- }
- startFragment(fragmentClass, ENROLLING_TAG)
- }
-
- private fun attachEnrollingViewModel() {
- enrollingViewModel.let {
- it.clearActionLiveData()
- it.actionLiveData.observe(this, enrollingActionObserver)
- }
- }
-
- private fun startFinishFragment() {
- viewModel.isNewFingerprintAdded = true
- attachFinishViewModel()
- if (viewModel.request.isSkipFindSensor) {
- // Set page to Finish
- supportFragmentManager.beginTransaction()
- .setReorderingAllowed(true)
- .setCustomAnimations(
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit
- )
- .replace(
- R.id.fragment_container_view,
- FingerprintEnrollFinishFragment::class.java,
- null,
- FINISH_TAG
- )
- .commit()
- } else {
- // Remove Enrolling page
- supportFragmentManager.popBackStack()
-
- // Remove old Finish page if any
- if (supportFragmentManager.findFragmentByTag(FINISH_TAG) != null) {
- supportFragmentManager.popBackStack(FINISH_TAG, POP_BACK_STACK_INCLUSIVE)
- }
-
- // Remove FindSensor page if maxEnrolled
- if (viewModel.isMaxEnrolledReached(autoCredentialViewModel.userId)
- && supportFragmentManager.findFragmentByTag(FIND_SENSOR_TAG) != null
- ) {
- supportFragmentManager.popBackStack(FIND_SENSOR_TAG, POP_BACK_STACK_INCLUSIVE)
- }
-
- // Add Finish page
- supportFragmentManager.beginTransaction()
- .setReorderingAllowed(true)
- .setCustomAnimations(
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_open_exit,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_enter_dynamic_color,
- com.google.android.setupdesign.R.anim.shared_x_axis_activity_close_exit
- )
- .replace(
- R.id.fragment_container_view,
- FingerprintEnrollFinishFragment::class.java,
- null,
- FINISH_TAG
- )
- .addToBackStack(FINISH_TAG)
- .commit()
- }
- }
-
- private fun attachFinishViewModel() {
- finishViewModel.let {
- it.clearActionLiveData()
- it.actionLiveData.observe(this, finishActionObserver)
- }
- }
-
- private fun onSetActivityResult(result: ActivityResult) {
- val challengeExtras: Bundle? = autoCredentialViewModel.createGeneratingChallengeExtras()
- val overrideResult: ActivityResult = viewModel.getOverrideActivityResult(
- result, challengeExtras
- )
- if (DEBUG) {
- Log.d(
- TAG, "onSetActivityResult(" + result + "), override:" + overrideResult
- + ") challengeExtras:" + challengeExtras
- )
- }
- setResult(overrideResult.resultCode, overrideResult.data)
- finish()
- }
-
- private fun checkCredential() {
- when (autoCredentialViewModel.checkCredential(lifecycleScope)) {
- CredentialAction.FAIL_NEED_TO_CHOOSE_LOCK -> {
- val intent: Intent = autoCredentialViewModel.createChooseLockIntent(
- this,
- viewModel.request.isSuw,
- viewModel.request.suwExtras
- )
- if (!viewModel.isWaitingActivityResult.compareAndSet(false, true)) {
- Log.w(TAG, "chooseLock, fail to set isWaiting flag to true")
- }
- chooseLockLauncher.launch(intent)
- return
- }
-
- CredentialAction.FAIL_NEED_TO_CONFIRM_LOCK -> {
- val launched: Boolean = autoCredentialViewModel.createConfirmLockLauncher(
- this,
- LAUNCH_CONFIRM_LOCK_ACTIVITY,
- getString(R.string.security_settings_fingerprint_preference_title)
- ).launch()
- if (!launched) {
- // This shouldn't happen, as we should only end up at this step if a lock thingy
- // is already set.
- Log.e(TAG, "confirmLock, launched is true")
- finish()
- } else if (!viewModel.isWaitingActivityResult.compareAndSet(false, true)) {
- Log.w(TAG, "confirmLock, fail to set isWaiting flag to true")
- }
- return
- }
-
- CredentialAction.CREDENTIAL_VALID,
- CredentialAction.IS_GENERATING_CHALLENGE -> {}
- }
- }
-
- private fun onChooseOrConfirmLockResult(
- isChooseLock: Boolean,
- activityResult: ActivityResult
- ) {
- if (!viewModel.isWaitingActivityResult.compareAndSet(true, false)) {
- Log.w(TAG, "isChooseLock:$isChooseLock, fail to unset waiting flag")
- }
- if (!autoCredentialViewModel.generateChallengeAsCredentialActivityResult(
- isChooseLock,
- activityResult,
- lifecycleScope
- )
- ) {
- onSetActivityResult(activityResult)
- }
- }
-
- private fun onIntroAction(action: FingerprintEnrollIntroAction) {
- Log.d(TAG, "onIntroAction($action)")
- when (action) {
- FingerprintEnrollIntroAction.DONE_AND_FINISH -> {
- onSetActivityResult(ActivityResult(BiometricEnrollBase.RESULT_FINISHED, null))
- return
- }
-
- FingerprintEnrollIntroAction.SKIP_OR_CANCEL -> {
- onSetActivityResult(ActivityResult(BiometricEnrollBase.RESULT_SKIP, null))
- return
- }
-
- FingerprintEnrollIntroAction.CONTINUE_ENROLL -> {
- startFindSensorFragment()
- }
- }
- }
-
- private fun onFindSensorAction(@FingerprintEnrollFindSensorAction action: Int) {
- when (action) {
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP -> {
- onSetActivityResult(ActivityResult(BiometricEnrollBase.RESULT_SKIP, null))
- return
- }
-
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG -> {
- SkipSetupFindFpsDialog().show(
- supportFragmentManager,
- SKIP_SETUP_FIND_FPS_DIALOG_TAG
- )
- return
- }
-
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START -> {
- startEnrollingFragment()
- }
- }
- }
-
- private fun onEnrollingAction(@FingerprintEnrollEnrollingAction action: Int) {
- when (action) {
- FINGERPRINT_ENROLL_ENROLLING_ACTION_DONE -> {
- startFinishFragment()
- }
-
- FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP -> {
- onSetActivityResult(ActivityResult(BiometricEnrollBase.RESULT_SKIP, null))
- }
-
- FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG -> {
- FingerprintEnrollEnrollingIconTouchDialog().show(
- supportFragmentManager,
- SKIP_SETUP_FIND_FPS_DIALOG_TAG
- )
- }
-
- FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED -> {
- if (supportFragmentManager.backStackEntryCount > 0) {
- supportFragmentManager.popBackStack()
- } else {
- onSetActivityResult(ActivityResult(RESULT_CANCELED, null))
- }
- }
- }
- }
-
- private fun onFinishAction(@FingerprintEnrollFinishAction action: Int) {
- when (action) {
- FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK -> {
- startEnrollingFragment()
- }
-
- FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK -> {
- val data: Intent? = if (viewModel.request.isSuw) {
- Intent().also {
- it.putExtras(
- viewModel.getSuwFingerprintCountExtra(
- autoCredentialViewModel.userId
- )
- )
- }
- } else {
- null
- }
- onSetActivityResult(ActivityResult(BiometricEnrollBase.RESULT_FINISHED, data))
- }
- }
- }
-
- override fun onPause() {
- super.onPause()
- viewModel.checkFinishActivityDuringOnPause(
- isFinishing,
- isChangingConfigurations,
- lifecycleScope
- )
- }
-
- override fun onDestroy() {
- viewModel.updateFingerprintSuggestionEnableState(autoCredentialViewModel.userId)
- super.onDestroy()
- }
-
- override fun onApplyThemeResource(theme: Theme, @StyleRes resid: Int, first: Boolean) {
- theme.applyStyle(R.style.SetupWizardPartnerResource, true)
- super.onApplyThemeResource(theme, resid, first)
- }
-
- @Deprecated("Deprecated in Java")
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- if (requestCode == LAUNCH_CONFIRM_LOCK_ACTIVITY) {
- onChooseOrConfirmLockResult(false, ActivityResult(resultCode, data))
- return
- }
- super.onActivityResult(requestCode, resultCode, data)
- }
-
- override val defaultViewModelCreationExtras: CreationExtras
- get() = MutableCreationExtras(super.defaultViewModelCreationExtras).also {
- it[CHALLENGE_GENERATOR_KEY] = FingerprintChallengeGenerator(
- featureFactory.biometricsRepositoryProvider.getFingerprintRepository(application)!!
- )
- it[ENROLLMENT_REQUEST_KEY] =
- EnrollmentRequest(intent, applicationContext, this is SetupActivity)
- it[CREDENTIAL_MODEL_KEY] =
- CredentialModel(intent.extras, SystemClock.elapsedRealtimeClock())
- }
-
- override val defaultViewModelProviderFactory: ViewModelProvider.Factory
- get() = BiometricsViewModelFactory()
-
- override fun onAttachedToWindow() {
- super.onAttachedToWindow()
- window.statusBarColor = backgroundColor
- }
-
- @get:ColorInt
- private val backgroundColor: Int
- get() {
- val stateList: ColorStateList? =
- Utils.getColorAttr(this, android.R.attr.windowBackground)
- return stateList?.defaultColor ?: Color.TRANSPARENT
- }
-
- override fun onConfigurationChanged(newConfig: Configuration) {
- viewModelProvider[DeviceFoldedViewModel::class.java].onConfigurationChanged(newConfig)
- super.onConfigurationChanged(newConfig)
- }
-
- companion object {
- private const val DEBUG = false
- private const val TAG = "FingerprintEnrollmentActivity"
- protected const val LAUNCH_CONFIRM_LOCK_ACTIVITY = 1
-
- private const val INTRO_TAG = "intro"
- private const val FIND_SENSOR_TAG = "find-sensor"
- private const val ENROLLING_TAG = "enrolling"
- private const val FINISH_TAG = "finish"
- private const val SKIP_SETUP_FIND_FPS_DIALOG_TAG = "skip-setup-dialog"
- private const val ERROR_DIALOG_TAG = "error-dialog"
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/GlifLayoutHelper.kt b/src/com/android/settings/biometrics2/ui/view/GlifLayoutHelper.kt
deleted file mode 100644
index 756f309..0000000
--- a/src/com/android/settings/biometrics2/ui/view/GlifLayoutHelper.kt
+++ /dev/null
@@ -1,56 +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.biometrics2.ui.view
-
-import android.app.Activity
-import android.text.TextUtils
-import android.view.View
-import androidx.annotation.StringRes
-import com.google.android.setupdesign.GlifLayout
-
-/**
- * Utils class for GlifLayout
- */
-class GlifLayoutHelper(val activity: Activity, val glifLayout: GlifLayout) {
-
- /**
- * Sets header text to GlifLayout
- */
- fun setHeaderText(@StringRes textResId: Int) {
- val layoutTitle = glifLayout.headerTextView
- val previousTitle = layoutTitle.text
- val title = activity.getText(textResId)
- if (previousTitle !== title) {
- if (!TextUtils.isEmpty(previousTitle)) {
- layoutTitle.accessibilityLiveRegion = View.ACCESSIBILITY_LIVE_REGION_POLITE
- }
- glifLayout.headerText = title
- glifLayout.headerTextView.contentDescription = title
- activity.title = title
- }
- }
-
- /**
- * Sets description text to GlifLayout
- */
- fun setDescriptionText(description: CharSequence?) {
- val previousDescription = glifLayout.descriptionText
- // Prevent a11y for re-reading the same string
- if (!TextUtils.equals(previousDescription, description)) {
- glifLayout.descriptionText = description
- }
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt b/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt
deleted file mode 100644
index bb74e36..0000000
--- a/src/com/android/settings/biometrics2/ui/view/SkipSetupFindFpsDialog.kt
+++ /dev/null
@@ -1,56 +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.biometrics2.ui.view
-
-import android.app.Dialog
-import android.content.Context
-import android.content.DialogInterface
-import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.ViewModelProvider
-import com.android.settings.R
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel
-
-/**
- * Skip dialog which shows when user clicks "Do it later" button in FingerprintFindSensor page.
- */
-class SkipSetupFindFpsDialog : DialogFragment() {
-
- private var mViewModel: FingerprintEnrollFindSensorViewModel? = null
-
- override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
- requireActivity().bindSkipSetupFindFpsDialog {
- _: DialogInterface?, _: Int -> mViewModel?.onSkipDialogButtonClick()
- }
-
- override fun onAttach(context: Context) {
- mViewModel = ViewModelProvider(requireActivity())[
- FingerprintEnrollFindSensorViewModel::class.java
- ]
- super.onAttach(context)
- }
-}
-
-fun Context.bindSkipSetupFindFpsDialog(
- positiveButtonClickListener: DialogInterface.OnClickListener
-): AlertDialog =
- AlertDialog.Builder(this, R.style.Theme_AlertDialog)
- .setTitle(R.string.setup_fingerprint_enroll_skip_title)
- .setPositiveButton(R.string.skip_anyway_button_label, positiveButtonClickListener)
- .setNegativeButton(R.string.go_back_button_label, null)
- .setMessage(R.string.setup_fingerprint_enroll_skip_after_adding_lock_text)
- .create()
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModel.kt b/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModel.kt
deleted file mode 100644
index 95aee4b..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModel.kt
+++ /dev/null
@@ -1,283 +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.biometrics2.ui.viewmodel
-
-import android.app.Activity
-import android.app.Application
-import android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.result.ActivityResult
-import androidx.lifecycle.AndroidViewModel
-import com.android.internal.widget.LockPatternUtils
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics.BiometricUtils
-import com.android.settings.biometrics.BiometricUtils.GatekeeperCredentialNotMatchException
-import com.android.settings.biometrics2.data.repository.FingerprintRepository
-import com.android.settings.biometrics2.ui.model.CredentialModel
-import com.android.settings.password.ChooseLockGeneric
-import com.android.settings.password.ChooseLockPattern
-import com.android.settings.password.ChooseLockSettingsHelper
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
-
-/**
- * AutoCredentialViewModel which uses CredentialModel to determine next actions for activity, like
- * start ChooseLockActivity, start ConfirmLockActivity, GenerateCredential, or do nothing.
- */
-class AutoCredentialViewModel(
- application: Application,
- private val lockPatternUtils: LockPatternUtils,
- private val challengeGenerator: ChallengeGenerator,
- private val credentialModel: CredentialModel
-) : AndroidViewModel(application) {
-
- /**
- * Generic callback for FingerprintManager#generateChallenge or FaceManager#generateChallenge
- */
- interface GenerateChallengeCallback {
- /** Generic generateChallenge method for FingerprintManager or FaceManager */
- fun onChallengeGenerated(sensorId: Int, userId: Int, challenge: Long)
- }
-
- /**
- * A generic interface class for calling different generateChallenge from FingerprintManager or
- * FaceManager
- */
- interface ChallengeGenerator {
-
- /** Callback that will be called later after challenge generated */
- var callback: GenerateChallengeCallback?
-
- /** Method for generating challenge from FingerprintManager or FaceManager */
- fun generateChallenge(userId: Int)
- }
-
- /** Used to generate challenge through FingerprintRepository */
- class FingerprintChallengeGenerator(
- private val fingerprintRepository: FingerprintRepository
- ) : ChallengeGenerator {
-
- override var callback: GenerateChallengeCallback? = null
-
- override fun generateChallenge(userId: Int) {
- callback?.let {
- fingerprintRepository.generateChallenge(userId) {
- sensorId: Int, uid: Int, challenge: Long ->
- it.onChallengeGenerated(sensorId, uid, challenge)
- }
- } ?:run {
- Log.e(TAG, "generateChallenge, null callback")
- }
- }
-
- companion object {
- private const val TAG = "FingerprintChallengeGenerator"
- }
- }
-
- private val _generateChallengeFailedFlow = MutableSharedFlow<Boolean>()
- val generateChallengeFailedFlow: SharedFlow<Boolean>
- get() = _generateChallengeFailedFlow.asSharedFlow()
-
-
- // flag if token is generating through checkCredential()'s generateChallenge()
- private var isGeneratingChallengeDuringCheckingCredential = false
-
- /** Get bundle which passing back to FingerprintSettings for late generateChallenge() */
- fun createGeneratingChallengeExtras(): Bundle? {
- if (!isGeneratingChallengeDuringCheckingCredential
- || !credentialModel.isValidToken
- || !credentialModel.isValidChallenge
- ) {
- return null
- }
- val bundle = Bundle()
- bundle.putByteArray(
- ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
- credentialModel.token
- )
- bundle.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, credentialModel.challenge)
- return bundle
- }
-
- /** Check credential status for biometric enrollment. */
- fun checkCredential(scope: CoroutineScope): CredentialAction {
- return if (isValidCredential) {
- CredentialAction.CREDENTIAL_VALID
- } else if (isUnspecifiedPassword) {
- CredentialAction.FAIL_NEED_TO_CHOOSE_LOCK
- } else if (credentialModel.isValidGkPwHandle) {
- val gkPwHandle = credentialModel.gkPwHandle
- credentialModel.clearGkPwHandle()
- // GkPwHandle is got through caller activity, we shall not revoke it after
- // generateChallenge(). Let caller activity to make decision.
- generateChallenge(gkPwHandle, false, scope)
- isGeneratingChallengeDuringCheckingCredential = true
- CredentialAction.IS_GENERATING_CHALLENGE
- } else {
- CredentialAction.FAIL_NEED_TO_CONFIRM_LOCK
- }
- }
-
- private fun generateChallenge(
- gkPwHandle: Long,
- revokeGkPwHandle: Boolean,
- scope: CoroutineScope
- ) {
- challengeGenerator.callback = object : GenerateChallengeCallback {
- override fun onChallengeGenerated(sensorId: Int, userId: Int, challenge: Long) {
- var illegalStateExceptionCaught = false
- try {
- val newToken = requestGatekeeperHat(gkPwHandle, challenge, userId)
- credentialModel.challenge = challenge
- credentialModel.token = newToken
- } catch (e: IllegalStateException) {
- Log.e(TAG, "generateChallenge, IllegalStateException", e)
- illegalStateExceptionCaught = true
- } finally {
- if (revokeGkPwHandle) {
- lockPatternUtils.removeGatekeeperPasswordHandle(gkPwHandle)
- }
- Log.d(
- TAG,
- "generateChallenge(), model:$credentialModel"
- + ", revokeGkPwHandle:$revokeGkPwHandle"
- )
- // Check credential again
- if (!isValidCredential || illegalStateExceptionCaught) {
- Log.w(TAG, "generateChallenge, invalid Credential or IllegalStateException")
- scope.launch {
- _generateChallengeFailedFlow.emit(true)
- }
- }
- }
- }
- }
- challengeGenerator.generateChallenge(userId)
- }
-
- private val isValidCredential: Boolean
- get() = !isUnspecifiedPassword && credentialModel.isValidToken
-
- private val isUnspecifiedPassword: Boolean
- get() = lockPatternUtils.getActivePasswordQuality(userId) == PASSWORD_QUALITY_UNSPECIFIED
-
- /**
- * Handle activity result from ChooseLockGeneric, ConfirmLockPassword, or ConfirmLockPattern
- * @param isChooseLock true if result is coming from ChooseLockGeneric. False if result is
- * coming from ConfirmLockPassword or ConfirmLockPattern
- * @param result activity result
- * @return if it is a valid result and viewModel is generating challenge
- */
- fun generateChallengeAsCredentialActivityResult(
- isChooseLock: Boolean,
- result: ActivityResult,
- scope: CoroutineScope
- ): Boolean {
- if ((isChooseLock && result.resultCode == ChooseLockPattern.RESULT_FINISHED) ||
- (!isChooseLock && result.resultCode == Activity.RESULT_OK)) {
- result.data?.let {
- val gkPwHandle = it.getLongExtra(
- ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
- CredentialModel.INVALID_GK_PW_HANDLE
- )
- // Revoke self requested GkPwHandle because it shall only used once inside this
- // activity lifecycle.
- generateChallenge(gkPwHandle, true, scope)
- return true
- }
- }
- return false
- }
-
- val userId: Int
- get() = credentialModel.userId
-
- val token: ByteArray?
- get() = credentialModel.token
-
- @Throws(IllegalStateException::class)
- private fun requestGatekeeperHat(gkPwHandle: Long, challenge: Long, userId: Int): ByteArray? {
- val response = lockPatternUtils
- .verifyGatekeeperPasswordHandle(gkPwHandle, challenge, userId)
- if (!response.isMatched) {
- throw GatekeeperCredentialNotMatchException("Unable to request Gatekeeper HAT")
- }
- return response.gatekeeperHAT
- }
-
- /** Create Intent for choosing lock */
- fun createChooseLockIntent(
- context: Context, isSuw: Boolean,
- suwExtras: Bundle
- ): Intent {
- val intent = BiometricUtils.getChooseLockIntent(
- context, isSuw,
- suwExtras
- )
- intent.putExtra(
- ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS,
- true
- )
- intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true)
- intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true)
- if (credentialModel.isValidUserId) {
- intent.putExtra(Intent.EXTRA_USER_ID, credentialModel.userId)
- }
- return intent
- }
-
- /** Create ConfirmLockLauncher */
- fun createConfirmLockLauncher(
- activity: Activity,
- requestCode: Int, title: String
- ): ChooseLockSettingsHelper {
- val builder = ChooseLockSettingsHelper.Builder(activity)
- builder.setRequestCode(requestCode)
- .setTitle(title)
- .setRequestGatekeeperPasswordHandle(true)
- .setForegroundOnly(true)
- .setReturnCredentials(true)
- if (credentialModel.isValidUserId) {
- builder.setUserId(credentialModel.userId)
- }
- return builder.build()
- }
-
- companion object {
- private const val TAG = "AutoCredentialViewModel"
- }
-}
-
-enum class CredentialAction {
-
- CREDENTIAL_VALID,
-
- /** Valid credential, activity does nothing. */
- IS_GENERATING_CHALLENGE,
-
- /** This credential looks good, but still need to run generateChallenge(). */
- FAIL_NEED_TO_CHOOSE_LOCK,
-
- /** Need activity to run confirm lock */
- FAIL_NEED_TO_CONFIRM_LOCK
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModel.java
deleted file mode 100644
index 7dc1328..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModel.java
+++ /dev/null
@@ -1,74 +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.biometrics2.ui.viewmodel;
-
-import android.content.res.Configuration;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-import com.android.systemui.unfold.compat.ScreenSizeFoldProvider;
-import com.android.systemui.unfold.updates.FoldProvider;
-
-import java.util.concurrent.Executor;
-
-/**
- * ViewModel explaining the fingerprint sensor location for fingerprint enrollment.
- */
-public class DeviceFoldedViewModel extends ViewModel {
-
- private static final String TAG = "DeviceFoldedViewModel";
-
- @NonNull private final MutableLiveData<Boolean> mLiveData =
- new MutableLiveData<>(null);
-
- private final ScreenSizeFoldProvider mScreenSizeFoldProvider;
- private final FoldProvider.FoldCallback mIsFoldedCallback = isFolded -> {
- Log.d(TAG, "onFoldUpdated= " + isFolded);
- mLiveData.postValue(isFolded);
- };
-
- public DeviceFoldedViewModel(@NonNull ScreenSizeFoldProvider screenSizeFoldProvider,
- @NonNull Executor executor) {
- super();
- mScreenSizeFoldProvider = screenSizeFoldProvider;
- mScreenSizeFoldProvider.registerCallback(mIsFoldedCallback, executor);
- }
-
- /**
- * Calls this method when activity gets configuration change
- */
- public void onConfigurationChanged(@NonNull Configuration newConfig) {
- mScreenSizeFoldProvider.onConfigurationChange(newConfig);
- }
-
- /**
- * Returns FoldedLiveData
- */
- public LiveData<Boolean> getLiveData() {
- return mLiveData;
- }
-
- @Override
- protected void onCleared() {
- mScreenSizeFoldProvider.unregisterCallback(mIsFoldedCallback);
- super.onCleared();
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModel.java
deleted file mode 100644
index 07fe275..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModel.java
+++ /dev/null
@@ -1,113 +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.biometrics2.ui.viewmodel;
-
-import static android.hardware.display.DisplayManager.DisplayListener;
-
-import android.app.Application;
-import android.hardware.display.DisplayManager;
-import android.util.Log;
-import android.view.DisplayInfo;
-import android.view.Surface;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import com.android.internal.annotations.VisibleForTesting;
-
-/**
- * ViewModel explaining the fingerprint sensor location for fingerprint enrollment.
- */
-public class DeviceRotationViewModel extends AndroidViewModel {
-
- private static final boolean DEBUG = false;
- private static final String TAG = "DeviceRotationViewModel";
-
- private final DisplayManager mDisplayManager;
- private final boolean mIsReverseDefaultRotation;
- @NonNull private final DisplayInfo mDisplayInfo = new DisplayInfo();
-
- /** {@link android.hardware.display.DisplayManager} is a final class, set this member visibility
- * to 'protected' for testing
- */
- @VisibleForTesting
- protected final DisplayListener mDisplayListener = new DisplayListener() {
- @Override
- public void onDisplayAdded(int displayId) {
- }
-
- @Override
- public void onDisplayRemoved(int displayId) {
- }
-
- @Override
- public void onDisplayChanged(int displayId) {
- final int rotation = getRotation();
- Log.d(TAG, "onDisplayChanged(" + displayId + "), rotation:" + rotation);
- mLiveData.postValue(rotation);
- }
- };
-
- @NonNull private final MutableLiveData<Integer> mLiveData = new MutableLiveData<>();
-
- public DeviceRotationViewModel(@NonNull Application application) {
- super(application);
- mDisplayManager = application.getSystemService(DisplayManager.class);
- mDisplayManager.registerDisplayListener(mDisplayListener,
- application.getMainThreadHandler());
- mIsReverseDefaultRotation = application.getResources().getBoolean(
- com.android.internal.R.bool.config_reverseDefaultRotation);
- }
-
- /**
- * Returns current rotation.
- *
- * {@link android.view.Display} is a final class, set this method visibility to "protected" for
- * inheriting it in test
- */
- @VisibleForTesting
- @Surface.Rotation
- protected int getRotation() {
- getApplication().getDisplay().getDisplayInfo(mDisplayInfo);
- if (mIsReverseDefaultRotation) {
- return (mDisplayInfo.rotation + 1) % 4;
- } else {
- return mDisplayInfo.rotation;
- }
- }
-
- /**
- * Returns RotationLiveData
- */
- public LiveData<Integer> getLiveData() {
- final Integer lastRotation = mLiveData.getValue();
- @Surface.Rotation int newRotation = getRotation();
- if (lastRotation == null || lastRotation != newRotation) {
- Log.d(TAG, "getLiveData, update rotation from " + lastRotation + " to " + newRotation);
- mLiveData.setValue(newRotation);
- }
- return mLiveData;
- }
-
- @Override
- protected void onCleared() {
- mDisplayManager.unregisterDisplayListener(mDisplayListener);
- super.onCleared();
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModel.java
deleted file mode 100644
index eba6a15..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModel.java
+++ /dev/null
@@ -1,248 +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.biometrics2.ui.viewmodel;
-
-import android.annotation.IntDef;
-import android.app.Application;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.os.VibrationAttributes;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
-import android.util.Log;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * ViewModel explaining the fingerprint enrolling page
- */
-public class FingerprintEnrollEnrollingViewModel extends AndroidViewModel {
-
- private static final String TAG = FingerprintEnrollEnrollingViewModel.class.getSimpleName();
- private static final boolean DEBUG = false;
-
- private static final VibrationEffect VIBRATE_EFFECT_ERROR =
- VibrationEffect.createWaveform(new long[]{0, 5, 55, 60}, -1);
- private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
- VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY);
-
- /**
- * Enrolling finished
- */
- public static final int FINGERPRINT_ENROLL_ENROLLING_ACTION_DONE = 0;
-
- /**
- * Icon touch dialog show
- */
- public static final int FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG = 1;
-
- /**
- * Has got latest cancelled event due to user skip
- */
- public static final int FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP = 2;
-
- /**
- * Has got latest cancelled event due to back key
- */
- public static final int FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED = 3;
-
- @IntDef(prefix = { "FINGERPRINT_ENROLL_ENROLLING_ACTION_" }, value = {
- FINGERPRINT_ENROLL_ENROLLING_ACTION_DONE,
- FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG,
- FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface FingerprintEnrollEnrollingAction {}
-
- private final int mUserId;
- private boolean mOnBackPressed;
- private boolean mOnSkipPressed;
- @NonNull private final FingerprintRepository mFingerprintRepository;
- private final AccessibilityManager mAccessibilityManager;
- private final Vibrator mVibrator;
-
- private final MutableLiveData<Integer> mActionLiveData = new MutableLiveData<>();
-
- public FingerprintEnrollEnrollingViewModel(
- @NonNull Application application,
- int userId,
- @NonNull FingerprintRepository fingerprintRepository
- ) {
- super(application);
- mUserId = userId;
- mFingerprintRepository = fingerprintRepository;
- mAccessibilityManager = application.getSystemService(AccessibilityManager.class);
- mVibrator = application.getSystemService(Vibrator.class);
- }
-
- public LiveData<Integer> getActionLiveData() {
- return mActionLiveData;
- }
-
- /**
- * Clears action live data
- */
- public void clearActionLiveData() {
- mActionLiveData.setValue(null);
- }
-
- public boolean getOnSkipPressed() {
- return mOnSkipPressed;
- }
-
- /**
- * User clicks skip button
- */
- public void setOnSkipPressed() {
- mOnSkipPressed = true;
- }
-
- /**
- * Enrolling is cancelled because user clicks skip
- */
- public void onCancelledDueToOnSkipPressed() {
- final int action = FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP;
- if (DEBUG) {
- Log.d(TAG, "onSkipButtonClick, post action " + action);
- }
- mOnSkipPressed = false;
- mActionLiveData.postValue(action);
- }
-
- /**
- * Is enrolling finished
- */
- public void onEnrollingDone() {
- final int action = FINGERPRINT_ENROLL_ENROLLING_ACTION_DONE;
- if (DEBUG) {
- Log.d(TAG, "onEnrollingDone, post action " + action);
- }
- mActionLiveData.postValue(action);
- }
-
- public boolean getOnBackPressed() {
- return mOnBackPressed;
- }
-
- /**
- * Back key is pressed.
- */
- public void setOnBackPressed() {
- mOnBackPressed = true;
- }
-
- /**
- * Enrollment is cancelled because back key is pressed.
- */
- public void onCancelledDueToOnBackPressed() {
- final int action = FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED;
- if (DEBUG) {
- Log.d(TAG, "onCancelledEventReceivedAfterOnBackPressed, post action " + action);
- }
- mOnBackPressed = false;
- mActionLiveData.postValue(action);
- }
-
- /**
- * Icon touch dialog show
- */
- public void showIconTouchDialog() {
- final int action = FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG;
- if (DEBUG) {
- Log.d(TAG, "onIconTouchDialogShow, post action " + action);
- }
- mActionLiveData.postValue(action);
- }
-
- /**
- * get enroll stage threshold
- */
- public float getEnrollStageThreshold(int index) {
- return mFingerprintRepository.getEnrollStageThreshold(index);
- }
-
- /**
- * Get enroll stage count
- */
- public int getEnrollStageCount() {
- return mFingerprintRepository.getEnrollStageCount();
- }
-
- /**
- * Requests interruption of the accessibility feedback from all accessibility services.
- */
- public void clearTalkback() {
- mAccessibilityManager.interrupt();
- }
-
- /**
- * Returns if the {@link AccessibilityManager} is enabled.
- *
- * @return True if this {@link AccessibilityManager} is enabled, false otherwise.
- */
- public boolean isAccessibilityEnabled() {
- return mAccessibilityManager.isEnabled();
- }
-
- /**
- * Sends an {@link AccessibilityEvent}.
- */
- public void sendAccessibilityEvent(CharSequence announcement) {
- AccessibilityEvent e = AccessibilityEvent.obtain();
- e.setEventType(AccessibilityEvent.TYPE_ANNOUNCEMENT);
- e.setClassName(getClass().getName());
- e.setPackageName(getApplication().getPackageName());
- e.getText().add(announcement);
- mAccessibilityManager.sendAccessibilityEvent(e);
- }
-
- /**
- * Returns if the touch exploration in the system is enabled.
- *
- * @return True if touch exploration is enabled, false otherwise.
- */
- public boolean isTouchExplorationEnabled() {
- return mAccessibilityManager.isTouchExplorationEnabled();
- }
-
- /**
- * Like {@link #vibrate(VibrationEffect, VibrationAttributes)}, but allows the
- * caller to specify the vibration is owned by someone else and set a reason for vibration.
- */
- public void vibrateError(String reason) {
- mVibrator.vibrate(mUserId, getApplication().getOpPackageName(),
- VIBRATE_EFFECT_ERROR, reason, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
- }
-
- /**
- * Gets the first FingerprintSensorPropertiesInternal from FingerprintManager
- */
- @Nullable
- public FingerprintSensorPropertiesInternal getFirstFingerprintSensorPropertiesInternal() {
- return mFingerprintRepository.getFirstFingerprintSensorPropertiesInternal();
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModel.kt b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModel.kt
deleted file mode 100644
index b154fe7..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModel.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.android.settings.biometrics2.ui.viewmodel
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import kotlinx.atomicfu.AtomicBoolean
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-
-class FingerprintEnrollErrorDialogViewModel(
- application: Application,
- val isSuw: Boolean
-): AndroidViewModel(application) {
-
- private val _isDialogShown: AtomicBoolean = atomic(false)
- val isDialogShown: Boolean
- get() = _isDialogShown.value
-
- private val _newDialogFlow = MutableSharedFlow<Int>()
- val newDialogFlow: SharedFlow<Int>
- get() = _newDialogFlow.asSharedFlow()
-
- private val _triggerRetryFlow = MutableSharedFlow<Any>()
- val triggerRetryFlow: SharedFlow<Any>
- get() = _triggerRetryFlow.asSharedFlow()
-
- private val _setResultFlow = MutableSharedFlow<FingerprintErrorDialogSetResultAction>()
- val setResultFlow: SharedFlow<FingerprintErrorDialogSetResultAction>
- get() = _setResultFlow.asSharedFlow()
-
- suspend fun newDialog(errorMsgId: Int) {
- _isDialogShown.compareAndSet(expect = false, update = true)
- _newDialogFlow.emit(errorMsgId)
- }
-
- suspend fun triggerRetry() {
- _isDialogShown.compareAndSet(expect = true, update = false)
- _triggerRetryFlow.emit(Any())
- }
-
- suspend fun setResultAndFinish(action: FingerprintErrorDialogSetResultAction) {
- _isDialogShown.compareAndSet(expect = true, update = false)
- _setResultFlow.emit(action)
- }
-}
-
-enum class FingerprintErrorDialogSetResultAction {
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH,
- FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_TIMEOUT
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModel.java
deleted file mode 100644
index 00c67c4..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModel.java
+++ /dev/null
@@ -1,129 +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.biometrics2.ui.viewmodel;
-
-import android.annotation.IntDef;
-import android.app.Application;
-import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * ViewModel explaining the fingerprint sensor location for fingerprint enrollment.
- */
-public class FingerprintEnrollFindSensorViewModel extends AndroidViewModel {
-
- private static final boolean DEBUG = false;
- private static final String TAG = "FingerprintEnrollFindSensorViewModel";
-
- /**
- * User clicks 'Skip' button on this page in Settings
- */
- public static final int FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP = 0;
-
- /**
- * User clicks 'Skip' button on this page in SetupWizard flow
- */
- public static final int FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG = 1;
-
- /**
- * User clicks 'Start' button on this page
- */
- public static final int FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START = 2;
-
- @IntDef(prefix = { "FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_" }, value = {
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP,
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG,
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface FingerprintEnrollFindSensorAction {}
-
- private final AccessibilityManager mAccessibilityManager;
-
- private final boolean mIsSuw;
- @NonNull private final MutableLiveData<Integer> mActionLiveData = new MutableLiveData<>();
-
- public FingerprintEnrollFindSensorViewModel(@NonNull Application application, boolean isSuw) {
- super(application);
- mAccessibilityManager = application.getSystemService(AccessibilityManager.class);
- mIsSuw = isSuw;
- }
-
- /**
- * Returns action live data that user chooses
- */
- public LiveData<Integer> getActionLiveData() {
- return mActionLiveData;
- }
-
- /**
- * Clear ActionLiveData to prevent get obsolete data
- */
- public void clearActionLiveData() {
- mActionLiveData.setValue(null);
- }
-
- /**
- * User clicks skip button on dialog
- */
- public void onSkipDialogButtonClick() {
- final int action = FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP;
- if (DEBUG) {
- Log.d(TAG, "onSkipDialogButtonClick, post " + action);
- }
- mActionLiveData.postValue(action);
- }
-
- /**
- * User clicks skip button
- */
- public void onSkipButtonClick() {
- final int action = mIsSuw
- ? FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG
- : FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP;
- if (DEBUG) {
- Log.d(TAG, "onSkipButtonClick, post action " + action);
- }
- mActionLiveData.postValue(action);
- }
-
- /**
- * User clicks start button
- */
- public void onStartButtonClick() {
- final int action = FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START;
- if (DEBUG) {
- Log.d(TAG, "onStartButtonClick, post action " + action);
- }
- mActionLiveData.postValue(action);
- }
-
- /**
- * Returns the info about accessibility is enabled or not
- */
- public boolean isAccessibilityEnabled() {
- return mAccessibilityManager.isEnabled();
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModel.java
deleted file mode 100644
index ae67f74..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModel.java
+++ /dev/null
@@ -1,129 +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.biometrics2.ui.viewmodel;
-
-import android.annotation.IntDef;
-import android.app.Application;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Finish ViewModel handles the state of the fingerprint renroll final stage
- */
-public class FingerprintEnrollFinishViewModel extends AndroidViewModel {
-
- private static final String TAG = FingerprintEnrollFinishViewModel.class.getSimpleName();
- private static final boolean DEBUG = false;
-
- /**
- * User clicks "Add" button
- */
- public static final int FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK = 0;
-
- /**
- * User clicks "Next" button
- */
- public static final int FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK = 1;
-
- @IntDef(prefix = { "FINGERPRINT_ENROLL_FINISH_ACTION_" }, value = {
- FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK,
- FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK
- })
- @Retention(RetentionPolicy.SOURCE)
- public @interface FingerprintEnrollFinishAction {}
-
- @NonNull private final FingerprintRepository mFingerprintRepository;
- @NonNull private final EnrollmentRequest mRequest;
- private final int mUserId;
-
- private final MutableLiveData<Integer> mActionLiveData = new MutableLiveData<>();
-
- public FingerprintEnrollFinishViewModel(@NonNull Application application, int userId,
- @NonNull EnrollmentRequest request,
- @NonNull FingerprintRepository fingerprintRepository) {
- super(application);
- mUserId = userId;
- mRequest = request;
- mFingerprintRepository = fingerprintRepository;
- }
-
- @NonNull
- public EnrollmentRequest getRequest() {
- return mRequest;
- }
-
- /**
- * The first sensor type is Side fps sensor or not
- */
- public boolean canAssumeSfps() {
- return mFingerprintRepository.canAssumeSfps();
- }
-
- /**
- * Device allows user to enroll another fingerprint or not.
- */
- public boolean isAnotherFingerprintEnrollable() {
- return mFingerprintRepository.getNumOfEnrolledFingerprintsSize(mUserId)
- < mFingerprintRepository.getMaxFingerprints();
- }
-
- /**
- * Clear action LiveData
- */
- public void clearActionLiveData() {
- mActionLiveData.setValue(null);
- }
-
- /**
- * Get action LiveData
- */
- public LiveData<Integer> getActionLiveData() {
- return mActionLiveData;
- }
-
- /**
- * Handle add button Click
- */
- public void onAddButtonClick() {
- final int action = FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK;
- if (DEBUG) {
- Log.d(TAG, "onAddButtonClick post(" + action + ")");
- }
- mActionLiveData.postValue(action);
- }
-
- /**
- * Handle next button Click
- */
- public void onNextButtonClick() {
- final int action = FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK;
- if (DEBUG) {
- Log.d(TAG, "onNextButtonClick post(" + action + ")");
- }
- mActionLiveData.postValue(action);
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModel.kt b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModel.kt
deleted file mode 100644
index 98137b4..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModel.kt
+++ /dev/null
@@ -1,138 +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.biometrics2.ui.viewmodel
-
-import android.app.Application
-import android.util.Log
-import androidx.lifecycle.AndroidViewModel
-import com.android.settings.biometrics2.data.repository.FingerprintRepository
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollIntroStatus
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.CONTINUE_ENROLL
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.DONE_AND_FINISH
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.SKIP_OR_CANCEL
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.launch
-
-/** Fingerprint intro onboarding page view model implementation */
-class FingerprintEnrollIntroViewModel(
- application: Application,
- private val fingerprintRepository: FingerprintRepository,
- val request: EnrollmentRequest,
- private val userId: Int
-) : AndroidViewModel(application) {
-
- /** User's action flow (like clicking Agree, Skip, or Done) */
- private val _actionFlow = MutableSharedFlow<FingerprintEnrollIntroAction>()
- val actionFlow: SharedFlow<FingerprintEnrollIntroAction>
- get() = _actionFlow.asSharedFlow()
-
- private fun getEnrollableStatus(): FingerprintEnrollable {
- val num = fingerprintRepository.getNumOfEnrolledFingerprintsSize(userId)
- val max =
- if (request.isSuw && !request.isAfterSuwOrSuwSuggestedAction)
- fingerprintRepository.getMaxFingerprintsInSuw(
- getApplication<Application>().resources
- )
- else
- fingerprintRepository.maxFingerprints
- return if (num >= max)
- FingerprintEnrollable.FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
- else
- FingerprintEnrollable.FINGERPRINT_ENROLLABLE_OK
- }
-
- private val hasScrolledToBottomFlow = MutableStateFlow(HAS_SCROLLED_TO_BOTTOM_DEFAULT)
- private val enrollableStatusFlow = MutableStateFlow(getEnrollableStatus())
-
- /** Enrollable status and hasScrollToBottom live data */
- val pageStatusFlow: Flow<FingerprintEnrollIntroStatus> =
- hasScrolledToBottomFlow.combine(enrollableStatusFlow) {
- hasScrolledToBottom: Boolean, enrollableStatus: FingerprintEnrollable ->
- FingerprintEnrollIntroStatus(hasScrolledToBottom, enrollableStatus)
- }
-
- fun updateEnrollableStatus(scope: CoroutineScope) {
- scope.launch {
- enrollableStatusFlow.emit(getEnrollableStatus())
- }
- }
-
- /** The first sensor type is UDFPS sensor or not */
- val canAssumeUdfps: Boolean
- get() = fingerprintRepository.canAssumeUdfps()
-
- /** Update onboarding intro page has scrolled to bottom */
- fun setHasScrolledToBottom(value: Boolean, scope: CoroutineScope) {
- scope.launch {
- hasScrolledToBottomFlow.emit(value)
- }
- }
-
- /** Get parental consent required or not during enrollment process */
- val isParentalConsentRequired: Boolean
- get() = fingerprintRepository.isParentalConsentRequired(getApplication())
-
- /** Get fingerprint is disable by admin or not */
- val isBiometricUnlockDisabledByAdmin: Boolean
- get() = fingerprintRepository.isDisabledByAdmin(getApplication(), userId)
-
- /**
- * User clicks next button
- */
- fun onNextButtonClick(scope: CoroutineScope) {
- scope.launch {
- when (val status = enrollableStatusFlow.value) {
- FingerprintEnrollable.FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX ->
- _actionFlow.emit(DONE_AND_FINISH)
-
- FingerprintEnrollable.FINGERPRINT_ENROLLABLE_OK ->
- _actionFlow.emit(CONTINUE_ENROLL)
-
- else -> Log.w(TAG, "fail to click next, enrolled:$status")
- }
- }
- }
-
- /** User clicks skip/cancel button */
- fun onSkipOrCancelButtonClick(scope: CoroutineScope) {
- scope.launch {
- _actionFlow.emit(SKIP_OR_CANCEL)
- }
- }
-
- companion object {
- private const val TAG = "FingerprintEnrollIntroViewModel"
- private const val HAS_SCROLLED_TO_BOTTOM_DEFAULT = false
- private val ENROLLABLE_STATUS_DEFAULT = FingerprintEnrollable.FINGERPRINT_ENROLLABLE_UNKNOWN
- }
-}
-
-enum class FingerprintEnrollIntroAction {
- /** User clicks 'Done' button on this page */
- DONE_AND_FINISH,
- /** User clicks 'Agree' button on this page */
- CONTINUE_ENROLL,
- /** User clicks 'Skip' button on this page */
- SKIP_OR_CANCEL
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java
deleted file mode 100644
index 1cfec52..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModel.java
+++ /dev/null
@@ -1,251 +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.biometrics2.ui.viewmodel;
-
-import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ERROR_CANCELED;
-import static android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL;
-
-import static com.android.settings.biometrics2.ui.model.EnrollmentProgress.INITIAL_REMAINING;
-import static com.android.settings.biometrics2.ui.model.EnrollmentProgress.INITIAL_STEPS;
-
-import android.app.Application;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.hardware.fingerprint.FingerprintManager.EnrollReason;
-import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-import android.os.CancellationSignal;
-import android.os.SystemClock;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import com.android.settings.R;
-import com.android.settings.biometrics.fingerprint.FingerprintUpdater;
-import com.android.settings.biometrics.fingerprint.MessageDisplayController;
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress;
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage;
-
-import java.util.LinkedList;
-
-/**
- * Progress ViewModel handles the state around biometric enrollment. It manages the state of
- * enrollment throughout the activity lifecycle so the app can continue after an event like
- * rotation.
- */
-public class FingerprintEnrollProgressViewModel extends AndroidViewModel {
-
- private static final boolean DEBUG = false;
- private static final String TAG = "FingerprintEnrollProgressViewModel";
-
- private final MutableLiveData<EnrollmentProgress> mProgressLiveData = new MutableLiveData<>(
- new EnrollmentProgress(INITIAL_STEPS, INITIAL_REMAINING));
- private final MutableLiveData<EnrollmentStatusMessage> mHelpMessageLiveData =
- new MutableLiveData<>();
- private final MutableLiveData<EnrollmentStatusMessage> mErrorMessageLiveData =
- new MutableLiveData<>();
- private final MutableLiveData<Object> mCanceledSignalLiveData = new MutableLiveData<>();
- private final MutableLiveData<Boolean> mAcquireLiveData = new MutableLiveData<>();
- private final MutableLiveData<Integer> mPointerDownLiveData = new MutableLiveData<>();
- private final MutableLiveData<Integer> mPointerUpLiveData = new MutableLiveData<>();
-
- private byte[] mToken = null;
- private final int mUserId;
-
- private final FingerprintUpdater mFingerprintUpdater;
- @Nullable private CancellationSignal mCancellationSignal = null;
- @NonNull private final LinkedList<CancellationSignal> mCancelingSignalQueue =
- new LinkedList<>();
- private final EnrollmentCallback mEnrollmentCallback = new EnrollmentCallback() {
-
- @Override
- public void onEnrollmentProgress(int remaining) {
- final int currentSteps = getSteps();
- final EnrollmentProgress progress = new EnrollmentProgress(
- currentSteps == INITIAL_STEPS ? remaining : getSteps(), remaining);
- if (DEBUG) {
- Log.d(TAG, "onEnrollmentProgress(" + remaining + "), steps: " + currentSteps
- + ", post progress as " + progress);
- }
- mHelpMessageLiveData.setValue(null);
- mProgressLiveData.postValue(progress);
- }
-
- @Override
- public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
- if (DEBUG) {
- Log.d(TAG, "onEnrollmentHelp(" + helpMsgId + ", " + helpString + ")");
- }
- mHelpMessageLiveData.postValue(new EnrollmentStatusMessage(helpMsgId, helpString));
- }
-
- @Override
- public void onEnrollmentError(int errMsgId, CharSequence errString) {
- Log.d(TAG, "onEnrollmentError(" + errMsgId + ", " + errString
- + "), cancelingQueueSize:" + mCancelingSignalQueue.size());
- if (FINGERPRINT_ERROR_CANCELED == errMsgId && mCancelingSignalQueue.size() > 0) {
- mCanceledSignalLiveData.postValue(mCancelingSignalQueue.poll());
- } else {
- mErrorMessageLiveData.postValue(new EnrollmentStatusMessage(errMsgId, errString));
- }
- }
-
- @Override
- public void onAcquired(boolean isAcquiredGood) {
- mAcquireLiveData.postValue(isAcquiredGood);
- }
-
- @Override
- public void onUdfpsPointerDown(int sensorId) {
- mPointerDownLiveData.postValue(sensorId);
- }
-
- @Override
- public void onUdfpsPointerUp(int sensorId) {
- mPointerUpLiveData.postValue(sensorId);
- }
- };
-
- public FingerprintEnrollProgressViewModel(@NonNull Application application,
- @NonNull FingerprintUpdater fingerprintUpdater, int userId) {
- super(application);
- mFingerprintUpdater = fingerprintUpdater;
- mUserId = userId;
- }
-
- public void setToken(byte[] token) {
- mToken = token;
- }
-
- /**
- * clear progress
- */
- public void clearProgressLiveData() {
- mProgressLiveData.setValue(new EnrollmentProgress(INITIAL_STEPS, INITIAL_REMAINING));
- mHelpMessageLiveData.setValue(null);
- mErrorMessageLiveData.setValue(null);
- }
-
- /**
- * clear error message
- */
- public void clearErrorMessageLiveData() {
- mErrorMessageLiveData.setValue(null);
- }
-
- public LiveData<EnrollmentProgress> getProgressLiveData() {
- return mProgressLiveData;
- }
-
- public LiveData<EnrollmentStatusMessage> getHelpMessageLiveData() {
- return mHelpMessageLiveData;
- }
-
- public LiveData<EnrollmentStatusMessage> getErrorMessageLiveData() {
- return mErrorMessageLiveData;
- }
-
- public LiveData<Object> getCanceledSignalLiveData() {
- return mCanceledSignalLiveData;
- }
-
- public LiveData<Boolean> getAcquireLiveData() {
- return mAcquireLiveData;
- }
-
- public LiveData<Integer> getPointerDownLiveData() {
- return mPointerDownLiveData;
- }
-
- public LiveData<Integer> getPointerUpLiveData() {
- return mPointerUpLiveData;
- }
-
- /**
- * Starts enrollment and return latest isEnrolling() result
- */
- public Object startEnrollment(@EnrollReason int reason) {
- if (mToken == null) {
- Log.e(TAG, "Null hardware auth token for enroll");
- return null;
- }
- if (mCancellationSignal != null) {
- Log.w(TAG, "Enrolling is running, shall not start again");
- return mCancellationSignal;
- }
- if (DEBUG) {
- Log.e(TAG, "startEnrollment(" + reason + ")");
- }
-
- // Clear data
- mProgressLiveData.setValue(new EnrollmentProgress(INITIAL_STEPS, INITIAL_REMAINING));
- mHelpMessageLiveData.setValue(null);
- mErrorMessageLiveData.setValue(null);
-
- mCancellationSignal = new CancellationSignal();
-
- final Resources res = getApplication().getResources();
- if (reason == ENROLL_ENROLL
- && res.getBoolean(R.bool.enrollment_message_display_controller_flag)) {
- final EnrollmentCallback callback = new MessageDisplayController(
- getApplication().getMainThreadHandler(),
- mEnrollmentCallback,
- SystemClock.elapsedRealtimeClock(),
- res.getInteger(R.integer.enrollment_help_minimum_time_display),
- res.getInteger(R.integer.enrollment_progress_minimum_time_display),
- res.getBoolean(R.bool.enrollment_progress_priority_over_help),
- res.getBoolean(R.bool.enrollment_prioritize_acquire_messages),
- res.getInteger(R.integer.enrollment_collect_time));
- mFingerprintUpdater.enroll(mToken, mCancellationSignal, mUserId, callback, reason,
- new Intent());
- } else {
- mFingerprintUpdater.enroll(mToken, mCancellationSignal, mUserId, mEnrollmentCallback,
- reason, new Intent());
- }
- return mCancellationSignal;
- }
-
- /**
- * Cancels enrollment and return latest isEnrolling result
- */
- public boolean cancelEnrollment() {
- final CancellationSignal cancellationSignal = mCancellationSignal;
- mCancellationSignal = null;
-
- if (cancellationSignal == null) {
- Log.e(TAG, "Fail to cancel enrollment, has cancelled or not start");
- return false;
- } else {
- Log.d(TAG, "enrollment cancelled");
- }
- mCancelingSignalQueue.add(cancellationSignal);
- cancellationSignal.cancel();
-
- return true;
- }
-
- public boolean isEnrolling() {
- return (mCancellationSignal != null);
- }
-
- private int getSteps() {
- return mProgressLiveData.getValue().getSteps();
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModel.kt b/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModel.kt
deleted file mode 100644
index 37b0052..0000000
--- a/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModel.kt
+++ /dev/null
@@ -1,162 +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.biometrics2.ui.viewmodel
-
-import android.app.Application
-import android.content.ComponentName
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.util.Log
-import androidx.activity.result.ActivityResult
-import androidx.lifecycle.AndroidViewModel
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction
-import com.android.settings.biometrics2.data.repository.FingerprintRepository
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest
-import kotlinx.atomicfu.AtomicBoolean
-import kotlinx.atomicfu.atomic
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.launch
-
-/**
- * Fingerprint enrollment view model implementation
- */
-class FingerprintEnrollmentViewModel(
- application: Application,
- private val fingerprintRepository: FingerprintRepository,
- val request: EnrollmentRequest
-) : AndroidViewModel(application) {
-
- val isWaitingActivityResult: AtomicBoolean = atomic(false)
-
- private val _setResultFlow = MutableSharedFlow<ActivityResult>()
- val setResultFlow: SharedFlow<ActivityResult>
- get() = _setResultFlow.asSharedFlow()
-
- var isNewFingerprintAdded = false
- set(value) {
- // Only allow changing this value from false to true
- if (!field) {
- field = value
- }
- }
-
- /**
- * Get override activity result as current ViewModel status.
- *
- * FingerprintEnrollmentActivity supports user enrolls 2nd fingerprint or starts a new flow
- * through Deferred-SUW, Portal-SUW, or SUW Suggestion. Use a method to get override activity
- * result instead of putting these if-else on every setResult(), .
- */
- fun getOverrideActivityResult(
- result: ActivityResult,
- generatingChallengeExtras: Bundle?
- ): ActivityResult {
- val newResultCode = if (isNewFingerprintAdded)
- BiometricEnrollBase.RESULT_FINISHED
- else if (request.isAfterSuwOrSuwSuggestedAction)
- BiometricEnrollBase.RESULT_CANCELED
- else
- result.resultCode
-
- var newData = result.data
- if (newResultCode == BiometricEnrollBase.RESULT_FINISHED
- && generatingChallengeExtras != null
- ) {
- if (newData == null) {
- newData = Intent()
- }
- newData.putExtras(generatingChallengeExtras)
- }
- return ActivityResult(newResultCode, newData)
- }
-
- /**
- * Activity calls this method during onPause() to finish itself when back to background.
- *
- * @param isActivityFinishing Activity has called finish() or not
- * @param isChangingConfigurations Activity is finished because of configuration changed or not.
- */
- fun checkFinishActivityDuringOnPause(
- isActivityFinishing: Boolean,
- isChangingConfigurations: Boolean,
- scope: CoroutineScope
- ) {
- if (isChangingConfigurations || isActivityFinishing || request.isSuw
- || isWaitingActivityResult.value
- ) {
- return
- }
- scope.launch {
- _setResultFlow.emit(ActivityResult(BiometricEnrollBase.RESULT_TIMEOUT, null))
- }
- }
-
- /**
- * Get Suw fingerprint count extra for statistics
- */
- fun getSuwFingerprintCountExtra(userId: Int) = Bundle().also {
- it.putInt(
- SetupFingerprintEnrollIntroduction.EXTRA_FINGERPRINT_ENROLLED_COUNT,
- fingerprintRepository.getNumOfEnrolledFingerprintsSize(userId)
- )
- }
-
- /**
- * Gets the result about fingerprint enrollable
- */
- fun isMaxEnrolledReached(userId: Int): Boolean = with(fingerprintRepository) {
- maxFingerprints <= getNumOfEnrolledFingerprintsSize(userId)
- }
-
- val canAssumeUdfps: Boolean
- get() = fingerprintRepository.canAssumeUdfps()
-
- val canAssumeSfps: Boolean
- get() = fingerprintRepository.canAssumeSfps()
-
- /**
- * Update FINGERPRINT_SUGGESTION_ACTIVITY into package manager
- */
- fun updateFingerprintSuggestionEnableState(userId: Int) {
- // Only show "Add another fingerprint" if the user already enrolled one.
- // "Add fingerprint" will be shown in the main flow if the user hasn't enrolled any
- // fingerprints. If the user already added more than one fingerprint, they already know
- // to add multiple fingerprints so we don't show the suggestion.
- val state = if (fingerprintRepository.getNumOfEnrolledFingerprintsSize(userId) == 1)
- PackageManager.COMPONENT_ENABLED_STATE_ENABLED
- else
- PackageManager.COMPONENT_ENABLED_STATE_DISABLED
- getApplication<Application>().packageManager.setComponentEnabledSetting(
- ComponentName(
- getApplication(),
- FINGERPRINT_SUGGESTION_ACTIVITY
- ),
- state,
- PackageManager.DONT_KILL_APP
- )
- Log.d(TAG, "$FINGERPRINT_SUGGESTION_ACTIVITY enabled state: $state")
- }
-
- companion object {
- private const val TAG = "FingerprintEnrollmentViewModel"
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java
deleted file mode 100644
index 4b0b624..0000000
--- a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollDrawable.java
+++ /dev/null
@@ -1,436 +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.biometrics2.ui.widget;
-
-import android.animation.Animator;
-import android.animation.AnimatorSet;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.PathShape;
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.Build;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.PathParser;
-import android.util.TypedValue;
-import android.view.accessibility.AccessibilityManager;
-import android.view.animation.AccelerateDecelerateInterpolator;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * UDFPS fingerprint drawable that is shown when enrolling
- */
-public class UdfpsEnrollDrawable extends Drawable {
- private static final String TAG = "UdfpsAnimationEnroll";
-
- private static final long TARGET_ANIM_DURATION_LONG = 800L;
- private static final long TARGET_ANIM_DURATION_SHORT = 600L;
- // 1 + SCALE_MAX is the maximum that the moving target will animate to
- private static final float SCALE_MAX = 0.25f;
- private static final float DEFAULT_STROKE_WIDTH = 3f;
- private static final float SCALE = 0.5f;
- private static final String SCALE_OVERRIDE =
- "com.android.systemui.biometrics.UdfpsEnrollHelper.scale";
- private static final String NEW_COORDS_OVERRIDE =
- "com.android.systemui.biometrics.UdfpsNewCoords";
-
- @NonNull
- private final Drawable mMovingTargetFpIcon;
- @NonNull
- private final Paint mSensorOutlinePaint;
- @NonNull
- private final Paint mBlueFill;
- @NonNull
- private final ShapeDrawable mFingerprintDrawable;
- private int mAlpha;
- private boolean mSkipDraw = false;
-
- @Nullable
- private RectF mSensorRect;
-
- // Moving target animator set
- @Nullable
- AnimatorSet mTargetAnimatorSet;
- // Moving target location
- float mCurrentX;
- float mCurrentY;
- // Moving target size
- float mCurrentScale = 1.f;
-
- @NonNull
- private final Animator.AnimatorListener mTargetAnimListener;
-
- private boolean mShouldShowTipHint = false;
- private boolean mShouldShowEdgeHint = false;
-
- private int mEnrollIcon;
- private int mMovingTargetFill;
-
- private int mTotalSteps = -1;
- private int mRemainingSteps = -1;
- private int mLocationsEnrolled = 0;
- private int mCenterTouchCount = 0;
-
- private FingerprintManager mFingerprintManager;
-
- private boolean mAccessibilityEnabled;
- private Context mContext;
- private final List<PointF> mGuidedEnrollmentPoints;
-
- UdfpsEnrollDrawable(@NonNull Context context, @Nullable AttributeSet attrs) {
- mFingerprintDrawable = defaultFactory(context);
-
- loadResources(context, attrs);
- mSensorOutlinePaint = new Paint(0 /* flags */);
- mSensorOutlinePaint.setAntiAlias(true);
- mSensorOutlinePaint.setColor(mMovingTargetFill);
- mSensorOutlinePaint.setStyle(Paint.Style.FILL);
-
- mBlueFill = new Paint(0 /* flags */);
- mBlueFill.setAntiAlias(true);
- mBlueFill.setColor(mMovingTargetFill);
- mBlueFill.setStyle(Paint.Style.FILL);
-
- mMovingTargetFpIcon = context.getResources()
- .getDrawable(R.drawable.ic_enrollment_fingerprint, null);
- mMovingTargetFpIcon.setTint(mEnrollIcon);
- mMovingTargetFpIcon.mutate();
-
- mFingerprintDrawable.setTint(mEnrollIcon);
-
- setAlpha(255);
- mTargetAnimListener = new Animator.AnimatorListener() {
- @Override
- public void onAnimationStart(Animator animation) {
- }
-
- @Override
- public void onAnimationEnd(Animator animation) {
- updateTipHintVisibility();
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
- }
- };
- mContext = context;
- mFingerprintManager = context.getSystemService(FingerprintManager.class);
- final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);
- mAccessibilityEnabled = am.isEnabled();
- mGuidedEnrollmentPoints = new ArrayList<>();
- initEnrollPoint(context);
- }
-
- /** The [sensorRect] coordinates for the sensor area. */
- void onSensorRectUpdated(@NonNull RectF sensorRect) {
- int margin = ((int) sensorRect.height()) / 8;
- Rect bounds = new Rect((int) (sensorRect.left) + margin, (int) (sensorRect.top) + margin,
- (int) (sensorRect.right) - margin, (int) (sensorRect.bottom) - margin);
- updateFingerprintIconBounds(bounds);
- mSensorRect = sensorRect;
- }
-
- void setShouldSkipDraw(boolean skipDraw) {
- if (mSkipDraw == skipDraw) {
- return;
- }
- mSkipDraw = skipDraw;
- invalidateSelf();
- }
-
- void updateFingerprintIconBounds(@NonNull Rect bounds) {
- mFingerprintDrawable.setBounds(bounds);
- invalidateSelf();
- mMovingTargetFpIcon.setBounds(bounds);
- invalidateSelf();
- }
-
- void onEnrollmentProgress(final int remaining, final int totalSteps) {
- if (mTotalSteps == -1) {
- mTotalSteps = totalSteps;
- }
-
- if (remaining != mRemainingSteps) {
- mLocationsEnrolled++;
- if (isCenterEnrollmentStage()) {
- mCenterTouchCount++;
- }
- }
- mRemainingSteps = remaining;
-
- if (!isCenterEnrollmentStage()) {
- if (mTargetAnimatorSet != null && mTargetAnimatorSet.isRunning()) {
- mTargetAnimatorSet.end();
- }
-
- final PointF point = getNextGuidedEnrollmentPoint();
- if (mCurrentX != point.x || mCurrentY != point.y) {
- final ValueAnimator x = ValueAnimator.ofFloat(mCurrentX, point.x);
- x.addUpdateListener(animation -> {
- mCurrentX = (float) animation.getAnimatedValue();
- invalidateSelf();
- });
-
- final ValueAnimator y = ValueAnimator.ofFloat(mCurrentY, point.y);
- y.addUpdateListener(animation -> {
- mCurrentY = (float) animation.getAnimatedValue();
- invalidateSelf();
- });
-
- final boolean isMovingToCenter = point.x == 0f && point.y == 0f;
- final long duration = isMovingToCenter
- ? TARGET_ANIM_DURATION_SHORT
- : TARGET_ANIM_DURATION_LONG;
-
- final ValueAnimator scale = ValueAnimator.ofFloat(0, (float) Math.PI);
- scale.setDuration(duration);
- scale.addUpdateListener(animation -> {
- // Grow then shrink
- mCurrentScale = 1
- + SCALE_MAX * (float) Math.sin((float) animation.getAnimatedValue());
- invalidateSelf();
- });
-
- mTargetAnimatorSet = new AnimatorSet();
-
- mTargetAnimatorSet.setInterpolator(new AccelerateDecelerateInterpolator());
- mTargetAnimatorSet.setDuration(duration);
- mTargetAnimatorSet.addListener(mTargetAnimListener);
- mTargetAnimatorSet.playTogether(x, y, scale);
- mTargetAnimatorSet.start();
- } else {
- updateTipHintVisibility();
- }
- } else {
- updateTipHintVisibility();
- }
-
- updateEdgeHintVisibility();
- }
-
- @Override
- public void draw(@NonNull Canvas canvas) {
- if (mSkipDraw) {
- return;
- }
-
- // Draw moving target
- if (!isCenterEnrollmentStage()) {
- canvas.save();
- canvas.translate(mCurrentX, mCurrentY);
-
- if (mSensorRect != null) {
- canvas.scale(mCurrentScale, mCurrentScale,
- mSensorRect.centerX(), mSensorRect.centerY());
- canvas.drawOval(mSensorRect, mBlueFill);
- }
-
- mMovingTargetFpIcon.draw(canvas);
- canvas.restore();
- } else {
- if (mSensorRect != null) {
- canvas.drawOval(mSensorRect, mSensorOutlinePaint);
- }
- mFingerprintDrawable.draw(canvas);
- mFingerprintDrawable.setAlpha(getAlpha());
- mSensorOutlinePaint.setAlpha(getAlpha());
- }
-
- }
-
- @Override
- public void setAlpha(int alpha) {
- mAlpha = alpha;
- mFingerprintDrawable.setAlpha(alpha);
- mSensorOutlinePaint.setAlpha(alpha);
- mBlueFill.setAlpha(alpha);
- mMovingTargetFpIcon.setAlpha(alpha);
- invalidateSelf();
- }
-
- @Override
- public int getAlpha() {
- return mAlpha;
- }
-
- @Override
- public void setColorFilter(@Nullable ColorFilter colorFilter) {
- }
-
- @Override
- public int getOpacity() {
- return 0;
- }
-
- private void updateTipHintVisibility() {
- final boolean shouldShow = isTipEnrollmentStage();
- // With the new update, we will git rid of most of this code, and instead
- // we will change the fingerprint icon.
- if (mShouldShowTipHint == shouldShow) {
- return;
- }
- mShouldShowTipHint = shouldShow;
- }
-
- private void updateEdgeHintVisibility() {
- final boolean shouldShow = isEdgeEnrollmentStage();
- if (mShouldShowEdgeHint == shouldShow) {
- return;
- }
- mShouldShowEdgeHint = shouldShow;
- }
-
- private ShapeDrawable defaultFactory(Context context) {
- String fpPath = context.getResources().getString(R.string.config_udfpsIcon);
- ShapeDrawable drawable = new ShapeDrawable(
- new PathShape(PathParser.createPathFromPathData(fpPath), 72f, 72f)
- );
- drawable.mutate();
- drawable.getPaint().setStyle(Paint.Style.STROKE);
- drawable.getPaint().setStrokeCap(Paint.Cap.ROUND);
- drawable.getPaint().setStrokeWidth(DEFAULT_STROKE_WIDTH);
- return drawable;
- }
-
- private void loadResources(Context context, @Nullable AttributeSet attrs) {
- final TypedArray ta = context.obtainStyledAttributes(attrs,
- R.styleable.BiometricsEnrollView, R.attr.biometricsEnrollStyle,
- R.style.BiometricsEnrollStyle);
- mEnrollIcon = ta.getColor(R.styleable.BiometricsEnrollView_biometricsEnrollIcon, 0);
- mMovingTargetFill = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsMovingTargetFill, 0);
- ta.recycle();
- }
-
- private boolean isCenterEnrollmentStage() {
- if (mTotalSteps == -1 || mRemainingSteps == -1) {
- return true;
- }
- return mTotalSteps - mRemainingSteps < getStageThresholdSteps(mTotalSteps, 0);
- }
-
- private int getStageThresholdSteps(int totalSteps, int stageIndex) {
- return Math.round(totalSteps * mFingerprintManager.getEnrollStageThreshold(stageIndex));
- }
-
- private PointF getNextGuidedEnrollmentPoint() {
- if (mAccessibilityEnabled || !isGuidedEnrollmentStage()) {
- return new PointF(0f, 0f);
- }
-
- float scale = SCALE;
- if (Build.IS_ENG || Build.IS_USERDEBUG) {
- scale = Settings.Secure.getFloatForUser(mContext.getContentResolver(),
- SCALE_OVERRIDE, SCALE,
- UserHandle.USER_CURRENT);
- }
- final int index = mLocationsEnrolled - mCenterTouchCount;
- final PointF originalPoint = mGuidedEnrollmentPoints
- .get(index % mGuidedEnrollmentPoints.size());
- return new PointF(originalPoint.x * scale, originalPoint.y * scale);
- }
-
- private boolean isGuidedEnrollmentStage() {
- if (mAccessibilityEnabled || mTotalSteps == -1 || mRemainingSteps == -1) {
- return false;
- }
- final int progressSteps = mTotalSteps - mRemainingSteps;
- return progressSteps >= getStageThresholdSteps(mTotalSteps, 0)
- && progressSteps < getStageThresholdSteps(mTotalSteps, 1);
- }
-
- private boolean isTipEnrollmentStage() {
- if (mTotalSteps == -1 || mRemainingSteps == -1) {
- return false;
- }
- final int progressSteps = mTotalSteps - mRemainingSteps;
- return progressSteps >= getStageThresholdSteps(mTotalSteps, 1)
- && progressSteps < getStageThresholdSteps(mTotalSteps, 2);
- }
-
- private boolean isEdgeEnrollmentStage() {
- if (mTotalSteps == -1 || mRemainingSteps == -1) {
- return false;
- }
- return mTotalSteps - mRemainingSteps >= getStageThresholdSteps(mTotalSteps, 2);
- }
-
- private void initEnrollPoint(Context context) {
- // Number of pixels per mm
- float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 1,
- context.getResources().getDisplayMetrics());
- boolean useNewCoords = Settings.Secure.getIntForUser(mContext.getContentResolver(),
- NEW_COORDS_OVERRIDE, 0,
- UserHandle.USER_CURRENT) != 0;
- if (useNewCoords && (Build.IS_ENG || Build.IS_USERDEBUG)) {
- Log.v(TAG, "Using new coordinates");
- mGuidedEnrollmentPoints.add(new PointF(-0.15f * px, -1.02f * px));
- mGuidedEnrollmentPoints.add(new PointF(-0.15f * px, 1.02f * px));
- mGuidedEnrollmentPoints.add(new PointF(0.29f * px, 0.00f * px));
- mGuidedEnrollmentPoints.add(new PointF(2.17f * px, -2.35f * px));
- mGuidedEnrollmentPoints.add(new PointF(1.07f * px, -3.96f * px));
- mGuidedEnrollmentPoints.add(new PointF(-0.37f * px, -4.31f * px));
- mGuidedEnrollmentPoints.add(new PointF(-1.69f * px, -3.29f * px));
- mGuidedEnrollmentPoints.add(new PointF(-2.48f * px, -1.23f * px));
- mGuidedEnrollmentPoints.add(new PointF(-2.48f * px, 1.23f * px));
- mGuidedEnrollmentPoints.add(new PointF(-1.69f * px, 3.29f * px));
- mGuidedEnrollmentPoints.add(new PointF(-0.37f * px, 4.31f * px));
- mGuidedEnrollmentPoints.add(new PointF(1.07f * px, 3.96f * px));
- mGuidedEnrollmentPoints.add(new PointF(2.17f * px, 2.35f * px));
- mGuidedEnrollmentPoints.add(new PointF(2.58f * px, 0.00f * px));
- } else {
- Log.v(TAG, "Using old coordinates");
- mGuidedEnrollmentPoints.add(new PointF(2.00f * px, 0.00f * px));
- mGuidedEnrollmentPoints.add(new PointF(0.87f * px, -2.70f * px));
- mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, -1.31f * px));
- mGuidedEnrollmentPoints.add(new PointF(-1.80f * px, 1.31f * px));
- mGuidedEnrollmentPoints.add(new PointF(0.88f * px, 2.70f * px));
- mGuidedEnrollmentPoints.add(new PointF(3.94f * px, -1.06f * px));
- mGuidedEnrollmentPoints.add(new PointF(2.90f * px, -4.14f * px));
- mGuidedEnrollmentPoints.add(new PointF(-0.52f * px, -5.95f * px));
- mGuidedEnrollmentPoints.add(new PointF(-3.33f * px, -3.33f * px));
- mGuidedEnrollmentPoints.add(new PointF(-3.99f * px, -0.35f * px));
- mGuidedEnrollmentPoints.add(new PointF(-3.62f * px, 2.54f * px));
- mGuidedEnrollmentPoints.add(new PointF(-1.49f * px, 5.57f * px));
- mGuidedEnrollmentPoints.add(new PointF(2.29f * px, 4.92f * px));
- mGuidedEnrollmentPoints.add(new PointF(3.82f * px, 1.78f * px));
- }
- }
-
-}
diff --git a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
deleted file mode 100644
index 8cb4bb2..0000000
--- a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
+++ /dev/null
@@ -1,422 +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.biometrics2.ui.widget;
-
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.os.Process;
-import android.os.VibrationAttributes;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.accessibility.AccessibilityManager;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
-import android.view.animation.OvershootInterpolator;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-
-/**
- * UDFPS enrollment progress bar.
- */
-public class UdfpsEnrollProgressBarDrawable extends Drawable {
- private static final String TAG = "UdfpsProgressBar";
-
- private static final long CHECKMARK_ANIMATION_DELAY_MS = 200L;
- private static final long CHECKMARK_ANIMATION_DURATION_MS = 300L;
- private static final long FILL_COLOR_ANIMATION_DURATION_MS = 350L;
- private static final long PROGRESS_ANIMATION_DURATION_MS = 400L;
- private static final float STROKE_WIDTH_DP = 12f;
- private static final Interpolator DEACCEL = new DecelerateInterpolator();
-
- private static final VibrationEffect VIBRATE_EFFECT_ERROR =
- VibrationEffect.createWaveform(new long[]{0, 5, 55, 60}, -1);
- private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES =
- VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY);
-
- private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES =
- VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK);
-
- private static final VibrationEffect SUCCESS_VIBRATION_EFFECT =
- VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
-
- private final float mStrokeWidthPx;
- @ColorInt
- private final int mProgressColor;
- @ColorInt
- private final int mHelpColor;
- @ColorInt
- private final int mOnFirstBucketFailedColor;
- @NonNull
- private final Drawable mCheckmarkDrawable;
- @NonNull
- private final Interpolator mCheckmarkInterpolator;
- @NonNull
- private final Paint mBackgroundPaint;
- @VisibleForTesting
- @NonNull
- final Paint mFillPaint;
- @NonNull
- private final Vibrator mVibrator;
- @NonNull
- private final boolean mIsAccessibilityEnabled;
- @NonNull
- private final Context mContext;
-
- private boolean mAfterFirstTouch;
-
- private int mRemainingSteps = 0;
- private int mTotalSteps = 0;
- private float mProgress = 0f;
- @Nullable
- private ValueAnimator mProgressAnimator;
- @NonNull
- private final ValueAnimator.AnimatorUpdateListener mProgressUpdateListener;
-
- private boolean mShowingHelp = false;
- @Nullable
- private ValueAnimator mFillColorAnimator;
- @NonNull
- private final ValueAnimator.AnimatorUpdateListener mFillColorUpdateListener;
-
- @Nullable
- private ValueAnimator mBackgroundColorAnimator;
- @NonNull
- private final ValueAnimator.AnimatorUpdateListener mBackgroundColorUpdateListener;
-
- private boolean mComplete = false;
- private float mCheckmarkScale = 0f;
- @Nullable
- private ValueAnimator mCheckmarkAnimator;
- @NonNull
- private final ValueAnimator.AnimatorUpdateListener mCheckmarkUpdateListener;
-
- private int mMovingTargetFill;
- private int mMovingTargetFillError;
- private int mEnrollProgress;
- private int mEnrollProgressHelp;
- private int mEnrollProgressHelpWithTalkback;
-
- public UdfpsEnrollProgressBarDrawable(@NonNull Context context, @Nullable AttributeSet attrs) {
- mContext = context;
-
- loadResources(context, attrs);
- float density = context.getResources().getDisplayMetrics().densityDpi;
- mStrokeWidthPx = STROKE_WIDTH_DP * (density / DisplayMetrics.DENSITY_DEFAULT);
- mProgressColor = mEnrollProgress;
- final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);
- mIsAccessibilityEnabled = am.isTouchExplorationEnabled();
- mOnFirstBucketFailedColor = mMovingTargetFillError;
- if (!mIsAccessibilityEnabled) {
- mHelpColor = mEnrollProgressHelp;
- } else {
- mHelpColor = mEnrollProgressHelpWithTalkback;
- }
- mCheckmarkDrawable = context.getDrawable(R.drawable.udfps_enroll_checkmark);
- mCheckmarkDrawable.mutate();
- mCheckmarkInterpolator = new OvershootInterpolator();
-
- mBackgroundPaint = new Paint();
- mBackgroundPaint.setStrokeWidth(mStrokeWidthPx);
- mBackgroundPaint.setColor(mMovingTargetFill);
- mBackgroundPaint.setAntiAlias(true);
- mBackgroundPaint.setStyle(Paint.Style.STROKE);
- mBackgroundPaint.setStrokeCap(Paint.Cap.ROUND);
-
- // Progress fill should *not* use the extracted system color.
- mFillPaint = new Paint();
- mFillPaint.setStrokeWidth(mStrokeWidthPx);
- mFillPaint.setColor(mProgressColor);
- mFillPaint.setAntiAlias(true);
- mFillPaint.setStyle(Paint.Style.STROKE);
- mFillPaint.setStrokeCap(Paint.Cap.ROUND);
-
- mVibrator = mContext.getSystemService(Vibrator.class);
-
- mProgressUpdateListener = animation -> {
- mProgress = (float) animation.getAnimatedValue();
- invalidateSelf();
- };
-
- mFillColorUpdateListener = animation -> {
- mFillPaint.setColor((int) animation.getAnimatedValue());
- invalidateSelf();
- };
-
- mCheckmarkUpdateListener = animation -> {
- mCheckmarkScale = (float) animation.getAnimatedValue();
- invalidateSelf();
- };
-
- mBackgroundColorUpdateListener = animation -> {
- mBackgroundPaint.setColor((int) animation.getAnimatedValue());
- invalidateSelf();
- };
- }
-
- void onEnrollmentProgress(final int remaining, final int totalSteps) {
- mAfterFirstTouch = true;
- updateState(remaining, totalSteps, false /* showingHelp */);
- }
-
- void onEnrollmentHelp(int remaining, int totalSteps) {
- updateState(remaining, totalSteps, true /* showingHelp */);
- }
-
- void onLastStepAcquired() {
- updateState(0, mTotalSteps, false /* showingHelp */);
- }
-
- private void updateState(int remainingSteps, int totalSteps, boolean showingHelp) {
- updateProgress(remainingSteps, totalSteps, showingHelp);
- updateFillColor(showingHelp);
- }
-
- private void updateProgress(int remainingSteps, int totalSteps, boolean showingHelp) {
- if (mRemainingSteps == remainingSteps && mTotalSteps == totalSteps) {
- return;
- }
-
- if (mShowingHelp) {
- if (mVibrator != null && mIsAccessibilityEnabled) {
- mVibrator.vibrate(Process.myUid(), mContext.getOpPackageName(),
- VIBRATE_EFFECT_ERROR, getClass().getSimpleName() + "::onEnrollmentHelp",
- FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
- }
- } else {
- // If the first touch is an error, remainingSteps will be -1 and the callback
- // doesn't come from onEnrollmentHelp. If we are in the accessibility flow,
- // we still would like to vibrate.
- if (mVibrator != null) {
- if (remainingSteps == -1 && mIsAccessibilityEnabled) {
- mVibrator.vibrate(Process.myUid(), mContext.getOpPackageName(),
- VIBRATE_EFFECT_ERROR,
- getClass().getSimpleName() + "::onFirstTouchError",
- FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
- } else if (remainingSteps != -1 && !mIsAccessibilityEnabled) {
- mVibrator.vibrate(Process.myUid(),
- mContext.getOpPackageName(),
- SUCCESS_VIBRATION_EFFECT,
- getClass().getSimpleName() + "::OnEnrollmentProgress",
- HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES);
- }
- }
- }
-
- mShowingHelp = showingHelp;
- mRemainingSteps = remainingSteps;
- mTotalSteps = totalSteps;
-
- final int progressSteps = Math.max(0, totalSteps - remainingSteps);
-
- // If needed, add 1 to progress and total steps to account for initial touch.
- final int adjustedSteps = mAfterFirstTouch ? progressSteps + 1 : progressSteps;
- final int adjustedTotal = mAfterFirstTouch ? mTotalSteps + 1 : mTotalSteps;
-
- final float targetProgress = Math.min(1f, (float) adjustedSteps / (float) adjustedTotal);
-
- if (mProgressAnimator != null && mProgressAnimator.isRunning()) {
- mProgressAnimator.cancel();
- }
-
- mProgressAnimator = ValueAnimator.ofFloat(mProgress, targetProgress);
- mProgressAnimator.setDuration(PROGRESS_ANIMATION_DURATION_MS);
- mProgressAnimator.addUpdateListener(mProgressUpdateListener);
- mProgressAnimator.start();
-
- if (remainingSteps == 0) {
- startCompletionAnimation();
- } else if (remainingSteps > 0) {
- rollBackCompletionAnimation();
- }
- }
-
- private void animateBackgroundColor() {
- if (mBackgroundColorAnimator != null && mBackgroundColorAnimator.isRunning()) {
- mBackgroundColorAnimator.end();
- }
- mBackgroundColorAnimator = ValueAnimator.ofArgb(mBackgroundPaint.getColor(),
- mOnFirstBucketFailedColor);
- mBackgroundColorAnimator.setDuration(FILL_COLOR_ANIMATION_DURATION_MS);
- mBackgroundColorAnimator.setRepeatCount(1);
- mBackgroundColorAnimator.setRepeatMode(ValueAnimator.REVERSE);
- mBackgroundColorAnimator.setInterpolator(DEACCEL);
- mBackgroundColorAnimator.addUpdateListener(mBackgroundColorUpdateListener);
- mBackgroundColorAnimator.start();
- }
-
- private void updateFillColor(boolean showingHelp) {
- if (!mAfterFirstTouch && showingHelp) {
- // If we are on the first touch, animate the background color
- // instead of the progress color.
- animateBackgroundColor();
- return;
- }
-
- if (mFillColorAnimator != null && mFillColorAnimator.isRunning()) {
- mFillColorAnimator.end();
- }
-
- @ColorInt final int targetColor = showingHelp ? mHelpColor : mProgressColor;
- mFillColorAnimator = ValueAnimator.ofArgb(mFillPaint.getColor(), targetColor);
- mFillColorAnimator.setDuration(FILL_COLOR_ANIMATION_DURATION_MS);
- mFillColorAnimator.setRepeatCount(1);
- mFillColorAnimator.setRepeatMode(ValueAnimator.REVERSE);
- mFillColorAnimator.setInterpolator(DEACCEL);
- mFillColorAnimator.addUpdateListener(mFillColorUpdateListener);
- mFillColorAnimator.start();
- }
-
- private void startCompletionAnimation() {
- if (mComplete) {
- return;
- }
- mComplete = true;
-
- if (mCheckmarkAnimator != null && mCheckmarkAnimator.isRunning()) {
- mCheckmarkAnimator.cancel();
- }
-
- mCheckmarkAnimator = ValueAnimator.ofFloat(mCheckmarkScale, 1f);
- mCheckmarkAnimator.setStartDelay(CHECKMARK_ANIMATION_DELAY_MS);
- mCheckmarkAnimator.setDuration(CHECKMARK_ANIMATION_DURATION_MS);
- mCheckmarkAnimator.setInterpolator(mCheckmarkInterpolator);
- mCheckmarkAnimator.addUpdateListener(mCheckmarkUpdateListener);
- mCheckmarkAnimator.start();
- }
-
- private void rollBackCompletionAnimation() {
- if (!mComplete) {
- return;
- }
- mComplete = false;
-
- // Adjust duration based on how much of the completion animation has played.
- final float animatedFraction = mCheckmarkAnimator != null
- ? mCheckmarkAnimator.getAnimatedFraction()
- : 0f;
- final long durationMs = Math.round(CHECKMARK_ANIMATION_DELAY_MS * animatedFraction);
-
- if (mCheckmarkAnimator != null && mCheckmarkAnimator.isRunning()) {
- mCheckmarkAnimator.cancel();
- }
-
- mCheckmarkAnimator = ValueAnimator.ofFloat(mCheckmarkScale, 0f);
- mCheckmarkAnimator.setDuration(durationMs);
- mCheckmarkAnimator.addUpdateListener(mCheckmarkUpdateListener);
- mCheckmarkAnimator.start();
- }
-
- private void loadResources(Context context, @Nullable AttributeSet attrs) {
- final TypedArray ta = context.obtainStyledAttributes(attrs,
- R.styleable.BiometricsEnrollView, R.attr.biometricsEnrollStyle,
- R.style.BiometricsEnrollStyle);
- mMovingTargetFill = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsMovingTargetFill, 0);
- mMovingTargetFillError = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsMovingTargetFillError, 0);
- mEnrollProgress = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsEnrollProgress, 0);
- mEnrollProgressHelp = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsEnrollProgressHelp, 0);
- mEnrollProgressHelpWithTalkback = ta.getColor(
- R.styleable.BiometricsEnrollView_biometricsEnrollProgressHelpWithTalkback, 0);
- ta.recycle();
- }
-
- @Override
- public void draw(@NonNull Canvas canvas) {
- canvas.save();
-
- // Progress starts from the top, instead of the right
- canvas.rotate(-90f, getBounds().centerX(), getBounds().centerY());
-
- final float halfPaddingPx = mStrokeWidthPx / 2f;
-
- if (mProgress < 1f) {
- // Draw the background color of the progress circle.
- canvas.drawArc(
- halfPaddingPx,
- halfPaddingPx,
- getBounds().right - halfPaddingPx,
- getBounds().bottom - halfPaddingPx,
- 0f /* startAngle */,
- 360f /* sweepAngle */,
- false /* useCenter */,
- mBackgroundPaint);
- }
-
- if (mProgress > 0f) {
- // Draw the filled portion of the progress circle.
- canvas.drawArc(
- halfPaddingPx,
- halfPaddingPx,
- getBounds().right - halfPaddingPx,
- getBounds().bottom - halfPaddingPx,
- 0f /* startAngle */,
- 360f * mProgress /* sweepAngle */,
- false /* useCenter */,
- mFillPaint);
- }
-
- canvas.restore();
-
- if (mCheckmarkScale > 0f) {
- final float offsetScale = (float) Math.sqrt(2) / 2f;
- final float centerXOffset = (getBounds().width() - mStrokeWidthPx) / 2f * offsetScale;
- final float centerYOffset = (getBounds().height() - mStrokeWidthPx) / 2f * offsetScale;
- final float centerX = getBounds().centerX() + centerXOffset;
- final float centerY = getBounds().centerY() + centerYOffset;
-
- final float boundsXOffset =
- mCheckmarkDrawable.getIntrinsicWidth() / 2f * mCheckmarkScale;
- final float boundsYOffset =
- mCheckmarkDrawable.getIntrinsicHeight() / 2f * mCheckmarkScale;
-
- final int left = Math.round(centerX - boundsXOffset);
- final int top = Math.round(centerY - boundsYOffset);
- final int right = Math.round(centerX + boundsXOffset);
- final int bottom = Math.round(centerY + boundsYOffset);
- mCheckmarkDrawable.setBounds(left, top, right, bottom);
- mCheckmarkDrawable.draw(canvas);
- }
- }
-
- @Override
- public void setAlpha(int alpha) {
- }
-
- @Override
- public void setColorFilter(@Nullable ColorFilter colorFilter) {
- }
-
- @Override
- public int getOpacity() {
- return 0;
- }
-}
diff --git a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
deleted file mode 100644
index c99cb2d..0000000
--- a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollView.java
+++ /dev/null
@@ -1,277 +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.biometrics2.ui.widget;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.RotationUtils;
-import android.view.DisplayInfo;
-import android.view.Surface;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.R;
-import com.android.systemui.biometrics.UdfpsUtils;
-import com.android.systemui.biometrics.shared.model.UdfpsOverlayParams;
-
-/**
- * View corresponding with udfps_enroll_view.xml
- */
-public class UdfpsEnrollView extends FrameLayout {
- private static final String TAG = "UdfpsEnrollView";
- @NonNull
- private final UdfpsEnrollDrawable mFingerprintDrawable;
- @NonNull
- private final UdfpsEnrollProgressBarDrawable mFingerprintProgressDrawable;
- @NonNull
- private final Handler mHandler;
-
- @NonNull
- private ImageView mFingerprintProgressView;
- private UdfpsUtils mUdfpsUtils;
-
- private int mProgressBarRadius;
-
- private Rect mSensorRect;
- private UdfpsOverlayParams mOverlayParams;
- private FingerprintSensorPropertiesInternal mSensorProperties;
-
- private int mTotalSteps = -1;
- private int mRemainingSteps = -1;
- private int mLocationsEnrolled = 0;
- private int mCenterTouchCount = 0;
-
- public UdfpsEnrollView(Context context, @Nullable AttributeSet attrs) {
- super(context, attrs);
- mFingerprintDrawable = new UdfpsEnrollDrawable(mContext, attrs);
- mFingerprintProgressDrawable = new UdfpsEnrollProgressBarDrawable(context, attrs);
- mHandler = new Handler(Looper.getMainLooper());
- mUdfpsUtils = new UdfpsUtils();
- }
-
- @Override
- protected void onFinishInflate() {
- ImageView fingerprintView = findViewById(R.id.udfps_enroll_animation_fp_view);
- fingerprintView.setImageDrawable(mFingerprintDrawable);
- mFingerprintProgressView = findViewById(R.id.udfps_enroll_animation_fp_progress_view);
- mFingerprintProgressView.setImageDrawable(mFingerprintProgressDrawable);
- }
-
- /**
- * Receive enroll progress information from FingerprintEnrollEnrollingUdfpsFragment
- */
- public void onEnrollmentProgress(int remaining, int totalSteps) {
- if (mTotalSteps == -1) {
- mTotalSteps = totalSteps;
- }
- mRemainingSteps = remaining;
- mHandler.post(() -> {
- mFingerprintProgressDrawable.onEnrollmentProgress(remaining, totalSteps);
- mFingerprintDrawable.onEnrollmentProgress(remaining, totalSteps);
- });
- }
-
- /**
- * Receive enroll help information from FingerprintEnrollEnrollingUdfpsFragment
- */
- public void onEnrollmentHelp() {
- mHandler.post(
- () -> mFingerprintProgressDrawable.onEnrollmentHelp(mRemainingSteps, mTotalSteps));
- }
-
- /**
- * Receive onAcquired from FingerprintEnrollEnrollingUdfpsFragment
- */
- public void onAcquired(boolean isAcquiredGood) {
- final boolean animateIfLastStepGood =
- isAcquiredGood && (mRemainingSteps <= 2 && mRemainingSteps >= 0);
- mHandler.post(() -> {
- onFingerUp();
- if (animateIfLastStepGood) mFingerprintProgressDrawable.onLastStepAcquired();
- });
- }
-
- /**
- * Receive onPointerDown from FingerprintEnrollEnrollingUdfpsFragment
- */
- public void onPointerDown(int sensorId) {
- onFingerDown();
- }
-
- /**
- * Receive onPointerUp from FingerprintEnrollEnrollingUdfpsFragment
- */
- public void onPointerUp(int sensorId) {
- onFingerUp();
- }
-
- private final ViewTreeObserver.OnDrawListener mOnDrawListener = this::updateOverlayParams;
-
- /**
- * setup SensorProperties
- */
- public void setSensorProperties(FingerprintSensorPropertiesInternal properties) {
- mSensorProperties = properties;
- ((ViewGroup) getParent()).getViewTreeObserver().addOnDrawListener(mOnDrawListener);
- }
-
- @Override
- protected void onDetachedFromWindow() {
- final ViewGroup parent = (ViewGroup) getParent();
- if (parent != null) {
- final ViewTreeObserver observer = parent.getViewTreeObserver();
- if (observer != null) {
- observer.removeOnDrawListener(mOnDrawListener);
- }
- }
- super.onDetachedFromWindow();
- }
-
- private void onSensorRectUpdated() {
- updateDimensions();
-
- // Updates sensor rect in relation to the overlay view
- mSensorRect.set(getPaddingX(), getPaddingY(),
- (mOverlayParams.getSensorBounds().width() + getPaddingX()),
- (mOverlayParams.getSensorBounds().height() + getPaddingY()));
- mFingerprintDrawable.onSensorRectUpdated(new RectF(mSensorRect));
- }
-
- private void updateDimensions() {
- // Original sensorBounds assume portrait mode.
- final Rect rotatedBounds = new Rect(mOverlayParams.getSensorBounds());
- int rotation = mOverlayParams.getRotation();
- if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
- RotationUtils.rotateBounds(
- rotatedBounds,
- mOverlayParams.getNaturalDisplayWidth(),
- mOverlayParams.getNaturalDisplayHeight(),
- rotation
- );
- }
-
- RelativeLayout parent = ((RelativeLayout) getParent());
- if (parent == null) {
- Log.e(TAG, "Fail to updateDimensions for " + this + ", parent null");
- return;
- }
- final int[] coords = parent.getLocationOnScreen();
- final int parentLeft = coords[0];
- final int parentTop = coords[1];
- final int parentRight = parentLeft + parent.getWidth();
- final int parentBottom = parentTop + parent.getHeight();
-
-
- RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(getWidth(),
- getHeight());
- if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {
- params.addRule(RelativeLayout.ALIGN_PARENT_TOP);
- params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
- params.rightMargin = parentRight - rotatedBounds.right - getPaddingX();
- params.topMargin = rotatedBounds.top - parentTop - getPaddingY();
- } else {
- if (rotation == Surface.ROTATION_90) {
- params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
- params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
- params.rightMargin = parentRight - rotatedBounds.right - getPaddingX();
- params.bottomMargin = parentBottom - rotatedBounds.bottom - getPaddingY();
- } else {
- params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
- params.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
- params.bottomMargin = parentBottom - rotatedBounds.bottom - getPaddingY();
- params.leftMargin = rotatedBounds.left - parentLeft - getPaddingX();
- }
- }
- params.height = rotatedBounds.height() + 2 * getPaddingX();
- params.width = rotatedBounds.width() + 2 * getPaddingY();
- setLayoutParams(params);
- }
-
- private void onFingerDown() {
- mFingerprintDrawable.setShouldSkipDraw(true);
- mFingerprintDrawable.invalidateSelf();
- }
-
- private void onFingerUp() {
- mFingerprintDrawable.setShouldSkipDraw(false);
- mFingerprintDrawable.invalidateSelf();
- }
-
- private int getPaddingX() {
- return mProgressBarRadius;
- }
-
- private int getPaddingY() {
- return mProgressBarRadius;
- }
-
- private void updateOverlayParams() {
-
- if (mSensorProperties == null) {
- android.util.Log.e(TAG, "There is no sensor info!");
- return;
- }
-
- DisplayInfo displayInfo = new DisplayInfo();
- if (getDisplay() == null) {
- android.util.Log.e(TAG, "Can not get display");
- return;
- }
- getDisplay().getDisplayInfo(displayInfo);
- Rect udfpsBounds = mSensorProperties.getLocation().getRect();
- float scaleFactor = mUdfpsUtils.getScaleFactor(displayInfo);
- udfpsBounds.scale(scaleFactor);
-
- final Rect overlayBounds = new Rect(
- 0, /* left */
- displayInfo.getNaturalHeight() / 2, /* top */
- displayInfo.getNaturalWidth(), /* right */
- displayInfo.getNaturalHeight() /* botom */);
-
- mOverlayParams = new UdfpsOverlayParams(
- udfpsBounds,
- overlayBounds,
- displayInfo.getNaturalWidth(),
- displayInfo.getNaturalHeight(),
- scaleFactor,
- displayInfo.rotation,
- mSensorProperties.sensorType);
-
- post(() -> {
- mProgressBarRadius =
- (int) (mOverlayParams.getScaleFactor() * getContext().getResources().getInteger(
- R.integer.config_udfpsEnrollProgressBar));
- mSensorRect = new Rect(mOverlayParams.getSensorBounds());
-
- onSensorRectUpdated();
- });
-
- }
-}
-
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 1326831..11ecf8b 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -39,6 +39,7 @@
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
@@ -46,6 +47,7 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.flags.Flags;
import com.android.settings.fuelgauge.BatteryMeterView;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -456,18 +458,24 @@
com.android.settings.Utils.formatPercentage(batteryLevel));
batterySummaryView.setVisibility(View.VISIBLE);
showBatteryIcon(linearLayout, batteryLevel, lowBatteryLevel, charging);
+ showBatteryRing(linearLayout, batteryLevel);
} else {
if (deviceId == MAIN_DEVICE_ID) {
linearLayout.setVisibility(View.VISIBLE);
linearLayout.findViewById(R.id.bt_battery_icon).setVisibility(View.GONE);
+
int level = preloadedNativeBatteryLevel.get();
if (level != BluetoothDevice.BATTERY_LEVEL_UNKNOWN
&& level != BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF) {
batterySummaryView.setText(
com.android.settings.Utils.formatPercentage(level));
batterySummaryView.setVisibility(View.VISIBLE);
+ showBatteryRing(linearLayout, level);
} else {
batterySummaryView.setVisibility(View.GONE);
+ if (Flags.enableBluetoothDeviceDetailsPolish()) {
+ linearLayout.findViewById(R.id.battery_ring).setVisibility(View.GONE);
+ }
}
} else {
// Hide it if it doesn't have battery information
@@ -481,6 +489,7 @@
com.android.settings.Utils.formatPercentage(batteryLevel));
batterySummaryView.setVisibility(View.VISIBLE);
showBatteryIcon(linearLayout, batteryLevel, lowBatteryLevel, charging);
+ showBatteryRing(linearLayout, batteryLevel);
} else {
batterySummaryView.setVisibility(View.GONE);
}
@@ -610,6 +619,14 @@
imageView.setVisibility(View.VISIBLE);
}
+ private void showBatteryRing(LinearLayout linearLayout, int level) {
+ if (Flags.enableBluetoothDeviceDetailsPolish()) {
+ ProgressBar batteryProgress = linearLayout.findViewById(R.id.battery_ring);
+ batteryProgress.setProgress(level);
+ batteryProgress.setVisibility(View.VISIBLE);
+ }
+ }
+
private void updateDisconnectLayout() {
mLayoutPreference.findViewById(R.id.layout_left).setVisibility(View.GONE);
mLayoutPreference.findViewById(R.id.layout_right).setVisibility(View.GONE);
@@ -620,6 +637,9 @@
linearLayout.findViewById(R.id.header_title).setVisibility(View.GONE);
linearLayout.findViewById(R.id.bt_battery_summary).setVisibility(View.GONE);
linearLayout.findViewById(R.id.bt_battery_icon).setVisibility(View.GONE);
+ if (Flags.enableBluetoothDeviceDetailsPolish()) {
+ linearLayout.findViewById(R.id.battery_ring).setVisibility(View.GONE);
+ }
// Only show bluetooth icon
final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index b361bd2..183de7f 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -35,7 +35,7 @@
private static final String TAG = "AvailableMediaBluetoothDeviceUpdater";
private static final boolean DBG = Log.isLoggable(BluetoothDeviceUpdater.TAG, Log.DEBUG);
- private static final String PREF_KEY = "available_media_bt";
+ private static final String PREF_KEY_PREFIX = "available_media_bt_";
private final AudioManager mAudioManager;
private final LocalBluetoothManager mLocalBtManager;
@@ -141,8 +141,8 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
@Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsController.java
index 564e138..f7ccc61 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsController.java
@@ -159,19 +159,22 @@
mPreference.setEnabled(mCachedDevice.isConnectedHapClientDevice());
loadAllPresetInfo();
+ mPreference.setSummary(null);
if (mPreference.getEntries().length == 0) {
- if (DEBUG) {
- Log.w(TAG, "Disable the preference since preset info size = 0");
+ if (mPreference.isEnabled()) {
+ if (DEBUG) {
+ Log.w(TAG, "Disable the preference since preset info size = 0");
+ }
+ mPreference.setEnabled(false);
+ mPreference.setSummary(mContext.getString(
+ R.string.bluetooth_hearing_aids_presets_empty_list_message));
}
- mPreference.setEnabled(false);
} else {
int activePresetIndex = mHapClientProfile.getActivePresetIndex(
mCachedDevice.getDevice());
if (activePresetIndex != BluetoothHapClient.PRESET_INDEX_UNAVAILABLE) {
mPreference.setValue(Integer.toString(activePresetIndex));
mPreference.setSummary(mPreference.getEntry());
- } else {
- mPreference.setSummary(null);
}
}
}
@@ -273,7 +276,8 @@
return;
}
List<BluetoothHapPresetInfo> infoList = mHapClientProfile.getAllPresetInfo(
- mCachedDevice.getDevice());
+ mCachedDevice.getDevice()).stream().filter(
+ BluetoothHapPresetInfo::isAvailable).toList();
CharSequence[] presetNames = new CharSequence[infoList.size()];
CharSequence[] presetIndexes = new CharSequence[infoList.size()];
for (int i = 0; i < infoList.size(); i++) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index 3fa811a..015d427 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -43,7 +43,6 @@
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HeadsetProfile;
-import com.android.settingslib.bluetooth.HearingAidProfile;
import com.android.settingslib.bluetooth.LeAudioProfile;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfile;
@@ -95,6 +94,7 @@
new HashMap<String, List<CachedBluetoothDevice>>();
private boolean mIsLeContactSharingEnabled = false;
private boolean mIsLeAudioToggleEnabled = false;
+ private boolean mIsLeAudioOnlyDevice = false;
@VisibleForTesting
PreferenceCategory mProfilesContainer;
@@ -182,7 +182,15 @@
}
if (profile instanceof LeAudioProfile) {
- profilePref.setVisible(mIsLeAudioToggleEnabled);
+ boolean showLeAudioToggle = mIsLeAudioToggleEnabled;
+ if (Flags.hideLeAudioToggleForLeAudioOnlyDevice() && mIsLeAudioOnlyDevice) {
+ showLeAudioToggle = false;
+ Log.d(
+ TAG,
+ "Hide LeAudio toggle for LeAudio-only Device: "
+ + mCachedDevice.getDevice().getAnonymizedAddress());
+ }
+ profilePref.setVisible(showLeAudioToggle);
}
if (profile instanceof MapProfile) {
@@ -326,12 +334,14 @@
// Only provide PBAP cabability if the client device has requested PBAP.
if (pbapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
- result.add(psp);
+ if (psp != null) {
+ result.add(psp);
+ }
}
final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
final int mapPermission = device.getMessageAccessPermission();
- if (mapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
+ if (mapPermission != BluetoothDevice.ACCESS_UNKNOWN && mapProfile != null) {
result.add(mapProfile);
}
@@ -345,6 +355,11 @@
result.remove(mManager.getProfileManager().getA2dpProfile());
result.remove(mManager.getProfileManager().getHeadsetProfile());
}
+ boolean hearingAidSupported = result.contains(
+ mManager.getProfileManager().getHearingAidProfile());
+ if (leAudioSupported && !classicAudioSupported && !hearingAidSupported) {
+ mIsLeAudioOnlyDevice = true;
+ }
Log.d(TAG, "getProfiles:Map:" + mProfileDeviceMap);
return result;
}
@@ -513,19 +528,6 @@
refresh();
}
- private boolean isLeAudioOnlyDevice() {
- if (mCachedDevice.getProfiles().stream()
- .noneMatch(profile -> profile instanceof LeAudioProfile)) {
- return false;
- }
- return mCachedDevice.getProfiles().stream()
- .noneMatch(
- profile ->
- profile instanceof HearingAidProfile
- || profile instanceof A2dpProfile
- || profile instanceof HeadsetProfile);
- }
-
private void updateLeAudioConfig() {
mIsLeContactSharingEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
SettingsUIDeviceConfig.BT_LE_AUDIO_CONTACT_SHARING_ENABLED, true);
@@ -534,13 +536,6 @@
boolean isLeEnabledByDefault =
SystemProperties.getBoolean(LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY, true);
mIsLeAudioToggleEnabled = isLeAudioToggleVisible || isLeEnabledByDefault;
- if (Flags.hideLeAudioToggleForLeAudioOnlyDevice() && isLeAudioOnlyDevice()) {
- mIsLeAudioToggleEnabled = false;
- Log.d(
- TAG,
- "Hide LeAudio toggle for LeAudio-only Device: "
- + mCachedDevice.getDevice().getAnonymizedAddress());
- }
Log.d(TAG, "BT_LE_AUDIO_CONTACT_SHARING_ENABLED:" + mIsLeContactSharingEnabled
+ ", LE_AUDIO_TOGGLE_VISIBLE_PROPERTY:" + isLeAudioToggleVisible
+ ", LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY:" + isLeEnabledByDefault);
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
index 30e86fe..4ff7136 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioController.java
@@ -19,13 +19,16 @@
import static android.media.Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE;
import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.media.AudioDeviceAttributes;
import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
import android.media.Spatializer;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
@@ -37,9 +40,14 @@
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothProfile;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.flags.Flags;
import com.android.settingslib.utils.ThreadUtils;
+import com.google.common.collect.ImmutableSet;
+
+import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -53,22 +61,27 @@
private static final String KEY_SPATIAL_AUDIO = "spatial_audio";
private static final String KEY_HEAD_TRACKING = "head_tracking";
+ private final AudioManager mAudioManager;
private final Spatializer mSpatializer;
@VisibleForTesting
PreferenceCategory mProfilesContainer;
- @VisibleForTesting
- AudioDeviceAttributes mAudioDevice = null;
+ @VisibleForTesting @Nullable AudioDeviceAttributes mAudioDevice = null;
AtomicBoolean mHasHeadTracker = new AtomicBoolean(false);
AtomicBoolean mInitialRefresh = new AtomicBoolean(true);
+ public static final Set<Integer> SA_PROFILES =
+ ImmutableSet.of(
+ BluetoothProfile.A2DP, BluetoothProfile.LE_AUDIO, BluetoothProfile.HEARING_AID);
+
public BluetoothDetailsSpatialAudioController(
Context context,
PreferenceFragmentCompat fragment,
CachedBluetoothDevice device,
Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
+ mAudioManager = context.getSystemService(AudioManager.class);
mSpatializer = FeatureFactory.getFeatureFactory().getBluetoothFeatureProvider()
.getSpatializer(context);
}
@@ -142,8 +155,12 @@
@Override
protected void refresh() {
- if (mAudioDevice == null) {
- getAvailableDevice();
+ if (Flags.enableDeterminingSpatialAudioAttributesByProfile()) {
+ getAvailableDeviceByProfileState();
+ } else {
+ if (mAudioDevice == null) {
+ getAvailableDevice();
+ }
}
ThreadUtils.postOnBackgroundThread(
() -> {
@@ -274,6 +291,77 @@
+ ", type : " + (mAudioDevice == null ? "no type" : mAudioDevice.getType()));
}
+ private void getAvailableDeviceByProfileState() {
+ Log.i(
+ TAG,
+ "getAvailableDevice() mCachedDevice: "
+ + mCachedDevice
+ + " profiles: "
+ + mCachedDevice.getProfiles());
+
+ AudioDeviceAttributes saDevice = null;
+ for (LocalBluetoothProfile profile : mCachedDevice.getProfiles()) {
+ // pick first enabled profile that is compatible with spatial audio
+ if (SA_PROFILES.contains(profile.getProfileId())
+ && profile.isEnabled(mCachedDevice.getDevice())) {
+ switch (profile.getProfileId()) {
+ case BluetoothProfile.A2DP:
+ saDevice =
+ new AudioDeviceAttributes(
+ AudioDeviceAttributes.ROLE_OUTPUT,
+ AudioDeviceInfo.TYPE_BLUETOOTH_A2DP,
+ mCachedDevice.getAddress());
+ break;
+ case BluetoothProfile.LE_AUDIO:
+ if (mAudioManager.getBluetoothAudioDeviceCategory(
+ mCachedDevice.getAddress())
+ == AudioManager.AUDIO_DEVICE_CATEGORY_SPEAKER) {
+ saDevice =
+ new AudioDeviceAttributes(
+ AudioDeviceAttributes.ROLE_OUTPUT,
+ AudioDeviceInfo.TYPE_BLE_SPEAKER,
+ mCachedDevice.getAddress());
+ } else {
+ saDevice =
+ new AudioDeviceAttributes(
+ AudioDeviceAttributes.ROLE_OUTPUT,
+ AudioDeviceInfo.TYPE_BLE_HEADSET,
+ mCachedDevice.getAddress());
+ }
+
+ break;
+ case BluetoothProfile.HEARING_AID:
+ saDevice =
+ new AudioDeviceAttributes(
+ AudioDeviceAttributes.ROLE_OUTPUT,
+ AudioDeviceInfo.TYPE_HEARING_AID,
+ mCachedDevice.getAddress());
+ break;
+ default:
+ Log.i(
+ TAG,
+ "unrecognized profile for spatial audio: "
+ + profile.getProfileId());
+ break;
+ }
+ break;
+ }
+ }
+ mAudioDevice = null;
+ if (saDevice != null && mSpatializer.isAvailableForDevice(saDevice)) {
+ mAudioDevice = saDevice;
+ }
+
+ Log.d(
+ TAG,
+ "getAvailableDevice() device : "
+ + mCachedDevice.getDevice().getAnonymizedAddress()
+ + ", is available : "
+ + (mAudioDevice != null)
+ + ", type : "
+ + (mAudioDevice == null ? "no type" : mAudioDevice.getType()));
+ }
+
@VisibleForTesting
void setAvailableDevice(AudioDeviceAttributes audioDevice) {
mAudioDevice = audioDevice;
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 44915fe..5f9957b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -142,13 +142,23 @@
}
@VisibleForTesting
+ @Nullable
CachedBluetoothDevice getCachedDevice(String deviceAddress) {
if (sTestDataFactory != null) {
return sTestDataFactory.getDevice(deviceAddress);
}
BluetoothDevice remoteDevice =
mManager.getBluetoothAdapter().getRemoteDevice(deviceAddress);
- return mManager.getCachedDeviceManager().findDevice(remoteDevice);
+ if (remoteDevice == null) {
+ return null;
+ }
+ CachedBluetoothDevice cachedDevice =
+ mManager.getCachedDeviceManager().findDevice(remoteDevice);
+ if (cachedDevice != null) {
+ return cachedDevice;
+ }
+ Log.i(TAG, "Add device to cached device manager: " + remoteDevice.getAnonymizedAddress());
+ return mManager.getCachedDeviceManager().addDevice(remoteDevice);
}
@VisibleForTesting
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 4b21b2e..965bb94 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -213,9 +213,9 @@
public abstract boolean isFilterMatched(CachedBluetoothDevice cachedBluetoothDevice);
/**
- * Return a preference key for logging
+ * Return a preference key prefix for logging
*/
- protected abstract String getPreferenceKey();
+ protected abstract String getPreferenceKeyPrefix();
/**
* Update whether to show {@link CachedBluetoothDevice} in the list.
@@ -248,7 +248,7 @@
new BluetoothDevicePreference(mPrefContext, cachedDevice,
true /* showDeviceWithoutNames */,
type);
- btPreference.setKey(getPreferenceKey());
+ btPreference.setKey(getPreferenceKeyPrefix() + cachedDevice.hashCode());
btPreference.setOnGearClickListener(mDeviceProfilesListener);
if (this instanceof Preference.OnPreferenceClickListener) {
btPreference.setOnPreferenceClickListener(
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index d15696b..2107569 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -36,7 +36,7 @@
private static final String TAG = "ConnBluetoothDeviceUpdater";
private static final boolean DBG = Log.isLoggable(BluetoothDeviceUpdater.TAG, Log.DEBUG);
- private static final String PREF_KEY = "connected_bt";
+ private static final String PREF_KEY_PREFIX = "connected_bt_";
private final AudioManager mAudioManager;
@@ -126,8 +126,8 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
@Override
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index ed1be7a..d7c0366 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -41,7 +41,7 @@
private static final String TAG = "SavedBluetoothDeviceUpdater";
- private static final String PREF_KEY = "saved_bt";
+ private static final String PREF_KEY_PREFIX = "saved_bt_";
private final boolean mShowConnectedDevice;
@@ -134,8 +134,8 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
@Override
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 56a3005..2548b95 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -15,6 +15,8 @@
*/
package com.android.settings.connecteddevice;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isExternalDisplaySettingsPageEnabled;
+
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.input.InputManager;
@@ -22,6 +24,8 @@
import android.util.Log;
import android.view.InputDevice;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
@@ -31,12 +35,15 @@
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.bluetooth.Utils;
+import com.android.settings.connecteddevice.display.ExternalDisplayUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.flags.FeatureFlags;
+import com.android.settings.flags.FeatureFlagsImpl;
import com.android.settings.flags.Flags;
import com.android.settings.overlay.DockUpdaterFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
@@ -64,6 +71,8 @@
@VisibleForTesting
PreferenceGroup mPreferenceGroup;
+ @Nullable
+ private ExternalDisplayUpdater mExternalDisplayUpdater;
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
private ConnectedUsbDeviceUpdater mConnectedUsbDeviceUpdater;
private DockUpdater mConnectedDockUpdater;
@@ -71,6 +80,8 @@
private final PackageManager mPackageManager;
private final InputManager mInputManager;
private final LocalBluetoothManager mLocalBluetoothManager;
+ @NonNull
+ private final FeatureFlags mFeatureFlags = new FeatureFlagsImpl();
public ConnectedDeviceGroupController(Context context) {
super(context, KEY);
@@ -81,6 +92,10 @@
@Override
public void onStart() {
+ if (mExternalDisplayUpdater != null) {
+ mExternalDisplayUpdater.registerCallback();
+ }
+
if (mBluetoothDeviceUpdater != null) {
mBluetoothDeviceUpdater.registerCallback();
mBluetoothDeviceUpdater.refreshPreference();
@@ -101,6 +116,10 @@
@Override
public void onStop() {
+ if (mExternalDisplayUpdater != null) {
+ mExternalDisplayUpdater.unregisterCallback();
+ }
+
if (mBluetoothDeviceUpdater != null) {
mBluetoothDeviceUpdater.unregisterCallback();
}
@@ -127,6 +146,10 @@
if (isAvailable()) {
final Context context = screen.getContext();
+ if (mExternalDisplayUpdater != null) {
+ mExternalDisplayUpdater.initPreference(context);
+ }
+
if (mBluetoothDeviceUpdater != null) {
mBluetoothDeviceUpdater.setPrefContext(context);
mBluetoothDeviceUpdater.forceUpdate();
@@ -150,7 +173,8 @@
@Override
public int getAvailabilityStatus() {
- return (hasBluetoothFeature()
+ return (hasExternalDisplayFeature()
+ || hasBluetoothFeature()
|| hasUsbFeature()
|| hasUsiStylusFeature()
|| mConnectedDockUpdater != null)
@@ -180,11 +204,13 @@
}
@VisibleForTesting
- void init(BluetoothDeviceUpdater bluetoothDeviceUpdater,
+ void init(@Nullable ExternalDisplayUpdater externalDisplayUpdater,
+ BluetoothDeviceUpdater bluetoothDeviceUpdater,
ConnectedUsbDeviceUpdater connectedUsbDeviceUpdater,
DockUpdater connectedDockUpdater,
StylusDeviceUpdater connectedStylusDeviceUpdater) {
+ mExternalDisplayUpdater = externalDisplayUpdater;
mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
mConnectedUsbDeviceUpdater = connectedUsbDeviceUpdater;
mConnectedDockUpdater = connectedDockUpdater;
@@ -197,7 +223,10 @@
FeatureFactory.getFeatureFactory().getDockUpdaterFeatureProvider();
final DockUpdater connectedDockUpdater =
dockUpdaterFeatureProvider.getConnectedDockUpdater(context, this);
- init(hasBluetoothFeature()
+ init(hasExternalDisplayFeature()
+ ? new ExternalDisplayUpdater(this, fragment.getMetricsCategory())
+ : null,
+ hasBluetoothFeature()
? new ConnectedBluetoothDeviceUpdater(context, this,
fragment.getMetricsCategory())
: null,
@@ -210,6 +239,19 @@
: null);
}
+ /**
+ * @return trunk stable feature flags.
+ */
+ @VisibleForTesting
+ @NonNull
+ public FeatureFlags getFeatureFlags() {
+ return mFeatureFlags;
+ }
+
+ private boolean hasExternalDisplayFeature() {
+ return isExternalDisplaySettingsPageEnabled(getFeatureFlags());
+ }
+
private boolean hasBluetoothFeature() {
return mPackageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
index 4d7e699..21eb4d1 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
@@ -21,6 +21,7 @@
import android.util.Log;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
@@ -35,7 +36,8 @@
private static final String TAG = "AudioSharingBluetoothDeviceUpdater";
- private static final String PREF_KEY = "audio_sharing_bt";
+ @VisibleForTesting
+ static final String PREF_KEY_PREFIX = "audio_sharing_bt_";
@Nullable private LocalBluetoothManager mLocalBtManager;
@@ -76,8 +78,8 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
@Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
index 75b4acf..5e0ec07 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java
@@ -19,6 +19,7 @@
import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.os.Bundle;
+import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -66,7 +67,13 @@
@NonNull List<AudioSharingDeviceItem> deviceItems,
@NonNull DialogEventListener listener) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- final FragmentManager manager = host.getChildFragmentManager();
+ 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();
@@ -79,10 +86,18 @@
}
@Override
+ @NonNull
public Dialog onCreateDialog(Bundle savedInstanceState) {
Bundle arguments = requireArguments();
List<AudioSharingDeviceItem> deviceItems =
arguments.getParcelable(BUNDLE_KEY_DEVICE_ITEMS, List.class);
+ AlertDialog.Builder builder =
+ new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.audio_sharing_call_audio_title);
+ if (deviceItems == null) {
+ Log.d(TAG, "Create dialog error: null deviceItems");
+ return builder.create();
+ }
int checkedItem = -1;
for (AudioSharingDeviceItem item : deviceItems) {
int fallbackActiveGroupId = AudioSharingUtils.getFallbackActiveGroupId(getContext());
@@ -92,17 +107,14 @@
}
String[] choices =
deviceItems.stream().map(AudioSharingDeviceItem::getName).toArray(String[]::new);
- AlertDialog.Builder builder =
- new AlertDialog.Builder(getActivity())
- .setTitle(R.string.audio_sharing_call_audio_title)
- .setSingleChoiceItems(
- choices,
- checkedItem,
- (dialog, which) -> {
- if (sListener != null) {
- sListener.onItemClick(deviceItems.get(which));
- }
- });
+ builder.setSingleChoiceItems(
+ choices,
+ checkedItem,
+ (dialog, which) -> {
+ if (sListener != null) {
+ sListener.onItemClick(deviceItems.get(which));
+ }
+ });
return builder.create();
}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
index e9013d7..61b1df1 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java
@@ -21,6 +21,7 @@
import android.os.Bundle;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
@@ -44,7 +45,13 @@
*/
public static void show(Fragment host) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- FragmentManager manager = host.getChildFragmentManager();
+ 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.");
@@ -56,6 +63,7 @@
}
@Override
+ @NonNull
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
AlertDialog dialog =
AudioSharingDialogFactory.newBuilder(getActivity())
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
index b932a7e..cc883fe 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
@@ -18,6 +18,7 @@
import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.EXTRA_BLUETOOTH_DEVICE;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastAssistant;
@@ -44,6 +45,7 @@
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.BluetoothEventManager;
@@ -56,6 +58,7 @@
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.Locale;
import java.util.concurrent.Executor;
@@ -80,6 +83,7 @@
@Nullable private final LocalBluetoothProfileManager mProfileManager;
@Nullable private final LocalBluetoothLeBroadcastAssistant mAssistant;
private final Executor mExecutor;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
@Nullable private PreferenceGroup mPreferenceGroup;
@Nullable private Preference mAudioSharingSettingsPreference;
@Nullable private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
@@ -114,6 +118,10 @@
@NonNull BluetoothDevice sink,
@NonNull BluetoothLeBroadcastMetadata source,
int reason) {
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_JOIN_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
AudioSharingUtils.toastMessage(
mContext,
String.format(
@@ -143,6 +151,10 @@
@Override
public void onSourceRemoveFailed(
@NonNull BluetoothDevice sink, int sourceId, int reason) {
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_LEAVE_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
AudioSharingUtils.toastMessage(
mContext,
String.format(
@@ -183,6 +195,7 @@
? null
: mProfileManager.getLeAudioBroadcastAssistantProfile();
mExecutor = Executors.newSingleThreadExecutor();
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
index 660229d..0fbb892 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java
@@ -25,6 +25,7 @@
import android.widget.SeekBar;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.bluetooth.BluetoothDevicePreference;
@@ -41,7 +42,8 @@
private static final String TAG = "AudioSharingDeviceVolumeControlUpdater";
- private static final String PREF_KEY = "audio_sharing_volume_control";
+ @VisibleForTesting
+ static final String PREF_KEY_PREFIX = "audio_sharing_volume_control_";
@Nullable private final LocalBluetoothManager mBtManager;
@Nullable private final VolumeControlProfile mVolumeControl;
@@ -119,7 +121,7 @@
new AudioSharingDeviceVolumePreference(mPrefContext, cachedDevice);
vPreference.initialize();
vPreference.setOnSeekBarChangeListener(listener);
- vPreference.setKey(getPreferenceKey());
+ vPreference.setKey(getPreferenceKeyPrefix() + cachedDevice.hashCode());
vPreference.setIcon(com.android.settingslib.R.drawable.ic_bt_untethered_earbuds);
vPreference.setTitle(cachedDevice.getName());
mPreferenceMap.put(device, vPreference);
@@ -128,8 +130,8 @@
}
@Override
- protected String getPreferenceKey() {
- return PREF_KEY;
+ protected String getPreferenceKeyPrefix() {
+ return PREF_KEY_PREFIX;
}
@Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
index e787be3..f00cf73 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragment.java
@@ -77,7 +77,13 @@
@NonNull DialogEventListener listener,
@NonNull Pair<Integer, Object>[] eventData) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- final FragmentManager manager = host.getChildFragmentManager();
+ final FragmentManager manager;
+ try {
+ manager = host.getChildFragmentManager();
+ } catch (IllegalStateException e) {
+ Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+ return;
+ }
sListener = listener;
sEventData = eventData;
AlertDialog dialog = AudioSharingDialogHelper.getDialogIfShowing(manager, TAG);
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
index 8d69cf6..81d7979 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandler.java
@@ -60,7 +60,9 @@
@Nullable private final LocalBluetoothLeBroadcast mBroadcast;
@Nullable private final LocalBluetoothLeBroadcastAssistant mAssistant;
private final MetricsFeatureProvider mMetricsFeatureProvider;
- private List<BluetoothDevice> mTargetSinks = new ArrayList<>();
+ // The target sinks to join broadcast onPlaybackStarted
+ @Nullable private List<BluetoothDevice> mTargetSinks;
+ private boolean mIsStoppingBroadcast = false;
@VisibleForTesting
final BluetoothLeBroadcast.Callback mBroadcastCallback =
@@ -78,8 +80,15 @@
@Override
public void onBroadcastStartFailed(int reason) {
Log.d(TAG, "onBroadcastStartFailed(), reason = " + reason);
- AudioSharingUtils.toastMessage(
- mContext, "Fail to start broadcast, reason " + reason);
+ if (mTargetSinks != null) {
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_START_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ AudioSharingUtils.toastMessage(
+ mContext, "Fail to start broadcast, reason " + reason);
+ mTargetSinks = null;
+ }
}
@Override
@@ -101,13 +110,21 @@
+ reason
+ ", broadcastId = "
+ broadcastId);
+ mIsStoppingBroadcast = false;
}
@Override
public void onBroadcastStopFailed(int reason) {
Log.d(TAG, "onBroadcastStopFailed(), reason = " + reason);
- AudioSharingUtils.toastMessage(
- mContext, "Fail to stop broadcast, reason " + reason);
+ if (mIsStoppingBroadcast) {
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_STOP_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ AudioSharingUtils.toastMessage(
+ mContext, "Fail to stop broadcast, reason " + reason);
+ mIsStoppingBroadcast = false;
+ }
}
@Override
@@ -124,7 +141,7 @@
+ reason
+ ", broadcastId = "
+ broadcastId);
- if (!mTargetSinks.isEmpty()) {
+ if (mTargetSinks != null) {
AudioSharingUtils.addSourceToTargetSinks(mTargetSinks, mLocalBtManager);
new SubSettingLauncher(mContext)
.setDestination(AudioSharingDashboardFragment.class.getName())
@@ -134,7 +151,7 @@
.getMetricsCategory()
: SettingsEnums.PAGE_UNKNOWN)
.launch();
- mTargetSinks = new ArrayList<>();
+ mTargetSinks = null;
}
}
@@ -203,6 +220,7 @@
AudioSharingStopDialogFragment.DialogEventListener listener =
() -> {
cachedDevice.setActive();
+ mIsStoppingBroadcast = true;
AudioSharingUtils.stopBroadcasting(mLocalBtManager);
};
Pair<Integer, Object>[] eventData =
@@ -240,6 +258,8 @@
boolean userTriggered) {
Map<Integer, List<CachedBluetoothDevice>> groupedDevices =
AudioSharingUtils.fetchConnectedDevicesByGroupId(mLocalBtManager);
+ BluetoothDevice btDevice = cachedDevice.getDevice();
+ String deviceAddress = btDevice == null ? "" : btDevice.getAnonymizedAddress();
if (isBroadcasting) {
// If another device within the same is already in the sharing session, add source to
// the device automatically.
@@ -253,10 +273,10 @@
Log.d(
TAG,
"Automatically add another device within the same group to the sharing: "
- + cachedDevice.getDevice().getAnonymizedAddress());
+ + deviceAddress);
if (mAssistant != null && mBroadcast != null) {
mAssistant.addSource(
- cachedDevice.getDevice(),
+ btDevice,
mBroadcast.getLatestBluetoothLeBroadcastMetadata(),
/* isGroupOp= */ false);
}
@@ -295,6 +315,7 @@
cachedDevice,
listener,
eventData);
+ Log.d(TAG, "Show disconnect dialog, device = " + deviceAddress);
});
} else {
// Show audio sharing join dialog when the first or second eligible (LE audio)
@@ -325,9 +346,11 @@
cachedDevice,
listener,
eventData);
+ Log.d(TAG, "Show join dialog, device = " + deviceAddress);
});
}
} else {
+ // Build a list of AudioSharingDeviceItem for connected devices other than cachedDevice.
List<AudioSharingDeviceItem> deviceItems = new ArrayList<>();
for (List<CachedBluetoothDevice> devices : groupedDevices.values()) {
// Use random device in the group within the sharing session to represent the group.
@@ -340,7 +363,7 @@
}
// Show audio sharing join dialog when the second eligible (LE audio) remote
// device connect and no sharing session.
- if (deviceItems.size() == 1) {
+ if (groupedDevices.size() == 2 && deviceItems.size() == 1) {
AudioSharingJoinDialogFragment.DialogEventListener listener =
new AudioSharingJoinDialogFragment.DialogEventListener() {
@Override
@@ -378,16 +401,26 @@
closeOpeningDialogsOtherThan(AudioSharingJoinDialogFragment.tag());
AudioSharingJoinDialogFragment.show(
mHostFragment, deviceItems, cachedDevice, listener, eventData);
+ Log.d(TAG, "Show start dialog, device = " + deviceAddress);
});
} else if (userTriggered) {
cachedDevice.setActive();
+ Log.d(TAG, "Set active device = " + deviceAddress);
+ } else {
+ Log.d(TAG, "Fail to handle LE audio device connected, device = " + deviceAddress);
}
}
}
private void closeOpeningDialogsOtherThan(String tag) {
if (mHostFragment == null) return;
- List<Fragment> fragments = mHostFragment.getChildFragmentManager().getFragments();
+ List<Fragment> fragments;
+ try {
+ fragments = mHostFragment.getChildFragmentManager().getFragments();
+ } catch (IllegalStateException e) {
+ Log.d(TAG, "Fail to closeOpeningDialogsOtherThan " + tag + ": " + e.getMessage());
+ return;
+ }
for (Fragment fragment : fragments) {
if (fragment instanceof DialogFragment
&& fragment.getTag() != null
@@ -403,7 +436,13 @@
public void closeOpeningDialogsForLeaDevice(@NonNull CachedBluetoothDevice cachedDevice) {
if (mHostFragment == null) return;
int groupId = AudioSharingUtils.getGroupId(cachedDevice);
- List<Fragment> fragments = mHostFragment.getChildFragmentManager().getFragments();
+ List<Fragment> fragments;
+ try {
+ fragments = mHostFragment.getChildFragmentManager().getFragments();
+ } catch (IllegalStateException e) {
+ Log.d(TAG, "Fail to closeOpeningDialogsForLeaDevice: " + e.getMessage());
+ return;
+ }
for (Fragment fragment : fragments) {
CachedBluetoothDevice device = getCachedBluetoothDeviceFromDialog(fragment);
if (device != null
@@ -420,7 +459,13 @@
public void closeOpeningDialogsForNonLeaDevice(@NonNull CachedBluetoothDevice cachedDevice) {
if (mHostFragment == null) return;
String address = cachedDevice.getAddress();
- List<Fragment> fragments = mHostFragment.getChildFragmentManager().getFragments();
+ List<Fragment> fragments;
+ try {
+ fragments = mHostFragment.getChildFragmentManager().getFragments();
+ } catch (IllegalStateException e) {
+ Log.d(TAG, "Fail to closeOpeningDialogsForNonLeaDevice: " + e.getMessage());
+ return;
+ }
for (Fragment fragment : fragments) {
CachedBluetoothDevice device = getCachedBluetoothDeviceFromDialog(fragment);
if (device != null && address != null && address.equals(device.getAddress())) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHelper.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHelper.java
index 69001aa..010a3ba 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHelper.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHelper.java
@@ -51,12 +51,13 @@
public static AlertDialog getDialogIfShowing(
@NonNull FragmentManager manager, @NonNull String tag) {
Fragment dialog = manager.findFragmentByTag(tag);
- return dialog != null
- && dialog instanceof DialogFragment
- && ((DialogFragment) dialog).getDialog() != null
- && ((DialogFragment) dialog).getDialog().isShowing()
- && ((DialogFragment) dialog).getDialog() instanceof AlertDialog
+ return dialog instanceof DialogFragment
+ && ((DialogFragment) dialog).getDialog() != null
+ && ((DialogFragment) dialog).getDialog().isShowing()
+ && ((DialogFragment) dialog).getDialog() instanceof AlertDialog
? (AlertDialog) ((DialogFragment) dialog).getDialog()
: null;
}
+
+ private AudioSharingDialogHelper() {}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
index dcd8a3b..66e327b 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragment.java
@@ -84,7 +84,13 @@
@NonNull DialogEventListener listener,
@NonNull Pair<Integer, Object>[] eventData) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- FragmentManager manager = host.getChildFragmentManager();
+ 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) {
int newGroupId = AudioSharingUtils.getGroupId(newDevice);
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
index ec669bf..9afa186 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragment.java
@@ -81,7 +81,13 @@
@NonNull DialogEventListener listener,
@NonNull Pair<Integer, Object>[] eventData) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- final FragmentManager manager = host.getChildFragmentManager();
+ final FragmentManager manager;
+ try {
+ manager = host.getChildFragmentManager();
+ } catch (IllegalStateException e) {
+ Log.d(TAG, "Fail to show dialog: " + e.getMessage());
+ return;
+ }
sListener = listener;
sNewDevice = newDevice;
sEventData = eventData;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java
index 0bb6b60..0a90e7b 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java
@@ -92,17 +92,19 @@
shareButton.setVisibility(View.VISIBLE);
shareButton.setImageDrawable(getContext().getDrawable(R.drawable.ic_qrcode_24dp));
shareButton.setOnClickListener(unused -> launchAudioSharingQrCodeFragment());
+ shareButton.setContentDescription(
+ getContext().getString(R.string.audio_sharing_qrcode_button_label));
}
private void configureInvisibleStateForQrCodeIcon(ImageButton shareButton, View divider) {
- divider.setVisibility(View.INVISIBLE);
- shareButton.setVisibility(View.INVISIBLE);
+ divider.setVisibility(View.GONE);
+ shareButton.setVisibility(View.GONE);
shareButton.setOnClickListener(null);
}
private void launchAudioSharingQrCodeFragment() {
new SubSettingLauncher(getContext())
- .setTitleText(getContext().getString(R.string.audio_streams_qr_code_page_title))
+ .setTitleRes(R.string.audio_streams_qr_code_page_title)
.setDestination(AudioStreamsQrCodeFragment.class.getName())
.setSourceMetricsCategory(SettingsEnums.AUDIO_SHARING_SETTINGS)
.launch();
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
index 24b8f20..894ba48 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceController.java
@@ -26,6 +26,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
@@ -56,7 +57,8 @@
private static final boolean DEBUG = BluetoothUtils.D;
private static final String PREF_KEY = "audio_sharing_stream_name";
- private final BluetoothLeBroadcast.Callback mBroadcastCallback =
+ @VisibleForTesting
+ final BluetoothLeBroadcast.Callback mBroadcastCallback =
new BluetoothLeBroadcast.Callback() {
@Override
public void onBroadcastMetadataChanged(
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
index 258cf3b..14930e1 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceController.java
@@ -19,12 +19,19 @@
import static com.android.settings.connecteddevice.audiosharing.AudioSharingUtils.isBroadcasting;
import android.app.settings.SettingsEnums;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -41,15 +48,19 @@
public class AudioSharingPasswordPreferenceController extends BasePreferenceController
implements ValidatedEditTextPreference.Validator,
- AudioSharingPasswordPreference.OnDialogEventListener {
-
+ AudioSharingPasswordPreference.OnDialogEventListener,
+ DefaultLifecycleObserver {
private static final String TAG = "AudioSharingPasswordPreferenceController";
private static final String PREF_KEY = "audio_sharing_stream_password";
private static final String SHARED_PREF_NAME = "audio_sharing_settings";
private static final String SHARED_PREF_KEY = "default_password";
+ @Nullable private final ContentResolver mContentResolver;
+ @Nullable private final SharedPreferences mSharedPref;
@Nullable private final LocalBluetoothManager mBtManager;
@Nullable private final LocalBluetoothLeBroadcast mBroadcast;
@Nullable private AudioSharingPasswordPreference mPreference;
+ private final ContentObserver mSettingsObserver;
+ private final SharedPreferences.OnSharedPreferenceChangeListener mSharedPrefChangeListener;
private final AudioSharingPasswordValidator mAudioSharingPasswordValidator;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -61,10 +72,45 @@
? mBtManager.getProfileManager().getLeAudioBroadcastProfile()
: null;
mAudioSharingPasswordValidator = new AudioSharingPasswordValidator();
+ mContentResolver = context.getContentResolver();
+ mSettingsObserver = new PasswordSettingsObserver();
+ mSharedPref = context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
+ mSharedPrefChangeListener = new PasswordSharedPrefChangeListener();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@Override
+ public void onStart(@NonNull LifecycleOwner owner) {
+ if (!isAvailable()) {
+ Log.d(TAG, "Feature is not available.");
+ return;
+ }
+ if (mContentResolver != null) {
+ mContentResolver.registerContentObserver(
+ Settings.Secure.getUriFor(Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE),
+ false,
+ mSettingsObserver);
+ }
+ if (mSharedPref != null) {
+ mSharedPref.registerOnSharedPreferenceChangeListener(mSharedPrefChangeListener);
+ }
+ }
+
+ @Override
+ public void onStop(@NonNull LifecycleOwner owner) {
+ if (!isAvailable()) {
+ Log.d(TAG, "Feature is not available.");
+ return;
+ }
+ if (mContentResolver != null) {
+ mContentResolver.unregisterContentObserver(mSettingsObserver);
+ }
+ if (mSharedPref != null) {
+ mSharedPref.unregisterOnSharedPreferenceChangeListener(mSharedPrefChangeListener);
+ }
+ }
+
+ @Override
public int getAvailabilityStatus() {
return AudioSharingUtils.isFeatureEnabled() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@@ -125,7 +171,6 @@
persistDefaultPassword(mContext, password);
mBroadcast.setBroadcastCode(
isPublicBroadcast ? new byte[0] : password.getBytes());
- updatePreference();
mMetricsFeatureProvider.action(
mContext,
SettingsEnums.ACTION_AUDIO_STREAM_PASSWORD_UPDATED,
@@ -164,32 +209,52 @@
});
}
- private static void persistDefaultPassword(Context context, String defaultPassword) {
+ private class PasswordSettingsObserver extends ContentObserver {
+ PasswordSettingsObserver() {
+ super(new Handler(Looper.getMainLooper()));
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ Log.d(TAG, "onChange, broadcast password has been changed");
+ updatePreference();
+ }
+ }
+
+ private class PasswordSharedPrefChangeListener
+ implements SharedPreferences.OnSharedPreferenceChangeListener {
+ @Override
+ public void onSharedPreferenceChanged(
+ SharedPreferences sharedPreferences, @Nullable String key) {
+ if (!SHARED_PREF_KEY.equals(key)) {
+ return;
+ }
+ Log.d(TAG, "onSharedPreferenceChanged, default password has been changed");
+ updatePreference();
+ }
+ }
+
+ private void persistDefaultPassword(Context context, String defaultPassword) {
if (getDefaultPassword(context).equals(defaultPassword)) {
return;
}
-
- SharedPreferences sharedPref =
- context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
- if (sharedPref == null) {
+ if (mSharedPref == null) {
Log.w(TAG, "persistDefaultPassword(): sharedPref is empty!");
return;
}
- SharedPreferences.Editor editor = sharedPref.edit();
+ SharedPreferences.Editor editor = mSharedPref.edit();
editor.putString(SHARED_PREF_KEY, defaultPassword);
editor.apply();
}
- private static String getDefaultPassword(Context context) {
- SharedPreferences sharedPref =
- context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
- if (sharedPref == null) {
+ private String getDefaultPassword(Context context) {
+ if (mSharedPref == null) {
Log.w(TAG, "getDefaultPassword(): sharedPref is empty!");
return "";
}
- String value = sharedPref.getString(SHARED_PREF_KEY, "");
+ String value = mSharedPref.getString(SHARED_PREF_KEY, "");
if (value != null && value.isEmpty()) {
Log.w(TAG, "getDefaultPassword(): default password is empty!");
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
index 59593ba..d026fa7 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragment.java
@@ -81,7 +81,13 @@
@NonNull DialogEventListener listener,
@NonNull Pair<Integer, Object>[] eventData) {
if (!AudioSharingUtils.isFeatureEnabled()) return;
- final FragmentManager manager = host.getChildFragmentManager();
+ 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) {
int newGroupId = AudioSharingUtils.getGroupId(newDevice);
@@ -140,6 +146,13 @@
return sCachedDevice;
}
+ /** Test only: get the {@link DialogEventListener} passed to the dialog. */
+ @VisibleForTesting
+ @Nullable
+ DialogEventListener getListener() {
+ return sListener;
+ }
+
/** Test only: get the event data passed to the dialog. */
@VisibleForTesting
@NonNull
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
index 89d2c95..9705566 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarController.java
@@ -134,8 +134,11 @@
@Override
public void onBroadcastStartFailed(int reason) {
Log.d(TAG, "onBroadcastStartFailed(), reason = " + reason);
- // TODO: handle broadcast start fail
updateSwitch();
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_START_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
}
@Override
@@ -164,8 +167,11 @@
@Override
public void onBroadcastStopFailed(int reason) {
Log.d(TAG, "onBroadcastStopFailed(), reason = " + reason);
- // TODO: handle broadcast stop fail
updateSwitch();
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_STOP_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
}
@Override
@@ -189,7 +195,8 @@
public void onPlaybackStopped(int reason, int broadcastId) {}
};
- private final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
+ @VisibleForTesting
+ final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
new BluetoothLeBroadcastAssistant.Callback() {
@Override
public void onSearchStarted(int reason) {}
@@ -207,16 +214,8 @@
public void onSourceFound(@NonNull BluetoothLeBroadcastMetadata source) {}
@Override
- public void onSourceAdded(@NonNull BluetoothDevice sink, int sourceId, int reason) {
- Log.d(
- TAG,
- "onSourceAdded(), sink = "
- + sink
- + ", sourceId = "
- + sourceId
- + ", reason = "
- + reason);
- }
+ public void onSourceAdded(
+ @NonNull BluetoothDevice sink, int sourceId, int reason) {}
@Override
public void onSourceAddFailed(
@@ -231,6 +230,10 @@
+ source
+ ", reason = "
+ reason);
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_JOIN_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
AudioSharingUtils.toastMessage(
mContext,
String.format(
@@ -318,15 +321,17 @@
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// Filter out unnecessary callbacks when switch is disabled.
if (!buttonView.isEnabled()) return;
+ if (mBroadcast == null || mAssistant == null) {
+ mSwitchBar.setChecked(false);
+ Log.d(TAG, "Skip onCheckedChanged, profile not support.");
+ return;
+ }
+ mSwitchBar.setEnabled(false);
+ boolean isBroadcasting = AudioSharingUtils.isBroadcasting(mBtManager);
if (isChecked) {
- mSwitchBar.setEnabled(false);
- boolean isBroadcasting = AudioSharingUtils.isBroadcasting(mBtManager);
- if (mAssistant == null || mBroadcast == null || isBroadcasting) {
- Log.d(TAG, "Skip startAudioSharing, already broadcasting or not support.");
+ if (isBroadcasting) {
+ Log.d(TAG, "Skip startAudioSharing, already broadcasting.");
mSwitchBar.setEnabled(true);
- if (!isBroadcasting) {
- mSwitchBar.setChecked(false);
- }
return;
}
// FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST is always true in
@@ -352,6 +357,11 @@
}
startAudioSharing();
} else {
+ if (!isBroadcasting) {
+ Log.d(TAG, "Skip stopAudioSharing, already not broadcasting.");
+ mSwitchBar.setEnabled(true);
+ return;
+ }
stopAudioSharing();
}
}
@@ -454,18 +464,18 @@
}
if (mBroadcast != null) {
mBroadcast.startPrivateBroadcast();
+ mMetricsFeatureProvider.action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_MAIN_SWITCH_ON,
+ deviceItems.size());
}
}
private void stopAudioSharing() {
- mSwitchBar.setEnabled(false);
- if (!AudioSharingUtils.isBroadcasting(mBtManager)) {
- Log.d(TAG, "Skip stopAudioSharing, already not broadcasting or broadcast not support.");
- mSwitchBar.setEnabled(true);
- return;
- }
if (mBroadcast != null) {
mBroadcast.stopBroadcast(mBroadcast.getLatestBroadcastId());
+ mMetricsFeatureProvider.action(
+ mContext, SettingsEnums.ACTION_AUDIO_SHARING_MAIN_SWITCH_OFF);
}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseState.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseState.java
index 24a28dd..7be01a2 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseState.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseState.java
@@ -36,7 +36,8 @@
@Nullable private static AddSourceWaitForResponseState sInstance = null;
- private AddSourceWaitForResponseState() {}
+ @VisibleForTesting
+ AddSourceWaitForResponseState() {}
static AddSourceWaitForResponseState getInstance() {
if (sInstance == null) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
index 2661072..939dd5c 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamButtonController.java
@@ -27,6 +27,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
@@ -48,7 +49,9 @@
private static final String TAG = "AudioStreamButtonController";
private static final String KEY = "audio_stream_button";
private static final int SOURCE_ORIGIN_REPOSITORY = SourceOriginForLogging.REPOSITORY.ordinal();
- private final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
+
+ @VisibleForTesting
+ final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
new AudioStreamsBroadcastAssistantCallback() {
@Override
public void onSourceRemoved(BluetoothDevice sink, int sourceId, int reason) {
@@ -97,8 +100,7 @@
}
};
- private final AudioStreamsRepository mAudioStreamsRepository =
- AudioStreamsRepository.getInstance();
+ private AudioStreamsRepository mAudioStreamsRepository = AudioStreamsRepository.getInstance();
private final Executor mExecutor;
private final AudioStreamsHelper mAudioStreamsHelper;
private final @Nullable LocalBluetoothLeBroadcastAssistant mLeBroadcastAssistant;
@@ -228,4 +230,9 @@
void init(int broadcastId) {
mBroadcastId = broadcastId;
}
+
+ @VisibleForTesting
+ void setAudioStreamsRepositoryForTesting(AudioStreamsRepository repository) {
+ mAudioStreamsRepository = repository;
+ }
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
index 6c449a4..148c776 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialog.java
@@ -31,6 +31,7 @@
import android.util.Log;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
@@ -43,9 +44,12 @@
public class AudioStreamConfirmDialog extends InstrumentedDialogFragment {
private static final String TAG = "AudioStreamConfirmDialog";
- private static final int DEFAULT_DEVICE_NAME = R.string.audio_streams_dialog_default_device;
+
+ @VisibleForTesting
+ static final int DEFAULT_DEVICE_NAME = R.string.audio_streams_dialog_default_device;
+
private Context mContext;
- @Nullable private Activity mActivity;
+ @VisibleForTesting @Nullable Activity mActivity;
@Nullable private BluetoothLeBroadcastMetadata mBroadcastMetadata;
@Nullable private BluetoothDevice mConnectedDevice;
private int mAudioStreamConfirmDialogId = SettingsEnums.PAGE_UNKNOWN;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
index 860e62e..e1a178d 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamHeaderController.java
@@ -54,7 +54,9 @@
private final Executor mExecutor;
private final AudioStreamsHelper mAudioStreamsHelper;
@Nullable private final LocalBluetoothLeBroadcastAssistant mLeBroadcastAssistant;
- private final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
+
+ @VisibleForTesting
+ final BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
new AudioStreamsBroadcastAssistantCallback() {
@Override
public void onSourceRemoved(BluetoothDevice sink, int sourceId, int reason) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
index 6d297f4..ad358ed 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamMediaService.java
@@ -16,6 +16,8 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static java.util.Collections.emptyList;
+
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -50,10 +52,14 @@
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.VolumeControlProfile;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.utils.ThreadUtils;
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
public class AudioStreamMediaService extends Service {
static final String BROADCAST_ID = "audio_stream_media_service_broadcast_id";
@@ -62,102 +68,13 @@
private static final String TAG = "AudioStreamMediaService";
private static final int NOTIFICATION_ID = 1;
private static final int BROADCAST_CONTENT_TEXT = R.string.audio_streams_listening_now;
- private static final String LEAVE_BROADCAST_ACTION = "leave_broadcast_action";
+ @VisibleForTesting static final String LEAVE_BROADCAST_ACTION = "leave_broadcast_action";
private static final String LEAVE_BROADCAST_TEXT = "Leave Broadcast";
private static final String CHANNEL_ID = "bluetooth_notification_channel";
private static final String DEFAULT_DEVICE_NAME = "";
private static final int STATIC_PLAYBACK_DURATION = 100;
private static final int STATIC_PLAYBACK_POSITION = 30;
private static final int ZERO_PLAYBACK_SPEED = 0;
- private final AudioStreamsBroadcastAssistantCallback mBroadcastAssistantCallback =
- new AudioStreamsBroadcastAssistantCallback() {
- @Override
- public void onSourceLost(int broadcastId) {
- super.onSourceLost(broadcastId);
- if (broadcastId == mBroadcastId) {
- stopSelf();
- }
- }
-
- @Override
- public void onSourceRemoved(BluetoothDevice sink, int sourceId, int reason) {
- super.onSourceRemoved(sink, sourceId, reason);
- if (mAudioStreamsHelper != null
- && mAudioStreamsHelper.getAllConnectedSources().stream()
- .map(BluetoothLeBroadcastReceiveState::getBroadcastId)
- .noneMatch(id -> id == mBroadcastId)) {
- stopSelf();
- }
- }
- };
-
- private final BluetoothCallback mBluetoothCallback =
- new BluetoothCallback() {
- @Override
- public void onBluetoothStateChanged(int bluetoothState) {
- if (BluetoothAdapter.STATE_OFF == bluetoothState) {
- stopSelf();
- }
- }
-
- @Override
- public void onProfileConnectionStateChanged(
- @NonNull CachedBluetoothDevice cachedDevice,
- @ConnectionState int state,
- int bluetoothProfile) {
- if (state == BluetoothAdapter.STATE_DISCONNECTED
- && bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
- && mDevices != null) {
- mDevices.remove(cachedDevice.getDevice());
- cachedDevice
- .getMemberDevice()
- .forEach(
- m -> {
- // Check nullability to pass NullAway check
- if (mDevices != null) {
- mDevices.remove(m.getDevice());
- }
- });
- }
- if (mDevices == null || mDevices.isEmpty()) {
- stopSelf();
- }
- }
- };
-
- private final BluetoothVolumeControl.Callback mVolumeControlCallback =
- new BluetoothVolumeControl.Callback() {
- @Override
- public void onDeviceVolumeChanged(
- @NonNull BluetoothDevice device,
- @IntRange(from = -255, to = 255) int volume) {
- if (mDevices == null || mDevices.isEmpty()) {
- Log.w(TAG, "active device or device has source is null!");
- return;
- }
- if (mDevices.contains(device)) {
- Log.d(
- TAG,
- "onDeviceVolumeChanged() bluetoothDevice : "
- + device
- + " volume: "
- + volume);
- if (volume == 0) {
- mIsMuted = true;
- } else {
- mIsMuted = false;
- mLatestPositiveVolume = volume;
- }
- if (mLocalSession != null) {
- mLocalSession.setPlaybackState(getPlaybackState());
- if (mNotificationManager != null) {
- mNotificationManager.notify(NOTIFICATION_ID, buildNotification());
- }
- }
- }
- }
- };
-
private final PlaybackState.Builder mPlayStatePlayingBuilder =
new PlaybackState.Builder()
.setActions(PlaybackState.ACTION_PAUSE | PlaybackState.ACTION_SEEK_TO)
@@ -184,20 +101,24 @@
private final MetricsFeatureProvider mMetricsFeatureProvider =
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+ private final AtomicBoolean mIsMuted = new AtomicBoolean(false);
+ // Set 25 as default as the volume range from `VolumeControlProfile` is from 0 to 255.
+ // 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 int mBroadcastId;
- @Nullable private ArrayList<BluetoothDevice> mDevices;
+ @Nullable private List<BluetoothDevice> mDevices;
@Nullable private LocalBluetoothManager mLocalBtManager;
@Nullable private AudioStreamsHelper mAudioStreamsHelper;
@Nullable private LocalBluetoothLeBroadcastAssistant mLeBroadcastAssistant;
@Nullable private VolumeControlProfile mVolumeControl;
@Nullable private NotificationManager mNotificationManager;
-
- // Set 25 as default as the volume range from `VolumeControlProfile` is from 0 to 255.
- // 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 int mLatestPositiveVolume = 25;
- private boolean mIsMuted = false;
- @VisibleForTesting @Nullable MediaSession mLocalSession;
+ @Nullable private MediaSession mLocalSession;
+ @VisibleForTesting @Nullable AudioStreamsBroadcastAssistantCallback mBroadcastAssistantCallback;
+ @VisibleForTesting @Nullable BluetoothCallback mBluetoothCallback;
+ @VisibleForTesting @Nullable BluetoothVolumeControl.Callback mVolumeControlCallback;
+ @VisibleForTesting @Nullable MediaSession.Callback mMediaSessionCallback;
@Override
public void onCreate() {
@@ -234,30 +155,33 @@
mNotificationManager.createNotificationChannel(notificationChannel);
}
+ mBluetoothCallback = new BtCallback();
mLocalBtManager.getEventManager().registerCallback(mBluetoothCallback);
mVolumeControl = mLocalBtManager.getProfileManager().getVolumeControlProfile();
if (mVolumeControl != null) {
+ mVolumeControlCallback = new VolumeControlCallback();
mVolumeControl.registerCallback(mExecutor, mVolumeControlCallback);
}
+ mBroadcastAssistantCallback = new AssistantCallback();
mLeBroadcastAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
}
@Override
public void onDestroy() {
+ Log.d(TAG, "onDestroy()");
super.onDestroy();
-
if (!AudioSharingUtils.isFeatureEnabled()) {
return;
}
if (mLocalBtManager != null) {
mLocalBtManager.getEventManager().unregisterCallback(mBluetoothCallback);
}
- if (mLeBroadcastAssistant != null) {
+ if (mLeBroadcastAssistant != null && mBroadcastAssistantCallback != null) {
mLeBroadcastAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
}
- if (mVolumeControl != null) {
+ if (mVolumeControl != null && mVolumeControlCallback != null) {
mVolumeControl.unregisterCallback(mVolumeControlCallback);
}
if (mLocalSession != null) {
@@ -269,27 +193,31 @@
@Override
public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
Log.d(TAG, "onStartCommand()");
-
- mBroadcastId = intent != null ? intent.getIntExtra(BROADCAST_ID, -1) : -1;
+ 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;
}
-
- if (intent != null) {
- mDevices = intent.getParcelableArrayListExtra(DEVICES, BluetoothDevice.class);
- }
- if (mDevices == null || mDevices.isEmpty()) {
+ 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;
}
- if (intent != null) {
- createLocalMediaSession(intent.getStringExtra(BROADCAST_TITLE));
- startForeground(NOTIFICATION_ID, buildNotification());
- }
-
+ 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);
return START_NOT_STICKY;
}
@@ -302,78 +230,12 @@
.build());
mLocalSession.setActive(true);
mLocalSession.setPlaybackState(getPlaybackState());
- mLocalSession.setCallback(
- new MediaSession.Callback() {
- public void onSeekTo(long pos) {
- Log.d(TAG, "onSeekTo: " + pos);
- if (mLocalSession != null) {
- mLocalSession.setPlaybackState(getPlaybackState());
- if (mNotificationManager != null) {
- mNotificationManager.notify(NOTIFICATION_ID, buildNotification());
- }
- }
- }
-
- @Override
- public void onPause() {
- if (mDevices == null || mDevices.isEmpty()) {
- Log.w(TAG, "active device or device has source is null!");
- return;
- }
- Log.d(
- TAG,
- "onPause() setting volume for device : "
- + mDevices.get(0)
- + " volume: "
- + 0);
- if (mVolumeControl != null) {
- mVolumeControl.setDeviceVolume(mDevices.get(0), 0, true);
- mMetricsFeatureProvider.action(
- getApplicationContext(),
- SettingsEnums
- .ACTION_AUDIO_STREAM_NOTIFICATION_MUTE_BUTTON_CLICK,
- 1);
- }
- }
-
- @Override
- public void onPlay() {
- if (mDevices == null || mDevices.isEmpty()) {
- Log.w(TAG, "active device or device has source is null!");
- return;
- }
- Log.d(
- TAG,
- "onPlay() setting volume for device : "
- + mDevices.get(0)
- + " volume: "
- + mLatestPositiveVolume);
- if (mVolumeControl != null) {
- mVolumeControl.setDeviceVolume(
- mDevices.get(0), mLatestPositiveVolume, true);
- }
- mMetricsFeatureProvider.action(
- getApplicationContext(),
- SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_MUTE_BUTTON_CLICK,
- 0);
- }
-
- @Override
- public void onCustomAction(@NonNull String action, Bundle extras) {
- Log.d(TAG, "onCustomAction: " + action);
- if (action.equals(LEAVE_BROADCAST_ACTION) && mAudioStreamsHelper != null) {
- mAudioStreamsHelper.removeSource(mBroadcastId);
- mMetricsFeatureProvider.action(
- getApplicationContext(),
- SettingsEnums
- .ACTION_AUDIO_STREAM_NOTIFICATION_LEAVE_BUTTON_CLICK);
- }
- }
- });
+ mMediaSessionCallback = new MediaSessionCallback();
+ mLocalSession.setCallback(mMediaSessionCallback);
}
private PlaybackState getPlaybackState() {
- return mIsMuted ? mPlayStatePausingBuilder.build() : mPlayStatePlayingBuilder.build();
+ return mIsMuted.get() ? mPlayStatePausingBuilder.build() : mPlayStatePlayingBuilder.build();
}
private String getDeviceName() {
@@ -414,4 +276,167 @@
public IBinder onBind(Intent intent) {
return null;
}
+
+ private class AssistantCallback extends AudioStreamsBroadcastAssistantCallback {
+ @Override
+ public void onSourceLost(int broadcastId) {
+ super.onSourceLost(broadcastId);
+ handleRemoveSource();
+ }
+
+ @Override
+ public void onSourceRemoved(BluetoothDevice sink, int sourceId, int reason) {
+ super.onSourceRemoved(sink, sourceId, reason);
+ handleRemoveSource();
+ }
+
+ 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();
+ }
+ });
+ }
+ }
+
+ private class VolumeControlCallback implements BluetoothVolumeControl.Callback {
+ @Override
+ public void onDeviceVolumeChanged(
+ @NonNull BluetoothDevice device, @IntRange(from = -255, to = 255) int volume) {
+ if (mDevices == null || mDevices.isEmpty()) {
+ Log.w(TAG, "active device or device has source is null!");
+ return;
+ }
+ Log.d(
+ TAG,
+ "onDeviceVolumeChanged() bluetoothDevice : " + device + " volume: " + volume);
+ if (mDevices.contains(device)) {
+ if (volume == 0) {
+ mIsMuted.set(true);
+ } else {
+ mIsMuted.set(false);
+ mLatestPositiveVolume.set(volume);
+ }
+ updateNotification(getPlaybackState());
+ }
+ }
+ }
+
+ private class BtCallback implements BluetoothCallback {
+ @Override
+ public void onBluetoothStateChanged(int bluetoothState) {
+ if (BluetoothAdapter.STATE_OFF == bluetoothState) {
+ Log.d(TAG, "onBluetoothStateChanged() : stopSelf");
+ mHasStopped.set(true);
+ stopSelf();
+ }
+ }
+
+ @Override
+ public void onProfileConnectionStateChanged(
+ @NonNull CachedBluetoothDevice cachedDevice,
+ @ConnectionState int state,
+ int bluetoothProfile) {
+ if (state == BluetoothAdapter.STATE_DISCONNECTED
+ && bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+ && mDevices != null) {
+ mDevices.remove(cachedDevice.getDevice());
+ cachedDevice
+ .getMemberDevice()
+ .forEach(
+ m -> {
+ // Check nullability to pass NullAway check
+ if (mDevices != null) {
+ mDevices.remove(m.getDevice());
+ }
+ });
+ }
+ if (mDevices == null || mDevices.isEmpty()) {
+ Log.d(TAG, "onProfileConnectionStateChanged() : stopSelf");
+ mHasStopped.set(true);
+ stopSelf();
+ }
+ }
+ }
+
+ private class MediaSessionCallback extends MediaSession.Callback {
+ public void onSeekTo(long pos) {
+ Log.d(TAG, "onSeekTo: " + pos);
+ updateNotification(getPlaybackState());
+ }
+
+ @Override
+ public void onPause() {
+ if (mDevices == null || mDevices.isEmpty()) {
+ Log.w(TAG, "active device or device has source is null!");
+ return;
+ }
+ Log.d(
+ TAG,
+ "onPause() setting volume for device : " + mDevices.get(0) + " volume: " + 0);
+ setDeviceVolume(mDevices.get(0), /* volume= */ 0);
+ }
+
+ @Override
+ public void onPlay() {
+ if (mDevices == null || mDevices.isEmpty()) {
+ Log.w(TAG, "active device or device has source is null!");
+ return;
+ }
+ Log.d(
+ TAG,
+ "onPlay() setting volume for device : "
+ + mDevices.get(0)
+ + " volume: "
+ + mLatestPositiveVolume.get());
+ setDeviceVolume(mDevices.get(0), mLatestPositiveVolume.get());
+ }
+
+ @Override
+ public void onCustomAction(@NonNull String action, Bundle extras) {
+ Log.d(TAG, "onCustomAction: " + action);
+ if (action.equals(LEAVE_BROADCAST_ACTION) && mAudioStreamsHelper != null) {
+ mAudioStreamsHelper.removeSource(mBroadcastId);
+ mMetricsFeatureProvider.action(
+ getApplicationContext(),
+ SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_LEAVE_BUTTON_CLICK);
+ }
+ }
+
+ private void setDeviceVolume(BluetoothDevice device, int volume) {
+ int event = SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_MUTE_BUTTON_CLICK;
+ var unused =
+ ThreadUtils.postOnBackgroundThread(
+ () -> {
+ if (mVolumeControl != null) {
+ mVolumeControl.setDeviceVolume(device, volume, true);
+ mMetricsFeatureProvider.action(
+ getApplicationContext(), event, volume == 0 ? 1 : 0);
+ }
+ });
+ }
+ }
+
+ 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 b0c5b6b..4bb8475 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandler.java
@@ -35,10 +35,10 @@
private static final boolean DEBUG = BluetoothUtils.D;
@VisibleForTesting static final int EMPTY_STRING_RES = 0;
- final AudioStreamsRepository mAudioStreamsRepository = AudioStreamsRepository.getInstance();
final Handler mHandler = new Handler(Looper.getMainLooper());
final MetricsFeatureProvider mMetricsFeatureProvider =
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
+ AudioStreamsRepository mAudioStreamsRepository = AudioStreamsRepository.getInstance();
AudioStreamStateHandler() {}
@@ -112,4 +112,9 @@
AudioStreamsProgressCategoryController.AudioStreamState getStateEnum() {
return AudioStreamsProgressCategoryController.AudioStreamState.UNKNOWN;
}
+
+ @VisibleForTesting
+ void setAudioStreamsRepositoryForTesting(AudioStreamsRepository repository) {
+ mAudioStreamsRepository = repository;
+ }
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
index ab22b07..47ee440 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
@@ -16,24 +16,22 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.text.TextUtils;
-import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
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.utils.ThreadUtils;
public class AudioStreamsActiveDeviceSummaryUpdater implements BluetoothCallback {
- private static final String TAG = "AudioStreamsActiveDeviceSummaryUpdater";
- private static final boolean DEBUG = BluetoothUtils.D;
private final LocalBluetoothManager mBluetoothManager;
private Context mContext;
@Nullable private String mSummary;
@@ -47,17 +45,20 @@
}
@Override
- public void onActiveDeviceChanged(
- @Nullable CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- if (DEBUG) {
- Log.d(
- TAG,
- "onActiveDeviceChanged() with activeDevice : "
- + (activeDevice == null ? "null" : activeDevice.getAddress())
- + " on profile : "
- + bluetoothProfile);
+ public void onBluetoothStateChanged(@AdapterState int bluetoothState) {
+ if (bluetoothState == BluetoothAdapter.STATE_OFF) {
+ notifyChangeIfNeeded();
}
- if (bluetoothProfile == BluetoothProfile.LE_AUDIO) {
+ }
+
+ @Override
+ public void onProfileConnectionStateChanged(
+ @NonNull CachedBluetoothDevice cachedDevice,
+ @ConnectionState int state,
+ int bluetoothProfile) {
+ if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+ && (state == BluetoothAdapter.STATE_CONNECTED
+ || state == BluetoothAdapter.STATE_DISCONNECTED)) {
notifyChangeIfNeeded();
}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
index 3174ace..0107c6e 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java
@@ -16,12 +16,12 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.util.Log;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.lifecycle.LifecycleOwner;
import com.android.settings.bluetooth.Utils;
@@ -44,9 +44,13 @@
private final BluetoothCallback mBluetoothCallback =
new BluetoothCallback() {
@Override
- public void onActiveDeviceChanged(
- @Nullable CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- if (bluetoothProfile == BluetoothProfile.LE_AUDIO) {
+ public void onProfileConnectionStateChanged(
+ @NonNull CachedBluetoothDevice cachedDevice,
+ @ConnectionState int state,
+ int bluetoothProfile) {
+ if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+ && (state == BluetoothAdapter.STATE_CONNECTED
+ || state == BluetoothAdapter.STATE_DISCONNECTED)) {
updateVisibility();
}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragment.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragment.java
index ce32cdb..ae5cb6e 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragment.java
@@ -23,7 +23,6 @@
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.content.Context;
import android.content.Intent;
-import android.os.Bundle;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -64,11 +63,6 @@
}
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- }
-
- @Override
public void onAttach(Context context) {
super.onAttach(context);
use(AudioStreamsScanQrCodeController.class).setFragment(this);
@@ -92,11 +86,6 @@
}
@Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- }
-
- @Override
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (DEBUG) {
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
index 775186a..6e335a0 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelper.java
@@ -71,7 +71,8 @@
*
* @param source The LE broadcast metadata representing the audio source.
*/
- void addSource(BluetoothLeBroadcastMetadata source) {
+ @VisibleForTesting
+ public void addSource(BluetoothLeBroadcastMetadata source) {
if (mLeBroadcastAssistant == null) {
Log.w(TAG, "addSource(): LeBroadcastAssistant is null!");
return;
@@ -97,7 +98,8 @@
}
/** Removes sources from LE broadcasts associated for all active sinks based on broadcast Id. */
- void removeSource(int broadcastId) {
+ @VisibleForTesting
+ public void removeSource(int broadcastId) {
if (mLeBroadcastAssistant == null) {
Log.w(TAG, "removeSource(): LeBroadcastAssistant is null!");
return;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
index cb3a0da..3370d8d 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallback.java
@@ -19,7 +19,6 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
-import android.util.Log;
public class AudioStreamsProgressCategoryCallback extends AudioStreamsBroadcastAssistantCallback {
private static final String TAG = "AudioStreamsProgressCategoryCallback";
@@ -53,10 +52,6 @@
@Override
public void onSearchStarted(int reason) {
super.onSearchStarted(reason);
- if (mCategoryController == null) {
- Log.w(TAG, "onSearchStarted() : mCategoryController is null!");
- return;
- }
mCategoryController.setScanning(true);
}
@@ -69,10 +64,6 @@
@Override
public void onSearchStopped(int reason) {
super.onSearchStopped(reason);
- if (mCategoryController == null) {
- Log.w(TAG, "onSearchStopped() : mCategoryController is null!");
- return;
- }
mCategoryController.setScanning(false);
}
@@ -86,10 +77,6 @@
@Override
public void onSourceFound(BluetoothLeBroadcastMetadata source) {
super.onSourceFound(source);
- if (mCategoryController == null) {
- Log.w(TAG, "onSourceFound() : mCategoryController is null!");
- return;
- }
mCategoryController.handleSourceFound(source);
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
index 890879e..9bbf135 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java
@@ -20,6 +20,7 @@
import android.app.AlertDialog;
import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.bluetooth.BluetoothProfile;
@@ -27,10 +28,12 @@
import android.util.Log;
import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
@@ -55,13 +58,35 @@
implements DefaultLifecycleObserver {
private static final String TAG = "AudioStreamsProgressCategoryController";
private static final boolean DEBUG = BluetoothUtils.D;
- private static final int UNSET_BROADCAST_ID = -1;
- private final BluetoothCallback mBluetoothCallback =
+ @VisibleForTesting static final int UNSET_BROADCAST_ID = -1;
+
+ @VisibleForTesting
+ final BluetoothCallback mBluetoothCallback =
new BluetoothCallback() {
@Override
- public void onActiveDeviceChanged(
- @Nullable CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- if (bluetoothProfile == BluetoothProfile.LE_AUDIO) {
+ public void onBluetoothStateChanged(@AdapterState int bluetoothState) {
+ Log.d(TAG, "onBluetoothStateChanged() with bluetoothState : " + bluetoothState);
+ if (bluetoothState == BluetoothAdapter.STATE_OFF) {
+ mExecutor.execute(() -> init());
+ }
+ }
+
+ @Override
+ public void onProfileConnectionStateChanged(
+ @NonNull CachedBluetoothDevice cachedDevice,
+ @ConnectionState int state,
+ int bluetoothProfile) {
+ Log.d(
+ TAG,
+ "onProfileConnectionStateChanged() with cachedDevice : "
+ + cachedDevice.getAddress()
+ + " with state : "
+ + state
+ + " on profile : "
+ + bluetoothProfile);
+ if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+ && (state == BluetoothAdapter.STATE_CONNECTED
+ || state == BluetoothAdapter.STATE_DISCONNECTED)) {
mExecutor.execute(() -> init());
}
}
@@ -92,7 +117,7 @@
SOURCE_ADDED,
}
- private final Executor mExecutor;
+ @VisibleForTesting Executor mExecutor;
private final AudioStreamsProgressCategoryCallback mBroadcastAssistantCallback;
private final AudioStreamsHelper mAudioStreamsHelper;
private final MediaControlHelper mMediaControlHelper;
@@ -103,7 +128,7 @@
private @Nullable BluetoothLeBroadcastMetadata mSourceFromQrCode;
private SourceOriginForLogging mSourceFromQrCodeOriginForLogging;
@Nullable private AudioStreamsProgressCategoryPreference mCategoryPreference;
- @Nullable private AudioStreamsDashboardFragment mFragment;
+ @Nullable private Fragment mFragment;
public AudioStreamsProgressCategoryController(Context context, String preferenceKey) {
super(context, preferenceKey);
@@ -142,12 +167,12 @@
mExecutor.execute(this::stopScanning);
}
- void setFragment(AudioStreamsDashboardFragment fragment) {
+ void setFragment(Fragment fragment) {
mFragment = fragment;
}
@Nullable
- AudioStreamsDashboardFragment getFragment() {
+ Fragment getFragment() {
return mFragment;
}
@@ -546,7 +571,8 @@
return preference;
}
- private void moveToState(AudioStreamPreference preference, AudioStreamState state) {
+ @VisibleForTesting
+ void moveToState(AudioStreamPreference preference, AudioStreamState state) {
AudioStreamStateHandler stateHandler =
switch (state) {
case SYNCED -> SyncedState.getInstance();
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java
index e4c0794..47f9c75 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragment.java
@@ -55,7 +55,7 @@
@Override
public final View onCreateView(
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- return inflater.inflate(R.xml.bluetooth_audio_streams_qr_code, container, false);
+ return inflater.inflate(R.layout.bluetooth_audio_streams_qr_code, container, false);
}
@Override
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeController.java
index 5f50be7..d0d82fb 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeController.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.util.Log;
@@ -47,9 +48,13 @@
final BluetoothCallback mBluetoothCallback =
new BluetoothCallback() {
@Override
- public void onActiveDeviceChanged(
- @Nullable CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- if (bluetoothProfile == BluetoothProfile.LE_AUDIO) {
+ public void onProfileConnectionStateChanged(
+ @NonNull CachedBluetoothDevice cachedDevice,
+ @ConnectionState int state,
+ int bluetoothProfile) {
+ if (bluetoothProfile == BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT
+ && (state == BluetoothAdapter.STATE_CONNECTED
+ || state == BluetoothAdapter.STATE_DISCONNECTED)) {
updateVisibility();
}
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedState.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedState.java
index ee84429..88393ab 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedState.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedState.java
@@ -25,6 +25,7 @@
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
class SourceAddedState extends AudioStreamStateHandler {
@VisibleForTesting
@@ -32,7 +33,8 @@
@Nullable private static SourceAddedState sInstance = null;
- private SourceAddedState() {}
+ @VisibleForTesting
+ SourceAddedState() {}
static SourceAddedState getInstance() {
if (sInstance == null) {
@@ -80,13 +82,13 @@
AudioStreamDetailsFragment.BROADCAST_ID_ARG, p.getAudioStreamBroadcastId());
new SubSettingLauncher(p.getContext())
- .setTitleText(
- p.getContext().getString(R.string.audio_streams_detail_page_title))
+ .setTitleRes(R.string.audio_streams_detail_page_title)
.setDestination(AudioStreamDetailsFragment.class.getName())
.setSourceMetricsCategory(
- controller.getFragment() == null
+ !(controller.getFragment() instanceof DashboardFragment)
? SettingsEnums.PAGE_UNKNOWN
- : controller.getFragment().getMetricsCategory())
+ : ((DashboardFragment) controller.getFragment())
+ .getMetricsCategory())
.setArguments(broadcast)
.launch();
return true;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncState.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncState.java
index 55f61fd..9689b26 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncState.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncState.java
@@ -39,7 +39,8 @@
@Nullable private static WaitForSyncState sInstance = null;
- private WaitForSyncState() {}
+ @VisibleForTesting
+ WaitForSyncState() {}
static WaitForSyncState getInstance() {
if (sInstance == null) {
@@ -114,7 +115,8 @@
SettingsEnums.DIALOG_AUDIO_STREAM_MAIN_WAIT_FOR_SYNC_TIMEOUT);
}
- private void launchQrCodeScanFragment(Context context, Fragment fragment) {
+ @VisibleForTesting
+ void launchQrCodeScanFragment(Context context, Fragment fragment) {
new SubSettingLauncher(context)
.setTitleRes(R.string.audio_streams_main_page_scan_qr_code_title)
.setDestination(AudioStreamsQrCodeScanFragment.class.getName())
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
new file mode 100644
index 0000000..7b5bef6
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragment.java
@@ -0,0 +1,537 @@
+/*
+ * 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 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.isDisplayAllowed;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isUseDisplaySettingEnabled;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isResolutionSettingEnabled;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isRotationSettingEnabled;
+
+import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragmentBase;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.IllustrationPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.TwoTargetPreference;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The Settings screen for External Displays configuration and connection management.
+ */
+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 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";
+ static final int EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE =
+ R.string.external_display_change_resolution_footer_title;
+ static final int EXTERNAL_DISPLAY_LANDSCAPE_DRAWABLE =
+ R.drawable.external_display_mirror_landscape;
+ static final int EXTERNAL_DISPLAY_TITLE_RESOURCE =
+ R.string.external_display_settings_title;
+ static final int EXTERNAL_DISPLAY_USE_TITLE_RESOURCE =
+ R.string.external_display_use_title;
+ static final int EXTERNAL_DISPLAY_NOT_FOUND_FOOTER_RESOURCE =
+ R.string.external_display_not_found_footer_title;
+ static final int EXTERNAL_DISPLAY_PORTRAIT_DRAWABLE =
+ R.drawable.external_display_mirror_portrait;
+ static final int EXTERNAL_DISPLAY_ROTATION_TITLE_RESOURCE =
+ R.string.external_display_rotation;
+ static final int EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE =
+ R.string.external_display_resolution_settings_title;
+ @VisibleForTesting
+ static final String PREVIOUSLY_SHOWN_LIST_KEY = "mPreviouslyShownListOfDisplays";
+ private boolean mStarted;
+ @Nullable
+ private MainSwitchPreference mUseDisplayPref;
+ @Nullable
+ private IllustrationPreference mImagePreference;
+ @Nullable
+ private Preference mResolutionPreference;
+ @Nullable
+ private ListPreference mRotationPref;
+ @Nullable
+ private FooterPreference mFooterPreference;
+ @Nullable
+ private PreferenceCategory mDisplaysPreference;
+ @Nullable
+ private Injector mInjector;
+ @Nullable
+ private String[] mRotationEntries;
+ @Nullable
+ private String[] mRotationEntriesValues;
+ @NonNull
+ private final Runnable mUpdateRunnable = this::update;
+ private final DisplayListener mListener = new DisplayListener() {
+ @Override
+ public void update(int displayId) {
+ scheduleUpdate();
+ }
+ };
+ private boolean mPreviouslyShownListOfDisplays;
+
+ public ExternalDisplayPreferenceFragment() {}
+
+ @VisibleForTesting
+ ExternalDisplayPreferenceFragment(@NonNull Injector injector) {
+ mInjector = injector;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY;
+ }
+
+ @Override
+ public int getHelpResource() {
+ return EXTERNAL_DISPLAY_HELP_URL;
+ }
+
+ @Override
+ public void onSaveInstanceStateCallback(@NonNull Bundle outState) {
+ outState.putSerializable(PREVIOUSLY_SHOWN_LIST_KEY,
+ (Serializable) mPreviouslyShownListOfDisplays);
+ }
+
+ @Override
+ public void onCreateCallback(@Nullable Bundle icicle) {
+ if (mInjector == null) {
+ mInjector = new Injector(getPrefContext());
+ }
+ addPreferencesFromResource(EXTERNAL_DISPLAY_SETTINGS_RESOURCE);
+ }
+
+ @Override
+ public void onActivityCreatedCallback(@Nullable Bundle savedInstanceState) {
+ restoreState(savedInstanceState);
+ View view = getView();
+ TextView emptyView = null;
+ if (view != null) {
+ emptyView = (TextView) view.findViewById(android.R.id.empty);
+ }
+ if (emptyView != null) {
+ emptyView.setText(EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE);
+ setEmptyView(emptyView);
+ }
+ }
+
+ @Override
+ public void onStartCallback() {
+ mStarted = true;
+ if (mInjector == null) {
+ return;
+ }
+ mInjector.registerDisplayListener(mListener);
+ scheduleUpdate();
+ }
+
+ @Override
+ public void onStopCallback() {
+ mStarted = false;
+ if (mInjector == null) {
+ return;
+ }
+ mInjector.unregisterDisplayListener(mListener);
+ unscheduleUpdate();
+ }
+
+ /**
+ * @return id of the preference.
+ */
+ @Override
+ protected int getPreferenceScreenResId() {
+ return EXTERNAL_DISPLAY_SETTINGS_RESOURCE;
+ }
+
+ @VisibleForTesting
+ protected void launchResolutionSelector(@NonNull final Context context, final int displayId) {
+ final Bundle args = new Bundle();
+ args.putInt(DISPLAY_ID_ARG, displayId);
+ new SubSettingLauncher(context)
+ .setDestination(ResolutionPreferenceFragment.class.getName())
+ .setArguments(args)
+ .setSourceMetricsCategory(getMetricsCategory()).launch();
+ }
+
+ @VisibleForTesting
+ protected void launchDisplaySettings(final int displayId) {
+ final Bundle args = new Bundle();
+ var context = getPrefContext();
+ args.putInt(DISPLAY_ID_ARG, displayId);
+ new SubSettingLauncher(context)
+ .setDestination(this.getClass().getName())
+ .setArguments(args)
+ .setSourceMetricsCategory(getMetricsCategory()).launch();
+ }
+
+ /**
+ * Returns the preference for the footer.
+ */
+ @NonNull
+ @VisibleForTesting
+ FooterPreference getFooterPreference(@NonNull Context context) {
+ if (mFooterPreference == null) {
+ mFooterPreference = new FooterPreference(context);
+ mFooterPreference.setPersistent(false);
+ }
+ return mFooterPreference;
+ }
+
+ @NonNull
+ @VisibleForTesting
+ ListPreference getRotationPreference(@NonNull Context context) {
+ if (mRotationPref == null) {
+ mRotationPref = new ListPreference(context);
+ mRotationPref.setPersistent(false);
+ }
+ return mRotationPref;
+ }
+
+ @NonNull
+ @VisibleForTesting
+ Preference getResolutionPreference(@NonNull Context context) {
+ if (mResolutionPreference == null) {
+ mResolutionPreference = new Preference(context);
+ mResolutionPreference.setPersistent(false);
+ }
+ return mResolutionPreference;
+ }
+
+ @NonNull
+ @VisibleForTesting
+ MainSwitchPreference getUseDisplayPreference(@NonNull Context context) {
+ if (mUseDisplayPref == null) {
+ mUseDisplayPref = new MainSwitchPreference(context);
+ mUseDisplayPref.setPersistent(false);
+ }
+ return mUseDisplayPref;
+ }
+
+ @NonNull
+ @VisibleForTesting
+ IllustrationPreference getIllustrationPreference(@NonNull Context context) {
+ if (mImagePreference == null) {
+ mImagePreference = new IllustrationPreference(context);
+ mImagePreference.setPersistent(false);
+ }
+ return mImagePreference;
+ }
+
+ /**
+ * @return return display id argument of this settings page.
+ */
+ @VisibleForTesting
+ protected int getDisplayIdArg() {
+ var args = getArguments();
+ return args != null ? args.getInt(DISPLAY_ID_ARG, INVALID_DISPLAY) : INVALID_DISPLAY;
+ }
+
+ @NonNull
+ private PreferenceCategory getDisplaysListPreference(@NonNull Context context) {
+ if (mDisplaysPreference == null) {
+ mDisplaysPreference = new PreferenceCategory(context);
+ mDisplaysPreference.setPersistent(false);
+ }
+ return mDisplaysPreference;
+ }
+
+ private void restoreState(@Nullable Bundle savedInstanceState) {
+ if (savedInstanceState == null) {
+ return;
+ }
+ mPreviouslyShownListOfDisplays = Boolean.TRUE.equals(savedInstanceState.getSerializable(
+ PREVIOUSLY_SHOWN_LIST_KEY, Boolean.class));
+ }
+
+ private void update() {
+ final var screen = getPreferenceScreen();
+ if (screen == null || mInjector == null || mInjector.getContext() == null) {
+ return;
+ }
+ screen.removeAll();
+ updateScreenForDisplayId(getDisplayIdArg(), screen, mInjector.getContext());
+ }
+
+ private void updateScreenForDisplayId(final int displayId,
+ @NonNull final PreferenceScreen screen, @NonNull Context context) {
+ final var displaysToShow = getDisplaysToShow(displayId);
+ if (displaysToShow.isEmpty() && displayId == INVALID_DISPLAY) {
+ showTextWhenNoDisplaysToShow(screen, context);
+ } else if (displaysToShow.size() == 1
+ && ((displayId == INVALID_DISPLAY && !mPreviouslyShownListOfDisplays)
+ || displaysToShow.get(0).getDisplayId() == displayId)) {
+ showDisplaySettings(displaysToShow.get(0), screen, context);
+ } else if (displayId == INVALID_DISPLAY) {
+ // If ever shown a list of displays - keep showing it for consistency after
+ // disconnecting one of the displays, and only one display is left.
+ mPreviouslyShownListOfDisplays = true;
+ showDisplaysList(displaysToShow, screen, context);
+ }
+ updateSettingsTitle(displaysToShow, displayId);
+ }
+
+ private void updateSettingsTitle(@NonNull final List<Display> displaysToShow, int displayId) {
+ final Activity activity = getCurrentActivity();
+ if (activity == null) {
+ return;
+ }
+ if (displaysToShow.size() == 1 && displaysToShow.get(0).getDisplayId() == displayId) {
+ var displayName = displaysToShow.get(0).getName();
+ if (!displayName.isEmpty()) {
+ activity.setTitle(displayName.substring(0, Math.min(displayName.length(), 40)));
+ return;
+ }
+ }
+ activity.setTitle(EXTERNAL_DISPLAY_TITLE_RESOURCE);
+ }
+
+ private void showTextWhenNoDisplaysToShow(@NonNull final PreferenceScreen screen,
+ @NonNull Context context) {
+ if (isUseDisplaySettingEnabled(mInjector)) {
+ screen.addPreference(updateUseDisplayPreferenceNoDisplaysFound(context));
+ }
+ screen.addPreference(updateFooterPreference(context,
+ EXTERNAL_DISPLAY_NOT_FOUND_FOOTER_RESOURCE));
+ }
+
+ private void showDisplaySettings(@NonNull Display display, @NonNull PreferenceScreen screen,
+ @NonNull Context context) {
+ final var isEnabled = mInjector != null && mInjector.isDisplayEnabled(display);
+ if (isUseDisplaySettingEnabled(mInjector)) {
+ screen.addPreference(updateUseDisplayPreference(context, display, isEnabled));
+ }
+ if (!isEnabled) {
+ // Skip all other settings
+ return;
+ }
+ final var displayRotation = getDisplayRotation(display.getDisplayId());
+ screen.addPreference(updateIllustrationImage(context, displayRotation));
+ screen.addPreference(updateResolutionPreference(context, display));
+ screen.addPreference(updateRotationPreference(context, display, displayRotation));
+ if (isResolutionSettingEnabled(mInjector)) {
+ screen.addPreference(updateFooterPreference(context,
+ EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE));
+ }
+ }
+
+ private void showDisplaysList(@NonNull List<Display> displaysToShow,
+ @NonNull PreferenceScreen screen, @NonNull Context context) {
+ var pref = getDisplaysListPreference(context);
+ pref.setKey(DISPLAYS_LIST_PREFERENCE_KEY);
+ pref.removeAll();
+ if (!displaysToShow.isEmpty()) {
+ screen.addPreference(pref);
+ }
+ for (var display : displaysToShow) {
+ pref.addPreference(new DisplayPreference(context, display));
+ }
+ }
+
+ private List<Display> getDisplaysToShow(int displayIdToShow) {
+ if (mInjector == null) {
+ return List.of();
+ }
+ if (displayIdToShow != INVALID_DISPLAY) {
+ var display = mInjector.getDisplay(displayIdToShow);
+ if (display != null && isDisplayAllowed(display, mInjector)) {
+ return List.of(display);
+ }
+ }
+ var displaysToShow = new ArrayList<Display>();
+ for (var display : mInjector.getAllDisplays()) {
+ if (display != null && isDisplayAllowed(display, mInjector)) {
+ displaysToShow.add(display);
+ }
+ }
+ return displaysToShow;
+ }
+
+ private Preference updateUseDisplayPreferenceNoDisplaysFound(@NonNull Context context) {
+ final var pref = getUseDisplayPreference(context);
+ pref.setKey(EXTERNAL_DISPLAY_USE_PREFERENCE_KEY);
+ pref.setTitle(EXTERNAL_DISPLAY_USE_TITLE_RESOURCE);
+ pref.setChecked(false);
+ pref.setEnabled(false);
+ pref.setOnPreferenceChangeListener(null);
+ return pref;
+ }
+
+ private Preference updateUseDisplayPreference(@NonNull final Context context,
+ @NonNull final Display display, boolean isEnabled) {
+ final var pref = getUseDisplayPreference(context);
+ pref.setKey(EXTERNAL_DISPLAY_USE_PREFERENCE_KEY);
+ pref.setTitle(EXTERNAL_DISPLAY_USE_TITLE_RESOURCE);
+ pref.setChecked(isEnabled);
+ pref.setEnabled(true);
+ pref.setOnPreferenceChangeListener((p, newValue) -> {
+ writePreferenceClickMetric(p);
+ final boolean result;
+ if (mInjector == null) {
+ return false;
+ }
+ if ((Boolean) newValue) {
+ result = mInjector.enableConnectedDisplay(display.getDisplayId());
+ } else {
+ result = mInjector.disableConnectedDisplay(display.getDisplayId());
+ }
+ if (result) {
+ pref.setChecked((Boolean) newValue);
+ }
+ return result;
+ });
+ return pref;
+ }
+
+ private Preference updateIllustrationImage(@NonNull final Context context,
+ final int displayRotation) {
+ var pref = getIllustrationPreference(context);
+ if (displayRotation % 2 == 0) {
+ pref.setLottieAnimationResId(EXTERNAL_DISPLAY_PORTRAIT_DRAWABLE);
+ } else {
+ pref.setLottieAnimationResId(EXTERNAL_DISPLAY_LANDSCAPE_DRAWABLE);
+ }
+ return pref;
+ }
+
+ private Preference updateFooterPreference(@NonNull final Context context, final int title) {
+ var pref = getFooterPreference(context);
+ pref.setTitle(title);
+ return pref;
+ }
+
+ private Preference updateRotationPreference(@NonNull final Context context,
+ @NonNull final Display display, final int displayRotation) {
+ var pref = getRotationPreference(context);
+ pref.setKey(EXTERNAL_DISPLAY_ROTATION_KEY);
+ pref.setTitle(EXTERNAL_DISPLAY_ROTATION_TITLE_RESOURCE);
+ if (mRotationEntries == null || mRotationEntriesValues == null) {
+ mRotationEntries = new String[] {
+ context.getString(R.string.external_display_standard_rotation),
+ context.getString(R.string.external_display_rotation_90),
+ context.getString(R.string.external_display_rotation_180),
+ context.getString(R.string.external_display_rotation_270)};
+ mRotationEntriesValues = new String[] {"0", "1", "2", "3"};
+ }
+ pref.setEntries(mRotationEntries);
+ pref.setEntryValues(mRotationEntriesValues);
+ pref.setValueIndex(displayRotation);
+ pref.setSummary(mRotationEntries[displayRotation]);
+ pref.setOnPreferenceChangeListener((p, newValue) -> {
+ writePreferenceClickMetric(p);
+ var rotation = Integer.parseInt((String) newValue);
+ var displayId = display.getDisplayId();
+ if (mInjector == null || !mInjector.freezeDisplayRotation(displayId, rotation)) {
+ return false;
+ }
+ pref.setValueIndex(rotation);
+ return true;
+ });
+ pref.setEnabled(isRotationSettingEnabled(mInjector));
+ return pref;
+ }
+
+ private Preference updateResolutionPreference(@NonNull final Context context,
+ @NonNull final Display display) {
+ var pref = getResolutionPreference(context);
+ pref.setKey(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+ pref.setTitle(EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE);
+ pref.setSummary(display.getMode().getPhysicalWidth() + " x "
+ + display.getMode().getPhysicalHeight());
+ pref.setOnPreferenceClickListener((Preference p) -> {
+ writePreferenceClickMetric(p);
+ launchResolutionSelector(context, display.getDisplayId());
+ return true;
+ });
+ pref.setEnabled(isResolutionSettingEnabled(mInjector));
+ return pref;
+ }
+
+ private int getDisplayRotation(int displayId) {
+ if (mInjector == null) {
+ return 0;
+ }
+ return Math.min(3, Math.max(0, mInjector.getDisplayUserRotation(displayId)));
+ }
+
+ private void scheduleUpdate() {
+ if (mInjector == null || !mStarted) {
+ return;
+ }
+ unscheduleUpdate();
+ mInjector.getHandler().post(mUpdateRunnable);
+ }
+
+ private void unscheduleUpdate() {
+ if (mInjector == null || !mStarted) {
+ return;
+ }
+ mInjector.getHandler().removeCallbacks(mUpdateRunnable);
+ }
+
+ @VisibleForTesting
+ class DisplayPreference extends TwoTargetPreference
+ implements Preference.OnPreferenceClickListener {
+ private final int mDisplayId;
+
+ DisplayPreference(@NonNull final Context context, @NonNull final Display display) {
+ super(context);
+ mDisplayId = display.getDisplayId();
+ setPersistent(false);
+ setKey("display_id_" + mDisplayId);
+ setTitle(display.getName());
+ setSummary(display.getMode().getPhysicalWidth() + " x "
+ + display.getMode().getPhysicalHeight());
+ setOnPreferenceClickListener(this);
+ }
+
+ @Override
+ public boolean onPreferenceClick(@NonNull Preference preference) {
+ launchDisplaySettings(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
new file mode 100644
index 0000000..c9ea8ae
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplaySettingsConfiguration.java
@@ -0,0 +1,350 @@
+/*
+ * 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 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.view.Display.INVALID_DISPLAY;
+
+import static com.android.server.display.feature.flags.Flags.enableModeLimitForExternalDisplay;
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManagerGlobal;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.view.Display;
+import android.view.Display.Mode;
+import android.view.IWindowManager;
+import android.view.WindowManagerGlobal;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settings.flags.FeatureFlags;
+import com.android.settings.flags.FeatureFlagsImpl;
+
+public class ExternalDisplaySettingsConfiguration {
+ static final String VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY =
+ "persist.demo.userrotation.package_name";
+ static final String DISPLAY_ID_ARG = "display_id";
+ static final int EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE = R.string.external_display_not_found;
+ static final int EXTERNAL_DISPLAY_HELP_URL = R.string.help_url_external_display;
+
+ public static class SystemServicesProvider {
+ @Nullable
+ private IWindowManager mWindowManager;
+ @Nullable
+ private DisplayManager mDisplayManager;
+ @Nullable
+ protected Context mContext;
+ /**
+ * @param name of a system property.
+ * @return the value of the system property.
+ */
+ @NonNull
+ public String getSystemProperty(@NonNull String name) {
+ return SystemProperties.get(name);
+ }
+
+ /**
+ * @return return public Display manager.
+ */
+ @Nullable
+ public DisplayManager getDisplayManager() {
+ if (mDisplayManager == null && getContext() != null) {
+ mDisplayManager = (DisplayManager) getContext().getSystemService(DISPLAY_SERVICE);
+ }
+ return mDisplayManager;
+ }
+
+ /**
+ * @return internal IWindowManager
+ */
+ @Nullable
+ public IWindowManager getWindowManager() {
+ if (mWindowManager == null) {
+ mWindowManager = WindowManagerGlobal.getWindowManagerService();
+ }
+ return mWindowManager;
+ }
+
+ /**
+ * @return context.
+ */
+ @Nullable
+ public Context getContext() {
+ return mContext;
+ }
+ }
+
+ public static class Injector extends SystemServicesProvider {
+ @NonNull
+ private final FeatureFlags mFlags;
+ @NonNull
+ private final Handler mHandler;
+
+ Injector(@Nullable Context context) {
+ this(context, new FeatureFlagsImpl(), new Handler(Looper.getMainLooper()));
+ }
+
+ Injector(@Nullable Context context, @NonNull FeatureFlags flags, @NonNull Handler handler) {
+ mContext = context;
+ mFlags = flags;
+ mHandler = handler;
+ }
+
+ /**
+ * @return all displays including disabled.
+ */
+ @NonNull
+ public Display[] getAllDisplays() {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return new Display[0];
+ }
+ return dm.getDisplays(DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED);
+ }
+
+ /**
+ * @return enabled displays only.
+ */
+ @NonNull
+ public Display[] getEnabledDisplays() {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return new Display[0];
+ }
+ return dm.getDisplays();
+ }
+
+ /**
+ * @return true if the display is enabled
+ */
+ public boolean isDisplayEnabled(@NonNull Display display) {
+ for (var enabledDisplay : getEnabledDisplays()) {
+ if (enabledDisplay.getDisplayId() == display.getDisplayId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Register display listener.
+ */
+ public void registerDisplayListener(@NonNull DisplayManager.DisplayListener listener) {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return;
+ }
+ dm.registerDisplayListener(listener, mHandler, EVENT_FLAG_DISPLAY_ADDED
+ | EVENT_FLAG_DISPLAY_CHANGED | EVENT_FLAG_DISPLAY_REMOVED
+ | EVENT_FLAG_DISPLAY_CONNECTION_CHANGED);
+ }
+
+ /**
+ * Unregister display listener.
+ */
+ public void unregisterDisplayListener(@NonNull DisplayManager.DisplayListener listener) {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return;
+ }
+ dm.unregisterDisplayListener(listener);
+ }
+
+ /**
+ * @return feature flags.
+ */
+ @NonNull
+ public FeatureFlags getFlags() {
+ return mFlags;
+ }
+
+ /**
+ * Enable connected display.
+ */
+ public boolean enableConnectedDisplay(int displayId) {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return false;
+ }
+ dm.enableConnectedDisplay(displayId);
+ return true;
+ }
+
+ /**
+ * Disable connected display.
+ */
+ public boolean disableConnectedDisplay(int displayId) {
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return false;
+ }
+ dm.disableConnectedDisplay(displayId);
+ return true;
+ }
+
+ /**
+ * @param displayId which must be returned
+ * @return display object for the displayId
+ */
+ @Nullable
+ public Display getDisplay(int displayId) {
+ if (displayId == INVALID_DISPLAY) {
+ return null;
+ }
+ var dm = getDisplayManager();
+ if (dm == null) {
+ return null;
+ }
+ return dm.getDisplay(displayId);
+ }
+
+ /**
+ * @return handler
+ */
+ @NonNull
+ public Handler getHandler() {
+ return mHandler;
+ }
+
+ /**
+ * Get display rotation
+ * @param displayId display identifier
+ * @return rotation
+ */
+ public int getDisplayUserRotation(int displayId) {
+ var wm = getWindowManager();
+ if (wm == null) {
+ return 0;
+ }
+ try {
+ return wm.getDisplayUserRotation(displayId);
+ } catch (RemoteException e) {
+ return 0;
+ }
+ }
+
+ /**
+ * Freeze rotation of the display in the specified rotation.
+ * @param displayId display identifier
+ * @param rotation [0, 1, 2, 3]
+ * @return true if successful
+ */
+ public boolean freezeDisplayRotation(int displayId, int rotation) {
+ var wm = getWindowManager();
+ if (wm == null) {
+ return false;
+ }
+ try {
+ wm.freezeDisplayRotation(displayId, rotation,
+ "ExternalDisplayPreferenceFragment");
+ return true;
+ } catch (RemoteException e) {
+ return false;
+ }
+ }
+
+ /**
+ * Enforce display mode on the given display.
+ */
+ public void setUserPreferredDisplayMode(int displayId, @NonNull Mode mode) {
+ DisplayManagerGlobal.getInstance().setUserPreferredDisplayMode(displayId, mode);
+ }
+
+ /**
+ * @return true if the display mode limit flag enabled.
+ */
+ public boolean isModeLimitForExternalDisplayEnabled() {
+ return enableModeLimitForExternalDisplay();
+ }
+ }
+
+ public abstract static class DisplayListener implements DisplayManager.DisplayListener {
+ @Override
+ public void onDisplayAdded(int displayId) {
+ update(displayId);
+ }
+
+ @Override
+ public void onDisplayRemoved(int displayId) {
+ update(displayId);
+ }
+
+ @Override
+ public void onDisplayChanged(int displayId) {
+ update(displayId);
+ }
+
+ @Override
+ public void onDisplayConnected(int displayId) {
+ update(displayId);
+ }
+
+ @Override
+ public void onDisplayDisconnected(int displayId) {
+ update(displayId);
+ }
+
+ /**
+ * Called from other listener methods to trigger update of the settings page.
+ */
+ public abstract void update(int displayId);
+ }
+
+ /**
+ * @return whether the settings page is enabled or not.
+ */
+ public static boolean isExternalDisplaySettingsPageEnabled(@NonNull FeatureFlags flags) {
+ return flags.rotationConnectedDisplaySetting()
+ || flags.resolutionAndEnableConnectedDisplaySetting();
+ }
+
+ static boolean isDisplayAllowed(@NonNull Display display,
+ @NonNull SystemServicesProvider props) {
+ return display.getType() == Display.TYPE_EXTERNAL
+ || display.getType() == Display.TYPE_OVERLAY
+ || isVirtualDisplayAllowed(display, props);
+ }
+
+ static boolean isVirtualDisplayAllowed(@NonNull Display display,
+ @NonNull SystemServicesProvider properties) {
+ var sysProp = properties.getSystemProperty(VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY);
+ return !sysProp.isEmpty() && display.getType() == Display.TYPE_VIRTUAL
+ && sysProp.equals(display.getOwnerPackageName());
+ }
+
+ static boolean isUseDisplaySettingEnabled(@Nullable Injector injector) {
+ return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting();
+ }
+
+ static boolean isResolutionSettingEnabled(@Nullable Injector injector) {
+ return injector != null && injector.getFlags().resolutionAndEnableConnectedDisplaySetting();
+ }
+
+ static boolean isRotationSettingEnabled(@Nullable Injector injector) {
+ return injector != null && injector.getFlags().rotationConnectedDisplaySetting();
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java b/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java
new file mode 100644
index 0000000..64dd7bb
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdater.java
@@ -0,0 +1,181 @@
+/*
+ * 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 static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplayAllowed;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+public class ExternalDisplayUpdater {
+
+ private static final String PREF_KEY = "external_display_settings";
+ private final int mMetricsCategory;
+ @NonNull
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+ @NonNull
+ private final Runnable mUpdateRunnable = this::update;
+ @NonNull
+ private final DevicePreferenceCallback mDevicePreferenceCallback;
+ @Nullable
+ private RestrictedPreference mPreference;
+ @Nullable
+ private Injector mInjector;
+ private final DisplayListener mListener = new DisplayListener() {
+ @Override
+ public void update(int displayId) {
+ scheduleUpdate();
+ }
+ };
+
+ public ExternalDisplayUpdater(@NonNull DevicePreferenceCallback callback, int metricsCategory) {
+ mDevicePreferenceCallback = callback;
+ mMetricsCategory = metricsCategory;
+ mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
+ }
+
+ /**
+ * Set the context to generate the {@link Preference}, so it could get the correct theme.
+ */
+ public void initPreference(@NonNull Context context) {
+ initPreference(context, new Injector(context));
+ }
+
+ @VisibleForTesting
+ void initPreference(@NonNull Context context, Injector injector) {
+ mInjector = injector;
+ mPreference = new RestrictedPreference(context, null /* AttributeSet */);
+ mPreference.setTitle(R.string.external_display_settings_title);
+ mPreference.setSummary(getSummary());
+ mPreference.setIcon(getDrawable(context));
+ mPreference.setKey(PREF_KEY);
+ mPreference.setDisabledByAdmin(checkIfUsbDataSignalingIsDisabled(context));
+ mPreference.setOnPreferenceClickListener((Preference p) -> {
+ mMetricsFeatureProvider.logClickedPreference(p, mMetricsCategory);
+ // New version - uses a separate screen.
+ new SubSettingLauncher(context)
+ .setDestination(ExternalDisplayPreferenceFragment.class.getName())
+ .setTitleRes(R.string.external_display_settings_title)
+ .setSourceMetricsCategory(mMetricsCategory)
+ .launch();
+ return true;
+ });
+
+ scheduleUpdate();
+ }
+
+ /**
+ * Unregister the display listener.
+ */
+ public void unregisterCallback() {
+ if (mInjector != null) {
+ mInjector.unregisterDisplayListener(mListener);
+ }
+ }
+
+ /**
+ * Register the display listener.
+ */
+ public void registerCallback() {
+ if (mInjector != null) {
+ mInjector.registerDisplayListener(mListener);
+ }
+ }
+
+ @VisibleForTesting
+ @Nullable
+ protected RestrictedLockUtils.EnforcedAdmin checkIfUsbDataSignalingIsDisabled(Context context) {
+ return RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled(context,
+ UserHandle.myUserId());
+ }
+
+ @VisibleForTesting
+ @Nullable
+ protected Drawable getDrawable(Context context) {
+ return context.getDrawable(R.drawable.ic_external_display_32dp);
+ }
+
+ @Nullable
+ protected CharSequence getSummary() {
+ if (mInjector == null) {
+ return null;
+ }
+ var context = mInjector.getContext();
+ if (context == null) {
+ return null;
+ }
+
+ for (var display : mInjector.getEnabledDisplays()) {
+ if (display != null && isDisplayAllowed(display, mInjector)) {
+ return context.getString(R.string.external_display_on);
+ }
+ }
+
+ for (var display : mInjector.getAllDisplays()) {
+ if (display != null && isDisplayAllowed(display, mInjector)) {
+ return context.getString(R.string.external_display_off);
+ }
+ }
+
+ return null;
+ }
+
+ private void scheduleUpdate() {
+ if (mInjector == null) {
+ return;
+ }
+ unscheduleUpdate();
+ mInjector.getHandler().post(mUpdateRunnable);
+ }
+
+ private void unscheduleUpdate() {
+ if (mInjector == null) {
+ return;
+ }
+ mInjector.getHandler().removeCallbacks(mUpdateRunnable);
+ }
+
+ private void update() {
+ var summary = getSummary();
+ if (mPreference == null) {
+ return;
+ }
+ mPreference.setSummary(summary);
+ if (summary != null) {
+ mDevicePreferenceCallback.onDeviceAdded(mPreference);
+ } else {
+ mDevicePreferenceCallback.onDeviceRemoved(mPreference);
+ }
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/display/OWNERS b/src/com/android/settings/connecteddevice/display/OWNERS
new file mode 100644
index 0000000..78aecb9
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/OWNERS
@@ -0,0 +1,7 @@
+# Default reviewers for this and subdirectories.
+santoscordon@google.com
+petsjonkin@google.com
+flc@google.com
+wilczynskip@google.com
+brup@google.com
+olb@google.com
diff --git a/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragment.java b/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragment.java
new file mode 100644
index 0000000..db81be8
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragment.java
@@ -0,0 +1,358 @@
+/*
+ * 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 static android.view.Display.INVALID_DISPLAY;
+
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DISPLAY_ID_ARG;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_HELP_URL;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.isDisplayAllowed;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.Pair;
+import android.view.Display;
+import android.view.Display.Mode;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.util.ToBooleanFunction;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragmentBase;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.Injector;
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+public class ResolutionPreferenceFragment extends SettingsPreferenceFragmentBase {
+ private static final String TAG = "ResolutionPreference";
+ static final int DEFAULT_LOW_REFRESH_RATE = 60;
+ static final String MORE_OPTIONS_KEY = "more_options";
+ static final String TOP_OPTIONS_KEY = "top_options";
+ static final int MORE_OPTIONS_TITLE_RESOURCE =
+ R.string.external_display_more_options_title;
+ static final int EXTERNAL_DISPLAY_RESOLUTION_SETTINGS_RESOURCE =
+ R.xml.external_display_resolution_settings;
+ static final String DISPLAY_MODE_LIMIT_OVERRIDE_PROP = "persist.sys.com.android.server.display"
+ + ".feature.flags.enable_mode_limit_for_external_display-override";
+ @Nullable
+ private Injector mInjector;
+ @Nullable
+ private PreferenceCategory mTopOptionsPreference;
+ @Nullable
+ private PreferenceCategory mMoreOptionsPreference;
+ private boolean mStarted;
+ private final HashSet<String> mResolutionPreferences = new HashSet<>();
+ private int mExternalDisplayPeakWidth;
+ private int mExternalDisplayPeakHeight;
+ private int mExternalDisplayPeakRefreshRate;
+ private boolean mRefreshRateSynchronizationEnabled;
+ private boolean mMoreOptionsExpanded;
+ private final Runnable mUpdateRunnable = this::update;
+ private final DisplayListener mListener = new DisplayListener() {
+ @Override
+ public void update(int displayId) {
+ scheduleUpdate();
+ }
+ };
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY;
+ }
+
+ @Override
+ public int getHelpResource() {
+ return EXTERNAL_DISPLAY_HELP_URL;
+ }
+
+ @Override
+ public void onCreateCallback(@Nullable Bundle icicle) {
+ if (mInjector == null) {
+ mInjector = new Injector(getPrefContext());
+ }
+ addPreferencesFromResource(EXTERNAL_DISPLAY_RESOLUTION_SETTINGS_RESOURCE);
+ updateDisplayModeLimits(mInjector.getContext());
+ }
+
+ @Override
+ public void onActivityCreatedCallback(@Nullable Bundle savedInstanceState) {
+ View view = getView();
+ TextView emptyView = null;
+ if (view != null) {
+ emptyView = (TextView) view.findViewById(android.R.id.empty);
+ }
+ if (emptyView != null) {
+ emptyView.setText(EXTERNAL_DISPLAY_NOT_FOUND_RESOURCE);
+ setEmptyView(emptyView);
+ }
+ }
+
+ @Override
+ public void onStartCallback() {
+ mStarted = true;
+ if (mInjector == null) {
+ return;
+ }
+ mInjector.registerDisplayListener(mListener);
+ scheduleUpdate();
+ }
+
+ @Override
+ public void onStopCallback() {
+ mStarted = false;
+ if (mInjector == null) {
+ return;
+ }
+ mInjector.unregisterDisplayListener(mListener);
+ unscheduleUpdate();
+ }
+
+ public ResolutionPreferenceFragment() {}
+
+ @VisibleForTesting
+ ResolutionPreferenceFragment(@NonNull Injector injector) {
+ mInjector = injector;
+ }
+
+ @VisibleForTesting
+ protected int getDisplayIdArg() {
+ var args = getArguments();
+ return args != null ? args.getInt(DISPLAY_ID_ARG, INVALID_DISPLAY) : INVALID_DISPLAY;
+ }
+
+ @VisibleForTesting
+ @NonNull
+ protected Resources getResources(@NonNull Context context) {
+ return context.getResources();
+ }
+
+ private void update() {
+ final PreferenceScreen screen = getPreferenceScreen();
+ if (screen == null || mInjector == null) {
+ return;
+ }
+ var context = mInjector.getContext();
+ if (context == null) {
+ return;
+ }
+ var display = mInjector.getDisplay(getDisplayIdArg());
+ if (display == null || !isDisplayAllowed(display, mInjector)) {
+ screen.removeAll();
+ mTopOptionsPreference = null;
+ mMoreOptionsPreference = null;
+ return;
+ }
+ mResolutionPreferences.clear();
+ var remainingModes = addModePreferences(context,
+ getTopPreference(context, screen),
+ display.getSupportedModes(), this::isTopMode, display);
+ addRemainingPreferences(context,
+ getMorePreference(context, screen),
+ display, remainingModes.first, remainingModes.second);
+ }
+
+ private PreferenceCategory getTopPreference(@NonNull Context context,
+ @NonNull PreferenceScreen screen) {
+ if (mTopOptionsPreference == null) {
+ mTopOptionsPreference = new PreferenceCategory(context);
+ mTopOptionsPreference.setPersistent(false);
+ mTopOptionsPreference.setKey(TOP_OPTIONS_KEY);
+ screen.addPreference(mTopOptionsPreference);
+ } else {
+ mTopOptionsPreference.removeAll();
+ }
+ return mTopOptionsPreference;
+ }
+
+ private PreferenceCategory getMorePreference(@NonNull Context context,
+ @NonNull PreferenceScreen screen) {
+ if (mMoreOptionsPreference == null) {
+ mMoreOptionsPreference = new PreferenceCategory(context);
+ mMoreOptionsPreference.setPersistent(false);
+ mMoreOptionsPreference.setTitle(MORE_OPTIONS_TITLE_RESOURCE);
+ mMoreOptionsPreference.setOnExpandButtonClickListener(() -> {
+ mMoreOptionsExpanded = true;
+ });
+ mMoreOptionsPreference.setKey(MORE_OPTIONS_KEY);
+ screen.addPreference(mMoreOptionsPreference);
+ } else {
+ mMoreOptionsPreference.removeAll();
+ }
+ return mMoreOptionsPreference;
+ }
+
+ private void addRemainingPreferences(@NonNull Context context,
+ @NonNull PreferenceCategory group, @NonNull Display display,
+ boolean isSelectedModeFound, @NonNull Mode[] moreModes) {
+ if (moreModes.length == 0) {
+ return;
+ }
+ mMoreOptionsExpanded |= !isSelectedModeFound;
+ group.setInitialExpandedChildrenCount(mMoreOptionsExpanded ? Integer.MAX_VALUE : 0);
+ addModePreferences(context, group, moreModes, /*checkMode=*/ null, display);
+ }
+
+ private Pair<Boolean, Mode[]> addModePreferences(@NonNull Context context,
+ @NonNull PreferenceGroup group,
+ @NonNull Mode[] modes,
+ @Nullable ToBooleanFunction<Mode> checkMode,
+ @NonNull Display display) {
+ Display.Mode curMode = display.getMode();
+ var currentResolution = curMode.getPhysicalWidth() + "x" + curMode.getPhysicalHeight();
+ var rotatedResolution = curMode.getPhysicalHeight() + "x" + curMode.getPhysicalWidth();
+ var skippedModes = new ArrayList<Mode>();
+ var isAnyOfModesSelected = false;
+ for (var mode : modes) {
+ var modeStr = mode.getPhysicalWidth() + "x" + mode.getPhysicalHeight();
+ SelectorWithWidgetPreference pref = group.findPreference(modeStr);
+ if (pref != null) {
+ continue;
+ }
+ if (checkMode != null && !checkMode.apply(mode)) {
+ skippedModes.add(mode);
+ continue;
+ }
+ var isCurrentMode =
+ currentResolution.equals(modeStr) || rotatedResolution.equals(modeStr);
+ if (!isCurrentMode && !isAllowedMode(mode)) {
+ continue;
+ }
+ if (mResolutionPreferences.contains(modeStr)) {
+ // Added to "Top modes" already.
+ continue;
+ }
+ mResolutionPreferences.add(modeStr);
+ pref = new SelectorWithWidgetPreference(context);
+ pref.setPersistent(false);
+ pref.setKey(modeStr);
+ pref.setTitle(mode.getPhysicalWidth() + " x " + mode.getPhysicalHeight());
+ pref.setSingleLineTitle(true);
+ pref.setOnClickListener(preference -> onDisplayModeClicked(preference, display));
+ pref.setChecked(isCurrentMode);
+ isAnyOfModesSelected |= isCurrentMode;
+ group.addPreference(pref);
+ }
+ return new Pair<>(isAnyOfModesSelected, skippedModes.toArray(Mode.EMPTY_ARRAY));
+ }
+
+ private boolean isTopMode(@NonNull Mode mode) {
+ return mTopOptionsPreference != null
+ && mTopOptionsPreference.getPreferenceCount() < 3;
+ }
+
+ private boolean isAllowedMode(@NonNull Mode mode) {
+ if (mRefreshRateSynchronizationEnabled
+ && (mode.getRefreshRate() < DEFAULT_LOW_REFRESH_RATE - 1
+ || mode.getRefreshRate() > DEFAULT_LOW_REFRESH_RATE + 1)) {
+ Log.d(TAG, mode + " refresh rate is out of synchronization range");
+ return false;
+ }
+ if (mExternalDisplayPeakHeight > 0
+ && mode.getPhysicalHeight() > mExternalDisplayPeakHeight) {
+ Log.d(TAG, mode + " height is above the allowed limit");
+ return false;
+ }
+ if (mExternalDisplayPeakWidth > 0
+ && mode.getPhysicalWidth() > mExternalDisplayPeakWidth) {
+ Log.d(TAG, mode + " width is above the allowed limit");
+ return false;
+ }
+ if (mExternalDisplayPeakRefreshRate > 0
+ && mode.getRefreshRate() > mExternalDisplayPeakRefreshRate) {
+ Log.d(TAG, mode + " refresh rate is above the allowed limit");
+ return false;
+ }
+ return true;
+ }
+
+ private void scheduleUpdate() {
+ if (mInjector == null || !mStarted) {
+ return;
+ }
+ unscheduleUpdate();
+ mInjector.getHandler().post(mUpdateRunnable);
+ }
+
+ private void unscheduleUpdate() {
+ if (mInjector == null || !mStarted) {
+ return;
+ }
+ mInjector.getHandler().removeCallbacks(mUpdateRunnable);
+ }
+
+ private void onDisplayModeClicked(@NonNull SelectorWithWidgetPreference preference,
+ @NonNull Display display) {
+ if (mInjector == null) {
+ return;
+ }
+ String[] modeResolution = preference.getKey().split("x");
+ int width = Integer.parseInt(modeResolution[0]);
+ int height = Integer.parseInt(modeResolution[1]);
+ for (var mode : display.getSupportedModes()) {
+ if (mode.getPhysicalWidth() == width && mode.getPhysicalHeight() == height
+ && isAllowedMode(mode)) {
+ mInjector.setUserPreferredDisplayMode(display.getDisplayId(), mode);
+ return;
+ }
+ }
+ }
+
+ private boolean isDisplayResolutionLimitEnabled() {
+ if (mInjector == null) {
+ return false;
+ }
+ var flagOverride = mInjector.getSystemProperty(DISPLAY_MODE_LIMIT_OVERRIDE_PROP);
+ var isOverrideEnabled = "true".equals(flagOverride);
+ var isOverrideEnabledOrNotSet = !"false".equals(flagOverride);
+ return (mInjector.isModeLimitForExternalDisplayEnabled() && isOverrideEnabledOrNotSet)
+ || isOverrideEnabled;
+ }
+
+ private void updateDisplayModeLimits(@Nullable Context context) {
+ if (context == null) {
+ return;
+ }
+ mExternalDisplayPeakRefreshRate = getResources(context).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakRefreshRate);
+ if (isDisplayResolutionLimitEnabled()) {
+ mExternalDisplayPeakWidth = getResources(context).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakWidth);
+ mExternalDisplayPeakHeight = getResources(context).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakHeight);
+ }
+ mRefreshRateSynchronizationEnabled = getResources(context).getBoolean(
+ com.android.internal.R.bool.config_refreshRateSynchronizationEnabled);
+ Log.d(TAG, "mExternalDisplayPeakRefreshRate=" + mExternalDisplayPeakRefreshRate);
+ Log.d(TAG, "mExternalDisplayPeakWidth=" + mExternalDisplayPeakWidth);
+ Log.d(TAG, "mExternalDisplayPeakHeight=" + mExternalDisplayPeakHeight);
+ Log.d(TAG, "mRefreshRateSynchronizationEnabled=" + mRefreshRateSynchronizationEnabled);
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 04fab7d..ae9dbeb 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -31,6 +31,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
+import com.android.settings.flags.Flags;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.LinkedHashMap;
@@ -130,39 +131,54 @@
@Override
public void onRadioButtonClicked(SelectorWithWidgetPreference preference) {
- requireAuthAndExecute(() -> {
- final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
- final long previousFunction = mUsbBackend.getCurrentFunctions();
- if (DEBUG) {
- Log.d(TAG, "onRadioButtonClicked() function : " + function + ", toString() : "
- + UsbManager.usbFunctionsToString(function) + ", previousFunction : "
- + previousFunction + ", toString() : "
- + UsbManager.usbFunctionsToString(previousFunction));
- }
- if (function != previousFunction && !Utils.isMonkeyRunning()
- && !isClickEventIgnored(function, previousFunction)) {
- mPreviousFunction = previousFunction;
+ final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
+ if (isAuthRequired(function)) {
+ requireAuthAndExecute(()->handleRadioButtonClicked(preference, function));
+ } else {
+ handleRadioButtonClicked(preference, function);
+ }
+ }
- //Update the UI in advance to make it looks smooth
- final SelectorWithWidgetPreference prevPref =
- (SelectorWithWidgetPreference) mProfilesContainer.findPreference(
- UsbBackend.usbFunctionsToString(mPreviousFunction));
- if (prevPref != null) {
- prevPref.setChecked(false);
- preference.setChecked(true);
- }
+ private void handleRadioButtonClicked(SelectorWithWidgetPreference preference, long function) {
+ final long previousFunction = mUsbBackend.getCurrentFunctions();
+ if (DEBUG) {
+ Log.d(TAG, "onRadioButtonClicked() function : " + function + ", toString() : "
+ + UsbManager.usbFunctionsToString(function) + ", previousFunction : "
+ + previousFunction + ", toString() : "
+ + UsbManager.usbFunctionsToString(previousFunction));
+ }
+ if (function != previousFunction && !Utils.isMonkeyRunning()
+ && !isClickEventIgnored(function, previousFunction)) {
+ mPreviousFunction = previousFunction;
- if (function == UsbManager.FUNCTION_RNDIS || function == UsbManager.FUNCTION_NCM) {
- // We need to have entitlement check for usb tethering, so use API in
- // TetheringManager.
- mTetheringManager.startTethering(
- TetheringManager.TETHERING_USB, new HandlerExecutor(mHandler),
- mOnStartTetheringCallback);
- } else {
- mUsbBackend.setCurrentFunctions(function);
- }
+ //Update the UI in advance to make it looks smooth
+ final SelectorWithWidgetPreference prevPref =
+ (SelectorWithWidgetPreference) mProfilesContainer.findPreference(
+ UsbBackend.usbFunctionsToString(mPreviousFunction));
+ if (prevPref != null) {
+ prevPref.setChecked(false);
+ preference.setChecked(true);
}
- });
+
+ if (function == UsbManager.FUNCTION_RNDIS || function == UsbManager.FUNCTION_NCM) {
+ // We need to have entitlement check for usb tethering, so use API in
+ // TetheringManager.
+ mTetheringManager.startTethering(
+ TetheringManager.TETHERING_USB, new HandlerExecutor(mHandler),
+ mOnStartTetheringCallback);
+ } else {
+ mUsbBackend.setCurrentFunctions(function);
+ }
+ }
+ }
+
+ private boolean isAuthRequired(long function) {
+ if (!Flags.excludeWebcamAuthChallenge()) {
+ return true;
+ }
+ // Since webcam and MIDI don't transfer any persistent data over USB
+ // don't require authentication.
+ return !(function == UsbManager.FUNCTION_UVC || function == UsbManager.FUNCTION_MIDI);
}
private boolean isClickEventIgnored(long function, long previousFunction) {
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 1c14712..734bddc 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -156,12 +156,15 @@
import com.android.settings.notification.ConfigureNotificationSettings;
import com.android.settings.notification.NotificationAccessSettings;
import com.android.settings.notification.NotificationAssistantPicker;
+import com.android.settings.notification.PoliteNotificationsPreferenceFragment;
import com.android.settings.notification.SoundSettings;
import com.android.settings.notification.app.AppBubbleNotificationSettings;
import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settings.notification.app.ChannelNotificationSettings;
import com.android.settings.notification.app.ConversationListSettings;
import com.android.settings.notification.history.NotificationStation;
+import com.android.settings.notification.modes.ZenModeFragment;
+import com.android.settings.notification.modes.ZenModesListFragment;
import com.android.settings.notification.zen.ZenAccessSettings;
import com.android.settings.notification.zen.ZenModeAutomationSettings;
import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
@@ -312,6 +315,7 @@
AppInfoDashboardFragment.class.getName(),
BatterySaverSettings.class.getName(),
AppNotificationSettings.class.getName(),
+ PoliteNotificationsPreferenceFragment.class.getName(),
NotificationAssistantPicker.class.getName(),
ChannelNotificationSettings.class.getName(),
SatelliteSetting.class.getName(),
@@ -396,6 +400,8 @@
CellularSecuritySettingsFragment.class.getName(),
AccessibilityHearingAidsFragment.class.getName(),
HearingDevicePairingFragment.class.getName(),
+ ZenModesListFragment.class.getName(),
+ ZenModeFragment.class.getName()
};
public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index ffc97dc..791b629 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -52,6 +52,7 @@
import android.util.Pair;
import android.widget.Toast;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
@@ -63,6 +64,7 @@
import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
+import com.android.settings.flags.Flags;
import com.android.settings.homepage.TopLevelHighlightMixin;
import com.android.settings.homepage.TopLevelSettings;
import com.android.settings.overlay.FeatureFactory;
@@ -413,13 +415,23 @@
METHOD_GET_PROVIDER_ICON);
final Pair<String, Integer> iconInfo = TileUtils.getIconFromUri(
mContext, packageName, uri, providerMap);
- if (iconInfo == null) {
+ final Icon icon;
+ if (iconInfo != null) {
+ icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
+ } else if (Flags.supportRawDynamicIcons()) {
+ icon = TileUtils.getRawIconFromUri(mContext, uri, providerMap);
+ } else {
+ icon = null;
+ }
+ if (icon == null) {
Log.w(TAG, "Failed to get icon from uri " + uri);
return;
}
- final Icon icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
+
+ final String iconPackage = (iconInfo != null) ? iconInfo.first : null;
+
ThreadUtils.postOnMainThread(() -> {
- setPreferenceIcon(preference, tile, forceRoundedIcon, iconInfo.first, icon);
+ setPreferenceIcon(preference, tile, forceRoundedIcon, iconPackage, icon);
});
});
return;
@@ -435,14 +447,21 @@
}
private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon,
- String iconPackage, Icon icon) {
+ @Nullable String iconPackage, Icon icon) {
Drawable iconDrawable = icon.loadDrawable(preference.getContext());
if (iconDrawable == null) {
Log.w(TAG, "Set null preference icon for: " + iconPackage);
preference.setIcon(null);
return;
}
+ // Tint homepage icons
if (TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) {
+ // Skip tinting and Adaptive Icon transformation for homepage account type raw icons
+ if (TextUtils.equals(tile.getGroupKey(), "top_level_account_category")
+ && iconPackage == null) {
+ preference.setIcon(iconDrawable);
+ return;
+ }
iconDrawable.setTint(Utils.getHomepageIconColor(preference.getContext()));
}
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 9abc6c2..0808da1 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -649,8 +649,12 @@
DynamicDataObserver observer) {
Log.d(TAG, "register observer: @" + Integer.toHexString(observer.hashCode())
+ ", uri: " + observer.getUri());
- resolver.registerContentObserver(observer.getUri(), false, observer);
- mRegisteredObservers.add(observer);
+ try {
+ resolver.registerContentObserver(observer.getUri(), false, observer);
+ mRegisteredObservers.add(observer);
+ } catch (Exception e) {
+ Log.w(TAG, "Cannot register observer: " + observer.getUri(), e);
+ }
}
private void unregisterDynamicDataObservers(List<DynamicDataObserver> observers) {
@@ -661,8 +665,13 @@
observers.forEach(observer -> {
Log.d(TAG, "unregister observer: @" + Integer.toHexString(observer.hashCode())
+ ", uri: " + observer.getUri());
- mRegisteredObservers.remove(observer);
- resolver.unregisterContentObserver(observer);
+ if (mRegisteredObservers.remove(observer)) {
+ try {
+ resolver.unregisterContentObserver(observer);
+ } catch (Exception e) {
+ Log.w(TAG, "Cannot unregister observer: " + observer.getUri(), e);
+ }
+ }
});
}
diff --git a/src/com/android/settings/datausage/DataUsageList.kt b/src/com/android/settings/datausage/DataUsageList.kt
index af115d9..a293277 100644
--- a/src/com/android/settings/datausage/DataUsageList.kt
+++ b/src/com/android/settings/datausage/DataUsageList.kt
@@ -33,13 +33,10 @@
import com.android.settings.dashboard.DashboardFragment
import com.android.settings.datausage.lib.BillingCycleRepository
import com.android.settings.datausage.lib.NetworkUsageData
-import com.android.settings.network.MobileNetworkRepository
import com.android.settings.network.SubscriptionUtil
-import com.android.settings.network.telephony.requireSubscriptionManager
-import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity
+import com.android.settings.network.telephony.SubscriptionRepository
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import com.android.settingslib.spaprivileged.framework.common.userManager
-import com.android.settingslib.utils.ThreadUtils
import kotlin.jvm.optionals.getOrNull
/**
@@ -59,7 +56,6 @@
private lateinit var billingCycleRepository: BillingCycleRepository
private var usageAmount: Preference? = null
- private var subscriptionInfoEntity: SubscriptionInfoEntity? = null
private var dataUsageListAppsController: DataUsageListAppsController? = null
private var chartDataUsagePreferenceController: ChartDataUsagePreferenceController? = null
private var dataUsageListHeaderController: DataUsageListHeaderController? = null
@@ -90,7 +86,6 @@
finish()
return
}
- updateSubscriptionInfoEntity()
dataUsageListAppsController = use(DataUsageListAppsController::class.java).apply {
init(template)
}
@@ -132,6 +127,16 @@
viewModel.chartDataFlow.collectLatestWithLifecycle(viewLifecycleOwner) { chartData ->
chartDataUsagePreferenceController?.update(chartData)
}
+ finishIfSubscriptionDisabled()
+ }
+
+ private fun finishIfSubscriptionDisabled() {
+ if (SubscriptionManager.isUsableSubscriptionId(subId)) {
+ SubscriptionRepository(requireContext()).isSubscriptionEnabledFlow(subId)
+ .collectLatestWithLifecycle(viewLifecycleOwner) { isSubscriptionEnabled ->
+ if (!isSubscriptionEnabled) finish()
+ }
+ }
}
override fun getPreferenceScreenResId() = R.xml.data_usage_list
@@ -155,23 +160,12 @@
}
}
- private fun updateSubscriptionInfoEntity() {
- ThreadUtils.postOnBackgroundThread {
- subscriptionInfoEntity =
- MobileNetworkRepository.getInstance(context).getSubInfoById(subId.toString())
- }
- }
-
/** Update chart sweeps and cycle list to reflect [NetworkPolicy] for current [template]. */
private fun updatePolicy(isModifiable: Boolean) {
- val isBillingCycleModifiable = isModifiable && isActiveSubscription()
- dataUsageListHeaderController?.setConfigButtonVisible(isBillingCycleModifiable)
- chartDataUsagePreferenceController?.setBillingCycleModifiable(isBillingCycleModifiable)
+ dataUsageListHeaderController?.setConfigButtonVisible(isModifiable)
+ chartDataUsagePreferenceController?.setBillingCycleModifiable(isModifiable)
}
- private fun isActiveSubscription(): Boolean =
- requireContext().requireSubscriptionManager().getActiveSubscriptionInfo(subId) != null
-
/**
* Updates the chart and detail data when initial loaded or selected cycle changed.
*/
@@ -187,7 +181,7 @@
/** Updates applications data usage. */
private fun updateApps(usageData: NetworkUsageData) {
dataUsageListAppsController?.update(
- carrierId = subscriptionInfoEntity?.carrierId,
+ subId = subId,
startTime = usageData.startTime,
endTime = usageData.endTime,
)
diff --git a/src/com/android/settings/datausage/DataUsageListAppsController.kt b/src/com/android/settings/datausage/DataUsageListAppsController.kt
index 93623f4..d8bddde 100644
--- a/src/com/android/settings/datausage/DataUsageListAppsController.kt
+++ b/src/com/android/settings/datausage/DataUsageListAppsController.kt
@@ -20,6 +20,7 @@
import android.content.Context
import android.net.NetworkTemplate
import android.os.Bundle
+import android.telephony.SubscriptionManager
import androidx.annotation.OpenForTesting
import androidx.annotation.VisibleForTesting
import androidx.lifecycle.LifecycleCoroutineScope
@@ -32,6 +33,7 @@
import com.android.settings.core.SubSettingLauncher
import com.android.settings.datausage.lib.AppDataUsageRepository
import com.android.settings.datausage.lib.NetworkUsageData
+import com.android.settings.network.telephony.requireSubscriptionManager
import com.android.settingslib.AppItem
import com.android.settingslib.net.UidDetailProvider
import kotlinx.coroutines.Dispatchers
@@ -74,8 +76,11 @@
this.cycleData = cycleData
}
- fun update(carrierId: Int?, startTime: Long, endTime: Long) = lifecycleScope.launch {
+ fun update(subId: Int, startTime: Long, endTime: Long) = lifecycleScope.launch {
val apps = withContext(Dispatchers.Default) {
+ val carrierId = if (SubscriptionManager.isValidSubscriptionId(subId)) {
+ mContext.requireSubscriptionManager().getActiveSubscriptionInfo(subId)?.carrierId
+ } else null
repository.getAppPercent(carrierId, startTime, endTime).map { (appItem, percent) ->
AppDataUsagePreference(mContext, appItem, percent, uidDetailProvider).apply {
setOnPreferenceClickListener {
diff --git a/src/com/android/settings/datausage/lib/BillingCycleRepository.kt b/src/com/android/settings/datausage/lib/BillingCycleRepository.kt
index d324c75..59c853d 100644
--- a/src/com/android/settings/datausage/lib/BillingCycleRepository.kt
+++ b/src/com/android/settings/datausage/lib/BillingCycleRepository.kt
@@ -21,7 +21,7 @@
import android.os.ServiceManager
import android.util.Log
import androidx.annotation.OpenForTesting
-import com.android.settings.network.telephony.TelephonyRepository
+import com.android.settings.network.telephony.MobileDataRepository
import com.android.settingslib.spaprivileged.framework.common.userManager
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
@@ -36,13 +36,13 @@
INetworkManagementService.Stub.asInterface(
ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE)
),
- private val telephonyRepository: TelephonyRepository = TelephonyRepository(context),
+ private val mobileDataRepository: MobileDataRepository = MobileDataRepository(context),
) {
private val userManager = context.userManager
fun isModifiableFlow(subId: Int): Flow<Boolean> =
- telephonyRepository.isDataEnabledFlow(subId).map { isDataEnabled ->
- isDataEnabled && isBandwidthControlEnabled() && userManager.isAdminUser
+ mobileDataRepository.isMobileDataEnabledFlow(subId).map { mobileDataEnabled ->
+ mobileDataEnabled && isBandwidthControlEnabled() && userManager.isAdminUser
}.conflate().flowOn(Dispatchers.Default)
open fun isBandwidthControlEnabled(): Boolean = try {
diff --git a/src/com/android/settings/development/AdbQrcodeScannerFragment.java b/src/com/android/settings/development/AdbQrcodeScannerFragment.java
index 1d38454..ca44747 100644
--- a/src/com/android/settings/development/AdbQrcodeScannerFragment.java
+++ b/src/com/android/settings/development/AdbQrcodeScannerFragment.java
@@ -16,7 +16,6 @@
package com.android.settings.development;
-import android.annotation.Nullable;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -27,7 +26,6 @@
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
-import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -49,6 +47,7 @@
import com.android.settings.SetupWizardUtils;
import com.android.settings.wifi.dpp.AdbQrCode;
import com.android.settings.wifi.dpp.WifiDppQrCodeBaseFragment;
+import com.android.settings.wifi.dpp.WifiNetworkConfig;
import com.android.settingslib.qrcode.QrCamera;
import com.android.settingslib.qrcode.QrDecorateView;
@@ -82,8 +81,7 @@
/** QR code data scanned by camera */
private AdbQrCode mAdbQrCode;
- @Nullable
- private WifiConfiguration mAdbConfig;
+ private WifiNetworkConfig mAdbConfig;
private IAdbManager mAdbManager;
@@ -289,16 +287,13 @@
AdbQrCode.triggerVibrationForQrCodeRecognition(getContext());
mVerifyingTextView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
try {
- if (mAdbConfig != null) {
- mAdbManager.enablePairingByQrCode(mAdbConfig.SSID,
- mAdbConfig.preSharedKey);
- return;
- }
+ mAdbManager.enablePairingByQrCode(mAdbConfig.getSsid(),
+ mAdbConfig.getPreSharedKey());
} catch (RemoteException e) {
- Log.e(TAG, "Unable to enable QR code pairing" + e);
+ Log.e(TAG, "Unable to enable QR code pairing");
+ getActivity().setResult(Activity.RESULT_CANCELED);
+ getActivity().finish();
}
- getActivity().setResult(Activity.RESULT_CANCELED);
- getActivity().finish();
}
@Override
diff --git a/src/com/android/settings/development/DesktopModePreferenceController.java b/src/com/android/settings/development/DesktopModePreferenceController.java
index c6b2397..3f8ddab 100644
--- a/src/com/android/settings/development/DesktopModePreferenceController.java
+++ b/src/com/android/settings/development/DesktopModePreferenceController.java
@@ -16,33 +16,39 @@
package com.android.settings.development;
-import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
+import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
+
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.convertToToggleOverrideWithFallback;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import android.content.Context;
-import android.os.Build;
import android.provider.Settings;
+import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride;
+import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
+/**
+ * Preference controller to control Desktop mode features
+ */
public class DesktopModePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
RebootConfirmationDialogHost {
- private static final String FORCE_DESKTOP_MODE_KEY = "force_desktop_mode_on_external_displays";
+ private static final String OVERRIDE_DESKTOP_MODE_FEATURES_KEY =
+ "override_desktop_mode_features";
- @VisibleForTesting
- static final int SETTING_VALUE_OFF = 0;
- @VisibleForTesting
- static final int SETTING_VALUE_ON = 1;
-
- @Nullable private final DevelopmentSettingsDashboardFragment mFragment;
+ @Nullable
+ private final DevelopmentSettingsDashboardFragment mFragment;
public DesktopModePreferenceController(
Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
@@ -51,40 +57,47 @@
}
@Override
- public String getPreferenceKey() {
- return FORCE_DESKTOP_MODE_KEY;
+ public boolean isAvailable() {
+ return DesktopModeStatus.canShowDesktopModeDevOption(mContext);
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
+ public String getPreferenceKey() {
+ return OVERRIDE_DESKTOP_MODE_FEATURES_KEY;
+ }
+
+ @Override
+ public boolean onPreferenceChange(@NonNull Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
Settings.Global.putInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS,
- isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
- if (isEnabled) {
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES,
+ isEnabled ? OVERRIDE_ON.getSetting() : OVERRIDE_OFF.getSetting());
+ if (mFragment != null) {
RebootConfirmationDialogFragment.show(
- mFragment, R.string.reboot_dialog_force_desktop_mode, this);
+ mFragment, R.string.reboot_dialog_override_desktop_mode, this);
}
return true;
}
@Override
public void updateState(Preference preference) {
- final int mode = Settings.Global.getInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
- ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
+ // Use overridden state, if not present, then use default state
+ final int overrideInt = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting());
+ final ToggleOverride toggleOverride = convertToToggleOverrideWithFallback(overrideInt,
+ OVERRIDE_UNSET);
+ final boolean shouldDevOptionBeEnabled = switch (toggleOverride) {
+ case OVERRIDE_OFF -> false;
+ case OVERRIDE_ON -> true;
+ case OVERRIDE_UNSET -> DesktopModeStatus.shouldDevOptionBeEnabledByDefault();
+ };
+ ((TwoStatePreference) mPreference).setChecked(shouldDevOptionBeEnabled);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
- ((TwoStatePreference) mPreference).setChecked(false);
- }
-
- @VisibleForTesting
- String getBuildType() {
- return Build.TYPE;
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting());
}
}
diff --git a/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java b/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java
new file mode 100644
index 0000000..0d3d835
--- /dev/null
+++ b/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceController.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
+
+import android.content.Context;
+import android.os.Build;
+import android.provider.Settings;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Preference controller to control Desktop mode features on secondary display
+ */
+public class DesktopModeSecondaryDisplayPreferenceController extends
+ DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
+ RebootConfirmationDialogHost {
+
+ private static final String ENABLE_DESKTOP_MODE_ON_SECONDARY_DISPLAY =
+ "force_desktop_mode_on_external_displays";
+
+ @VisibleForTesting
+ static final int SETTING_VALUE_OFF = 0;
+ @VisibleForTesting
+ static final int SETTING_VALUE_ON = 1;
+
+ @Nullable
+ private final DevelopmentSettingsDashboardFragment mFragment;
+
+ public DesktopModeSecondaryDisplayPreferenceController(
+ Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+ mFragment = fragment;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return ENABLE_DESKTOP_MODE_ON_SECONDARY_DISPLAY;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean isEnabled = (Boolean) newValue;
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS,
+ isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+ if (isEnabled && mFragment != null) {
+ RebootConfirmationDialogFragment.show(
+ mFragment, R.string.reboot_dialog_enable_desktop_mode_on_secondary_display,
+ this);
+ }
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
+ ((TwoStatePreference) mPreference).setChecked(mode != SETTING_VALUE_OFF);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ super.onDeveloperOptionsSwitchDisabled();
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
+ ((TwoStatePreference) mPreference).setChecked(false);
+ }
+
+ @VisibleForTesting
+ String getBuildType() {
+ return Build.TYPE;
+ }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 38cb6c7..0389b45 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -749,6 +749,7 @@
controllers.add(new ResizableActivityPreferenceController(context));
controllers.add(new FreeformWindowsPreferenceController(context, fragment));
controllers.add(new DesktopModePreferenceController(context, fragment));
+ controllers.add(new DesktopModeSecondaryDisplayPreferenceController(context, fragment));
controllers.add(new NonResizableMultiWindowPreferenceController(context));
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
index 7cf7738..c02ffa7 100644
--- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java
+++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
@@ -16,8 +16,9 @@
package com.android.settings.development;
+import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
+
import android.content.Context;
-import android.os.Build;
import android.provider.Settings;
import androidx.annotation.Nullable;
@@ -40,7 +41,8 @@
@VisibleForTesting
static final int SETTING_VALUE_ON = 1;
- @Nullable private final DevelopmentSettingsDashboardFragment mFragment;
+ @Nullable
+ private final DevelopmentSettingsDashboardFragment mFragment;
public FreeformWindowsPreferenceController(
Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
@@ -49,6 +51,13 @@
}
@Override
+ public boolean isAvailable() {
+ // When devices have the system feature FEATURE_FREEFORM_WINDOW_MANAGEMENT, freeform
+ // mode is enabled automatically, and this toggle is not needed.
+ return !mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT);
+ }
+
+ @Override
public String getPreferenceKey() {
return ENABLE_FREEFORM_SUPPORT_KEY;
}
@@ -80,9 +89,4 @@
Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, SETTING_VALUE_OFF);
((TwoStatePreference) mPreference).setChecked(false);
}
-
- @VisibleForTesting
- String getBuildType() {
- return Build.TYPE;
- }
}
diff --git a/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceController.java b/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceController.java
index 23d4cc6..9f7512c 100644
--- a/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceController.java
@@ -30,85 +30,184 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+/**
+ * This preference represents the default log level for the Bluetooth stack
+ *
+ * The default log level is captured and held in an Android Log Framework log tag, using "bluetooth"
+ * as the tag name. The Log framework does not provide methods to directly write a log tag value,
+ * but instead leverages special system properties to hold the value of a log tag.
+ *
+ * This preferences aims to keep the selection in sync with the currently set log tag value. It
+ * writes directly to the system properties that hold the level associated with the bluetooth log
+ * tag. It leverages the Log.isLoggable("bluetooth", level) function to discern the current value.
+ * The default level is INFO.
+ *
+ * This value is read once at start of the Bluetooth stack. To use a new value once setting it, be
+ * sure to turn Bluetooth off and back on again.
+ */
public class BluetoothStackLogPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+ private static final String TAG = BluetoothStackLogPreferenceController.class.getSimpleName();
+
+ private static final String PREFERENCE_KEY = "bt_stack_log_level";
/* Ensure that the indexes match with bt_stack_log_values and bt_stack_log_entries ordering */
- private static final String PREFERENCE_KEY = "bt_stack_log_level";
- @VisibleForTesting static final int BTSTACK_LOG_MODE_VERBOSE_INDEX = 0;
- @VisibleForTesting static final int BTSTACK_LOG_MODE_DEBUG_INDEX = 1;
- @VisibleForTesting static final int BTSTACK_LOG_MODE_INFO_INDEX = 2;
- @VisibleForTesting static final int BTSTACK_LOG_MODE_WARN_INDEX = 3;
- @VisibleForTesting static final int BTSTACK_LOG_MODE_ERROR_INDEX = 4;
+ private static final int BT_LOG_LEVEL_VERBOSE_INDEX = 0;
+ private static final int BT_LOG_LEVEL_DEBUG_INDEX = 1;
+ private static final int BT_LOG_LEVEL_INFO_INDEX = 2;
+ private static final int BT_LOG_LEVEL_WARN_INDEX = 3;
+ private static final int BT_LOG_LEVEL_ERROR_INDEX = 4;
+ @VisibleForTesting static final int BT_LOG_LEVEL_DEFAULT_INDEX = BT_LOG_LEVEL_INFO_INDEX;
- @VisibleForTesting
- static final String BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST = "persist.log.tag.bluetooth";
- static final String BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY = "log.tag.bluetooth";
- static final String BLUETOOTH_STRING_NAME = "bluetooth";
- static final int DEFAULT_MODE = BTSTACK_LOG_MODE_INFO_INDEX;
+ private static final String BT_LOG_TAG = "bluetooth";
+ @VisibleForTesting static final String BT_LOG_LEVEL_PROP_PERSIST = "persist.log.tag.bluetooth";
+ @VisibleForTesting static final String BT_LOG_LEVEL_PROP = "log.tag.bluetooth";
- private final String[] mListValues;
- private final String[] mListEntries;
+ // Values represents the untranslatable log level strings that should be used for writing to
+ // system properties. Entries represents the translatable log level strings that should be used
+ // in the UI to communicate to the user their options for this preference.
+ private String[] mListValues;
+ private String[] mListEntries;
-
+ /**
+ * Create a BluetoothStackLogPreferenceController instance
+ */
public BluetoothStackLogPreferenceController(@NonNull Context context) {
super(context);
mListValues = context.getResources().getStringArray(R.array.bt_stack_log_level_values);
mListEntries = context.getResources().getStringArray(R.array.bt_stack_log_level_entries);
}
- /** returns default log level index of INFO */
- public int getDefaultModeIndex() {
- return DEFAULT_MODE;
- }
-
+ /**
+ * Returns the preference key associated with this preference
+ *
+ * Note that this key is _usually_ a system property in and of itself, which is expected to hold
+ * the value of the preference. In this case though, this key *does not* hold the preference. It
+ * is only really used to tie this controller to the list preference defined in the XML file.
+ *
+ * @return the preference key associated with this preference
+ */
@Override
@Nullable
public String getPreferenceKey() {
return PREFERENCE_KEY;
}
+ /**
+ * Update the state of the preference based on what the user has selected
+ *
+ * This function is invoked when the user has selected a new value for this preference. The new
+ * value is the entry value at the index of the list the user has selected. This value will be
+ * one of the values from the array returned in getEntryValues(). Specifically, this array is
+ * set using R.array.bt_stack_log_level_values
+ *
+ * @param preference - the preference object to set the value of
+ * @param newValue - the value the user has selected, as an Object
+ * @return True when updated successfully
+ */
@Override
public boolean onPreferenceChange(@NonNull Preference preference, @NonNull Object newValue) {
- SystemProperties.set(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST, newValue.toString());
- SystemProperties.set(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY, newValue.toString());
- updateState(mPreference);
+ Log.v(TAG, "onPreferenceChange(pref=" + preference + "value=" + newValue.toString() + ")");
+ setBluetoothLogTag(newValue.toString());
+ setBluetoothLogLevelIndex(getBluetoothLogLevelIndex());
return true;
}
+ /**
+ * Refresh the state of this preference based on the state stored on the system
+ *
+ * Read the Bluetooth stack log level from the underlying system property/log tag, and map that
+ * level to the proper index in the values and entries array. Use those strings to set the value
+ * and summary of the preference.
+ *
+ * @param preference - the preference object to refresh the state of
+ */
@Override
public void updateState(@NonNull Preference preference) {
- final ListPreference listPreference = (ListPreference) preference;
- int index = getBluetoothLogLevelIndex();
- listPreference.setValue(mListValues[index]);
- listPreference.setSummary(mListEntries[index]);
+ Log.v(TAG, "updateState(pref=" + preference + "): refresh preference state");
+ setBluetoothLogLevelIndex(getBluetoothLogLevelIndex());
}
/**
- * Returns the current log level from Log.isLoggable().
+ * Notify this developer options preference of a change to developer options visibility
+ *
+ * We developer options are closed, we should clear out the value of this developer option
+ * preference and revert it back to the default state of INFO.
*/
- @VisibleForTesting
- public int getBluetoothLogLevelIndex() {
- if (Log.isLoggable(BLUETOOTH_STRING_NAME, Log.VERBOSE)) {
- return BTSTACK_LOG_MODE_VERBOSE_INDEX;
- } else if (Log.isLoggable(BLUETOOTH_STRING_NAME, Log.DEBUG)) {
- return BTSTACK_LOG_MODE_DEBUG_INDEX;
- } else if (Log.isLoggable(BLUETOOTH_STRING_NAME, Log.INFO)) {
- return BTSTACK_LOG_MODE_INFO_INDEX;
- } else if (Log.isLoggable(BLUETOOTH_STRING_NAME, Log.WARN)) {
- return BTSTACK_LOG_MODE_WARN_INDEX;
- } else if (Log.isLoggable(BLUETOOTH_STRING_NAME, Log.ERROR)) {
- return BTSTACK_LOG_MODE_ERROR_INDEX;
- }
- return BTSTACK_LOG_MODE_INFO_INDEX;
- }
-
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
- SystemProperties.set(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST, null);
- SystemProperties.set(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY, null);
- ((ListPreference) mPreference).setValue(mListValues[getDefaultModeIndex()]);
- ((ListPreference) mPreference).setSummary(mListEntries[getDefaultModeIndex()]);
+ Log.v(TAG, "onDeveloperOptionsSwitchDisabled(): Revert stack log to default");
+ setBluetoothLogTag(null);
+ setBluetoothLogLevelIndex(BT_LOG_LEVEL_DEFAULT_INDEX);
+ }
+
+ /**
+ * Set the system property values used by the Log framework to read the "bluetooth" log tag
+ *
+ * @param logLevel - the log level to set the Bluetooth stack minimum log level to
+ */
+ private void setBluetoothLogTag(@Nullable String logLevel) {
+ Log.i(TAG, "setBluetoothLogTag(logLevel=" + logLevel + "): Set properties for log tag");
+ SystemProperties.set(BT_LOG_LEVEL_PROP_PERSIST, logLevel);
+ SystemProperties.set(BT_LOG_LEVEL_PROP, logLevel);
+ }
+
+ /**
+ * Get the entry and value index corresponding to the current Bluetooth stack log level
+ *
+ * Since this preference uses an actual log tag and not a specific/private system property, we
+ * can read the value using the Log.isLoggable() function with our "bluetooth" log tag that
+ * represents the log level of the Bluetooth stack. This is safer than trying to replacate the
+ * logic used in the Log framework around the various persist, ro, and blank variants of the tag
+ *
+ * If no value is present, INFO is used.
+ *
+ * @return the entry/value index corresponding to the current log level of the tag "bluetooth"
+ */
+ @VisibleForTesting
+ public int getBluetoothLogLevelIndex() {
+ int level = BT_LOG_LEVEL_DEFAULT_INDEX;
+ if (Log.isLoggable(BT_LOG_TAG, Log.VERBOSE)) {
+ level = BT_LOG_LEVEL_VERBOSE_INDEX;
+ } else if (Log.isLoggable(BT_LOG_TAG, Log.DEBUG)) {
+ level = BT_LOG_LEVEL_DEBUG_INDEX;
+ } else if (Log.isLoggable(BT_LOG_TAG, Log.INFO)) {
+ level = BT_LOG_LEVEL_INFO_INDEX;
+ } else if (Log.isLoggable(BT_LOG_TAG, Log.WARN)) {
+ level = BT_LOG_LEVEL_WARN_INDEX;
+ } else if (Log.isLoggable(BT_LOG_TAG, Log.ERROR)) {
+ level = BT_LOG_LEVEL_ERROR_INDEX;
+ }
+ Log.v(TAG, "getBluetoothLogLevelIndex() -> " + level);
+ return level;
+ }
+
+ /**
+ * Set the current Bluetooth stack log level displayed in the list for this preference
+ *
+ * @param index - the index representing the log level choice of this preference
+ */
+ private void setBluetoothLogLevelIndex(int index) {
+ if (index < BT_LOG_LEVEL_VERBOSE_INDEX || index > BT_LOG_LEVEL_ERROR_INDEX) {
+ Log.e(TAG, "setBluetoothLogLevelIndex(index=" + index + "): Log level invalid");
+ return;
+ }
+
+ String value = mListValues[index];
+ String entryValue = mListEntries[index];
+
+ ListPreference preference = ((ListPreference) mPreference);
+ if (preference == null) {
+ Log.e(TAG, "setBluetoothLogLevelIndex(index=" + index + "): mPreference is null");
+ return;
+ }
+
+ preference.setValue(value);
+ preference.setSummary(entryValue);
+
+ Log.i(TAG, "setBluetoothLogLevelIndex(index=" + index
+ + "): Updated Bluetooth stack log level to value='" + value + "', entryValue='"
+ + entryValue + "'");
}
}
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepository.kt b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepository.kt
index 5ed6993..760f8b6 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepository.kt
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepository.kt
@@ -23,10 +23,10 @@
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
+import com.android.settings.network.telephony.CarrierConfigRepository
import com.android.settings.network.telephony.SimSlotRepository
import com.android.settings.network.telephony.ims.ImsMmTelRepository
import com.android.settings.network.telephony.ims.ImsMmTelRepositoryImpl
-import com.android.settings.network.telephony.safeGetConfig
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
@@ -39,7 +39,9 @@
import kotlinx.coroutines.launch
@OptIn(ExperimentalCoroutinesApi::class)
-class SimStatusDialogRepository @JvmOverloads constructor(
+class SimStatusDialogRepository
+@JvmOverloads
+constructor(
private val context: Context,
private val simSlotRepository: SimSlotRepository = SimSlotRepository(context),
private val signalStrengthRepository: SignalStrengthRepository =
@@ -48,7 +50,7 @@
ImsMmTelRepositoryImpl(context, subId)
},
) {
- private val carrierConfigManager = context.getSystemService(CarrierConfigManager::class.java)!!
+ private val carrierConfigRepository = CarrierConfigRepository(context)
data class SimStatusDialogInfo(
val signalStrength: String? = null,
@@ -73,7 +75,8 @@
}
private fun simStatusDialogInfoBySlotFlow(simSlotIndex: Int): Flow<SimStatusDialogInfo> =
- simSlotRepository.subIdInSimSlotFlow(simSlotIndex)
+ simSlotRepository
+ .subIdInSimSlotFlow(simSlotIndex)
.flatMapLatest { subId ->
if (SubscriptionManager.isValidSubscriptionId(subId)) {
simStatusDialogInfoFlow(subId)
@@ -99,22 +102,16 @@
}
private fun showUpFlow(subId: Int) = flow {
- val config = carrierConfigManager.safeGetConfig(
- keys = listOf(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL,
- CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL,
- ),
- subId = subId,
- )
- val visibility = SimStatusDialogVisibility(
- signalStrengthShowUp = config.getBoolean(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL,
- true, // by default we show the signal strength in sim status
- ),
- imsRegisteredShowUp = config.getBoolean(
- CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL
- ),
- )
+ val visibility =
+ carrierConfigRepository.transformConfig(subId) {
+ SimStatusDialogVisibility(
+ signalStrengthShowUp =
+ getBoolean(
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL),
+ imsRegisteredShowUp =
+ getBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL),
+ )
+ }
emit(visibility)
}
}
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 005c073..7bbb06a 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -269,6 +269,11 @@
}
@Override
+ protected boolean shouldSkipForInitialSUW() {
+ return true;
+ }
+
+ @Override
public void onPause() {
super.onPause();
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 7d15858..f121d0c 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -81,7 +81,10 @@
return mContext.getString(
com.android.settingslib.R.string.battery_info_status_not_charging);
}
- if (BatteryUtils.isBatteryDefenderOn(info)) {
+ if (BatteryUtils.isBatteryDefenderOn(info)
+ || FeatureFactory.getFeatureFactory()
+ .getPowerUsageFeatureProvider()
+ .isExtraDefend()) {
return mContext.getString(
com.android.settingslib.R.string.battery_info_status_charging_on_hold);
}
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index b54801a..fa30253 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -53,7 +53,8 @@
public int batteryStatus;
public int pluggedStatus;
public boolean discharging = true;
- public boolean isBatteryDefender;
+ public boolean isBatteryDefender = false;
+ public boolean isLongLife = false;
public boolean isFastCharging;
public long remainingTimeUs = 0;
public long averageTimeToDischarge = EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN;
@@ -306,12 +307,13 @@
info.pluggedStatus = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
info.mCharging = info.pluggedStatus != 0;
info.averageTimeToDischarge = estimate.getAverageDischargeTime();
- info.isBatteryDefender =
- batteryBroadcast.getIntExtra(
- BatteryManager.EXTRA_CHARGING_STATUS,
- BatteryManager.CHARGING_POLICY_DEFAULT)
- == BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE;
+ final int chargingPolicy =
+ batteryBroadcast.getIntExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
+ BatteryManager.CHARGING_POLICY_DEFAULT);
+
+ info.isLongLife = chargingPolicy == BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE;
info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast, isCompactStatus);
info.batteryStatus =
batteryBroadcast.getIntExtra(
@@ -319,13 +321,21 @@
info.isFastCharging =
BatteryStatus.getChargingSpeed(context, batteryBroadcast)
== BatteryStatus.CHARGING_FAST;
- if (info.isBatteryDefender) {
+ if (info.isLongLife) {
info.isBatteryDefender =
FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider()
.isBatteryDefend(info);
}
- if (!info.mCharging) {
+ Log.d(
+ TAG,
+ "chargingPolicy = "
+ + chargingPolicy
+ + ", pluggedStatus = "
+ + info.pluggedStatus
+ + ", batteryStatus = "
+ + info.batteryStatus);
+ if (!isPluggedIn(context, info.mCharging, chargingPolicy)) {
updateBatteryInfoDischarging(context, shortString, estimate, info);
} else {
updateBatteryInfoCharging(
@@ -555,6 +565,14 @@
}
}
+ private static boolean isPluggedIn(Context context, boolean isCharging, int chargingPolicy) {
+ return isCharging
+ || (chargingPolicy == BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE
+ && FeatureFactory.getFeatureFactory()
+ .getBatterySettingsFeatureProvider()
+ .isChargingOptimizationMode(context));
+ }
+
public interface BatteryDataParser {
void onParsingStarted(long startTime, long endTime);
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 9e08664..7cb5733 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -600,12 +600,12 @@
context.getContentResolver(), SETTINGS_GLOBAL_DOCK_DEFENDER_BYPASS, 0)
== 1) {
return DockDefenderMode.TEMPORARILY_BYPASSED;
- } else if (batteryInfo.isBatteryDefender
+ } else if (batteryInfo.isLongLife
&& FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider()
.isExtraDefend()) {
return DockDefenderMode.ACTIVE;
- } else if (!batteryInfo.isBatteryDefender) {
+ } else if (!batteryInfo.isLongLife) {
return DockDefenderMode.FUTURE_BYPASS;
}
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index f63b649..e441b85 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -23,11 +23,16 @@
import android.util.ArrayMap;
import android.util.SparseIntArray;
+import androidx.annotation.NonNull;
+
+import com.android.settings.fuelgauge.batteryusage.BatteryDiffData;
+import com.android.settings.fuelgauge.batteryusage.BatteryEvent;
import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType;
import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
import com.android.settingslib.fuelgauge.Estimate;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/** Feature Provider used in power usage */
@@ -39,6 +44,12 @@
/** Check whether the battery tips card is enabled in the battery usage page */
boolean isBatteryTipsEnabled();
+ /** Check whether overwrite the app optimization mode to restricted mode is enabled */
+ boolean isRestrictedModeOverwriteEnabled();
+
+ /** Check whether force expire the app optimization mode. */
+ boolean isForceExpireAppOptimizationModeEnabled();
+
/** Check whether to log the optimization mode of app entry in period job */
boolean isAppOptimizationModeLogged();
@@ -154,4 +165,14 @@
/** Whether the device is under the battery defender mode */
boolean isBatteryDefend(BatteryInfo info);
+
+ /** Whether the battery usage reattribute is eabled or not. */
+ boolean isBatteryUsageReattributeEnabled();
+
+ /** Collect and process battery reattribute data if needed. */
+ boolean processBatteryReattributeData(
+ @NonNull Context context,
+ @NonNull Map<Long, BatteryDiffData> batteryDiffDataMap,
+ @NonNull List<BatteryEvent> batteryEventList,
+ final boolean isFromPeriodJob);
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index cc6659a..bdb236a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -18,7 +18,6 @@
import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME;
-import android.annotation.Nullable;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -27,13 +26,19 @@
import android.util.ArraySet;
import android.util.SparseIntArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.android.internal.util.ArrayUtils;
+import com.android.settings.fuelgauge.batteryusage.BatteryDiffData;
+import com.android.settings.fuelgauge.batteryusage.BatteryEvent;
import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType;
import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
import com.android.settingslib.fuelgauge.Estimate;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Set;
/** Implementation of {@code PowerUsageFeatureProvider} */
@@ -84,6 +89,16 @@
}
@Override
+ public boolean isRestrictedModeOverwriteEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean isForceExpireAppOptimizationModeEnabled() {
+ return false;
+ }
+
+ @Override
public boolean isAppOptimizationModeLogged() {
return false;
}
@@ -238,6 +253,20 @@
@Override
public boolean isBatteryDefend(BatteryInfo info) {
- return info.isBatteryDefender && !isExtraDefend();
+ return info.isLongLife && !isExtraDefend();
+ }
+
+ @Override
+ public boolean isBatteryUsageReattributeEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean processBatteryReattributeData(
+ @NonNull Context context,
+ @NonNull Map<Long, BatteryDiffData> batteryDiffDataMap,
+ @NonNull List<BatteryEvent> batteryEventList,
+ final boolean isFromPeriodJob) {
+ return false;
}
}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
index 639b3c7..6ff2665 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
@@ -21,7 +21,6 @@
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.overlay.FeatureFactory;
/** Detect whether the battery is overheated */
public class BatteryDefenderDetector implements BatteryTipDetector {
@@ -35,12 +34,10 @@
@Override
public BatteryTip detect() {
- final boolean isBasicBatteryDefend =
- FeatureFactory.getFeatureFactory()
- .getPowerUsageFeatureProvider()
- .isBatteryDefend(mBatteryInfo);
final int state =
- isBasicBatteryDefend ? BatteryTip.StateType.NEW : BatteryTip.StateType.INVISIBLE;
+ mBatteryInfo.isBatteryDefender
+ ? BatteryTip.StateType.NEW
+ : BatteryTip.StateType.INVISIBLE;
final boolean isPluggedIn = mBatteryInfo.pluggedStatus != 0;
return new BatteryDefenderTip(state, isPluggedIn);
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtils.kt b/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtils.kt
index 1111bd4..508c4df 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtils.kt
+++ b/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtils.kt
@@ -25,6 +25,7 @@
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action
import com.android.settings.fuelgauge.BatteryOptimizeUtils
import com.android.settings.fuelgauge.BatteryUtils
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
/** A util to store and update app optimization mode expiration event data. */
object AppOptModeSharedPreferencesUtils {
@@ -74,10 +75,13 @@
@JvmStatic
fun resetExpiredAppOptModeBeforeTimestamp(context: Context, queryTimestampMs: Long) =
synchronized(appOptimizationModeLock) {
+ val forceExpireEnabled =
+ featureFactory.powerUsageFeatureProvider.isForceExpireAppOptimizationModeEnabled
val eventsMap = getAppOptModeEventsMap(context)
val expirationUids = ArrayList<Int>(eventsMap.size)
for ((uid, event) in eventsMap) {
- if (event.expirationTime > queryTimestampMs) {
+ // Not reset the mode if forceExpireEnabled is false and not expired.
+ if (!forceExpireEnabled && event.expirationTime > queryTimestampMs) {
continue
}
updateBatteryOptimizationMode(
@@ -108,12 +112,22 @@
getBatteryOptimizeUtils: (Int, String) -> BatteryOptimizeUtils,
) =
synchronized(appOptimizationModeLock) {
+ val restrictedModeOverwriteEnabled =
+ featureFactory.powerUsageFeatureProvider.isRestrictedModeOverwriteEnabled
val eventsMap = getAppOptModeEventsMap(context)
val expirationEvents: MutableMap<Int, AppOptimizationModeEvent> = ArrayMap()
for (i in uids.indices) {
val uid = uids[i]
val packageName = packageNames[i]
val optimizationMode = optimizationModes[i]
+ if (
+ !restrictedModeOverwriteEnabled &&
+ optimizationMode == BatteryOptimizeUtils.MODE_RESTRICTED
+ ) {
+ // Unable to set restricted mode due to flag protection.
+ Log.w(TAG, "setOptimizationMode($packageName) into restricted ignored")
+ continue
+ }
val originalOptMode: Int =
updateBatteryOptimizationMode(
context,
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
index 7ea7203..b5d5099 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffData.java
@@ -77,11 +77,13 @@
processAndSortEntries(mSystemEntries);
}
- long getStartTimestamp() {
+ /** Gets the start timestamp. */
+ public long getStartTimestamp() {
return mStartTimestamp;
}
- long getEndTimestamp() {
+ /** Gets the end timestamp. */
+ public long getEndTimestamp() {
return mEndTimestamp;
}
@@ -97,7 +99,8 @@
return mScreenOnTime;
}
- List<BatteryDiffEntry> getAppDiffEntryList() {
+ /** Gets the {@link BatteryDiffEntry} list for apps. */
+ public List<BatteryDiffEntry> getAppDiffEntryList() {
return mAppEntries;
}
@@ -296,8 +299,7 @@
* Sets total consume power, and adjusts the percentages to ensure the total round percentage
* could be 100%, and then sorts entries based on the sorting key.
*/
- @VisibleForTesting
- static void processAndSortEntries(final List<BatteryDiffEntry> batteryDiffEntries) {
+ public static void processAndSortEntries(final List<BatteryDiffEntry> batteryDiffEntries) {
if (batteryDiffEntries.isEmpty()) {
return;
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
index 5b05e34..4d1545a 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntry.java
@@ -422,7 +422,8 @@
return;
}
final boolean isValidPackage =
- BatteryUtils.getInstance(mContext).getPackageUid(getPackageName())
+ BatteryUtils.getInstance(mContext)
+ .getPackageUidAsUser(getPackageName(), (int) mUserId)
!= BatteryUtils.UID_NULL;
if (!isValidPackage) {
mValidForRestriction = false;
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
index ddb8ecb..fef3056 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
@@ -22,7 +22,6 @@
import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.BatteryConsumer;
@@ -176,18 +175,7 @@
}
}
if (mDefaultPackageName != null) {
- PackageManager pm = context.getPackageManager();
- try {
- ApplicationInfo appInfo =
- pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */);
- mName = pm.getApplicationLabel(appInfo).toString();
- } catch (NameNotFoundException e) {
- Log.d(
- TAG,
- "PackageManager failed to retrieve ApplicationInfo for: "
- + mDefaultPackageName);
- mName = mDefaultPackageName;
- }
+ mName = mDefaultPackageName;
}
mTimeInForegroundMs =
uidBatteryConsumer.getTimeInProcessStateMs(
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
index bfa501c..f710c71 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiver.java
@@ -63,8 +63,8 @@
}
final String action = intent.getAction();
Log.d(TAG, "onReceive:" + action);
- if (com.android.settingslib.fuelgauge.BatteryUtils.isWorkProfile(context)) {
- Log.w(TAG, "do nothing for work profile action=" + action);
+ if (com.android.settingslib.fuelgauge.BatteryUtils.isAdditionalProfile(context)) {
+ Log.w(TAG, "do nothing for an additional profile action=" + action);
return;
}
DatabaseUtils.recordDateTime(context, action);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProvider.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProvider.java
index 095a65a..52010af 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProvider.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProvider.java
@@ -110,8 +110,8 @@
@Override
public boolean onCreate() {
- if (BatteryUtils.isWorkProfile(getContext())) {
- Log.w(TAG, "do not create provider for work profile");
+ if (BatteryUtils.isAdditionalProfile(getContext())) {
+ Log.w(TAG, "do not create provider for an additional profile");
return false;
}
mClock = Clock.systemUTC();
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
index b758df4..45d724f 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiver.java
@@ -54,8 +54,8 @@
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent == null ? "" : intent.getAction();
- if (BatteryUtils.isWorkProfile(context)) {
- Log.w(TAG, "do not start job for work profile action=" + action);
+ if (BatteryUtils.isAdditionalProfile(context)) {
+ Log.w(TAG, "do not start job for an additional profile action=" + action);
return;
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
index 1c6ff54..8f4d4dd 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
@@ -201,6 +201,20 @@
return defaultInstance;
}
+ /** Gets the encoded string from {@link BatteryReattribute} instance. */
+ @NonNull
+ public static String encodeBatteryReattribute(
+ @NonNull BatteryReattribute batteryReattribute) {
+ return Base64.encodeToString(batteryReattribute.toByteArray(), Base64.DEFAULT);
+ }
+
+ /** Gets the decoded {@link BatteryReattribute} instance from string. */
+ @NonNull
+ public static BatteryReattribute decodeBatteryReattribute(@NonNull String content) {
+ return BatteryUtils.parseProtoFromString(
+ content, BatteryReattribute.getDefaultInstance());
+ }
+
/** Converts to {@link BatteryHistEntry} */
public static BatteryHistEntry convertToBatteryHistEntry(
BatteryEntry entry, BatteryUsageStats batteryUsageStats) {
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
index 719d3bd..0a1a547 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
@@ -28,6 +28,8 @@
import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
import java.util.ArrayList;
import java.util.Calendar;
@@ -78,6 +80,7 @@
// Raw start timestamp with round to the nearest hour.
private final long mRawStartTimestamp;
private final long mLastFullChargeTimestamp;
+ private final boolean mIsFromPeriodJob;
private final Context mContext;
private final Handler mHandler;
private final UserIdsSeries mUserIdsSeries;
@@ -122,6 +125,7 @@
Context context,
Handler handler,
final UserIdsSeries userIdsSeries,
+ final boolean isFromPeriodJob,
final long rawStartTimestamp,
final long lastFullChargeTimestamp,
@NonNull final OnBatteryDiffDataMapLoadedListener callbackFunction,
@@ -130,6 +134,7 @@
mContext = context.getApplicationContext();
mHandler = handler;
mUserIdsSeries = userIdsSeries;
+ mIsFromPeriodJob = isFromPeriodJob;
mRawStartTimestamp = rawStartTimestamp;
mLastFullChargeTimestamp = lastFullChargeTimestamp;
mCallbackFunction = callbackFunction;
@@ -147,6 +152,7 @@
mHandler = handler;
mUserIdsSeries = userIdsSeries;
mCallbackFunction = callbackFunction;
+ mIsFromPeriodJob = false;
mRawStartTimestamp = 0L;
mLastFullChargeTimestamp = 0L;
mHourlyBatteryLevelsPerDay = null;
@@ -158,14 +164,9 @@
/** Starts the async tasks to load battery history data and app usage data. */
public void start() {
- start(/* isFromPeriodJob= */ false);
- }
-
- /** Starts the async tasks to load battery history data and app usage data. */
- public void start(boolean isFromPeriodJob) {
// If we have battery level data, load the battery history map and app usage simultaneously.
if (mHourlyBatteryLevelsPerDay != null) {
- if (isFromPeriodJob) {
+ if (mIsFromPeriodJob) {
mIsCurrentBatteryHistoryLoaded = true;
mIsCurrentAppUsageLoaded = true;
mIsBatteryUsageSlotLoaded = true;
@@ -514,6 +515,14 @@
mAppUsagePeriodMap,
getSystemAppsPackageNames(),
getSystemAppsUids()));
+ // Process the reattributate data for the following two cases:
+ // 1) the latest slot for the timestamp "until now"
+ // 2) walkthrough all BatteryDiffData again to handle "re-compute" case
+ final PowerUsageFeatureProvider featureProvider =
+ FeatureFactory.getFeatureFactory()
+ .getPowerUsageFeatureProvider();
+ featureProvider.processBatteryReattributeData(
+ mContext, batteryDiffDataMap, mBatteryEventList, mIsFromPeriodJob);
Log.d(
TAG,
@@ -683,12 +692,13 @@
context,
handler,
userIdsSeries,
+ isFromPeriodJob,
startTimestamp,
lastFullChargeTime,
onBatteryDiffDataMapLoadedListener,
batteryLevelData.getHourlyBatteryLevelsPerDay(),
processedBatteryHistoryMap)
- .start(isFromPeriodJob);
+ .start();
return batteryLevelData;
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
index 0bb6286..ad487ef 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
@@ -70,6 +70,7 @@
/** 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;
@@ -429,6 +430,7 @@
database.batteryEventDao().clearAll();
database.batteryStateDao().clearAll();
database.batteryUsageSlotDao().clearAll();
+ database.batteryReattributeDao().clearAll();
} catch (RuntimeException e) {
Log.e(TAG, "clearAll() failed", e);
}
@@ -446,12 +448,28 @@
database.batteryEventDao().clearAllAfter(startTimestamp);
database.batteryStateDao().clearAllAfter(startTimestamp);
database.batteryUsageSlotDao().clearAllAfter(startTimestamp);
+ database.batteryReattributeDao().clearAllAfter(startTimestamp);
} catch (RuntimeException e) {
Log.e(TAG, "clearAllAfter() failed", e);
}
});
}
+ /** Clears generated cache data in the battery usage database. */
+ public static void clearEvenHourCacheData(Context context) {
+ AsyncTask.execute(
+ () -> {
+ try {
+ final BatteryStateDatabase database =
+ BatteryStateDatabase.getInstance(context.getApplicationContext());
+ database.batteryEventDao().clearEvenHourEvent();
+ database.batteryUsageSlotDao().clearAll();
+ } catch (RuntimeException e) {
+ Log.e(TAG, "clearEvenHourCacheData() failed", e);
+ }
+ });
+ }
+
/** Clears all out-of-date data in the battery usage database. */
public static void clearExpiredDataIfNeeded(Context context) {
AsyncTask.execute(
@@ -466,6 +484,7 @@
database.batteryEventDao().clearAllBefore(earliestTimestamp);
database.batteryStateDao().clearAllBefore(earliestTimestamp);
database.batteryUsageSlotDao().clearAllBefore(earliestTimestamp);
+ database.batteryReattributeDao().clearAllBefore(earliestTimestamp);
} catch (RuntimeException e) {
Log.e(TAG, "clearAllBefore() failed", e);
}
@@ -524,9 +543,11 @@
return startCalendar.getTimeInMillis();
}
- /** Returns the context with profile parent identity when current user is work profile. */
+ /**
+ * Returns the context with profile parent identity when current user is an additional profile.
+ */
public static Context getParentContext(Context context) {
- if (com.android.settingslib.fuelgauge.BatteryUtils.isWorkProfile(context)) {
+ if (com.android.settingslib.fuelgauge.BatteryUtils.isAdditionalProfile(context)) {
try {
return context.createPackageContextAsUser(
/* packageName= */ context.getPackageName(),
@@ -917,14 +938,12 @@
final String logInfo =
String.format(
Locale.ENGLISH,
- "clear database for new time zone = %s",
+ "clear database cache for new time zone = %s",
TimeZone.getDefault().toString());
BatteryUsageLogUtils.writeLog(context, Action.TIMEZONE_UPDATED, logInfo);
Log.d(TAG, logInfo);
- DatabaseUtils.clearAll(context);
+ DatabaseUtils.clearEvenHourCacheData(context);
PeriodicJobManager.getInstance(context).refreshJob(/* fromBoot= */ false);
- // Take a snapshot of battery usage data immediately
- BatteryUsageDataLoader.enqueueWork(context, /* isFullChargeStart= */ true);
}
private static long loadLongFromContentProvider(
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiver.java b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiver.java
index 5c73adb..982cf40 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiver.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiver.java
@@ -50,10 +50,10 @@
Log.w(TAG, "receive unexpected action=" + action);
return;
}
- if (BatteryUtils.isWorkProfile(context)) {
+ if (BatteryUtils.isAdditionalProfile(context)) {
BatteryUsageLogUtils.writeLog(
- context, Action.SCHEDULE_JOB, "do not refresh job for work profile");
- Log.w(TAG, "do not refresh job for work profile action=" + action);
+ context, Action.SCHEDULE_JOB, "do not refresh job for an additional profile");
+ Log.w(TAG, "do not refresh job for an additional profile action=" + action);
return;
}
BatteryUsageLogUtils.writeLog(context, Action.EXECUTE_JOB, "");
diff --git a/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java b/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java
index 7613d9a..e829a3c 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProvider.java
@@ -49,12 +49,13 @@
Log.w(TAG, "failed to dump BatteryUsage state: null application context");
return;
}
- if (BatteryUtils.isWorkProfile(context)) {
- Log.w(TAG, "ignore battery usage states dump in the work profile");
+ if (BatteryUtils.isAdditionalProfile(context)) {
+ Log.w(TAG, "ignore battery usage states dump in the additional profile");
return;
}
writer.println("dump BatteryUsage and AppUsage states:");
LogUtils.dumpAppOptimizationModeEventHist(context, writer);
+ LogUtils.dumpBatteryReattributeDatabaseHist(context, writer);
LogUtils.dumpBatteryUsageDatabaseHist(context, writer);
LogUtils.dumpAppUsageDatabaseHist(context, writer);
LogUtils.dumpBatteryUsageSlotDatabaseHist(context, writer);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java
index b230030..45871a3 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtils.java
@@ -19,6 +19,8 @@
import android.content.Context;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUtils;
import com.android.settings.fuelgauge.batteryusage.AppOptimizationModeEvent;
@@ -29,11 +31,14 @@
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
import com.android.settings.fuelgauge.batteryusage.db.BatteryEventDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryEventEntity;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryReattributeDao;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryReattributeEntity;
import com.android.settings.fuelgauge.batteryusage.db.BatteryState;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
import com.android.settings.fuelgauge.batteryusage.db.BatteryUsageSlotDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryUsageSlotEntity;
+import com.android.settings.overlay.FeatureFactory;
import java.io.PrintWriter;
import java.time.Clock;
@@ -127,6 +132,33 @@
dumpListItems(writer, entities, entity -> entity);
}
+ static void dumpBatteryReattributeDatabaseHist(Context context, PrintWriter writer) {
+ try {
+ dumpBatteryReattributeDatabaseHist(
+ BatteryStateDatabase.getInstance(context).batteryReattributeDao(),
+ writer);
+ } catch (Exception e) {
+ Log.e(TAG, "failed to run dumpBatteryReattributeDatabaseHist()", e);
+ }
+ }
+
+ @VisibleForTesting
+ static void dumpBatteryReattributeDatabaseHist(
+ BatteryReattributeDao batteryReattributeDao, PrintWriter writer) {
+ if (!FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider()
+ .isBatteryUsageReattributeEnabled()) {
+ writer.println("\n\tBatteryReattribute is disabled!");
+ return;
+ }
+ writer.println("\n\tBatteryReattribute DatabaseHistory:");
+ final List<BatteryReattributeEntity> entities =
+ batteryReattributeDao.getAllAfter(
+ Clock.systemUTC().millis() - DUMP_TIME_OFFSET.toMillis());
+ if (entities != null && !entities.isEmpty()) {
+ dumpListItems(writer, entities, entity -> entity);
+ }
+ }
+
private static <T, S> void dumpListItems(
PrintWriter writer, List<T> itemList, Function<T, S> itemConverter) {
final AtomicInteger counter = new AtomicInteger(0);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.java b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.java
deleted file mode 100644
index 2497801..0000000
--- a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.java
+++ /dev/null
@@ -1,65 +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.fuelgauge.batteryusage.db;
-
-import android.database.Cursor;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-/** Data access object for accessing {@link AppUsageEventEntity} in the database. */
-@Dao
-public interface AppUsageEventDao {
-
- /** Inserts a {@link AppUsageEventEntity} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(AppUsageEventEntity event);
-
- /** Inserts {@link AppUsageEventEntity} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insertAll(List<AppUsageEventEntity> events);
-
- /** Lists all recorded data after a specific timestamp. */
- @Query("SELECT * FROM AppUsageEventEntity WHERE timestamp > :timestamp ORDER BY timestamp DESC")
- List<AppUsageEventEntity> getAllAfter(long timestamp);
-
- /** Gets the {@link Cursor} of all recorded data after a specific timestamp of the users. */
- @Query(
- "SELECT * FROM AppUsageEventEntity WHERE timestamp >= :timestamp"
- + " AND userId IN (:userIds) ORDER BY timestamp ASC")
- Cursor getAllForUsersAfter(List<Long> userIds, long timestamp);
-
- /** Gets the {@link Cursor} of the latest timestamp of the specific user. */
- @Query("SELECT MAX(timestamp) as timestamp FROM AppUsageEventEntity WHERE userId = :userId")
- Cursor getLatestTimestampOfUser(long userId);
-
- /** Deletes all recorded data before a specific timestamp. */
- @Query("DELETE FROM AppUsageEventEntity WHERE timestamp <= :timestamp")
- void clearAllBefore(long timestamp);
-
- /** Deletes all recorded data after a specific timestamp. */
- @Query("DELETE FROM AppUsageEventEntity WHERE timestamp >= :timestamp")
- void clearAllAfter(long timestamp);
-
- /** Clears all recorded data in the database. */
- @Query("DELETE FROM AppUsageEventEntity")
- void clearAll();
-}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.kt b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.kt
new file mode 100644
index 0000000..fa5fbc7
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/AppUsageEventDao.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.fuelgauge.batteryusage.db
+
+import android.database.Cursor
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+/** Data access object for accessing [AppUsageEventEntity] in the database. */
+@Dao
+interface AppUsageEventDao {
+ /** Inserts a [AppUsageEventEntity] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE) fun insert(event: AppUsageEventEntity)
+
+ /** Inserts [AppUsageEventEntity] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ fun insertAll(events: List<AppUsageEventEntity>)
+
+ /** Lists all recorded data after a specific timestamp. */
+ @Query("SELECT * FROM AppUsageEventEntity WHERE timestamp > :timestamp ORDER BY timestamp DESC")
+ fun getAllAfter(timestamp: Long): List<AppUsageEventEntity>
+
+ /** Gets the [Cursor] of all recorded data after a specific timestamp of the users. */
+ @Query(
+ "SELECT * FROM AppUsageEventEntity WHERE timestamp >= :timestamp" +
+ " AND userId IN (:userIds) ORDER BY timestamp ASC"
+ )
+ fun getAllForUsersAfter(userIds: List<Long>, timestamp: Long): Cursor
+
+ /** Gets the [Cursor] of the latest timestamp of the specific user. */
+ @Query("SELECT MAX(timestamp) as timestamp FROM AppUsageEventEntity WHERE userId = :userId")
+ fun getLatestTimestampOfUser(userId: Long): Cursor
+
+ /** Deletes all recorded data before a specific timestamp. */
+ @Query("DELETE FROM AppUsageEventEntity WHERE timestamp <= :timestamp")
+ fun clearAllBefore(timestamp: Long)
+
+ /** Deletes all recorded data after a specific timestamp. */
+ @Query("DELETE FROM AppUsageEventEntity WHERE timestamp >= :timestamp")
+ fun clearAllAfter(timestamp: Long)
+
+ /** Clears all recorded data in the database. */
+ @Query("DELETE FROM AppUsageEventEntity") fun clearAll()
+}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.java
deleted file mode 100644
index 19d2043..0000000
--- a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.java
+++ /dev/null
@@ -1,75 +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.batteryusage.db;
-
-import android.database.Cursor;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-/** Data access object for accessing {@link BatteryEventEntity} in the database. */
-@Dao
-public interface BatteryEventDao {
- /** Inserts a {@link BatteryEventEntity} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(BatteryEventEntity event);
-
- /** Gets all recorded data. */
- @Query("SELECT * FROM BatteryEventEntity ORDER BY timestamp DESC")
- List<BatteryEventEntity> getAll();
-
- /** Gets the {@link Cursor} of the last full charge time . */
- @Query(
- "SELECT MAX(timestamp) FROM BatteryEventEntity"
- + " WHERE batteryEventType = 3") // BatteryEventType.FULL_CHARGED = 3
- Cursor getLastFullChargeTimestamp();
-
- /** Gets the {@link Long} of the last full charge time . */
- @Query(
- "SELECT MAX(timestamp) FROM BatteryEventEntity"
- + " WHERE batteryEventType = 3") // BatteryEventType.FULL_CHARGED = 3
- Long getLastFullChargeTimestampForLog();
-
- /** Gets the {@link Cursor} of all recorded data after a specific timestamp. */
- @Query(
- "SELECT * FROM BatteryEventEntity"
- + " WHERE timestamp >= :timestamp AND batteryEventType IN (:batteryEventTypes)"
- + " ORDER BY timestamp DESC")
- Cursor getAllAfter(long timestamp, List<Integer> batteryEventTypes);
-
- /** Gets all recorded data after a specific timestamp for log.*/
- @Query(
- "SELECT * FROM BatteryEventEntity "
- + "WHERE timestamp >= :timestamp ORDER BY timestamp DESC")
- List<BatteryEventEntity> getAllAfterForLog(long timestamp);
-
- /** Deletes all recorded data before a specific timestamp. */
- @Query("DELETE FROM BatteryEventEntity WHERE timestamp <= :timestamp")
- void clearAllBefore(long timestamp);
-
- /** Deletes all recorded data after a specific timestamp. */
- @Query("DELETE FROM BatteryEventEntity WHERE timestamp >= :timestamp")
- void clearAllAfter(long timestamp);
-
- /** Clears all recorded data in the database. */
- @Query("DELETE FROM BatteryEventEntity")
- void clearAll();
-}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.kt b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.kt
new file mode 100644
index 0000000..351b086
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDao.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.fuelgauge.batteryusage.db
+
+import android.database.Cursor
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.android.settings.fuelgauge.batteryusage.BatteryEventType
+
+/** Data access object for accessing [BatteryEventEntity] in the database. */
+@Dao
+interface BatteryEventDao {
+ /** Inserts a [BatteryEventEntity] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ fun insert(event: BatteryEventEntity)
+
+ /** Gets all recorded data. */
+ @Query("SELECT * FROM BatteryEventEntity ORDER BY timestamp DESC")
+ fun getAll(): List<BatteryEventEntity>
+
+ /** Gets the [Cursor] of the last full charge time. */
+ @Query(
+ "SELECT MAX(timestamp) FROM BatteryEventEntity" +
+ " WHERE batteryEventType = 3" // BatteryEventType.FULL_CHARGED = 3
+ )
+ fun getLastFullChargeTimestamp(): Cursor
+
+ /** Gets the [Long] of the last full charge time. */
+ @Query(
+ "SELECT MAX(timestamp) FROM BatteryEventEntity" +
+ " WHERE batteryEventType = 3" // BatteryEventType.FULL_CHARGED = 3
+ )
+ fun getLastFullChargeTimestampForLog(): Long?
+
+ /** Gets the [Cursor] of all recorded data after a specific timestamp. */
+ @Query(
+ "SELECT * FROM BatteryEventEntity" +
+ " WHERE timestamp >= :timestamp AND batteryEventType IN (:batteryEventTypes)" +
+ " ORDER BY timestamp DESC"
+ )
+ fun getAllAfter(timestamp: Long, batteryEventTypes: List<Int>): Cursor
+
+ /** Gets all recorded data after a specific timestamp for log. */
+ @Query(
+ "SELECT * FROM BatteryEventEntity " +
+ "WHERE timestamp >= :timestamp ORDER BY timestamp DESC"
+ )
+ fun getAllAfterForLog(timestamp: Long): List<BatteryEventEntity>
+
+ /** Deletes all recorded data before a specific timestamp. */
+ @Query("DELETE FROM BatteryEventEntity WHERE timestamp <= :timestamp")
+ fun clearAllBefore(timestamp: Long)
+
+ /** Deletes all recorded data after a specific timestamp. */
+ @Query("DELETE FROM BatteryEventEntity WHERE timestamp >= :timestamp")
+ fun clearAllAfter(timestamp: Long)
+
+ /** Deletes even_hour event data in the database. */
+ @Query(
+ "DELETE FROM BatteryEventEntity " +
+ "WHERE batteryEventType = 4" // BatteryEventType.EVEN_HOUR = 4
+ )
+ fun clearEvenHourEvent()
+
+ /** Clears all recorded data in the database. */
+ @Query("DELETE FROM BatteryEventEntity")
+ fun clearAll()
+}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDao.kt b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDao.kt
new file mode 100644
index 0000000..4151a5b
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDao.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.batteryusage.db;
+
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+/** DAO for accessing {@link BatteryReattributeEntity} in the database. */
+@Dao
+interface BatteryReattributeDao {
+
+ /** Inserts a {@link BatteryReattributeEntity} data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE)
+ fun insert(event: BatteryReattributeEntity)
+
+ /** Gets all recorded data after a specific timestamp. */
+ @Query(
+ "SELECT * FROM BatteryReattributeEntity WHERE "
+ + "timestampStart >= :timestampStart ORDER BY timestampStart DESC")
+ fun getAllAfter(timestampStart: Long): List<BatteryReattributeEntity>
+
+ /** Deletes all recorded data before a specific timestamp. */
+ @Query("DELETE FROM BatteryReattributeEntity WHERE timestampStart <= :timestampStart")
+ fun clearAllBefore(timestampStart: Long)
+
+ /** Deletes all recorded data after a specific timestamp. */
+ @Query("DELETE FROM BatteryReattributeEntity WHERE timestampStart >= :timestampStart")
+ fun clearAllAfter(timestampStart: Long)
+
+ /** Clears all recorded data in the database. */
+ @Query("DELETE FROM BatteryReattributeEntity") fun clearAll()
+}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntity.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntity.java
new file mode 100644
index 0000000..0ee2260
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntity.java
@@ -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.fuelgauge.batteryusage.db;
+
+import static com.android.settings.fuelgauge.batteryusage.ConvertUtils.utcToLocalTimeForLogging;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
+import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
+import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
+
+/** A {@link Entity} for battery usage reattribution data in the database. */
+@Entity
+public class BatteryReattributeEntity {
+
+ /** The start timestamp of this record data. */
+ @PrimaryKey
+ public final long timestampStart;
+
+ /** The end timestamp of this record data. */
+ public final long timestampEnd;
+
+ /** The battery usage reattribution data for corresponding uids. */
+ @NonNull public final String reattributeData;
+
+ public BatteryReattributeEntity(@NonNull BatteryReattribute batteryReattribute) {
+ this(
+ batteryReattribute.getTimestampStart(),
+ batteryReattribute.getTimestampEnd(),
+ ConvertUtils.encodeBatteryReattribute(batteryReattribute));
+ }
+
+ @VisibleForTesting
+ BatteryReattributeEntity(
+ long timestampStart, long timestampEnd, @NonNull String reattributeData) {
+ this.timestampStart = timestampStart;
+ this.timestampEnd = timestampEnd;
+ this.reattributeData = reattributeData;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ final BatteryReattribute batteryReattribute =
+ ConvertUtils.decodeBatteryReattribute(reattributeData);
+ final StringBuilder builder = new StringBuilder()
+ .append("\nBatteryReattributeEntity{")
+ .append("\n\t" + utcToLocalTimeForLogging(timestampStart))
+ .append("\n\t" + utcToLocalTimeForLogging(timestampEnd))
+ .append("\n\t" + batteryReattribute);
+ if (batteryReattribute != null) {
+ builder.append("\n\t" + batteryReattribute.getReattributeDataMap());
+ }
+ return builder.append("\n}").toString();
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.java
deleted file mode 100644
index 049251e..0000000
--- a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.java
+++ /dev/null
@@ -1,71 +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.fuelgauge.batteryusage.db;
-
-import android.database.Cursor;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-/** Data access object for accessing {@link BatteryState} in the database. */
-@Dao
-public interface BatteryStateDao {
-
- /** Inserts a {@link BatteryState} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(BatteryState state);
-
- /** Inserts {@link BatteryState} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insertAll(List<BatteryState> states);
-
- /** Gets the {@link Cursor} of the latest record timestamp no later than the given timestamp. */
- @Query("SELECT MAX(timestamp) FROM BatteryState WHERE timestamp <= :timestamp")
- Cursor getLatestTimestampBefore(long timestamp);
-
- /** Lists all recorded battery states after a specific timestamp. */
- @Query("SELECT * FROM BatteryState WHERE timestamp >= :timestamp ORDER BY timestamp ASC")
- Cursor getBatteryStatesAfter(long timestamp);
-
- /** Lists all recorded data after a specific timestamp. */
- @Query("SELECT * FROM BatteryState WHERE timestamp > :timestamp ORDER BY timestamp DESC")
- List<BatteryState> getAllAfter(long timestamp);
-
- /** Get the count of distinct timestamp after a specific timestamp. */
- @Query("SELECT COUNT(DISTINCT timestamp) FROM BatteryState WHERE timestamp > :timestamp")
- int getDistinctTimestampCount(long timestamp);
-
- /** Lists all distinct timestamps after a specific timestamp. */
- @Query("SELECT DISTINCT timestamp FROM BatteryState WHERE timestamp > :timestamp")
- List<Long> getDistinctTimestamps(long timestamp);
-
- /** Deletes all recorded data before a specific timestamp. */
- @Query("DELETE FROM BatteryState WHERE timestamp <= :timestamp")
- void clearAllBefore(long timestamp);
-
- /** Deletes all recorded data after a specific timestamp. */
- @Query("DELETE FROM BatteryState WHERE timestamp >= :timestamp")
- void clearAllAfter(long timestamp);
-
- /** Clears all recorded data in the database. */
- @Query("DELETE FROM BatteryState")
- void clearAll();
-}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.kt b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.kt
new file mode 100644
index 0000000..6d31e07
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDao.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.fuelgauge.batteryusage.db
+
+import android.database.Cursor
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+/** Data access object for accessing [BatteryState] in the database. */
+@Dao
+interface BatteryStateDao {
+ /** Inserts a [BatteryState] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE) fun insert(state: BatteryState)
+
+ /** Inserts [BatteryState] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE) fun insertAll(states: List<BatteryState>)
+
+ /** Gets the [Cursor] of the latest record timestamp no later than the given timestamp. */
+ @Query("SELECT MAX(timestamp) FROM BatteryState WHERE timestamp <= :timestamp")
+ fun getLatestTimestampBefore(timestamp: Long): Cursor
+
+ /** Lists all recorded battery states after a specific timestamp. */
+ @Query("SELECT * FROM BatteryState WHERE timestamp >= :timestamp ORDER BY timestamp ASC")
+ fun getBatteryStatesAfter(timestamp: Long): Cursor
+
+ /** Lists all recorded data after a specific timestamp. */
+ @Query("SELECT * FROM BatteryState WHERE timestamp > :timestamp ORDER BY timestamp DESC")
+ fun getAllAfter(timestamp: Long): List<BatteryState>
+
+ /** Get the count of distinct timestamp after a specific timestamp. */
+ @Query("SELECT COUNT(DISTINCT timestamp) FROM BatteryState WHERE timestamp > :timestamp")
+ fun getDistinctTimestampCount(timestamp: Long): Int
+
+ /** Lists all distinct timestamps after a specific timestamp. */
+ @Query("SELECT DISTINCT timestamp FROM BatteryState WHERE timestamp > :timestamp")
+ fun getDistinctTimestamps(timestamp: Long): List<Long>
+
+ /** Deletes all recorded data before a specific timestamp. */
+ @Query("DELETE FROM BatteryState WHERE timestamp <= :timestamp")
+ fun clearAllBefore(timestamp: Long)
+
+ /** Deletes all recorded data after a specific timestamp. */
+ @Query("DELETE FROM BatteryState WHERE timestamp >= :timestamp")
+ fun clearAllAfter(timestamp: Long)
+
+ /** Clears all recorded data in the database. */
+ @Query("DELETE FROM BatteryState") fun clearAll()
+}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDatabase.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDatabase.java
index 7504775..c3aea08 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDatabase.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryStateDatabase.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.util.Log;
+import androidx.annotation.NonNull;
import androidx.room.Database;
import androidx.room.Room;
import androidx.room.RoomDatabase;
@@ -29,11 +30,13 @@
AppUsageEventEntity.class,
BatteryEventEntity.class,
BatteryState.class,
- BatteryUsageSlotEntity.class
+ BatteryUsageSlotEntity.class,
+ BatteryReattributeEntity.class
},
- version = 1)
+ version = 3)
public abstract class BatteryStateDatabase extends RoomDatabase {
private static final String TAG = "BatteryStateDatabase";
+ private static final String DB_FILE_NAME = "battery-usage-db-v11";
private static BatteryStateDatabase sBatteryStateDatabase;
@@ -49,11 +52,15 @@
/** Provides DAO for battery usage slot table. */
public abstract BatteryUsageSlotDao batteryUsageSlotDao();
+ /** Provides DAO for battery reattribution table. */
+ @NonNull
+ public abstract BatteryReattributeDao batteryReattributeDao();
+
/** Gets or creates an instance of {@link RoomDatabase}. */
public static BatteryStateDatabase getInstance(Context context) {
if (sBatteryStateDatabase == null) {
sBatteryStateDatabase =
- Room.databaseBuilder(context, BatteryStateDatabase.class, "battery-usage-db-v9")
+ Room.databaseBuilder(context, BatteryStateDatabase.class, DB_FILE_NAME)
// Allows accessing data in the main thread for dumping bugreport.
.allowMainThreadQueries()
.fallbackToDestructiveMigration()
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.java b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.java
deleted file mode 100644
index d53b0cf..0000000
--- a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.java
+++ /dev/null
@@ -1,62 +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.batteryusage.db;
-
-import android.database.Cursor;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-
-import java.util.List;
-
-/** Data access object for accessing {@link BatteryUsageSlotEntity} in the database. */
-@Dao
-public interface BatteryUsageSlotDao {
- /** Inserts a {@link BatteryUsageSlotEntity} data into the database. */
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(BatteryUsageSlotEntity event);
-
- /** Gets all recorded data. */
- @Query("SELECT * FROM BatteryUsageSlotEntity ORDER BY timestamp ASC")
- List<BatteryUsageSlotEntity> getAll();
-
- /** Gets the {@link Cursor} of all recorded data after a specific timestamp. */
- @Query(
- "SELECT * FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp"
- + " ORDER BY timestamp ASC")
- Cursor getAllAfter(long timestamp);
-
- /** Gets all recorded data after a specific timestamp for log.*/
- @Query(
- "SELECT * FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp"
- + " ORDER BY timestamp DESC")
- List<BatteryUsageSlotEntity> getAllAfterForLog(long timestamp);
-
- /** Deletes all recorded data before a specific timestamp. */
- @Query("DELETE FROM BatteryUsageSlotEntity WHERE timestamp <= :timestamp")
- void clearAllBefore(long timestamp);
-
- /** Deletes all recorded data after a specific timestamp. */
- @Query("DELETE FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp")
- void clearAllAfter(long timestamp);
-
- /** Clears all recorded data in the database. */
- @Query("DELETE FROM BatteryUsageSlotEntity")
- void clearAll();
-}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.kt b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.kt
new file mode 100644
index 0000000..434c61a
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batteryusage/db/BatteryUsageSlotDao.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.fuelgauge.batteryusage.db
+
+import android.database.Cursor
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+
+/** Data access object for accessing [BatteryUsageSlotEntity] in the database. */
+@Dao
+interface BatteryUsageSlotDao {
+ /** Inserts a [BatteryUsageSlotEntity] data into the database. */
+ @Insert(onConflict = OnConflictStrategy.REPLACE) fun insert(event: BatteryUsageSlotEntity)
+
+ /** Gets all recorded data. */
+ @Query("SELECT * FROM BatteryUsageSlotEntity ORDER BY timestamp ASC")
+ fun getAll(): List<BatteryUsageSlotEntity>
+
+ /** Gets the [Cursor] of all recorded data after a specific timestamp. */
+ @Query(
+ "SELECT * FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp" +
+ " ORDER BY timestamp ASC"
+ )
+ fun getAllAfter(timestamp: Long): Cursor
+
+ /** Gets all recorded data after a specific timestamp for log. */
+ @Query(
+ "SELECT * FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp" +
+ " ORDER BY timestamp DESC"
+ )
+ fun getAllAfterForLog(timestamp: Long): List<BatteryUsageSlotEntity>
+
+ /** Deletes all recorded data before a specific timestamp. */
+ @Query("DELETE FROM BatteryUsageSlotEntity WHERE timestamp <= :timestamp")
+ fun clearAllBefore(timestamp: Long)
+
+ /** Deletes all recorded data after a specific timestamp. */
+ @Query("DELETE FROM BatteryUsageSlotEntity WHERE timestamp >= :timestamp")
+ fun clearAllAfter(timestamp: Long)
+
+ /** Clears all recorded data in the database. */
+ @Query("DELETE FROM BatteryUsageSlotEntity") fun clearAll()
+}
diff --git a/src/com/android/settings/fuelgauge/protos/battery_reattribute.proto b/src/com/android/settings/fuelgauge/protos/battery_reattribute.proto
new file mode 100644
index 0000000..8185a22
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/protos/battery_reattribute.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "com.android.settings.fuelgauge.batteryusage";
+option java_outer_classname = "BatteryReaatributeProto";
+
+// Battery usage reattribute data for a specific timestamp slot.
+message BatteryReattribute {
+ optional int64 timestamp_start = 1;
+ optional int64 timestamp_end = 2;
+ // Battery reattribute data for uid and its corresponding ratio.
+ map<int32, float> reattribute_data = 3;
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
index e69a336..6362068 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -105,7 +105,8 @@
+ mAppContext.getText(R.string.condition_zen_title))
.setTitleText(mAppContext.getText(R.string.condition_zen_title).toString())
.setSummaryText(getSummary())
- .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp))
+ .setIconDrawable(mAppContext.getDrawable(
+ com.android.settingslib.R.drawable.ic_do_not_disturb_on_24dp))
.setViewType(ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH)
.build();
}
diff --git a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
index 8f1e5c8..f7a9aca 100644
--- a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
@@ -66,6 +66,20 @@
return false;
}
+ static boolean isMouse() {
+ for (int deviceId : InputDevice.getDeviceIds()) {
+ final InputDevice device = InputDevice.getDevice(deviceId);
+ if (device == null) {
+ continue;
+ }
+ if ((device.getSources() & InputDevice.SOURCE_MOUSE)
+ == InputDevice.SOURCE_MOUSE) {
+ return true;
+ }
+ }
+ return false;
+ }
+
@SuppressLint("MissingPermission")
@Nullable
static String getSelectedKeyboardLayoutLabelForUser(Context context, @UserIdInt int userId,
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index 5ba1c84..bafec32 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -70,10 +70,10 @@
private static final String KEYBOARD_OPTIONS_CATEGORY = "keyboard_options_category";
private static final String KEYBOARD_A11Y_CATEGORY = "keyboard_a11y_category";
- private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch";
private static final String ACCESSIBILITY_BOUNCE_KEYS = "accessibility_bounce_keys";
private static final String ACCESSIBILITY_SLOW_KEYS = "accessibility_slow_keys";
private static final String ACCESSIBILITY_STICKY_KEYS = "accessibility_sticky_keys";
+ private static final String ACCESSIBILITY_MOUSE_KEYS = "accessibility_mouse_keys";
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";
@@ -85,6 +85,8 @@
Secure.ACCESSIBILITY_SLOW_KEYS);
private static final Uri sAccessibilityStickyKeysUri = Secure.getUriFor(
Secure.ACCESSIBILITY_STICKY_KEYS);
+ private static final Uri sAccessibilityMouseKeysUri = Secure.getUriFor(
+ Secure.ACCESSIBILITY_MOUSE_KEYS_ENABLED);
public static final int BOUNCE_KEYS_THRESHOLD = 500;
public static final int SLOW_KEYS_THRESHOLD = 500;
@@ -100,14 +102,13 @@
@Nullable
private PreferenceCategory mKeyboardA11yCategory = null;
@Nullable
- private TwoStatePreference mShowVirtualKeyboardSwitch = null;
- @Nullable
private TwoStatePreference mAccessibilityBounceKeys = null;
@Nullable
private TwoStatePreference mAccessibilitySlowKeys = null;
@Nullable
private TwoStatePreference mAccessibilityStickyKeys = null;
-
+ @Nullable
+ private TwoStatePreference mAccessibilityMouseKeys = null;
private Intent mIntentWaitingForResult;
private boolean mSupportsFirmwareUpdate;
@@ -129,8 +130,6 @@
mImm = Preconditions.checkNotNull(activity.getSystemService(InputMethodManager.class));
mKeyboardAssistanceCategory = Preconditions.checkNotNull(
findPreference(KEYBOARD_OPTIONS_CATEGORY));
- mShowVirtualKeyboardSwitch = Objects.requireNonNull(
- mKeyboardAssistanceCategory.findPreference(SHOW_VIRTUAL_KEYBOARD_SWITCH));
mKeyboardA11yCategory = Objects.requireNonNull(findPreference(KEYBOARD_A11Y_CATEGORY));
mAccessibilityBounceKeys = Objects.requireNonNull(
@@ -143,6 +142,8 @@
getContext().getString(R.string.slow_keys_summary, SLOW_KEYS_THRESHOLD));
mAccessibilityStickyKeys = Objects.requireNonNull(
mKeyboardA11yCategory.findPreference(ACCESSIBILITY_STICKY_KEYS));
+ mAccessibilityMouseKeys = Objects.requireNonNull(
+ mKeyboardA11yCategory.findPreference(ACCESSIBILITY_MOUSE_KEYS));
FeatureFactory featureFactory = FeatureFactory.getFeatureFactory();
mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
@@ -165,6 +166,9 @@
if (!InputSettings.isAccessibilityStickyKeysFeatureEnabled()) {
mKeyboardA11yCategory.removePreference(mAccessibilityStickyKeys);
}
+ if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
+ mKeyboardA11yCategory.removePreference(mAccessibilityMouseKeys);
+ }
InputDeviceIdentifier inputDeviceIdentifier = activity.getIntent().getParcelableExtra(
KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
InputDeviceIdentifier.class);
@@ -207,14 +211,14 @@
mLastHardKeyboards.clear();
scheduleUpdateHardKeyboards();
mIm.registerInputDeviceListener(this, null);
- Objects.requireNonNull(mShowVirtualKeyboardSwitch).setOnPreferenceChangeListener(
- mShowVirtualKeyboardSwitchPreferenceChangeListener);
Objects.requireNonNull(mAccessibilityBounceKeys).setOnPreferenceChangeListener(
mAccessibilityBounceKeysSwitchPreferenceChangeListener);
Objects.requireNonNull(mAccessibilitySlowKeys).setOnPreferenceChangeListener(
mAccessibilitySlowKeysSwitchPreferenceChangeListener);
Objects.requireNonNull(mAccessibilityStickyKeys).setOnPreferenceChangeListener(
mAccessibilityStickyKeysSwitchPreferenceChangeListener);
+ Objects.requireNonNull(mAccessibilityMouseKeys).setOnPreferenceChangeListener(
+ mAccessibilityMouseKeysSwitchPreferenceChangeListener);
registerSettingsObserver();
}
@@ -223,10 +227,10 @@
super.onPause();
mLastHardKeyboards.clear();
mIm.unregisterInputDeviceListener(this);
- Objects.requireNonNull(mShowVirtualKeyboardSwitch).setOnPreferenceChangeListener(null);
Objects.requireNonNull(mAccessibilityBounceKeys).setOnPreferenceChangeListener(null);
Objects.requireNonNull(mAccessibilitySlowKeys).setOnPreferenceChangeListener(null);
Objects.requireNonNull(mAccessibilityStickyKeys).setOnPreferenceChangeListener(null);
+ Objects.requireNonNull(mAccessibilityMouseKeys).setOnPreferenceChangeListener(null);
unregisterSettingsObserver();
}
@@ -314,16 +318,17 @@
if (mSupportsFirmwareUpdate) {
mFeatureProvider.addFirmwareUpdateCategory(getPrefContext(), preferenceScreen);
}
- updateShowVirtualKeyboardSwitch();
if (InputSettings.isAccessibilityBounceKeysFeatureEnabled()
|| InputSettings.isAccessibilityStickyKeysFeatureEnabled()
- || InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()) {
+ || InputSettings.isAccessibilitySlowKeysFeatureFlagEnabled()
+ || InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
Objects.requireNonNull(mKeyboardA11yCategory).setOrder(2);
preferenceScreen.addPreference(mKeyboardA11yCategory);
updateAccessibilityBounceKeysSwitch();
updateAccessibilitySlowKeysSwitch();
updateAccessibilityStickyKeysSwitch();
+ updateAccessibilityMouseKeysSwitch();
}
}
@@ -374,21 +379,23 @@
mContentObserver,
UserHandle.myUserId());
}
- updateShowVirtualKeyboardSwitch();
+ if (InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
+ contentResolver.registerContentObserver(
+ sAccessibilityMouseKeysUri,
+ false,
+ mContentObserver,
+ UserHandle.myUserId());
+ }
updateAccessibilityBounceKeysSwitch();
updateAccessibilitySlowKeysSwitch();
updateAccessibilityStickyKeysSwitch();
+ updateAccessibilityMouseKeysSwitch();
}
private void unregisterSettingsObserver() {
getActivity().getContentResolver().unregisterContentObserver(mContentObserver);
}
- private void updateShowVirtualKeyboardSwitch() {
- Objects.requireNonNull(mShowVirtualKeyboardSwitch).setChecked(
- Secure.getInt(getContentResolver(), Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0) != 0);
- }
-
private void updateAccessibilityBounceKeysSwitch() {
if (!InputSettings.isAccessibilityBounceKeysFeatureEnabled()) {
return;
@@ -413,19 +420,18 @@
InputSettings.isAccessibilityStickyKeysEnabled(getContext()));
}
+ private void updateAccessibilityMouseKeysSwitch() {
+ if (!InputSettings.isAccessibilityMouseKeysFeatureFlagEnabled()) {
+ return;
+ }
+ Objects.requireNonNull(mAccessibilityMouseKeys).setChecked(
+ InputSettings.isAccessibilityMouseKeysEnabled(getContext()));
+ }
+
private void toggleKeyboardShortcutsMenu() {
getActivity().requestShowKeyboardShortcuts();
}
- private final OnPreferenceChangeListener mShowVirtualKeyboardSwitchPreferenceChangeListener =
- (preference, newValue) -> {
- final ContentResolver cr = getContentResolver();
- Secure.putInt(cr, Secure.SHOW_IME_WITH_HARD_KEYBOARD, ((Boolean) newValue) ? 1 : 0);
- cr.notifyChange(Secure.getUriFor(Secure.SHOW_IME_WITH_HARD_KEYBOARD),
- null /* observer */, ContentResolver.NOTIFY_NO_DELAY);
- return true;
- };
-
private final OnPreferenceChangeListener
mAccessibilityBounceKeysSwitchPreferenceChangeListener = (preference, newValue) -> {
InputSettings.setAccessibilityBounceKeysThreshold(getContext(),
@@ -446,17 +452,23 @@
return true;
};
+ private final OnPreferenceChangeListener
+ mAccessibilityMouseKeysSwitchPreferenceChangeListener = (preference, newValue) -> {
+ InputSettings.setAccessibilityMouseKeysEnabled(getContext(), (Boolean) newValue);
+ return true;
+ };
+
private final ContentObserver mContentObserver = new ContentObserver(new Handler(true)) {
@Override
public void onChange(boolean selfChange, Uri uri) {
- if (sVirtualKeyboardSettingsUri.equals(uri)) {
- updateShowVirtualKeyboardSwitch();
- } else if (sAccessibilityBounceKeysUri.equals(uri)) {
+ if (sAccessibilityBounceKeysUri.equals(uri)) {
updateAccessibilityBounceKeysSwitch();
} else if (sAccessibilitySlowKeysUri.equals(uri)) {
updateAccessibilitySlowKeysSwitch();
} else if (sAccessibilityStickyKeysUri.equals(uri)) {
updateAccessibilityStickyKeysSwitch();
+ } else if (sAccessibilityMouseKeysUri.equals(uri)) {
+ updateAccessibilityMouseKeysSwitch();
}
}
};
diff --git a/src/com/android/settings/inputmethod/PointerFillStylePreferenceController.java b/src/com/android/settings/inputmethod/PointerFillStylePreferenceController.java
index 5abc383..bd6bbd5 100644
--- a/src/com/android/settings/inputmethod/PointerFillStylePreferenceController.java
+++ b/src/com/android/settings/inputmethod/PointerFillStylePreferenceController.java
@@ -16,25 +16,39 @@
package com.android.settings.inputmethod;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_FILL_BLACK;
+
+import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceDataStore;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-public class PointerFillStylePreferenceController extends BasePreferenceController {
+public class PointerFillStylePreferenceController extends BasePreferenceController
+ implements LifecycleEventObserver {
+
+ private MetricsFeatureProvider mMetricsFeatureProvider;
@VisibleForTesting
static final String KEY_POINTER_FILL_STYLE = "pointer_fill_style";
public PointerFillStylePreferenceController(@NonNull Context context) {
super(context, KEY_POINTER_FILL_STYLE);
+
+ mMetricsFeatureProvider =
+ FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
}
@AvailabilityStatus
@@ -64,4 +78,17 @@
}
});
}
+
+ @Override
+ public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+ @NonNull Lifecycle.Event event) {
+ if (event == Lifecycle.Event.ON_PAUSE) {
+ int currentValue =
+ Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_FILL_STYLE,
+ POINTER_ICON_VECTOR_STYLE_FILL_BLACK, UserHandle.USER_CURRENT);
+ mMetricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_POINTER_ICON_FILL_STYLE_CHANGED, currentValue);
+ }
+ }
}
diff --git a/src/com/android/settings/inputmethod/PointerScaleSeekBarController.java b/src/com/android/settings/inputmethod/PointerScaleSeekBarController.java
new file mode 100644
index 0000000..509cdd6
--- /dev/null
+++ b/src/com/android/settings/inputmethod/PointerScaleSeekBarController.java
@@ -0,0 +1,121 @@
+/*
+ * 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.view.PointerIcon.DEFAULT_POINTER_SCALE;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.widget.SeekBar;
+
+import androidx.annotation.NonNull;
+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.overlay.FeatureFactory;
+import com.android.settings.widget.LabeledSeekBarPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+public class PointerScaleSeekBarController extends BasePreferenceController
+ implements LifecycleEventObserver {
+
+ private final int mProgressMin;
+ private final int mProgressMax;
+ private final float mScaleMin;
+ private final float mScaleMax;
+
+ private MetricsFeatureProvider mMetricsFeatureProvider;
+
+ public PointerScaleSeekBarController(@NonNull Context context, @NonNull String key) {
+ super(context, key);
+
+ Resources res = context.getResources();
+ mProgressMin = res.getInteger(R.integer.pointer_scale_seek_bar_start);
+ mProgressMax = res.getInteger(R.integer.pointer_scale_seek_bar_end);
+ mScaleMin = res.getFloat(R.dimen.pointer_scale_size_start);
+ mScaleMax = res.getFloat(R.dimen.pointer_scale_size_end);
+
+ mMetricsFeatureProvider =
+ FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
+ }
+
+ @AvailabilityStatus
+ public int getAvailabilityStatus() {
+ return android.view.flags.Flags.enableVectorCursorA11ySettings() ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ LabeledSeekBarPreference seekBarPreference = screen.findPreference(getPreferenceKey());
+ seekBarPreference.setMax(mProgressMax);
+ seekBarPreference.setContinuousUpdates(/* continuousUpdates= */ true);
+ seekBarPreference.setProgress(scaleToProgress(
+ Settings.System.getFloatForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_SCALE, DEFAULT_POINTER_SCALE,
+ UserHandle.USER_CURRENT)));
+ seekBarPreference.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+ @Override
+ public void onProgressChanged(@NonNull SeekBar seekBar, int progress,
+ boolean fromUser) {
+ Settings.System.putFloatForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_SCALE, progressToScale(progress),
+ UserHandle.USER_CURRENT);
+ }
+
+ @Override
+ public void onStartTrackingTouch(@NonNull SeekBar seekBar) {}
+
+ @Override
+ public void onStopTrackingTouch(@NonNull SeekBar seekBar) {}
+ });
+ }
+
+ private float progressToScale(int progress) {
+ return (((progress - mProgressMin) * (mScaleMax - mScaleMin)) / (mProgressMax
+ - mProgressMin)) + mScaleMin;
+ }
+
+ private int scaleToProgress(float scale) {
+ return (int) (
+ (((scale - mScaleMin) * (mProgressMax - mProgressMin)) / (mScaleMax - mScaleMin))
+ + mProgressMin);
+ }
+
+ @Override
+ public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+ @NonNull Lifecycle.Event event) {
+ if (event == Lifecycle.Event.ON_PAUSE) {
+ float currentValue =
+ Settings.System.getFloatForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_SCALE, DEFAULT_POINTER_SCALE,
+ UserHandle.USER_CURRENT);
+ mMetricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_POINTER_ICON_SCALE_CHANGED,
+ Float.toString(currentValue));
+ }
+ }
+}
diff --git a/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java
new file mode 100644
index 0000000..1c02332
--- /dev/null
+++ b/src/com/android/settings/inputmethod/PointerStrokeStylePreference.java
@@ -0,0 +1,75 @@
+/*
+ * 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.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_BLACK;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_NONE;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_WHITE;
+
+import android.content.Context;
+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 PointerStrokeStylePreference extends Preference {
+
+ public PointerStrokeStylePreference(@NonNull Context context, @Nullable AttributeSet attrs) {
+ super(context, attrs);
+ setLayoutResource(R.layout.pointer_icon_stroke_style_layout);
+ }
+
+ @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 currentStroke = getPreferenceDataStore().getInt(Settings.System.POINTER_STROKE_STYLE,
+ POINTER_ICON_VECTOR_STYLE_STROKE_WHITE);
+ initRadioButton(holder, R.id.stroke_style_white, POINTER_ICON_VECTOR_STYLE_STROKE_WHITE,
+ currentStroke);
+ initRadioButton(holder, R.id.stroke_style_black, POINTER_ICON_VECTOR_STYLE_STROKE_BLACK,
+ currentStroke);
+ initRadioButton(holder, R.id.stroke_style_none, POINTER_ICON_VECTOR_STYLE_STROKE_NONE,
+ currentStroke);
+ }
+
+ private void initRadioButton(@NonNull PreferenceViewHolder holder, int id, int strokeStyle,
+ int currentStroke) {
+ RadioButton radioButton = (RadioButton) holder.findViewById(id);
+ if (radioButton == null) {
+ return;
+ }
+ radioButton.setOnCheckedChangeListener((v, isChecked) -> {
+ if (isChecked) {
+ getPreferenceDataStore().putInt(Settings.System.POINTER_STROKE_STYLE, strokeStyle);
+ }
+ });
+ radioButton.setChecked(currentStroke == strokeStyle);
+ radioButton.setPointerIcon(PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_ARROW));
+ }
+}
diff --git a/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceController.java b/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceController.java
new file mode 100644
index 0000000..714e7b5
--- /dev/null
+++ b/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceController.java
@@ -0,0 +1,94 @@
+/*
+ * 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.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_WHITE;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceDataStore;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+public class PointerStrokeStylePreferenceController extends BasePreferenceController
+ implements LifecycleEventObserver {
+
+ private MetricsFeatureProvider mMetricsFeatureProvider;
+
+ @VisibleForTesting
+ static final String KEY_POINTER_STROKE_STYLE = "pointer_stroke_style";
+
+ public PointerStrokeStylePreferenceController(@NonNull Context context) {
+ super(context, KEY_POINTER_STROKE_STYLE);
+
+ mMetricsFeatureProvider =
+ FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
+ }
+
+ @AvailabilityStatus
+ public int getAvailabilityStatus() {
+ return android.view.flags.Flags.enableVectorCursorA11ySettings() ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(@NonNull PreferenceScreen screen) {
+ super.displayPreference(screen);
+ Preference pointerStrokeStylePreference = screen.findPreference(KEY_POINTER_STROKE_STYLE);
+ if (pointerStrokeStylePreference == null) {
+ return;
+ }
+ pointerStrokeStylePreference.setPreferenceDataStore(new PreferenceDataStore() {
+ @Override
+ public void putInt(@NonNull String key, int value) {
+ Settings.System.putIntForUser(mContext.getContentResolver(), key, value,
+ UserHandle.USER_CURRENT);
+ }
+
+ @Override
+ public int getInt(@NonNull String key, int defValue) {
+ return Settings.System.getIntForUser(mContext.getContentResolver(), key, defValue,
+ UserHandle.USER_CURRENT);
+ }
+ });
+ }
+
+ @Override
+ public void onStateChanged(@NonNull LifecycleOwner lifecycleOwner,
+ @NonNull Lifecycle.Event event) {
+ if (event == Lifecycle.Event.ON_PAUSE) {
+ int currentValue =
+ Settings.System.getIntForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_STROKE_STYLE,
+ POINTER_ICON_VECTOR_STYLE_STROKE_WHITE, UserHandle.USER_CURRENT);
+ mMetricsFeatureProvider.action(mContext,
+ SettingsEnums.ACTION_POINTER_ICON_STROKE_STYLE_CHANGED, currentValue);
+ }
+ }
+}
diff --git a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
index 648a3e6..12dc076 100644
--- a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
@@ -16,8 +16,11 @@
package com.android.settings.inputmethod;
+import static com.android.systemui.shared.Flags.newTouchpadGesturesTutorial;
+
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.content.Intent;
import android.util.FeatureFlagUtils;
import androidx.fragment.app.Fragment;
@@ -34,6 +37,7 @@
private static final int ORDER_BOTTOM = 100;
private static final String PREFERENCE_KEY = "trackpad_touch_gesture";
private static final String GESTURE_DIALOG_TAG = "GESTURE_DIALOG_TAG";
+ private static final String TUTORIAL_ACTION = "com.android.systemui.action.TOUCHPAD_TUTORIAL";
private Fragment mParent;
private MetricsFeatureProvider mMetricsFeatureProvider;
@@ -68,13 +72,21 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
private void showTouchpadGestureEducation() {
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_LEARN_TOUCHPAD_GESTURE_CLICK);
- TrackpadGestureDialogFragment fragment = new TrackpadGestureDialogFragment();
- fragment.setTargetFragment(mParent, 0);
- fragment.show(mParent.getActivity().getSupportFragmentManager(), GESTURE_DIALOG_TAG);
+ if (newTouchpadGesturesTutorial()) {
+ Intent intent = new Intent(TUTORIAL_ACTION);
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ mContext.startActivity(intent);
+ } else {
+ TrackpadGestureDialogFragment fragment = new TrackpadGestureDialogFragment();
+ fragment.setTargetFragment(mParent, 0);
+ fragment.show(mParent.getActivity().getSupportFragmentManager(), GESTURE_DIALOG_TAG);
+ }
}
}
diff --git a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
index d410a1b..a92ebd4 100644
--- a/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadBottomPreferenceController.java
@@ -49,7 +49,8 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
index 042126d..ca086a9 100644
--- a/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceController.java
@@ -49,7 +49,8 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/inputmethod/TrackpadSettings.java b/src/com/android/settings/inputmethod/TrackpadSettings.java
index 4955933..dca418a 100644
--- a/src/com/android/settings/inputmethod/TrackpadSettings.java
+++ b/src/com/android/settings/inputmethod/TrackpadSettings.java
@@ -56,7 +56,8 @@
@Override
protected boolean isPageSearchEnabled(Context context) {
return FeatureFlagUtils
- .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
+ .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD)
+ && NewKeyboardSettingsUtils.isTouchpad();
}
};
}
diff --git a/src/com/android/settings/inputmethod/TrackpadSettingsController.java b/src/com/android/settings/inputmethod/TrackpadSettingsController.java
index 3de58e4..d88b282 100644
--- a/src/com/android/settings/inputmethod/TrackpadSettingsController.java
+++ b/src/com/android/settings/inputmethod/TrackpadSettingsController.java
@@ -84,6 +84,10 @@
boolean isFeatureOn = FeatureFlagUtils
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
- return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ boolean isPointerCustomizationEnabled =
+ android.view.flags.Flags.enableVectorCursorA11ySettings();
+ boolean isMouse = NewKeyboardSettingsUtils.isMouse();
+ return (isFeatureOn && isTouchpad) || (isPointerCustomizationEnabled && isMouse) ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
}
}
diff --git a/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
index 30253a8..b2bb617 100644
--- a/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTapDraggingPreferenceController.java
@@ -49,7 +49,8 @@
@Override
public int getAvailabilityStatus() {
- return InputSettings.isTouchpadTapDraggingFeatureFlagEnabled()
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return (InputSettings.isTouchpadTapDraggingFeatureFlagEnabled() && isTouchpad)
? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
diff --git a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
index f78c81e..c25cc4e 100644
--- a/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceController.java
@@ -49,7 +49,8 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return isTouchpad ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
index 9a4b90f..a6af3f6 100644
--- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
@@ -58,7 +58,8 @@
return FeatureFlagUtils
.isEnabled(
context,
- FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
+ FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE)
+ && NewKeyboardSettingsUtils.isTouchpad();
}
};
}
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
index 8f04aee..7949727 100644
--- a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
@@ -31,6 +31,7 @@
public int getAvailabilityStatus() {
boolean isFeatureOn = FeatureFlagUtils
.isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
- return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ boolean isTouchpad = NewKeyboardSettingsUtils.isTouchpad();
+ return (isFeatureOn && isTouchpad) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
}
diff --git a/src/com/android/settings/network/InternetPreferenceControllerV2.kt b/src/com/android/settings/network/InternetPreferenceControllerV2.kt
index a181abd..3c79342 100644
--- a/src/com/android/settings/network/InternetPreferenceControllerV2.kt
+++ b/src/com/android/settings/network/InternetPreferenceControllerV2.kt
@@ -28,7 +28,7 @@
class InternetPreferenceControllerV2(context: Context, preferenceKey: String) :
BasePreferenceController(context, preferenceKey) {
- private val repository = InternetPreferenceRepository(mContext)
+ private val repository by lazy { InternetPreferenceRepository(mContext) }
private var preference: Preference? = null
override fun getAvailabilityStatus() =
diff --git a/src/com/android/settings/network/MobileDataEnabledFlow.kt b/src/com/android/settings/network/MobileDataEnabledFlow.kt
deleted file mode 100644
index 1f995a9..0000000
--- a/src/com/android/settings/network/MobileDataEnabledFlow.kt
+++ /dev/null
@@ -1,43 +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.network
-
-import android.content.Context
-import android.provider.Settings
-import android.telephony.SubscriptionManager
-import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalChangeFlow
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.merge
-
-/**
- * Flow for mobile data enabled changed event.
- *
- * Note: This flow can only notify enabled status changes, cannot provide the latest status.
- */
-fun Context.mobileDataEnabledFlow(subId: Int, sendInitialValue: Boolean = true): Flow<Unit> {
- val flow = settingsGlobalChangeFlow(Settings.Global.MOBILE_DATA, sendInitialValue)
- return when (subId) {
- SubscriptionManager.INVALID_SUBSCRIPTION_ID -> flow
- else -> {
- val subIdFlow = settingsGlobalChangeFlow(
- name = Settings.Global.MOBILE_DATA + subId,
- sendInitialValue = false,
- )
- merge(flow, subIdFlow)
- }
- }
-}
diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java
index 8ee5389..f5763eb 100644
--- a/src/com/android/settings/network/MobileNetworkRepository.java
+++ b/src/com/android/settings/network/MobileNetworkRepository.java
@@ -29,7 +29,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
-import android.telephony.UiccCardInfo;
import android.telephony.UiccPortInfo;
import android.telephony.UiccSlotInfo;
import android.util.ArrayMap;
@@ -41,7 +40,6 @@
import androidx.lifecycle.LifecycleOwner;
import com.android.internal.telephony.flags.Flags;
-import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.mobile.dataservice.MobileNetworkDatabase;
@@ -49,7 +47,6 @@
import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoDao;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
-import com.android.settingslib.mobile.dataservice.UiccInfoDao;
import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
import java.util.ArrayList;
@@ -81,23 +78,13 @@
private SubscriptionManager mSubscriptionManager;
private MobileNetworkDatabase mMobileNetworkDatabase;
private SubscriptionInfoDao mSubscriptionInfoDao;
- private UiccInfoDao mUiccInfoDao;
private MobileNetworkInfoDao mMobileNetworkInfoDao;
private List<SubscriptionInfoEntity> mAvailableSubInfoEntityList = new ArrayList<>();
private List<SubscriptionInfoEntity> mActiveSubInfoEntityList = new ArrayList<>();
- private List<UiccInfoEntity> mUiccInfoEntityList = new ArrayList<>();
- private List<MobileNetworkInfoEntity> mMobileNetworkInfoEntityList = new ArrayList<>();
private Context mContext;
private AirplaneModeObserver mAirplaneModeObserver;
- private DataRoamingObserver mDataRoamingObserver;
private MetricsFeatureProvider mMetricsFeatureProvider;
private int mPhysicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
- private int mLogicalSlotIndex = SubscriptionManager.INVALID_SIM_SLOT_INDEX;
- private int mCardState = UiccSlotInfo.CARD_STATE_INFO_ABSENT;
- private int mPortIndex = TelephonyManager.INVALID_PORT_INDEX;
- private int mCardId = TelephonyManager.UNINITIALIZED_CARD_ID;
- private boolean mIsEuicc = false;
- private boolean mIsRemovable = false;
private boolean mIsActive = false;
private Map<Integer, SubscriptionInfo> mSubscriptionInfoMap = new ArrayMap<>();
private Map<Integer, TelephonyManager> mTelephonyManagerMap = new HashMap<>();
@@ -124,10 +111,8 @@
mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_MOBILE_NETWORK_DB_CREATED);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mSubscriptionInfoDao = mMobileNetworkDatabase.mSubscriptionInfoDao();
- mUiccInfoDao = mMobileNetworkDatabase.mUiccInfoDao();
mMobileNetworkInfoDao = mMobileNetworkDatabase.mMobileNetworkInfoDao();
mAirplaneModeObserver = new AirplaneModeObserver(new Handler(Looper.getMainLooper()));
- mDataRoamingObserver = new DataRoamingObserver(new Handler(Looper.getMainLooper()));
}
private class AirplaneModeObserver extends ContentObserver {
@@ -158,47 +143,6 @@
}
}
- private class DataRoamingObserver extends ContentObserver {
- private int mRegSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- private String mBaseField = Settings.Global.DATA_ROAMING;
-
- DataRoamingObserver(Handler handler) {
- super(handler);
- }
-
- public void register(Context context, int subId) {
- mRegSubId = subId;
- String lastField = mBaseField;
- createTelephonyManagerBySubId(subId);
- TelephonyManager tm = mTelephonyManagerMap.get(subId);
- if (tm.getSimCount() != 1) {
- lastField += subId;
- }
- context.getContentResolver().registerContentObserver(
- Settings.Global.getUriFor(lastField), false, this);
- }
-
- public void unRegister(Context context) {
- context.getContentResolver().unregisterContentObserver(this);
- }
-
- @Override
- public void onChange(boolean selfChange, Uri uri) {
- TelephonyManager tm = mTelephonyManagerMap.get(mRegSubId);
- if (tm == null) {
- return;
- }
- sExecutor.execute(() -> {
- Log.d(TAG, "DataRoamingObserver changed");
- insertMobileNetworkInfo(mContext, mRegSubId, tm);
- });
- boolean isDataRoamingEnabled = tm.isDataRoamingEnabled();
- for (MobileNetworkCallback callback : sCallbacks) {
- callback.onDataRoamingChanged(mRegSubId, isDataRoamingEnabled);
- }
- }
- }
-
/**
* Register all callbacks and listener.
*
@@ -224,7 +168,6 @@
observeAllMobileNetworkInfo(lifecycleOwner);
if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
createTelephonyManagerBySubId(subId);
- mDataRoamingObserver.register(mContext, subId);
}
// When one client registers callback first time, convey the cached results to the client
// so that the client is aware of the content therein.
@@ -288,7 +231,6 @@
if (sCallbacks.isEmpty()) {
mSubscriptionManager.removeOnSubscriptionsChangedListener(this);
mAirplaneModeObserver.unRegister(mContext);
- mDataRoamingObserver.unRegister(mContext);
mTelephonyManagerMap.forEach((id, manager) -> {
TelephonyCallback callback = mTelephonyCallbackMap.get(id);
@@ -338,22 +280,6 @@
lifecycleOwner, this::onAllMobileNetworkInfoChanged);
}
- public List<SubscriptionInfoEntity> getAvailableSubInfoEntityList() {
- return mAvailableSubInfoEntityList;
- }
-
- public List<SubscriptionInfoEntity> getActiveSubscriptionInfoList() {
- return mActiveSubInfoEntityList;
- }
-
- public List<UiccInfoEntity> getUiccInfoEntityList() {
- return mUiccInfoEntityList;
- }
-
- public List<MobileNetworkInfoEntity> getMobileNetworkInfoEntityList() {
- return mMobileNetworkInfoEntityList;
- }
-
public SubscriptionInfoEntity getSubInfoById(String subId) {
return mSubscriptionInfoDao.querySubInfoById(subId);
}
@@ -368,19 +294,13 @@
UiccSlotInfo curSlotInfo = uiccSlotInfos[i];
if (curSlotInfo != null && curSlotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT) {
final int index = i;
- mIsEuicc = curSlotInfo.getIsEuicc();
- mCardState = curSlotInfo.getCardStateInfo();
- mIsRemovable = curSlotInfo.isRemovable();
- mCardId = subInfo.getCardId();
Collection<UiccPortInfo> uiccPortInfos = curSlotInfo.getPorts();
uiccPortInfos.forEach(portInfo -> {
if (portInfo.getPortIndex() == subInfo.getPortIndex()
&& portInfo.getLogicalSlotIndex() == subInfo.getSimSlotIndex()) {
mPhysicalSlotIndex = index;
- mLogicalSlotIndex = portInfo.getLogicalSlotIndex();
mIsActive = portInfo.isActive();
- mPortIndex = portInfo.getPortIndex();
} else if (DEBUG) {
Log.d(TAG, "Can not get port index and physicalSlotIndex for subId "
+ subInfo.getSubscriptionId());
@@ -464,7 +384,6 @@
}
private void onAllUiccInfoChanged(List<UiccInfoEntity> uiccInfoEntityList) {
- mUiccInfoEntityList = new ArrayList<>(uiccInfoEntityList);
for (MobileNetworkCallback callback : sCallbacks) {
callback.onAllUiccInfoChanged(uiccInfoEntityList);
}
@@ -474,7 +393,6 @@
private void onAllMobileNetworkInfoChanged(
List<MobileNetworkInfoEntity> mobileNetworkInfoEntityList) {
- mMobileNetworkInfoEntityList = new ArrayList<>(mobileNetworkInfoEntityList);
for (MobileNetworkCallback callback : sCallbacks) {
callback.onAllMobileNetworkInfoChanged(mobileNetworkInfoEntityList);
}
@@ -502,8 +420,8 @@
mMobileNetworkDatabase.insertSubsInfo(subInfoEntity);
mMetricsFeatureProvider.action(mContext,
SettingsEnums.ACTION_MOBILE_NETWORK_DB_INSERT_SUB_INFO, subId);
- insertUiccInfo(subId, telephonyManager);
- insertMobileNetworkInfo(context, subId, telephonyManager);
+ insertUiccInfo(subId);
+ insertMobileNetworkInfo(subId, telephonyManager);
}
} else if (DEBUG) {
Log.d(TAG, "Can not insert subInfo, the entity is null");
@@ -515,8 +433,6 @@
mMobileNetworkDatabase.deleteSubInfoBySubId(subId);
mMobileNetworkDatabase.deleteUiccInfoBySubId(subId);
mMobileNetworkDatabase.deleteMobileNetworkInfoBySubId(subId);
- mUiccInfoEntityList.removeIf(info -> info.subId.equals(subId));
- mMobileNetworkInfoEntityList.removeIf(info -> info.subId.equals(subId));
int id = Integer.parseInt(subId);
removerRegisterBySubId(id);
mSubscriptionInfoMap.remove(id);
@@ -545,36 +461,22 @@
return null;
} else {
getUiccInfoBySubscriptionInfo(uiccSlotInfos, subInfo);
- SubscriptionInfo firstRemovableSubInfo = SubscriptionUtil.getFirstRemovableSubscription(
- context);
if (DEBUG) {
Log.d(TAG, "convert subscriptionInfo to entity for subId = " + subId);
}
- return new SubscriptionInfoEntity(String.valueOf(subId),
- subInfo.getSimSlotIndex(),
- subInfo.getCarrierId(), subInfo.getDisplayName().toString(),
- subInfo.getCarrierName() != null ? subInfo.getCarrierName().toString() : "",
- subInfo.getDataRoaming(), subInfo.getMccString(), subInfo.getMncString(),
- subInfo.getCountryIso(), subInfo.isEmbedded(), mCardId,
- subInfo.getPortIndex(), subInfo.isOpportunistic(),
- String.valueOf(subInfo.getGroupUuid()),
- subInfo.getSubscriptionType(),
+ return new SubscriptionInfoEntity(String.valueOf(subId), subInfo.getSimSlotIndex(),
+ subInfo.isEmbedded(), subInfo.isOpportunistic(),
SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, context).toString(),
SubscriptionUtil.isSubscriptionVisible(mSubscriptionManager, context, subInfo),
- SubscriptionUtil.getFormattedPhoneNumber(context, subInfo),
- firstRemovableSubInfo == null ? false
- : firstRemovableSubInfo.getSubscriptionId() == subId,
SubscriptionUtil.isDefaultSubscription(context, subId),
mSubscriptionManager.isValidSubscriptionId(subId),
- mSubscriptionManager.isUsableSubscriptionId(subId),
mSubscriptionManager.isActiveSubscriptionId(subId),
- true /*availableSubInfo*/,
mSubscriptionManager.getActiveDataSubscriptionId() == subId);
}
}
- private void insertUiccInfo(int subId, TelephonyManager telephonyManager) {
- UiccInfoEntity uiccInfoEntity = convertToUiccInfoEntity(subId, telephonyManager);
+ private void insertUiccInfo(int subId) {
+ UiccInfoEntity uiccInfoEntity = convertToUiccInfoEntity(subId);
if (DEBUG) {
Log.d(TAG, "uiccInfoEntity = " + uiccInfoEntity);
}
@@ -587,20 +489,13 @@
}
}
- private void insertMobileNetworkInfo(Context context, int subId,
- TelephonyManager telephonyManager) {
- MobileNetworkInfoEntity mobileNetworkInfoEntity = convertToMobileNetworkInfoEntity(context,
- subId, telephonyManager);
-
+ private void insertMobileNetworkInfo(int subId, TelephonyManager telephonyManager) {
+ MobileNetworkInfoEntity mobileNetworkInfoEntity =
+ convertToMobileNetworkInfoEntity(subId, telephonyManager);
Log.d(TAG, "insertMobileNetworkInfo, mobileNetworkInfoEntity = "
+ mobileNetworkInfoEntity);
-
- if (mobileNetworkInfoEntity == null) {
- return;
- }
-
if (!sCacheMobileNetworkInfoEntityMap.containsKey(subId)
|| !sCacheMobileNetworkInfoEntityMap.get(subId).equals(mobileNetworkInfoEntity)) {
sCacheMobileNetworkInfoEntityMap.put(subId, mobileNetworkInfoEntity);
@@ -610,53 +505,22 @@
}
}
- private MobileNetworkInfoEntity convertToMobileNetworkInfoEntity(Context context, int subId,
+ private MobileNetworkInfoEntity convertToMobileNetworkInfoEntity(int subId,
TelephonyManager telephonyManager) {
boolean isDataEnabled = false;
- boolean isDataRoamingEnabled = false;
if (telephonyManager != null) {
isDataEnabled = telephonyManager.isDataEnabled();
- isDataRoamingEnabled = telephonyManager.isDataRoamingEnabled();
} else {
Log.d(TAG, "TelephonyManager is null, subId = " + subId);
}
- return new MobileNetworkInfoEntity(String.valueOf(subId),
- MobileNetworkUtils.isContactDiscoveryEnabled(context, subId),
- MobileNetworkUtils.isContactDiscoveryVisible(context, subId),
- isDataEnabled,
- MobileNetworkUtils.isCdmaOptions(context, subId),
- MobileNetworkUtils.isGsmOptions(context, subId),
- MobileNetworkUtils.isWorldMode(context, subId),
- MobileNetworkUtils.shouldDisplayNetworkSelectOptions(context, subId),
- MobileNetworkUtils.isTdscdmaSupported(context, subId),
- MobileNetworkUtils.activeNetworkIsCellular(context),
- SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager),
- isDataRoamingEnabled
+ return new MobileNetworkInfoEntity(String.valueOf(subId), isDataEnabled,
+ SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)
);
}
- private UiccInfoEntity convertToUiccInfoEntity(int subId, TelephonyManager telephonyManager) {
- return new UiccInfoEntity(String.valueOf(subId), String.valueOf(mPhysicalSlotIndex),
- mLogicalSlotIndex, mCardId, mIsEuicc,
- isMultipleEnabledProfilesSupported(telephonyManager), mCardState, mIsRemovable,
- mIsActive, mPortIndex
- );
- }
-
- private boolean isMultipleEnabledProfilesSupported(TelephonyManager telephonyManager) {
- if (telephonyManager == null) {
- Log.d(TAG, "TelephonyManager is null");
- return false;
- }
-
- List<UiccCardInfo> cardInfos = telephonyManager.getUiccCardsInfo();
- if (cardInfos == null) {
- Log.d(TAG, "UICC card info list is empty.");
- return false;
- }
- return cardInfos.stream().anyMatch(
- cardInfo -> cardInfo.isMultipleEnabledProfilesSupported());
+ private UiccInfoEntity convertToUiccInfoEntity(int subId) {
+ return new UiccInfoEntity(String.valueOf(subId), mIsActive);
}
@Override
@@ -741,7 +605,6 @@
}
private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
- TelephonyCallback.CallStateListener,
TelephonyCallback.UserMobileDataStateListener {
private int mSubId;
@@ -751,18 +614,10 @@
}
@Override
- public void onCallStateChanged(int state) {
- for (MobileNetworkCallback callback : sCallbacks) {
- callback.onCallStateChanged(state);
- }
- }
-
- @Override
public void onUserMobileDataStateChanged(boolean enabled) {
Log.d(TAG, "onUserMobileDataStateChanged enabled " + enabled + " on SUB " + mSubId);
sExecutor.execute(() -> {
- insertMobileNetworkInfo(mContext, mSubId,
- getTelephonyManagerBySubId(mContext, mSubId));
+ insertMobileNetworkInfo(mSubId, getTelephonyManagerBySubId(mContext, mSubId));
});
}
}
@@ -787,15 +642,6 @@
default void onAirplaneModeChanged(boolean enabled) {
}
-
- /**
- * Notify clients data roaming changed of subscription.
- */
- default void onDataRoamingChanged(int subId, boolean enabled) {
- }
-
- default void onCallStateChanged(int state) {
- }
}
public void dump(IndentingPrintWriter printwriter) {
@@ -803,8 +649,6 @@
printwriter.increaseIndent();
printwriter.println(" availableSubInfoEntityList= " + mAvailableSubInfoEntityList);
printwriter.println(" activeSubInfoEntityList=" + mActiveSubInfoEntityList);
- printwriter.println(" mobileNetworkInfoEntityList= " + mMobileNetworkInfoEntityList);
- printwriter.println(" uiccInfoEntityList= " + mUiccInfoEntityList);
printwriter.println(" CacheSubscriptionInfoEntityMap= " + sCacheSubscriptionInfoEntityMap);
printwriter.println(" SubscriptionInfoMap= " + mSubscriptionInfoMap);
printwriter.flush();
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index a4193f8..0fcfcb5 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -36,6 +36,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.EventLog;
@@ -370,7 +371,7 @@
mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
mDataUsagePreference.setTemplate(new NetworkTemplate.Builder(NetworkTemplate.MATCH_WIFI)
- .build(), 0 /*subId*/);
+ .build(), SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mResetInternetPreference = findPreference(PREF_KEY_RESET_INTERNET);
if (mResetInternetPreference != null) {
mResetInternetPreference.setVisible(false);
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index 686990b..c60594d 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -264,7 +264,8 @@
}
String summary = networkTypeDescription;
if (isDataSimActive()) {
- summary = mContext.getString(R.string.preference_summary_default_combination,
+ summary = mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.mobile_data_connection_active),
networkTypeDescription);
}
diff --git a/src/com/android/settings/network/ResetNetworkOperationBuilder.java b/src/com/android/settings/network/ResetNetworkOperationBuilder.java
index 6f36074..dfcca52 100644
--- a/src/com/android/settings/network/ResetNetworkOperationBuilder.java
+++ b/src/com/android/settings/network/ResetNetworkOperationBuilder.java
@@ -18,6 +18,7 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothManager;
+import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -28,11 +29,14 @@
import android.net.wifi.p2p.WifiP2pManager;
import android.os.Looper;
import android.os.RecoverySystem;
+import android.os.RemoteException;
import android.os.SystemClock;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.ResetNetworkRequest;
@@ -61,6 +65,8 @@
private Context mContext;
private List<Runnable> mResetSequence = new ArrayList<Runnable>();
+ @Nullable
+ private Consumer<Boolean> mResetEsimResultCallback = null;
/**
* Constructor of builder.
@@ -125,31 +131,32 @@
}
/**
- * Append a step of resetting E-SIM.
- * @param callerPackage package name of caller
+ * Append a result callback of resetting E-SIM.
+ * @param resultCallback a callback dealing with result of resetting eSIM
* @return this
*/
- public ResetNetworkOperationBuilder resetEsim(String callerPackage) {
- resetEsim(callerPackage, null);
+ public ResetNetworkOperationBuilder resetEsimResultCallback(Consumer<Boolean> resultCallback) {
+ mResetEsimResultCallback = resultCallback;
return this;
}
/**
* Append a step of resetting E-SIM.
* @param callerPackage package name of caller
- * @param resultCallback a Consumer<Boolean> dealing with result of resetting eSIM
* @return this
*/
- public ResetNetworkOperationBuilder resetEsim(String callerPackage,
- Consumer<Boolean> resultCallback) {
+ public ResetNetworkOperationBuilder resetEsim(String callerPackage) {
Runnable runnable = () -> {
long startTime = SystemClock.elapsedRealtime();
- if (!DRY_RUN) {
- Boolean wipped = RecoverySystem.wipeEuiccData(mContext, callerPackage);
- if (resultCallback != null) {
- resultCallback.accept(wipped);
- }
+ boolean wipped;
+ if (DRY_RUN) {
+ wipped = true;
+ } else {
+ wipped = RecoverySystem.wipeEuiccData(mContext, callerPackage);
+ }
+ if (mResetEsimResultCallback != null) {
+ mResetEsimResultCallback.accept(wipped);
}
long endTime = SystemClock.elapsedRealtime();
@@ -257,15 +264,15 @@
*/
public ResetNetworkOperationBuilder restartPhoneProcess() {
Runnable runnable = () -> {
- try {
- mContext.getContentResolver().call(
- getResetTelephonyContentProviderAuthority(),
- METHOD_RESTART_PHONE_PROCESS,
- /* arg= */ null,
- /* extras= */ null);
- Log.i(TAG, "Phone process was restarted.");
- } catch (IllegalArgumentException iae) {
- Log.w(TAG, "Fail to restart phone process: " + iae);
+ // Unstable content provider can avoid us getting killed together with phone process
+ try (ContentProviderClient client = getUnstableTelephonyContentProviderClient()) {
+ if (client != null) {
+ client.call(METHOD_RESTART_PHONE_PROCESS, /* arg= */ null, /* extra= */ null);
+ Log.i(TAG, "Phone process was restarted.");
+ }
+ } catch (RemoteException re) {
+ // It's normal to throw RE since phone process immediately dies
+ Log.i(TAG, "Phone process has been restarted: " + re);
}
};
mResetSequence.add(runnable);
@@ -279,15 +286,13 @@
*/
public ResetNetworkOperationBuilder restartRild() {
Runnable runnable = () -> {
- try {
- mContext.getContentResolver().call(
- getResetTelephonyContentProviderAuthority(),
- METHOD_RESTART_RILD,
- /* arg= */ null,
- /* extras= */ null);
- Log.i(TAG, "RILD was restarted.");
- } catch (IllegalArgumentException iae) {
- Log.w(TAG, "Fail to restart RILD: " + iae);
+ try (ContentProviderClient client = getUnstableTelephonyContentProviderClient()) {
+ if (client != null) {
+ client.call(METHOD_RESTART_RILD, /* arg= */ null, /* extra= */ null);
+ Log.i(TAG, "RILD was restarted.");
+ }
+ } catch (RemoteException re) {
+ Log.w(TAG, "Fail to restart RILD: " + re);
}
};
mResetSequence.add(runnable);
@@ -322,9 +327,18 @@
* @return the authority of the telephony content provider that support methods
* resetPhoneProcess and resetRild.
*/
- @VisibleForTesting
- String getResetTelephonyContentProviderAuthority() {
+ private String getResetTelephonyContentProviderAuthority() {
return mContext.getResources().getString(
R.string.reset_telephony_stack_content_provider_authority);
}
+
+ /**
+ * @return the unstable content provider to avoid us getting killed with phone process
+ */
+ @Nullable
+ @VisibleForTesting
+ public ContentProviderClient getUnstableTelephonyContentProviderClient() {
+ return mContext.getContentResolver().acquireUnstableContentProviderClient(
+ getResetTelephonyContentProviderAuthority());
+ }
}
diff --git a/src/com/android/settings/network/SimOnboardingService.kt b/src/com/android/settings/network/SimOnboardingService.kt
index f6c6065..59dc35e 100644
--- a/src/com/android/settings/network/SimOnboardingService.kt
+++ b/src/com/android/settings/network/SimOnboardingService.kt
@@ -27,9 +27,8 @@
import android.telephony.UiccSlotInfo
import android.util.Log
import com.android.settings.network.SimOnboardingActivity.Companion.CallbackType
-import com.android.settings.network.telephony.TelephonyRepository
+import com.android.settings.network.telephony.MobileDataRepository
import com.android.settings.sim.SimActivationNotifier
-import com.android.settings.spa.network.setAutomaticData
import com.android.settings.spa.network.setDefaultData
import com.android.settings.spa.network.setDefaultSms
import com.android.settings.spa.network.setDefaultVoice
@@ -238,6 +237,7 @@
fun addItemForRenaming(subInfo: SubscriptionInfo, newName: String) {
if (subInfo.displayName == newName) {
+ renameMutableMap.remove(subInfo.subscriptionId)
return
}
renameMutableMap[subInfo.subscriptionId] = newName
@@ -366,7 +366,7 @@
wifiPickerTrackerHelper,
targetPrimarySimMobileData
)
- TelephonyRepository(context).setAutomaticData(
+ MobileDataRepository(context).setAutoDataSwitch(
targetNonDds,
targetPrimarySimAutoDataSwitch.value
)
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index d9a6464..b7ed31e 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -301,7 +301,8 @@
return connectionState;
} else {
result = mContext.getString(
- R.string.preference_summary_default_combination, connectionState, result);
+ com.android.settingslib.R.string.preference_summary_default_combination,
+ connectionState, result);
}
} else if (!isDataInService) {
return mContext.getString(R.string.mobile_data_no_connection);
diff --git a/src/com/android/settings/network/apn/ApnEditCarrierEnabled.kt b/src/com/android/settings/network/apn/ApnEditCarrierEnabled.kt
new file mode 100644
index 0000000..bd58da8
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnEditCarrierEnabled.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.network.apn
+
+import android.provider.Telephony
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.booleanResource
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settingslib.spa.widget.preference.SwitchPreference
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+
+@Composable
+fun ApnEditCarrierEnabled(apnData: ApnData, onCarrierEnabledChanged: (Boolean) -> Unit) {
+ SwitchPreference(
+ object : SwitchPreferenceModel {
+ override val title = stringResource(R.string.carrier_enabled)
+ val allowEdit = booleanResource(R.bool.config_allow_edit_carrier_enabled)
+ override val changeable = {
+ allowEdit && apnData.isFieldEnabled(Telephony.Carriers.CARRIER_ENABLED)
+ }
+ override val checked = { apnData.carrierEnabled }
+ override val onCheckedChange = onCarrierEnabledChanged
+ }
+ )
+}
diff --git a/src/com/android/settings/network/apn/ApnEditPageProvider.kt b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
index 099e2fa..5442082 100644
--- a/src/com/android/settings/network/apn/ApnEditPageProvider.kt
+++ b/src/com/android/settings/network/apn/ApnEditPageProvider.kt
@@ -235,19 +235,7 @@
enabled = apnData.isFieldEnabled(Telephony.Carriers.ROAMING_PROTOCOL),
) { apnData = apnData.copy(apnRoaming = it) }
ApnNetworkTypeCheckBox(apnData) { apnData = apnData.copy(networkType = it) }
- SwitchPreference(
- object : SwitchPreferenceModel {
- override val title = stringResource(R.string.carrier_enabled)
- override val changeable = {
- apnData.apnEnableEnabled &&
- apnData.isFieldEnabled(Telephony.Carriers.CARRIER_ENABLED)
- }
- override val checked = { apnData.apnEnable }
- override val onCheckedChange = { newChecked: Boolean ->
- apnData = apnData.copy(apnEnable = newChecked)
- }
- }
- )
+ ApnEditCarrierEnabled(apnData) { apnData = apnData.copy(carrierEnabled = it) }
}
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/network/apn/ApnPreference.java b/src/com/android/settings/network/apn/ApnPreference.java
index 879fcb6..55258c1 100644
--- a/src/com/android/settings/network/apn/ApnPreference.java
+++ b/src/com/android/settings/network/apn/ApnPreference.java
@@ -85,10 +85,11 @@
final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout);
textArea.setOnClickListener(this);
+ final View radioButtonFrame = view.itemView.requireViewById(R.id.apn_radio_button_frame);
final RadioButton rb = view.itemView.requireViewById(R.id.apn_radiobutton);
mRadioButton = rb;
if (mDefaultSelectable) {
- view.itemView.requireViewById(R.id.apn_radio_button_frame).setOnClickListener((v) -> {
+ radioButtonFrame.setOnClickListener((v) -> {
rb.performClick();
});
rb.setOnCheckedChangeListener(this);
@@ -96,9 +97,9 @@
mProtectFromCheckedChange = true;
rb.setChecked(mIsChecked);
mProtectFromCheckedChange = false;
- rb.setVisibility(View.VISIBLE);
+ radioButtonFrame.setVisibility(View.VISIBLE);
} else {
- rb.setVisibility(View.GONE);
+ radioButtonFrame.setVisibility(View.GONE);
}
}
diff --git a/src/com/android/settings/network/apn/ApnRepository.kt b/src/com/android/settings/network/apn/ApnRepository.kt
index 2d41976..8433715 100644
--- a/src/com/android/settings/network/apn/ApnRepository.kt
+++ b/src/com/android/settings/network/apn/ApnRepository.kt
@@ -90,7 +90,7 @@
apnRoaming = context.convertProtocol2Options(
cursor.getString(Telephony.Carriers.ROAMING_PROTOCOL)
),
- apnEnable = cursor.getInt(Telephony.Carriers.CARRIER_ENABLED) == 1,
+ carrierEnabled = cursor.getInt(Telephony.Carriers.CARRIER_ENABLED) == 1,
networkType = cursor.getLong(Telephony.Carriers.NETWORK_TYPE_BITMASK),
edited = cursor.getInt(Telephony.Carriers.EDITED_STATUS),
userEditable = cursor.getInt(Telephony.Carriers.USER_EDITABLE),
diff --git a/src/com/android/settings/network/apn/ApnStatus.kt b/src/com/android/settings/network/apn/ApnStatus.kt
index dc50452..6492d39 100644
--- a/src/com/android/settings/network/apn/ApnStatus.kt
+++ b/src/com/android/settings/network/apn/ApnStatus.kt
@@ -44,11 +44,10 @@
val apnType: String = "",
val apnProtocol: Int = -1,
val apnRoaming: Int = -1,
- val apnEnable: Boolean = true,
+ val carrierEnabled: Boolean = true,
val networkType: Long = 0,
val edited: Int = Telephony.Carriers.USER_EDITED,
val userEditable: Int = 1,
- val apnEnableEnabled: Boolean = true,
val newApn: Boolean = false,
val subId: Int = -1,
val validEnabled: Boolean = false,
@@ -72,7 +71,7 @@
Telephony.Carriers.NETWORK_TYPE_BITMASK to networkType,
// Copy network type into lingering network type.
Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK to networkType,
- Telephony.Carriers.CARRIER_ENABLED to apnEnable,
+ Telephony.Carriers.CARRIER_ENABLED to carrierEnabled,
Telephony.Carriers.EDITED_STATUS to Telephony.Carriers.USER_EDITED,
)
@@ -134,10 +133,6 @@
)
}
- apnDataInit = apnDataInit.copy(
- apnEnableEnabled =
- context.resources.getBoolean(R.bool.config_allow_edit_carrier_enabled)
- )
// TODO: mIsCarrierIdApn
return disableInit(apnDataInit)
}
diff --git a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
index fcbfdef..6d6e41f 100644
--- a/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
+++ b/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
@@ -38,7 +38,6 @@
import com.android.settings.flags.Flags;
import com.android.settings.network.MobileDataContentObserver;
import com.android.settings.network.SubscriptionsChangeListener;
-import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel;
/**
* Controls whether switch mobile data to the non-default SIM if the non-default SIM has better
@@ -63,8 +62,6 @@
@Nullable
private MobileDataContentObserver mMobileDataContentObserver;
@Nullable
- private CrossSimCallingViewModel mCrossSimCallingViewModel;
- @Nullable
private PreferenceScreen mScreen;
public AutoDataSwitchPreferenceController(
@@ -72,10 +69,9 @@
super(context, preferenceKey);
}
- void init(int subId, @Nullable CrossSimCallingViewModel crossSimCallingViewModel) {
+ void init(int subId) {
this.mSubId = subId;
mManager = mContext.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
- mCrossSimCallingViewModel = crossSimCallingViewModel;
}
@OnLifecycleEvent(ON_RESUME)
@@ -122,9 +118,6 @@
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
isChecked);
}
- if (mCrossSimCallingViewModel != null) {
- mCrossSimCallingViewModel.updateCrossSimCalling();
- }
return true;
}
diff --git a/src/com/android/settings/network/telephony/CallStateRepository.kt b/src/com/android/settings/network/telephony/CallStateRepository.kt
index 4b6cdc8..e5a21bf 100644
--- a/src/com/android/settings/network/telephony/CallStateRepository.kt
+++ b/src/com/android/settings/network/telephony/CallStateRepository.kt
@@ -25,14 +25,17 @@
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.onEach
@OptIn(ExperimentalCoroutinesApi::class)
-class CallStateRepository(private val context: Context) {
- private val subscriptionManager = context.requireSubscriptionManager()
+class CallStateRepository(
+ private val context: Context,
+ private val subscriptionRepository: SubscriptionRepository = SubscriptionRepository(context),
+) {
/** Flow for call state of given [subId]. */
fun callStateFlow(subId: Int): Flow<Int> = context.telephonyCallbackFlow(subId) {
@@ -48,9 +51,8 @@
*
* @return true if any active subscription's call state is not idle.
*/
- fun isInCallFlow(): Flow<Boolean> = context.subscriptionsChangedFlow()
- .flatMapLatest {
- val subIds = subscriptionManager.activeSubscriptionIdList
+ fun isInCallFlow(): Flow<Boolean> = subscriptionRepository.activeSubscriptionIdListFlow()
+ .flatMapLatest { subIds ->
if (subIds.isEmpty()) {
flowOf(false)
} else {
@@ -59,9 +61,10 @@
}
}
}
+ .distinctUntilChanged()
.conflate()
- .flowOn(Dispatchers.Default)
.onEach { Log.d(TAG, "isInCallFlow: $it") }
+ .flowOn(Dispatchers.Default)
private companion object {
private const val TAG = "CallStateRepository"
diff --git a/src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt b/src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt
index 05b4c07..5408ab0 100644
--- a/src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt
+++ b/src/com/android/settings/network/telephony/CarrierConfigManagerExt.kt
@@ -24,6 +24,7 @@
/**
* Gets the configuration values of the specified config keys applied.
*/
+@Deprecated("Use CarrierConfigRepository instead")
fun CarrierConfigManager.safeGetConfig(
keys: List<String>,
subId: Int = SubscriptionManager.getDefaultSubscriptionId(),
diff --git a/src/com/android/settings/network/telephony/CarrierConfigRepository.kt b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
new file mode 100644
index 0000000..3ec529d
--- /dev/null
+++ b/src/com/android/settings/network/telephony/CarrierConfigRepository.kt
@@ -0,0 +1,217 @@
+/*
+ * 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 android.content.Context
+import android.os.PersistableBundle
+import android.telephony.CarrierConfigManager
+import android.telephony.SubscriptionManager
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.asExecutor
+
+class CarrierConfigRepository(private val context: Context) {
+
+ private val carrierConfigManager: CarrierConfigManager? =
+ context.getSystemService(CarrierConfigManager::class.java)
+
+ private enum class KeyType {
+ BOOLEAN,
+ INT,
+ STRING
+ }
+
+ interface CarrierConfigAccessor {
+ fun getBoolean(key: String): Boolean
+
+ fun getInt(key: String): Int
+
+ fun getString(key: String): String?
+ }
+
+ private class Accessor(private val cache: ConfigCache) : CarrierConfigAccessor {
+ private val keysToRetrieve = mutableMapOf<String, KeyType>()
+
+ override fun getBoolean(key: String): Boolean {
+ check(key.endsWith("_bool")) { "Boolean key should ends with _bool" }
+ val value = cache[key]
+ return if (value == null) {
+ keysToRetrieve += key to KeyType.BOOLEAN
+ DefaultConfig.getBoolean(key)
+ } else {
+ check(value is BooleanConfigValue) { "Boolean value type wrong" }
+ value.value
+ }
+ }
+
+ override fun getInt(key: String): Int {
+ check(key.endsWith("_int")) { "Int key should ends with _int" }
+ val value = cache[key]
+ return if (value == null) {
+ keysToRetrieve += key to KeyType.INT
+ DefaultConfig.getInt(key)
+ } else {
+ check(value is IntConfigValue) { "Int value type wrong" }
+ value.value
+ }
+ }
+
+ override fun getString(key: String): String? {
+ check(key.endsWith("_string")) { "String key should ends with _string" }
+ val value = cache[key]
+ return if (value == null) {
+ keysToRetrieve += key to KeyType.STRING
+ DefaultConfig.getString(key)
+ } else {
+ check(value is StringConfigValue) { "String value type wrong" }
+ value.value
+ }
+ }
+
+ fun getKeysToRetrieve(): Map<String, KeyType> = keysToRetrieve
+ }
+
+ /**
+ * Gets the configuration values for the given [subId].
+ *
+ * Configuration values could be accessed in [block]. Note: [block] could be called multiple
+ * times, so it should be pure function without side effort.
+ */
+ fun <T> transformConfig(subId: Int, block: CarrierConfigAccessor.() -> T): T {
+ val perSubCache = getPerSubCache(subId)
+ val accessor = Accessor(perSubCache)
+ val result = accessor.block()
+ val keysToRetrieve = accessor.getKeysToRetrieve()
+ // If all keys found in the first pass, no need to collect again
+ if (keysToRetrieve.isEmpty()) return result
+
+ perSubCache.update(subId, keysToRetrieve)
+
+ return accessor.block()
+ }
+
+ /** Gets the configuration boolean for the given [subId] and [key]. */
+ fun getBoolean(subId: Int, key: String): Boolean = transformConfig(subId) { getBoolean(key) }
+
+ /** Gets the configuration int for the given [subId] and [key]. */
+ fun getInt(subId: Int, key: String): Int = transformConfig(subId) { getInt(key) }
+
+ /** Gets the configuration string for the given [subId] and [key]. */
+ fun getString(subId: Int, key: String): String? = transformConfig(subId) { getString(key) }
+
+ private fun ConfigCache.update(subId: Int, keysToRetrieve: Map<String, KeyType>) {
+ val config = safeGetConfig(subId, keysToRetrieve.keys) ?: return
+ for ((key, type) in keysToRetrieve) {
+ when (type) {
+ KeyType.BOOLEAN -> this[key] = BooleanConfigValue(config.getBoolean(key))
+ KeyType.INT -> this[key] = IntConfigValue(config.getInt(key))
+ KeyType.STRING -> this[key] = StringConfigValue(config.getString(key))
+ }
+ }
+ }
+
+ /** Gets the configuration values of the specified config keys applied. */
+ private fun safeGetConfig(subId: Int, keys: Collection<String>): PersistableBundle? {
+ if (carrierConfigManager == null || !SubscriptionManager.isValidSubscriptionId(subId)) {
+ return null
+ }
+ tryRegisterListener(context)
+ return try {
+ carrierConfigManager.getConfigForSubId(subId, *keys.toTypedArray())
+ } catch (e: Exception) {
+ Log.e(TAG, "safeGetConfig: exception", e)
+ // The CarrierConfigLoader (the service implemented the CarrierConfigManager) hasn't
+ // been initialized yet. This may occurs during very early phase of phone booting up
+ // or when Phone process has been restarted.
+ // Settings should not assume Carrier config loader (and any other system services
+ // as well) are always available. If not available, use default value instead.
+ null
+ }
+ }
+
+ companion object {
+ private const val TAG = "CarrierConfigRepository"
+
+ private val DefaultConfig = CarrierConfigManager.getDefaultConfig()
+
+ /** Cache of config values for each subscription. */
+ private val Cache = ConcurrentHashMap<Int, ConfigCache>()
+
+ private fun getPerSubCache(subId: Int) =
+ Cache.computeIfAbsent(subId) { ConcurrentHashMap() }
+
+ /** To make sure the registerCarrierConfigChangeListener is only called once. */
+ private val ListenerRegistered = atomic(false)
+
+ private fun tryRegisterListener(context: Context) {
+ if (ListenerRegistered.compareAndSet(expect = false, update = true)) {
+ val carrierConfigManager =
+ context.applicationContext.getSystemService(CarrierConfigManager::class.java)
+ if (carrierConfigManager != null) {
+ carrierConfigManager.registerCarrierConfigChangeListener()
+ } else {
+ ListenerRegistered.getAndSet(false)
+ }
+ }
+ }
+
+ private fun CarrierConfigManager.registerCarrierConfigChangeListener() {
+ val executor = Dispatchers.Default.asExecutor()
+ registerCarrierConfigChangeListener(executor) { _, subId, _, _ ->
+ Log.d(TAG, "[$subId] onCarrierConfigChanged")
+ Cache.remove(subId)
+ }
+ }
+
+ @VisibleForTesting
+ fun resetForTest() {
+ Cache.clear()
+ ListenerRegistered.getAndSet(false)
+ }
+
+ @VisibleForTesting
+ fun setBooleanForTest(subId: Int, key: String, value: Boolean) {
+ check(key.endsWith("_bool")) { "Boolean key should ends with _bool" }
+ getPerSubCache(subId)[key] = BooleanConfigValue(value)
+ }
+
+ @VisibleForTesting
+ fun setIntForTest(subId: Int, key: String, value: Int) {
+ check(key.endsWith("_int")) { "Int key should ends with _int" }
+ getPerSubCache(subId)[key] = IntConfigValue(value)
+ }
+
+ @VisibleForTesting
+ fun setStringForTest(subId: Int, key: String, value: String) {
+ check(key.endsWith("_string")) { "String key should ends with _string" }
+ getPerSubCache(subId)[key] = StringConfigValue(value)
+ }
+ }
+}
+
+private sealed interface ConfigValue
+
+private data class BooleanConfigValue(val value: Boolean) : ConfigValue
+
+private data class IntConfigValue(val value: Int) : ConfigValue
+
+private data class StringConfigValue(val value: String?) : ConfigValue
+
+private typealias ConfigCache = ConcurrentHashMap<String, ConfigValue>
diff --git a/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java b/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
index 3e37352..20385b9 100644
--- a/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
+++ b/src/com/android/settings/network/telephony/CellularSecuritySettingsFragment.java
@@ -20,13 +20,10 @@
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
/**
* Cellular Security features (insecure network notifications, network security controls, etc)
*/
-@SearchIndexable
public class CellularSecuritySettingsFragment extends DashboardFragment {
private static final String TAG = "CellularSecuritySettingsFragment";
@@ -53,7 +50,4 @@
super.onCreatePreferences(bundle, rootKey);
setPreferencesFromResource(R.xml.cellular_security, rootKey);
}
-
- public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.cellular_security);
}
diff --git a/src/com/android/settings/network/telephony/DataSubscriptionRepository.kt b/src/com/android/settings/network/telephony/DataSubscriptionRepository.kt
index 99f639b..829c4c0 100644
--- a/src/com/android/settings/network/telephony/DataSubscriptionRepository.kt
+++ b/src/com/android/settings/network/telephony/DataSubscriptionRepository.kt
@@ -33,6 +33,7 @@
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.onStart
class DataSubscriptionRepository(
@@ -51,46 +52,42 @@
)
.map { it.getIntExtra(SUBSCRIPTION_KEY, SubscriptionManager.INVALID_SUBSCRIPTION_ID) }
.onStart { emit(SubscriptionManager.getDefaultDataSubscriptionId()) }
+ .distinctUntilChanged()
.conflate()
+ .onEach { Log.d(TAG, "defaultDataSubscriptionIdFlow: $it") }
.flowOn(Dispatchers.Default)
fun activeDataSubscriptionIdFlow(): Flow<Int> =
- telephonyManager.telephonyCallbackFlow {
- object : TelephonyCallback(), TelephonyCallback.ActiveDataSubscriptionIdListener {
- override fun onActiveDataSubscriptionIdChanged(subId: Int) {
- trySend(subId)
- Log.d(TAG, "activeDataSubscriptionIdFlow: $subId")
+ telephonyManager
+ .telephonyCallbackFlow {
+ object : TelephonyCallback(), TelephonyCallback.ActiveDataSubscriptionIdListener {
+ override fun onActiveDataSubscriptionIdChanged(subId: Int) {
+ trySend(subId)
+ Log.d(TAG, "activeDataSubscriptionIdFlow: $subId")
+ }
}
}
- }
+ .distinctUntilChanged()
fun dataSummaryFlow(): Flow<String> =
combine(defaultDataSubscriptionIdFlow(), activeDataSubscriptionIdFlow()) {
- defaultSubId,
- activeSubId ->
- DataSubscriptionIds(defaultSubId, activeSubId)
+ defaultDataSubId,
+ activeDataSubId ->
+ getDataSummary(defaultDataSubId, activeDataSubId)
}
- .distinctUntilChanged()
- .map { it.getDataSummary() }
.conflate()
.flowOn(Dispatchers.Default)
- private data class DataSubscriptionIds(
- val defaultSubId: Int,
- val activeSubId: Int,
- )
-
- private fun DataSubscriptionIds.getDataSummary(): String {
- val activeSubInfo = subscriptionManager.getActiveSubscriptionInfo(activeSubId) ?: return ""
+ private fun getDataSummary(defaultDataSubId: Int, activeDataSubId: Int): String {
+ if (defaultDataSubId == activeDataSubId) return getDisplayName(defaultDataSubId)
+ val activeSubInfo =
+ subscriptionManager.getActiveSubscriptionInfo(activeDataSubId)
+ ?: return getDisplayName(defaultDataSubId)
if (!SubscriptionUtil.isSubscriptionVisible(subscriptionManager, context, activeSubInfo)) {
- return getDisplayName(defaultSubId)
+ return getDisplayName(defaultDataSubId)
}
- val uniqueName = getDisplayName(activeSubId)
- return if (activeSubId == defaultSubId) {
- uniqueName
- } else {
- context.getString(R.string.mobile_data_temp_using, uniqueName)
- }
+ // non-DDS is active
+ return context.getString(R.string.mobile_data_temp_using, getDisplayName(activeDataSubId))
}
companion object {
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
index e14d5f8..445597f 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.kt
@@ -22,7 +22,6 @@
import android.telephony.data.ApnSetting
import androidx.lifecycle.LifecycleOwner
import androidx.preference.PreferenceScreen
-import com.android.settings.network.mobileDataEnabledFlow
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import kotlinx.coroutines.flow.combine
@@ -71,7 +70,7 @@
override fun onViewCreated(viewLifecycleOwner: LifecycleOwner) {
combine(
- mContext.mobileDataEnabledFlow(mSubId),
+ MobileDataRepository(mContext).mobileDataEnabledChangedFlow(mSubId),
mContext.subscriptionsChangedFlow(), // Capture isMobileDataPolicyEnabled() changes
) { _, _ -> }.collectLatestWithLifecycle(viewLifecycleOwner) {
preferenceScreen?.let { super.displayPreference(it) }
diff --git a/src/com/android/settings/network/telephony/MobileDataRepository.kt b/src/com/android/settings/network/telephony/MobileDataRepository.kt
new file mode 100644
index 0000000..5a0dff7
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileDataRepository.kt
@@ -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.network.telephony
+
+import android.content.Context
+import android.provider.Settings
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import android.telephony.TelephonyManager.MobileDataPolicy
+import android.util.Log
+import com.android.settings.wifi.WifiPickerTrackerHelper
+import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalChangeFlow
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.onEach
+
+class MobileDataRepository(
+ private val context: Context,
+ private val subscriptionsChangedFlow: Flow<Unit> = context.subscriptionsChangedFlow(),
+) {
+ fun isMobileDataPolicyEnabledFlow(subId: Int, @MobileDataPolicy policy: Int): Flow<Boolean> {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
+ val telephonyManager = context.telephonyManager(subId)
+ return subscriptionsChangedFlow
+ .map { telephonyManager.isMobileDataPolicyEnabled(policy) }
+ .distinctUntilChanged()
+ .conflate()
+ .onEach { Log.d(TAG, "[$subId] isMobileDataPolicyEnabled($policy): $it") }
+ .flowOn(Dispatchers.Default)
+ }
+
+ fun setMobileDataPolicyEnabled(subId: Int, @MobileDataPolicy policy: Int, enabled: Boolean) {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return
+ Log.d(TAG, "[$subId] setMobileDataPolicyEnabled($policy): $enabled")
+ context.telephonyManager(subId).setMobileDataPolicyEnabled(policy, enabled)
+ }
+
+ fun setAutoDataSwitch(subId: Int, newEnabled: Boolean) {
+ setMobileDataPolicyEnabled(
+ subId = subId,
+ policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
+ enabled = newEnabled,
+ )
+ }
+
+ /**
+ * Flow for mobile data enabled changed event.
+ *
+ * Note: This flow can only notify enabled status changes, cannot provide the latest status.
+ */
+ fun mobileDataEnabledChangedFlow(subId: Int, sendInitialValue: Boolean = true): Flow<Unit> =
+ mobileSettingsGlobalChangedFlow(Settings.Global.MOBILE_DATA, subId, sendInitialValue)
+
+ private fun mobileSettingsGlobalChangedFlow(
+ name: String,
+ subId: Int,
+ sendInitialValue: Boolean = true,
+ ): Flow<Unit> {
+ val flow = context.settingsGlobalChangeFlow(name, sendInitialValue)
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return flow
+ val subIdFlow =
+ context.settingsGlobalChangeFlow(name = name + subId, sendInitialValue = false)
+ return merge(flow, subIdFlow)
+ }
+
+ fun isMobileDataEnabledFlow(subId: Int): Flow<Boolean> {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
+ val telephonyManager = context.telephonyManager(subId)
+ return mobileDataEnabledChangedFlow(subId)
+ .map {
+ telephonyManager.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
+ }
+ .catch { e ->
+ Log.w(TAG, "[$subId] isMobileDataEnabledFlow: exception", e)
+ emit(false)
+ }
+ .distinctUntilChanged()
+ .conflate()
+ .onEach { Log.d(TAG, "[$subId] isMobileDataEnabledFlow: $it") }
+ .flowOn(Dispatchers.Default)
+ }
+
+ fun setMobileDataEnabled(
+ subId: Int,
+ enabled: Boolean,
+ wifiPickerTrackerHelper: WifiPickerTrackerHelper? = null,
+ ) {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return
+
+ Log.d(TAG, "setMobileDataEnabled: $enabled")
+ MobileNetworkUtils.setMobileDataEnabled(
+ context, subId, enabled, /* disableOtherSubscriptions= */ true)
+
+ if (wifiPickerTrackerHelper != null &&
+ !wifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(subId)) {
+ wifiPickerTrackerHelper.setCarrierNetworkEnabled(enabled)
+ }
+ }
+
+ /** Creates an instance of a cold Flow for whether data roaming is enabled of given [subId]. */
+ fun isDataRoamingEnabledFlow(subId: Int): Flow<Boolean> {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
+ val telephonyManager = context.telephonyManager(subId)
+ return mobileSettingsGlobalChangedFlow(Settings.Global.DATA_ROAMING, subId)
+ .map { telephonyManager.isDataRoamingEnabled }
+ .distinctUntilChanged()
+ .conflate()
+ .onEach { Log.d(TAG, "[$subId] isDataRoamingEnabledFlow: $it") }
+ .flowOn(Dispatchers.Default)
+ }
+
+ private companion object {
+ private const val TAG = "MobileDataRepository"
+ }
+}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
index 1e635a5..621465e 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
+++ b/src/com/android/settings/network/telephony/MobileNetworkEidPreferenceController.kt
@@ -91,7 +91,6 @@
)
return
}
- preference.isVisible = false
val viewModel by lazyViewModel
coroutineScope = viewLifecycleOwner.lifecycleScope
@@ -127,7 +126,6 @@
preference.title = title
preference.dialogTitle = title
preference.summary = eid
- preference.isVisible = eid.isNotEmpty()
}
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
index a6fb7ba..6b3f903 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
+++ b/src/com/android/settings/network/telephony/MobileNetworkImeiPreferenceController.kt
@@ -113,7 +113,6 @@
private fun refreshUi(){
preference.title = title
preference.summary = imei
- preference.isVisible = true
}
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 8b927a9..896eac6 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -20,11 +20,14 @@
import android.app.Activity;
import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.os.Bundle;
import android.os.UserManager;
import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -79,7 +82,6 @@
@VisibleForTesting
static final String KEY_CLICKED_PREF = "key_clicked_pref";
- private static final String KEY_ROAMING_PREF = "button_roaming_key";
private static final String KEY_CALLS_PREF = "calls_preference";
private static final String KEY_SMS_PREF = "sms_preference";
private static final String KEY_MOBILE_DATA_PREF = "mobile_data_enable";
@@ -107,6 +109,15 @@
private SubscriptionInfoEntity mSubscriptionInfoEntity;
private MobileNetworkInfoEntity mMobileNetworkInfoEntity;
+ private BroadcastReceiver mBrocastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)) {
+ redrawPreferenceControllers();
+ }
+ }
+ };
+
public MobileNetworkSettings() {
super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
}
@@ -178,8 +189,6 @@
return Arrays.asList(
new DataUsageSummaryPreferenceController(context, mSubId),
- new RoamingPreferenceController(context, KEY_ROAMING_PREF, getSettingsLifecycle(),
- this, mSubId),
new CallsDefaultSubscriptionController(context, KEY_CALLS_PREF,
getSettingsLifecycle(), this),
new SmsDefaultSubscriptionController(context, KEY_SMS_PREF, getSettingsLifecycle(),
@@ -238,9 +247,10 @@
use(CarrierSettingsVersionPreferenceController.class).init(mSubId);
use(BillingCyclePreferenceController.class).init(mSubId);
use(MmsMessagePreferenceController.class).init(mSubId);
- final var crossSimCallingViewModel =
- new ViewModelProvider(this).get(CrossSimCallingViewModel.class);
- use(AutoDataSwitchPreferenceController.class).init(mSubId, crossSimCallingViewModel);
+ // CrossSimCallingViewModel is responsible for maintaining the correct cross sim calling
+ // settings (backup calling).
+ new ViewModelProvider(this).get(CrossSimCallingViewModel.class);
+ use(AutoDataSwitchPreferenceController.class).init(mSubId);
use(DisabledSubscriptionController.class).init(mSubId);
use(DeleteSimProfilePreferenceController.class).init(mSubId);
use(DisableSimFooterPreferenceController.class).init(mSubId);
@@ -263,8 +273,7 @@
final RoamingPreferenceController roamingPreferenceController =
use(RoamingPreferenceController.class);
if (roamingPreferenceController != null) {
- roamingPreferenceController.init(getFragmentManager(), mSubId,
- mMobileNetworkInfoEntity);
+ roamingPreferenceController.init(getParentFragmentManager(), mSubId);
}
final SatelliteSettingPreferenceController satelliteSettingPreferenceController = use(
SatelliteSettingPreferenceController.class);
@@ -355,6 +364,10 @@
mMobileNetworkRepository.updateEntity();
// TODO: remove log after fixing b/182326102
Log.d(LOG_TAG, "onResume() subId=" + mSubId);
+
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
+ getContext().registerReceiver(mBrocastReceiver, intentFilter, Context.RECEIVER_EXPORTED);
}
private void onSubscriptionDetailChanged() {
@@ -374,6 +387,7 @@
@Override
public void onPause() {
mMobileNetworkRepository.removeRegister(this);
+ getContext().unregisterReceiver(mBrocastReceiver);
super.onPause();
}
diff --git a/src/com/android/settings/network/telephony/RoamingPreferenceController.java b/src/com/android/settings/network/telephony/RoamingPreferenceController.java
deleted file mode 100644
index bf02308..0000000
--- a/src/com/android/settings/network/telephony/RoamingPreferenceController.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
-import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.network.MobileNetworkRepository;
-import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Preference controller for "Roaming"
- */
-public class RoamingPreferenceController extends TelephonyTogglePreferenceController implements
- LifecycleObserver, MobileNetworkRepository.MobileNetworkCallback {
- private static final String TAG = "RoamingController";
- private static final String DIALOG_TAG = "MobileDataDialog";
-
- private RestrictedSwitchPreference mSwitchPreference;
- private TelephonyManager mTelephonyManager;
- private CarrierConfigManager mCarrierConfigManager;
- protected MobileNetworkRepository mMobileNetworkRepository;
- protected LifecycleOwner mLifecycleOwner;
- private List<MobileNetworkInfoEntity> mMobileNetworkInfoEntityList = new ArrayList<>();
-
- @VisibleForTesting
- FragmentManager mFragmentManager;
- MobileNetworkInfoEntity mMobileNetworkInfoEntity;
-
- public RoamingPreferenceController(Context context, String key, Lifecycle lifecycle,
- LifecycleOwner lifecycleOwner, int subId) {
- this(context, key);
- mSubId = subId;
- mLifecycleOwner = lifecycleOwner;
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- public RoamingPreferenceController(Context context, String key) {
- super(context, key);
- mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
- mMobileNetworkRepository = MobileNetworkRepository.getInstance(context);
- }
-
- @Override
- public int getAvailabilityStatus() {
- final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
- if (carrierConfig != null && carrierConfig.getBoolean(
- CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL)) {
- return CONDITIONALLY_UNAVAILABLE;
- }
- return AVAILABLE;
- }
-
- @OnLifecycleEvent(ON_START)
- public void onStart() {
- mMobileNetworkRepository.addRegister(mLifecycleOwner, this, mSubId);
- mMobileNetworkRepository.updateEntity();
- }
-
- @OnLifecycleEvent(ON_STOP)
- public void onStop() {
- mMobileNetworkRepository.removeRegister(this);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mSwitchPreference = screen.findPreference(getPreferenceKey());
- }
-
- @Override
- public int getAvailabilityStatus(int subId) {
- return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
- ? AVAILABLE
- : AVAILABLE_UNSEARCHABLE;
- }
-
- @Override
- public boolean setChecked(boolean isChecked) {
- if (isDialogNeeded()) {
- showDialog();
- } else {
- // Update data directly if we don't need dialog
- mTelephonyManager.setDataRoamingEnabled(isChecked);
- return true;
- }
-
- return false;
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
- mSwitchPreference = (RestrictedSwitchPreference) preference;
- update();
- }
-
- private void update() {
- if (mSwitchPreference == null) {
- return;
- }
- if (!mSwitchPreference.isDisabledByAdmin()) {
- mSwitchPreference.setEnabled(mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- mSwitchPreference.setChecked(isChecked());
- }
- }
-
- @VisibleForTesting
- boolean isDialogNeeded() {
- final boolean isRoamingEnabled = mMobileNetworkInfoEntity == null ? false
- : mMobileNetworkInfoEntity.isDataRoamingEnabled;
- final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(
- mSubId);
- // Need dialog if we need to turn on roaming and the roaming charge indication is allowed
- if (!isRoamingEnabled && (carrierConfig == null || !carrierConfig.getBoolean(
- CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL))) {
- return true;
- }
- return false;
- }
-
- @Override
- public boolean isChecked() {
- return mMobileNetworkInfoEntity == null ? false
- : mMobileNetworkInfoEntity.isDataRoamingEnabled;
- }
-
- public void init(FragmentManager fragmentManager, int subId, MobileNetworkInfoEntity entity) {
- mFragmentManager = fragmentManager;
- mSubId = subId;
- mMobileNetworkInfoEntity = entity;
- mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
- if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- return;
- }
- final TelephonyManager telephonyManager = mTelephonyManager
- .createForSubscriptionId(mSubId);
- if (telephonyManager == null) {
- Log.w(TAG, "fail to init in sub" + mSubId);
- mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- return;
- }
- mTelephonyManager = telephonyManager;
- }
-
- private void showDialog() {
- final RoamingDialogFragment dialogFragment = RoamingDialogFragment.newInstance(mSubId);
-
- dialogFragment.show(mFragmentManager, DIALOG_TAG);
- }
-
- @VisibleForTesting
- public void setMobileNetworkInfoEntity(MobileNetworkInfoEntity mobileNetworkInfoEntity) {
- mMobileNetworkInfoEntity = mobileNetworkInfoEntity;
- }
-
- @Override
- public void onAllMobileNetworkInfoChanged(
- List<MobileNetworkInfoEntity> mobileNetworkInfoEntityList) {
- mMobileNetworkInfoEntityList = mobileNetworkInfoEntityList;
- mMobileNetworkInfoEntityList.forEach(entity -> {
- if (Integer.parseInt(entity.subId) == mSubId) {
- mMobileNetworkInfoEntity = entity;
- update();
- refreshSummary(mSwitchPreference);
- return;
- }
- });
- }
-
- @Override
- public void onDataRoamingChanged(int subId, boolean enabled) {
- if (subId != mSubId) {
- Log.d(TAG, "onDataRoamingChanged - wrong subId : " + subId + " / " + enabled);
- return;
- }
- update();
- }
-}
diff --git a/src/com/android/settings/network/telephony/RoamingPreferenceController.kt b/src/com/android/settings/network/telephony/RoamingPreferenceController.kt
new file mode 100644
index 0000000..2529d41
--- /dev/null
+++ b/src/com/android/settings/network/telephony/RoamingPreferenceController.kt
@@ -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.network.telephony
+
+import android.content.Context
+import android.os.UserManager
+import android.telephony.CarrierConfigManager
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import androidx.annotation.VisibleForTesting
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.android.settings.R
+import com.android.settings.spa.preference.ComposePreferenceController
+import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
+import com.android.settingslib.spaprivileged.model.enterprise.Restrictions
+import com.android.settingslib.spaprivileged.template.preference.RestrictedSwitchPreference
+
+/** Preference controller for "Roaming" */
+class RoamingPreferenceController
+@JvmOverloads
+constructor(
+ context: Context,
+ key: String,
+ private val mobileDataRepository: MobileDataRepository = MobileDataRepository(context),
+) : ComposePreferenceController(context, key) {
+ @VisibleForTesting var fragmentManager: FragmentManager? = null
+ private var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
+
+ private var telephonyManager = context.getSystemService(TelephonyManager::class.java)!!
+ private val carrierConfigRepository = CarrierConfigRepository(context)
+
+ fun init(fragmentManager: FragmentManager, subId: Int) {
+ this.fragmentManager = fragmentManager
+ this.subId = subId
+ telephonyManager = telephonyManager.createForSubscriptionId(subId)
+ }
+
+ override fun getAvailabilityStatus(): Int {
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) return CONDITIONALLY_UNAVAILABLE
+ val isForceHomeNetwork =
+ carrierConfigRepository.getBoolean(
+ subId, CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL)
+
+ return if (isForceHomeNetwork) CONDITIONALLY_UNAVAILABLE else AVAILABLE
+ }
+
+ @Composable
+ override fun Content() {
+ val summary = stringResource(R.string.roaming_enable)
+ val isDataRoamingEnabled by
+ remember { mobileDataRepository.isDataRoamingEnabledFlow(subId) }
+ .collectAsStateWithLifecycle(null)
+ RestrictedSwitchPreference(
+ model =
+ object : SwitchPreferenceModel {
+ override val title = stringResource(R.string.roaming)
+ override val summary = { summary }
+ override val checked = { isDataRoamingEnabled }
+ override val onCheckedChange: (Boolean) -> Unit = { newChecked ->
+ if (newChecked && isDialogNeeded()) {
+ showDialog()
+ } else {
+ // Update data directly if we don't need dialog
+ telephonyManager.isDataRoamingEnabled = newChecked
+ }
+ }
+ },
+ restrictions = Restrictions(keys = listOf(UserManager.DISALLOW_DATA_ROAMING)),
+ )
+ }
+
+ @VisibleForTesting
+ fun isDialogNeeded(): Boolean {
+ // Need dialog if we need to turn on roaming and the roaming charge indication is allowed
+ return !carrierConfigRepository.getBoolean(
+ subId, CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL)
+ }
+
+ private fun showDialog() {
+ fragmentManager?.let { RoamingDialogFragment.newInstance(subId).show(it, DIALOG_TAG) }
+ }
+
+ companion object {
+ private const val DIALOG_TAG = "MobileDataDialog"
+ }
+}
diff --git a/src/com/android/settings/network/telephony/SatelliteSetting.java b/src/com/android/settings/network/telephony/SatelliteSetting.java
index 314fb3a..7e9e61d 100644
--- a/src/com/android/settings/network/telephony/SatelliteSetting.java
+++ b/src/com/android/settings/network/telephony/SatelliteSetting.java
@@ -92,6 +92,14 @@
}
mActivity = getActivity();
+
+ mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
+ if (mSatelliteManager == null) {
+ Log.d(TAG, "SatelliteManager is null, do nothing.");
+ finish();
+ return;
+ }
+
mSubId = mActivity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -104,7 +112,6 @@
}
mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
- mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
}
@Override
diff --git a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
index 153698c..9ca0294 100644
--- a/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/SatelliteSettingPreferenceController.java
@@ -64,6 +64,10 @@
return UNSUPPORTED_ON_DEVICE;
}
+ if (mSatelliteManager == null) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
diff --git a/src/com/android/settings/network/telephony/SubscriptionRepository.kt b/src/com/android/settings/network/telephony/SubscriptionRepository.kt
index 3ee8548..c952310 100644
--- a/src/com/android/settings/network/telephony/SubscriptionRepository.kt
+++ b/src/com/android/settings/network/telephony/SubscriptionRepository.kt
@@ -29,6 +29,7 @@
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filterNot
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.flowOn
@@ -68,6 +69,30 @@
}
fun canDisablePhysicalSubscription() = subscriptionManager.canDisablePhysicalSubscription()
+
+ /** Flow for subscriptions changes. */
+ fun subscriptionsChangedFlow() = callbackFlow {
+ val listener = object : SubscriptionManager.OnSubscriptionsChangedListener() {
+ override fun onSubscriptionsChanged() {
+ trySend(Unit)
+ }
+ }
+
+ subscriptionManager.addOnSubscriptionsChangedListener(
+ Dispatchers.Default.asExecutor(),
+ listener,
+ )
+
+ awaitClose { subscriptionManager.removeOnSubscriptionsChangedListener(listener) }
+ }.conflate().onEach { Log.d(TAG, "subscriptions changed") }.flowOn(Dispatchers.Default)
+
+ /** Flow of active subscription ids. */
+ fun activeSubscriptionIdListFlow(): Flow<List<Int>> = context.subscriptionsChangedFlow()
+ .map { subscriptionManager.activeSubscriptionIdList.sorted() }
+ .distinctUntilChanged()
+ .conflate()
+ .onEach { Log.d(TAG, "activeSubscriptionIdList: $it") }
+ .flowOn(Dispatchers.Default)
}
val Context.subscriptionManager: SubscriptionManager?
@@ -79,22 +104,8 @@
SubscriptionUtil.getBidiFormattedPhoneNumber(this, subscriptionInfo)
}.filterNot { it.isNullOrEmpty() }.flowOn(Dispatchers.Default)
-fun Context.subscriptionsChangedFlow() = callbackFlow {
- val subscriptionManager = requireSubscriptionManager()
-
- val listener = object : SubscriptionManager.OnSubscriptionsChangedListener() {
- override fun onSubscriptionsChanged() {
- trySend(Unit)
- }
- }
-
- subscriptionManager.addOnSubscriptionsChangedListener(
- Dispatchers.Default.asExecutor(),
- listener,
- )
-
- awaitClose { subscriptionManager.removeOnSubscriptionsChangedListener(listener) }
-}.conflate().onEach { Log.d(TAG, "subscriptions changed") }.flowOn(Dispatchers.Default)
+fun Context.subscriptionsChangedFlow(): Flow<Unit> =
+ SubscriptionRepository(this).subscriptionsChangedFlow()
/**
* Return a list of subscriptions that are available and visible to the user.
diff --git a/src/com/android/settings/network/telephony/TelephonyRepository.kt b/src/com/android/settings/network/telephony/TelephonyRepository.kt
index 7c334ee..3317c71 100644
--- a/src/com/android/settings/network/telephony/TelephonyRepository.kt
+++ b/src/com/android/settings/network/telephony/TelephonyRepository.kt
@@ -17,98 +17,16 @@
package com.android.settings.network.telephony
import android.content.Context
-import android.telephony.SubscriptionManager
import android.telephony.TelephonyCallback
import android.telephony.TelephonyManager
-import android.util.Log
-import com.android.settings.network.mobileDataEnabledFlow
-import com.android.settings.wifi.WifiPickerTrackerHelper
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.channels.ProducerScope
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.conflate
-import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
-
-class TelephonyRepository(
- private val context: Context,
- private val subscriptionsChangedFlow: Flow<Unit> = context.subscriptionsChangedFlow(),
-) {
- fun isMobileDataPolicyEnabledFlow(
- subId: Int,
- @TelephonyManager.MobileDataPolicy policy: Int,
- ): Flow<Boolean> {
- if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
-
- val telephonyManager = context.telephonyManager(subId)
-
- return subscriptionsChangedFlow.map {
- telephonyManager.isMobileDataPolicyEnabled(policy)
- .also { Log.d(TAG, "[$subId] isMobileDataPolicyEnabled($policy): $it") }
- }.conflate().flowOn(Dispatchers.Default)
- }
-
- fun setMobileDataPolicyEnabled(
- subId: Int,
- @TelephonyManager.MobileDataPolicy policy: Int,
- enabled: Boolean,
- ) {
- if (!SubscriptionManager.isValidSubscriptionId(subId)) return
-
- val telephonyManager = context.telephonyManager(subId)
- Log.d(TAG, "[$subId] setMobileDataPolicyEnabled($policy): $enabled")
- telephonyManager.setMobileDataPolicyEnabled(policy, enabled)
- }
-
- fun isDataEnabledFlow(subId: Int): Flow<Boolean> {
- if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
-
- return context.mobileDataEnabledFlow(subId)
- .map {
- val telephonyManager = context.telephonyManager(subId)
- telephonyManager.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
- }
- .catch {
- Log.w(TAG, "[$subId] isDataEnabledFlow: exception", it)
- emit(false)
- }
- .onEach { Log.d(TAG, "[$subId] isDataEnabledFlow: isDataEnabled() = $it") }
- .conflate()
- .flowOn(Dispatchers.Default)
- }
-
- fun setMobileData(
- subId: Int,
- enabled: Boolean,
- wifiPickerTrackerHelper: WifiPickerTrackerHelper? = null
- ) {
- if (!SubscriptionManager.isValidSubscriptionId(subId)) return
-
- Log.d(TAG, "setMobileData: $enabled")
- MobileNetworkUtils.setMobileDataEnabled(
- context,
- subId,
- enabled /* enabled */,
- true /* disableOtherSubscriptions */
- )
-
- if (wifiPickerTrackerHelper != null
- && !wifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(subId)
- ) {
- wifiPickerTrackerHelper.setCarrierNetworkEnabled(enabled)
- }
- }
-
- private companion object {
- private const val TAG = "TelephonyRepository"
- }
-}
/** Creates an instance of a cold Flow for Telephony callback of given [subId]. */
fun <T> Context.telephonyCallbackFlow(
diff --git a/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt b/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt
index 0e15033..caf8549 100644
--- a/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt
+++ b/src/com/android/settings/network/telephony/scan/NetworkScanRepository.kt
@@ -30,8 +30,8 @@
import com.android.settings.network.telephony.CellInfoUtil.getNetworkTitle
import com.android.settings.network.telephony.telephonyManager
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
+import java.util.concurrent.Executors
import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
@@ -96,7 +96,9 @@
val networkScan = telephonyManager.requestNetworkScan(
createNetworkScan(),
- Dispatchers.Default.asExecutor(),
+ // requestNetworkScan() could call callbacks concurrently, so we use a single thread
+ // to avoid racing conditions.
+ Executors.newSingleThreadExecutor(),
callback,
)
diff --git a/src/com/android/settings/network/telephony/wificalling/CrossSimCallingViewModel.kt b/src/com/android/settings/network/telephony/wificalling/CrossSimCallingViewModel.kt
index 5dcac1e..dda147b 100644
--- a/src/com/android/settings/network/telephony/wificalling/CrossSimCallingViewModel.kt
+++ b/src/com/android/settings/network/telephony/wificalling/CrossSimCallingViewModel.kt
@@ -24,23 +24,22 @@
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.android.settings.R
-import com.android.settings.network.mobileDataEnabledFlow
+import com.android.settings.network.telephony.CarrierConfigRepository
+import com.android.settings.network.telephony.DataSubscriptionRepository
+import com.android.settings.network.telephony.MobileDataRepository
+import com.android.settings.network.telephony.SubscriptionRepository
import com.android.settings.network.telephony.ims.ImsMmTelRepositoryImpl
-import com.android.settings.network.telephony.requireSubscriptionManager
-import com.android.settings.network.telephony.safeGetConfig
-import com.android.settings.network.telephony.subscriptionsChangedFlow
-import com.android.settings.network.telephony.telephonyManager
import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.merge
import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.plus
@OptIn(ExperimentalCoroutinesApi::class)
@@ -48,25 +47,24 @@
private val application: Application,
) : AndroidViewModel(application) {
- private val subscriptionManager = application.requireSubscriptionManager()
- private val carrierConfigManager =
- application.getSystemService(CarrierConfigManager::class.java)!!
+ private val subscriptionRepository = SubscriptionRepository(application)
+ private val dataSubscriptionRepository = DataSubscriptionRepository(application)
+ private val mobileDataRepository = MobileDataRepository(application)
+ private val carrierConfigRepository = CarrierConfigRepository(application)
private val scope = viewModelScope + Dispatchers.Default
private val metricsFeatureProvider = featureFactory.metricsFeatureProvider
- private val updateChannel = Channel<Unit>()
init {
val resources = application.resources
if (resources.getBoolean(R.bool.config_auto_data_switch_enables_cross_sim_calling)) {
- application.subscriptionsChangedFlow()
- .flatMapLatest {
- val activeSubIds = subscriptionManager.activeSubscriptionIdList.toList()
- merge(
- activeSubIds.anyMobileDataEnableChangedFlow(),
- updateChannel.receiveAsFlow(),
- ).map {
- activeSubIds to crossSimCallNewEnabled(activeSubIds)
- }
+ combine(
+ subscriptionRepository.activeSubscriptionIdListFlow(),
+ dataSubscriptionRepository.defaultDataSubscriptionIdFlow(),
+ ) { activeSubIds, defaultDataSubId ->
+ activeSubIds to crossSimCallNewEnabled(activeSubIds, defaultDataSubId)
+ }
+ .flatMapLatest { (activeSubIds, newEnabledFlow) ->
+ newEnabledFlow.map { newEnabled -> activeSubIds to newEnabled }
}
.distinctUntilChanged()
.onEach { (activeSubIds, newEnabled) ->
@@ -76,44 +74,36 @@
}
}
- fun updateCrossSimCalling() {
- updateChannel.trySend(Unit)
- }
-
- private fun List<Int>.anyMobileDataEnableChangedFlow() = map { subId ->
- application.mobileDataEnabledFlow(subId = subId, sendInitialValue = false)
- }.merge()
-
private suspend fun updateCrossSimCalling(activeSubIds: List<Int>, newEnabled: Boolean) {
metricsFeatureProvider.action(
application,
SettingsEnums.ACTION_UPDATE_CROSS_SIM_CALLING_ON_AUTO_DATA_SWITCH_EVENT,
newEnabled,
)
- activeSubIds.filter { crossSimAvailable(it) }.forEach { subId ->
- ImsMmTelRepositoryImpl(application, subId)
- .setCrossSimCallingEnabled(newEnabled)
- }
+ activeSubIds
+ .filter { subId -> crossSimAvailable(subId) }
+ .forEach { subId ->
+ ImsMmTelRepositoryImpl(application, subId).setCrossSimCallingEnabled(newEnabled)
+ }
}
private suspend fun crossSimAvailable(subId: Int): Boolean =
WifiCallingRepository(application, subId).isWifiCallingSupported() &&
- crossSimImsAvailable(subId)
+ carrierConfigRepository.getBoolean(
+ subId, CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL)
- private fun crossSimImsAvailable(subId: Int): Boolean =
- carrierConfigManager.safeGetConfig(
- keys = listOf(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL),
- subId = subId,
- ).getBoolean(CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false)
-
- private fun crossSimCallNewEnabled(activeSubscriptionIdList: List<Int>): Boolean {
- val defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId()
- return SubscriptionManager.isValidSubscriptionId(defaultDataSubId) &&
- activeSubscriptionIdList.any { subId ->
- subId != defaultDataSubId &&
- application.telephonyManager(subId).isMobileDataPolicyEnabled(
- TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH
- )
- }
+ private fun crossSimCallNewEnabled(
+ activeSubscriptionIdList: List<Int>,
+ defaultDataSubId: Int,
+ ): Flow<Boolean> {
+ if (!SubscriptionManager.isValidSubscriptionId(defaultDataSubId)) return flowOf(false)
+ val isMobileDataPolicyEnabledFlows =
+ activeSubscriptionIdList
+ .filter { subId -> subId != defaultDataSubId }
+ .map { subId ->
+ mobileDataRepository.isMobileDataPolicyEnabledFlow(
+ subId, TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH)
+ }
+ return combine(isMobileDataPolicyEnabledFlows) { true in it }
}
}
diff --git a/src/com/android/settings/network/telephony/wificalling/WifiCallingRepository.kt b/src/com/android/settings/network/telephony/wificalling/WifiCallingRepository.kt
index a5d4ba8..b5cdeda 100644
--- a/src/com/android/settings/network/telephony/wificalling/WifiCallingRepository.kt
+++ b/src/com/android/settings/network/telephony/wificalling/WifiCallingRepository.kt
@@ -21,14 +21,16 @@
import android.telephony.CarrierConfigManager
import android.telephony.CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL
import android.telephony.SubscriptionManager
-import android.telephony.TelephonyManager
import android.telephony.ims.ImsMmTelManager.WiFiCallingMode
import android.telephony.ims.feature.MmTelFeature
import android.telephony.ims.stub.ImsRegistrationImplBase
+import androidx.lifecycle.LifecycleOwner
import com.android.settings.network.telephony.ims.ImsMmTelRepository
import com.android.settings.network.telephony.ims.ImsMmTelRepositoryImpl
import com.android.settings.network.telephony.ims.imsFeatureProvisionedFlow
import com.android.settings.network.telephony.subscriptionsChangedFlow
+import com.android.settings.network.telephony.telephonyManager
+import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
@@ -38,13 +40,19 @@
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.withContext
-class WifiCallingRepository(
+interface IWifiCallingRepository {
+ /** TODO: Move this to UI layer, when UI layer migrated to Kotlin. */
+ fun collectIsWifiCallingReadyFlow(lifecycleOwner: LifecycleOwner, action: (Boolean) -> Unit)
+}
+
+class WifiCallingRepository
+@JvmOverloads
+constructor(
private val context: Context,
private val subId: Int,
private val imsMmTelRepository: ImsMmTelRepository = ImsMmTelRepositoryImpl(context, subId)
-) {
- private val telephonyManager = context.getSystemService(TelephonyManager::class.java)!!
- .createForSubscriptionId(subId)
+) : IWifiCallingRepository {
+ private val telephonyManager = context.telephonyManager(subId)
private val carrierConfigManager = context.getSystemService(CarrierConfigManager::class.java)!!
@@ -59,6 +67,14 @@
.getConfigForSubId(subId, KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL)
.getBoolean(KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL)
+ /** TODO: Move this to UI layer, when UI layer migrated to Kotlin. */
+ override fun collectIsWifiCallingReadyFlow(
+ lifecycleOwner: LifecycleOwner,
+ action: (Boolean) -> Unit,
+ ) {
+ wifiCallingReadyFlow().collectLatestWithLifecycle(lifecycleOwner, action = action)
+ }
+
@OptIn(ExperimentalCoroutinesApi::class)
fun wifiCallingReadyFlow(): Flow<Boolean> {
if (!SubscriptionManager.isValidSubscriptionId(subId)) return flowOf(false)
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 0661de7..d6f810c 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -21,6 +21,8 @@
import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;
import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER;
+import static com.android.server.notification.Flags.notificationHideUnusedChannels;
+
import android.app.INotificationManager;
import android.app.NotificationChannel;
import android.app.NotificationChannelGroup;
@@ -78,6 +80,9 @@
public AppRow loadAppRow(Context context, PackageManager pm, ApplicationInfo app) {
final AppRow row = new AppRow();
+ if (notificationHideUnusedChannels()) {
+ row.showAllChannels = false;
+ }
row.pkg = app.packageName;
row.uid = app.uid;
try {
@@ -357,19 +362,6 @@
}
}
- /**
- * Returns all of a user's packages that have at least one channel that will bypass DND
- */
- public List<String> getPackagesBypassingDnd(int userId,
- boolean includeConversationChannels) {
- try {
- return sINM.getPackagesBypassingDnd(userId, includeConversationChannels);
- } catch (Exception e) {
- Log.w(TAG, "Error calling NoMan", e);
- return new ArrayList<>();
- }
- }
-
public void updateChannel(String pkg, int uid, NotificationChannel channel) {
try {
sINM.updateNotificationChannelForPackage(pkg, uid, channel);
@@ -699,5 +691,6 @@
public int channelCount;
public Map<String, NotificationsSentState> sentByChannel;
public NotificationsSentState sentByApp;
+ public boolean showAllChannels = true;
}
}
diff --git a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
index 880db35..d851caf 100644
--- a/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
+++ b/src/com/android/settings/notification/SettingsEnableZenModeDialog.java
@@ -21,13 +21,13 @@
import android.os.Bundle;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.notification.modes.EnableZenModeDialog;
public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- return new com.android.settingslib.notification.EnableZenModeDialog(
- getContext()).createDialog();
+ return new EnableZenModeDialog(getContext()).createDialog();
}
@Override
diff --git a/src/com/android/settings/notification/app/AppNotificationSettings.java b/src/com/android/settings/notification/app/AppNotificationSettings.java
index 89756b7..046f0ce 100644
--- a/src/com/android/settings/notification/app/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -16,16 +16,10 @@
package com.android.settings.notification.app;
-import static com.android.server.notification.Flags.notificationHideUnusedChannels;
-
-
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -107,38 +101,9 @@
mControllers.add(new BubbleSummaryPreferenceController(context, mBackend));
mControllers.add(new NotificationsOffPreferenceController(context));
mControllers.add(new DeletedChannelsPreferenceController(context, mBackend));
+ mControllers.add(new ShowMorePreferenceController(
+ context, mDependentFieldListener, mBackend));
+ mControllers.add(new BundleListPreferenceController(context, mBackend));
return new ArrayList<>(mControllers);
}
-
- private final int SHOW_ALL_CHANNELS = 1;
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- if (notificationHideUnusedChannels()) {
- menu.add(Menu.NONE, SHOW_ALL_CHANNELS, Menu.NONE,
- mShowAll ? R.string.hide_unused_channels : R.string.show_unused_channels);
- }
- super.onCreateOptionsMenu(menu, inflater);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (!notificationHideUnusedChannels()) {
- return super.onOptionsItemSelected(item);
- }
- switch (item.getItemId()) {
- case SHOW_ALL_CHANNELS:
- mShowAll = !mShowAll;
- item.setTitle(mShowAll
- ? R.string.hide_unused_channels
- : R.string.show_unused_channels);
- ChannelListPreferenceController list =
- use(ChannelListPreferenceController.class);
- list.setShowAll(mShowAll);
- list.updateState(findPreference(list.getPreferenceKey()));
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
}
diff --git a/src/com/android/settings/notification/app/BundleListPreferenceController.java b/src/com/android/settings/notification/app/BundleListPreferenceController.java
new file mode 100644
index 0000000..82e910c
--- /dev/null
+++ b/src/com/android/settings/notification/app/BundleListPreferenceController.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.app;
+
+import static android.app.NotificationChannel.NEWS_ID;
+import static android.app.NotificationChannel.PROMOTIONS_ID;
+import static android.app.NotificationChannel.RECS_ID;
+import static android.app.NotificationChannel.SOCIAL_MEDIA_ID;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static com.android.server.notification.Flags.notificationHideUnusedChannels;
+
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.service.notification.Flags;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.TwoStatePreference;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class BundleListPreferenceController extends NotificationPreferenceController {
+
+ private static final String KEY = "bundles";
+
+ public BundleListPreferenceController(Context context, NotificationBackend backend) {
+ super(context, backend);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ if (!Flags.notificationClassification()) {
+ return false;
+ }
+ if (mAppRow == null) {
+ return false;
+ }
+ if (mAppRow.banned || mAppRow.lockedImportance || mAppRow.systemApp) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ boolean isIncludedInFilter() {
+ return false;
+ }
+
+ @Override
+ 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));
+ }
+
+ @NonNull
+ private void createOrUpdatePrefForChannel(
+ @NonNull PreferenceGroup groupPrefGroup, NotificationChannel channel) {
+ int preferenceCount = groupPrefGroup.getPreferenceCount();
+ for (int i = 0; i < preferenceCount; i++) {
+ Preference preference = groupPrefGroup.getPreference(i);
+ if (channel.getId().equals(preference.getKey())) {
+ updateSingleChannelPrefs((PrimarySwitchPreference) preference, channel);
+ return;
+ }
+ }
+ PrimarySwitchPreference channelPref = new PrimarySwitchPreference(mContext);
+ channelPref.setKey(channel.getId());
+ updateSingleChannelPrefs(channelPref, channel);
+ groupPrefGroup.addPreference(channelPref);
+ }
+
+ /** Update the properties of the channel preference with the values from the channel object. */
+ private void updateSingleChannelPrefs(@NonNull final PrimarySwitchPreference channelPref,
+ @NonNull final NotificationChannel channel) {
+ channelPref.setSwitchEnabled(mAdmin == null);
+ if (channel.getImportance() > IMPORTANCE_LOW) {
+ channelPref.setIcon(getAlertingIcon());
+ } else {
+ channelPref.setIcon(mContext.getDrawable(R.drawable.empty_icon));
+ }
+ channelPref.setIconSize(PrimarySwitchPreference.ICON_SIZE_SMALL);
+ channelPref.setTitle(channel.getName());
+ channelPref.setSummary(NotificationBackend.getSentSummary(
+ mContext, mAppRow.sentByChannel.get(channel.getId()), false));
+ channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
+ Bundle channelArgs = new Bundle();
+ channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, mAppRow.uid);
+ channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mAppRow.pkg);
+ channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
+ channelPref.setIntent(new SubSettingLauncher(mContext)
+ .setDestination(ChannelNotificationSettings.class.getName())
+ .setArguments(channelArgs)
+ .setTitleRes(R.string.notification_channel_title)
+ .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_APP_NOTIFICATION)
+ .toIntent());
+
+ channelPref.setOnPreferenceChangeListener(
+ (preference, o) -> {
+ boolean value = (Boolean) o;
+ int importance = value
+ ? Math.max(channel.getOriginalImportance(), IMPORTANCE_LOW)
+ : IMPORTANCE_NONE;
+ channel.setImportance(importance);
+ channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+ PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;
+ channelPref1.setIcon(R.drawable.empty_icon);
+ if (channel.getImportance() > IMPORTANCE_LOW) {
+ channelPref1.setIcon(getAlertingIcon());
+ }
+ mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, channel);
+
+ return true;
+ });
+ }
+
+ private Drawable getAlertingIcon() {
+ Drawable icon = mContext.getDrawable(R.drawable.ic_notifications_alert);
+ icon.setTintList(Utils.getColorAccent(mContext));
+ return icon;
+ }
+
+}
diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
index 7077592..b8dfb6a 100644
--- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
@@ -59,8 +59,6 @@
private List<NotificationChannelGroup> mChannelGroupList;
private PreferenceCategory mPreference;
- private boolean mShowAll;
-
public ChannelListPreferenceController(Context context, NotificationBackend backend) {
super(context, backend);
}
@@ -100,7 +98,7 @@
@Override
protected Void doInBackground(Void... unused) {
if (notificationHideUnusedChannels()) {
- if (mShowAll) {
+ if (mAppRow.showAllChannels) {
mChannelGroupList = mBackend.getGroups(mAppRow.pkg, mAppRow.uid).getList();
} else {
mChannelGroupList = mBackend.getGroupsWithRecentBlockedFilter(mAppRow.pkg,
@@ -123,10 +121,6 @@
}.execute();
}
- protected void setShowAll(boolean showAll) {
- mShowAll = showAll;
- }
-
/**
* Update the preferences group to match the
* @param groupPrefsList
diff --git a/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
index 6a1d4cb..07b7fda 100644
--- a/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
+++ b/src/com/android/settings/notification/app/DeletedChannelsPreferenceController.java
@@ -16,6 +16,8 @@
package com.android.settings.notification.app;
+import static com.android.server.notification.Flags.notificationHideUnusedChannels;
+
import android.content.Context;
import androidx.preference.Preference;
@@ -44,6 +46,9 @@
if (!super.isAvailable()) {
return false;
}
+ if (notificationHideUnusedChannels()) {
+ return false;
+ }
// only visible on app screen
if (mChannel != null || hasValidGroup()) {
return false;
diff --git a/src/com/android/settings/notification/app/ShowMorePreferenceController.java b/src/com/android/settings/notification/app/ShowMorePreferenceController.java
new file mode 100644
index 0000000..dbc279a
--- /dev/null
+++ b/src/com/android/settings/notification/app/ShowMorePreferenceController.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.notification.app;
+
+import static com.android.server.notification.Flags.notificationHideUnusedChannels;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ShowMorePreferenceController extends NotificationPreferenceController {
+
+ private static final String KEY = "more";
+ private NotificationSettings.DependentFieldListener mDependentFieldListener;
+
+ public ShowMorePreferenceController(Context context,
+ NotificationSettings.DependentFieldListener dependentFieldListener,
+ NotificationBackend backend) {
+ super(context, backend);
+ mDependentFieldListener = dependentFieldListener;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ if (!notificationHideUnusedChannels()) {
+ return false;
+ }
+ if (mAppRow == null) {
+ return false;
+ }
+ if (mAppRow.banned || mAppRow.showAllChannels) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ boolean isIncludedInFilter() {
+ return false;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ preference.setOnPreferenceClickListener(preference1 -> {
+ mAppRow.showAllChannels = true;
+ mDependentFieldListener.onFieldValueChanged();
+ return true;
+ });
+ }
+}
diff --git a/src/com/android/settings/notification/modes/AbstractZenModeHeaderController.java b/src/com/android/settings/notification/modes/AbstractZenModeHeaderController.java
new file mode 100644
index 0000000..06a30fa
--- /dev/null
+++ b/src/com/android/settings/notification/modes/AbstractZenModeHeaderController.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.notification.modes;
+
+import android.app.Flags;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.notification.modes.ZenIconLoader;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+abstract class AbstractZenModeHeaderController extends AbstractZenModePreferenceController {
+
+ private final DashboardFragment mFragment;
+ private EntityHeaderController mHeaderController;
+
+ AbstractZenModeHeaderController(
+ @NonNull Context context,
+ @NonNull String key,
+ @NonNull DashboardFragment fragment) {
+ super(context, key);
+ mFragment = fragment;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return Flags.modesApi() && Flags.modesUi();
+ }
+
+ protected void updateIcon(Preference preference, @NonNull ZenMode zenMode, int iconSizePx,
+ Function<Drawable, Drawable> modeIconStylist,
+ @Nullable Consumer<ImageView> iconViewCustomizer) {
+ if (mFragment == null) {
+ return;
+ }
+ preference.setSelectable(false);
+
+ if (mHeaderController == null) {
+ final LayoutPreference pref = (LayoutPreference) preference;
+ mHeaderController = EntityHeaderController.newInstance(
+ mFragment.getActivity(),
+ mFragment,
+ pref.findViewById(R.id.entity_header));
+ }
+
+ ImageView iconView = ((LayoutPreference) preference).findViewById(R.id.entity_header_icon);
+ if (iconView != null) {
+ if (iconViewCustomizer != null) {
+ iconViewCustomizer.accept(iconView);
+ }
+ ViewGroup.LayoutParams layoutParams = iconView.getLayoutParams();
+ if (layoutParams.width != iconSizePx || layoutParams.height != iconSizePx) {
+ layoutParams.width = iconSizePx;
+ layoutParams.height = iconSizePx;
+ iconView.setLayoutParams(layoutParams);
+ }
+ }
+
+ FutureUtil.whenDone(
+ zenMode.getIcon(mContext, ZenIconLoader.getInstance()),
+ icon -> mHeaderController
+ .setIcon(modeIconStylist.apply(icon))
+ .done(/* rebindActions= */ false),
+ mContext.getMainExecutor());
+ }
+}
diff --git a/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
index aebc4eb..c740847 100644
--- a/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/modes/AbstractZenModePreferenceController.java
@@ -16,6 +16,8 @@
package com.android.settings.notification.modes;
+import static com.google.common.base.Preconditions.checkState;
+
import android.app.Flags;
import android.content.Context;
import android.service.notification.ZenPolicy;
@@ -24,10 +26,11 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settingslib.core.AbstractPreferenceController;
-
-import com.google.common.base.Preconditions;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import java.util.function.Function;
@@ -38,8 +41,8 @@
private static final String TAG = "AbstractZenModePreferenceController";
- @Nullable
- protected ZenModesBackend mBackend;
+ @Nullable protected final ZenModesBackend mBackend;
+
@Nullable // only until setZenMode() is called
private ZenMode mZenMode;
@@ -47,14 +50,27 @@
@NonNull
private final String mKey;
- // ZenModesBackend should only be passed in if the preference controller may set the user's
- // policy for this zen mode. Otherwise, if the preference controller is essentially read-only
- // and leads to a further Settings screen, backend should be null.
- AbstractZenModePreferenceController(@NonNull Context context, @NonNull String key,
- @Nullable ZenModesBackend backend) {
+ /**
+ * Constructor suitable for "read-only" controllers (e.g. link to a different sub-screen.
+ * Controllers that call this constructor to initialize themselves <em>cannot</em> call
+ * {@link #saveMode} or {@link #savePolicy} later.
+ */
+ AbstractZenModePreferenceController(@NonNull Context context, @NonNull String key) {
super(context);
- mBackend = backend;
mKey = key;
+ mBackend = null;
+ }
+
+ /**
+ * Constructor suitable for controllers that will update the associated {@link ZenMode}.
+ * Controllers that call this constructor to initialize themselves may call {@link #saveMode} or
+ * {@link #savePolicy} later.
+ */
+ AbstractZenModePreferenceController(@NonNull Context context, @NonNull String key,
+ @NonNull ZenModesBackend backend) {
+ super(context);
+ mKey = key;
+ mBackend = backend;
}
@Override
@@ -90,6 +106,16 @@
}
@Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ if (mZenMode != null) {
+ displayPreference(screen, mZenMode);
+ }
+ }
+
+ public void displayPreference(PreferenceScreen screen, @NonNull ZenMode zenMode) {}
+
+ @Override
public final void updateState(Preference preference) {
super.updateState(preference);
if (mZenMode != null) {
@@ -122,7 +148,7 @@
* instance is ok.
*/
protected final boolean saveMode(Function<ZenMode, ZenMode> updater) {
- Preconditions.checkState(mBackend != null);
+ checkState(mBackend != null);
ZenMode mode = mZenMode;
if (mode == null) {
Log.wtf(TAG, "Cannot save mode, it hasn't been loaded (" + getClass() + ")");
diff --git a/src/com/android/settings/notification/modes/CircularIconSet.java b/src/com/android/settings/notification/modes/CircularIconSet.java
new file mode 100644
index 0000000..eb7289a
--- /dev/null
+++ b/src/com/android/settings/notification/modes/CircularIconSet.java
@@ -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.notification.modes;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import com.google.common.base.Equivalence;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Function;
+
+/**
+ * A set of icons to be displayed in a {@link CircularIconsPreference}
+ *
+ * @param <T> The type of the items in the set. Can be an arbitrary type, the only requirement
+ * being that the {@code drawableLoader} supplied to the constructor is able to produce
+ * a {@link Drawable} from it (for example a resource id, a Content Uri, etc).
+ */
+class CircularIconSet<T> {
+
+ @VisibleForTesting // Can be set by tests, before creating instances.
+ static ExecutorService sExecutorService = Executors.newCachedThreadPool();
+
+ static final CircularIconSet<?> EMPTY = new CircularIconSet<>(ImmutableList.of(),
+ unused -> new ColorDrawable(Color.BLACK));
+
+ private final ImmutableList<T> mItems;
+ private final Function<T, Drawable> mDrawableLoader;
+ private final ListeningExecutorService mBackgroundExecutor;
+
+ private final ConcurrentHashMap<T, Drawable> mCachedIcons;
+
+ CircularIconSet(List<T> items, Function<T, Drawable> drawableLoader) {
+ mItems = ImmutableList.copyOf(items);
+ mDrawableLoader = drawableLoader;
+ mBackgroundExecutor = MoreExecutors.listeningDecorator(sExecutorService);
+ mCachedIcons = new ConcurrentHashMap<>();
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this).add("items", mItems).toString();
+ }
+
+ @SuppressWarnings("unchecked")
+ <OtherT> boolean hasSameItemsAs(CircularIconSet<OtherT> other,
+ @Nullable Equivalence<OtherT> equivalence) {
+ if (other == null) {
+ return false;
+ }
+ if (other == this) {
+ return true;
+ }
+ if (equivalence == null) {
+ return mItems.equals(other.mItems);
+ }
+ // Check that types match before applying equivalence (statically unsafe). :(
+ Optional<Class<?>> thisItemClass = this.mItems.stream().findFirst().map(T::getClass);
+ Optional<Class<?>> otherItemClass = other.mItems.stream().findFirst().map(OtherT::getClass);
+ if (!thisItemClass.equals(otherItemClass)) {
+ return false;
+ }
+ return equivalence.pairwise().equivalent((Iterable<OtherT>) this.mItems, other.mItems);
+ }
+
+ int size() {
+ return mItems.size();
+ }
+
+ /**
+ * Loads all icons from the set, using the supplied {@code drawableLoader}, in a background
+ * thread.
+ */
+ List<ListenableFuture<Drawable>> getIcons() {
+ return getIcons(Integer.MAX_VALUE);
+ }
+
+ /**
+ * Loads up to {@code maxSize} icons from the set, using the supplied {@code drawableLoader}, in
+ * a background thread.
+ */
+ List<ListenableFuture<Drawable>> getIcons(int maxNumber) {
+ return mItems.stream().limit(maxNumber)
+ .map(this::loadIcon)
+ .toList();
+ }
+
+ private ListenableFuture<Drawable> loadIcon(T item) {
+ return mBackgroundExecutor.submit(() -> {
+ if (mCachedIcons.containsKey(item)) {
+ return mCachedIcons.get(item);
+ }
+ Drawable drawable = mDrawableLoader.apply(item);
+ if (drawable != null) {
+ mCachedIcons.put(item, drawable);
+ }
+ return drawable;
+ });
+ }
+}
diff --git a/src/com/android/settings/notification/modes/CircularIconsPreference.java b/src/com/android/settings/notification/modes/CircularIconsPreference.java
new file mode 100644
index 0000000..0766ccd
--- /dev/null
+++ b/src/com/android/settings/notification/modes/CircularIconsPreference.java
@@ -0,0 +1,248 @@
+/*
+ * 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.base.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedPreference;
+
+import com.google.common.base.Equivalence;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+public class CircularIconsPreference extends RestrictedPreference {
+
+ private static final float DISABLED_ITEM_ALPHA = 0.3f;
+
+ record LoadedIcons(ImmutableList<Drawable> icons, int extraItems) { }
+
+ private Executor mUiExecutor;
+
+ // Chronologically, fields will be set top-to-bottom.
+ @Nullable private CircularIconSet<?> mIconSet;
+ @Nullable private ListenableFuture<List<Drawable>> mPendingLoadIconsFuture;
+ @Nullable private LoadedIcons mLoadedIcons;
+
+ public CircularIconsPreference(Context context) {
+ super(context);
+ init(context);
+ }
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ public CircularIconsPreference(Context context, Executor uiExecutor) {
+ this(context);
+ mUiExecutor = uiExecutor;
+ }
+
+ public CircularIconsPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init(context);
+ }
+
+ public CircularIconsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ init(context);
+ }
+
+ public CircularIconsPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ init(context);
+ }
+
+ private void init(Context context) {
+ mUiExecutor = context.getMainExecutor();
+ setLayoutResource(R.layout.preference_circular_icons);
+ }
+
+ <T> void displayIcons(CircularIconSet<T> iconSet) {
+ displayIcons(iconSet, null);
+ }
+
+ <T> void displayIcons(CircularIconSet<T> iconSet, @Nullable Equivalence<T> itemEquivalence) {
+ if (mIconSet != null && mIconSet.hasSameItemsAs(iconSet, itemEquivalence)) {
+ return;
+ }
+ mIconSet = iconSet;
+
+ mLoadedIcons = null;
+ if (mPendingLoadIconsFuture != null) {
+ mPendingLoadIconsFuture.cancel(true);
+ mPendingLoadIconsFuture = null;
+ }
+
+ notifyChanged();
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ LinearLayout iconContainer = checkNotNull(
+ (LinearLayout) holder.findViewById(R.id.circles_container));
+ bindIconContainer(iconContainer);
+ }
+
+ private void bindIconContainer(LinearLayout container) {
+ if (mLoadedIcons != null) {
+ // We have the icons ready to display already, show them.
+ setDrawables(container, mLoadedIcons);
+ } else if (mIconSet != null) {
+ // We know what icons we want, but haven't yet loaded them.
+ if (mIconSet.size() == 0) {
+ container.setVisibility(View.GONE);
+ return;
+ }
+ container.setVisibility(View.VISIBLE);
+ if (container.getMeasuredWidth() != 0) {
+ startLoadingIcons(container, mIconSet);
+ } else {
+ container.getViewTreeObserver().addOnGlobalLayoutListener(
+ new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ container.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ startLoadingIcons(container, mIconSet);
+ }
+ }
+ );
+ }
+ }
+ }
+
+ private void startLoadingIcons(LinearLayout container, CircularIconSet<?> iconSet) {
+ Resources res = getContext().getResources();
+ int availableSpace = container.getMeasuredWidth();
+ int iconHorizontalSpace = res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_diameter)
+ + res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_margin_between);
+ int numIconsThatFit = availableSpace / iconHorizontalSpace;
+
+ List<ListenableFuture<Drawable>> iconFutures;
+ int extraItems;
+ if (iconSet.size() > numIconsThatFit) {
+ // Reserve one space for the (+xx) textview.
+ int numIconsToShow = numIconsThatFit - 1;
+ if (numIconsToShow < 0) {
+ numIconsToShow = 0;
+ }
+ iconFutures = iconSet.getIcons(numIconsToShow);
+ extraItems = iconSet.size() - numIconsToShow;
+ } else {
+ // Fit exactly or with remaining space.
+ iconFutures = iconSet.getIcons();
+ extraItems = 0;
+ }
+
+ // Display icons when all are ready (more consistent than randomly loading).
+ mPendingLoadIconsFuture = Futures.allAsList(iconFutures);
+ FutureUtil.whenDone(
+ mPendingLoadIconsFuture,
+ icons -> {
+ mLoadedIcons = new LoadedIcons(ImmutableList.copyOf(icons), extraItems);
+ notifyChanged(); // So that view is rebound and icons actually shown.
+ },
+ mUiExecutor);
+ }
+
+ private void setDrawables(LinearLayout container, LoadedIcons loadedIcons) {
+ // Rearrange child views until we have <numImages> ImageViews...
+ LayoutInflater inflater = LayoutInflater.from(getContext());
+ int numImages = loadedIcons.icons.size();
+ int numImageViews = getChildCount(container, ImageView.class);
+ if (numImages > numImageViews) {
+ for (int i = 0; i < numImages - numImageViews; i++) {
+ ImageView imageView = (ImageView) inflater.inflate(
+ R.layout.preference_circular_icons_item, container, false);
+ container.addView(imageView, 0);
+ }
+ } else if (numImageViews > numImages) {
+ for (int i = 0; i < numImageViews - numImages; i++) {
+ container.removeViewAt(0);
+ }
+ }
+ // ... plus 0/1 TextViews at the end.
+ if (loadedIcons.extraItems > 0 && !(getLastChild(container) instanceof TextView)) {
+ TextView plusView = (TextView) inflater.inflate(
+ R.layout.preference_circular_icons_plus_item, container, false);
+ container.addView(plusView);
+ } else if (loadedIcons.extraItems == 0 && (getLastChild(container) instanceof TextView)) {
+ container.removeViewAt(container.getChildCount() - 1);
+ }
+
+ // Show images (and +n if needed).
+ for (int i = 0; i < numImages; i++) {
+ ImageView imageView = (ImageView) container.getChildAt(i);
+ imageView.setImageDrawable(loadedIcons.icons.get(i));
+ }
+ if (loadedIcons.extraItems > 0) {
+ TextView textView = (TextView) checkNotNull(getLastChild(container));
+ textView.setText(getContext().getString(R.string.zen_mode_plus_n_items,
+ loadedIcons.extraItems));
+ }
+
+ // Apply enabled/disabled style.
+ for (int i = 0; i < container.getChildCount(); i++) {
+ View child = container.getChildAt(i);
+ child.setAlpha(isEnabled() ? 1.0f : DISABLED_ITEM_ALPHA);
+ }
+ }
+
+ private static int getChildCount(ViewGroup parent, Class<? extends View> childClass) {
+ int count = 0;
+ for (int i = 0; i < parent.getChildCount(); i++) {
+ if (childClass.isInstance(parent.getChildAt(i))) {
+ count++;
+ }
+ }
+ return count;
+ }
+
+ @Nullable
+ private static View getLastChild(ViewGroup parent) {
+ if (parent.getChildCount() == 0) {
+ return null;
+ }
+ return parent.getChildAt(parent.getChildCount() - 1);
+ }
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ @Nullable
+ LoadedIcons getLoadedIcons() {
+ return mLoadedIcons;
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ConfigurationActivityHelper.java b/src/com/android/settings/notification/modes/ConfigurationActivityHelper.java
new file mode 100644
index 0000000..d001651
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ConfigurationActivityHelper.java
@@ -0,0 +1,143 @@
+/*
+ * 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 android.app.NotificationManager.EXTRA_AUTOMATIC_RULE_ID;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.service.notification.ConditionProviderService;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.notification.modes.ZenMode;
+
+import java.util.List;
+import java.util.function.Function;
+
+class ConfigurationActivityHelper {
+
+ private static final String TAG = "ConfigurationActivityHelper";
+
+ private final PackageManager mPm;
+
+ ConfigurationActivityHelper(PackageManager pm) {
+ mPm = pm;
+ }
+
+ @Nullable
+ Intent getConfigurationActivityIntentForMode(ZenMode zenMode,
+ Function<ComponentName, ComponentInfo> approvedServiceFinder) {
+
+ String owner = zenMode.getRule().getPackageName();
+ ComponentName configActivity = null;
+ if (zenMode.getRule().getConfigurationActivity() != null) {
+ // If a configuration activity is present, use that directly in the intent
+ configActivity = zenMode.getRule().getConfigurationActivity();
+ } else {
+ // Otherwise, look for a condition provider service for the rule's package
+ ComponentInfo ci = approvedServiceFinder.apply(zenMode.getRule().getOwner());
+ if (ci != null) {
+ configActivity = extractConfigurationActivityFromComponent(ci);
+ }
+ }
+
+ if (configActivity != null
+ && (owner == null || isSameOwnerPackage(owner, configActivity))
+ && isResolvableActivity(configActivity)) {
+ return new Intent()
+ .setComponent(configActivity)
+ .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+ .putExtra(ConditionProviderService.EXTRA_RULE_ID, zenMode.getId())
+ .putExtra(EXTRA_AUTOMATIC_RULE_ID, zenMode.getId());
+ } else {
+ return null;
+ }
+ }
+
+ @Nullable
+ ComponentName getConfigurationActivityFromApprovedComponent(ComponentInfo ci) {
+ ComponentName configActivity = extractConfigurationActivityFromComponent(ci);
+ if (configActivity != null
+ && isSameOwnerPackage(ci.packageName, configActivity)
+ && isResolvableActivity(configActivity)) {
+ return configActivity;
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Extract the {@link ComponentName} corresponding to the mode configuration <em>activity</em>
+ * from the component declaring the rule (which may be the Activity itself, or a CPS that points
+ * to the activity in question in its metadata).
+ *
+ * <p>This method doesn't perform any validation, so the activity may or may not exist.
+ */
+ @Nullable
+ private ComponentName extractConfigurationActivityFromComponent(ComponentInfo ci) {
+ if (ci instanceof ActivityInfo) {
+ // New (activity-backed) rule.
+ return new ComponentName(ci.packageName, ci.name);
+ } else if (ci.metaData != null) {
+ // Old (service-backed) rule.
+ final String configurationActivity = ci.metaData.getString(
+ ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+ if (configurationActivity != null) {
+ return ComponentName.unflattenFromString(configurationActivity);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Verifies that the activity is the same package as the rule owner.
+ */
+ private boolean isSameOwnerPackage(String ownerPkg, ComponentName activityName) {
+ try {
+ int ownerUid = mPm.getPackageUid(ownerPkg, 0);
+ int configActivityOwnerUid = mPm.getPackageUid(activityName.getPackageName(), 0);
+ if (ownerUid == configActivityOwnerUid) {
+ return true;
+ } else {
+ Log.w(TAG, String.format("Config activity (%s) not in owner package (%s)",
+ activityName, ownerPkg));
+ return false;
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Failed to find config activity " + activityName);
+ return false;
+ }
+ }
+
+ /** Verifies that the activity exists and hasn't been disabled. */
+ private boolean isResolvableActivity(ComponentName activityName) {
+ Intent intent = new Intent().setComponent(activityName);
+ List<ResolveInfo> results = mPm.queryIntentActivities(intent, /* flags= */ 0);
+
+ if (intent.resolveActivity(mPm) == null || results.isEmpty()) {
+ Log.w(TAG, "Cannot resolve: " + activityName);
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/src/com/android/settings/notification/modes/FutureUtil.java b/src/com/android/settings/notification/modes/FutureUtil.java
index e7bf8b9..b9a4300 100644
--- a/src/com/android/settings/notification/modes/FutureUtil.java
+++ b/src/com/android/settings/notification/modes/FutureUtil.java
@@ -18,10 +18,13 @@
import android.util.Log;
+import androidx.annotation.NonNull;
+
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.Executor;
import java.util.function.Consumer;
@@ -42,8 +45,10 @@
}
@Override
- public void onFailure(Throwable throwable) {
- Log.e(TAG, String.format(errorLogMessage, errorLogMessageArgs), throwable);
+ public void onFailure(@NonNull Throwable throwable) {
+ if (!(throwable instanceof CancellationException)) {
+ Log.e(TAG, String.format(errorLogMessage, errorLogMessageArgs), throwable);
+ }
}
}, executor);
}
diff --git a/src/com/android/settings/notification/modes/IconLoader.java b/src/com/android/settings/notification/modes/IconLoader.java
deleted file mode 100644
index c590285..0000000
--- a/src/com/android/settings/notification/modes/IconLoader.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.notification.modes;
-
-import static com.google.common.util.concurrent.Futures.immediateFuture;
-
-import static java.util.Objects.requireNonNull;
-
-import android.annotation.Nullable;
-import android.app.AutomaticZenRule;
-import android.content.Context;
-import android.graphics.drawable.AdaptiveIconDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.InsetDrawable;
-import android.service.notification.SystemZenRules;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.LruCache;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.content.res.AppCompatResources;
-
-import com.google.common.util.concurrent.FluentFuture;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-class IconLoader {
-
- private static final String TAG = "ZenIconLoader";
-
- private static final Drawable MISSING = new ColorDrawable();
-
- @Nullable // Until first usage
- private static IconLoader sInstance;
-
- private final LruCache<String, Drawable> mCache;
- private final ListeningExecutorService mBackgroundExecutor;
-
- static IconLoader getInstance() {
- if (sInstance == null) {
- sInstance = new IconLoader();
- }
- return sInstance;
- }
-
- private IconLoader() {
- this(Executors.newFixedThreadPool(4));
- }
-
- @VisibleForTesting
- IconLoader(ExecutorService backgroundExecutor) {
- mCache = new LruCache<>(50);
- mBackgroundExecutor =
- MoreExecutors.listeningDecorator(backgroundExecutor);
- }
-
- @NonNull
- ListenableFuture<Drawable> getIcon(Context context, @NonNull AutomaticZenRule rule) {
- if (rule.getIconResId() == 0) {
- return Futures.immediateFuture(getFallbackIcon(context, rule.getType()));
- }
-
- return FluentFuture.from(loadIcon(context, rule.getPackageName(), rule.getIconResId()))
- .transform(icon ->
- icon != null ? icon : getFallbackIcon(context, rule.getType()),
- MoreExecutors.directExecutor());
- }
-
- @NonNull
- private ListenableFuture</* @Nullable */ Drawable> loadIcon(Context context, String pkg,
- int iconResId) {
- String cacheKey = pkg + ":" + iconResId;
- synchronized (mCache) {
- Drawable cachedValue = mCache.get(cacheKey);
- if (cachedValue != null) {
- return immediateFuture(cachedValue != MISSING ? cachedValue : null);
- }
- }
-
- return FluentFuture.from(mBackgroundExecutor.submit(() -> {
- if (TextUtils.isEmpty(pkg) || SystemZenRules.PACKAGE_ANDROID.equals(pkg)) {
- return context.getDrawable(iconResId);
- } else {
- Context appContext = context.createPackageContext(pkg, 0);
- Drawable appDrawable = AppCompatResources.getDrawable(appContext, iconResId);
- return getMonochromeIconIfPresent(appDrawable);
- }
- })).catching(Exception.class, ex -> {
- // If we cannot resolve the icon, then store MISSING in the cache below, so
- // we don't try again.
- Log.e(TAG, "Error while loading icon " + cacheKey, ex);
- return null;
- }, MoreExecutors.directExecutor()).transform(drawable -> {
- synchronized (mCache) {
- mCache.put(cacheKey, drawable != null ? drawable : MISSING);
- }
- return drawable;
- }, MoreExecutors.directExecutor());
- }
-
- private static Drawable getFallbackIcon(Context context, int ruleType) {
- int iconResIdFromType = switch (ruleType) {
- case AutomaticZenRule.TYPE_UNKNOWN ->
- com.android.internal.R.drawable.ic_zen_mode_type_unknown;
- case AutomaticZenRule.TYPE_OTHER ->
- com.android.internal.R.drawable.ic_zen_mode_type_other;
- case AutomaticZenRule.TYPE_SCHEDULE_TIME ->
- com.android.internal.R.drawable.ic_zen_mode_type_schedule_time;
- case AutomaticZenRule.TYPE_SCHEDULE_CALENDAR ->
- com.android.internal.R.drawable.ic_zen_mode_type_schedule_calendar;
- case AutomaticZenRule.TYPE_BEDTIME ->
- com.android.internal.R.drawable.ic_zen_mode_type_bedtime;
- case AutomaticZenRule.TYPE_DRIVING ->
- com.android.internal.R.drawable.ic_zen_mode_type_driving;
- case AutomaticZenRule.TYPE_IMMERSIVE ->
- com.android.internal.R.drawable.ic_zen_mode_type_immersive;
- case AutomaticZenRule.TYPE_THEATER ->
- com.android.internal.R.drawable.ic_zen_mode_type_theater;
- case AutomaticZenRule.TYPE_MANAGED ->
- com.android.internal.R.drawable.ic_zen_mode_type_managed;
- default ->
- com.android.internal.R.drawable.ic_zen_mode_type_unknown;
- };
- return requireNonNull(context.getDrawable(iconResIdFromType));
- }
-
- private static Drawable getMonochromeIconIfPresent(Drawable icon) {
- // For created rules, the app should've provided a monochrome Drawable. However, implicit
- // rules have the app's icon, which is not -- but might have a monochrome layer. Thus
- // we choose it, if present.
- if (icon instanceof AdaptiveIconDrawable adaptiveIcon) {
- if (adaptiveIcon.getMonochrome() != null) {
- // Wrap with negative inset => scale icon (inspired from BaseIconFactory)
- return new InsetDrawable(adaptiveIcon.getMonochrome(),
- -2.0f * AdaptiveIconDrawable.getExtraInsetFraction());
- }
- }
- return icon;
- }
-}
diff --git a/src/com/android/settings/notification/modes/IconUtil.java b/src/com/android/settings/notification/modes/IconUtil.java
index c6ecaa0..55abccf 100644
--- a/src/com/android/settings/notification/modes/IconUtil.java
+++ b/src/com/android/settings/notification/modes/IconUtil.java
@@ -19,51 +19,187 @@
import static com.google.common.base.Preconditions.checkNotNull;
import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.OvalShape;
+import android.view.Gravity;
+import androidx.annotation.AttrRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
import com.android.settings.R;
import com.android.settingslib.Utils;
+import com.google.common.base.Strings;
+
+import java.util.Locale;
+
class IconUtil {
- static Drawable applyTint(@NonNull Context context, @NonNull Drawable icon) {
+ static Drawable applyNormalTint(@NonNull Context context, @NonNull Drawable icon) {
+ return applyTint(context, icon, android.R.attr.colorControlNormal);
+ }
+
+ static Drawable applyAccentTint(@NonNull Context context, @NonNull Drawable icon) {
+ return applyTint(context, icon, android.R.attr.colorAccent);
+ }
+
+ private static Drawable applyTint(@NonNull Context context, @NonNull Drawable icon,
+ @AttrRes int colorAttr) {
icon = icon.mutate();
- icon.setTintList(
- Utils.getColorAttr(context, android.R.attr.colorControlNormal));
+ icon.setTintList(Utils.getColorAttr(context, colorAttr));
return icon;
}
/**
- * Returns a variant of the supplied {@code icon} to be used in the icon picker. The inner icon
- * is 36x36dp and it's contained into a circle of diameter 54dp.
+ * Returns a variant of the supplied mode icon to be used as the header in the mode page. The
+ * inner icon is 64x64 dp and it's contained in a 12-sided-cookie of 136dp diameter. It's
+ * tinted with the "material secondary" color combination and the "selected" color variant
+ * should be used for modes currently active.
*/
- static Drawable makeIconCircle(@NonNull Context context, @NonNull Drawable icon) {
- ShapeDrawable background = new ShapeDrawable(new OvalShape());
- background.getPaint().setColor(Utils.getColorAttrDefaultColor(context,
- com.android.internal.R.attr.materialColorSecondaryContainer));
- icon.setTint(Utils.getColorAttrDefaultColor(context,
- com.android.internal.R.attr.materialColorOnSecondaryContainer));
-
- LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] { background, icon });
-
- int circleDiameter = context.getResources().getDimensionPixelSize(
- R.dimen.zen_mode_icon_list_circle_diameter);
- int iconSize = context.getResources().getDimensionPixelSize(
- R.dimen.zen_mode_icon_list_icon_size);
- int iconPadding = (circleDiameter - iconSize) / 2;
- layerDrawable.setBounds(0, 0, circleDiameter, circleDiameter);
- layerDrawable.setLayerInset(1, iconPadding, iconPadding, iconPadding, iconPadding);
-
- return layerDrawable;
+ static Drawable makeModeHeader(@NonNull Context context, Drawable modeIcon) {
+ return composeIcons(
+ checkNotNull(context.getDrawable(R.drawable.ic_zen_mode_icon_cookie)),
+ context.getColorStateList(R.color.modes_icon_selectable_background),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_header_size),
+ modeIcon,
+ context.getColorStateList(R.color.modes_icon_selectable_icon),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_header_inner_icon_size));
}
- static Drawable makeIconCircle(@NonNull Context context, @DrawableRes int iconResId) {
- return makeIconCircle(context, checkNotNull(context.getDrawable(iconResId)));
+ /**
+ * Returns a variant of the supplied {@code icon} to be used as the header in the icon picker.
+ * The inner icon is 48x48dp and it's contained in a circle of diameter 90dp.
+ */
+ static Drawable makeIconPickerHeader(@NonNull Context context, Drawable icon) {
+ return composeIconCircle(
+ Utils.getColorAttr(context,
+ com.android.internal.R.attr.materialColorSecondaryContainer),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_icon_list_header_circle_diameter),
+ icon,
+ Utils.getColorAttr(context,
+ com.android.internal.R.attr.materialColorOnSecondaryContainer),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_icon_list_header_icon_size));
+ }
+
+ /**
+ * Returns a variant of the supplied {@code icon} to be used as an option in the icon picker.
+ * The inner icon is 36x36dp and it's contained in a circle of diameter 54dp. It's also set up
+ * so that selection and pressed states are represented in the color.
+ */
+ static Drawable makeIconPickerItem(@NonNull Context context, @DrawableRes int iconResId) {
+ return composeIconCircle(
+ context.getColorStateList(R.color.modes_icon_selectable_background),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_icon_list_item_circle_diameter),
+ checkNotNull(context.getDrawable(iconResId)),
+ context.getColorStateList(R.color.modes_icon_selectable_icon),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_icon_list_item_icon_size));
+ }
+
+ /**
+ * Returns a variant of the supplied icon to be used in a {@link CircularIconsPreference}. The
+ * inner icon is 20x20 dp and it's contained in a circle of diameter 32dp, and is tinted
+ * with the "material secondary" color combination.
+ */
+ static Drawable makeCircularIconPreferenceItem(@NonNull Context context,
+ @DrawableRes int iconResId) {
+ return composeIconCircle(
+ Utils.getColorAttr(context,
+ com.android.internal.R.attr.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.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_circular_icon_inner_icon_size));
+ }
+
+ /**
+ * Returns an icon representing a contact that doesn't have an associated photo, to be used in
+ * a {@link CircularIconsPreference}, tinted with the "material tertiary". If the contact's
+ * display name is not empty, it's the contact's monogram, otherwise it's a generic icon.
+ */
+ static Drawable makeContactMonogram(@NonNull Context context, @Nullable String displayName) {
+ Resources res = context.getResources();
+ if (Strings.isNullOrEmpty(displayName)) {
+ return composeIconCircle(
+ Utils.getColorAttr(context,
+ com.android.internal.R.attr.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),
+ res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_inner_icon_size));
+ }
+
+ float diameter = res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_diameter);
+ Bitmap bitmap = Bitmap.createBitmap((int) diameter, (int) diameter,
+ Bitmap.Config.ARGB_8888);
+ Canvas canvas = new Canvas(bitmap);
+
+ Paint circlePaint = new Paint();
+ circlePaint.setColor(Utils.getColorAttrDefaultColor(context,
+ com.android.internal.R.attr.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.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
+ textPaint.setTextAlign(Paint.Align.LEFT);
+ textPaint.setTextSize(res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_text_size));
+
+ String text = displayName.substring(0, 1).toUpperCase(Locale.getDefault());
+ Rect textRect = new Rect();
+ textPaint.getTextBounds(text, 0, text.length(), textRect);
+
+ float textX = diameter / 2f - textRect.width() / 2f - textRect.left;
+ float textY = diameter / 2f + textRect.height() / 2f - textRect.bottom;
+ canvas.drawText(text, textX, textY, textPaint);
+
+ return new BitmapDrawable(context.getResources(), bitmap);
+ }
+
+ private static Drawable composeIconCircle(ColorStateList circleColor, @Px int circleDiameterPx,
+ Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
+ return composeIcons(new ShapeDrawable(new OvalShape()), circleColor, circleDiameterPx, icon,
+ iconColor, iconSizePx);
+ }
+
+ private static Drawable composeIcons(Drawable outer, ColorStateList outerColor,
+ @Px int outerSizePx, Drawable icon, ColorStateList iconColor, @Px int iconSizePx) {
+ Drawable background = checkNotNull(outer.getConstantState()).newDrawable().mutate();
+ background.setTintList(outerColor);
+ Drawable foreground = checkNotNull(icon.getConstantState()).newDrawable().mutate();
+ foreground.setTintList(iconColor);
+
+ LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] { background, foreground });
+
+ layerDrawable.setLayerSize(0, outerSizePx, outerSizePx);
+ layerDrawable.setLayerGravity(1, Gravity.CENTER);
+ layerDrawable.setLayerSize(1, iconSizePx, iconSizePx);
+
+ layerDrawable.setBounds(0, 0, outerSizePx, outerSizePx);
+ return layerDrawable;
}
}
diff --git a/src/com/android/settings/notification/modes/InterruptionFilterPreferenceController.java b/src/com/android/settings/notification/modes/InterruptionFilterPreferenceController.java
new file mode 100644
index 0000000..9d4a172
--- /dev/null
+++ b/src/com/android/settings/notification/modes/InterruptionFilterPreferenceController.java
@@ -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.notification.modes;
+
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+class InterruptionFilterPreferenceController extends AbstractZenModePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ public InterruptionFilterPreferenceController(Context context, String key,
+ ZenModesBackend backend) {
+ super(context, key, backend);
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ return !zenMode.isManualDnd();
+ }
+
+ @Override
+ public void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ preference.setEnabled(zenMode.isEnabled());
+ boolean filteringNotifications = zenMode.getRule().getInterruptionFilter()
+ != INTERRUPTION_FILTER_ALL;
+ ((TwoStatePreference) preference).setChecked(filteringNotifications);
+ preference.setSummary(filteringNotifications ? "" :
+ mContext.getResources().getString(R.string.mode_no_notification_filter));
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean filterNotifications = ((Boolean) newValue);
+ return saveMode(zenMode -> {
+ zenMode.getRule().setInterruptionFilter(filterNotifications
+ ? INTERRUPTION_FILTER_PRIORITY
+ : INTERRUPTION_FILTER_ALL);
+ return zenMode;
+ });
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ManualDurationHelper.java b/src/com/android/settings/notification/modes/ManualDurationHelper.java
new file mode 100644
index 0000000..da9f420
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ManualDurationHelper.java
@@ -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.notification.modes;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.icu.text.MessageFormat;
+import android.net.Uri;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Class to contain shared utilities for reading and observing the Settings ZEN_DURATION value.
+ */
+class ManualDurationHelper {
+ private Context mContext;
+
+ ManualDurationHelper(@NonNull Context context) {
+ mContext = context;
+ }
+
+ int getZenDuration() {
+ return Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.ZEN_DURATION,
+ 0);
+ }
+
+ /**
+ * Generates a summary of the duration that manual DND will be on when turned on from
+ * quick settings, for example "Until you turn off" or "[number] hours", based on the given
+ * setting value.
+ */
+ public String getSummary() {
+ int zenDuration = getZenDuration();
+ String summary;
+ if (zenDuration < 0) {
+ summary = mContext.getString(R.string.zen_mode_duration_summary_always_prompt);
+ } else if (zenDuration == 0) {
+ summary = mContext.getString(R.string.zen_mode_duration_summary_forever);
+ } else {
+ if (zenDuration >= 60) {
+ MessageFormat msgFormat = new MessageFormat(
+ mContext.getString(R.string.zen_mode_duration_summary_time_hours),
+ Locale.getDefault());
+ Map<String, Object> msgArgs = new HashMap<>();
+ msgArgs.put("count", zenDuration / 60);
+ summary = msgFormat.format(msgArgs);
+ } else {
+ MessageFormat msgFormat = new MessageFormat(
+ mContext.getString(R.string.zen_mode_duration_summary_time_minutes),
+ Locale.getDefault());
+ Map<String, Object> msgArgs = new HashMap<>();
+ msgArgs.put("count", zenDuration);
+ summary = msgFormat.format(msgArgs);
+ }
+ }
+ return summary;
+ }
+
+ SettingsObserver makeSettingsObserver(@NonNull AbstractZenModePreferenceController controller) {
+ return new SettingsObserver(controller);
+ }
+
+ final class SettingsObserver extends ContentObserver {
+ private static final Uri ZEN_MODE_DURATION_URI = Settings.Secure.getUriFor(
+ Settings.Secure.ZEN_DURATION);
+
+ private final AbstractZenModePreferenceController mPrefController;
+ private Preference mPreference;
+
+ /**
+ * Create a settings observer attached to the provided PreferenceController, whose
+ * updateState method should be called onChange.
+ */
+ SettingsObserver(@NonNull AbstractZenModePreferenceController prefController) {
+ super(mContext.getMainExecutor(), 0);
+ mPrefController = prefController;
+ }
+
+ void setPreference(Preference preference) {
+ mPreference = preference;
+ }
+
+ public void register() {
+ mContext.getContentResolver().registerContentObserver(ZEN_MODE_DURATION_URI, false,
+ this);
+ }
+
+ public void unregister() {
+ mContext.getContentResolver().unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange, @Nullable Uri uri) {
+ super.onChange(selfChange, uri);
+ if (ZEN_MODE_DURATION_URI.equals(uri) && mPreference != null) {
+ mPrefController.updateState(mPreference);
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ManualDurationPreferenceController.java b/src/com/android/settings/notification/modes/ManualDurationPreferenceController.java
new file mode 100644
index 0000000..073f8ab
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ManualDurationPreferenceController.java
@@ -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.notification.modes;
+
+import android.content.Context;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.notification.zen.SettingsZenDurationDialog;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+public class ManualDurationPreferenceController extends AbstractZenModePreferenceController {
+ private static final String TAG = "QsDurationPrefController";
+
+ private final Fragment mParent;
+ private final ManualDurationHelper mDurationHelper;
+ private final ManualDurationHelper.SettingsObserver mSettingsObserver;
+
+ ManualDurationPreferenceController(Context context, String key, Fragment parent,
+ ZenModesBackend backend) {
+ super(context, key, backend);
+ mParent = parent;
+ mDurationHelper = new ManualDurationHelper(context);
+ mSettingsObserver = mDurationHelper.makeSettingsObserver(this);
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ if (!super.isAvailable(zenMode)) {
+ return false;
+ }
+ return zenMode.isManualDnd();
+ }
+
+ // Called by parent fragment onAttach().
+ void registerSettingsObserver() {
+ mSettingsObserver.register();
+ }
+
+ // Called by parent fragment onDetach().
+ void unregisterSettingsObserver() {
+ mSettingsObserver.unregister();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ Preference pref = screen.findPreference(getPreferenceKey());
+ if (pref != null) {
+ mSettingsObserver.setPreference(pref);
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference, ZenMode unusedZenMode) {
+ // This controller is a link between a Settings value (ZEN_DURATION) and the manual DND
+ // mode. The status of the zen mode object itself doesn't affect the preference
+ // value, as that comes from settings; that value from settings will determine the
+ // condition that is attached to the mode on manual activation. Thus we ignore the actual
+ // zen mode value provided here.
+ preference.setSummary(mDurationHelper.getSummary());
+ preference.setOnPreferenceClickListener(pref -> {
+ // The new setting value is set by the dialog, so we don't need to do it here.
+ final SettingsZenDurationDialog durationDialog = new SettingsZenDurationDialog();
+ durationDialog.show(mParent.getParentFragmentManager(), TAG);
+ return true;
+ });
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenHelperBackend.java b/src/com/android/settings/notification/modes/ZenHelperBackend.java
new file mode 100644
index 0000000..a2c3578
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenHelperBackend.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.notification.modes;
+
+import android.annotation.Nullable;
+import android.app.INotificationManager;
+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.provider.ContactsContract;
+import android.service.notification.ConversationChannelWrapper;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Class used for Settings-system_server interactions that are not <em>directly</em> related to
+ * Mode management, but still used in the UI of its Settings pages (such as listing priority
+ * conversations, contacts, etc).
+ */
+class ZenHelperBackend {
+
+ private static final String TAG = "ZenHelperBackend";
+
+ @Nullable // Until first usage
+ private static ZenHelperBackend sInstance;
+
+ private final Context mContext;
+ private final INotificationManager mInm;
+
+ static ZenHelperBackend getInstance(Context context) {
+ if (sInstance == null) {
+ sInstance = new ZenHelperBackend(context.getApplicationContext());
+ }
+ return sInstance;
+ }
+
+ ZenHelperBackend(Context context) {
+ mContext = context;
+ mInm = INotificationManager.Stub.asInterface(
+ ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+ }
+
+ /**
+ * Returns all of a user's packages that have at least one channel that will bypass DND
+ */
+ List<String> getPackagesBypassingDnd(int userId,
+ boolean includeConversationChannels) {
+ try {
+ return mInm.getPackagesBypassingDnd(userId, includeConversationChannels);
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return new ArrayList<>();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ ImmutableList<ConversationChannelWrapper> getImportantConversations() {
+ try {
+ ImmutableList.Builder<ConversationChannelWrapper> list = new ImmutableList.Builder<>();
+ ParceledListSlice<ConversationChannelWrapper> parceledList = mInm.getConversations(
+ /* onlyImportant= */ true);
+ if (parceledList != null) {
+ for (ConversationChannelWrapper conversation : parceledList.getList()) {
+ if (!conversation.getNotificationChannel().isDemoted()) {
+ list.add(conversation);
+ }
+ }
+ }
+ return list.build();
+ } catch (Exception e) {
+ Log.w(TAG, "Error calling NoMan", e);
+ return ImmutableList.of();
+ }
+ }
+
+ record Contact(long id, @Nullable String displayName, @Nullable Uri photoUri) { }
+
+ ImmutableList<Contact> getAllContacts() {
+ try (Cursor cursor = queryAllContactsData()) {
+ return getContactsFromCursor(cursor);
+ }
+ }
+
+ ImmutableList<Contact> getStarredContacts() {
+ try (Cursor cursor = queryStarredContactsData()) {
+ return getContactsFromCursor(cursor);
+ }
+ }
+
+ private ImmutableList<Contact> getContactsFromCursor(Cursor cursor) {
+ ImmutableList.Builder<Contact> list = new ImmutableList.Builder<>();
+ 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));
+ } while (cursor.moveToNext());
+ }
+ return list.build();
+ }
+
+ int getAllContactsCount() {
+ try (Cursor cursor = queryAllContactsData()) {
+ return cursor != null ? cursor.getCount() : 0;
+ }
+ }
+
+ private static final String[] CONTACTS_PROJECTION = new String[] {
+ ContactsContract.Contacts._ID,
+ ContactsContract.Contacts.DISPLAY_NAME_PRIMARY,
+ ContactsContract.Contacts.PHOTO_THUMBNAIL_URI
+ };
+
+ private Cursor queryStarredContactsData() {
+ return mContext.getContentResolver().query(
+ ContactsContract.Contacts.CONTENT_URI,
+ CONTACTS_PROJECTION,
+ /* selection= */ ContactsContract.Data.STARRED + "=1", /* selectionArgs= */ null,
+ /* sortOrder= */ ContactsContract.Contacts.DISPLAY_NAME_PRIMARY);
+ }
+
+ private Cursor queryAllContactsData() {
+ return mContext.getContentResolver().query(
+ ContactsContract.Contacts.CONTENT_URI,
+ CONTACTS_PROJECTION,
+ /* selection= */ null, /* selectionArgs= */ null,
+ /* sortOrder= */ ContactsContract.Contacts.DISPLAY_NAME_PRIMARY);
+ }
+
+ @NonNull
+ Drawable getContactPhoto(Contact contact) {
+ if (contact.photoUri != null) {
+ try (InputStream is = mContext.getContentResolver().openInputStream(contact.photoUri)) {
+ if (is != null) {
+ RoundedBitmapDrawable rbd = RoundedBitmapDrawableFactory.create(
+ mContext.getResources(), is);
+ if (rbd != null && rbd.getBitmap() != null) {
+ rbd.setCircular(true);
+ return rbd;
+ }
+ }
+ } catch (IOException e) {
+ Log.w(TAG, "Couldn't load photo for " + contact, e);
+ }
+ }
+
+ // Fall back to a monogram if no picture.
+ return IconUtil.makeContactMonogram(mContext, contact.displayName);
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenMode.java b/src/com/android/settings/notification/modes/ZenMode.java
deleted file mode 100644
index cbe915b..0000000
--- a/src/com/android/settings/notification/modes/ZenMode.java
+++ /dev/null
@@ -1,244 +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.notification.modes;
-
-import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-
-import static java.util.Objects.requireNonNull;
-
-import android.annotation.SuppressLint;
-import android.app.AutomaticZenRule;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.service.notification.ZenDeviceEffects;
-import android.service.notification.ZenPolicy;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.android.settings.R;
-
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-
-import java.util.Objects;
-
-/**
- * Represents either an {@link AutomaticZenRule} or the manual DND rule in a unified way.
- *
- * <p>It also adapts other rule features that we don't want to expose in the UI, such as
- * interruption filters other than {@code PRIORITY}, rules without specific icons, etc.
- */
-class ZenMode {
-
- private static final String TAG = "ZenMode";
-
- /**
- * Additional value for the {@code @ZenPolicy.ChannelType} enumeration that indicates that all
- * channels can bypass DND when this policy is active.
- *
- * <p>This value shouldn't be used on "real" ZenPolicy objects sent to or returned from
- * {@link android.app.NotificationManager}; it's a way of representing rules with interruption
- * filter = {@link NotificationManager#INTERRUPTION_FILTER_ALL} in the UI.
- */
- public static final int CHANNEL_POLICY_ALL = -1;
-
- static final String MANUAL_DND_MODE_ID = "manual_dnd";
-
- @SuppressLint("WrongConstant")
- private static final ZenPolicy POLICY_INTERRUPTION_FILTER_ALL =
- new ZenPolicy.Builder()
- .allowChannels(CHANNEL_POLICY_ALL)
- .allowAllSounds()
- .showAllVisualEffects()
- .build();
-
- // Must match com.android.server.notification.ZenModeHelper#applyCustomPolicy.
- private static final ZenPolicy POLICY_INTERRUPTION_FILTER_ALARMS =
- new ZenPolicy.Builder()
- .disallowAllSounds()
- .allowAlarms(true)
- .allowMedia(true)
- .allowPriorityChannels(false)
- .build();
-
- // Must match com.android.server.notification.ZenModeHelper#applyCustomPolicy.
- private static final ZenPolicy POLICY_INTERRUPTION_FILTER_NONE =
- new ZenPolicy.Builder()
- .disallowAllSounds()
- .hideAllVisualEffects()
- .allowPriorityChannels(false)
- .build();
-
- private final String mId;
- private AutomaticZenRule mRule;
- private final boolean mIsActive;
- private final boolean mIsManualDnd;
-
- ZenMode(String id, AutomaticZenRule rule, boolean isActive) {
- this(id, rule, isActive, false);
- }
-
- private ZenMode(String id, AutomaticZenRule rule, boolean isActive, boolean isManualDnd) {
- mId = id;
- mRule = rule;
- mIsActive = isActive;
- mIsManualDnd = isManualDnd;
- }
-
- static ZenMode manualDndMode(AutomaticZenRule manualRule, boolean isActive) {
- return new ZenMode(MANUAL_DND_MODE_ID, manualRule, isActive, true);
- }
-
- @NonNull
- public String getId() {
- return mId;
- }
-
- @NonNull
- public AutomaticZenRule getRule() {
- return mRule;
- }
-
- @NonNull
- public ListenableFuture<Drawable> getIcon(@NonNull Context context,
- @NonNull IconLoader iconLoader) {
- if (mIsManualDnd) {
- return Futures.immediateFuture(requireNonNull(
- context.getDrawable(R.drawable.ic_do_not_disturb_on_24dp)));
- }
-
- return iconLoader.getIcon(context, mRule);
- }
-
- @NonNull
- public ZenPolicy getPolicy() {
- switch (mRule.getInterruptionFilter()) {
- case INTERRUPTION_FILTER_PRIORITY:
- return requireNonNull(mRule.getZenPolicy());
-
- case NotificationManager.INTERRUPTION_FILTER_ALL:
- return POLICY_INTERRUPTION_FILTER_ALL;
-
- case NotificationManager.INTERRUPTION_FILTER_ALARMS:
- return POLICY_INTERRUPTION_FILTER_ALARMS;
-
- case NotificationManager.INTERRUPTION_FILTER_NONE:
- return POLICY_INTERRUPTION_FILTER_NONE;
-
- case NotificationManager.INTERRUPTION_FILTER_UNKNOWN:
- default:
- Log.wtf(TAG, "Rule " + mId + " with unexpected interruptionFilter "
- + mRule.getInterruptionFilter());
- return requireNonNull(mRule.getZenPolicy());
- }
- }
-
- /**
- * Updates the {@link ZenPolicy} of the associated {@link AutomaticZenRule} based on the
- * supplied policy. In some cases this involves conversions, so that the following call
- * to {@link #getPolicy} might return a different policy from the one supplied here.
- */
- @SuppressLint("WrongConstant")
- public void setPolicy(@NonNull ZenPolicy policy) {
- ZenPolicy currentPolicy = getPolicy();
- if (currentPolicy.equals(policy)) {
- return;
- }
-
- // A policy with CHANNEL_POLICY_ALL is only a UI representation of the
- // INTERRUPTION_FILTER_ALL filter. Thus, switching to or away to this value only updates
- // the filter, discarding the rest of the supplied policy.
- if (policy.getAllowedChannels() == CHANNEL_POLICY_ALL
- && currentPolicy.getAllowedChannels() != CHANNEL_POLICY_ALL) {
- if (mIsManualDnd) {
- throw new IllegalArgumentException("Manual DND cannot have CHANNEL_POLICY_ALL");
- }
- mRule.setInterruptionFilter(INTERRUPTION_FILTER_ALL);
- // Preserve the existing policy, e.g. if the user goes PRIORITY -> ALL -> PRIORITY that
- // shouldn't discard all other policy customizations. The existing policy will be a
- // synthetic one if the rule originally had filter NONE or ALARMS_ONLY and that's fine.
- if (mRule.getZenPolicy() == null) {
- mRule.setZenPolicy(currentPolicy);
- }
- return;
- } else if (policy.getAllowedChannels() != CHANNEL_POLICY_ALL
- && currentPolicy.getAllowedChannels() == CHANNEL_POLICY_ALL) {
- mRule.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
- // Go back to whatever policy the rule had before, unless the rule never had one, in
- // which case we use the supplied policy (which we know has a valid allowedChannels).
- if (mRule.getZenPolicy() == null) {
- mRule.setZenPolicy(policy);
- }
- return;
- }
-
- // If policy is customized from any of the "special" ones, make the rule PRIORITY.
- if (mRule.getInterruptionFilter() != INTERRUPTION_FILTER_PRIORITY) {
- mRule.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
- }
- mRule.setZenPolicy(policy);
- }
-
- @NonNull
- public ZenDeviceEffects getDeviceEffects() {
- return mRule.getDeviceEffects() != null
- ? mRule.getDeviceEffects()
- : new ZenDeviceEffects.Builder().build();
- }
-
- public boolean canEditName() {
- return !isManualDnd();
- }
-
- public boolean canEditIcon() {
- return !isManualDnd();
- }
-
- public boolean canBeDeleted() {
- return !mIsManualDnd;
- }
-
- public boolean isManualDnd() {
- return mIsManualDnd;
- }
-
- public boolean isActive() {
- return mIsActive;
- }
-
- @Override
- public boolean equals(@Nullable Object obj) {
- return obj instanceof ZenMode other
- && mId.equals(other.mId)
- && mRule.equals(other.mRule)
- && mIsActive == other.mIsActive;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(mId, mRule, mIsActive);
- }
-
- @Override
- public String toString() {
- return mId + "(" + (mIsActive ? "active" : "inactive") + ") -> " + mRule;
- }
-}
diff --git a/src/com/android/settings/notification/modes/ZenModeActionsPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeActionsPreferenceController.java
deleted file mode 100644
index 8585234..0000000
--- a/src/com/android/settings/notification/modes/ZenModeActionsPreferenceController.java
+++ /dev/null
@@ -1,62 +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.notification.modes;
-
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settingslib.widget.ActionButtonsPreference;
-
-class ZenModeActionsPreferenceController extends AbstractZenModePreferenceController {
-
- ZenModeActionsPreferenceController(@NonNull Context context, @NonNull String key,
- @Nullable ZenModesBackend backend) {
- super(context, key, backend);
- }
-
- @Override
- void updateState(Preference preference, @NonNull ZenMode zenMode) {
- ActionButtonsPreference buttonsPreference = (ActionButtonsPreference) preference;
-
- // TODO: b/346278854 - Add rename action (with setButton1Enabled(zenMode.canEditName())
- buttonsPreference.setButton1Text(R.string.zen_mode_action_change_name);
- buttonsPreference.setButton1Icon(R.drawable.ic_mode_edit);
- buttonsPreference.setButton1Enabled(false);
-
- buttonsPreference.setButton2Text(R.string.zen_mode_action_change_icon);
- buttonsPreference.setButton2Icon(R.drawable.ic_zen_mode_action_change_icon);
- buttonsPreference.setButton2Enabled(zenMode.canEditIcon());
- buttonsPreference.setButton2OnClickListener(v -> {
- Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
- new SubSettingLauncher(mContext)
- .setDestination(ZenModeIconPickerFragment.class.getName())
- // TODO: b/332937635 - Update metrics category
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .launch();
- });
- }
-}
diff --git a/src/com/android/settings/notification/modes/ZenModeAppsFragment.java b/src/com/android/settings/notification/modes/ZenModeAppsFragment.java
index 73329a2..19035dd 100644
--- a/src/com/android/settings/notification/modes/ZenModeAppsFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeAppsFragment.java
@@ -37,10 +37,6 @@
context, ZenModeAppsPreferenceController.KEY_PRIORITY, mBackend));
controllers.add(new ZenModeAppsPreferenceController(
context, ZenModeAppsPreferenceController.KEY_NONE, mBackend));
- // TODO: b/308819928 - The manual DND mode cannot have the ALL type;
- // unify the controllers into one and only create a preference if isManualDnd is false.
- controllers.add(new ZenModeAppsPreferenceController(
- context, ZenModeAppsPreferenceController.KEY_ALL, mBackend));
return controllers;
}
diff --git a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
index 581fff5..1521a8b 100644
--- a/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceController.java
@@ -16,27 +16,38 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+import android.app.Application;
import android.content.Context;
import android.os.Bundle;
-import android.util.ArraySet;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.service.notification.ZenPolicy;
+import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import androidx.core.text.BidiFormatter;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.NotificationBackend;
+import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+import com.google.common.base.Equivalence;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Multimap;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Comparator;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.Objects;
/**
* Preference with a link and summary about what apps can break through the mode
@@ -46,36 +57,67 @@
private static final String TAG = "ZenModeAppsLinkPreferenceController";
private final ZenModeSummaryHelper mSummaryHelper;
+ private final ApplicationsState mApplicationsState;
+ private final UserManager mUserManager;
private ApplicationsState.Session mAppSession;
- private NotificationBackend mNotificationBackend = new NotificationBackend();
+ private final ZenHelperBackend mHelperBackend;
private ZenMode mZenMode;
- private Preference mPreference;
+ private CircularIconsPreference mPreference;
+ private final Fragment mHost;
ZenModeAppsLinkPreferenceController(Context context, String key, Fragment host,
- ApplicationsState applicationsState, ZenModesBackend backend) {
+ ZenModesBackend backend, ZenHelperBackend helperBackend) {
+ this(context, key, host,
+ ApplicationsState.getInstance((Application) context.getApplicationContext()),
+ backend, helperBackend);
+ }
+
+ @VisibleForTesting
+ ZenModeAppsLinkPreferenceController(Context context, String key, Fragment host,
+ ApplicationsState applicationsState, ZenModesBackend backend,
+ ZenHelperBackend helperBackend) {
super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(mContext, mBackend);
- if (applicationsState != null && host != null) {
- mAppSession = applicationsState.newSession(mAppSessionCallbacks, host.getLifecycle());
- }
+ mSummaryHelper = new ZenModeSummaryHelper(mContext, helperBackend);
+ mHelperBackend = helperBackend;
+ mApplicationsState = applicationsState;
+ mUserManager = context.getSystemService(UserManager.class);
+ mHost = host;
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ return zenMode.getRule().getInterruptionFilter() != INTERRUPTION_FILTER_ALL;
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
- preference.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModeAppsFragment.class.getName())
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
+ preference.setIntent(
+ ZenSubSettingLauncher.forModeFragment(mContext, ZenModeAppsFragment.class,
+ zenMode.getId(), 0).toIntent());
+ preference.setEnabled(zenMode.isEnabled());
+
mZenMode = zenMode;
- mPreference = preference;
- triggerUpdateAppsBypassingDndSummaryText();
+ mPreference = (CircularIconsPreference) preference;
+
+ if (zenMode.getPolicy().getAllowedChannels() == ZenPolicy.CHANNEL_POLICY_NONE) {
+ mPreference.setSummary(R.string.zen_mode_apps_none_apps);
+ mPreference.displayIcons(CircularIconSet.EMPTY);
+ } else {
+ if (TextUtils.isEmpty(mPreference.getSummary())) {
+ mPreference.setSummary(R.string.zen_mode_apps_calculating);
+ }
+ if (mApplicationsState != null && mHost != null) {
+ mAppSession = mApplicationsState.newSession(mAppSessionCallbacks,
+ mHost.getLifecycle());
+ }
+ triggerUpdateAppsBypassingDnd();
+ }
}
- private void triggerUpdateAppsBypassingDndSummaryText() {
+ private void triggerUpdateAppsBypassingDnd() {
if (mAppSession == null) {
return;
}
@@ -90,64 +132,84 @@
mAppSession.rebuild(filter, ApplicationsState.ALPHA_COMPARATOR, false);
}
- private void updateAppsBypassingDndSummaryText(List<ApplicationsState.AppEntry> apps) {
- Set<String> appNames = getAppsBypassingDnd(apps);
- mPreference.setSummary(mSummaryHelper.getAppsSummary(mZenMode, appNames));
+ private void displayAppsBypassingDnd(List<AppEntry> allApps) {
+ ImmutableList<AppEntry> apps = getAppsBypassingDndSortedByName(allApps);
+
+ mPreference.setSummary(mSummaryHelper.getAppsSummary(mZenMode, apps));
+
+ mPreference.displayIcons(new CircularIconSet<>(apps,
+ app -> Utils.getBadgedIcon(mContext, app.info)),
+ APP_ENTRY_EQUIVALENCE);
}
@VisibleForTesting
- ArraySet<String> getAppsBypassingDnd(@NonNull List<ApplicationsState.AppEntry> apps) {
- ArraySet<String> appsBypassingDnd = new ArraySet<>();
+ ImmutableList<AppEntry> getAppsBypassingDndSortedByName(@NonNull List<AppEntry> allApps) {
+ Multimap<Integer, String> packagesBypassingDnd = HashMultimap.create();
+ for (UserHandle userHandle : mUserManager.getUserProfiles()) {
+ packagesBypassingDnd.putAll(userHandle.getIdentifier(),
+ mHelperBackend.getPackagesBypassingDnd(userHandle.getIdentifier(),
+ /* includeConversationChannels= */ false));
+ }
- Map<String, String> pkgLabelMap = new HashMap<String, String>();
- for (ApplicationsState.AppEntry entry : apps) {
- if (entry.info != null) {
- pkgLabelMap.put(entry.info.packageName, entry.label);
- }
- }
- for (String pkg : mNotificationBackend.getPackagesBypassingDnd(mContext.getUserId(),
- /* includeConversationChannels= */ false)) {
- // Settings may hide some packages from the user, so if they're not present here
- // we skip displaying them, even if they bypass dnd.
- if (pkgLabelMap.get(pkg) == null) {
- continue;
- }
- appsBypassingDnd.add(BidiFormatter.getInstance().unicodeWrap(pkgLabelMap.get(pkg)));
- }
- return appsBypassingDnd;
+ return ImmutableList.copyOf(
+ allApps.stream()
+ .filter(app -> packagesBypassingDnd.containsEntry(
+ UserHandle.getUserId(app.info.uid), app.info.packageName))
+ .sorted(Comparator.comparing((AppEntry app) -> app.label)
+ .thenComparing(app -> UserHandle.getUserId(app.info.uid)))
+ .toList());
}
- @VisibleForTesting final ApplicationsState.Callbacks mAppSessionCallbacks =
+ private static final Equivalence<AppEntry> APP_ENTRY_EQUIVALENCE = new Equivalence<>() {
+ @Override
+ protected boolean doEquivalent(@NonNull AppEntry a, @NonNull AppEntry b) {
+ return a.info.uid == b.info.uid
+ && Objects.equals(a.info.packageName, b.info.packageName);
+ }
+
+ @Override
+ protected int doHash(@NonNull AppEntry entry) {
+ return Objects.hash(entry.info.uid, entry.info.packageName);
+ }
+ };
+
+ @VisibleForTesting
+ final ApplicationsState.Callbacks mAppSessionCallbacks =
new ApplicationsState.Callbacks() {
@Override
- public void onRunningStateChanged(boolean running) { }
+ public void onRunningStateChanged(boolean running) {
+ }
@Override
public void onPackageListChanged() {
- triggerUpdateAppsBypassingDndSummaryText();
+ triggerUpdateAppsBypassingDnd();
}
@Override
public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> apps) {
- updateAppsBypassingDndSummaryText(apps);
+ displayAppsBypassingDnd(apps);
}
@Override
- public void onPackageIconChanged() { }
+ public void onPackageIconChanged() {
+ }
@Override
- public void onPackageSizeChanged(String packageName) { }
+ public void onPackageSizeChanged(String packageName) {
+ }
@Override
- public void onAllSizesComputed() { }
+ public void onAllSizesComputed() {
+ }
@Override
- public void onLauncherInfoChanged() { }
+ public void onLauncherInfoChanged() {
+ }
@Override
public void onLoadEntriesCompleted() {
- triggerUpdateAppsBypassingDndSummaryText();
+ triggerUpdateAppsBypassingDnd();
}
};
}
diff --git a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
index 704bce0..522f191 100644
--- a/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeAppsPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -24,13 +24,14 @@
import android.service.notification.ZenPolicy;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
public class ZenModeAppsPreferenceController extends
@@ -38,13 +39,11 @@
static final String KEY_PRIORITY = "zen_mode_apps_priority";
static final String KEY_NONE = "zen_mode_apps_none";
- static final String KEY_ALL = "zen_mode_apps_all";
String mModeId;
-
public ZenModeAppsPreferenceController(@NonNull Context context,
- @NonNull String key, @Nullable ZenModesBackend backend) {
+ @NonNull String key, @NonNull ZenModesBackend backend) {
super(context, key, backend);
}
@@ -79,13 +78,6 @@
== ZenPolicy.CHANNEL_POLICY_NONE;
pref.setChecked(policy_none);
break;
- case KEY_ALL:
- // A UI-only setting; the underlying policy never actually has this value,
- // but ZenMode acts as though it does for the sake of UI consistency.
- boolean policy_all = zenMode.getPolicy().getAllowedChannels()
- == ZenMode.CHANNEL_POLICY_ALL;
- pref.setChecked(policy_all);
- break;
}
}
@@ -96,8 +88,6 @@
return savePolicy(p -> p.allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY));
case KEY_NONE:
return savePolicy(p -> p.allowChannels(ZenPolicy.CHANNEL_POLICY_NONE));
- case KEY_ALL:
- return savePolicy(p -> p.allowChannels(ZenMode.CHANNEL_POLICY_ALL));
}
return true;
}
@@ -114,7 +104,7 @@
private void launchPrioritySettings() {
Bundle bundle = new Bundle();
if (mModeId != null) {
- bundle.putString(MODE_ID, mModeId);
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, mModeId);
}
// TODO(b/332937635): Update metrics category
new SubSettingLauncher(mContext)
diff --git a/src/com/android/settings/notification/modes/ZenModeBlurbPreference.java b/src/com/android/settings/notification/modes/ZenModeBlurbPreference.java
new file mode 100644
index 0000000..5850ae6
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeBlurbPreference.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.modes;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.TopIntroPreference;
+
+public class ZenModeBlurbPreference extends TopIntroPreference {
+
+ public ZenModeBlurbPreference(Context context) {
+ super(context);
+ }
+
+ public ZenModeBlurbPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ if (holder.findViewById(android.R.id.title) instanceof TextView textView) {
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+ getContext().getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_blurb_text_size));
+
+ textView.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+
+ ViewGroup.LayoutParams layoutParams = textView.getLayoutParams();
+ if (layoutParams.width != MATCH_PARENT) {
+ layoutParams.width = MATCH_PARENT;
+ textView.setLayoutParams(layoutParams);
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java
new file mode 100644
index 0000000..097b40d
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeBlurbPreferenceController.java
@@ -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.notification.modes;
+
+import static android.app.AutomaticZenRule.TYPE_BEDTIME;
+import static android.app.AutomaticZenRule.TYPE_DRIVING;
+import static android.app.AutomaticZenRule.TYPE_IMMERSIVE;
+import static android.app.AutomaticZenRule.TYPE_MANAGED;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
+import static android.app.AutomaticZenRule.TYPE_THEATER;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+
+class ZenModeBlurbPreferenceController extends AbstractZenModePreferenceController {
+
+ ZenModeBlurbPreferenceController(@NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ preference.setTitle(getModeBlurb(zenMode));
+ }
+
+ @StringRes
+ @SuppressLint("SwitchIntDef")
+ private static int getModeBlurb(ZenMode mode) {
+ if (mode.isSystemOwned()) {
+ return switch (mode.getType()) {
+ case TYPE_SCHEDULE_TIME -> R.string.zen_mode_blurb_schedule_time;
+ case TYPE_SCHEDULE_CALENDAR -> R.string.zen_mode_blurb_schedule_calendar;
+ default -> R.string.zen_mode_blurb_generic; // Custom Manual
+ };
+ } else {
+ return switch (mode.getType()) {
+ case TYPE_BEDTIME -> R.string.zen_mode_blurb_bedtime;
+ case TYPE_DRIVING -> R.string.zen_mode_blurb_driving;
+ case TYPE_IMMERSIVE -> R.string.zen_mode_blurb_immersive;
+ case TYPE_THEATER -> R.string.zen_mode_blurb_theater;
+ case TYPE_MANAGED -> R.string.zen_mode_blurb_managed;
+ default -> R.string.zen_mode_blurb_generic; // Including OTHER, UNKNOWN.
+ };
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java
index 1846dfc..998b596 100644
--- a/src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeButtonPreferenceController.java
@@ -16,26 +16,42 @@
package com.android.settings.notification.modes;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import android.annotation.NonNull;
import android.content.Context;
+import android.provider.Settings;
import android.widget.Button;
+import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settings.notification.SettingsEnableZenModeDialog;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.LayoutPreference;
-public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController {
+import java.time.Duration;
+
+class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController {
+ private static final String TAG = "ZenModeButtonPrefController";
private Button mZenButton;
+ private final Fragment mParent;
+ private final ManualDurationHelper mDurationHelper;
- public ZenModeButtonPreferenceController(Context context, String key, ZenModesBackend backend) {
+ ZenModeButtonPreferenceController(Context context, String key, Fragment parent,
+ ZenModesBackend backend) {
super(context, key, backend);
+ mParent = parent;
+ mDurationHelper = new ManualDurationHelper(context);
}
@Override
public boolean isAvailable(ZenMode zenMode) {
- return zenMode.getRule().isManualInvocationAllowed() && zenMode.getRule().isEnabled();
+ return zenMode.isEnabled()
+ && (zenMode.isActive() || zenMode.getRule().isManualInvocationAllowed());
}
@Override
@@ -44,10 +60,27 @@
mZenButton = ((LayoutPreference) preference).findViewById(R.id.activate_mode);
}
mZenButton.setOnClickListener(v -> {
+ checkNotNull(mBackend, "Backend not available!");
if (zenMode.isActive()) {
mBackend.deactivateMode(zenMode);
} else {
- mBackend.activateMode(zenMode, null);
+ if (zenMode.isManualDnd()) {
+ // if manual DND, potentially ask for or use desired duration
+ int zenDuration = mDurationHelper.getZenDuration();
+ switch (zenDuration) {
+ case Settings.Secure.ZEN_DURATION_PROMPT:
+ new SettingsEnableZenModeDialog().show(
+ mParent.getParentFragmentManager(), TAG);
+ break;
+ case Settings.Secure.ZEN_DURATION_FOREVER:
+ mBackend.activateMode(zenMode, null);
+ break;
+ default:
+ mBackend.activateMode(zenMode, Duration.ofMinutes(zenDuration));
+ }
+ } else {
+ mBackend.activateMode(zenMode, null);
+ }
}
});
if (zenMode.isActive()) {
diff --git a/src/com/android/settings/notification/modes/ZenModeCallsFragment.java b/src/com/android/settings/notification/modes/ZenModeCallsFragment.java
index 4c85bf5..54072ac 100644
--- a/src/com/android/settings/notification/modes/ZenModeCallsFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeCallsFragment.java
@@ -18,6 +18,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,7 +35,7 @@
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePrioritySendersPreferenceController(context,
- "zen_mode_settings_category_calls", false, mBackend));
+ "zen_mode_settings_category_calls", false, mBackend, mHelperBackend));
controllers.add(new ZenModeRepeatCallersPreferenceController(context,
"zen_mode_repeat_callers", mBackend,
context.getResources().getInteger(com.android.internal.R.integer
diff --git a/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java
index 746af44..d885019 100644
--- a/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.content.Context;
import android.os.Bundle;
@@ -25,21 +25,22 @@
import androidx.preference.Preference;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.notification.modes.ZenMode;
class ZenModeCallsLinkPreferenceController extends AbstractZenModePreferenceController {
private final ZenModeSummaryHelper mSummaryHelper;
public ZenModeCallsLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(context, backend);
+ ZenHelperBackend helperBackend) {
+ super(context, key);
+ mSummaryHelper = new ZenModeSummaryHelper(context, helperBackend);
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
preference.setIntent(new SubSettingLauncher(mContext)
.setDestination(ZenModeCallsFragment.class.getName())
diff --git a/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceController.java
index bca7b55..b0d3952 100644
--- a/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceController.java
@@ -23,7 +23,10 @@
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-public class ZenModeDisplayEffectPreferenceController extends AbstractZenModePreferenceController
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+class ZenModeDisplayEffectPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
public ZenModeDisplayEffectPreferenceController(Context context, String key,
@@ -34,24 +37,20 @@
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
TwoStatePreference pref = (TwoStatePreference) preference;
- ZenDeviceEffects effects = zenMode.getRule().getDeviceEffects();
- if (effects == null) {
- pref.setChecked(false);
- } else {
- switch (getPreferenceKey()) {
- case "effect_greyscale":
- pref.setChecked(effects.shouldDisplayGrayscale());
- break;
- case "effect_aod":
- pref.setChecked(effects.shouldSuppressAmbientDisplay());
- break;
- case "effect_wallpaper":
- pref.setChecked(effects.shouldDimWallpaper());
- break;
- case "effect_dark_theme":
- pref.setChecked(effects.shouldUseNightMode());
- break;
- }
+ ZenDeviceEffects effects = zenMode.getDeviceEffects();
+ switch (getPreferenceKey()) {
+ case "effect_greyscale":
+ pref.setChecked(effects.shouldDisplayGrayscale());
+ break;
+ case "effect_aod":
+ pref.setChecked(effects.shouldSuppressAmbientDisplay());
+ break;
+ case "effect_wallpaper":
+ pref.setChecked(effects.shouldDimWallpaper());
+ break;
+ case "effect_dark_theme":
+ pref.setChecked(effects.shouldUseNightMode());
+ break;
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java b/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java
index 0972049..38ac8f3 100644
--- a/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeDisplayFragment.java
@@ -18,6 +18,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,7 +35,7 @@
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> prefControllers = new ArrayList<>();
prefControllers.add(new ZenModeNotifVisLinkPreferenceController(
- context, "notification_visibility", mBackend));
+ context, "notification_visibility", mHelperBackend));
prefControllers.add(new ZenModeDisplayEffectPreferenceController(
context, "effect_greyscale", mBackend));
prefControllers.add(new ZenModeDisplayEffectPreferenceController(
diff --git a/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java
index 8720a4b..bba5e34 100644
--- a/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.content.Context;
import android.os.Bundle;
@@ -24,28 +24,28 @@
import androidx.annotation.NonNull;
import androidx.preference.Preference;
-import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
class ZenModeDisplayLinkPreferenceController extends AbstractZenModePreferenceController {
private final ZenModeSummaryHelper mSummaryHelper;
public ZenModeDisplayLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
+ ZenModesBackend backend, ZenHelperBackend helperBackend) {
super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(context, backend);
+ mSummaryHelper = new ZenModeSummaryHelper(context, helperBackend);
}
@Override
void updateState(Preference preference, @NonNull ZenMode zenMode) {
Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
- preference.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModeDisplayFragment.class.getName())
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
+ preference.setIntent(
+ ZenSubSettingLauncher.forModeFragment(mContext, ZenModeDisplayFragment.class,
+ zenMode.getId(), 0).toIntent());
+ preference.setEnabled(zenMode.isEnabled());
}
@Override
diff --git a/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.java
new file mode 100644
index 0000000..de1adc7
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceController.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.modes;
+
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+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;
+
+class ZenModeEditDonePreferenceController extends AbstractZenModePreferenceController {
+
+ private final Runnable mConfirmSave;
+ @Nullable private Button mButton;
+
+ ZenModeEditDonePreferenceController(@NonNull Context context, @NonNull String key,
+ Runnable confirmSave) {
+ super(context, key);
+ mConfirmSave = confirmSave;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ LayoutPreference pref = screen.findPreference(getPreferenceKey());
+ if (pref != null) {
+ mButton = pref.findViewById(R.id.done);
+ if (mButton != null) {
+ mButton.setOnClickListener(v -> mConfirmSave.run());
+ }
+ }
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ if (mButton != null) {
+ mButton.setEnabled(!zenMode.getName().isBlank());
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.java
new file mode 100644
index 0000000..a0c2cf1
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragment.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.modes;
+
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
+import android.app.settings.SettingsEnums;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+
+public class ZenModeEditNameIconFragment extends ZenModeEditNameIconFragmentBase {
+
+ @Nullable
+ @Override
+ protected ZenMode onCreateInstantiateZenMode() {
+ String modeId = getModeIdFromArguments();
+ return modeId != null ? requireBackend().getMode(modeId) : null;
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ requireActivity().setTitle(R.string.zen_mode_rename_title);
+ }
+
+ @Override
+ void saveMode(ZenMode mode) {
+ String modeId = getModeIdFromArguments();
+ ZenMode modeToUpdate = modeId != null ? requireBackend().getMode(modeId) : null;
+ if (modeToUpdate == null) {
+ // Huh, maybe it was deleted while we were choosing the icon? Unusual...
+ Log.w(getLogTag(), "Couldn't fetch mode with id " + modeId
+ + " from the backend for saving. Discarding changes!");
+ finish();
+ return;
+ }
+
+ modeToUpdate.getRule().setName(mode.getRule().getName());
+ modeToUpdate.getRule().setIconResId(mode.getRule().getIconResId());
+ requireBackend().updateMode(modeToUpdate);
+ finish();
+ }
+
+ @Nullable
+ private String getModeIdFromArguments() {
+ Bundle bundle = getArguments();
+ if (bundle != null && bundle.containsKey(EXTRA_AUTOMATIC_ZEN_RULE_ID)) {
+ return bundle.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID);
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ // TODO: b/332937635 - make this the correct metrics category
+ return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return "ZenModeEditNameIconFragment";
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentBase.java b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentBase.java
new file mode 100644
index 0000000..d666254
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentBase.java
@@ -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.modes;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.DrawableRes;
+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.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Base class for the "add a mode" and "edit mode name and icon" fragments. In both cases we are
+ * editing a {@link ZenMode}, but the mode shouldn't be saved immediately after each atomic change
+ * -- instead, it will be saved to the backend upon user confirmation.
+ *
+ * <p>As a result, instead of using {@link ZenModesBackend} to apply each change, we instead modify
+ * an in-memory {@link ZenMode}, that is preserved/restored in extras. This also means we don't
+ * listen to changes -- whatever the user sees should be applied.
+ */
+public abstract class ZenModeEditNameIconFragmentBase extends DashboardFragment {
+
+ private static final String MODE_KEY = "ZenMode";
+
+ @Nullable private ZenMode mZenMode;
+
+ private ZenModesBackend mBackend;
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ void setBackend(ZenModesBackend backend) {
+ mBackend = backend;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (mBackend == null) {
+ mBackend = ZenModesBackend.getInstance(context);
+ }
+ }
+
+ @Override
+ public final void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mZenMode = icicle != null
+ ? icicle.getParcelable(MODE_KEY, ZenMode.class)
+ : onCreateInstantiateZenMode();
+
+ if (mZenMode == null) {
+ finish();
+ }
+ }
+
+ /**
+ * Provides the mode that will be edited. Called in {@link #onCreate}, the first time (the
+ * value returned here is persisted on Fragment recreation).
+ *
+ * <p>If {@code null} is returned, the fragment will {@link #finish()}.
+ */
+ @Nullable
+ protected abstract ZenMode onCreateInstantiateZenMode();
+
+ @Override
+ protected final int getPreferenceScreenResId() {
+ return R.xml.modes_edit_name_icon;
+ }
+
+ @Override
+ protected final List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return ImmutableList.of(
+ new ZenModeIconPickerIconPreferenceController(context, "chosen_icon", this),
+ new ZenModeEditNamePreferenceController(context, "name", this::setModeName),
+ new ZenModeIconPickerListPreferenceController(context, "icon_list",
+ this::setModeIcon),
+ new ZenModeEditDonePreferenceController(context, "done", this::saveMode)
+ );
+ }
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ @Nullable
+ ZenMode getZenMode() {
+ return mZenMode;
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ updateControllers();
+ }
+
+ @VisibleForTesting
+ final void setModeName(String name) {
+ checkNotNull(mZenMode).getRule().setName(Strings.nullToEmpty(name));
+ updateControllers(); // Updates confirmation button.
+ }
+
+ @VisibleForTesting
+ final void setModeIcon(@DrawableRes int iconResId) {
+ checkNotNull(mZenMode).getRule().setIconResId(iconResId);
+ updateControllers(); // Updates icon at the top.
+ }
+
+ protected void updateControllers() {
+ PreferenceScreen screen = getPreferenceScreen();
+ Collection<List<AbstractPreferenceController>> controllers = getPreferenceControllers();
+ if (mZenMode == null || screen == null || controllers == null) {
+ return;
+ }
+ for (List<AbstractPreferenceController> list : controllers) {
+ for (AbstractPreferenceController controller : list) {
+ try {
+ final String key = controller.getPreferenceKey();
+ final Preference preference = screen.findPreference(key);
+ if (preference != null) {
+ AbstractZenModePreferenceController zenController =
+ (AbstractZenModePreferenceController) controller;
+ zenController.updateZenMode(preference, mZenMode);
+ } else {
+ Log.d(getLogTag(),
+ String.format("Cannot find preference with key %s in Controller %s",
+ key, controller.getClass().getSimpleName()));
+ }
+ controller.displayPreference(screen);
+ } catch (ClassCastException e) {
+ // Skip any controllers that aren't AbstractZenModePreferenceController.
+ Log.d(getLogTag(), "Could not cast: " + controller.getClass().getSimpleName());
+ }
+ }
+ }
+ }
+
+ @VisibleForTesting
+ final void saveMode() {
+ saveMode(checkNotNull(mZenMode));
+ }
+
+ /**
+ * Called to actually save the mode, after the user confirms. This method is also responsible
+ * for calling {@link #finish()}, if appropriate.
+ *
+ * <p>Note that {@code mode} is the <em>in-memory</em> mode and, as such, may have obsolete
+ * data. If the concrete fragment is editing an existing mode, it should first fetch it from
+ * the backend, and copy the new name and icon before saving. */
+ abstract void saveMode(ZenMode mode);
+
+ @NonNull
+ protected ZenModesBackend requireBackend() {
+ checkState(mBackend != null);
+ return mBackend;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putParcelable(MODE_KEY, mZenMode);
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.java
new file mode 100644
index 0000000..78cbfe0
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceController.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.notification.modes;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.widget.EditText;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.function.Consumer;
+
+class ZenModeEditNamePreferenceController extends AbstractZenModePreferenceController {
+
+ private final Consumer<String> mModeNameSetter;
+ @Nullable private EditText mEditText;
+ private boolean mIsSettingText;
+
+ ZenModeEditNamePreferenceController(@NonNull Context context, @NonNull String key,
+ @NonNull Consumer<String> modeNameSetter) {
+ super(context, key);
+ mModeNameSetter = modeNameSetter;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ if (mEditText == null) {
+ LayoutPreference pref = checkNotNull(screen.findPreference(getPreferenceKey()));
+ mEditText = pref.findViewById(android.R.id.edit);
+
+ mEditText.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) { }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+ if (!mIsSettingText) {
+ mModeNameSetter.accept(s.toString());
+ }
+ }
+ });
+ }
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ if (mEditText != null) {
+ mIsSettingText = true;
+ try {
+ String currentText = mEditText.getText().toString();
+ String modeName = zenMode.getName();
+ if (!modeName.equals(currentText)) {
+ mEditText.setText(modeName);
+ }
+ } finally {
+ mIsSettingText = false;
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceController.java
index 8517af1..326bc97 100644
--- a/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceController.java
@@ -23,6 +23,9 @@
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
/**
* Preference controller controlling whether a time schedule-based mode ends at the next alarm.
*/
diff --git a/src/com/android/settings/notification/modes/ZenModeFragment.java b/src/com/android/settings/notification/modes/ZenModeFragment.java
index e4d81fe..5aeb34d 100644
--- a/src/com/android/settings/notification/modes/ZenModeFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeFragment.java
@@ -16,20 +16,32 @@
package com.android.settings.notification.modes;
-import android.app.Application;
-import android.app.AutomaticZenRule;
+import android.app.AlertDialog;
import android.app.settings.SettingsEnums;
import android.content.Context;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import androidx.activity.ComponentActivity;
+import androidx.annotation.NonNull;
+import androidx.core.view.MenuProvider;
import com.android.settings.R;
-import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.notification.modes.ZenMode;
import java.util.ArrayList;
import java.util.List;
public class ZenModeFragment extends ZenModeFragmentBase {
+ // for mode context menu
+ private static final int RENAME_MODE = 1;
+ private static final int DELETE_MODE = 2;
+
+ private ModeMenuProvider mModeMenuProvider;
+
@Override
protected int getPreferenceScreenResId() {
return R.xml.modes_rule_settings;
@@ -38,35 +50,69 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> prefControllers = new ArrayList<>();
- prefControllers.add(new ZenModeHeaderController(context, "header", this, mBackend));
- prefControllers.add(new ZenModeButtonPreferenceController(context, "activate", mBackend));
- prefControllers.add(new ZenModeActionsPreferenceController(context, "actions", mBackend));
+ prefControllers.add(new ZenModeHeaderController(context, "header", this));
+ prefControllers.add(new ZenModeBlurbPreferenceController(context, "mode_blurb"));
+ prefControllers.add(
+ new ZenModeButtonPreferenceController(context, "activate", this, mBackend));
+ prefControllers.add(new ZenModePreferenceCategoryController(context, "modes_filters"));
prefControllers.add(new ZenModePeopleLinkPreferenceController(
- context, "zen_mode_people", mBackend));
+ context, "zen_mode_people", mHelperBackend));
prefControllers.add(new ZenModeAppsLinkPreferenceController(
- context, "zen_mode_apps", this,
- ApplicationsState.getInstance((Application) context.getApplicationContext()),
- mBackend));
+ context, "zen_mode_apps", this, mBackend, mHelperBackend));
prefControllers.add(new ZenModeOtherLinkPreferenceController(
- context, "zen_other_settings", mBackend));
+ context, "zen_other_settings", mHelperBackend));
+ prefControllers.add(
+ new ZenModePreferenceCategoryController(context, "modes_additional_actions"));
prefControllers.add(new ZenModeDisplayLinkPreferenceController(
- context, "mode_display_settings", mBackend));
- prefControllers.add(new ZenModeSetTriggerLinkPreferenceController(context,
- "zen_automatic_trigger_category", mBackend));
+ context, "mode_display_settings", mBackend, mHelperBackend));
+ prefControllers.add(new ZenModeTriggerCategoryPreferenceController(context,
+ "zen_automatic_trigger_category"));
+ prefControllers.add(new ZenModeTriggerUpdatePreferenceController(context,
+ "zen_automatic_trigger_settings", mBackend));
+ prefControllers.add(
+ new ZenModeTriggerAddPreferenceController(context, "zen_add_automatic_trigger",
+ this, mBackend));
+ prefControllers.add(new InterruptionFilterPreferenceController(
+ context, "allow_filtering", mBackend));
+ prefControllers.add(new ManualDurationPreferenceController(
+ context, "mode_manual_duration", this, mBackend));
return prefControllers;
}
@Override
+ public void onAttach(@NonNull Context context) {
+ super.onAttach(context);
+
+ // allow duration preference controller to listen for settings changes
+ use(ManualDurationPreferenceController.class).registerSettingsObserver();
+ }
+
+ @Override
public void onStart() {
super.onStart();
// Set title for the entire screen
ZenMode mode = getMode();
- AutomaticZenRule azr = getAZR();
- if (mode == null || azr == null) {
- return;
+ ComponentActivity activity = getActivity();
+ if (mode != null && activity != null) {
+ activity.setTitle(mode.getName());
+ mModeMenuProvider = new ModeMenuProvider(mode);
+ activity.addMenuProvider(mModeMenuProvider);
}
- getActivity().setTitle(azr.getName());
+ }
+
+ @Override
+ public void onStop() {
+ if (getActivity() != null) {
+ getActivity().removeMenuProvider(mModeMenuProvider);
+ }
+ super.onStop();
+ }
+
+ @Override
+ public void onDetach() {
+ use(ManualDurationPreferenceController.class).unregisterSettingsObserver();
+ super.onDetach();
}
@Override
@@ -74,4 +120,58 @@
// TODO: b/332937635 - make this the correct metrics category
return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION;
}
+
+ @Override
+ protected void updateZenModeState() {
+ // Because this fragment may be asked to finish by the delete menu but not be done doing
+ // so yet, ignore any attempts to update info in that case.
+ if (getActivity() != null && getActivity().isFinishing()) {
+ return;
+ }
+ super.updateZenModeState();
+ }
+
+ private class ModeMenuProvider implements MenuProvider {
+ @NonNull private final ZenMode mZenMode;
+
+ ModeMenuProvider(@NonNull ZenMode mode) {
+ mZenMode = mode;
+ }
+
+ @Override
+ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+ if (mZenMode.canEditNameAndIcon()) {
+ menu.add(Menu.NONE, RENAME_MODE, Menu.NONE, R.string.zen_mode_menu_rename_mode);
+ }
+ if (mZenMode.canBeDeleted()) {
+ // Only deleteable modes should get a delete menu option.
+ menu.add(Menu.NONE, DELETE_MODE, Menu.NONE, R.string.zen_mode_menu_delete_mode);
+ }
+ }
+
+ @Override
+ public boolean onMenuItemSelected(@NonNull MenuItem menuItem) {
+ if (menuItem.getItemId() == RENAME_MODE) {
+ // TODO: b/332937635 - Update metrics category
+ ZenSubSettingLauncher.forModeFragment(mContext, ZenModeEditNameIconFragment.class,
+ mZenMode.getId(), 0).launch();
+ } else if (menuItem.getItemId() == DELETE_MODE) {
+ new AlertDialog.Builder(mContext)
+ .setTitle(mContext.getString(R.string.zen_mode_delete_mode_confirmation,
+ mZenMode.getRule().getName()))
+ .setPositiveButton(R.string.zen_mode_schedule_delete,
+ (dialog, which) -> {
+ // start finishing before calling removeMode() so that we
+ // don't try to update this activity with a nonexistent mode
+ // when the zen mode config is updated
+ finish();
+ mBackend.removeMode(mZenMode);
+ })
+ .setNegativeButton(R.string.cancel, null)
+ .show();
+ return true;
+ }
+ return false;
+ }
+ }
}
diff --git a/src/com/android/settings/notification/modes/ZenModeFragmentBase.java b/src/com/android/settings/notification/modes/ZenModeFragmentBase.java
index e086524..f461fc3 100644
--- a/src/com/android/settings/notification/modes/ZenModeFragmentBase.java
+++ b/src/com/android/settings/notification/modes/ZenModeFragmentBase.java
@@ -16,7 +16,8 @@
package com.android.settings.notification.modes;
-import android.app.AutomaticZenRule;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
import android.content.Context;
import android.os.Bundle;
import android.util.Log;
@@ -29,15 +30,18 @@
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.base.Preconditions;
import java.util.List;
+import java.util.function.Consumer;
/**
* Base class for Settings pages used to configure individual modes.
*/
abstract class ZenModeFragmentBase extends ZenModesFragmentBase {
static final String TAG = "ZenModeSettings";
- static final String MODE_ID = "MODE_ID";
@Nullable // only until reloadMode() is called
private ZenMode mZenMode;
@@ -46,17 +50,21 @@
public void onAttach(@NonNull Context context) {
super.onAttach(context);
- // TODO: b/322373473 - Update if modes page ends up using a different method of passing id
+ String id = null;
+ if (getActivity() != null && getActivity().getIntent() != null) {
+ id = getActivity().getIntent().getStringExtra(EXTRA_AUTOMATIC_ZEN_RULE_ID);
+ }
Bundle bundle = getArguments();
- if (bundle != null && bundle.containsKey(MODE_ID)) {
- String id = bundle.getString(MODE_ID);
- if (!reloadMode(id)) {
- Log.e(TAG, "Mode id " + id + " not found");
- toastAndFinish();
- return;
- }
- } else {
- Log.e(TAG, "Mode id required to set mode config settings");
+ if (id == null && bundle != null && bundle.containsKey(EXTRA_AUTOMATIC_ZEN_RULE_ID)) {
+ id = bundle.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID);
+ }
+ if (id == null) {
+ Log.d(TAG, "No id provided");
+ toastAndFinish();
+ return;
+ }
+ if (!reloadMode(id)) {
+ Log.d(TAG, "Mode id " + id + " not found");
toastAndFinish();
return;
}
@@ -120,10 +128,6 @@
}
for (List<AbstractPreferenceController> list : getPreferenceControllers()) {
for (AbstractPreferenceController controller : list) {
- if (!controller.isAvailable()) {
- continue;
- }
-
try {
// Find preference associated with controller
final String key = controller.getPreferenceKey();
@@ -137,6 +141,7 @@
String.format("Cannot find preference with key %s in Controller %s",
key, controller.getClass().getSimpleName()));
}
+ controller.displayPreference(screen);
} catch (ClassCastException e) {
// Skip any controllers that aren't AbstractZenModePreferenceController.
Log.d(TAG, "Could not cast: " + controller.getClass().getSimpleName());
@@ -159,14 +164,15 @@
return mZenMode;
}
- /**
- * Get AutomaticZenRule associated with current mode data, or null if it doesn't exist.
- */
- @Nullable
- public AutomaticZenRule getAZR() {
- if (mZenMode == null) {
- return null;
+ protected final boolean saveMode(Consumer<ZenMode> updater) {
+ Preconditions.checkState(mBackend != null);
+ ZenMode mode = mZenMode;
+ if (mode == null) {
+ Log.wtf(TAG, "Cannot save mode, it hasn't been loaded (" + getClass() + ")");
+ return false;
}
- return mZenMode.getRule();
+ updater.accept(mode);
+ mBackend.updateMode(mode);
+ return true;
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModeHeaderController.java b/src/com/android/settings/notification/modes/ZenModeHeaderController.java
index d8f0a67..c4f3dd1 100644
--- a/src/com/android/settings/notification/modes/ZenModeHeaderController.java
+++ b/src/com/android/settings/notification/modes/ZenModeHeaderController.java
@@ -15,56 +15,29 @@
*/
package com.android.settings.notification.modes;
-import android.app.Flags;
import android.content.Context;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.notification.modes.ZenMode;
-class ZenModeHeaderController extends AbstractZenModePreferenceController {
-
- private final DashboardFragment mFragment;
- private EntityHeaderController mHeaderController;
+class ZenModeHeaderController extends AbstractZenModeHeaderController {
ZenModeHeaderController(
@NonNull Context context,
@NonNull String key,
- @NonNull DashboardFragment fragment,
- @Nullable ZenModesBackend backend) {
- super(context, key, backend);
- mFragment = fragment;
- }
-
- @Override
- public boolean isAvailable() {
- return Flags.modesApi();
+ @NonNull DashboardFragment fragment) {
+ super(context, key, fragment);
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
- if (mFragment == null) {
- return;
- }
- preference.setSelectable(false);
-
- if (mHeaderController == null) {
- final LayoutPreference pref = (LayoutPreference) preference;
- mHeaderController = EntityHeaderController.newInstance(
- mFragment.getActivity(),
- mFragment,
- pref.findViewById(R.id.entity_header));
- }
-
- FutureUtil.whenDone(
- zenMode.getIcon(mContext, IconLoader.getInstance()),
- icon -> mHeaderController.setIcon(IconUtil.applyTint(mContext, icon))
- .done(/* rebindActions= */ false),
- mContext.getMainExecutor());
+ updateIcon(preference, zenMode,
+ mContext.getResources().getDimensionPixelSize(R.dimen.zen_mode_header_size),
+ icon -> IconUtil.makeModeHeader(mContext, icon),
+ iconView -> iconView.setSelected(zenMode.isActive()));
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModeIconPickerFragment.java b/src/com/android/settings/notification/modes/ZenModeIconPickerFragment.java
deleted file mode 100644
index 760b183..0000000
--- a/src/com/android/settings/notification/modes/ZenModeIconPickerFragment.java
+++ /dev/null
@@ -1,49 +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.notification.modes;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.List;
-
-public class ZenModeIconPickerFragment extends ZenModeFragmentBase {
- @Override
- protected int getPreferenceScreenResId() {
- return R.xml.modes_icon_picker;
- }
-
- @Override
- public int getMetricsCategory() {
- // TODO: b/332937635 - make this the correct metrics category
- return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION;
- }
-
- @Override
- protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return ImmutableList.of(
- new ZenModeIconPickerIconPreferenceController(context, "current_icon", this,
- mBackend),
- new ZenModeIconPickerListPreferenceController(context, "icon_list", this,
- new IconOptionsProviderImpl(mContext), mBackend));
- }
-}
diff --git a/src/com/android/settings/notification/modes/ZenModeIconPickerIconPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeIconPickerIconPreferenceController.java
index 9eaaa97..a7adf6c 100644
--- a/src/com/android/settings/notification/modes/ZenModeIconPickerIconPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeIconPickerIconPreferenceController.java
@@ -19,41 +19,26 @@
import android.content.Context;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.notification.modes.ZenMode;
-class ZenModeIconPickerIconPreferenceController extends AbstractZenModePreferenceController {
-
- private final DashboardFragment mFragment;
- private EntityHeaderController mHeaderController;
+/** Controller used for displaying the currently-chosen icon at the top of the icon picker. */
+class ZenModeIconPickerIconPreferenceController extends AbstractZenModeHeaderController {
ZenModeIconPickerIconPreferenceController(@NonNull Context context, @NonNull String key,
- @NonNull DashboardFragment fragment, @Nullable ZenModesBackend backend) {
- super(context, key, backend);
- mFragment = fragment;
+ @NonNull DashboardFragment fragment) {
+ super(context, key, fragment);
}
@Override
void updateState(Preference preference, @NonNull ZenMode zenMode) {
- preference.setSelectable(false);
-
- if (mHeaderController == null) {
- final LayoutPreference pref = (LayoutPreference) preference;
- mHeaderController = EntityHeaderController.newInstance(
- mFragment.getActivity(),
- mFragment,
- pref.findViewById(R.id.entity_header));
- }
-
- FutureUtil.whenDone(
- zenMode.getIcon(mContext, IconLoader.getInstance()),
- icon -> mHeaderController.setIcon(IconUtil.applyTint(mContext, icon))
- .done(/* rebindActions= */ false),
- mContext.getMainExecutor());
+ updateIcon(preference, zenMode,
+ mContext.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_icon_list_header_circle_diameter),
+ icon -> IconUtil.makeIconPickerHeader(mContext, icon),
+ null);
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceController.java
index fc991dc..93df38b 100644
--- a/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceController.java
@@ -17,6 +17,7 @@
package com.android.settings.notification.modes;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -30,24 +31,37 @@
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.notification.modes.ZenIconLoader;
+import com.android.settingslib.notification.modes.ZenMode;
import com.android.settingslib.widget.LayoutPreference;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+
+import java.util.HashMap;
+import java.util.Map;
class ZenModeIconPickerListPreferenceController extends AbstractZenModePreferenceController {
- private final DashboardFragment mFragment;
private final IconOptionsProvider mIconOptionsProvider;
+ private final IconPickerListener mListener;
@Nullable private IconAdapter mAdapter;
+ private @DrawableRes int mCurrentIconResId;
ZenModeIconPickerListPreferenceController(@NonNull Context context, @NonNull String key,
- @NonNull DashboardFragment fragment, @NonNull IconOptionsProvider iconOptionsProvider,
- @Nullable ZenModesBackend backend) {
- super(context, key, backend);
- mFragment = fragment;
+ @NonNull IconPickerListener listener) {
+ this(context, key, listener, new IconOptionsProviderImpl(context));
+ }
+
+ @VisibleForTesting
+ ZenModeIconPickerListPreferenceController(@NonNull Context context, @NonNull String key,
+ @NonNull IconPickerListener listener,
+ @NonNull IconOptionsProvider iconOptionsProvider) {
+ super(context, key);
+ mListener = listener;
mIconOptionsProvider = iconOptionsProvider;
}
@@ -66,20 +80,38 @@
recyclerView.setLayoutManager(new AutoFitGridLayoutManager(mContext));
recyclerView.setAdapter(mAdapter);
recyclerView.setHasFixedSize(true);
- }
-
- @VisibleForTesting
- void onIconSelected(@DrawableRes int resId) {
- saveMode(mode -> {
- mode.getRule().setIconResId(resId);
- return mode;
- });
- mFragment.finish();
+ if (recyclerView.getItemAnimator() instanceof SimpleItemAnimator animator) {
+ animator.setSupportsChangeAnimations(true);
+ }
}
@Override
void updateState(Preference preference, @NonNull ZenMode zenMode) {
- // Nothing to do, the current icon is shown in a different preference.
+ @DrawableRes int iconResId = zenMode.getRule().getIconResId();
+ if (iconResId == 0) {
+ iconResId = ZenIconLoader.getIconResourceIdFromType(zenMode.getType());
+ }
+ updateIconSelection(iconResId);
+ }
+
+ private void updateIconSelection(@DrawableRes int iconResId) {
+ if (iconResId != mCurrentIconResId) {
+ int oldIconResId = mCurrentIconResId;
+ mCurrentIconResId = iconResId;
+ if (mAdapter != null) {
+ mAdapter.notifyIconChanged(oldIconResId);
+ mAdapter.notifyIconChanged(mCurrentIconResId);
+ }
+ }
+ }
+
+ private void onIconSelected(@DrawableRes int iconResId) {
+ updateIconSelection(iconResId);
+ mListener.onIconSelected(iconResId);
+ }
+
+ interface IconPickerListener {
+ void onIconSelected(@DrawableRes int iconResId);
}
private class IconHolder extends RecyclerView.ViewHolder {
@@ -91,20 +123,25 @@
mImageView = itemView.findViewById(R.id.icon_image_view);
}
- void bindIcon(IconOptionsProvider.IconInfo icon) {
- mImageView.setImageDrawable(
- IconUtil.makeIconCircle(itemView.getContext(), icon.resId()));
+ void bindIcon(IconOptionsProvider.IconInfo icon, Drawable iconDrawable) {
+ mImageView.setImageDrawable(iconDrawable);
itemView.setContentDescription(icon.description());
- itemView.setOnClickListener(v -> onIconSelected(icon.resId()));
+ itemView.setOnClickListener(v -> {
+ itemView.setSelected(true); // Immediately, to avoid flicker until we rebind.
+ onIconSelected(icon.resId());
+ });
+ itemView.setSelected(icon.resId() == mCurrentIconResId);
}
}
private class IconAdapter extends RecyclerView.Adapter<IconHolder> {
private final ImmutableList<IconOptionsProvider.IconInfo> mIconResources;
+ private final Map<IconOptionsProvider.IconInfo, Drawable> mIconCache;
private IconAdapter(IconOptionsProvider iconOptionsProvider) {
mIconResources = iconOptionsProvider.getIcons();
+ mIconCache = new HashMap<>();
}
@NonNull
@@ -117,13 +154,24 @@
@Override
public void onBindViewHolder(@NonNull IconHolder holder, int position) {
- holder.bindIcon(mIconResources.get(position));
+ IconOptionsProvider.IconInfo iconInfo = mIconResources.get(position);
+ Drawable iconDrawable = mIconCache.computeIfAbsent(iconInfo,
+ info -> IconUtil.makeIconPickerItem(mContext, info.resId()));
+ holder.bindIcon(iconInfo, iconDrawable);
}
@Override
public int getItemCount() {
return mIconResources.size();
}
+
+ private void notifyIconChanged(@DrawableRes int iconResId) {
+ int position = Iterables.indexOf(mIconResources,
+ iconInfo -> iconInfo.resId() == iconResId);
+ if (position != -1) {
+ notifyItemChanged(position);
+ }
+ }
}
private static class AutoFitGridLayoutManager extends GridLayoutManager {
diff --git a/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java b/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java
index c86f8dd..8bf574f 100644
--- a/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModeMessagesFragment.java
@@ -18,6 +18,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,7 +35,7 @@
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePrioritySendersPreferenceController(context,
- "zen_mode_settings_category_messages", true, mBackend));
+ "zen_mode_settings_category_messages", true, mBackend, mHelperBackend));
return controllers;
}
diff --git a/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java
index 300ebbc..4c0b758 100644
--- a/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.content.Context;
import android.os.Bundle;
@@ -25,20 +25,21 @@
import androidx.preference.Preference;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.notification.modes.ZenMode;
class ZenModeMessagesLinkPreferenceController extends AbstractZenModePreferenceController {
private final ZenModeSummaryHelper mSummaryHelper;
public ZenModeMessagesLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(context, backend);
+ ZenHelperBackend helperBackend) {
+ super(context, key);
+ mSummaryHelper = new ZenModeSummaryHelper(context, helperBackend);
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
preference.setIntent(new SubSettingLauncher(mContext)
.setDestination(ZenModeMessagesFragment.class.getName())
diff --git a/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java b/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java
new file mode 100644
index 0000000..6086c0c
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeNewCustomFragment.java
@@ -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.notification.modes;
+
+import androidx.annotation.Nullable;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.base.Strings;
+
+public class ZenModeNewCustomFragment extends ZenModeEditNameIconFragmentBase {
+
+ @Nullable
+ @Override
+ protected ZenMode onCreateInstantiateZenMode() {
+ return ZenMode.newCustomManual(
+ requireContext().getString(R.string.zen_mode_new_custom_default_name),
+ /* iconResId= */ 0);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ requireActivity().setTitle(R.string.zen_mode_new_custom_title);
+ }
+
+ @Override
+ void saveMode(ZenMode mode) {
+ String modeName = Strings.isNullOrEmpty(mode.getName())
+ ? requireContext().getString(R.string.zen_mode_new_custom_default_name)
+ : mode.getName();
+
+ ZenMode created = requireBackend().addCustomManualMode(modeName,
+ mode.getRule().getIconResId());
+ if (created != null) {
+ // Open the mode view fragment and close the "add mode" fragment, so exiting the mode
+ // view goes back to previous screen (which should be the modes list).
+ ZenSubSettingLauncher.forMode(requireContext(), created.getId()).launch();
+ finish();
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ // TODO: b/332937635 - make this the correct metrics category
+ return 0;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return "ZenModeNewCustomFragment";
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java
index da3b3be..622c4a2 100644
--- a/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceController.java
@@ -16,7 +16,8 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import android.content.Context;
import android.os.Bundle;
@@ -25,21 +26,27 @@
import androidx.preference.Preference;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.notification.modes.ZenMode;
class ZenModeNotifVisLinkPreferenceController extends AbstractZenModePreferenceController {
private final ZenModeSummaryHelper mSummaryBuilder;
public ZenModeNotifVisLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- mSummaryBuilder = new ZenModeSummaryHelper(context, backend);
+ ZenHelperBackend helperBackend) {
+ super(context, key);
+ mSummaryBuilder = new ZenModeSummaryHelper(context, helperBackend);
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ return zenMode.getRule().getInterruptionFilter() != INTERRUPTION_FILTER_ALL;
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
preference.setIntent(new SubSettingLauncher(mContext)
.setDestination(ZenModeNotifVisFragment.class.getName())
diff --git a/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceController.java
index f918b25..3d9f713 100644
--- a/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceController.java
@@ -21,19 +21,21 @@
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
-import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
-import com.android.settings.widget.DisabledCheckBoxPreference;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
public class ZenModeNotifVisPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
- @VisibleForTesting protected @ZenPolicy.VisualEffect int mEffect;
+ @VisibleForTesting
+ protected @ZenPolicy.VisualEffect int mEffect;
// if any of these effects are suppressed, this effect must be too
- @VisibleForTesting protected @ZenPolicy.VisualEffect int[] mParentSuppressedEffects;
+ @VisibleForTesting
+ protected @ZenPolicy.VisualEffect int[] mParentSuppressedEffects;
public ZenModeNotifVisPreferenceController(Context context, String key,
@ZenPolicy.VisualEffect int visualEffect,
diff --git a/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java
index 1a00207..15e0edc 100644
--- a/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceController.java
@@ -16,38 +16,73 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_ALARMS;
+import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_EVENTS;
+import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_MEDIA;
+import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_REMINDERS;
+import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_SYSTEM;
import android.content.Context;
-import android.os.Bundle;
+import android.service.notification.ZenPolicy;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
-import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
/**
* Preference with a link and summary about what other sounds can break through the mode
*/
class ZenModeOtherLinkPreferenceController extends AbstractZenModePreferenceController {
+ private static final ImmutableMap</* @PriorityCategory */ Integer, /* @DrawableRes */ Integer>
+ PRIORITIES_TO_ICONS = ImmutableMap.of(
+ PRIORITY_CATEGORY_ALARMS, R.drawable.ic_zen_mode_sound_alarms,
+ PRIORITY_CATEGORY_MEDIA, R.drawable.ic_zen_mode_sound_media,
+ PRIORITY_CATEGORY_SYSTEM, R.drawable.ic_zen_mode_sound_system,
+ PRIORITY_CATEGORY_REMINDERS, R.drawable.ic_zen_mode_sound_reminders,
+ PRIORITY_CATEGORY_EVENTS, R.drawable.ic_zen_mode_sound_events);
+
private final ZenModeSummaryHelper mSummaryHelper;
public ZenModeOtherLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(mContext, mBackend);
+ ZenHelperBackend helperBackend) {
+ super(context, key);
+ mSummaryHelper = new ZenModeSummaryHelper(mContext, helperBackend);
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ return zenMode.getRule().getInterruptionFilter() != INTERRUPTION_FILTER_ALL;
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
- Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
- preference.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModeOtherFragment.class.getName())
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
+ // TODO: b/332937635 - Update metrics category
+ preference.setIntent(
+ ZenSubSettingLauncher.forModeFragment(mContext, ZenModeOtherFragment.class,
+ zenMode.getId(), 0).toIntent());
+
+ preference.setEnabled(zenMode.isEnabled());
preference.setSummary(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode));
+ ((CircularIconsPreference) preference).displayIcons(getSoundIcons(zenMode.getPolicy()));
+ }
+
+ private CircularIconSet<Integer> getSoundIcons(ZenPolicy policy) {
+ ImmutableList.Builder<Integer> icons = new ImmutableList.Builder<>();
+ for (Map.Entry<Integer, Integer> entry : PRIORITIES_TO_ICONS.entrySet()) {
+ if (policy.isCategoryAllowed(entry.getKey(), false)) {
+ icons.add(entry.getValue());
+ }
+ }
+ return new CircularIconSet<>(icons.build(),
+ iconResId -> IconUtil.makeCircularIconPreferenceItem(mContext, iconResId));
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModeOtherPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeOtherPreferenceController.java
index a770164e..ad5fa6a 100644
--- a/src/com/android/settings/notification/modes/ZenModeOtherPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeOtherPreferenceController.java
@@ -28,6 +28,9 @@
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
class ZenModeOtherPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/modes/ZenModePeopleFragment.java b/src/com/android/settings/notification/modes/ZenModePeopleFragment.java
index e1f753c..f541d13 100644
--- a/src/com/android/settings/notification/modes/ZenModePeopleFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModePeopleFragment.java
@@ -18,6 +18,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
+
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -34,9 +35,9 @@
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> prefControllers = new ArrayList<>();
prefControllers.add(new ZenModeCallsLinkPreferenceController(
- context, "zen_mode_people_calls", mBackend));
+ context, "zen_mode_people_calls", mHelperBackend));
prefControllers.add(new ZenModeMessagesLinkPreferenceController(
- context, "zen_mode_people_messages", mBackend));
+ context, "zen_mode_people_messages", mHelperBackend));
return prefControllers;
}
diff --git a/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java
index 55a83d6..0d3a721 100644
--- a/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceController.java
@@ -16,39 +16,216 @@
package com.android.settings.notification.modes;
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
+import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_IMPORTANT;
+import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_NONE;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_NONE;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_STARRED;
+import static android.service.notification.ZenPolicy.STATE_ALLOW;
import android.content.Context;
-import android.os.Bundle;
+import android.content.pm.LauncherApps;
+import android.graphics.drawable.Drawable;
+import android.service.notification.ConversationChannelWrapper;
+import android.service.notification.ZenPolicy;
+import android.service.notification.ZenPolicy.ConversationSenders;
+import android.service.notification.ZenPolicy.PeopleType;
+import android.util.IconDrawableFactory;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
import androidx.preference.Preference;
-import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.R;
+import com.android.settings.notification.modes.ZenHelperBackend.Contact;
+import com.android.settingslib.notification.ConversationIconFactory;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.base.Equivalence;
+import com.google.common.collect.ImmutableList;
+
+import java.util.Objects;
/**
- * Preference with a link and summary about what calls and messages can break through the mode
+ * Preference with a link and summary about what calls and messages can break through the mode,
+ * and icons representing those people.
*/
class ZenModePeopleLinkPreferenceController extends AbstractZenModePreferenceController {
private final ZenModeSummaryHelper mSummaryHelper;
+ private final ZenHelperBackend mHelperBackend;
+ private final ConversationIconFactory mConversationIconFactory;
- public ZenModePeopleLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- mSummaryHelper = new ZenModeSummaryHelper(mContext, mBackend);
+ ZenModePeopleLinkPreferenceController(Context context, String key,
+ ZenHelperBackend helperBackend) {
+ this(context, key, helperBackend,
+ new ConversationIconFactory(context,
+ context.getSystemService(LauncherApps.class),
+ context.getPackageManager(),
+ IconDrawableFactory.newInstance(context, false),
+ context.getResources().getDimensionPixelSize(
+ R.dimen.zen_mode_circular_icon_diameter)));
+ }
+
+ @VisibleForTesting
+ ZenModePeopleLinkPreferenceController(Context context, String key,
+ ZenHelperBackend helperBackend, ConversationIconFactory conversationIconFactory) {
+ super(context, key);
+ mSummaryHelper = new ZenModeSummaryHelper(mContext, helperBackend);
+ mHelperBackend = helperBackend;
+ mConversationIconFactory = conversationIconFactory;
+ }
+
+ @Override
+ public boolean isAvailable(ZenMode zenMode) {
+ return zenMode.getRule().getInterruptionFilter() != INTERRUPTION_FILTER_ALL;
}
@Override
public void updateState(Preference preference, @NonNull ZenMode zenMode) {
- Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
// TODO(b/332937635): Update metrics category
- preference.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModePeopleFragment.class.getName())
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
- preference.setSummary(mSummaryHelper.getPeopleSummary(zenMode));
+ preference.setIntent(
+ ZenSubSettingLauncher.forModeFragment(mContext, ZenModePeopleFragment.class,
+ zenMode.getId(), 0).toIntent());
+
+ preference.setEnabled(zenMode.isEnabled());
+ preference.setSummary(mSummaryHelper.getPeopleSummary(zenMode.getPolicy()));
+ ((CircularIconsPreference) preference).displayIcons(getPeopleIcons(zenMode.getPolicy()),
+ PEOPLE_ITEM_EQUIVALENCE);
+ }
+
+ // Represents "Either<All, Contact, ConversationChannelWrapper>".
+ private record PeopleItem(boolean all,
+ @Nullable Contact contact,
+ @Nullable ConversationChannelWrapper conversation) {
+
+ private static final PeopleItem ALL = new PeopleItem(true, null, null);
+
+ PeopleItem(@NonNull Contact contact) {
+ this(false, contact, null);
+ }
+
+ PeopleItem(@NonNull ConversationChannelWrapper conversation) {
+ this(false, null, conversation);
+ }
+ }
+
+ private static final Equivalence<PeopleItem> PEOPLE_ITEM_EQUIVALENCE = new Equivalence<>() {
+ @Override
+ protected boolean doEquivalent(@NonNull PeopleItem a, @NonNull PeopleItem b) {
+ if (a.all && b.all) {
+ return true;
+ } else if (a.contact != null && b.contact != null) {
+ return a.contact.equals(b.contact);
+ } else if (a.conversation != null && b.conversation != null) {
+ ConversationChannelWrapper c1 = a.conversation;
+ ConversationChannelWrapper c2 = b.conversation;
+ // Skip comparing ShortcutInfo which doesn't implement equals(). We assume same
+ // conversation channel means same icon (which is not 100% correct but unlikely to
+ // change while on this screen).
+ return Objects.equals(c1.getNotificationChannel(), c2.getNotificationChannel())
+ && Objects.equals(c1.getGroupLabel(), c2.getGroupLabel())
+ && Objects.equals(c1.getParentChannelLabel(), c2.getParentChannelLabel())
+ && Objects.equals(c1.getPkg(), c2.getPkg())
+ && Objects.equals(c1.getUid(), c2.getUid());
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ protected int doHash(@NonNull PeopleItem item) {
+ return Objects.hash(item.all, item.contact, item.conversation);
+ }
+ };
+
+ private CircularIconSet<PeopleItem> getPeopleIcons(ZenPolicy policy) {
+ if (getCallersOrMessagesAllowed(policy) == PEOPLE_TYPE_ANYONE) {
+ return new CircularIconSet<>(
+ ImmutableList.of(PeopleItem.ALL),
+ this::loadPeopleIcon);
+ }
+
+ ImmutableList.Builder<PeopleItem> peopleItems = ImmutableList.builder();
+ fetchContactsAllowed(policy, peopleItems);
+ fetchConversationsAllowed(policy, peopleItems);
+ return new CircularIconSet<>(peopleItems.build(), this::loadPeopleIcon);
+ }
+
+ /**
+ * Adds {@link PeopleItem} entries corresponding to the set of people (contacts) who can
+ * break through via either call OR message.
+ */
+ private void fetchContactsAllowed(ZenPolicy policy,
+ ImmutableList.Builder<PeopleItem> peopleItems) {
+ @PeopleType int peopleAllowed = getCallersOrMessagesAllowed(policy);
+
+ ImmutableList<Contact> contactsAllowed = ImmutableList.of();
+ if (peopleAllowed == PEOPLE_TYPE_CONTACTS) {
+ contactsAllowed = mHelperBackend.getAllContacts();
+ } else if (peopleAllowed == PEOPLE_TYPE_STARRED) {
+ contactsAllowed = mHelperBackend.getStarredContacts();
+ }
+
+ for (Contact contact : contactsAllowed) {
+ peopleItems.add(new PeopleItem(contact));
+ }
+ }
+
+ /**
+ * Adds {@link PeopleItem} entries corresponding to the set of conversation channels that can
+ * break through.
+ */
+ private void fetchConversationsAllowed(ZenPolicy policy,
+ ImmutableList.Builder<PeopleItem> peopleItems) {
+ @ConversationSenders int conversationSendersAllowed =
+ policy.getPriorityCategoryConversations() == STATE_ALLOW
+ ? policy.getPriorityConversationSenders()
+ : CONVERSATION_SENDERS_NONE;
+ ImmutableList<ConversationChannelWrapper> conversationsAllowed = ImmutableList.of();
+ if (conversationSendersAllowed == CONVERSATION_SENDERS_ANYONE) {
+ // TODO: b/354658240 - Need to handle CONVERSATION_SENDERS_ANYONE?
+ return;
+ } else if (conversationSendersAllowed == CONVERSATION_SENDERS_IMPORTANT) {
+ conversationsAllowed = mHelperBackend.getImportantConversations();
+ }
+
+ for (ConversationChannelWrapper conversation : conversationsAllowed) {
+ peopleItems.add(new PeopleItem(conversation));
+ }
+ }
+
+ /** Returns the broadest set of people who can call OR message. */
+ private @PeopleType int getCallersOrMessagesAllowed(ZenPolicy policy) {
+ @PeopleType int callersAllowed = policy.getPriorityCategoryCalls() == STATE_ALLOW
+ ? policy.getPriorityCallSenders() : PEOPLE_TYPE_NONE;
+ @PeopleType int messagesAllowed = policy.getPriorityCategoryMessages() == STATE_ALLOW
+ ? policy.getPriorityMessageSenders() : PEOPLE_TYPE_NONE;
+
+ // Order is ANYONE -> CONTACTS -> STARRED -> NONE, so just taking the minimum works.
+ return Math.min(callersAllowed, messagesAllowed);
+ }
+
+ @WorkerThread
+ private Drawable loadPeopleIcon(PeopleItem peopleItem) {
+ if (peopleItem.all) {
+ return IconUtil.makeCircularIconPreferenceItem(mContext,
+ R.drawable.ic_zen_mode_people_all);
+ } else if (peopleItem.contact != null) {
+ return mHelperBackend.getContactPhoto(peopleItem.contact);
+ } else if (peopleItem.conversation != null) {
+ return mConversationIconFactory.getConversationDrawable(
+ peopleItem.conversation.getShortcutInfo(),
+ peopleItem.conversation.getPkg(),
+ peopleItem.conversation.getUid(),
+ /* important= */ true);
+ } else {
+ throw new IllegalArgumentException("Neither all nor contact nor conversation!");
+ }
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModePreferenceCategoryController.java b/src/com/android/settings/notification/modes/ZenModePreferenceCategoryController.java
new file mode 100644
index 0000000..6ebcb1f
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModePreferenceCategoryController.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.notification.modes;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.ZenMode;
+
+/**
+ * Simple {@link AbstractZenModePreferenceController} used for all {@code PreferenceCategory}
+ * entries in {@link ZenModeFragment} that should be disabled when the mode is disabled.
+ */
+class ZenModePreferenceCategoryController extends AbstractZenModePreferenceController {
+ ZenModePreferenceCategoryController(@NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ preference.setEnabled(zenMode.isEnabled());
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
index 43f4d7f..32c6a98 100644
--- a/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceController.java
@@ -30,10 +30,8 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.ParceledListSlice;
import android.icu.text.MessageFormat;
import android.provider.Contacts;
-import android.service.notification.ConversationChannelWrapper;
import android.service.notification.ZenPolicy;
import android.view.View;
@@ -46,6 +44,8 @@
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.app.ConversationListSettings;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import java.util.ArrayList;
@@ -83,6 +83,7 @@
private static final Intent FALLBACK_INTENT = new Intent(Intent.ACTION_MAIN)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ private final ZenHelperBackend mHelperBackend;
private final PackageManager mPackageManager;
private PreferenceCategory mPreferenceCategory;
private List<SelectorWithWidgetPreference> mSelectorPreferences = new ArrayList<>();
@@ -90,9 +91,10 @@
private final ZenModeSummaryHelper mZenModeSummaryHelper;
public ZenModePrioritySendersPreferenceController(Context context, String key,
- boolean isMessages, ZenModesBackend backend) {
+ boolean isMessages, ZenModesBackend backend, ZenHelperBackend helperBackend) {
super(context, key, backend);
mIsMessages = isMessages;
+ mHelperBackend = helperBackend;
String contactsPackage = context.getString(R.string.config_contacts_package_name);
ALL_CONTACTS_INTENT.setPackage(contactsPackage);
@@ -103,7 +105,7 @@
if (!FALLBACK_INTENT.hasCategory(Intent.CATEGORY_APP_CONTACTS)) {
FALLBACK_INTENT.addCategory(Intent.CATEGORY_APP_CONTACTS);
}
- mZenModeSummaryHelper = new ZenModeSummaryHelper(mContext, mBackend);
+ mZenModeSummaryHelper = new ZenModeSummaryHelper(mContext, mHelperBackend);
}
@Override
@@ -163,17 +165,7 @@
}
private void updateChannelCounts() {
- ParceledListSlice<ConversationChannelWrapper> impConversations =
- mBackend.getConversations(true);
- int numImportantConversations = 0;
- if (impConversations != null) {
- for (ConversationChannelWrapper conversation : impConversations.getList()) {
- if (!conversation.getNotificationChannel().isDemoted()) {
- numImportantConversations++;
- }
- }
- }
- mNumImportantConversations = numImportantConversations;
+ mNumImportantConversations = mHelperBackend.getImportantConversations().size();
}
private int getPrioritySenders(ZenPolicy policy) {
diff --git a/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceController.java
index 7569051..ae62e35 100644
--- a/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceController.java
@@ -26,6 +26,8 @@
import androidx.preference.TwoStatePreference;
import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java b/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java
new file mode 100644
index 0000000..14264b7
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeScheduleChooserDialog.java
@@ -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.notification.modes;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.service.notification.ZenModeConfig;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.dashboard.DashboardFragment;
+
+import com.google.common.collect.ImmutableList;
+
+public class ZenModeScheduleChooserDialog extends InstrumentedDialogFragment {
+
+ private static final String TAG = "ZenModeScheduleChooserDialog";
+
+ static final int OPTION_TIME = 0;
+ static final int OPTION_CALENDAR = 1;
+
+ private record ScheduleOption(@StringRes int nameResId, @StringRes int exampleResId,
+ @DrawableRes int iconResId) {}
+
+ private static final ImmutableList<ScheduleOption> SCHEDULE_OPTIONS = ImmutableList.of(
+ new ScheduleOption(R.string.zen_mode_select_schedule_time,
+ R.string.zen_mode_select_schedule_time_example,
+ com.android.internal.R.drawable.ic_zen_mode_type_schedule_time),
+ new ScheduleOption(R.string.zen_mode_select_schedule_calendar,
+ R.string.zen_mode_select_schedule_calendar_example,
+ com.android.internal.R.drawable.ic_zen_mode_type_schedule_calendar));
+
+ private OnScheduleOptionListener mOptionListener;
+
+ interface OnScheduleOptionListener {
+ void onScheduleSelected(Uri conditionId);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ // TODO: b/332937635 - Update metrics category
+ return 0;
+ }
+
+ static void show(DashboardFragment parent, OnScheduleOptionListener optionListener) {
+ ZenModeScheduleChooserDialog dialog = new ZenModeScheduleChooserDialog();
+ dialog.mOptionListener = optionListener;
+ dialog.setTargetFragment(parent, 0);
+ dialog.show(parent.getParentFragmentManager(), TAG);
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ checkState(getContext() != null);
+ return new AlertDialog.Builder(getContext())
+ .setTitle(R.string.zen_mode_choose_rule_type)
+ .setAdapter(new OptionsAdapter(getContext()),
+ (dialog, which) -> onScheduleTypeSelected(which))
+ .setNegativeButton(R.string.cancel, null)
+ .create();
+ }
+
+ private static class OptionsAdapter extends ArrayAdapter<ScheduleOption> {
+
+ private final LayoutInflater mInflater;
+
+ OptionsAdapter(@NonNull Context context) {
+ super(context, R.layout.zen_mode_type_item, SCHEDULE_OPTIONS);
+ mInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+ if (convertView == null) {
+ convertView = mInflater.inflate(R.layout.zen_mode_type_item, parent, false);
+ }
+ // No need for holder pattern since we have only 2 items.
+ ImageView imageView = checkNotNull(convertView.findViewById(R.id.icon));
+ TextView title = checkNotNull(convertView.findViewById(R.id.title));
+ TextView subtitle = checkNotNull(convertView.findViewById(R.id.subtitle));
+
+ ScheduleOption option = checkNotNull(getItem(position));
+ imageView.setImageResource(option.iconResId());
+ title.setText(option.nameResId());
+ subtitle.setText(option.exampleResId());
+
+ return convertView;
+ }
+ }
+
+ private void onScheduleTypeSelected(int whichOption) {
+ Uri conditionId = switch (whichOption) {
+ case OPTION_TIME -> getDefaultScheduleTimeCondition();
+ case OPTION_CALENDAR -> getDefaultScheduleCalendarCondition();
+ default -> ZenModeConfig.toCustomManualConditionId();
+ };
+
+ mOptionListener.onScheduleSelected(conditionId);
+ }
+
+ private static Uri getDefaultScheduleTimeCondition() {
+ ZenModeConfig.ScheduleInfo schedule = new ZenModeConfig.ScheduleInfo();
+ schedule.days = ZenModeConfig.ALL_DAYS;
+ schedule.startHour = 9;
+ schedule.startMinute = 30;
+ schedule.endHour = 17;
+ return ZenModeConfig.toScheduleConditionId(schedule);
+ }
+
+ private static Uri getDefaultScheduleCalendarCondition() {
+ ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
+ eventInfo.calendarId = null; // All calendars of the current user.
+ eventInfo.reply = ZenModeConfig.EventInfo.REPLY_ANY_EXCEPT_NO;
+ return ZenModeConfig.toEventConditionId(eventInfo);
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
index 2841309..4f45c5c8 100644
--- a/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceController.java
@@ -16,14 +16,12 @@
package com.android.settings.notification.modes;
-import android.app.Flags;
import android.content.Context;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.CalendarContract;
-import android.service.notification.SystemZenRules;
import android.service.notification.ZenModeConfig;
import androidx.annotation.NonNull;
@@ -33,6 +31,8 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import java.util.ArrayList;
import java.util.Arrays;
@@ -42,7 +42,7 @@
import java.util.Objects;
import java.util.function.Function;
-public class ZenModeSetCalendarPreferenceController extends AbstractZenModePreferenceController {
+class ZenModeSetCalendarPreferenceController extends AbstractZenModePreferenceController {
@VisibleForTesting
protected static final String KEY_CALENDAR = "calendar";
@VisibleForTesting
@@ -122,11 +122,7 @@
@VisibleForTesting
protected Function<ZenMode, ZenMode> updateEventMode(ZenModeConfig.EventInfo event) {
return (zenMode) -> {
- zenMode.getRule().setConditionId(ZenModeConfig.toEventConditionId(event));
- if (Flags.modesApi() && Flags.modesUi()) {
- zenMode.getRule().setTriggerDescription(
- SystemZenRules.getTriggerDescriptionForScheduleEvent(mContext, event));
- }
+ zenMode.setCustomModeConditionId(mContext, ZenModeConfig.toEventConditionId(event));
return zenMode;
};
}
diff --git a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
index a6008cc..878a508 100644
--- a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java
@@ -16,9 +16,7 @@
package com.android.settings.notification.modes;
-import android.app.Flags;
import android.content.Context;
-import android.service.notification.SystemZenRules;
import android.service.notification.ZenModeConfig;
import android.text.format.DateFormat;
import android.util.ArraySet;
@@ -33,6 +31,8 @@
import androidx.preference.Preference;
import com.android.settings.R;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.LayoutPreference;
import java.text.SimpleDateFormat;
@@ -116,16 +116,13 @@
@VisibleForTesting
protected Function<ZenMode, ZenMode> updateScheduleMode(ZenModeConfig.ScheduleInfo schedule) {
return (zenMode) -> {
- zenMode.getRule().setConditionId(ZenModeConfig.toScheduleConditionId(schedule));
- if (Flags.modesApi() && Flags.modesUi()) {
- zenMode.getRule().setTriggerDescription(
- SystemZenRules.getTriggerDescriptionForScheduleTime(mContext, schedule));
- }
+ zenMode.setCustomModeConditionId(mContext,
+ ZenModeConfig.toScheduleConditionId(schedule));
return zenMode;
};
}
- private ZenModeTimePickerFragment.TimeSetter mStartSetter = (hour, minute) -> {
+ private final ZenModeTimePickerFragment.TimeSetter mStartSetter = (hour, minute) -> {
if (!isValidTime(hour, minute)) {
return;
}
@@ -137,7 +134,7 @@
saveMode(updateScheduleMode(mSchedule));
};
- private ZenModeTimePickerFragment.TimeSetter mEndSetter = (hour, minute) -> {
+ private final ZenModeTimePickerFragment.TimeSetter mEndSetter = (hour, minute) -> {
if (!isValidTime(hour, minute)) {
return;
}
diff --git a/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceController.java
deleted file mode 100644
index 14d5d59..0000000
--- a/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceController.java
+++ /dev/null
@@ -1,107 +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.notification.modes;
-
-import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
-import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
-
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settingslib.PrimarySwitchPreference;
-
-/**
- * Preference controller for the link to an individual mode's configuration page.
- */
-class ZenModeSetTriggerLinkPreferenceController extends AbstractZenModePreferenceController {
- @VisibleForTesting
- protected static final String AUTOMATIC_TRIGGER_PREF_KEY = "zen_automatic_trigger_settings";
-
- ZenModeSetTriggerLinkPreferenceController(Context context, String key,
- ZenModesBackend backend) {
- super(context, key, backend);
- }
-
- @Override
- public boolean isAvailable(@NonNull ZenMode zenMode) {
- return !zenMode.isManualDnd();
- }
-
- @Override
- public void updateState(Preference preference, @NonNull ZenMode zenMode) {
- // This controller is expected to govern a preference category so that it controls the
- // availability of the entire preference category if the mode doesn't have a way to
- // automatically trigger (such as manual DND).
- Preference switchPref = ((PreferenceCategory) preference).findPreference(
- AUTOMATIC_TRIGGER_PREF_KEY);
- if (switchPref == null) {
- return;
- }
- ((PrimarySwitchPreference) switchPref).setChecked(zenMode.getRule().isEnabled());
- switchPref.setOnPreferenceChangeListener(mSwitchChangeListener);
-
- Bundle bundle = new Bundle();
- bundle.putString(MODE_ID, zenMode.getId());
-
- // TODO: b/341961712 - direct preference to app-owned intent if available
- switch (zenMode.getRule().getType()) {
- case TYPE_SCHEDULE_TIME:
- switchPref.setTitle(R.string.zen_mode_set_schedule_link);
- switchPref.setSummary(zenMode.getRule().getTriggerDescription());
- switchPref.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModeSetScheduleFragment.class.getName())
- // TODO: b/332937635 - set correct metrics category
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
- break;
- case TYPE_SCHEDULE_CALENDAR:
- switchPref.setTitle(R.string.zen_mode_set_calendar_link);
- switchPref.setSummary(zenMode.getRule().getTriggerDescription());
- switchPref.setIntent(new SubSettingLauncher(mContext)
- .setDestination(ZenModeSetCalendarFragment.class.getName())
- // TODO: b/332937635 - set correct metrics category
- .setSourceMetricsCategory(0)
- .setArguments(bundle)
- .toIntent());
- break;
- default:
- // TODO: b/342156843 - change this to allow adding a trigger condition for system
- // rules that don't yet have a type selected
- switchPref.setTitle("not implemented");
- }
- }
-
- @VisibleForTesting
- protected Preference.OnPreferenceChangeListener mSwitchChangeListener = (p, newValue) -> {
- final boolean newEnabled = (Boolean) newValue;
- return saveMode((zenMode) -> {
- if (newEnabled != zenMode.getRule().isEnabled()) {
- zenMode.getRule().setEnabled(newEnabled);
- }
- return zenMode;
- });
- };
-}
diff --git a/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java b/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
index 77f364c..1acef20 100644
--- a/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
+++ b/src/com/android/settings/notification/modes/ZenModeSummaryHelper.java
@@ -15,6 +15,7 @@
*/
package com.android.settings.notification.modes;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_IMPORTANT;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_NONE;
@@ -30,6 +31,7 @@
import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_REMINDERS;
import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_REPEAT_CALLERS;
import static android.service.notification.ZenPolicy.PRIORITY_CATEGORY_SYSTEM;
+import static android.service.notification.ZenPolicy.STATE_ALLOW;
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_AMBIENT;
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_BADGE;
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_FULL_SCREEN_INTENT;
@@ -40,29 +42,39 @@
import android.content.Context;
import android.icu.text.MessageFormat;
+import android.provider.Settings;
import android.service.notification.ZenDeviceEffects;
+import android.service.notification.ZenModeConfig;
import android.service.notification.ZenPolicy;
+import android.service.notification.ZenPolicy.ConversationSenders;
+import android.service.notification.ZenPolicy.PeopleType;
+import android.util.ArrayMap;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.text.BidiFormatter;
import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import java.util.function.Predicate;
class ZenModeSummaryHelper {
private final Context mContext;
- private final ZenModesBackend mBackend;
+ private final ZenHelperBackend mBackend;
- public ZenModeSummaryHelper(Context context, ZenModesBackend backend) {
+ ZenModeSummaryHelper(Context context, ZenHelperBackend backend) {
mContext = context;
mBackend = backend;
}
@@ -79,14 +91,18 @@
PRIORITY_CATEGORY_REPEAT_CALLERS,
};
+ static final ImmutableList</* @PriorityCategory */ Integer> OTHER_SOUND_CATEGORIES =
+ ImmutableList.of(
+ PRIORITY_CATEGORY_ALARMS,
+ PRIORITY_CATEGORY_MEDIA,
+ PRIORITY_CATEGORY_SYSTEM,
+ PRIORITY_CATEGORY_REMINDERS,
+ PRIORITY_CATEGORY_EVENTS);
+
String getOtherSoundCategoriesSummary(ZenMode zenMode) {
List<String> enabledCategories = getEnabledCategories(
zenMode.getPolicy(),
- category -> PRIORITY_CATEGORY_ALARMS == category
- || PRIORITY_CATEGORY_MEDIA == category
- || PRIORITY_CATEGORY_SYSTEM == category
- || PRIORITY_CATEGORY_REMINDERS == category
- || PRIORITY_CATEGORY_EVENTS == category,
+ OTHER_SOUND_CATEGORIES::contains,
true);
int numCategories = enabledCategories.size();
MessageFormat msgFormat = new MessageFormat(
@@ -187,11 +203,12 @@
String getDisplayEffectsSummary(ZenMode zenMode) {
boolean isFirst = true;
List<String> enabledEffects = new ArrayList<>();
- if (!zenMode.getPolicy().shouldShowAllVisualEffects()) {
+ if (!zenMode.getPolicy().shouldShowAllVisualEffects()
+ && zenMode.getRule().getInterruptionFilter() != INTERRUPTION_FILTER_ALL) {
enabledEffects.add(getBlockedEffectsSummary(zenMode));
isFirst = false;
}
- ZenDeviceEffects currEffects = zenMode.getRule().getDeviceEffects();
+ ZenDeviceEffects currEffects = zenMode.getRule().getDeviceEffects();
if (currEffects != null) {
if (currEffects.shouldDisplayGrayscale()) {
if (isFirst) {
@@ -352,7 +369,12 @@
}
public String getStarredContactsSummary() {
- List<String> starredContacts = mBackend.getStarredContacts();
+ List<String> starredContacts = mBackend.getStarredContacts().stream()
+ .map(ZenHelperBackend.Contact::displayName)
+ .map(name -> Strings.isNullOrEmpty(name)
+ ? mContext.getString(R.string.zen_mode_starred_contacts_empty_name)
+ : name)
+ .toList();
int numStarredContacts = starredContacts.size();
MessageFormat msgFormat = new MessageFormat(
mContext.getString(R.string.zen_mode_starred_contacts_summary_contacts),
@@ -376,26 +398,32 @@
mContext.getString(R.string.zen_mode_contacts_count),
Locale.getDefault());
Map<String, Object> args = new HashMap<>();
- args.put("count", mBackend.queryAllContactsData().getCount());
+ args.put("count", mBackend.getAllContactsCount());
return msgFormat.format(args);
}
- public String getPeopleSummary(ZenMode zenMode) {
- final int callersAllowed = zenMode.getPolicy().getPriorityCallSenders();
- final int messagesAllowed = zenMode.getPolicy().getPriorityMessageSenders();
- final int conversationsAllowed = zenMode.getPolicy().getPriorityConversationSenders();
+ public String getPeopleSummary(ZenPolicy policy) {
+ @PeopleType int callersAllowed = policy.getPriorityCategoryCalls() == STATE_ALLOW
+ ? policy.getPriorityCallSenders() : PEOPLE_TYPE_NONE;
+ @PeopleType int messagesAllowed = policy.getPriorityCategoryMessages() == STATE_ALLOW
+ ? policy.getPriorityMessageSenders() : PEOPLE_TYPE_NONE;
+ @ConversationSenders int conversationsAllowed =
+ policy.getPriorityCategoryConversations() == STATE_ALLOW
+ ? policy.getPriorityConversationSenders()
+ : CONVERSATION_SENDERS_NONE;
final boolean areRepeatCallersAllowed =
- zenMode.getPolicy().isCategoryAllowed(PRIORITY_CATEGORY_REPEAT_CALLERS, false);
+ policy.isCategoryAllowed(PRIORITY_CATEGORY_REPEAT_CALLERS, false);
if (callersAllowed == PEOPLE_TYPE_ANYONE
&& messagesAllowed == PEOPLE_TYPE_ANYONE
&& conversationsAllowed == CONVERSATION_SENDERS_ANYONE) {
- return mContext.getResources().getString(R.string.zen_mode_people_all);
+ return mContext.getString(R.string.zen_mode_people_all);
} else if (callersAllowed == PEOPLE_TYPE_NONE
&& messagesAllowed == PEOPLE_TYPE_NONE
- && conversationsAllowed == CONVERSATION_SENDERS_NONE
- && !areRepeatCallersAllowed) {
- return mContext.getResources().getString(R.string.zen_mode_people_none);
+ && conversationsAllowed == CONVERSATION_SENDERS_NONE) {
+ return mContext.getString(
+ areRepeatCallersAllowed ? R.string.zen_mode_people_repeat_callers
+ : R.string.zen_mode_people_none);
} else {
return mContext.getResources().getString(R.string.zen_mode_people_some);
}
@@ -406,13 +434,11 @@
* on the given mode and provided set of apps.
*/
public @NonNull String getAppsSummary(@NonNull ZenMode zenMode,
- @Nullable Set<String> appsBypassing) {
+ @Nullable List<AppEntry> appsBypassing) {
if (zenMode.getPolicy().getAllowedChannels() == ZenPolicy.CHANNEL_POLICY_PRIORITY) {
return formatAppsList(appsBypassing);
} else if (zenMode.getPolicy().getAllowedChannels() == ZenPolicy.CHANNEL_POLICY_NONE) {
return mContext.getResources().getString(R.string.zen_mode_apps_none_apps);
- } else if (zenMode.getPolicy().getAllowedChannels() == ZenMode.CHANNEL_POLICY_ALL) {
- return mContext.getResources().getString(R.string.zen_mode_apps_all_apps);
}
return "";
}
@@ -420,31 +446,66 @@
/**
* Generates a formatted string declaring which apps can interrupt in the style of
* "App, App2, and 4 more can interrupt."
- * Apps selected for explicit mention are selected in order from the provided set sorted
- * alphabetically.
+ * Apps selected for explicit mention are picked in order from the provided list.
*/
- public @NonNull String formatAppsList(@Nullable Set<String> appsBypassingDnd) {
+ @VisibleForTesting
+ public @NonNull String formatAppsList(@Nullable List<AppEntry> appsBypassingDnd) {
if (appsBypassingDnd == null) {
return mContext.getResources().getString(R.string.zen_mode_apps_priority_apps);
}
- final int numAppsBypassingDnd = appsBypassingDnd.size();
- String[] appsBypassingDndArr = appsBypassingDnd.toArray(new String[numAppsBypassingDnd]);
- // Sorts the provided apps alphabetically.
- Arrays.sort(appsBypassingDndArr);
+ List<String> appNames = appsBypassingDnd.stream().limit(3)
+ .map(app -> {
+ String appName = BidiFormatter.getInstance().unicodeWrap(app.label);
+ if (app.isManagedProfile()) {
+ appName = mContext.getString(R.string.zen_mode_apps_work_app, appName);
+ }
+ return appName;
+ })
+ .toList();
+
MessageFormat msgFormat = new MessageFormat(
mContext.getString(R.string.zen_mode_apps_subtext),
Locale.getDefault());
Map<String, Object> args = new HashMap<>();
- args.put("count", numAppsBypassingDnd);
- if (numAppsBypassingDnd >= 1) {
- args.put("app_1", appsBypassingDndArr[0]);
- if (numAppsBypassingDnd >= 2) {
- args.put("app_2", appsBypassingDndArr[1]);
- if (numAppsBypassingDnd == 3) {
- args.put("app_3", appsBypassingDndArr[2]);
+ args.put("count", appsBypassingDnd.size());
+ if (appNames.size() >= 1) {
+ args.put("app_1", appNames.get(0));
+ if (appNames.size() >= 2) {
+ args.put("app_2", appNames.get(1));
+ if (appNames.size() == 3) {
+ args.put("app_3", appNames.get(2));
}
}
}
return msgFormat.format(args);
}
+
+ String getSoundSummary(int zenMode, ZenModeConfig config) {
+ if (zenMode != Settings.Global.ZEN_MODE_OFF) {
+ String description = ZenModeConfig.getDescription(mContext, true, config, false);
+
+ if (description == null) {
+ return mContext.getString(R.string.zen_mode_sound_summary_on);
+ } else {
+ return mContext.getString(R.string.zen_mode_sound_summary_on_with_info,
+ description);
+ }
+ } else {
+ int count = 0;
+ final ArrayMap<String, ZenModeConfig.ZenRule> ruleMap = config.automaticRules;
+ if (ruleMap != null) {
+ for (ZenModeConfig.ZenRule rule : ruleMap.values()) {
+ if (rule != null && rule.enabled) {
+ count++;
+ }
+ }
+ }
+ MessageFormat msgFormat = new MessageFormat(
+ mContext.getString(R.string.modes_sound_summary_off),
+ Locale.getDefault());
+ Map<String, Object> msgArgs = new HashMap<>();
+ msgArgs.put("count", count);
+ return msgFormat.format(msgArgs);
+ }
+ }
}
diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceController.java
new file mode 100644
index 0000000..68cc167
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceController.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.notification.modes;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+class ZenModeTriggerAddPreferenceController extends AbstractZenModePreferenceController {
+
+ private final DashboardFragment mFragment;
+
+ ZenModeTriggerAddPreferenceController(@NonNull Context context,
+ @NonNull String key, DashboardFragment fragment, ZenModesBackend backend) {
+ super(context, key, backend);
+ mFragment = fragment;
+ }
+
+ @Override
+ public boolean isAvailable(@NonNull ZenMode zenMode) {
+ return zenMode.isCustomManual();
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ if (!isAvailable(zenMode)) {
+ return;
+ }
+
+ preference.setOnPreferenceClickListener(unused -> {
+ ZenModeScheduleChooserDialog.show(mFragment, mOnScheduleOptionListener);
+ return true;
+ });
+ }
+
+ @VisibleForTesting
+ final ZenModeScheduleChooserDialog.OnScheduleOptionListener mOnScheduleOptionListener =
+ conditionId -> saveMode(mode -> {
+ mode.setCustomModeConditionId(mContext, conditionId);
+ return mode;
+ // TODO: b/342156843 - Maybe jump to the corresponding schedule editing screen?
+ });
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceController.java
new file mode 100644
index 0000000..5fc3fda
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceController.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.notification.modes;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.ZenMode;
+
+/**
+ * Preference controller for the "Turn on automatically" category
+ */
+class ZenModeTriggerCategoryPreferenceController extends AbstractZenModePreferenceController {
+
+ ZenModeTriggerCategoryPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public boolean isAvailable(@NonNull ZenMode zenMode) {
+ return !zenMode.isManualDnd();
+ }
+
+ @Override
+ public void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ // Nothing to update here (except visibility via isAvailable()).
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
new file mode 100644
index 0000000..043a38c
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceController.java
@@ -0,0 +1,230 @@
+/*
+ * 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 android.app.AutomaticZenRule.TYPE_BEDTIME;
+import static android.app.AutomaticZenRule.TYPE_DRIVING;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
+import static android.service.notification.ZenModeConfig.tryParseScheduleConditionId;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.service.notification.SystemZenRules;
+import android.service.notification.ZenModeConfig;
+import android.util.Log;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+import com.google.common.base.Strings;
+
+class ZenModeTriggerUpdatePreferenceController extends AbstractZenModePreferenceController {
+
+ private static final String TAG = "ZenModeTriggerUpdate";
+
+ private final PackageManager mPackageManager;
+ private final ConfigurationActivityHelper mConfigurationActivityHelper;
+ private final ZenServiceListing mServiceListing;
+
+ ZenModeTriggerUpdatePreferenceController(Context context, String key,
+ ZenModesBackend backend) {
+ this(context, key, backend, context.getPackageManager(),
+ new ConfigurationActivityHelper(context.getPackageManager()),
+ new ZenServiceListing(context));
+ }
+
+ @VisibleForTesting
+ ZenModeTriggerUpdatePreferenceController(Context context, String key,
+ ZenModesBackend backend, PackageManager packageManager,
+ ConfigurationActivityHelper configurationActivityHelper,
+ ZenServiceListing serviceListing) {
+ super(context, key, backend);
+ mPackageManager = packageManager;
+ mConfigurationActivityHelper = configurationActivityHelper;
+ mServiceListing = serviceListing;
+ }
+
+ @Override
+ public boolean isAvailable(@NonNull ZenMode zenMode) {
+ return !zenMode.isCustomManual() && !zenMode.isManualDnd();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen, @NonNull ZenMode zenMode) {
+ // Preload approved components, but only for the package that owns the rule (since it's the
+ // only package that can have a valid configurationActivity).
+ mServiceListing.loadApprovedComponents(zenMode.getRule().getPackageName());
+ }
+
+ @Override
+ void updateState(Preference preference, @NonNull ZenMode zenMode) {
+ if (!isAvailable(zenMode)) {
+ return;
+ }
+
+ PrimarySwitchPreference triggerPref = (PrimarySwitchPreference) preference;
+ triggerPref.setChecked(zenMode.getRule().isEnabled());
+ triggerPref.setOnPreferenceChangeListener(mSwitchChangeListener);
+ if (zenMode.isSystemOwned()) {
+ setUpForSystemOwnedTrigger(triggerPref, zenMode);
+ } else {
+ setUpForAppTrigger(triggerPref, zenMode);
+ }
+ }
+
+ private void setUpForSystemOwnedTrigger(Preference preference, ZenMode mode) {
+ if (mode.getType() == TYPE_SCHEDULE_TIME) {
+ // TODO: b/332937635 - set correct metrics category
+ preference.setIntent(ZenSubSettingLauncher.forModeFragment(mContext,
+ ZenModeSetScheduleFragment.class, mode.getId(), 0).toIntent());
+
+ // [Clock Icon] 9:00 - 17:00 / Sun-Mon
+ preference.setIcon(com.android.internal.R.drawable.ic_zen_mode_type_schedule_time);
+ ZenModeConfig.ScheduleInfo schedule =
+ tryParseScheduleConditionId(mode.getRule().getConditionId());
+ if (schedule != null) {
+ preference.setTitle(SystemZenRules.getTimeSummary(mContext, schedule));
+ preference.setSummary(SystemZenRules.getShortDaysSummary(mContext, schedule));
+ } else {
+ // Fallback, but shouldn't happen.
+ Log.wtf(TAG, "SCHEDULE_TIME mode without schedule: " + mode);
+ preference.setTitle(R.string.zen_mode_set_schedule_link);
+ preference.setSummary(null);
+ }
+ } else if (mode.getType() == TYPE_SCHEDULE_CALENDAR) {
+ // TODO: b/332937635 - set correct metrics category
+ preference.setIntent(ZenSubSettingLauncher.forModeFragment(mContext,
+ ZenModeSetCalendarFragment.class, mode.getId(), 0).toIntent());
+
+ // [Event Icon] Calendar Events / <Calendar name>
+ preference.setIcon(
+ com.android.internal.R.drawable.ic_zen_mode_type_schedule_calendar);
+ preference.setTitle(R.string.zen_mode_trigger_title_schedule_calendar);
+ preference.setSummary(mode.getTriggerDescription());
+ } else {
+ Log.wtf(TAG, "Unexpected type for system-owned mode: " + mode);
+ }
+ }
+
+ @SuppressLint("SwitchIntDef")
+ private void setUpForAppTrigger(Preference preference, ZenMode mode) {
+ // App-owned mode may have triggerDescription, configurationActivity, or both/neither.
+ Intent configurationIntent =
+ mConfigurationActivityHelper.getConfigurationActivityIntentForMode(
+ mode, mServiceListing::findService);
+
+ @StringRes int title = switch (mode.getType()) {
+ case TYPE_BEDTIME -> R.string.zen_mode_trigger_title_bedtime;
+ case TYPE_DRIVING -> R.string.zen_mode_trigger_title_driving;
+ default -> R.string.zen_mode_trigger_title_generic;
+ };
+
+ String summary;
+ if (!Strings.isNullOrEmpty(mode.getTriggerDescription())) {
+ summary = mode.getTriggerDescription();
+ } else if (!Strings.isNullOrEmpty(mode.getRule().getPackageName())) {
+ String appName = null;
+ try {
+ ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+ mode.getRule().getPackageName(), 0);
+ appName = appInfo.loadLabel(mPackageManager).toString();
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Couldn't resolve owner for mode: " + mode);
+ }
+
+ if (appName != null) {
+ summary = mContext.getString(
+ configurationIntent != null
+ ? R.string.zen_mode_trigger_summary_settings_in_app
+ : R.string.zen_mode_trigger_summary_managed_by_app,
+ appName);
+ } else {
+ summary = null;
+ }
+ } else {
+ Log.e(TAG, "Mode without package! " + mode);
+ summary = null;
+ }
+
+ @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 {
+ icon = configurationIntent != null ? R.drawable.ic_zen_mode_trigger_with_activity
+ : R.drawable.ic_zen_mode_trigger_without_activity;
+ }
+
+ preference.setTitle(title);
+ preference.setSummary(summary);
+ preference.setIcon(icon);
+ preference.setIntent(configurationIntent);
+ }
+
+ private final Preference.OnPreferenceChangeListener mSwitchChangeListener = (p, newValue) -> {
+ confirmChangeEnabled(p, (boolean) newValue);
+ return true;
+ };
+
+ private void confirmChangeEnabled(Preference preference, boolean enabled) {
+ @StringRes int title = enabled ? R.string.zen_mode_confirm_enable_title
+ : R.string.zen_mode_confirm_disable_title;
+ @StringRes int message = enabled ? R.string.zen_mode_confirm_enable_message
+ : R.string.zen_mode_confirm_disable_message;
+ @StringRes int confirmButton = enabled ? R.string.zen_mode_action_enable
+ : R.string.zen_mode_action_disable;
+
+ new AlertDialog.Builder(mContext)
+ .setTitle(title)
+ .setMessage(message)
+ .setPositiveButton(confirmButton,
+ (dialog, which) -> setModeEnabled(enabled))
+ .setNegativeButton(R.string.cancel,
+ (dialog, which) -> undoToggleSwitch(preference, enabled))
+ .setOnCancelListener(dialog -> undoToggleSwitch(preference, enabled))
+ .show();
+ }
+
+ private void setModeEnabled(boolean enabled) {
+ saveMode((zenMode) -> {
+ if (enabled != zenMode.getRule().isEnabled()) {
+ zenMode.getRule().setEnabled(enabled);
+ }
+ return zenMode;
+ });
+ }
+
+ private void undoToggleSwitch(Preference preference, boolean wasSwitchedTo) {
+ PrimarySwitchPreference switchPreference = (PrimarySwitchPreference) preference;
+ switchPreference.setChecked(!wasSwitchedTo);
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModesBackend.java b/src/com/android/settings/notification/modes/ZenModesBackend.java
deleted file mode 100644
index ad36fc1..0000000
--- a/src/com/android/settings/notification/modes/ZenModesBackend.java
+++ /dev/null
@@ -1,275 +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.notification.modes;
-
-import android.annotation.Nullable;
-import android.app.ActivityManager;
-import android.app.AutomaticZenRule;
-import android.app.INotificationManager;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.pm.ParceledListSlice;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.ServiceManager;
-import android.provider.ContactsContract;
-import android.provider.Settings;
-import android.service.notification.Condition;
-import android.service.notification.ConversationChannelWrapper;
-import android.service.notification.SystemZenRules;
-import android.service.notification.ZenAdapters;
-import android.service.notification.ZenModeConfig;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Class used for Settings-NMS interactions related to Mode management.
- *
- * <p>This class converts {@link AutomaticZenRule} instances, as well as the manual zen mode,
- * into the unified {@link ZenMode} format.
- */
-class ZenModesBackend {
-
- private static final String TAG = "ZenModeBackend";
-
- @Nullable // Until first usage
- private static ZenModesBackend sInstance;
-
- private final NotificationManager mNotificationManager;
- static INotificationManager sINM = INotificationManager.Stub.asInterface(
- ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-
- private final Context mContext;
-
- static ZenModesBackend getInstance(Context context) {
- if (sInstance == null) {
- sInstance = new ZenModesBackend(context.getApplicationContext());
- }
- return sInstance;
- }
-
- ZenModesBackend(Context context) {
- mContext = context;
- mNotificationManager = context.getSystemService(NotificationManager.class);
- }
-
- List<ZenMode> getModes() {
- ArrayList<ZenMode> modes = new ArrayList<>();
- ZenModeConfig currentConfig = mNotificationManager.getZenModeConfig();
- modes.add(getManualDndMode(currentConfig));
-
- Map<String, AutomaticZenRule> zenRules = mNotificationManager.getAutomaticZenRules();
- for (Map.Entry<String, AutomaticZenRule> zenRuleEntry : zenRules.entrySet()) {
- String ruleId = zenRuleEntry.getKey();
- modes.add(new ZenMode(ruleId, zenRuleEntry.getValue(),
- isRuleActive(ruleId, currentConfig)));
- }
-
- modes.sort((l, r) -> {
- if (l.isManualDnd()) {
- return -1;
- } else if (r.isManualDnd()) {
- return 1;
- }
- return l.getRule().getName().compareTo(r.getRule().getName());
- });
-
- return modes;
- }
-
- @Nullable
- ZenMode getMode(String id) {
- ZenModeConfig currentConfig = mNotificationManager.getZenModeConfig();
- if (ZenMode.MANUAL_DND_MODE_ID.equals(id)) {
- return getManualDndMode(currentConfig);
- } else {
- AutomaticZenRule rule = mNotificationManager.getAutomaticZenRule(id);
- if (rule == null) {
- return null;
- }
- return new ZenMode(id, rule, isRuleActive(id, currentConfig));
- }
- }
-
- public ParceledListSlice<ConversationChannelWrapper> getConversations(boolean onlyImportant) {
- try {
- return sINM.getConversations(onlyImportant);
- } catch (Exception e) {
- Log.w(TAG, "Error calling NoMan", e);
- return ParceledListSlice.emptyList();
- }
- }
-
- public List<String> getStarredContacts() {
- Cursor cursor = null;
- try {
- cursor = queryStarredContactsData();
- return getStarredContacts(cursor);
- } finally {
- if (cursor != null) {
- cursor.close();
- }
- }
- }
-
- @VisibleForTesting
- List<String> getStarredContacts(Cursor cursor) {
- List<String> starredContacts = new ArrayList<>();
- if (cursor != null && cursor.moveToFirst()) {
- do {
- String contact = cursor.getString(0);
- starredContacts.add(contact != null ? contact :
- mContext.getString(R.string.zen_mode_starred_contacts_empty_name));
-
- } while (cursor.moveToNext());
- }
- return starredContacts;
- }
-
- private Cursor queryStarredContactsData() {
- return mContext.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
- new String[]{ContactsContract.Contacts.DISPLAY_NAME_PRIMARY},
- ContactsContract.Data.STARRED + "=1", null,
- ContactsContract.Data.TIMES_CONTACTED);
- }
-
- Cursor queryAllContactsData() {
- return mContext.getContentResolver().query(ContactsContract.Contacts.CONTENT_URI,
- new String[]{ContactsContract.Contacts.DISPLAY_NAME_PRIMARY},
- null, null, null);
- }
-
- private ZenMode getManualDndMode(ZenModeConfig config) {
- ZenModeConfig.ZenRule manualRule = config.manualRule;
- // TODO: b/333682392 - Replace with final strings for name & trigger description
- AutomaticZenRule manualDndRule = new AutomaticZenRule.Builder(
- mContext.getString(R.string.zen_mode_settings_title), manualRule.conditionId)
- .setType(manualRule.type)
- .setZenPolicy(manualRule.zenPolicy)
- .setDeviceEffects(manualRule.zenDeviceEffects)
- .setManualInvocationAllowed(manualRule.allowManualInvocation)
- .setConfigurationActivity(null) // No further settings
- .setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_PRIORITY)
- .build();
-
- return ZenMode.manualDndMode(manualDndRule, config != null && config.isManualActive());
- }
-
- private static boolean isRuleActive(String id, ZenModeConfig config) {
- if (config == null) {
- // shouldn't happen if the config is coming from NM, but be safe
- return false;
- }
- ZenModeConfig.ZenRule configRule = config.automaticRules.get(id);
- return configRule != null && configRule.isAutomaticActive();
- }
-
- void updateMode(ZenMode mode) {
- if (mode.isManualDnd()) {
- try {
- NotificationManager.Policy dndPolicy =
- new ZenModeConfig().toNotificationPolicy(mode.getPolicy());
- mNotificationManager.setNotificationPolicy(dndPolicy, /* fromUser= */ true);
-
- mNotificationManager.setManualZenRuleDeviceEffects(
- mode.getRule().getDeviceEffects());
- } catch (Exception e) {
- Log.w(TAG, "Error updating manual mode", e);
- }
- } else {
- mNotificationManager.updateAutomaticZenRule(mode.getId(), mode.getRule(),
- /* fromUser= */ true);
- }
- }
-
- void activateMode(ZenMode mode, @Nullable Duration forDuration) {
- if (mode.isManualDnd()) {
- Uri durationConditionId = null;
- if (forDuration != null) {
- durationConditionId = ZenModeConfig.toTimeCondition(mContext,
- (int) forDuration.toMinutes(), ActivityManager.getCurrentUser(), true).id;
- }
- mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
- durationConditionId, TAG, /* fromUser= */ true);
-
- } else {
- if (forDuration != null) {
- throw new IllegalArgumentException(
- "Only the manual DND mode can be activated for a specific duration");
- }
- mNotificationManager.setAutomaticZenRuleState(mode.getId(),
- new Condition(mode.getRule().getConditionId(), "", Condition.STATE_TRUE,
- Condition.SOURCE_USER_ACTION));
- }
- }
-
- void deactivateMode(ZenMode mode) {
- if (mode.isManualDnd()) {
- // When calling with fromUser=true this will not snooze other modes.
- mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_OFF, null, TAG,
- /* fromUser= */ true);
- } else {
- // TODO: b/333527800 - This should (potentially) snooze the rule if it was active.
- mNotificationManager.setAutomaticZenRuleState(mode.getId(),
- new Condition(mode.getRule().getConditionId(), "", Condition.STATE_FALSE,
- Condition.SOURCE_USER_ACTION));
- }
- }
-
- void removeMode(ZenMode mode) {
- if (!mode.canBeDeleted()) {
- throw new IllegalArgumentException("Mode " + mode + " cannot be deleted!");
- }
- mNotificationManager.removeAutomaticZenRule(mode.getId(), /* fromUser= */ true);
- }
-
- /**
- * Creates a new custom mode with the provided {@code name}. The mode will be "manual" (i.e.
- * not have a schedule), this can be later updated by the user in the mode settings page.
- *
- * @return the created mode. Only {@code null} if creation failed due to an internal error
- */
- @Nullable
- ZenMode addCustomMode(String name) {
- ZenModeConfig.ScheduleInfo schedule = new ZenModeConfig.ScheduleInfo();
- schedule.days = ZenModeConfig.ALL_DAYS;
- schedule.startHour = 22;
- schedule.endHour = 7;
-
- // TODO: b/326442408 - Create as "manual" (i.e. no trigger) instead of schedule-time.
- AutomaticZenRule rule = new AutomaticZenRule.Builder(name,
- ZenModeConfig.toScheduleConditionId(schedule))
- .setPackage(ZenModeConfig.getScheduleConditionProvider().getPackageName())
- .setType(AutomaticZenRule.TYPE_SCHEDULE_CALENDAR)
- .setOwner(ZenModeConfig.getScheduleConditionProvider())
- .setTriggerDescription(SystemZenRules.getTriggerDescriptionForScheduleTime(
- mContext, schedule))
- .setManualInvocationAllowed(true)
- .build();
-
- String ruleId = mNotificationManager.addAutomaticZenRule(rule);
- return getMode(ruleId);
- }
-}
diff --git a/src/com/android/settings/notification/modes/ZenModesFragmentBase.java b/src/com/android/settings/notification/modes/ZenModesFragmentBase.java
index 3f33b02..0bc0617 100644
--- a/src/com/android/settings/notification/modes/ZenModesFragmentBase.java
+++ b/src/com/android/settings/notification/modes/ZenModesFragmentBase.java
@@ -26,7 +26,10 @@
import android.provider.Settings.Global;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settingslib.notification.modes.ZenModesBackend;
/**
* Base class for all Settings pages controlling Modes behavior.
@@ -41,6 +44,7 @@
protected Context mContext;
protected ZenModesBackend mBackend;
+ protected ZenHelperBackend mHelperBackend;
// Individual pages must implement this method based on what they should do when
// the device's zen mode state changes.
@@ -55,10 +59,16 @@
return TAG;
}
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ void setBackend(ZenModesBackend backend) {
+ mBackend = backend;
+ }
+
@Override
public void onAttach(@NonNull Context context) {
mContext = context;
mBackend = ZenModesBackend.getInstance(context);
+ mHelperBackend = ZenHelperBackend.getInstance(context);
super.onAttach(context);
mSettingsObserver.register();
}
diff --git a/src/com/android/settings/notification/modes/ZenModesLinkPreferenceController.java b/src/com/android/settings/notification/modes/ZenModesLinkPreferenceController.java
new file mode 100644
index 0000000..f2679d7
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModesLinkPreferenceController.java
@@ -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.notification.modes;
+
+import android.app.Flags;
+import android.app.NotificationManager;
+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.provider.Settings;
+
+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.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class ZenModesLinkPreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnResume, OnPause {
+
+ private SettingObserver mSettingObserver;
+ private ZenModeSummaryHelper mSummaryBuilder;
+ private NotificationManager mNm;
+
+ public ZenModesLinkPreferenceController(Context context, String key) {
+ super(context, key);
+ mSummaryBuilder = new ZenModeSummaryHelper(context, ZenHelperBackend.getInstance(context));
+ mNm = mContext.getSystemService(NotificationManager.class);
+ }
+
+ @Override
+ @AvailabilityStatus
+ public int getAvailabilityStatus() {
+ return Flags.modesUi() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ Preference preference = screen.findPreference(getPreferenceKey());
+ mSettingObserver = new SettingObserver(preference);
+ }
+
+ @Override
+ public void onResume() {
+ if (mSettingObserver != null) {
+ mSettingObserver.register(mContext.getContentResolver());
+ }
+ }
+
+ @Override
+ public void onPause() {
+ if (mSettingObserver != null) {
+ mSettingObserver.unregister(mContext.getContentResolver());
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ preference.setSummary(mSummaryBuilder.getSoundSummary(
+ Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.ZEN_MODE,
+ Settings.Global.ZEN_MODE_OFF),
+ mNm.getZenModeConfig()));
+ }
+
+ class SettingObserver extends ContentObserver {
+ private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
+ private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
+ Settings.Global.ZEN_MODE_CONFIG_ETAG);
+
+ private final Preference mPreference;
+
+ public SettingObserver(Preference preference) {
+ super(new Handler());
+ mPreference = preference;
+ }
+
+ public void register(ContentResolver cr) {
+ cr.registerContentObserver(ZEN_MODE_URI, false, this, UserHandle.USER_ALL);
+ cr.registerContentObserver(ZEN_MODE_CONFIG_ETAG_URI, false, this, UserHandle.USER_ALL);
+ }
+
+ public void unregister(ContentResolver cr) {
+ cr.unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ super.onChange(selfChange, uri);
+ if (ZEN_MODE_URI.equals(uri)) {
+ updateState(mPreference);
+ }
+
+ if (ZEN_MODE_CONFIG_ETAG_URI.equals(uri)) {
+ updateState(mPreference);
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java b/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
index c229fb1..b4657a3 100644
--- a/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceController.java
@@ -16,25 +16,82 @@
package com.android.settings.notification.modes;
+import android.app.NotificationManager;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.graphics.drawable.Drawable;
+import android.service.notification.ConditionProviderService;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
import androidx.preference.Preference;
-import com.android.settings.utils.ZenServiceListing;
+import com.android.settings.R;
+import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
-import java.util.Random;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.function.Function;
class ZenModesListAddModePreferenceController extends AbstractPreferenceController {
- private final ZenModesBackend mBackend;
private final ZenServiceListing mServiceListing;
+ private final OnAddModeListener mOnAddModeListener;
- ZenModesListAddModePreferenceController(Context context, ZenModesBackend backend,
- ZenServiceListing serviceListing) {
+ private final ConfigurationActivityHelper mConfigurationActivityHelper;
+ private final NotificationManager mNotificationManager;
+ private final PackageManager mPackageManager;
+ private final Function<ApplicationInfo, Drawable> mAppIconRetriever;
+ private final ListeningExecutorService mBackgroundExecutor;
+ private final Executor mUiThreadExecutor;
+
+ record ModeType(String name, Drawable icon, @Nullable String summary,
+ @Nullable Intent creationActivityIntent) { }
+
+ interface OnAddModeListener {
+ void onAvailableModeTypesForAdd(List<ModeType> types);
+ }
+
+ ZenModesListAddModePreferenceController(Context context, OnAddModeListener onAddModeListener) {
+ this(context, onAddModeListener, new ZenServiceListing(context),
+ new ConfigurationActivityHelper(context.getPackageManager()),
+ context.getSystemService(NotificationManager.class), context.getPackageManager(),
+ applicationInfo -> Utils.getBadgedIcon(context, applicationInfo),
+ Executors.newCachedThreadPool(), context.getMainExecutor());
+ }
+
+ @VisibleForTesting
+ ZenModesListAddModePreferenceController(Context context,
+ OnAddModeListener onAddModeListener, ZenServiceListing serviceListing,
+ ConfigurationActivityHelper configurationActivityHelper,
+ NotificationManager notificationManager, PackageManager packageManager,
+ Function<ApplicationInfo, Drawable> appIconRetriever,
+ ExecutorService backgroundExecutor, Executor uiThreadExecutor) {
super(context);
- mBackend = backend;
+ mOnAddModeListener = onAddModeListener;
mServiceListing = serviceListing;
+ mConfigurationActivityHelper = configurationActivityHelper;
+ mNotificationManager = notificationManager;
+ mPackageManager = packageManager;
+ mAppIconRetriever = appIconRetriever;
+ mBackgroundExecutor = MoreExecutors.listeningDecorator(backgroundExecutor);
+ mUiThreadExecutor = uiThreadExecutor;
}
@Override
@@ -50,12 +107,79 @@
@Override
public void updateState(Preference preference) {
preference.setOnPreferenceClickListener(pref -> {
- // TODO: b/326442408 - Launch the proper mode creation flow (using mServiceListing).
- ZenMode mode = mBackend.addCustomMode("New mode #" + new Random().nextInt(1000));
- if (mode != null) {
- ZenSubSettingLauncher.forMode(mContext, mode.getId()).launch();
- }
+ onClickAddMode();
return true;
});
}
+
+ @VisibleForTesting
+ void onClickAddMode() {
+ FutureUtil.whenDone(
+ mBackgroundExecutor.submit(this::getModeProviders),
+ mOnAddModeListener::onAvailableModeTypesForAdd,
+ mUiThreadExecutor);
+ }
+
+ @WorkerThread
+ private ImmutableList<ModeType> getModeProviders() {
+ ImmutableSet<ComponentInfo> approvedComponents = mServiceListing.loadApprovedComponents();
+
+ ArrayList<ModeType> appProvidedModes = new ArrayList<>();
+ for (ComponentInfo ci: approvedComponents) {
+ ModeType modeType = getValidNewModeTypeFromComponent(ci);
+ if (modeType != null) {
+ appProvidedModes.add(modeType);
+ }
+ }
+
+ return ImmutableList.<ModeType>builder()
+ .add(new ModeType(
+ mContext.getString(R.string.zen_mode_new_option_custom),
+ mContext.getDrawable(R.drawable.ic_zen_mode_new_option_custom),
+ null, null))
+ .addAll(appProvidedModes.stream()
+ .sorted(Comparator.comparing(ModeType::name))
+ .toList())
+ .build();
+ }
+
+ /**
+ * Returns a {@link ModeType} object corresponding to the approved {@link ComponentInfo} that
+ * specifies a creatable rule, if such a mode can actually be created (has an associated and
+ * enabled configuration activity, has not exceeded the rule instance limit, etc). Otherwise,
+ * returns {@code null}.
+ */
+ @WorkerThread
+ @Nullable
+ private ModeType getValidNewModeTypeFromComponent(ComponentInfo ci) {
+ if (ci.metaData == null) {
+ return null;
+ }
+
+ String ruleType = (ci instanceof ServiceInfo)
+ ? ci.metaData.getString(ConditionProviderService.META_DATA_RULE_TYPE)
+ : ci.metaData.getString(NotificationManager.META_DATA_AUTOMATIC_RULE_TYPE);
+ if (ruleType == null || ruleType.trim().isEmpty()) {
+ return null;
+ }
+
+ int ruleInstanceLimit = (ci instanceof ServiceInfo)
+ ? ci.metaData.getInt(ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1)
+ : ci.metaData.getInt(NotificationManager.META_DATA_RULE_INSTANCE_LIMIT, -1);
+ if (ruleInstanceLimit > 0 && mNotificationManager.getRuleInstanceCount(
+ ci.getComponentName()) >= ruleInstanceLimit) {
+ return null; // Would exceed instance limit.
+ }
+
+ ComponentName configurationActivity =
+ mConfigurationActivityHelper.getConfigurationActivityFromApprovedComponent(ci);
+ if (configurationActivity == null) {
+ return null;
+ }
+
+ String appName = ci.applicationInfo.loadLabel(mPackageManager).toString();
+ Drawable appIcon = mAppIconRetriever.apply(ci.applicationInfo);
+ Intent configActivityIntent = new Intent().setComponent(configurationActivity);
+ return new ModeType(ruleType, appIcon, appName, configActivityIntent);
+ }
}
diff --git a/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java b/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java
new file mode 100644
index 0000000..57d3bf9
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenModesListAddModeTypeChooserDialog.java
@@ -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.modes;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.modes.ZenModesListAddModePreferenceController.ModeType;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+public class ZenModesListAddModeTypeChooserDialog extends InstrumentedDialogFragment {
+
+ private static final String TAG = "ZenModesListAddModeTypeChooserDialog";
+
+ private OnChooseModeTypeListener mChooseModeTypeListener;
+ private ImmutableList<ModeType> mOptions;
+
+ interface OnChooseModeTypeListener {
+ void onTypeSelected(ModeType type);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ // TODO: b/332937635 - Update metrics category
+ return 0;
+ }
+
+ static void show(DashboardFragment parent,
+ OnChooseModeTypeListener onChooseModeTypeListener,
+ List<ModeType> options) {
+ ZenModesListAddModeTypeChooserDialog dialog = new ZenModesListAddModeTypeChooserDialog();
+ dialog.mChooseModeTypeListener = onChooseModeTypeListener;
+ dialog.mOptions = ImmutableList.copyOf(options);
+ dialog.setTargetFragment(parent, 0);
+ dialog.show(parent.getParentFragmentManager(), TAG);
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ checkState(getContext() != null);
+ return new AlertDialog.Builder(getContext())
+ .setTitle(R.string.zen_mode_new_title)
+ .setAdapter(new OptionsAdapter(getContext(), mOptions),
+ (dialog, which) -> mChooseModeTypeListener.onTypeSelected(
+ mOptions.get(which)))
+ .setNegativeButton(R.string.cancel, null)
+ .create();
+ }
+
+ private static class OptionsAdapter extends ArrayAdapter<ModeType> {
+
+ private final LayoutInflater mInflater;
+
+ private OptionsAdapter(Context context,
+ ImmutableList<ModeType> availableModeProviders) {
+ super(context, R.layout.zen_mode_type_item, availableModeProviders);
+ mInflater = LayoutInflater.from(context);
+ }
+
+ @NonNull
+ @Override
+ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+ if (convertView == null) {
+ convertView = mInflater.inflate(R.layout.zen_mode_type_item, parent, false);
+ }
+ ImageView imageView = checkNotNull(convertView.findViewById(R.id.icon));
+ TextView title = checkNotNull(convertView.findViewById(R.id.title));
+ TextView subtitle = checkNotNull(convertView.findViewById(R.id.subtitle));
+
+ ModeType option = checkNotNull(getItem(position));
+ imageView.setImageDrawable(option.icon());
+ title.setText(option.name());
+ subtitle.setText(option.summary());
+ subtitle.setVisibility(
+ Strings.isNullOrEmpty(option.summary()) ? View.GONE : View.VISIBLE);
+
+ return convertView;
+ }
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenModesListFragment.java b/src/com/android/settings/notification/modes/ZenModesListFragment.java
index 80678f6..be458b3 100644
--- a/src/com/android/settings/notification/modes/ZenModesListFragment.java
+++ b/src/com/android/settings/notification/modes/ZenModesListFragment.java
@@ -16,46 +16,51 @@
package com.android.settings.notification.modes;
-import android.app.NotificationManager;
import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
import android.content.Context;
-import android.service.notification.ConditionProviderService;
+import android.content.Intent;
import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
+import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.modes.ZenModesListAddModePreferenceController.ModeType;
+import com.android.settings.notification.modes.ZenModesListAddModePreferenceController.OnAddModeListener;
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.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.search.SearchIndexable;
import com.google.common.collect.ImmutableList;
import java.util.List;
+import java.util.Optional;
@SearchIndexable
public class ZenModesListFragment extends ZenModesFragmentBase {
- private static final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
+ static final int REQUEST_NEW_MODE = 101;
+
+ @Nullable private ComponentName mActivityInvokedForAddNew;
+ @Nullable private ImmutableList<String> mZenModeIdsBeforeAddNew;
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG);
- serviceListing.reloadApprovedServices();
- return buildPreferenceControllers(context, this, serviceListing);
+ return buildPreferenceControllers(context, this::onAvailableModeTypesForAdd);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
- @Nullable Fragment parent, @Nullable ZenServiceListing serviceListing) {
+ OnAddModeListener onAddModeListener) {
// We need to redefine ZenModesBackend here even though mBackend exists so that this method
// can be static; it must be static to be able to be used in SEARCH_INDEX_DATA_PROVIDER.
ZenModesBackend backend = ZenModesBackend.getInstance(context);
return ImmutableList.of(
- new ZenModesListPreferenceController(context, parent, backend),
- new ZenModesListAddModePreferenceController(context, backend, serviceListing)
+ new ZenModesListPreferenceController(context, backend),
+ new ZenModesListAddModePreferenceController(context, onAddModeListener)
);
}
@@ -77,14 +82,54 @@
return SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION;
}
- private static ManagedServiceSettings.Config getConditionProviderConfig() {
- return new ManagedServiceSettings.Config.Builder()
- .setTag(TAG)
- .setIntentAction(ConditionProviderService.SERVICE_INTERFACE)
- .setConfigurationIntentAction(NotificationManager.ACTION_AUTOMATIC_ZEN_RULE)
- .setPermission(android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE)
- .setNoun("condition provider")
- .build();
+ private void onAvailableModeTypesForAdd(List<ModeType> types) {
+ if (types.size() > 1) {
+ // Show dialog to choose the mode to be created. Continue once the user chooses.
+ ZenModesListAddModeTypeChooserDialog.show(this, this::onChosenModeTypeForAdd, types);
+ } else {
+ // Will be custom_manual.
+ onChosenModeTypeForAdd(types.get(0));
+ }
+ }
+
+ @VisibleForTesting
+ void onChosenModeTypeForAdd(ModeType type) {
+ if (type.creationActivityIntent() != null) {
+ mActivityInvokedForAddNew = type.creationActivityIntent().getComponent();
+ mZenModeIdsBeforeAddNew = ImmutableList.copyOf(
+ mBackend.getModes().stream().map(ZenMode::getId).toList());
+ startActivityForResult(type.creationActivityIntent(), REQUEST_NEW_MODE);
+ } else {
+ // Custom-manual mode -> "add a mode" screen.
+ // TODO: b/332937635 - set metrics categories correctly
+ new SubSettingLauncher(requireContext())
+ .setDestination(ZenModeNewCustomFragment.class.getName())
+ .setSourceMetricsCategory(0)
+ .launch();
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ // If coming back after starting a 3rd-party configuration activity to create a new mode,
+ // try to identify the created mode. Ideally this would be part of the resultCode/data, but
+ // the existing API doesn't work that way...
+ ComponentName activityInvoked = mActivityInvokedForAddNew;
+ ImmutableList<String> previousIds = mZenModeIdsBeforeAddNew;
+ mActivityInvokedForAddNew = null;
+ mZenModeIdsBeforeAddNew = null;
+ if (requestCode != REQUEST_NEW_MODE || previousIds == null || activityInvoked == null) {
+ return;
+ }
+
+ // If we find a new mode owned by the same package, presumably that's it. Open its page.
+ Optional<ZenMode> createdZenMode = mBackend.getModes().stream()
+ .filter(m -> !previousIds.contains(m.getId()))
+ .filter(m -> m.getRule().getPackageName().equals(activityInvoked.getPackageName()))
+ .findFirst();
+ createdZenMode.ifPresent(
+ mode -> ZenSubSettingLauncher.forMode(mContext, mode.getId()).launch());
}
/**
@@ -105,7 +150,7 @@
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
- return buildPreferenceControllers(context, null, null);
+ return buildPreferenceControllers(context, ignoredType -> {});
}
};
}
diff --git a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
index 7ecfb3a..261ab1d 100644
--- a/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
+++ b/src/com/android/settings/notification/modes/ZenModesListItemPreference.java
@@ -16,16 +16,31 @@
package com.android.settings.notification.modes;
import android.content.Context;
+import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
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.google.common.base.Strings;
/**
* Preference representing a single mode item on the modes aggregator page. Clicking on this
* preference leads to an individual mode's configuration page.
*/
class ZenModesListItemPreference extends RestrictedPreference {
- final Context mContext;
- ZenMode mZenMode;
+
+ private final Context mContext;
+ private ZenMode mZenMode;
+
+ private TextView mTitleView;
+ private TextView mSummaryView;
ZenModesListItemPreference(Context context, ZenMode zenMode) {
super(context);
@@ -35,19 +50,65 @@
}
@Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ if (holder.findViewById(android.R.id.title) instanceof TextView titleView) {
+ mTitleView = titleView;
+ }
+ if (holder.findViewById(android.R.id.summary) instanceof TextView summaryView) {
+ mSummaryView = summaryView;
+ }
+ updateTextColor(mZenMode);
+ }
+
+ @Override
public void onClick() {
ZenSubSettingLauncher.forMode(mContext, mZenMode.getId()).launch();
}
public void setZenMode(ZenMode zenMode) {
mZenMode = zenMode;
- setTitle(mZenMode.getRule().getName());
- setSummary(mZenMode.getRule().getTriggerDescription());
- setIconSize(ICON_SIZE_SMALL);
+ setTitle(mZenMode.getName());
+ CharSequence statusText = switch (mZenMode.getStatus()) {
+ case ENABLED_AND_ACTIVE ->
+ Strings.isNullOrEmpty(mZenMode.getTriggerDescription())
+ ? 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),
+ mZenMode.getRule().getTriggerDescription());
+ case ENABLED -> mZenMode.getRule().getTriggerDescription();
+ 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);
+ setIconSize(ICON_SIZE_SMALL);
FutureUtil.whenDone(
- mZenMode.getIcon(mContext, IconLoader.getInstance()),
- icon -> setIcon(IconUtil.applyTint(mContext, icon)),
+ mZenMode.getIcon(mContext, ZenIconLoader.getInstance()),
+ icon -> setIcon(
+ zenMode.isActive()
+ ? IconUtil.applyAccentTint(mContext, icon)
+ : IconUtil.applyNormalTint(mContext, icon)),
mContext.getMainExecutor());
+
+ updateTextColor(zenMode);
+ }
+
+ private void updateTextColor(@Nullable ZenMode zenMode) {
+ boolean isActive = zenMode != null && zenMode.isActive();
+ if (mTitleView != null) {
+ mTitleView.setTextColor(Utils.getColorAttr(mContext,
+ isActive ? android.R.attr.colorAccent : android.R.attr.textColorPrimary));
+ }
+ if (mSummaryView != null) {
+ mSummaryView.setTextColor(Utils.getColorAttr(mContext,
+ isActive ? android.R.attr.colorAccent : android.R.attr.textColorSecondary));
+ }
+ }
+
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ ZenMode getZenMode() {
+ return mZenMode;
}
}
diff --git a/src/com/android/settings/notification/modes/ZenModesListPreferenceController.java b/src/com/android/settings/notification/modes/ZenModesListPreferenceController.java
index 5dcd9eb..ba12b9a 100644
--- a/src/com/android/settings/notification/modes/ZenModesListPreferenceController.java
+++ b/src/com/android/settings/notification/modes/ZenModesListPreferenceController.java
@@ -20,13 +20,13 @@
import android.content.res.Resources;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.search.SearchIndexableRaw;
import java.util.HashMap;
@@ -41,14 +41,10 @@
class ZenModesListPreferenceController extends BasePreferenceController {
protected static final String KEY = "zen_modes_list";
- @Nullable
- protected Fragment mParent;
protected ZenModesBackend mBackend;
- public ZenModesListPreferenceController(Context context, @Nullable Fragment parent,
- @NonNull ZenModesBackend backend) {
+ ZenModesListPreferenceController(Context context, @NonNull ZenModesBackend backend) {
super(context, KEY);
- mParent = parent;
mBackend = backend;
}
diff --git a/src/com/android/settings/notification/modes/ZenServiceListing.java b/src/com/android/settings/notification/modes/ZenServiceListing.java
new file mode 100644
index 0000000..ccecec5
--- /dev/null
+++ b/src/com/android/settings/notification/modes/ZenServiceListing.java
@@ -0,0 +1,170 @@
+/*
+ * 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 android.app.ActivityManager;
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.service.notification.ConditionProviderService;
+import android.util.ArraySet;
+import android.util.Slog;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
+import com.android.settings.utils.ManagedServiceSettings;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+class ZenServiceListing {
+
+ static final ManagedServiceSettings.Config CONFIGURATION =
+ new ManagedServiceSettings.Config.Builder()
+ .setTag("ZenServiceListing")
+ .setIntentAction(ConditionProviderService.SERVICE_INTERFACE)
+ .setConfigurationIntentAction(NotificationManager.ACTION_AUTOMATIC_ZEN_RULE)
+ .setPermission(android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE)
+ .setNoun("condition provider")
+ .build();
+
+ private final Context mContext;
+ private final Set<ComponentInfo> mApprovedComponents = new ArraySet<>();
+ private final List<Callback> mZenCallbacks = new ArrayList<>();
+ private final NotificationManager mNm;
+
+ ZenServiceListing(Context context) {
+ mContext = context;
+ mNm = context.getSystemService(NotificationManager.class);
+ }
+
+ public ComponentInfo findService(final ComponentName cn) {
+ if (cn == null) {
+ return null;
+ }
+ for (ComponentInfo component : mApprovedComponents) {
+ final ComponentName ci = new ComponentName(component.packageName, component.name);
+ if (ci.equals(cn)) {
+ return component;
+ }
+ }
+ return null;
+ }
+
+ public void addZenCallback(Callback callback) {
+ mZenCallbacks.add(callback);
+ }
+
+ public void removeZenCallback(Callback callback) {
+ mZenCallbacks.remove(callback);
+ }
+
+ @WorkerThread
+ public ImmutableSet<ComponentInfo> loadApprovedComponents() {
+ return loadApprovedComponents(null);
+ }
+
+ @WorkerThread
+ public ImmutableSet<ComponentInfo> loadApprovedComponents(@Nullable String restrictToPkg) {
+ mApprovedComponents.clear();
+
+ List<String> enabledNotificationListenerPkgs = mNm.getEnabledNotificationListenerPackages();
+ List<ComponentInfo> components = new ArrayList<>();
+ getServices(CONFIGURATION, components, mContext.getPackageManager(), restrictToPkg);
+ getActivities(CONFIGURATION, components, mContext.getPackageManager(), restrictToPkg);
+ for (ComponentInfo componentInfo : components) {
+ final String pkg = componentInfo.getComponentName().getPackageName();
+ if (mNm.isNotificationPolicyAccessGrantedForPackage(pkg)
+ || enabledNotificationListenerPkgs.contains(pkg)) {
+ mApprovedComponents.add(componentInfo);
+ }
+ }
+
+ if (!mApprovedComponents.isEmpty()) {
+ for (Callback callback : mZenCallbacks) {
+ callback.onComponentsReloaded(mApprovedComponents);
+ }
+ }
+
+ return ImmutableSet.copyOf(mApprovedComponents);
+ }
+
+ private static void getServices(ManagedServiceSettings.Config c, List<ComponentInfo> list,
+ PackageManager pm, @Nullable String restrictToPkg) {
+ final int user = ActivityManager.getCurrentUser();
+
+ Intent queryIntent = new Intent(c.intentAction);
+ if (restrictToPkg != null) {
+ queryIntent.setPackage(restrictToPkg);
+ }
+ List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
+ queryIntent,
+ PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+ user);
+
+ for (int i = 0, count = installedServices.size(); i < count; i++) {
+ ResolveInfo resolveInfo = installedServices.get(i);
+ ServiceInfo info = resolveInfo.serviceInfo;
+
+ if (!c.permission.equals(info.permission)) {
+ Slog.w(c.tag, "Skipping " + c.noun + " service "
+ + info.packageName + "/" + info.name
+ + ": it does not require the permission "
+ + c.permission);
+ continue;
+ }
+ if (list != null) {
+ list.add(info);
+ }
+ }
+ }
+
+ private static void getActivities(ManagedServiceSettings.Config c, List<ComponentInfo> list,
+ PackageManager pm, @Nullable String restrictToPkg) {
+ final int user = ActivityManager.getCurrentUser();
+
+ Intent queryIntent = new Intent(c.configIntentAction);
+ if (restrictToPkg != null) {
+ queryIntent.setPackage(restrictToPkg);
+ }
+ List<ResolveInfo> resolveInfos = pm.queryIntentActivitiesAsUser(
+ queryIntent,
+ PackageManager.GET_ACTIVITIES | PackageManager.GET_META_DATA,
+ user);
+
+ for (int i = 0, count = resolveInfos.size(); i < count; i++) {
+ ResolveInfo resolveInfo = resolveInfos.get(i);
+ ActivityInfo info = resolveInfo.activityInfo;
+ if (list != null) {
+ list.add(info);
+ }
+ }
+ }
+
+ public interface Callback {
+ void onComponentsReloaded(Set<ComponentInfo> components);
+ }
+}
diff --git a/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java b/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java
index 11f3492..00c21bb 100644
--- a/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java
+++ b/src/com/android/settings/notification/modes/ZenSubSettingLauncher.java
@@ -16,11 +16,14 @@
package com.android.settings.notification.modes;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
class ZenSubSettingLauncher {
@@ -29,11 +32,11 @@
SettingsEnums.NOTIFICATION_ZEN_MODE_AUTOMATION);
}
- private static SubSettingLauncher forModeFragment(Context context,
- Class<? extends ZenModeFragmentBase> fragmentClass, String modeId,
+ static SubSettingLauncher forModeFragment(Context context,
+ Class<? extends DashboardFragment> fragmentClass, String modeId,
int sourceMetricsCategory) {
Bundle bundle = new Bundle();
- bundle.putString(ZenModeFragmentBase.MODE_ID, modeId);
+ bundle.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, modeId);
return new SubSettingLauncher(context)
.setDestination(fragmentClass.getName())
diff --git a/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
index c8d6eb9..bb83a73 100644
--- a/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
+++ b/src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
@@ -21,13 +21,13 @@
import android.os.Bundle;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.notification.modes.ZenDurationDialog;
public class SettingsZenDurationDialog extends InstrumentedDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- return new com.android.settingslib.notification.ZenDurationDialog(
- getContext()).createDialog();
+ return new ZenDurationDialog(getContext()).createDialog();
}
@Override
diff --git a/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
index 11def66..f243a51 100644
--- a/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
+++ b/src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
@@ -23,7 +23,7 @@
import androidx.appcompat.app.AlertDialog;
import com.android.settingslib.CustomDialogPreferenceCompat;
-import com.android.settingslib.notification.ZenDurationDialog;
+import com.android.settingslib.notification.modes.ZenDurationDialog;
public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 426f52d..de641c5 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -116,7 +116,7 @@
ActivityManager.getCurrentUser(), true).id;
if (android.app.Flags.modesApi()) {
mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
- conditionId, TAG, /* fromUser= */ true);
+ conditionId, TAG, /* fromUser= */ true);
} else {
mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
conditionId, TAG);
@@ -241,12 +241,14 @@
}
savePolicy(getNewDefaultPriorityCategories(allowSenders, category),
- priorityCallSenders, priorityMessagesSenders, mPolicy.suppressedVisualEffects,
+ priorityCallSenders, priorityMessagesSenders, mPolicy.suppressedVisualEffects,
mPolicy.priorityConversationSenders);
- if (ZenModeSettingsBase.DEBUG) Log.d(TAG, "onPrefChange allow" +
- stringCategory + "=" + allowSenders + " allow" + stringCategory + "From="
- + ZenModeConfig.sourceToString(allowSendersFrom));
+ if (ZenModeSettingsBase.DEBUG) {
+ Log.d(TAG, "onPrefChange allow"
+ + stringCategory + "=" + allowSenders + " allow" + stringCategory + "From="
+ + ZenModeConfig.sourceToString(allowSendersFrom));
+ }
}
protected void saveConversationSenders(int val) {
@@ -280,7 +282,7 @@
switch (contactType) {
case ZenPolicy.PEOPLE_TYPE_ANYONE:
return ZEN_MODE_FROM_ANYONE;
- case ZenPolicy.PEOPLE_TYPE_CONTACTS:
+ case ZenPolicy.PEOPLE_TYPE_CONTACTS:
return ZEN_MODE_FROM_CONTACTS;
case ZenPolicy.PEOPLE_TYPE_STARRED:
return ZEN_MODE_FROM_STARRED;
@@ -308,7 +310,7 @@
switch (setting) {
case ZenPolicy.PEOPLE_TYPE_ANYONE:
return NotificationManager.Policy.PRIORITY_SENDERS_ANY;
- case ZenPolicy.PEOPLE_TYPE_CONTACTS:
+ case ZenPolicy.PEOPLE_TYPE_CONTACTS:
return NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS;
case ZenPolicy.PEOPLE_TYPE_STARRED:
return NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
@@ -321,7 +323,7 @@
protected int getAlarmsTotalSilencePeopleSummary(int category) {
if (category == NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES) {
return R.string.zen_mode_none_messages;
- } else if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS){
+ } else if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CALLS) {
return R.string.zen_mode_none_calls;
} else if (category == NotificationManager.Policy.PRIORITY_CATEGORY_CONVERSATIONS) {
return R.string.zen_mode_from_no_conversations;
@@ -470,8 +472,8 @@
if (cursor != null && cursor.moveToFirst()) {
do {
String contact = cursor.getString(0);
- starredContacts.add(contact != null ? contact :
- mContext.getString(R.string.zen_mode_starred_contacts_empty_name));
+ int emptyNameId = R.string.zen_mode_starred_contacts_empty_name;
+ starredContacts.add(contact != null ? contact : mContext.getString(emptyNameId));
} while (cursor.moveToNext());
}
diff --git a/src/com/android/settings/notification/zen/ZenModePreferenceController.java b/src/com/android/settings/notification/zen/ZenModePreferenceController.java
index 7c36d80..c21bc3b 100644
--- a/src/com/android/settings/notification/zen/ZenModePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePreferenceController.java
@@ -28,9 +28,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.notification.modes.ZenModesListFragment;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -51,7 +49,6 @@
super.displayPreference(screen);
Preference preference = screen.findPreference(getPreferenceKey());
mSettingObserver = new SettingObserver(preference);
- maybeSetTitleAndDestination(preference);
}
@Override
@@ -70,28 +67,17 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE_UNSEARCHABLE;
+ return Flags.modesUi() ? UNSUPPORTED_ON_DEVICE : AVAILABLE_UNSEARCHABLE;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
- maybeSetTitleAndDestination(preference);
if (preference.isEnabled()) {
preference.setSummary(mSummaryBuilder.getSoundSummary());
}
}
- // Only when modes_ui is active: change title & target fragment.
- private void maybeSetTitleAndDestination(Preference preference) {
- if (!Flags.modesUi()) {
- return;
- }
-
- preference.setTitle(R.string.zen_modes_list_title);
- preference.setFragment(ZenModesListFragment.class.getCanonicalName());
- }
-
class SettingObserver extends ContentObserver {
private final Uri ZEN_MODE_URI = Settings.Global.getUriFor(Settings.Global.ZEN_MODE);
private final Uri ZEN_MODE_CONFIG_ETAG_URI = Settings.Global.getUriFor(
diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index 4f6f058..d16b1e4 100644
--- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -132,8 +132,8 @@
final Uri contentUri = new Uri.Builder().appendPath(ZEN_MODE_SLICE_KEY).build();
final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
return SliceBuilderUtils.buildSearchResultPageIntent(context,
- ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle,
- SettingsEnums.NOTIFICATION_ZEN_MODE, R.string.menu_key_notifications)
+ ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle,
+ SettingsEnums.NOTIFICATION_ZEN_MODE, R.string.menu_key_notifications)
.setClassName(context.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
diff --git a/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt b/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt
index f76e29a..58afb25 100644
--- a/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt
+++ b/src/com/android/settings/onboarding/OnboardingFeatureProvider.kt
@@ -39,4 +39,12 @@
* @param logger To log B&R stats.
*/
fun getSoundBackupHelper(context: Context, logger: BackupRestoreEventLogger): BackupHelper
+
+ /**
+ * Return a BackupHelper for backup accessibility appearance related settings.
+ *
+ * @param context App context
+ * @param logger To log B&R stats.
+ */
+ fun getAccessibilityAppearanceBackupHelper(context: Context, logger: BackupRestoreEventLogger): BackupHelper
}
\ No newline at end of file
diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt
index 675d789..84b82cb 100644
--- a/src/com/android/settings/overlay/FeatureFactory.kt
+++ b/src/com/android/settings/overlay/FeatureFactory.kt
@@ -22,7 +22,6 @@
import com.android.settings.applications.ApplicationFeatureProvider
import com.android.settings.biometrics.face.FaceFeatureProvider
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider
-import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
@@ -119,11 +118,6 @@
abstract val fingerprintFeatureProvider: FingerprintFeatureProvider
/**
- * Gets implementation for Biometrics repository provider.
- */
- abstract val biometricsRepositoryProvider: BiometricsRepositoryProvider
-
- /**
* Gets implementation for the WifiTrackerLib.
*/
abstract val wifiTrackerLibProvider: WifiTrackerLibProvider
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
index 2142ea5..a21d7e3 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
@@ -31,7 +31,6 @@
import com.android.settings.biometrics.face.FaceFeatureProviderImpl
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProviderImpl
-import com.android.settings.biometrics2.factory.BiometricsRepositoryProviderImpl
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl
import com.android.settings.connecteddevice.dock.DockUpdaterFeatureProviderImpl
@@ -152,8 +151,6 @@
FingerprintFeatureProviderImpl()
}
- override val biometricsRepositoryProvider by lazy { BiometricsRepositoryProviderImpl() }
-
override val wifiTrackerLibProvider: WifiTrackerLibProvider by lazy {
WifiTrackerLibProviderImpl()
}
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 02f5b86..a7a039e 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -16,8 +16,11 @@
package com.android.settings.password;
+import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED;
+
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
+import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
@@ -137,7 +140,7 @@
BiometricPrompt.Builder promptBuilder = new BiometricPrompt.Builder(getContext())
.setTitle(promptInfo.getTitle())
.setUseDefaultTitle() // use default title if title is null/empty
- .setDeviceCredentialAllowed(true)
+ .setAllowedAuthenticators(promptInfo.getAuthenticators())
.setSubtitle(promptInfo.getSubtitle())
.setDescription(promptInfo.getDescription())
.setTextForDeviceCredential(
@@ -170,6 +173,15 @@
if (promptInfo.isUseDefaultSubtitle()) {
promptBuilder.setUseDefaultSubtitle();
}
+
+ if ((promptInfo.getAuthenticators()
+ & BiometricManager.Authenticators.DEVICE_CREDENTIAL) == 0) {
+ promptBuilder.setNegativeButton(promptInfo.getNegativeButtonText(),
+ getContext().getMainExecutor(),
+ (dialog, which) -> mAuthenticationCallback.onAuthenticationError(
+ BIOMETRIC_ERROR_USER_CANCELED,
+ null /* errString */));
+ }
mBiometricPrompt = promptBuilder.build();
}
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index ce9a566..d5d079e 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -160,11 +160,14 @@
static final int CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST = 103;
@VisibleForTesting
static final int SKIP_FINGERPRINT_REQUEST = 104;
+ @VisibleForTesting
+ static final int BIOMETRIC_AUTH_REQUEST = 105;
private LockPatternUtils mLockPatternUtils;
private DevicePolicyManager mDpm;
private boolean mRequestGatekeeperPasswordHandle = false;
private boolean mPasswordConfirmed = false;
+ private boolean mBiometricsAuthSuccessful = false;
private boolean mWaitingForConfirmation = false;
private boolean mWaitingForActivityResult = false;
private LockscreenCredential mUserPassword;
@@ -488,6 +491,18 @@
? data.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD)
: null;
updatePreferencesOrFinish(false /* isRecreatingActivity */);
+ if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getContext(),
+ mBiometricsAuthSuccessful, mWaitingForConfirmation, mUserId)) {
+ mWaitingForConfirmation = true;
+ Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
+ mUserId);
+ }
+ } else if (requestCode == BIOMETRIC_AUTH_REQUEST) {
+ if (resultCode == Activity.RESULT_OK) {
+ mBiometricsAuthSuccessful = true;
+ } else {
+ finish();
+ }
} else if (requestCode == CHOOSE_LOCK_REQUEST) {
if (resultCode != RESULT_CANCELED) {
getActivity().setResult(resultCode, data);
@@ -763,6 +778,9 @@
entries.removePreference(pref);
} else if (!enabled) {
pref.setEnabled(false);
+ pref.setSummary(
+ com.android.settingslib.widget
+ .restricted.R.string.disabled_by_admin);
}
}
}
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index a645300..bcf1795 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -271,6 +271,8 @@
private static final int CONFIRM_EXISTING_REQUEST = 58;
static final int RESULT_FINISHED = RESULT_FIRST_USER;
+ private boolean mIsErrorTooShort = true;
+
/** Used to store the profile type for which pin/password is being set */
protected enum ProfileType {
None,
@@ -672,6 +674,11 @@
view.addView(mPasswordRestrictionView);
}
+ @VisibleForTesting
+ View getPasswordRequirementsView() {
+ return mPasswordRestrictionView;
+ }
+
private void createHintMessageView(ViewGroup view) {
if (mPasswordRestrictionView != null) {
return;
@@ -855,6 +862,7 @@
*/
String[] convertErrorCodeToMessages() {
List<String> messages = new ArrayList<>();
+ mIsErrorTooShort = false;
for (PasswordValidationError error : mValidationErrors) {
switch (error.errorCode) {
case CONTAINS_INVALID_CHARACTERS:
@@ -889,6 +897,7 @@
R.string.lockpassword_password_requires_nonnumerical));
break;
case TOO_SHORT:
+ mIsErrorTooShort = true;
String message = StringUtil.getIcuPluralsString(getContext(),
error.requirement,
mIsAlphaMode
@@ -951,12 +960,13 @@
? LockscreenCredential.createPassword(mPasswordEntry.getText())
: LockscreenCredential.createPin(mPasswordEntry.getText());
final int length = password.size();
+
if (mUiStage == Stage.Introduction) {
mPasswordRestrictionView.setVisibility(View.VISIBLE);
final boolean passwordCompliant = validatePassword(password);
String[] messages = convertErrorCodeToMessages();
// Update the fulfillment of requirements.
- mPasswordRequirementAdapter.setRequirements(messages);
+ mPasswordRequirementAdapter.setRequirements(messages, mIsErrorTooShort);
// set the visibility of pin_auto_confirm option accordingly
setAutoPinConfirmOption(passwordCompliant, length);
// Enable/Disable the next button accordingly.
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 7f362c3..c0b3093 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -17,10 +17,10 @@
package com.android.settings.password;
+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.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
import static com.android.systemui.biometrics.Utils.toBitmap;
@@ -40,6 +40,7 @@
import android.graphics.Bitmap;
import android.graphics.Color;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.hardware.biometrics.PromptInfo;
@@ -76,6 +77,9 @@
/** Use this extra value to provide a custom logo description for the biometric prompt. **/
public static final String CUSTOM_BIOMETRIC_PROMPT_LOGO_DESCRIPTION_KEY =
"custom_logo_description";
+ public static final String BIOMETRIC_PROMPT_AUTHENTICATORS = "biometric_prompt_authenticators";
+ public static final String BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT =
+ "biometric_prompt_negative_button_text";
public static class InternalActivity extends ConfirmDeviceCredentialActivity {
}
@@ -177,6 +181,11 @@
mDetails = intent.getCharSequenceExtra(KeyguardManager.EXTRA_DESCRIPTION);
String alternateButton = intent.getStringExtra(
KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
+ final int authenticators = intent.getIntExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,
+ BiometricManager.Authenticators.DEVICE_CREDENTIAL
+ | BiometricManager.Authenticators.BIOMETRIC_WEAK);
+ final String negativeButtonText = intent.getStringExtra(
+ BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT);
final boolean frp =
KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
final boolean repairMode =
@@ -213,6 +222,8 @@
promptInfo.setTitle(mTitle);
promptInfo.setDescription(mDetails);
promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager);
+ promptInfo.setAuthenticators(authenticators);
+ promptInfo.setNegativeButtonText(negativeButtonText);
if (android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt()
diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java
index 7cf6a00..b17f864 100644
--- a/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -36,6 +36,7 @@
private String[] mRequirements;
private Context mContext;
+ private boolean mIsTooShortError = true;
public PasswordRequirementAdapter(Context context) {
mContext = context;
@@ -54,8 +55,9 @@
return mRequirements.length;
}
- public void setRequirements(String[] requirements) {
+ public void setRequirements(String[] requirements, boolean isPasswordShort) {
mRequirements = requirements;
+ mIsTooShortError = isPasswordShort;
notifyDataSetChanged();
}
@@ -74,7 +76,12 @@
final int fontSize = mContext.getResources().getDimensionPixelSize(
R.dimen.password_requirement_font_size);
holder.mDescriptionText.setText(mRequirements[position]);
- holder.mDescriptionText.setTextAppearance(R.style.ScreenLockPasswordHintTextFontStyle);
+ if (mIsTooShortError) {
+ holder.mDescriptionText.setTextAppearance(R.style.ScreenLockPasswordHintTextFontStyle);
+ } else {
+ holder.mDescriptionText.
+ setTextAppearance(R.style.ScreenLockPasswordHintTextFontStyleError);
+ }
holder.mDescriptionText.setTextSize(fontSize / mContext.getResources()
.getDisplayMetrics().scaledDensity);
}
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index cfd12f0..1b771a2 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -243,6 +243,7 @@
@Override
protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+ setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState);
}
diff --git a/src/com/android/settings/print/PrintSettingsPageProvider.kt b/src/com/android/settings/print/PrintSettingsPageProvider.kt
index aac0a5d..f28f0bc 100644
--- a/src/com/android/settings/print/PrintSettingsPageProvider.kt
+++ b/src/com/android/settings/print/PrintSettingsPageProvider.kt
@@ -17,16 +17,32 @@
package com.android.settings.print
import android.app.settings.SettingsEnums
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
import android.os.Bundle
+import android.provider.Settings
import androidx.annotation.VisibleForTesting
import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Print
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
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.draw.alpha
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
import androidx.core.os.bundleOf
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.android.settings.R
@@ -36,13 +52,18 @@
import com.android.settings.print.PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME
import com.android.settings.print.PrintSettingsFragment.EXTRA_TITLE
import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.compose.rememberContext
import com.android.settingslib.spa.framework.compose.rememberDrawablePainter
import com.android.settingslib.spa.framework.theme.SettingsDimension
+import com.android.settingslib.spa.framework.theme.SettingsOpacity
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import com.android.settingslib.spa.widget.ui.Category
+import com.android.settingslib.spa.widget.ui.SettingsIcon
+import com.android.settingslib.spaprivileged.settingsprovider.settingsSecureStringFlow
import com.android.settingslib.spaprivileged.template.common.UserProfilePager
+import kotlinx.coroutines.flow.Flow
object PrintSettingsPageProvider : SettingsPageProvider {
override val name = "PrintSettings"
@@ -52,51 +73,101 @@
RegularScaffold(title = stringResource(R.string.print_settings)) {
val context = LocalContext.current
val printRepository = remember(context) { PrintRepository(context) }
- UserProfilePager {
- PrintServices(printRepository)
- }
+ UserProfilePager { PrintServices(printRepository) }
}
}
@Composable
private fun PrintServices(printRepository: PrintRepository) {
- val printServiceDisplayInfos by remember {
- printRepository.printServiceDisplayInfosFlow()
- }.collectAsStateWithLifecycle(initialValue = emptyList())
- Category(title = stringResource(R.string.print_settings_title)) {
- for (printServiceDisplayInfo in printServiceDisplayInfos) {
- PrintService(printServiceDisplayInfo)
+ val printServiceDisplayInfos by
+ remember { printRepository.printServiceDisplayInfosFlow() }
+ .collectAsStateWithLifecycle(initialValue = emptyList())
+ if (printServiceDisplayInfos.isEmpty()) {
+ NoServicesInstalled()
+ } else {
+ Category(title = stringResource(R.string.print_settings_title)) {
+ for (printServiceDisplayInfo in printServiceDisplayInfos) {
+ PrintService(printServiceDisplayInfo)
+ }
}
}
+ AddPrintService()
+ }
+
+ @Composable
+ private fun NoServicesInstalled() {
+ Column(
+ modifier = Modifier.fillMaxSize().padding(SettingsDimension.itemPaddingAround),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ ) {
+ Icon(
+ imageVector = Icons.Outlined.Print,
+ contentDescription = null,
+ modifier =
+ Modifier.size(110.dp)
+ .padding(SettingsDimension.itemPaddingAround)
+ .alpha(SettingsOpacity.SurfaceTone),
+ )
+ Text(
+ text = stringResource(R.string.print_no_services_installed),
+ style = MaterialTheme.typography.titleLarge,
+ )
+ }
}
@VisibleForTesting
@Composable
fun PrintService(displayInfo: PrintServiceDisplayInfo) {
val context = LocalContext.current
- Preference(model = object : PreferenceModel {
- override val title = displayInfo.title
- override val summary = { displayInfo.summary }
- override val icon: @Composable () -> Unit = {
- Image(
- painter = rememberDrawablePainter(displayInfo.icon),
- contentDescription = null,
- modifier = Modifier.size(SettingsDimension.appIconItemSize),
- )
- }
- override val onClick = {
- SubSettingLauncher(context).apply {
- setDestination(PrintServiceSettingsFragment::class.qualifiedName)
- setArguments(
- bundleOf(
- EXTRA_CHECKED to displayInfo.isEnabled,
- EXTRA_TITLE to displayInfo.title,
- EXTRA_SERVICE_COMPONENT_NAME to displayInfo.componentName
- )
+ Preference(
+ object : PreferenceModel {
+ override val title = displayInfo.title
+ override val summary = { displayInfo.summary }
+ override val icon: @Composable () -> Unit = {
+ Image(
+ painter = rememberDrawablePainter(displayInfo.icon),
+ contentDescription = null,
+ modifier = Modifier.size(SettingsDimension.appIconItemSize),
)
- setSourceMetricsCategory(SettingsEnums.PRINT_SETTINGS)
- }.launch()
+ }
+ override val onClick = { launchPrintServiceSettings(context, displayInfo) }
}
- })
+ )
+ }
+
+ private fun launchPrintServiceSettings(context: Context, displayInfo: PrintServiceDisplayInfo) {
+ SubSettingLauncher(context)
+ .apply {
+ setDestination(PrintServiceSettingsFragment::class.qualifiedName)
+ setArguments(
+ bundleOf(
+ EXTRA_CHECKED to displayInfo.isEnabled,
+ EXTRA_TITLE to displayInfo.title,
+ EXTRA_SERVICE_COMPONENT_NAME to displayInfo.componentName
+ )
+ )
+ setSourceMetricsCategory(SettingsEnums.PRINT_SETTINGS)
+ }
+ .launch()
+ }
+
+ @Composable
+ fun AddPrintService(
+ searchUriFlow: Flow<String> = rememberContext { context ->
+ context.settingsSecureStringFlow(Settings.Secure.PRINT_SERVICE_SEARCH_URI)
+ },
+ ) {
+ val context = LocalContext.current
+ val searchUri by searchUriFlow.collectAsStateWithLifecycle("")
+ if (searchUri.isEmpty()) return
+ Preference(
+ object : PreferenceModel {
+ override val title = stringResource(R.string.print_menu_item_add_service)
+ override val icon = @Composable { SettingsIcon(imageVector = Icons.Outlined.Add) }
+ override val onClick = {
+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(searchUri)))
+ }
+ }
+ )
}
}
diff --git a/src/com/android/settings/privacy/PrivacyHubPreferenceController.java b/src/com/android/settings/privacy/PrivacyHubPreferenceController.java
index 20e5290..4c59f80 100644
--- a/src/com/android/settings/privacy/PrivacyHubPreferenceController.java
+++ b/src/com/android/settings/privacy/PrivacyHubPreferenceController.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.content.Intent;
-import android.provider.DeviceConfig;
import androidx.annotation.NonNull;
import androidx.preference.Preference;
@@ -30,7 +29,6 @@
* The preference controller for privacy hub top level preference.
*/
public final class PrivacyHubPreferenceController extends BasePreferenceController {
- public static final String PROPERTY_PRIVACY_HUB_ENABLED = "privacy_hub_enabled";
public PrivacyHubPreferenceController(@NonNull Context context, @NonNull String key) {
super(context, key);
@@ -38,8 +36,7 @@
@Override
public int getAvailabilityStatus() {
- return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
- PROPERTY_PRIVACY_HUB_ENABLED, true) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return AVAILABLE;
}
@Override
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceCategoryController.java b/src/com/android/settings/privatespace/HidePrivateSpaceCategoryController.java
new file mode 100644
index 0000000..d754b20
--- /dev/null
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceCategoryController.java
@@ -0,0 +1,43 @@
+/*
+ * 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.privatespace;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.widget.PreferenceCategoryController;
+
+public class HidePrivateSpaceCategoryController extends PreferenceCategoryController {
+ public HidePrivateSpaceCategoryController(@NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (android.multiuser.Flags.privateSpaceSearchIllustrationConfig()) {
+ boolean configValue =
+ Resources.getSystem()
+ .getBoolean(
+ com.android.internal.R.bool
+ .config_enableSearchTileHideIllustrationInPrivateSpace);
+ return configValue ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/privatespace/HidePrivateSpaceIllustrationController.java b/src/com/android/settings/privatespace/HidePrivateSpaceIllustrationController.java
new file mode 100644
index 0000000..1606498
--- /dev/null
+++ b/src/com/android/settings/privatespace/HidePrivateSpaceIllustrationController.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.privatespace;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class HidePrivateSpaceIllustrationController extends BasePreferenceController {
+
+ public HidePrivateSpaceIllustrationController(@NonNull Context context, @NonNull String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (android.multiuser.Flags.privateSpaceSearchIllustrationConfig()) {
+ boolean configValue =
+ Resources.getSystem()
+ .getBoolean(
+ com.android.internal.R.bool
+ .config_enableSearchTileHideIllustrationInPrivateSpace);
+ return configValue ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/privatespace/OWNERS b/src/com/android/settings/privatespace/OWNERS
new file mode 100644
index 0000000..158c26a
--- /dev/null
+++ b/src/com/android/settings/privatespace/OWNERS
@@ -0,0 +1,11 @@
+# Bug component: 1376399
+
+# Default reviewers for this and subdirectories.
+
+azhura@google.com
+corinac@google.com
+himanshuz@google.com
+jigarthakkar@google.com
+josephpv@google.com
+onshimiye@google.com
+saumyap@google.com
diff --git a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
index 6b9252a..ec044da 100644
--- a/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
+++ b/src/com/android/settings/privatespace/PrivateSpaceMaintainer.java
@@ -205,7 +205,6 @@
return mKeyguardManager.createConfirmDeviceCredentialIntent(
/* title= */ null, /* description= */null, mUserHandle.getIdentifier());
}
- // TODO(b/304796434) Need to try changing this intent to use BiometricPrompt
return mKeyguardManager.createConfirmDeviceCredentialIntent(
/* title= */ null, /* description= */ null);
}
diff --git a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
index dfac100..1e503ec 100644
--- a/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
+++ b/src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
@@ -16,6 +16,8 @@
package com.android.settings.privatespace.onelock;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_INSECURE_OPTIONS;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE;
import static com.android.settings.privatespace.PrivateSpaceSetupActivity.EXTRA_ACTION_TYPE;
import static com.android.settings.privatespace.PrivateSpaceSetupActivity.SET_LOCK_ACTION;
import static com.android.settings.privatespace.onelock.UseOneLockSettingsFragment.UNIFY_PRIVATE_LOCK_WITH_DEVICE_REQUEST;
@@ -197,12 +199,7 @@
.setPositiveButton(
R.string.private_space_set_lock_label,
(dialog, which) -> {
- Intent intent = new Intent(mContext,
- PrivateProfileContextHelperActivity.class);
- intent.putExtra(EXTRA_ACTION_TYPE, SET_LOCK_ACTION);
- ((Activity) mContext).startActivityForResultAsUser(intent,
- UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST,
- /*Options*/ null, mUserHandle);
+ startSeparateLockSetup();
})
.setNegativeButton(R.string.private_space_cancel_label,
(DialogInterface dialog, int which) -> {
@@ -216,4 +213,26 @@
})
.show();
}
+
+ private void startSeparateLockSetup() {
+ if (android.multiuser.Flags.modifyPrivateSpaceSecondaryUnlockSetupFlow()) {
+ final Bundle extras = new Bundle();
+ extras.putInt(Intent.EXTRA_USER_ID, mProfileUserId);
+ extras.putBoolean(HIDE_INSECURE_OPTIONS, true);
+ extras.putInt(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE,
+ R.string.private_space_lock_setup_title);
+ new SubSettingLauncher(mContext).setDestination(ChooseLockGeneric
+ .ChooseLockGenericFragment.class.getName())
+ .setSourceMetricsCategory(mHost.getMetricsCategory())
+ .setArguments(extras)
+ .setExtras(extras)
+ .setTransitionType(SettingsTransitionHelper.TransitionType.TRANSITION_SLIDE)
+ .launch();
+ } else {
+ Intent intent = new Intent(mContext, PrivateProfileContextHelperActivity.class);
+ intent.putExtra(EXTRA_ACTION_TYPE, SET_LOCK_ACTION);
+ ((Activity) mContext).startActivityForResultAsUser(intent,
+ UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST, /*Options*/ null, mUserHandle);
+ }
+ }
}
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
deleted file mode 100644
index 3a62ddf..0000000
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-
-import com.android.settingslib.search.SearchIndexableResources;
-import com.android.settingslib.search.SearchIndexableResourcesMobile;
-
-/**
- * FeatureProvider for the refactored search code.
- */
-public class SearchFeatureProviderImpl implements SearchFeatureProvider {
-
- private SearchIndexableResources mSearchIndexableResources;
-
- @Override
- public void verifyLaunchSearchResultPageCaller(@NonNull Context context,
- @NonNull String callerPackage) {
- if (TextUtils.isEmpty(callerPackage)) {
- throw new IllegalArgumentException("ExternalSettingsTrampoline intents "
- + "must be called with startActivityForResult");
- }
- final boolean isSettingsPackage = TextUtils.equals(callerPackage, context.getPackageName())
- || TextUtils.equals(getSettingsIntelligencePkgName(context), callerPackage);
- final boolean isAllowlistedPackage = isSignatureAllowlisted(context, callerPackage);
- if (isSettingsPackage || isAllowlistedPackage) {
- return;
- }
- throw new SecurityException("Search result intents must be called with from an "
- + "allowlisted package.");
- }
-
- @Override
- public SearchIndexableResources getSearchIndexableResources() {
- if (mSearchIndexableResources == null) {
- mSearchIndexableResources = new SearchIndexableResourcesMobile();
- }
- return mSearchIndexableResources;
- }
-
- @Override
- public Intent buildSearchIntent(Context context, int pageId) {
- return new Intent(Settings.ACTION_APP_SEARCH_SETTINGS)
- .setPackage(getSettingsIntelligencePkgName(context))
- .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId));
- }
-
- protected boolean isSignatureAllowlisted(Context context, String callerPackage) {
- return false;
- }
-
- private static Uri buildReferrer(Context context, int pageId) {
- return new Uri.Builder()
- .scheme("android-app")
- .authority(context.getPackageName())
- .path(String.valueOf(pageId))
- .build();
- }
-}
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.kt b/src/com/android/settings/search/SearchFeatureProviderImpl.kt
new file mode 100644
index 0000000..b1378ab
--- /dev/null
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.kt
@@ -0,0 +1,71 @@
+/*
+ * 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.search
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import com.android.settings.search.SearchIndexableResourcesFactory.createSearchIndexableResources
+import com.android.settings.spa.search.SpaSearchRepository
+import com.android.settingslib.search.SearchIndexableResources
+
+/** FeatureProvider for the refactored search code. */
+open class SearchFeatureProviderImpl : SearchFeatureProvider {
+ private val lazySearchIndexableResources by lazy {
+ createSearchIndexableResources().apply {
+ for (searchIndexableData in SpaSearchRepository().getSearchIndexableDataList()) {
+ addIndex(searchIndexableData)
+ }
+ }
+ }
+
+ override fun verifyLaunchSearchResultPageCaller(context: Context, callerPackage: String) {
+ require(callerPackage.isNotEmpty()) {
+ "ExternalSettingsTrampoline intents must be called with startActivityForResult"
+ }
+ val isSettingsPackage = callerPackage == context.packageName
+ if (isSettingsPackage ||
+ callerPackage == getSettingsIntelligencePkgName(context) ||
+ isSignatureAllowlisted(context, callerPackage)) {
+ return
+ }
+ throw SecurityException(
+ "Search result intents must be called with from an allowlisted package.")
+ }
+
+ override fun getSearchIndexableResources(): SearchIndexableResources =
+ lazySearchIndexableResources
+
+ override fun buildSearchIntent(context: Context, pageId: Int): Intent =
+ Intent(Settings.ACTION_APP_SEARCH_SETTINGS)
+ .setPackage(getSettingsIntelligencePkgName(context))
+ .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId))
+
+ protected open fun isSignatureAllowlisted(context: Context, callerPackage: String): Boolean =
+ false
+
+ companion object {
+ private fun buildReferrer(context: Context, pageId: Int): Uri =
+ Uri.Builder()
+ .scheme("android-app")
+ .authority(context.packageName)
+ .path(pageId.toString())
+ .build()
+ }
+}
diff --git a/src/com/android/settings/search/SearchIndexableResourcesFactory.java b/src/com/android/settings/search/SearchIndexableResourcesFactory.java
new file mode 100644
index 0000000..25f34ed
--- /dev/null
+++ b/src/com/android/settings/search/SearchIndexableResourcesFactory.java
@@ -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.search;
+
+import androidx.annotation.NonNull;
+
+import com.android.settingslib.search.SearchIndexableResources;
+import com.android.settingslib.search.SearchIndexableResourcesMobile;
+
+/**
+ * Creates the {@link SearchIndexableResourcesMobile}.
+ * <p>
+ * Since this class is generated by annotation processor, so it can only be created in Java now.
+ */
+class SearchIndexableResourcesFactory {
+ @NonNull
+ static SearchIndexableResources createSearchIndexableResources() {
+ return new SearchIndexableResourcesMobile();
+ }
+}
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index 8f934d7..9394af1 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -28,6 +28,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
import android.telephony.UiccSlotInfo;
import android.util.Log;
@@ -91,10 +92,10 @@
Log.e(TAG, "Unable to find the removable slot. Do nothing.");
return;
}
-
+ Log.i(TAG, "The removableSlotInfo: " + removableSlotInfo);
int lastRemovableSlotState = getLastRemovableSimSlotState(mContext);
int currentRemovableSlotState = removableSlotInfo.getCardStateInfo();
- Log.i(TAG,
+ Log.d(TAG,
"lastRemovableSlotState: " + lastRemovableSlotState + ",currentRemovableSlotState: "
+ currentRemovableSlotState);
boolean isRemovableSimInserted =
@@ -115,8 +116,12 @@
if (Flags.isDualSimOnboardingEnabled()) {
// ForNewUi, when the user inserts the psim, showing the sim onboarding for the user
- // to setup the sim switching or the default data subscription.
- handleRemovableSimInsertWhenDsds();
+ // to setup the sim switching or the default data subscription in DSDS.
+ // Will show dialog for below case.
+ // 1. the psim slot is not active.
+ // 2. there are one or more active sim.
+ handleRemovableSimInsertWhenDsds(removableSlotInfo);
+ return;
} else if (!isMultipleEnabledProfilesSupported()) {
Log.d(TAG, "The device is already in DSDS mode and no MEP. Do nothing.");
return;
@@ -124,8 +129,6 @@
handleRemovableSimInsertUnderDsdsMep(removableSlotInfo);
return;
}
- Log.d(TAG, "the device is already in DSDS mode and have the DDS. Do nothing.");
- return;
}
if (isRemovableSimInserted) {
@@ -258,15 +261,29 @@
startChooseSimActivity(false);
}
- private void handleRemovableSimInsertWhenDsds() {
+ private boolean hasOtherActiveSubInfo(int psimSubId) {
+ List<SubscriptionInfo> activeSubs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+ return activeSubs.stream()
+ .anyMatch(subscriptionInfo -> subscriptionInfo.getSubscriptionId() != psimSubId);
+ }
+
+ private boolean hasAnyPortActiveInSlot(UiccSlotInfo removableSlotInfo) {
+ return removableSlotInfo.getPorts().stream().anyMatch(UiccPortInfo::isActive);
+ }
+
+ private void handleRemovableSimInsertWhenDsds(UiccSlotInfo removableSlotInfo) {
+ Log.i(TAG, "ForNewUi: Handle Removable SIM inserted");
List<SubscriptionInfo> subscriptionInfos = getAvailableRemovableSubscription();
if (subscriptionInfos.isEmpty()) {
Log.e(TAG, "Unable to find the removable subscriptionInfo. Do nothing.");
return;
}
- Log.d(TAG, "ForNewUi and getAvailableRemovableSubscription:"
- + subscriptionInfos);
- startSimConfirmDialogActivity(subscriptionInfos.get(0).getSubscriptionId());
+ Log.d(TAG, "getAvailableRemovableSubscription:" + subscriptionInfos);
+ int psimSubId = subscriptionInfos.get(0).getSubscriptionId();
+ if (!hasAnyPortActiveInSlot(removableSlotInfo) || hasOtherActiveSubInfo(psimSubId)) {
+ Log.d(TAG, "ForNewUi Start Setup flow");
+ startSimConfirmDialogActivity(psimSubId);
+ }
}
private void handleRemovableSimInsertUnderDsdsMep(UiccSlotInfo removableSlotInfo) {
diff --git a/src/com/android/settings/spa/SpaBridgeActivity.kt b/src/com/android/settings/spa/SpaBridgeActivity.kt
index 61d8f51..d579fdf 100644
--- a/src/com/android/settings/spa/SpaBridgeActivity.kt
+++ b/src/com/android/settings/spa/SpaBridgeActivity.kt
@@ -17,20 +17,18 @@
package com.android.settings.spa
import android.app.Activity
-import android.content.Intent
+import android.content.pm.PackageManager.ComponentInfoFlags
+import android.content.pm.PackageManager.GET_META_DATA
import android.os.Bundle
-import com.android.settings.activityembedding.ActivityEmbeddingUtils
-import com.android.settings.activityembedding.EmbeddedDeepLinkUtils.tryStartMultiPaneDeepLink
-import com.android.settings.spa.SpaDestination.Companion.getDestination
-import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL
-import com.android.settingslib.spa.framework.util.appendSpaParams
+import androidx.annotation.VisibleForTesting
+import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
/**
* Activity used as a bridge to [SpaActivity].
*
* Since [SpaActivity] is not exported, [SpaActivity] could not be the target activity of
- * <activity-alias>, otherwise all its pages will be exported.
- * So need this bridge activity to sit in the middle of <activity-alias> and [SpaActivity].
+ * <activity-alias>, otherwise all its pages will be exported. So need this bridge activity to sit
+ * in the middle of <activity-alias> and [SpaActivity].
*/
class SpaBridgeActivity : Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
@@ -41,17 +39,28 @@
companion object {
fun Activity.startSpaActivityFromBridge(destinationFactory: (String) -> String? = { it }) {
- val (destination, highlightMenuKey) = getDestination(destinationFactory) ?: return
- val intent = Intent(this, SpaActivity::class.java)
- .appendSpaParams(
- destination = destination,
- sessionName = SESSION_EXTERNAL,
- )
- if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this) ||
- !tryStartMultiPaneDeepLink(intent, highlightMenuKey)
- ) {
- startActivity(intent)
- }
+ getDestination(destinationFactory)?.startFromExportedActivity(this)
}
+
+ @VisibleForTesting
+ fun Activity.getDestination(
+ destinationFactory: (String) -> String? = { it },
+ ): SpaDestination? {
+ val metaData =
+ packageManager
+ .getActivityInfo(componentName, ComponentInfoFlags.of(GET_META_DATA.toLong()))
+ .metaData
+ val destination = metaData.getString(META_DATA_KEY_DESTINATION)
+ if (destination.isNullOrBlank()) return null
+ val finalDestination = destinationFactory(destination)
+ if (finalDestination.isNullOrBlank()) return null
+ return SpaDestination(
+ destination = finalDestination,
+ highlightMenuKey = metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY),
+ )
+ }
+
+ @VisibleForTesting
+ const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
}
}
diff --git a/src/com/android/settings/spa/SpaDestination.kt b/src/com/android/settings/spa/SpaDestination.kt
index bdec1d8..cb20c37 100644
--- a/src/com/android/settings/spa/SpaDestination.kt
+++ b/src/com/android/settings/spa/SpaDestination.kt
@@ -17,33 +17,26 @@
package com.android.settings.spa
import android.app.Activity
-import android.content.pm.PackageManager
-import androidx.annotation.VisibleForTesting
-import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
+import android.content.Intent
+import com.android.settings.activityembedding.ActivityEmbeddingUtils
+import com.android.settings.activityembedding.EmbeddedDeepLinkUtils.tryStartMultiPaneDeepLink
+import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL
+import com.android.settingslib.spa.framework.util.appendSpaParams
data class SpaDestination(
val destination: String,
val highlightMenuKey: String?,
) {
- companion object {
- fun Activity.getDestination(
- destinationFactory: (String) -> String? = { it },
- ): SpaDestination? {
- val metaData = packageManager.getActivityInfo(
- componentName,
- PackageManager.ComponentInfoFlags.of(PackageManager.GET_META_DATA.toLong())
- ).metaData
- val destination = metaData.getString(META_DATA_KEY_DESTINATION)
- if (destination.isNullOrBlank()) return null
- val finalDestination = destinationFactory(destination)
- if (finalDestination.isNullOrBlank()) return null
- return SpaDestination(
- destination = finalDestination,
- highlightMenuKey = metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY),
+ fun startFromExportedActivity(activity: Activity) {
+ val intent = Intent(activity, SpaActivity::class.java)
+ .appendSpaParams(
+ destination = destination,
+ sessionName = SESSION_EXTERNAL,
)
+ if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(activity) ||
+ !activity.tryStartMultiPaneDeepLink(intent, highlightMenuKey)
+ ) {
+ activity.startActivity(intent)
}
-
- @VisibleForTesting
- const val META_DATA_KEY_DESTINATION = "com.android.settings.spa.DESTINATION"
}
}
diff --git a/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt b/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
index 904f0af..55e842f 100644
--- a/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
+++ b/src/com/android/settings/spa/app/specialaccess/DisplayOverOtherApps.kt
@@ -44,6 +44,16 @@
logPermissionChange(newAllowed)
}
+ // TODO (b/349195999)
+ override fun isChangeable(record: AppOpPermissionRecord): Boolean {
+ if (record.app.packageName in
+ context.resources.getStringArray(R.array.display_over_apps_permission_change_exempt)
+ && record.app.isSystemApp()) {
+ return false
+ }
+ return super.isChangeable(record)
+ }
+
private fun logPermissionChange(newAllowed: Boolean) {
val category = when {
newAllowed -> SettingsEnums.APP_SPECIAL_PERMISSION_APPDRAW_ALLOW
diff --git a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
index 8659bf5..4377ccc 100644
--- a/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
+++ b/src/com/android/settings/spa/core/instrumentation/SpaLogProvider.kt
@@ -28,7 +28,6 @@
import com.android.settingslib.spa.framework.util.SESSION_BROWSE
import com.android.settingslib.spa.framework.util.SESSION_EXTERNAL
import com.android.settingslib.spa.framework.util.SESSION_SEARCH
-import com.android.settingslib.spa.framework.util.SESSION_SLICE
import com.android.settingslib.spa.framework.util.SESSION_UNKNOWN
/**
@@ -74,7 +73,6 @@
return when(sessionSource) {
SESSION_BROWSE -> SettingsEnums.SESSION_BROWSE
SESSION_SEARCH -> SettingsEnums.SESSION_SEARCH
- SESSION_SLICE -> SettingsEnums.SESSION_SLICE_TYPE
SESSION_EXTERNAL -> SettingsEnums.SESSION_EXTERNAL
else -> SettingsEnums.SESSION_UNKNOWN
}
diff --git a/src/com/android/settings/spa/network/AutomaticDataSwitchingPreference.kt b/src/com/android/settings/spa/network/AutomaticDataSwitchingPreference.kt
index e79be4a..5fbd7dc 100644
--- a/src/com/android/settings/spa/network/AutomaticDataSwitchingPreference.kt
+++ b/src/com/android/settings/spa/network/AutomaticDataSwitchingPreference.kt
@@ -16,13 +16,11 @@
package com.android.settings.spa.network
-import android.telephony.TelephonyManager
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.viewmodel.compose.viewModel
import com.android.settings.R
-import com.android.settings.network.telephony.TelephonyRepository
import com.android.settings.network.telephony.wificalling.CrossSimCallingViewModel
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
@@ -36,7 +34,9 @@
) {
val autoDataSummary = stringResource(id = R.string.primary_sim_automatic_data_msg)
val coroutineScope = rememberCoroutineScope()
- val crossSimCallingViewModel = viewModel<CrossSimCallingViewModel>() // handles backup calling
+ // CrossSimCallingViewModel is responsible for maintaining the correct cross sim calling
+ // settings (backup calling).
+ viewModel<CrossSimCallingViewModel>()
SwitchPreference(
object : SwitchPreferenceModel {
override val title = stringResource(id = R.string.primary_sim_automatic_data_title)
@@ -45,17 +45,8 @@
override val onCheckedChange: (Boolean) -> Unit = { newEnabled ->
coroutineScope.launch(Dispatchers.Default) {
setAutoDataEnabled(newEnabled)
- crossSimCallingViewModel.updateCrossSimCalling()
}
}
}
)
}
-
-fun TelephonyRepository.setAutomaticData(subId: Int, newEnabled: Boolean) {
- setMobileDataPolicyEnabled(
- subId = subId,
- policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
- enabled = newEnabled,
- )
-}
diff --git a/src/com/android/settings/spa/network/MobileDataSwitchingPreference.kt b/src/com/android/settings/spa/network/MobileDataSwitchingPreference.kt
index 0d40bca..4b95d44 100644
--- a/src/com/android/settings/spa/network/MobileDataSwitchingPreference.kt
+++ b/src/com/android/settings/spa/network/MobileDataSwitchingPreference.kt
@@ -16,12 +16,10 @@
package com.android.settings.spa.network
-import android.telephony.TelephonyManager
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.res.stringResource
import com.android.settings.R
-import com.android.settings.network.telephony.TelephonyRepository
import com.android.settingslib.spa.widget.preference.SwitchPreference
import com.android.settingslib.spa.widget.preference.SwitchPreferenceModel
import kotlinx.coroutines.Dispatchers
diff --git a/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt b/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
index 4b9fcf4..b9a375c 100644
--- a/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
+++ b/src/com/android/settings/spa/network/NetworkCellularGroupProvider.kt
@@ -46,21 +46,27 @@
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import com.android.settings.R
+import com.android.settings.flags.Flags
import com.android.settings.network.SubscriptionInfoListViewModel
+import com.android.settings.network.SubscriptionUtil
import com.android.settings.network.telephony.DataSubscriptionRepository
-import com.android.settings.network.telephony.TelephonyRepository
+import com.android.settings.network.telephony.MobileDataRepository
+import com.android.settings.network.telephony.requireSubscriptionManager
import com.android.settings.spa.network.PrimarySimRepository.PrimarySimInfo
+import com.android.settings.spa.search.SearchablePage
import com.android.settings.wifi.WifiPickerTrackerHelper
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPageProvider
import com.android.settingslib.spa.framework.common.createSettingsPage
import com.android.settingslib.spa.framework.compose.navigator
+import com.android.settingslib.spa.framework.compose.rememberContext
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import com.android.settingslib.spa.widget.preference.Preference
import com.android.settingslib.spa.widget.preference.PreferenceModel
import com.android.settingslib.spa.widget.scaffold.RegularScaffold
import com.android.settingslib.spa.widget.ui.Category
import com.android.settingslib.spaprivileged.framework.common.broadcastReceiverFlow
+import com.android.settingslib.spaprivileged.framework.common.userManager
import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBooleanFlow
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -77,7 +83,7 @@
/**
* Showing the sim onboarding which is the process flow of sim switching on.
*/
-open class NetworkCellularGroupProvider : SettingsPageProvider {
+open class NetworkCellularGroupProvider : SettingsPageProvider, SearchablePage {
override val name = fileName
override val metricsCategory = SettingsEnums.MOBILE_NETWORK_LIST
private val owner = createSettingsPage()
@@ -190,8 +196,24 @@
open fun OtherSection(){
// Do nothing
}
+
+ override fun getSearchableTitles(context: Context): List<String> {
+ if (!isPageSearchable(context)) return emptyList()
+ return buildList {
+ if (context.requireSubscriptionManager().activeSubscriptionInfoCount > 0) {
+ add(context.getString(R.string.mobile_data_settings_title))
+ }
+ }
+ }
+
companion object {
const val fileName = "NetworkCellularGroupProvider"
+
+ private fun isPageSearchable(context: Context) =
+ Flags.isDualSimOnboardingEnabled() &&
+ SubscriptionUtil.isSimHardwareVisible(context) &&
+ !com.android.settingslib.Utils.isWifiOnly(context) &&
+ context.userManager.isAdminUser
}
}
@@ -202,21 +224,18 @@
) {
val context = LocalContext.current
val localLifecycleOwner = LocalLifecycleOwner.current
- val wifiPickerTrackerHelper = getWifiPickerTrackerHelper(context, localLifecycleOwner)
-
- val subscriptionManager: SubscriptionManager? =
- context.getSystemService(SubscriptionManager::class.java)
+ val mobileDataRepository = rememberContext(::MobileDataRepository)
Category(title = stringResource(id = R.string.mobile_data_settings_title)) {
val isAutoDataEnabled by remember(nonDds.intValue) {
- TelephonyRepository(context).isMobileDataPolicyEnabledFlow(
+ mobileDataRepository.isMobileDataPolicyEnabledFlow(
subId = nonDds.intValue,
policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH
)
}.collectAsStateWithLifecycle(initialValue = null)
val mobileDataStateChanged by remember(mobileDataSelectedId.intValue) {
- TelephonyRepository(context).isDataEnabledFlow(mobileDataSelectedId.intValue)
+ mobileDataRepository.isMobileDataEnabledFlow(mobileDataSelectedId.intValue)
}.collectAsStateWithLifecycle(initialValue = false)
val coroutineScope = rememberCoroutineScope()
@@ -226,8 +245,8 @@
coroutineScope.launch {
setMobileData(
context,
- subscriptionManager,
- wifiPickerTrackerHelper,
+ context.getSystemService(SubscriptionManager::class.java),
+ getWifiPickerTrackerHelper(context, localLifecycleOwner),
mobileDataSelectedId.intValue,
newEnabled
)
@@ -238,7 +257,7 @@
AutomaticDataSwitchingPreference(
isAutoDataEnabled = { isAutoDataEnabled },
setAutoDataEnabled = { newEnabled ->
- TelephonyRepository(context).setAutomaticData(nonDds.intValue, newEnabled)
+ mobileDataRepository.setAutoDataSwitch(nonDds.intValue, newEnabled)
},
)
}
@@ -281,14 +300,14 @@
) {
CreatePrimarySimListPreference(
stringResource(id = R.string.primary_sim_calls_title),
- primarySimInfo.callsAndSmsList,
+ primarySimInfo.callsList,
callsSelectedId,
ImageVector.vectorResource(R.drawable.ic_phone),
actionSetCalls
)
CreatePrimarySimListPreference(
stringResource(id = R.string.primary_sim_texts_title),
- primarySimInfo.callsAndSmsList,
+ primarySimInfo.smsList,
textsSelectedId,
Icons.AutoMirrored.Outlined.Message,
actionSetTexts
@@ -426,6 +445,6 @@
Log.d(NetworkCellularGroupProvider.fileName, "setDefaultData: [$targetSubId]")
subscriptionManager?.setDefaultDataSubId(targetSubId)
}
- TelephonyRepository(context)
- .setMobileData(targetSubId, enabled, wifiPickerTrackerHelper)
+ MobileDataRepository(context)
+ .setMobileDataEnabled(targetSubId, enabled, wifiPickerTrackerHelper)
}
\ No newline at end of file
diff --git a/src/com/android/settings/spa/network/PrimarySimRepository.kt b/src/com/android/settings/spa/network/PrimarySimRepository.kt
index e34a29e..420f870 100644
--- a/src/com/android/settings/spa/network/PrimarySimRepository.kt
+++ b/src/com/android/settings/spa/network/PrimarySimRepository.kt
@@ -22,12 +22,14 @@
import android.util.Log
import com.android.settings.R
import com.android.settings.network.SubscriptionUtil
+import com.android.settings.network.telephony.CarrierConfigRepository
import com.android.settingslib.spa.widget.preference.ListPreferenceOption
class PrimarySimRepository(private val context: Context) {
data class PrimarySimInfo(
- val callsAndSmsList: List<ListPreferenceOption>,
+ val callsList: List<ListPreferenceOption>,
+ val smsList: List<ListPreferenceOption>,
val dataList: List<ListPreferenceOption>,
)
@@ -37,7 +39,8 @@
return null
}
- val callsAndSmsList = mutableListOf<ListPreferenceOption>()
+ val callsList = mutableListOf<ListPreferenceOption>()
+ val smsList = mutableListOf<ListPreferenceOption>()
val dataList = mutableListOf<ListPreferenceOption>()
for (info in selectableSubscriptionInfoList) {
val item = ListPreferenceOption(
@@ -45,15 +48,22 @@
text = "${info.displayName}",
summary = SubscriptionUtil.getBidiFormattedPhoneNumber(context, info) ?: "",
)
- callsAndSmsList += item
+ callsList += item
+ smsList += item
dataList += item
}
- callsAndSmsList += ListPreferenceOption(
+
+ val askEveryTime = ListPreferenceOption(
id = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
text = context.getString(R.string.sim_calls_ask_first_prefs_title),
)
+ callsList += askEveryTime
+ if (context.resources
+ .getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support)) {
+ smsList += askEveryTime
+ }
- return PrimarySimInfo(callsAndSmsList, dataList)
+ return PrimarySimInfo(callsList, smsList, dataList)
}
private companion object {
diff --git a/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt b/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
index 6466731..f78808f 100644
--- a/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
+++ b/src/com/android/settings/spa/network/SimOnboardingLabelSim.kt
@@ -81,24 +81,28 @@
onboardingService: SimOnboardingService,
subInfo: SubscriptionInfo,
) {
- val originalSimCarrierName = subInfo.displayName.toString()
- var titleSimName by remember {
- mutableStateOf(onboardingService.getSubscriptionInfoDisplayName(subInfo))
+ val currentSimName = onboardingService.getSubscriptionInfoDisplayName(subInfo)
+ var prefTitle by remember {
+ mutableStateOf(currentSimName)
+ }
+ var dialogInputContent by remember {
+ mutableStateOf(currentSimName)
}
val phoneNumber = phoneNumber(subInfo)
val alertDialogPresenter = rememberAlertDialogPresenter(
confirmButton = AlertDialogButton(
stringResource(R.string.mobile_network_sim_name_rename),
- titleSimName.isNotBlank()
+ dialogInputContent.isNotBlank()
) {
onboardingService.addItemForRenaming(
- subInfo, if (titleSimName.isEmpty()) originalSimCarrierName else titleSimName
+ subInfo, dialogInputContent
)
+ prefTitle = dialogInputContent
},
dismissButton = AlertDialogButton(
stringResource(R.string.cancel),
) {
- titleSimName = onboardingService.getSubscriptionInfoDisplayName(subInfo)
+ // Do nothing
},
title = stringResource(R.string.sim_onboarding_label_sim_dialog_title),
text = {
@@ -107,17 +111,19 @@
modifier = Modifier.padding(bottom = SettingsDimension.itemPaddingVertical)
)
SettingsOutlinedTextField(
- value = titleSimName,
+ value = dialogInputContent,
label = stringResource(R.string.sim_onboarding_label_sim_dialog_label),
- placeholder = {Text(text = originalSimCarrierName)},
- modifier = Modifier.fillMaxWidth().testTag("contentInput")
+ placeholder = {Text(text = subInfo.displayName.toString())},
+ modifier = Modifier
+ .fillMaxWidth()
+ .testTag("contentInput")
) {
- titleSimName = it
+ dialogInputContent = it
}
},
)
Preference(object : PreferenceModel {
- override val title = titleSimName
+ override val title = prefTitle
override val summary = { phoneNumber.value ?: "" }
override val onClick = alertDialogPresenter::open
})
diff --git a/src/com/android/settings/spa/notification/AppNotificationsListModel.kt b/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
index 9f949c4..8a534c8 100644
--- a/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
+++ b/src/com/android/settings/spa/notification/AppNotificationsListModel.kt
@@ -105,7 +105,7 @@
override fun getSpinnerOptions(recordList: List<AppNotificationsRecord>): List<SpinnerOption> {
val options = mutableListOf(SpinnerItem.AllApps, SpinnerItem.TurnedOff)
- if (repository.isUserUnlocked(recordList[0].app.userId)) {
+ if (recordList.isNotEmpty() && repository.isUserUnlocked(recordList[0].app.userId)) {
options.add(0, SpinnerItem.MostRecent)
options.add(1, SpinnerItem.MostFrequent)
}
diff --git a/src/com/android/settings/spa/search/SearchablePage.kt b/src/com/android/settings/spa/search/SearchablePage.kt
new file mode 100644
index 0000000..2364514
--- /dev/null
+++ b/src/com/android/settings/spa/search/SearchablePage.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.search
+
+import android.content.Context
+
+interface SearchablePage {
+
+ /** Gets the searchable titles at the current moment. */
+ fun getSearchableTitles(context: Context): List<String>
+}
diff --git a/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt b/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt
new file mode 100644
index 0000000..8c2bc37
--- /dev/null
+++ b/src/com/android/settings/spa/search/SpaSearchLandingActivity.kt
@@ -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.spa.search
+
+import android.app.Activity
+import android.os.Bundle
+import com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY
+import com.android.settings.overlay.FeatureFactory.Companion.featureFactory
+import com.android.settings.password.PasswordUtils
+import com.android.settings.spa.SpaDestination
+
+class SpaSearchLandingActivity : Activity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ if (!isValidCall()) return
+
+ val destination = intent.getStringExtra(EXTRA_FRAGMENT_ARG_KEY)
+ if (destination.isNullOrBlank()) return
+
+ SpaDestination(destination = destination, highlightMenuKey = null)
+ .startFromExportedActivity(this)
+ finish()
+ }
+
+ private fun isValidCall() =
+ PasswordUtils.getCallingAppPackageName(activityToken) ==
+ featureFactory.searchFeatureProvider.getSettingsIntelligencePkgName(this)
+}
diff --git a/src/com/android/settings/spa/search/SpaSearchRepository.kt b/src/com/android/settings/spa/search/SpaSearchRepository.kt
new file mode 100644
index 0000000..d37c50c
--- /dev/null
+++ b/src/com/android/settings/spa/search/SpaSearchRepository.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.spa.search
+
+import android.content.Context
+import android.provider.SearchIndexableResource
+import android.util.Log
+import androidx.annotation.VisibleForTesting
+import com.android.settingslib.search.Indexable
+import com.android.settingslib.search.SearchIndexableData
+import com.android.settingslib.search.SearchIndexableRaw
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.common.SpaEnvironment
+import com.android.settingslib.spa.framework.common.SpaEnvironmentFactory
+
+class SpaSearchRepository(
+ private val spaEnvironment: SpaEnvironment = SpaEnvironmentFactory.instance,
+) {
+ fun getSearchIndexableDataList(): List<SearchIndexableData> {
+ Log.d(TAG, "getSearchIndexableDataList")
+ return spaEnvironment.pageProviderRepository.value.getAllProviders().mapNotNull { page ->
+ if (page is SearchablePage) {
+ page.createSearchIndexableData(page::getSearchableTitles)
+ } else null
+ }
+ }
+
+ companion object {
+ private const val TAG = "SpaSearchRepository"
+
+ @VisibleForTesting
+ fun SettingsPageProvider.createSearchIndexableData(
+ titlesProvider: (context: Context) -> List<String>,
+ ): SearchIndexableData {
+ val searchIndexProvider =
+ object : Indexable.SearchIndexProvider {
+ override fun getXmlResourcesToIndex(
+ context: Context,
+ enabled: Boolean,
+ ): List<SearchIndexableResource> = emptyList()
+
+ override fun getRawDataToIndex(
+ context: Context,
+ enabled: Boolean,
+ ): List<SearchIndexableRaw> = emptyList()
+
+ override fun getDynamicRawDataToIndex(
+ context: Context,
+ enabled: Boolean,
+ ): List<SearchIndexableRaw> =
+ titlesProvider(context).map { title ->
+ createSearchIndexableRaw(context, title)
+ }
+
+ override fun getNonIndexableKeys(context: Context): List<String> = emptyList()
+ }
+ return SearchIndexableData(this::class.java, searchIndexProvider)
+ }
+
+ private fun SettingsPageProvider.createSearchIndexableRaw(context: Context, title: String) =
+ SearchIndexableRaw(context).apply {
+ key = name
+ this.title = title
+ intentAction = SEARCH_LANDING_ACTION
+ packageName = context.packageName
+ className = SpaSearchLandingActivity::class.qualifiedName
+ }
+
+ private const val SEARCH_LANDING_ACTION = "android.settings.SPA_SEARCH_LANDING"
+ }
+}
diff --git a/src/com/android/settings/system/DeviceDiagnosticsPreferenceController.kt b/src/com/android/settings/system/DeviceDiagnosticsPreferenceController.kt
index 695bb5b..d683804 100644
--- a/src/com/android/settings/system/DeviceDiagnosticsPreferenceController.kt
+++ b/src/com/android/settings/system/DeviceDiagnosticsPreferenceController.kt
@@ -26,7 +26,7 @@
import com.android.settings.core.BasePreferenceController
import com.android.settings.flags.Flags
-class DeviceDiagnosticsPreferenceController(context: Context, preferenceKey: String) :
+open class DeviceDiagnosticsPreferenceController(context: Context, preferenceKey: String) :
BasePreferenceController(context, preferenceKey) {
override fun getAvailabilityStatus(): Int {
@@ -59,6 +59,12 @@
val packageName = mContext.getResources().getString(
R.string.config_device_diagnostics_package_name)
intent.setPackage(packageName)
+
+ val info = mContext.getPackageManager().resolveActivity(intent, 0)
+ if (info == null) {
+ return null
+ }
+
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
return intent
}
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index df7cc3d..54c97a3 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.system;
import android.Manifest;
+import android.annotation.RequiresPermission;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -37,8 +38,8 @@
private static final String TAG = "FactoryResetPreference";
- @VisibleForTesting
- static final String ACTION_PREPARE_FACTORY_RESET =
+ @RequiresPermission(Manifest.permission.PREPARE_FACTORY_RESET)
+ public static final String ACTION_PREPARE_FACTORY_RESET =
"com.android.settings.ACTION_PREPARE_FACTORY_RESET";
private final UserManager mUm;
diff --git a/src/com/android/settings/system/reset/ResetNetworkConfirm.kt b/src/com/android/settings/system/reset/ResetNetworkConfirm.kt
new file mode 100644
index 0000000..34b9909
--- /dev/null
+++ b/src/com/android/settings/system/reset/ResetNetworkConfirm.kt
@@ -0,0 +1,217 @@
+/*
+ * 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.system.reset
+
+import android.app.ProgressDialog
+import android.app.settings.SettingsEnums
+import android.os.Bundle
+import android.os.Looper
+import android.telephony.SubscriptionManager
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.AlertDialog
+import androidx.lifecycle.lifecycleScope
+import com.android.settings.R
+import com.android.settings.ResetNetworkRequest
+import com.android.settings.Utils
+import com.android.settings.core.InstrumentedFragment
+import com.android.settings.network.ResetNetworkRestrictionViewBuilder
+import com.android.settings.network.telephony.SubscriptionRepository
+import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * Confirm and execute a reset of the network settings to a clean "just out of the box" state.
+ * Multiple confirmations are required: first, a general "are you sure you want to do this?" prompt,
+ * followed by a keyguard pattern trace if the user has defined one, followed by a final
+ * strongly-worded "THIS WILL RESET EVERYTHING" prompt. If at any time the phone is allowed to go to
+ * sleep, is locked, et cetera, then the confirmation sequence is abandoned.
+ *
+ * This is the confirmation screen.
+ */
+class ResetNetworkConfirm : InstrumentedFragment() {
+ @VisibleForTesting lateinit var resetNetworkRequest: ResetNetworkRequest
+ private var progressDialog: ProgressDialog? = null
+ private var alertDialog: AlertDialog? = null
+ private var resetStarted = false
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ Log.d(TAG, "onCreate: $arguments")
+ resetNetworkRequest = ResetNetworkRequest(arguments)
+ }
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ val view = ResetNetworkRestrictionViewBuilder(requireActivity()).build()
+ if (view != null) {
+ Log.w(TAG, "Access deny.")
+ return view
+ }
+ return inflater.inflate(R.layout.reset_network_confirm, null).apply {
+ establishFinalConfirmationState()
+ setSubtitle()
+ }
+ }
+
+ /** Configure the UI for the final confirmation interaction */
+ private fun View.establishFinalConfirmationState() {
+ requireViewById<View>(R.id.execute_reset_network).setOnClickListener {
+ if (!Utils.isMonkeyRunning() && !resetStarted) {
+ resetStarted = true
+ viewLifecycleOwner.lifecycleScope.launch { onResetClicked() }
+ }
+ }
+ }
+
+ private fun View.setSubtitle() {
+ if (resetNetworkRequest.resetEsimPackageName != null) {
+ requireViewById<TextView>(R.id.reset_network_confirm)
+ .setText(R.string.reset_network_final_desc_esim)
+ }
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ invalidSubIdFlow().collectLatestWithLifecycle(viewLifecycleOwner) { invalidSubId ->
+ // Reset process could triage this callback, so if reset has started, ignore the event.
+ if (!resetStarted) {
+ Log.w(TAG, "subId $invalidSubId no longer active.")
+ requireActivity().finish()
+ }
+ }
+ }
+
+ /**
+ * Monitor the sub ids in the request, if any sub id becomes inactive, the request is abandoned.
+ */
+ private fun invalidSubIdFlow(): Flow<Int> {
+ val subIdsInRequest =
+ listOf(
+ resetNetworkRequest.resetTelephonyAndNetworkPolicyManager,
+ resetNetworkRequest.resetApnSubId,
+ resetNetworkRequest.resetImsSubId,
+ )
+ .distinct()
+ .filter(SubscriptionManager::isUsableSubscriptionId)
+
+ if (subIdsInRequest.isEmpty()) return emptyFlow()
+
+ return SubscriptionRepository(requireContext())
+ .activeSubscriptionIdListFlow()
+ .mapNotNull { activeSubIds -> subIdsInRequest.firstOrNull { it !in activeSubIds } }
+ .conflate()
+ .flowOn(Dispatchers.Default)
+ }
+
+ /**
+ * The user has gone through the multiple confirmation, so now we go ahead and reset the network
+ * settings to its factory-default state.
+ */
+ @VisibleForTesting
+ suspend fun onResetClicked() {
+ showProgressDialog()
+ resetNetwork()
+ }
+
+ private fun showProgressDialog() {
+ progressDialog =
+ ProgressDialog(requireContext()).apply {
+ isIndeterminate = true
+ setCancelable(false)
+ setMessage(requireContext().getString(R.string.main_clear_progress_text))
+ show()
+ }
+ }
+
+ private fun dismissProgressDialog() {
+ progressDialog?.let { progressDialog ->
+ if (progressDialog.isShowing) {
+ progressDialog.dismiss()
+ }
+ }
+ }
+
+ /**
+ * Do all reset task.
+ *
+ * If error happens during erasing eSIM profiles or timeout, an error msg is shown.
+ */
+ private suspend fun resetNetwork() {
+ var resetEsimSuccess = true
+
+ withContext(Dispatchers.Default) {
+ val builder =
+ resetNetworkRequest.toResetNetworkOperationBuilder(
+ requireContext(), Looper.getMainLooper())
+ resetNetworkRequest.resetEsimPackageName?.let { resetEsimPackageName ->
+ builder.resetEsim(resetEsimPackageName)
+ builder.resetEsimResultCallback { resetEsimSuccess = it }
+ }
+ builder.build().run()
+ }
+
+ Log.d(TAG, "network factoryReset complete. succeeded: $resetEsimSuccess")
+ onResetFinished(resetEsimSuccess)
+ }
+
+ private fun onResetFinished(resetEsimSuccess: Boolean) {
+ dismissProgressDialog()
+ val activity = requireActivity()
+
+ if (!resetEsimSuccess) {
+ alertDialog =
+ AlertDialog.Builder(activity)
+ .setTitle(R.string.reset_esim_error_title)
+ .setMessage(R.string.reset_esim_error_msg)
+ .setPositiveButton(android.R.string.ok, /* listener= */ null)
+ .show()
+ } else {
+ Toast.makeText(activity, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
+ .show()
+ }
+ activity.finish()
+ }
+
+ override fun onDestroy() {
+ progressDialog?.dismiss()
+ alertDialog?.dismiss()
+ super.onDestroy()
+ }
+
+ override fun getMetricsCategory() = SettingsEnums.RESET_NETWORK_CONFIRM
+
+ private companion object {
+ const val TAG = "ResetNetworkConfirm"
+ }
+}
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index ce5533e..fe90a2a 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -42,9 +42,18 @@
if (!isAvailable()) {
restrictedSwitchPreference.setVisible(false);
} else {
- restrictedSwitchPreference.setDisabledByAdmin(
- mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
- restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ restrictedSwitchPreference.setVisible(true);
+ if (mUserCaps.mDisallowAddUserSetByAdmin) {
+ restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
+ } else if (mUserCaps.mDisallowAddUser) {
+ restrictedSwitchPreference.setVisible(false);
+ }
+ } else {
+ restrictedSwitchPreference.setDisabledByAdmin(
+ mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
+ restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
+ }
}
}
@@ -52,6 +61,8 @@
public int getAvailabilityStatus() {
if (!mUserCaps.isAdmin()) {
return DISABLED_FOR_USER;
+ } else if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ return AVAILABLE;
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
} else {
diff --git a/src/com/android/settings/users/GuestTelephonyPreferenceController.java b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
index 4fbd449..e730cbf 100644
--- a/src/com/android/settings/users/GuestTelephonyPreferenceController.java
+++ b/src/com/android/settings/users/GuestTelephonyPreferenceController.java
@@ -19,12 +19,16 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedSwitchPreference;
/**
* Controls the preference on the user settings screen which determines whether the guest user
@@ -43,10 +47,21 @@
@Override
public int getAvailabilityStatus() {
- if (!mUserCaps.isAdmin() || !mUserCaps.mCanAddGuest) {
+ if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || UserManager.isHeadlessSystemUserMode()) {
return DISABLED_FOR_USER;
+ }
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ if (!mUserCaps.isAdmin()) {
+ return DISABLED_FOR_USER;
+ }
+ return AVAILABLE;
} else {
- return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ if (!mUserCaps.isAdmin() || !mUserCaps.mCanAddGuest) {
+ return DISABLED_FOR_USER;
+ } else {
+ return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
}
}
@@ -74,8 +89,31 @@
public void updateState(Preference preference) {
super.updateState(preference);
mUserCaps.updateAddUserCapabilities(mContext);
- preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled
- && mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
- && !UserManager.isHeadlessSystemUserMode());
+ final RestrictedSwitchPreference restrictedSwitchPreference =
+ (RestrictedSwitchPreference) preference;
+ restrictedSwitchPreference.setChecked(isChecked());
+ if (!isAvailable()) {
+ restrictedSwitchPreference.setVisible(false);
+ } else {
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ restrictedSwitchPreference.setVisible(true);
+ final RestrictedLockUtils.EnforcedAdmin disallowRemoveUserAdmin =
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ if (disallowRemoveUserAdmin != null) {
+ restrictedSwitchPreference.setDisabledByAdmin(disallowRemoveUserAdmin);
+ } else if (mUserCaps.mDisallowAddUserSetByAdmin) {
+ restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
+ } else if (mUserCaps.mDisallowAddUser) {
+ // Adding user is restricted by system
+ restrictedSwitchPreference.setVisible(false);
+ }
+ } else {
+ restrictedSwitchPreference.setDisabledByAdmin(
+ mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
+ restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled
+ && isAvailable());
+ }
+ }
}
}
diff --git a/src/com/android/settings/users/MultiUserSwitchBarController.java b/src/com/android/settings/users/MultiUserSwitchBarController.java
index f57b795..641ae51 100644
--- a/src/com/android/settings/users/MultiUserSwitchBarController.java
+++ b/src/com/android/settings/users/MultiUserSwitchBarController.java
@@ -57,11 +57,6 @@
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
UserHandle.myUserId()));
-
- } else if (mUserCapabilities.mDisallowAddUser) {
- mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
- .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_ADD_USER,
- UserHandle.myUserId()));
} else {
mSwitchBar.setEnabled(mUserCapabilities.mIsMain);
}
diff --git a/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java b/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
index 01df5fd..345b506 100644
--- a/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
+++ b/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java
@@ -22,6 +22,7 @@
import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.Handler;
+import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.util.Log;
@@ -33,6 +34,8 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
/**
@@ -70,9 +73,24 @@
if (!isAvailable()) {
restrictedSwitchPreference.setVisible(false);
} else {
- restrictedSwitchPreference.setDisabledByAdmin(
- mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
- restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ restrictedSwitchPreference.setVisible(true);
+ final RestrictedLockUtils.EnforcedAdmin disallowRemoveUserAdmin =
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ if (disallowRemoveUserAdmin != null) {
+ restrictedSwitchPreference.setDisabledByAdmin(disallowRemoveUserAdmin);
+ } else if (mUserCaps.mDisallowAddUserSetByAdmin) {
+ restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
+ } else if (mUserCaps.mDisallowAddUser) {
+ // Adding user is restricted by system
+ restrictedSwitchPreference.setVisible(false);
+ }
+ } else {
+ restrictedSwitchPreference.setDisabledByAdmin(
+ mUserCaps.disallowAddUser() ? mUserCaps.getEnforcedAdmin() : null);
+ restrictedSwitchPreference.setVisible(mUserCaps.mUserSwitcherEnabled);
+ }
}
}
@@ -82,14 +100,24 @@
// then disable this controller
// also disable this controller for non-admin users
// also disable when config_guestUserAllowEphemeralStateChange is false
- if (mUserManager.isGuestUserAlwaysEphemeral()
- || !UserManager.isGuestUserAllowEphemeralStateChange()
- || !mUserCaps.isAdmin()
- || mUserCaps.disallowAddUser()
- || mUserCaps.disallowAddUserSetByAdmin()) {
- return DISABLED_FOR_USER;
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ if (mUserManager.isGuestUserAlwaysEphemeral()
+ || !UserManager.isGuestUserAllowEphemeralStateChange()
+ || !mUserCaps.isAdmin()) {
+ return DISABLED_FOR_USER;
+ } else {
+ return AVAILABLE;
+ }
} else {
- return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ if (mUserManager.isGuestUserAlwaysEphemeral()
+ || !UserManager.isGuestUserAllowEphemeralStateChange()
+ || !mUserCaps.isAdmin()
+ || mUserCaps.disallowAddUser()
+ || mUserCaps.disallowAddUserSetByAdmin()) {
+ return DISABLED_FOR_USER;
+ } else {
+ return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
}
}
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index b48c717..588f01a 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -126,7 +126,11 @@
@Override
public void onResume() {
super.onResume();
- mSwitchUserPref.setEnabled(canSwitchUserNow());
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ mSwitchUserPref.setEnabled(canSwitchUserNow() && mUserCaps.mUserSwitcherEnabled);
+ } else {
+ mSwitchUserPref.setEnabled(canSwitchUserNow());
+ }
if (mUserInfo.isGuest() && mGuestUserAutoCreated) {
mRemoveUserPref.setEnabled((mUserInfo.flags & UserInfo.FLAG_INITIALIZED) != 0);
}
@@ -358,18 +362,22 @@
mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));
} else {
mSwitchUserPref.setDisabledByAdmin(null);
- mSwitchUserPref.setSelectable(true);
+ if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+ mSwitchUserPref.setEnabled(mUserCaps.mUserSwitcherEnabled);
+ mSwitchUserPref.setSelectable(mUserCaps.mUserSwitcherEnabled);
+ } else {
+ mSwitchUserPref.setSelectable(true);
+ }
mSwitchUserPref.setOnPreferenceClickListener(this);
}
if (mUserInfo.isMain() || mUserInfo.isGuest() || !UserManager.isMultipleAdminEnabled()
|| mUserManager.hasUserRestrictionForUser(UserManager.DISALLOW_GRANT_ADMIN,
- mUserInfo.getUserHandle())) {
+ mUserInfo.getUserHandle()) || !mUserManager.isAdminUser()) {
removePreference(KEY_GRANT_ADMIN);
}
if (!mUserManager.isAdminUser()) { // non admin users can't remove users and allow calls
removePreference(KEY_ENABLE_TELEPHONY);
removePreference(KEY_REMOVE_USER);
- removePreference(KEY_GRANT_ADMIN);
removePreference(KEY_APP_AND_CONTENT_ACCESS);
removePreference(KEY_APP_COPYING);
} else {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bf21c9b..0cf01e3 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -463,7 +463,8 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
int pos = 0;
- if (!isCurrentUserAdmin() && canSwitchUserNow() && !isCurrentUserGuest()) {
+ if (!isCurrentUserAdmin() && (canSwitchUserNow() || Flags.newMultiuserSettingsUx())
+ && !isCurrentUserGuest()) {
String nickname = mUserManager.getUserName();
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
getResources().getString(R.string.user_remove_user_menu, nickname));
@@ -1198,15 +1199,23 @@
}
List<UserInfo> users;
- if (mUserCaps.mUserSwitcherEnabled) {
+ if (Flags.newMultiuserSettingsUx()) {
// Only users that can be switched to should show up here.
// e.g. Managed profiles appear under Accounts Settings instead
users = mUserManager.getAliveUsers().stream()
.filter(UserInfo::supportsSwitchToByUser)
.collect(Collectors.toList());
} else {
- // Only current user will be displayed in case of multi-user switch is disabled
- users = List.of(mUserManager.getUserInfo(context.getUserId()));
+ if (mUserCaps.mUserSwitcherEnabled) {
+ // Only users that can be switched to should show up here.
+ // e.g. Managed profiles appear under Accounts Settings instead
+ users = mUserManager.getAliveUsers().stream()
+ .filter(UserInfo::supportsSwitchToByUser)
+ .collect(Collectors.toList());
+ } else {
+ // Only current user will be displayed in case of multi-user switch is disabled
+ users = List.of(mUserManager.getUserInfo(context.getUserId()));
+ }
}
final ArrayList<Integer> missingIcons = new ArrayList<>();
@@ -1257,7 +1266,10 @@
pref.setSummary(R.string.user_summary_not_set_up);
// Disallow setting up user which results in user switching when the
// restriction is set.
- pref.setEnabled(!mUserCaps.mDisallowSwitchUser && canSwitchUserNow());
+ // If newMultiuserSettingsUx flag is enabled, allow opening user details page
+ // since switch to user will be disabled
+ pref.setEnabled((!mUserCaps.mDisallowSwitchUser && canSwitchUserNow())
+ || Flags.newMultiuserSettingsUx());
}
} else if (user.isRestricted()) {
pref.setSummary(R.string.user_summary_restricted_profile);
@@ -1417,16 +1429,22 @@
getContext().getResources(), icon)));
pref.setKey(KEY_USER_GUEST);
pref.setOrder(Preference.DEFAULT_ORDER);
- if (mUserCaps.mDisallowSwitchUser) {
+ if (mUserCaps.mDisallowSwitchUser && !Flags.newMultiuserSettingsUx()) {
pref.setDisabledByAdmin(
RestrictedLockUtilsInternal.getDeviceOwner(context));
} else {
pref.setDisabledByAdmin(null);
}
- if (mUserCaps.mUserSwitcherEnabled) {
+ if (Flags.newMultiuserSettingsUx()) {
mGuestUserCategory.addPreference(pref);
// guest user preference is shown hence also make guest category visible
mGuestUserCategory.setVisible(true);
+ } else {
+ if (mUserCaps.mUserSwitcherEnabled) {
+ mGuestUserCategory.addPreference(pref);
+ // guest user preference is shown hence also make guest category visible
+ mGuestUserCategory.setVisible(true);
+ }
}
isGuestAlreadyCreated = true;
}
@@ -1450,10 +1468,11 @@
private boolean updateAddGuestPreference(Context context, boolean isGuestAlreadyCreated) {
boolean isVisible = false;
- if (!isGuestAlreadyCreated && mUserCaps.mCanAddGuest
+ if (!isGuestAlreadyCreated && (mUserCaps.mCanAddGuest
+ || (Flags.newMultiuserSettingsUx() && mUserCaps.mDisallowAddUser))
&& mUserManager.canAddMoreUsers(UserManager.USER_TYPE_FULL_GUEST)
&& WizardManagerHelper.isDeviceProvisioned(context)
- && mUserCaps.mUserSwitcherEnabled) {
+ && (mUserCaps.mUserSwitcherEnabled || Flags.newMultiuserSettingsUx())) {
Drawable icon = context.getDrawable(
com.android.settingslib.R.drawable.ic_account_circle);
mAddGuest.setIcon(centerAndTint(icon));
@@ -1466,7 +1485,25 @@
mAddGuest.setEnabled(false);
} else {
mAddGuest.setTitle(com.android.settingslib.R.string.guest_new_guest);
- mAddGuest.setEnabled(canSwitchUserNow());
+ if (Flags.newMultiuserSettingsUx()
+ && mUserCaps.mDisallowAddUserSetByAdmin) {
+ mAddGuest.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
+ } else if (Flags.newMultiuserSettingsUx() && mUserCaps.mDisallowAddUser) {
+ final List<UserManager.EnforcingUser> enforcingUsers =
+ mUserManager.getUserRestrictionSources(UserManager.DISALLOW_ADD_USER,
+ UserHandle.of(UserHandle.myUserId()));
+ if (!enforcingUsers.isEmpty()) {
+ final UserManager.EnforcingUser enforcingUser = enforcingUsers.get(0);
+ final int restrictionSource = enforcingUser.getUserRestrictionSource();
+ if (restrictionSource == UserManager.RESTRICTION_SOURCE_SYSTEM) {
+ mAddGuest.setEnabled(false);
+ } else {
+ mAddGuest.setVisible(false);
+ }
+ }
+ } else {
+ mAddGuest.setEnabled(canSwitchUserNow() || Flags.newMultiuserSettingsUx());
+ }
}
} else {
mAddGuest.setVisible(false);
@@ -1494,16 +1531,18 @@
private void updateAddUserCommon(Context context, RestrictedPreference addUser,
boolean canAddRestrictedProfile) {
- if ((mUserCaps.mCanAddUser && !mUserCaps.mDisallowAddUserSetByAdmin)
+ if ((mUserCaps.mCanAddUser
+ && !(mUserCaps.mDisallowAddUserSetByAdmin && Flags.newMultiuserSettingsUx()))
&& WizardManagerHelper.isDeviceProvisioned(context)
- && mUserCaps.mUserSwitcherEnabled) {
+ && (mUserCaps.mUserSwitcherEnabled || Flags.newMultiuserSettingsUx())) {
addUser.setVisible(true);
addUser.setSelectable(true);
final boolean canAddMoreUsers =
mUserManager.canAddMoreUsers(UserManager.USER_TYPE_FULL_SECONDARY)
|| (canAddRestrictedProfile
&& mUserManager.canAddMoreUsers(UserManager.USER_TYPE_FULL_RESTRICTED));
- addUser.setEnabled(canAddMoreUsers && !mAddingUser && canSwitchUserNow());
+ addUser.setEnabled(canAddMoreUsers && !mAddingUser
+ && (canSwitchUserNow() || Flags.newMultiuserSettingsUx()));
if (!canAddMoreUsers) {
addUser.setSummary(getString(R.string.user_add_max_count));
@@ -1514,6 +1553,23 @@
addUser.setDisabledByAdmin(
mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
}
+ } else if (Flags.newMultiuserSettingsUx() && mUserCaps.mDisallowAddUserSetByAdmin) {
+ addUser.setVisible(true);
+ addUser.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
+ } else if (Flags.newMultiuserSettingsUx() && mUserCaps.mDisallowAddUser) {
+ final List<UserManager.EnforcingUser> enforcingUsers =
+ mUserManager.getUserRestrictionSources(UserManager.DISALLOW_ADD_USER,
+ UserHandle.of(UserHandle.myUserId()));
+ if (!enforcingUsers.isEmpty()) {
+ final UserManager.EnforcingUser enforcingUser = enforcingUsers.get(0);
+ final int restrictionSource = enforcingUser.getUserRestrictionSource();
+ if (restrictionSource == UserManager.RESTRICTION_SOURCE_SYSTEM) {
+ addUser.setVisible(true);
+ addUser.setEnabled(false);
+ } else {
+ addUser.setVisible(false);
+ }
+ }
} else {
addUser.setVisible(false);
}
diff --git a/src/com/android/settings/utils/ZenServiceListing.java b/src/com/android/settings/utils/ZenServiceListing.java
index 99f56f6..96d700b 100644
--- a/src/com/android/settings/utils/ZenServiceListing.java
+++ b/src/com/android/settings/utils/ZenServiceListing.java
@@ -28,11 +28,14 @@
import android.util.ArraySet;
import android.util.Slog;
+import androidx.annotation.Nullable;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
public class ZenServiceListing {
+ private static final String TAG = "ZenServiceListing";
private final Context mContext;
private final ManagedServiceSettings.Config mConfig;
@@ -40,9 +43,18 @@
private final List<Callback> mZenCallbacks = new ArrayList<>();
private final NotificationManager mNm;
+ // only used when android.app.modes_ui flag is true
+ @Nullable
+ private String mPkg = null;
+
public ZenServiceListing(Context context, ManagedServiceSettings.Config config) {
+ this(context, config, null);
+ }
+
+ public ZenServiceListing(Context context, ManagedServiceSettings.Config config, @Nullable String pkg) {
mContext = context;
mConfig = config;
+ mPkg = pkg;
mNm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
}
@@ -89,12 +101,16 @@
}
}
- private static void getServices(ManagedServiceSettings.Config c, List<ComponentInfo> list,
+ private void getServices(ManagedServiceSettings.Config c, List<ComponentInfo> list,
PackageManager pm) {
final int user = ActivityManager.getCurrentUser();
+ Intent queryIntent = new Intent(c.intentAction);
+ if (mPkg != null) {
+ queryIntent.setPackage(mPkg);
+ }
List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
- new Intent(c.intentAction),
+ queryIntent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
user);
@@ -115,12 +131,16 @@
}
}
- private static void getActivities(ManagedServiceSettings.Config c, List<ComponentInfo> list,
+ private void getActivities(ManagedServiceSettings.Config c, List<ComponentInfo> list,
PackageManager pm) {
final int user = ActivityManager.getCurrentUser();
+ Intent queryIntent = new Intent(c.configIntentAction);
+ if (mPkg != null) {
+ queryIntent.setPackage(mPkg);
+ }
List<ResolveInfo> resolveInfos = pm.queryIntentActivitiesAsUser(
- new Intent(c.configIntentAction),
+ queryIntent,
PackageManager.GET_ACTIVITIES | PackageManager.GET_META_DATA,
user);
diff --git a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
index 9ddec5c..15e83de 100644
--- a/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
+++ b/src/com/android/settings/widget/HighlightableTopLevelPreferenceAdapter.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import android.content.Context;
+import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.Log;
@@ -212,6 +213,14 @@
// Scroll to the top to reset the position.
mRecyclerView.nestedScrollBy(0, -mRecyclerView.getHeight());
+ // get the visible area of the recycler view
+ Rect rvRect = new Rect();
+ mRecyclerView.getGlobalVisibleRect(rvRect);
+ if (Flags.homepageRevamp() && view.getBottom() <= rvRect.height()) {
+ // the request position already fully visible in the visible area
+ return;
+ }
+
final int scrollY = view.getTop();
if (scrollY > 0) {
mRecyclerView.nestedScrollBy(0, scrollY);
diff --git a/src/com/android/settings/wifi/AddWifiNetworkPreference.java b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
index 999f4a4..ea22954 100644
--- a/src/com/android/settings/wifi/AddWifiNetworkPreference.java
+++ b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
@@ -26,11 +26,13 @@
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
/**
* The Preference for users to add Wi-Fi networks in WifiSettings
@@ -53,7 +55,7 @@
setTitle(R.string.wifi_add_network);
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);
- checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
+ checkRestrictionAndSetDisabled();
}
@Override
@@ -80,4 +82,15 @@
}
return buttonIcon;
}
+
+ @VisibleForTesting
+ void checkRestrictionAndSetDisabled() {
+ checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
+ if (isDisabledByAdmin()) {
+ return;
+ }
+ if (!WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(getContext())) {
+ setEnabled(false);
+ }
+ }
}
diff --git a/src/com/android/settings/wifi/WepLessSecureWarningController.kt b/src/com/android/settings/wifi/WepLessSecureWarningController.kt
new file mode 100644
index 0000000..8eba199
--- /dev/null
+++ b/src/com/android/settings/wifi/WepLessSecureWarningController.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
+
+import android.content.Context
+import com.android.settings.core.BasePreferenceController
+import com.android.wifitrackerlib.WifiEntry
+
+class WepLessSecureWarningController (context: Context, preferenceKey: String) :
+ BasePreferenceController(context, preferenceKey) {
+
+ private var availabilityStatus: Int = CONDITIONALLY_UNAVAILABLE
+
+ override fun getAvailabilityStatus(): Int = availabilityStatus
+
+ fun setWifiEntry(entry: WifiEntry) {
+ availabilityStatus = when(entry.securityTypes.contains(WifiEntry.SECURITY_WEP)) {
+ true -> AVAILABLE
+ else -> CONDITIONALLY_UNAVAILABLE
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 70e08eb..1ea0103 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -344,7 +344,7 @@
if (mPrivacySettingsSpinner != null) {
final int prefMacValue = WifiPrivacyPreferenceController2
- .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
+ .translateWifiEntryPrivacyToPrefValue(mWifiEntry.getPrivacy());
mPrivacySettingsSpinner.setSelection(prefMacValue);
}
@@ -863,7 +863,7 @@
if (mPrivacySettingsSpinner != null) {
config.macRandomizationSetting = WifiPrivacyPreferenceController2
- .translatePrefValueToMacRandomizedValue(mPrivacySettingsSpinner
+ .translatePrefValueToWifiConfigSetting(mPrivacySettingsSpinner
.getSelectedItemPosition());
}
diff --git a/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
deleted file mode 100644
index ae44b93..0000000
--- a/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.content.Context;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.GenericSwitchController;
-import com.android.settings.widget.SummaryUpdater;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
-
-/**
- * PreferenceController to update the wifi state.
- */
-// TODO(b/167474581): Should clean up this controller when Provider Model finished.
-public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
- LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
- //TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
-
- public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
-
- private PrimarySwitchPreference mWifiPreference;
- private WifiEnabler mWifiEnabler;
- private final WifiSummaryUpdater mSummaryHelper;
- private final MetricsFeatureProvider mMetricsFeatureProvider;
-
- public WifiPrimarySwitchPreferenceController(Context context,
- MetricsFeatureProvider metricsFeatureProvider) {
- super(context);
- mMetricsFeatureProvider = metricsFeatureProvider;
- mSummaryHelper = new WifiSummaryUpdater(mContext, this);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mWifiPreference = screen.findPreference(KEY_TOGGLE_WIFI);
- }
-
- @Override
- public boolean isAvailable() {
- return mContext.getResources().getBoolean(R.bool.config_show_wifi_settings);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_TOGGLE_WIFI;
- }
-
- @Override
- public void onResume() {
- mSummaryHelper.register(true);
- if (mWifiEnabler != null) {
- mWifiEnabler.resume(mContext);
- }
- }
-
- @Override
- public void onPause() {
- if (mWifiEnabler != null) {
- mWifiEnabler.pause();
- }
- mSummaryHelper.register(false);
- }
-
- @Override
- public void onStart() {
- mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mWifiPreference),
- mMetricsFeatureProvider);
- }
-
- @Override
- public void onStop() {
- if (mWifiEnabler != null) {
- mWifiEnabler.teardownSwitchController();
- }
- }
-
- @Override
- public void onSummaryChanged(String summary) {
- if (mWifiPreference != null) {
- mWifiPreference.setSummary(summary);
- }
- }
-
-}
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 82537d4..e5581d3 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -33,7 +33,6 @@
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsMmTelManager;
-import android.telephony.ims.ProvisioningManager;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -42,12 +41,14 @@
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
-import com.android.ims.ImsConfig;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.flags.Flags;
@@ -57,8 +58,12 @@
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.network.ims.WifiCallingQueryImsState;
+import com.android.settings.network.telephony.wificalling.IWifiCallingRepository;
+import com.android.settings.network.telephony.wificalling.WifiCallingRepository;
import com.android.settings.widget.SettingsMainSwitchPreference;
+import kotlin.Unit;
+
import java.util.List;
/**
@@ -103,7 +108,6 @@
private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
private ImsMmTelManager mImsMmTelManager;
- private ProvisioningManager mProvisioningManager;
private TelephonyManager mTelephonyManager;
private PhoneTelephonyCallback mTelephonyCallback;
@@ -188,19 +192,6 @@
return true;
};
- private final ProvisioningManager.Callback mProvisioningCallback =
- new ProvisioningManager.Callback() {
- @Override
- public void onProvisioningIntChanged(int item, int value) {
- if (item == ImsConfig.ConfigConstants.VOICE_OVER_WIFI_SETTING_ENABLED
- || item == ImsConfig.ConfigConstants.VLT_SETTING_ENABLED) {
- // The provisioning policy might have changed. Update the body to make sure
- // this change takes effect if needed.
- updateBody();
- }
- }
- };
-
@VisibleForTesting
void showAlert(Intent intent) {
final Context context = getActivity();
@@ -264,14 +255,6 @@
}
@VisibleForTesting
- ProvisioningManager getImsProvisioningManager() {
- if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
- return null;
- }
- return ProvisioningManager.createForSubscriptionId(mSubId);
- }
-
- @VisibleForTesting
ImsMmTelManager getImsMmTelManager() {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return null;
@@ -294,7 +277,6 @@
FRAGMENT_BUNDLE_SUBID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
}
- mProvisioningManager = getImsProvisioningManager();
mImsMmTelManager = getImsMmTelManager();
mSwitchBar = (SettingsMainSwitchPreference) findPreference(SWITCH_BAR);
@@ -336,19 +318,33 @@
return view;
}
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ getWifiCallingRepository().collectIsWifiCallingReadyFlow(
+ getLifecycleOwner(), (isWifiWifiCallingReadyFlow) -> {
+ if (!isWifiWifiCallingReadyFlow) {
+ // This screen is not allowed to be shown due to provisioning policy and
+ // should therefore be closed.
+ finish();
+ }
+ return Unit.INSTANCE;
+ });
+ }
+
@VisibleForTesting
- boolean isWfcProvisionedOnDevice() {
- return queryImsState(mSubId).isWifiCallingProvisioned();
+ @NonNull
+ IWifiCallingRepository getWifiCallingRepository() {
+ return new WifiCallingRepository(requireContext(), mSubId);
+ }
+
+ @VisibleForTesting
+ @NonNull
+ LifecycleOwner getLifecycleOwner() {
+ return getViewLifecycleOwner();
}
private void updateBody() {
- if (!isWfcProvisionedOnDevice()) {
- // This screen is not allowed to be shown due to provisioning policy and should
- // therefore be closed.
- finish();
- return;
- }
-
final CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
boolean isWifiOnlySupported = true;
@@ -448,8 +444,6 @@
if (intent.getBooleanExtra(Phone.EXTRA_KEY_ALERT_SHOW, false)) {
showAlert(intent);
}
- // Register callback for provisioning changes.
- registerProvisioningChangedCallback();
}
@Override
@@ -462,8 +456,6 @@
mSwitchBar.removeOnSwitchChangeListener(this);
}
context.unregisterReceiver(mIntentReceiver);
- // Remove callback for provisioning changes.
- unregisterProvisioningChangedCallback();
}
/**
@@ -699,27 +691,6 @@
return SubscriptionManager.getResourcesForSubId(getContext(), mSubId);
}
- @VisibleForTesting
- void registerProvisioningChangedCallback() {
- if (mProvisioningManager == null) {
- return;
- }
- try {
- mProvisioningManager.registerProvisioningChangedCallback(getContext().getMainExecutor(),
- mProvisioningCallback);
- } catch (Exception ex) {
- Log.w(TAG, "onResume: Unable to register callback for provisioning changes.");
- }
- }
-
- @VisibleForTesting
- void unregisterProvisioningChangedCallback() {
- if (mProvisioningManager == null) {
- return;
- }
- mProvisioningManager.unregisterProvisioningChangedCallback(mProvisioningCallback);
- }
-
/**
* Determine whether to override roaming Wi-Fi calling preference when device is connected to
* non-terrestrial network.
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index eb0b40a..3ec5bb2 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -51,6 +51,7 @@
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.network.telephony.MobileNetworkUtils;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.wifi.WepLessSecureWarningController;
import com.android.settings.wifi.WifiConfigUiBase2;
import com.android.settings.wifi.WifiDialog2;
import com.android.settings.wifi.WifiUtils;
@@ -132,6 +133,8 @@
.setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
use(ServerNamePreferenceController.class)
.setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
+ use(WepLessSecureWarningController.class)
+ .setWifiEntry(mNetworkDetailsTracker.getWifiEntry());
}
@Override
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index 5d393e5..0c67c04 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.details2;
import android.content.Context;
+import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import androidx.annotation.NonNull;
@@ -98,30 +99,30 @@
private static final int PREF_RANDOMIZATION_NONE = 1;
/**
- * Returns preference index value.
+ * Translates a WifiEntry.Privacy value to the matching preference index value.
*
- * @param macRandomized is mac randomized value
+ * @param privacy WifiEntry.Privacy value
* @return index value of preference
*/
- public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
- return (macRandomized == WifiEntry.PRIVACY_RANDOMIZED_MAC)
+ public static int translateWifiEntryPrivacyToPrefValue(@WifiEntry.Privacy int privacy) {
+ return (privacy == WifiEntry.PRIVACY_RANDOMIZED_MAC)
? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE;
}
/**
- * Returns mac randomized value.
+ * Translates the pref value to WifiConfiguration.MacRandomizationSetting value
*
* @param prefMacRandomized is preference index value
- * @return mac randomized value
+ * @return WifiConfiguration.MacRandomizationSetting value
*/
- public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) {
+ public static int translatePrefValueToWifiConfigSetting(int prefMacRandomized) {
return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT)
- ? WifiEntry.PRIVACY_RANDOMIZED_MAC : WifiEntry.PRIVACY_DEVICE_MAC;
+ ? WifiConfiguration.RANDOMIZATION_AUTO : WifiConfiguration.RANDOMIZATION_NONE;
}
private void updateSummary(ListPreference preference, int macRandomized) {
// Translates value here to set RANDOMIZATION_PERSISTENT as first item in UI for better UX.
- final int prefMacRandomized = translateMacRandomizedValueToPrefValue(macRandomized);
+ final int prefMacRandomized = translateWifiEntryPrivacyToPrefValue(macRandomized);
preference.setSummary(preference.getEntries()[prefMacRandomized]);
}
}
diff --git a/src/com/android/settings/wifi/dpp/AdbQrCode.java b/src/com/android/settings/wifi/dpp/AdbQrCode.java
index 2d830b2..8a578ea 100644
--- a/src/com/android/settings/wifi/dpp/AdbQrCode.java
+++ b/src/com/android/settings/wifi/dpp/AdbQrCode.java
@@ -16,11 +16,14 @@
package com.android.settings.wifi.dpp;
import android.content.Context;
-import android.net.wifi.UriParserResults;
import android.net.wifi.WifiConfiguration;
import android.text.TextUtils;
-import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
/**
* Extension of WifiQrCode to support ADB QR code format.
@@ -28,34 +31,74 @@
*
* WIFI:T:ADB;S:myname;P:mypassword;;
*/
-public class AdbQrCode extends WifiQrCode {
+public class AdbQrCode {
static final String SECURITY_ADB = "ADB";
+ static final String SCHEME_DPP = "DPP";
+ static final String SCHEME_ZXING_WIFI_NETWORK_CONFIG = "WIFI";
+ static final String PREFIX_DPP = "DPP:";
+ static final String PREFIX_ZXING_WIFI_NETWORK_CONFIG = "WIFI:";
- private WifiConfiguration mAdbConfig;
+ static final String PREFIX_DPP_PUBLIC_KEY = "K:";
+ static final String PREFIX_DPP_INFORMATION = "I:";
+
+ static final String PREFIX_ZXING_SECURITY = "T:";
+ static final String PREFIX_ZXING_SSID = "S:";
+ static final String PREFIX_ZXING_PASSWORD = "P:";
+ static final String PREFIX_ZXING_HIDDEN_SSID = "H:";
+ static final String DELIMITER_QR_CODE = ";";
+ // Ignores password if security is SECURITY_NO_PASSWORD or absent
+ static final String SECURITY_NO_PASSWORD = "nopass"; //open network or OWE
+ static final String SECURITY_WEP = "WEP";
+ static final String SECURITY_WPA_PSK = "WPA";
+ static final String SECURITY_SAE = "SAE";
+ private String mQrCode;
+ /**
+ * SCHEME_DPP for standard Wi-Fi device provision protocol; SCHEME_ZXING_WIFI_NETWORK_CONFIG
+ * for ZXing reader library' Wi-Fi Network config format
+ */
+ private String mScheme;
+ // Data from parsed Wi-Fi DPP QR code
+ private String mPublicKey;
+ private String mInformation;
+ // Data from parsed ZXing reader library's Wi-Fi Network config format
+ private WifiNetworkConfig mAdbConfig;
public AdbQrCode(String qrCode) throws IllegalArgumentException {
- super(qrCode);
+ if (TextUtils.isEmpty(qrCode)) {
+ throw new IllegalArgumentException("Empty QR code");
+ }
+
+ mQrCode = qrCode;
+ if (qrCode.startsWith(PREFIX_DPP)) {
+ mScheme = SCHEME_DPP;
+ parseWifiDppQrCode(qrCode);
+ } else if (qrCode.startsWith(PREFIX_ZXING_WIFI_NETWORK_CONFIG)) {
+ mScheme = SCHEME_ZXING_WIFI_NETWORK_CONFIG;
+ parseZxingWifiQrCode(qrCode);
+ } else {
+ throw new IllegalArgumentException("Invalid scheme");
+ }
// Only accept the zxing format.
- if (getScheme() != UriParserResults.URI_SCHEME_ZXING_WIFI_NETWORK_CONFIG) {
+ if (!SCHEME_ZXING_WIFI_NETWORK_CONFIG.equals(getScheme())) {
throw new IllegalArgumentException("DPP format not supported for ADB QR code");
}
- mAdbConfig = getWifiConfiguration();
+ mAdbConfig = getWifiNetworkConfig();
- if (mAdbConfig == null) {
- throw new IllegalArgumentException("Null config when parsing ADB QR code");
+ if (!SECURITY_ADB.equals(mAdbConfig.getSecurity())) {
+ throw new IllegalArgumentException("Invalid security type");
}
- if (TextUtils.isEmpty(mAdbConfig.SSID)) {
+
+ if (TextUtils.isEmpty(mAdbConfig.getSsid())) {
throw new IllegalArgumentException("Empty service name");
}
- if (TextUtils.isEmpty(mAdbConfig.preSharedKey)) {
+ if (TextUtils.isEmpty(mAdbConfig.getPreSharedKey())) {
throw new IllegalArgumentException("Empty password");
}
}
- @NonNull
- public WifiConfiguration getAdbNetworkConfig() {
+ public WifiNetworkConfig getAdbNetworkConfig() {
return mAdbConfig;
}
@@ -67,4 +110,117 @@
public static void triggerVibrationForQrCodeRecognition(Context context) {
WifiDppUtils.triggerVibrationForQrCodeRecognition(context);
}
+
+ /** Parses Wi-Fi DPP QR code string */
+ private void parseWifiDppQrCode(String qrCode) throws IllegalArgumentException {
+ List<String> keyValueList = getKeyValueList(qrCode, PREFIX_DPP, DELIMITER_QR_CODE);
+ String publicKey = getValueOrNull(keyValueList, PREFIX_DPP_PUBLIC_KEY);
+ if (TextUtils.isEmpty(publicKey)) {
+ throw new IllegalArgumentException("Invalid format");
+ }
+ mPublicKey = publicKey;
+ mInformation = getValueOrNull(keyValueList, PREFIX_DPP_INFORMATION);
+ }
+
+ /** Parses ZXing reader library's Wi-Fi Network config format */
+ private void parseZxingWifiQrCode(String qrCode) throws IllegalArgumentException {
+ List<String> keyValueList = getKeyValueList(qrCode, PREFIX_ZXING_WIFI_NETWORK_CONFIG,
+ DELIMITER_QR_CODE);
+ String security = getValueOrNull(keyValueList, PREFIX_ZXING_SECURITY);
+ String ssid = getValueOrNull(keyValueList, PREFIX_ZXING_SSID);
+ String password = getValueOrNull(keyValueList, PREFIX_ZXING_PASSWORD);
+ String hiddenSsidString = getValueOrNull(keyValueList, PREFIX_ZXING_HIDDEN_SSID);
+ boolean hiddenSsid = "true".equalsIgnoreCase(hiddenSsidString);
+ //"\", ";", "," and ":" are escaped with a backslash "\", should remove at first
+ security = removeBackSlash(security);
+ ssid = removeBackSlash(ssid);
+ password = removeBackSlash(password);
+ mAdbConfig = WifiNetworkConfig.getValidConfigOrNull(security, ssid, password,
+ hiddenSsid, WifiConfiguration.INVALID_NETWORK_ID, /* isHotspot */ false);
+ if (mAdbConfig == null) {
+ throw new IllegalArgumentException("Invalid format");
+ }
+ }
+
+ /**
+ * Splits key/value pairs from qrCode
+ *
+ * @param qrCode the QR code raw string
+ * @param prefixQrCode the string before all key/value pairs in qrCode
+ * @param delimiter the string to split key/value pairs, can't contain a backslash
+ * @return a list contains string of key/value (e.g. K:key1)
+ */
+ private List<String> getKeyValueList(String qrCode, String prefixQrCode,
+ String delimiter) {
+ String keyValueString = qrCode.substring(prefixQrCode.length());
+ // Should not treat \delimiter as a delimiter
+ String regex = "(?<!\\\\)" + Pattern.quote(delimiter);
+ return Arrays.asList(keyValueString.split(regex));
+ }
+
+ private String getValueOrNull(List<String> keyValueList, String prefix) {
+ for (String keyValue : keyValueList) {
+ String strippedKeyValue = keyValue.stripLeading();
+ if (strippedKeyValue.startsWith(prefix)) {
+ return strippedKeyValue.substring(prefix.length());
+ }
+ }
+ return null;
+ }
+
+ @VisibleForTesting
+ String removeBackSlash(String input) {
+ if (input == null) {
+ return null;
+ }
+ StringBuilder sb = new StringBuilder();
+ boolean backSlash = false;
+ for (char ch : input.toCharArray()) {
+ if (ch != '\\') {
+ sb.append(ch);
+ backSlash = false;
+ } else {
+ if (backSlash) {
+ sb.append(ch);
+ backSlash = false;
+ continue;
+ }
+ backSlash = true;
+ }
+ }
+ return sb.toString();
+ }
+
+ String getQrCode() {
+ return mQrCode;
+ }
+
+ /**
+ * Uses to check type of QR code
+ *
+ * SCHEME_DPP for standard Wi-Fi device provision protocol; SCHEME_ZXING_WIFI_NETWORK_CONFIG
+ * for ZXing reader library' Wi-Fi Network config format
+ */
+ public String getScheme() {
+ return mScheme;
+ }
+
+ /** Available when {@code getScheme()} returns SCHEME_DPP */
+ @VisibleForTesting
+ String getPublicKey() {
+ return mPublicKey;
+ }
+
+ /** May be available when {@code getScheme()} returns SCHEME_DPP */
+ public String getInformation() {
+ return mInformation;
+ }
+
+ /** Available when {@code getScheme()} returns SCHEME_ZXING_WIFI_NETWORK_CONFIG */
+ WifiNetworkConfig getWifiNetworkConfig() {
+ if (mAdbConfig == null) {
+ return null;
+ }
+ return new WifiNetworkConfig(mAdbConfig);
+ }
}
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index a7527d7..c7ad9ca 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -35,6 +35,8 @@
import androidx.fragment.app.FragmentTransaction;
import com.android.settings.R;
+import com.android.settings.flags.Flags;
+import com.android.settings.overlay.FeatureFactory;
import java.util.List;
@@ -236,7 +238,12 @@
WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
if (fragment == null) {
- fragment = new WifiDppQrCodeGeneratorFragment();
+ if (Flags.enableWifiSharingRuntimeFragment()) {
+ fragment = FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
+ .getWifiDppQrCodeGeneratorFragment();
+ } else {
+ fragment = new WifiDppQrCodeGeneratorFragment();
+ }
} else {
if (fragment.isVisible()) {
return;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index 3d437e2..40cf24d 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -44,6 +44,7 @@
import com.android.internal.app.chooser.DisplayResolveInfo;
import com.android.internal.app.chooser.TargetInfo;
import com.android.settings.R;
+import com.android.settings.flags.Flags;
import com.android.settingslib.qrcode.QrCodeGenerator;
import com.google.zxing.WriterException;
@@ -56,7 +57,7 @@
private static final String TAG = "WifiDppQrCodeGeneratorFragment";
private ImageView mQrCodeView;
- private String mQrCode;
+ protected String mQrCode;
private static final String CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label";
private static final String CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon";
@@ -69,6 +70,10 @@
@Override
public int getMetricsCategory() {
+ if (Flags.enableWifiSharingRuntimeFragment()) {
+ return SettingsEnums.SETTINGS_WIFI_DPP_QR_SHARING;
+ }
+
return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
}
@@ -109,6 +114,7 @@
super.onViewCreated(view, savedInstanceState);
mQrCodeView = view.findViewById(R.id.qrcode_view);
+ mQrCodeView.setContentDescription(getString(R.string.qr_code_content_description));
final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
if (wifiNetworkConfig.isHotspot()) {
@@ -258,7 +264,7 @@
return button;
}
- private void setQrCode() {
+ protected void setQrCode() {
try {
final int qrcodeSize = getContext().getResources().getDimensionPixelSize(
R.dimen.qrcode_size);
diff --git a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
index 5ab899a..e5bf81a 100644
--- a/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
+++ b/src/com/android/settings/wifi/factory/WifiFeatureProvider.java
@@ -27,6 +27,7 @@
import androidx.lifecycle.ViewModelStoreOwner;
import com.android.settings.wifi.details.WifiNetworkDetailsViewModel;
+import com.android.settings.wifi.dpp.WifiDppQrCodeGeneratorFragment;
import com.android.settings.wifi.repository.SharedConnectivityRepository;
import com.android.settings.wifi.repository.WifiHotspotRepository;
import com.android.settings.wifi.tether.WifiHotspotSecurityViewModel;
@@ -147,6 +148,15 @@
}
/**
+ * Gets an instance of WifiDppQrCodeGeneratorFragment
+ */
+ public WifiDppQrCodeGeneratorFragment getWifiDppQrCodeGeneratorFragment() {
+ WifiDppQrCodeGeneratorFragment fragment = new WifiDppQrCodeGeneratorFragment();
+ verboseLog(TAG, "getWifiDppQrCodeGeneratorFragment():" + fragment);
+ return fragment;
+ }
+
+ /**
* Send a {@link Log#VERBOSE} log message.
*
* @param tag Used to identify the source of a log message. It usually identifies
diff --git a/tests/Enable16KbTests/Android.bp b/tests/Enable16KbTests/Android.bp
index 781ea8f..fa05d33 100644
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -33,7 +33,6 @@
],
platform_apis: true,
certificate: "platform",
- test_suites: ["device-tests"],
libs: [
"android.test.runner",
"android.test.base",
@@ -57,6 +56,6 @@
data: [
":test_16kb_app",
],
- test_suites: ["device-tests"],
+ test_suites: ["general-tests"],
test_config: "AndroidTest.xml",
}
diff --git a/tests/robotests/src/com/android/settings/MainClearConfirmTest.java b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
index 6d85368..f7711c8 100644
--- a/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
@@ -77,6 +77,7 @@
when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
+ when(mPersistentDataBlockManager.isFactoryResetProtectionActive()).thenReturn(false);
}
@Test
@@ -113,6 +114,13 @@
}
@Test
+ public void shouldWipePersistentDataBlock_frpIsAlive_shouldReturnFalse() {
+ when(mPersistentDataBlockManager.isFactoryResetProtectionActive()).thenReturn(true);
+ assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(mPersistentDataBlockManager))
+ .isFalse();
+ }
+
+ @Test
public void shouldWipePersistentDataBlock_deviceIsStillBeingProvisioned_shouldReturnFalse() {
doReturn(true).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
index e84d4eb..26a430b 100644
--- a/tests/robotests/src/com/android/settings/MainClearTest.java
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -39,7 +40,12 @@
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.Flags;
import android.os.UserManager;
+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;
@@ -57,6 +63,7 @@
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;
import org.mockito.ArgumentCaptor;
@@ -77,6 +84,9 @@
})
public class MainClearTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
@@ -95,6 +105,12 @@
@Mock
private FragmentActivity mMockActivity;
+ @Mock
+ private BiometricManager mBiometricManager;
+ @Mock
+ private Resources mResources;
+ @Mock
+ private Context mContext;
@Mock
private Intent mMockIntent;
@@ -122,6 +138,11 @@
// Make scrollView only have one child
when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
when(mScrollView.getChildCount()).thenReturn(1);
+ 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_HW_UNAVAILABLE);
}
@After
@@ -344,6 +365,59 @@
}
@Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testOnActivityResultInternal_keyguardRequestTriggeringBiometricPrompt() {
+ when(mContext.getResources()).thenReturn(mResources);
+ when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
+ when(mResources.getString(anyInt())).thenReturn(TEST_ACCOUNT_NAME);
+ when(mBiometricManager.canAuthenticate(anyInt(),
+ eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+ .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
+ doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+ doNothing().when(mMainClear).startActivityForResult(any(), anyInt());
+ doReturn(mMockActivity).when(mMainClear).getActivity();
+ doReturn(mContext).when(mMainClear).getContext();
+
+ mMainClear
+ .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+
+ verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+ verify(mMainClear).startActivityForResult(any(), eq(MainClear.BIOMETRICS_REQUEST));
+ verify(mMainClear, times(0)).establishInitialState();
+ verify(mMainClear, times(0)).getAccountConfirmationIntent();
+ verify(mMainClear, times(0)).showFinalConfirmation();
+ }
+
+ @Test
+ public void testOnActivityResultInternal_biometricRequestTriggeringFinalConfirmation() {
+ doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.BIOMETRICS_REQUEST));
+ doReturn(null).when(mMainClear).getAccountConfirmationIntent();
+ doNothing().when(mMainClear).showFinalConfirmation();
+
+ mMainClear
+ .onActivityResultInternal(MainClear.BIOMETRICS_REQUEST, Activity.RESULT_OK, null);
+
+ verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.BIOMETRICS_REQUEST));
+ verify(mMainClear, times(0)).establishInitialState();
+ verify(mMainClear, times(1)).getAccountConfirmationIntent();
+ verify(mMainClear, times(1)).showFinalConfirmation();
+ }
+
+ @Test
+ public void testOnActivityResultInternal_biometricRequestTriggeringInitialState() {
+ doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.BIOMETRICS_REQUEST));
+ doNothing().when(mMainClear).establishInitialState();
+
+ mMainClear.onActivityResultInternal(MainClear.BIOMETRICS_REQUEST, Activity.RESULT_CANCELED,
+ null);
+
+ verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.BIOMETRICS_REQUEST));
+ verify(mMainClear, times(1)).establishInitialState();
+ verify(mMainClear, times(0)).getAccountConfirmationIntent();
+ verify(mMainClear, times(0)).showFinalConfirmation();
+ }
+
+ @Test
public void testOnActivityResultInternal_confirmRequestTriggeringShowFinal() {
doReturn(true).when(mMainClear)
.isValidRequestCode(eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
deleted file mode 100644
index ea6559c..0000000
--- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
+++ /dev/null
@@ -1,124 +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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-
-import android.view.LayoutInflater;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
-import com.android.settings.testutils.shadow.ShadowRecoverySystem;
-
-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.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.android.util.concurrent.PausedExecutorService;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowLooper;
-import org.robolectric.shadows.ShadowPausedAsyncTask;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowRecoverySystem.class, ShadowBluetoothAdapter.class})
-public class ResetNetworkConfirmTest {
- @Rule
- public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-
- private static final String TEST_PACKAGE = "com.android.settings";
-
- private FragmentActivity mActivity;
-
- @Mock
- private ResetNetworkConfirm mResetNetworkConfirm;
- private PausedExecutorService mExecutorService;
-
- @Before
- public void setUp() {
- mExecutorService = new PausedExecutorService();
- ShadowPausedAsyncTask.overrideExecutor(mExecutorService);
- mResetNetworkConfirm = new ResetNetworkConfirm();
- mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));
- mResetNetworkConfirm.mActivity = mActivity;
- }
-
- @After
- public void tearDown() {
- ShadowRecoverySystem.reset();
- }
-
- @Test
- public void testResetNetworkData_notResetEsim() {
- mResetNetworkConfirm.mResetNetworkRequest =
- new ResetNetworkRequest(ResetNetworkRequest.RESET_NONE);
- mResetNetworkConfirm.mResetSubscriptionContract =
- new ResetSubscriptionContract(mActivity,
- mResetNetworkConfirm.mResetNetworkRequest) {
- @Override
- public void onSubscriptionInactive(int subscriptionId) {
- mActivity.onBackPressed();
- }
- };
-
- mResetNetworkConfirm.mFinalClickListener.onClick(null /* View */);
- mExecutorService.runAll();
- ShadowLooper.idleMainLooper();
-
- assertThat(ShadowRecoverySystem.getWipeEuiccCalledCount()).isEqualTo(0);
- }
-
- @Test
- public void setSubtitle_eraseEsim() {
- mResetNetworkConfirm.mResetNetworkRequest =
- new ResetNetworkRequest(ResetNetworkRequest.RESET_NONE);
- mResetNetworkConfirm.mResetNetworkRequest.setResetEsim(TEST_PACKAGE);
-
- mResetNetworkConfirm.mContentView =
- LayoutInflater.from(mActivity).inflate(R.layout.reset_network_confirm, null);
-
- mResetNetworkConfirm.setSubtitle();
-
- assertThat(((TextView) mResetNetworkConfirm.mContentView
- .findViewById(R.id.reset_network_confirm)).getText())
- .isEqualTo(mActivity.getString(R.string.reset_network_final_desc_esim));
- }
-
- @Test
- public void setSubtitle_notEraseEsim() {
- mResetNetworkConfirm.mResetNetworkRequest =
- new ResetNetworkRequest(ResetNetworkRequest.RESET_NONE);
-
- mResetNetworkConfirm.mContentView =
- LayoutInflater.from(mActivity).inflate(R.layout.reset_network_confirm, null);
-
- mResetNetworkConfirm.setSubtitle();
-
- assertThat(((TextView) mResetNetworkConfirm.mContentView
- .findViewById(R.id.reset_network_confirm)).getText())
- .isEqualTo(mActivity.getString(R.string.reset_network_final_desc));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 0c57b01..b36e9d6 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -20,6 +20,10 @@
import static android.hardware.biometrics.SensorProperties.STRENGTH_STRONG;
import static android.hardware.biometrics.SensorProperties.STRENGTH_WEAK;
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_AUTHENTICATORS;
+import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT;
+
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertNull;
@@ -35,10 +39,12 @@
import static org.mockito.Mockito.when;
import android.app.ActionBar;
+import android.app.KeyguardManager;
import android.app.admin.DevicePolicyManager;
import android.app.admin.DevicePolicyResourcesManager;
import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
@@ -47,6 +53,8 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.VectorDrawable;
+import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.Flags;
import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorProperties;
import android.hardware.face.FaceSensorPropertiesInternal;
@@ -61,21 +69,28 @@
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.util.IconDrawableFactory;
import android.widget.EditText;
import android.widget.ScrollView;
import android.widget.TextView;
import androidx.core.graphics.drawable.IconCompat;
+import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import org.junit.After;
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.MockitoAnnotations;
import org.robolectric.Robolectric;
@@ -92,6 +107,9 @@
@Config(shadows = ShadowLockPatternUtils.class)
public class UtilsTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
private static final String PACKAGE_NAME = "com.android.app";
private static final int USER_ID = 1;
@@ -113,6 +131,11 @@
private IconDrawableFactory mIconDrawableFactory;
@Mock
private ApplicationInfo mApplicationInfo;
+ @Mock
+ private BiometricManager mBiometricManager;
+ @Mock
+ private Fragment mFragment;
+
private Context mContext;
private UserManager mUserManager;
private static final int FLAG_SYSTEM = 0x00000000;
@@ -128,6 +151,7 @@
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
.thenReturn(connectivityManager);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mContext.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager);
}
@After
@@ -503,6 +527,78 @@
assertThat(Utils.isFaceNotConvenienceBiometric(mContext)).isFalse();
}
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testRequestBiometricAuthentication_biometricManagerNull_shouldReturnFalse() {
+ when(mContext.getSystemService(BiometricManager.class)).thenReturn(null);
+ assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
+ false /* biometricsSuccessfullyAuthenticated */,
+ false /* biometricsAuthenticationRequested */, USER_ID)).isFalse();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testRequestBiometricAuthentication_biometricManagerReturnsSuccess_shouldReturnTrue() {
+ when(mBiometricManager.canAuthenticate(USER_ID,
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+ .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
+ final boolean requestBiometricAuthenticationForMandatoryBiometrics =
+ Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
+ false /* biometricsSuccessfullyAuthenticated */,
+ false /* biometricsAuthenticationRequested */, USER_ID);
+ assertThat(requestBiometricAuthenticationForMandatoryBiometrics).isTrue();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testRequestBiometricAuthentication_biometricManagerReturnsError_shouldReturnFalse() {
+ when(mBiometricManager.canAuthenticate(anyInt(),
+ eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+ .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
+ assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
+ false /* biometricsSuccessfullyAuthenticated */,
+ false /* biometricsAuthenticationRequested */, USER_ID)).isFalse();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testRequestBiometricAuthentication_biometricManagerReturnsSuccessForDifferentUser_shouldReturnFalse() {
+ when(mBiometricManager.canAuthenticate(anyInt(),
+ eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+ .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
+ when(mBiometricManager.canAuthenticate(0 /* userId */,
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+ .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
+ assertThat(Utils.requestBiometricAuthenticationForMandatoryBiometrics(mContext,
+ false /* biometricsSuccessfullyAuthenticated */,
+ false /* biometricsAuthenticationRequested */, USER_ID)).isFalse();
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testLaunchBiometricPrompt_checkIntentValues() {
+ when(mFragment.getContext()).thenReturn(mContext);
+
+ final int requestCode = 1;
+ final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ Utils.launchBiometricPromptForMandatoryBiometrics(mFragment, requestCode, USER_ID);
+
+ verify(mFragment).startActivityForResult(intentArgumentCaptor.capture(), eq(requestCode));
+
+ final Intent intent = intentArgumentCaptor.getValue();
+
+ assertThat(intent.getExtra(BIOMETRIC_PROMPT_AUTHENTICATORS)).isEqualTo(
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
+ 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))
+ .isTrue();
+ assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0)).isEqualTo(USER_ID);
+ assertThat(intent.getComponent().getPackageName()).isEqualTo(SETTINGS_PACKAGE_NAME);
+ assertThat(intent.getComponent().getClassName()).isEqualTo(
+ ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
+ }
+
private void setUpForConfirmCredentialString(boolean isEffectiveUserManagedProfile) {
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mMockUserManager);
when(mMockUserManager.getCredentialOwnerProfile(USER_ID)).thenReturn(USER_ID);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
index ad53ad6..547d0b6 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDialogUtilsTest.java
@@ -21,7 +21,6 @@
import android.app.Dialog;
import android.content.Context;
-import androidx.appcompat.app.AlertDialog;
import androidx.test.core.app.ApplicationProvider;
import org.junit.Before;
@@ -41,24 +40,6 @@
}
@Test
- public void updateShortcutInDialog_correctDialogType_success() {
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC, "Title",
- null);
-
- assertThat(
- AccessibilityDialogUtils.updateShortcutInDialog(mContext, dialog)).isTrue();
- }
-
- @Test
- public void updateShortcutInDialog_useNotSupportedDialog_fail() {
- final AlertDialog dialog = new AlertDialog.Builder(mContext).setTitle("Title").show();
-
- assertThat(AccessibilityDialogUtils.updateShortcutInDialog(mContext,
- dialog)).isFalse();
- }
-
- @Test
public void showDialog_createCustomDialog_isShowing() {
final Dialog dialog = AccessibilityDialogUtils.createCustomDialog(mContext,
"Title", /* customView= */ null, "positiveButton", /* positiveListener= */ null,
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index 1463cd0..86763fd 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -26,11 +26,9 @@
import static java.util.Collections.singletonList;
import android.accessibilityservice.AccessibilityServiceInfo;
-import android.accessibilityservice.AccessibilityShortcutInfo;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
@@ -110,9 +108,7 @@
private final Context mContext = ApplicationProvider.getApplicationContext();
@Spy
private final AccessibilityServiceInfo mServiceInfo = getMockAccessibilityServiceInfo(
- PACKAGE_NAME, CLASS_NAME);
- @Mock
- private AccessibilityShortcutInfo mShortcutInfo;
+ new ComponentName(PACKAGE_NAME, CLASS_NAME));
private ShadowAccessibilityManager mShadowAccessibilityManager;
@Mock
private LocalBluetoothManager mLocalBluetoothManager;
@@ -125,7 +121,6 @@
mShadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
- setMockAccessibilityShortcutInfo(mShortcutInfo);
Intent intent = new Intent();
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
@@ -174,7 +169,8 @@
mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.accessibility_summary_shortcut_enabled),
DEFAULT_SUMMARY));
}
@@ -189,7 +185,8 @@
mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_feature_shortcut_off),
DEFAULT_SUMMARY));
}
@@ -251,7 +248,8 @@
mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY));
}
@@ -265,7 +263,8 @@
mServiceInfo, SERVICE_ENABLED).toString();
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_on),
DEFAULT_SUMMARY));
}
@@ -279,7 +278,8 @@
mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY));
}
@@ -293,7 +293,8 @@
mServiceInfo, SERVICE_DISABLED).toString();
assertThat(summary).isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
mContext.getString(R.string.generic_accessibility_service_off),
DEFAULT_SUMMARY));
}
@@ -398,14 +399,25 @@
public void testAccessibilityMenuInSystem_IncludedInInteractionControl() {
mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
List.of(getMockAccessibilityServiceInfo(
- AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM)));
+ AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM,
+ /*isSystemApp=*/true)));
setupFragment();
- final RestrictedPreference pref = mFragment.getPreferenceScreen().findPreference(
- AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM.flattenToString());
- final String prefCategory = mFragment.mServicePreferenceToPreferenceCategoryMap.get(
- pref).getKey();
- assertThat(prefCategory).isEqualTo(AccessibilitySettings.CATEGORY_INTERACTION_CONTROL);
+ assertThat(getPreferenceCategory(AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM))
+ .isEqualTo(AccessibilitySettings.CATEGORY_INTERACTION_CONTROL);
+ }
+
+ @Test
+ @EnableFlags(com.android.settings.accessibility.Flags.FLAG_CHECK_PREBUNDLED_IS_PREINSTALLED)
+ public void testNonPreinstalledApp_IncludedInDownloadedCategory() {
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
+ List.of(getMockAccessibilityServiceInfo(
+ AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM,
+ /*isSystemApp=*/false)));
+ setupFragment();
+
+ assertThat(getPreferenceCategory(AccessibilityUtils.ACCESSIBILITY_MENU_IN_SYSTEM))
+ .isEqualTo(AccessibilitySettings.CATEGORY_DOWNLOADED_SERVICES);
}
@Test
@@ -418,13 +430,20 @@
assertThat(pref).isNull();
}
- private AccessibilityServiceInfo getMockAccessibilityServiceInfo(String packageName,
- String className) {
- return getMockAccessibilityServiceInfo(new ComponentName(packageName, className));
+ private String getPreferenceCategory(ComponentName componentName) {
+ return mFragment.mServicePreferenceToPreferenceCategoryMap.get(
+ mFragment.getPreferenceScreen().findPreference(
+ componentName.flattenToString())).getKey();
}
private AccessibilityServiceInfo getMockAccessibilityServiceInfo(ComponentName componentName) {
- final ApplicationInfo applicationInfo = new ApplicationInfo();
+ return getMockAccessibilityServiceInfo(componentName, true);
+ }
+
+ private AccessibilityServiceInfo getMockAccessibilityServiceInfo(ComponentName componentName,
+ boolean isSystemApp) {
+ final ApplicationInfo applicationInfo = Mockito.mock(ApplicationInfo.class);
+ when(applicationInfo.isSystemApp()).thenReturn(isSystemApp);
final ServiceInfo serviceInfo = new ServiceInfo();
applicationInfo.packageName = componentName.getPackageName();
serviceInfo.packageName = componentName.getPackageName();
@@ -445,16 +464,6 @@
return null;
}
- private void setMockAccessibilityShortcutInfo(AccessibilityShortcutInfo mockInfo) {
- final ActivityInfo activityInfo = Mockito.mock(ActivityInfo.class);
- activityInfo.applicationInfo = new ApplicationInfo();
- when(mockInfo.getActivityInfo()).thenReturn(activityInfo);
- when(activityInfo.loadLabel(any())).thenReturn(DEFAULT_LABEL);
- when(mockInfo.loadSummary(any())).thenReturn(DEFAULT_SUMMARY);
- when(mockInfo.loadDescription(any())).thenReturn(DEFAULT_DESCRIPTION);
- when(mockInfo.getComponentName()).thenReturn(COMPONENT_NAME);
- }
-
private void setInvisibleToggleFragmentType(AccessibilityServiceInfo info) {
info.getResolveInfo().serviceInfo.applicationInfo.targetSdkVersion = Build.VERSION_CODES.R;
info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON;
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
index f108b8e..9d18c44 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragmentTest.java
@@ -16,10 +16,11 @@
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.AccessibilityShortcutPreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
import static com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
-import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import static com.google.common.truth.Truth.assertThat;
@@ -34,7 +35,6 @@
import android.app.Application;
import android.content.ComponentName;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.icu.text.CaseMap;
import android.os.Bundle;
@@ -49,7 +49,6 @@
import android.widget.PopupWindow;
import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -128,7 +127,7 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.getComponentName().flattenToString());
// Compare to default UserShortcutType
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(SOFTWARE);
}
@Test
@@ -140,85 +139,20 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.getComponentName().flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ assertThat(expectedType).isEqualTo(SOFTWARE | HARDWARE);
}
@Test
public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
final PreferredShortcut hardwareShortcut = new PreferredShortcut(
- PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+ PLACEHOLDER_COMPONENT_NAME.flattenToString(), HARDWARE);
putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
mFragment.updateShortcutPreferenceData();
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.getComponentName().flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE);
- }
-
- @Test
- public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
- mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC,
- PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- mFragment.mShortcutPreference = shortcutPreference;
-
- mFragment.mShortcutPreference.setChecked(false);
- mFragment.setupEditShortcutDialog(dialog);
-
- final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
- }
-
- @Test
- public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
- mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC,
- PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- final PreferredShortcut hardwareShortcut = new PreferredShortcut(
- PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
- mFragment.mShortcutPreference = shortcutPreference;
-
- PreferredShortcuts.saveUserShortcutType(mContext, hardwareShortcut);
- mFragment.mShortcutPreference.setChecked(true);
- mFragment.setupEditShortcutDialog(dialog);
-
- final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.HARDWARE);
- }
-
- @Test
- @Config(shadows = ShadowFragment.class)
- public void restoreValueFromSavedInstanceState_assignShortcutTypeToVariable() {
- mContext.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, AccessibilityDialogUtils.DialogType.EDIT_SHORTCUT_GENERIC,
- PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final Bundle savedInstanceState = new Bundle();
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- mFragment.mShortcutPreference = shortcutPreference;
-
- savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
- mFragment.onAttach(mContext);
- mFragment.onCreate(savedInstanceState);
- mFragment.setupEditShortcutDialog(dialog);
- final int value = mFragment.getShortcutTypeCheckBoxValue();
- mFragment.saveNonEmptyUserShortcutType(value);
-
- final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
- mFragment.getComponentName().flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ assertThat(expectedType).isEqualTo(HARDWARE);
}
@Test
@@ -265,8 +199,7 @@
}
@Test
- @EnableFlags(com.android.settings.accessibility.Flags.FLAG_EDIT_SHORTCUTS_IN_FULL_SCREEN)
- public void onSettingsClicked_editShortcutsFullScreenFlagOn_showFullScreenEditShortcutScreen() {
+ public void onSettingsClicked_showFullScreenEditShortcutScreen() {
Activity activity = Robolectric.setupActivity(FragmentActivity.class);
when(mFragment.getContext()).thenReturn(activity);
Context context = mFragment.getContext();
@@ -290,7 +223,7 @@
public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
PLACEHOLDER_COMPONENT_NAME.flattenToString(),
- UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+ HARDWARE | QUICK_SETTINGS);
putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
final ShortcutPreference shortcutPreference =
new ShortcutPreference(mContext, /* attrs= */ null);
@@ -308,8 +241,6 @@
assertThat(summary).isEqualTo(expected);
}
- private void callEmptyOnClicked(DialogInterface dialog, int which) {}
-
private void putStringIntoSettings(String key, String componentName) {
Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
index a5aceed..d5c1fd1 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutsTutorialTest.java
@@ -16,11 +16,15 @@
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.internal.accessibility.common.ShortcutConstants.UserShortcutType.TRIPLETAP;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialog;
import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createAccessibilityTutorialDialogForSetupWizard;
import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.createShortcutTutorialPages;
import static com.android.settings.accessibility.AccessibilityShortcutsTutorial.showGestureNavigationTutorialDialog;
-import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import static com.google.common.truth.Truth.assertThat;
@@ -99,7 +103,7 @@
@Test
public void createTutorialPages_turnOnTripleTapShortcut_hasOnePage() {
- mShortcutTypes |= UserShortcutType.TRIPLETAP;
+ mShortcutTypes |= TRIPLETAP;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -114,7 +118,7 @@
@Test
@EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
public void createTutorialPages_turnOnTwoFingerTripleTapShortcut_hasOnePage() {
- mShortcutTypes |= UserShortcutType.TWOFINGER_DOUBLETAP;
+ mShortcutTypes |= TWOFINGER_DOUBLETAP;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -129,7 +133,7 @@
@Test
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void createTutorialPages_turnOnQuickSettingShortcut_hasOnePage() {
- mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ mShortcutTypes |= QUICK_SETTINGS;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -143,7 +147,7 @@
@Test
public void createTutorialPages_turnOnSoftwareShortcut_hasOnePage() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -157,8 +161,8 @@
@Test
public void createTutorialPages_turnOnSoftwareAndHardwareShortcuts_hasTwoPages() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
- mShortcutTypes |= UserShortcutType.HARDWARE;
+ mShortcutTypes |= SOFTWARE;
+ mShortcutTypes |= HARDWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -172,7 +176,7 @@
@Test
public void createTutorialPages_turnOnA11yGestureShortcut_linkButtonShownWithText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
@@ -191,7 +195,7 @@
@Test
public void createTutorialPages_turnOnA11yNavButtonShortcut_linkButtonShownWithText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ false, /* floatingButtonEnabled= */ false);
@@ -210,7 +214,7 @@
@Test
public void createTutorialPages_turnOnFloatingButtonShortcut_linkButtonShownWithText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ false, /* floatingButtonEnabled= */ true);
@@ -228,7 +232,7 @@
@Test
public void createTutorialPages_turnOnHardwareShortcut_linkButtonGone() {
- mShortcutTypes |= UserShortcutType.HARDWARE;
+ mShortcutTypes |= HARDWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
@@ -241,7 +245,7 @@
@Test
public void createTutorialPages_turnOnSoftwareShortcut_showFromSuW_linkButtonGone() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialogForSetupWizard(
@@ -256,7 +260,7 @@
@Test
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void createAccessibilityTutorialDialog_qsShortcut_inSuwTalkbackOn_verifyText() {
- mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ mShortcutTypes |= QUICK_SETTINGS;
setTouchExplorationEnabled(true);
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_quick_setting);
@@ -288,7 +292,7 @@
@Test
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void createAccessibilityTutorialDialog_qsShortcut_notInSuwTalkbackOn_verifyText() {
- mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ mShortcutTypes |= QUICK_SETTINGS;
setTouchExplorationEnabled(true);
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_quick_setting);
@@ -314,7 +318,7 @@
@Test
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void createAccessibilityTutorialDialog_qsShortcut_inSuwTalkbackOff_verifyText() {
- mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ mShortcutTypes |= QUICK_SETTINGS;
setTouchExplorationEnabled(false);
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_quick_setting);
@@ -345,7 +349,7 @@
@Test
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void createAccessibilityTutorialDialog_qsShortcut_notInSuwTalkbackOff_verifyText() {
- mShortcutTypes |= UserShortcutType.QUICK_SETTINGS;
+ mShortcutTypes |= QUICK_SETTINGS;
setTouchExplorationEnabled(false);
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_quick_setting);
@@ -370,7 +374,7 @@
@Test
public void createAccessibilityTutorialDialog_volumeKeysShortcut_verifyText() {
- mShortcutTypes |= UserShortcutType.HARDWARE;
+ mShortcutTypes |= HARDWARE;
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_volume);
final CharSequence expectedInstruction = mContext.getString(
@@ -390,7 +394,7 @@
@Test
public void createAccessibilityTutorialDialog_tripleTapShortcut_verifyText() {
- mShortcutTypes |= UserShortcutType.TRIPLETAP;
+ mShortcutTypes |= TRIPLETAP;
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_triple);
final CharSequence expectedInstruction = mContext.getString(
@@ -411,7 +415,7 @@
@Test
@EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
public void createAccessibilityTutorialDialog_twoFingerDoubleTapShortcut_verifyText() {
- mShortcutTypes |= UserShortcutType.TWOFINGER_DOUBLETAP;
+ mShortcutTypes |= TWOFINGER_DOUBLETAP;
final int numFingers = 2;
final String expectedTitle = mContext.getString(
R.string.accessibility_tutorial_dialog_title_two_finger_double, numFingers);
@@ -432,7 +436,7 @@
@Test
public void createAccessibilityTutorialDialog_floatingButtonShortcut_verifyText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ false, /* floatingButtonEnabled= */ true);
final String expectedTitle = mContext.getString(
@@ -454,7 +458,7 @@
@Test
public void createAccessibilityTutorialDialog_navA11yButtonShortcut_verifyText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ false, /* floatingButtonEnabled= */ false);
final String expectedTitle = mContext.getString(
@@ -476,7 +480,7 @@
@Test
public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOn_verifyText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
setTouchExplorationEnabled(true);
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
@@ -501,7 +505,7 @@
@Test
public void createAccessibilityTutorialDialog_gestureShortcut_talkbackOff_verifyText() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
setTouchExplorationEnabled(false);
AccessibilityTestUtils.setSoftwareShortcutMode(
mContext, /* gestureNavEnabled= */ true, /* floatingButtonEnabled= */ false);
@@ -526,7 +530,7 @@
@Test
public void performClickOnPositiveButton_turnOnSoftwareShortcut_dismiss() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(mContext, mShortcutTypes, FAKE_FEATURE_NAME);
alertDialog.show();
@@ -540,7 +544,7 @@
@Test
public void performClickOnPositiveButton_turnOnSoftwareShortcut_callOnClickListener() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(
mContext, mShortcutTypes, mOnClickListener, FAKE_FEATURE_NAME);
@@ -555,7 +559,7 @@
@Test
public void performClickOnNegativeButton_turnOnSoftwareShortcut_directToSettingsPage() {
- mShortcutTypes |= UserShortcutType.SOFTWARE;
+ mShortcutTypes |= SOFTWARE;
Activity activity = Robolectric.buildActivity(Activity.class).create().get();
final AlertDialog alertDialog =
createAccessibilityTutorialDialog(activity, mShortcutTypes, FAKE_FEATURE_NAME);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index 2d5deeb..c036432 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -16,6 +16,12 @@
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.internal.accessibility.common.ShortcutConstants.UserShortcutType.TRIPLETAP;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
@@ -39,9 +45,9 @@
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.accessibility.AccessibilityUtil.UserShortcutType;
import com.android.settings.testutils.AccessibilityTestUtils;
import org.junit.Before;
@@ -159,52 +165,52 @@
@Test
public void hasValueInSettings_putValue_hasValue() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- assertThat(AccessibilityUtil.hasValueInSettings(mContext, UserShortcutType.SOFTWARE,
+ assertThat(AccessibilityUtil.hasValueInSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME)).isTrue();
}
@Test
public void getUserShortcutTypeFromSettings_putOneValue_hasValue() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
MOCK_COMPONENT_NAME);
assertThat(shortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE
+ SOFTWARE
);
}
@Test
public void getUserShortcutTypeFromSettings_putTwoValues_hasValue() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
MOCK_COMPONENT_NAME);
assertThat(shortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE
- | UserShortcutType.HARDWARE
+ SOFTWARE
+ | HARDWARE
);
}
@Test
@EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void getUserShortcutTypeFromSettings_threeShortcutTypesChosen() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
- setShortcut(UserShortcutType.QUICK_SETTINGS, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(QUICK_SETTINGS, MOCK_COMPONENT_NAME.flattenToString());
final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(mContext,
MOCK_COMPONENT_NAME);
assertThat(shortcutTypes).isEqualTo(
- UserShortcutType.SOFTWARE
- | UserShortcutType.HARDWARE
- | UserShortcutType.QUICK_SETTINGS
+ SOFTWARE
+ | HARDWARE
+ | QUICK_SETTINGS
);
}
@@ -212,7 +218,7 @@
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optInAllValuesToSettings_optInValue_haveMatchString() {
clearShortcuts();
- int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
+ int shortcutTypes = SOFTWARE | HARDWARE;
AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, MOCK_COMPONENT_NAME);
@@ -229,8 +235,8 @@
AccessibilityManager a11yManager =
AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
- int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE
- | UserShortcutType.QUICK_SETTINGS;
+ int shortcutTypes = SOFTWARE | HARDWARE
+ | QUICK_SETTINGS;
AccessibilityUtil.optInAllValuesToSettings(mContext, shortcutTypes, MOCK_COMPONENT_NAME);
@@ -243,9 +249,9 @@
@Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optInValueToSettings_optInValue_haveMatchString() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
+ AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME2);
assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
@@ -261,10 +267,10 @@
Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME2.flattenToString());
AccessibilityUtil.optInValueToSettings(
- mContext, UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME2);
+ mContext, HARDWARE, MOCK_COMPONENT_NAME2);
verify(a11yManager).enableShortcutsForTargets(
- /* enable= */ true, UserShortcutType.HARDWARE,
+ /* enable= */ true, HARDWARE,
shortcutTargets, UserHandle.myUserId());
verifyNoMoreInteractions(a11yManager);
}
@@ -272,11 +278,11 @@
@Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optInValueToSettings_optInTwoValues_haveMatchString() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
+ AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME2);
- AccessibilityUtil.optInValueToSettings(mContext, UserShortcutType.SOFTWARE,
+ AccessibilityUtil.optInValueToSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME2);
assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
@@ -287,10 +293,10 @@
@Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optOutAllValuesToSettings_optOutValue_emptyString() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- setShortcut(UserShortcutType.HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(HARDWARE, MOCK_COMPONENT_NAME.flattenToString());
int shortcutTypes =
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+ SOFTWARE | HARDWARE | TRIPLETAP;
AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
MOCK_COMPONENT_NAME);
@@ -305,8 +311,8 @@
AccessibilityManager a11yManager =
AccessibilityTestUtils.setupMockAccessibilityManager(mContext);
int shortcutTypes =
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE
- | UserShortcutType.QUICK_SETTINGS;
+ SOFTWARE | HARDWARE
+ | QUICK_SETTINGS;
Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
AccessibilityUtil.optOutAllValuesFromSettings(mContext, shortcutTypes,
@@ -322,9 +328,9 @@
@Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optOutValueFromSettings_optOutValue_emptyString() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString());
- AccessibilityUtil.optOutValueFromSettings(mContext, UserShortcutType.SOFTWARE,
+ AccessibilityUtil.optOutValueFromSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME);
assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEmpty();
@@ -333,10 +339,10 @@
@Test
@DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void optOutValueFromSettings_optOutValue_haveMatchString() {
- setShortcut(UserShortcutType.SOFTWARE, MOCK_COMPONENT_NAME.flattenToString(),
+ setShortcut(SOFTWARE, MOCK_COMPONENT_NAME.flattenToString(),
MOCK_COMPONENT_NAME2.flattenToString());
- AccessibilityUtil.optOutValueFromSettings(mContext, UserShortcutType.SOFTWARE,
+ AccessibilityUtil.optOutValueFromSettings(mContext, SOFTWARE,
MOCK_COMPONENT_NAME2);
assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
@@ -351,36 +357,36 @@
Set<String> shortcutTargets = Set.of(MOCK_COMPONENT_NAME.flattenToString());
AccessibilityUtil.optOutValueFromSettings(
- mContext, UserShortcutType.QUICK_SETTINGS, MOCK_COMPONENT_NAME);
+ mContext, QUICK_SETTINGS, MOCK_COMPONENT_NAME);
verify(a11yManager).enableShortcutsForTargets(
- /* enable= */ false, UserShortcutType.QUICK_SETTINGS,
+ /* enable= */ false, QUICK_SETTINGS,
shortcutTargets, UserHandle.myUserId());
verifyNoMoreInteractions(a11yManager);
}
@Test
public void convertKeyFromSettings_shortcutTypeSoftware() {
- assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.SOFTWARE))
+ assertThat(AccessibilityUtil.convertKeyFromSettings(SOFTWARE))
.isEqualTo(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);
}
@Test
public void convertKeyFromSettings_shortcutTypeHardware() {
- assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.HARDWARE))
+ assertThat(AccessibilityUtil.convertKeyFromSettings(HARDWARE))
.isEqualTo(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);
}
@Test
public void convertKeyFromSettings_shortcutTypeTripleTap() {
- assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.TRIPLETAP))
+ assertThat(AccessibilityUtil.convertKeyFromSettings(TRIPLETAP))
.isEqualTo(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
}
@Test
@EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void convertKeyFromSettings_shortcutTypeMultiFingersMultiTap() {
- assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.TWOFINGER_DOUBLETAP))
+ assertThat(AccessibilityUtil.convertKeyFromSettings(TWOFINGER_DOUBLETAP))
.isEqualTo(
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_TWO_FINGER_TRIPLE_TAP_ENABLED);
}
@@ -388,7 +394,7 @@
@Test
@EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
public void convertKeyFromSettings_shortcutTypeQuickSettings() {
- assertThat(AccessibilityUtil.convertKeyFromSettings(UserShortcutType.QUICK_SETTINGS))
+ assertThat(AccessibilityUtil.convertKeyFromSettings(QUICK_SETTINGS))
.isEqualTo(Settings.Secure.ACCESSIBILITY_QS_TARGETS);
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java b/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java
index 1e6e068..c0b9dbd 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AutoBrightnessPreferenceFragmentForSetupWizardTest.java
@@ -18,66 +18,97 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import android.app.settings.SettingsEnums;
-import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.test.core.app.ApplicationProvider;
+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.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;
/** Tests for {@link AutoBrightnessPreferenceFragmentForSetupWizard}. */
@RunWith(RobolectricTestRunner.class)
public class AutoBrightnessPreferenceFragmentForSetupWizardTest {
- @Rule
- public final MockitoRule mMockito = MockitoJUnit.rule();
+ // Same as AutoBrightnessPreferenceFragmentForSetupWizard#FOOTER_PREFERENCE_KEY
+ private static final String FOOTER_PREFERENCE_KEY = "auto_brightness_footer";
- @Spy
- private final Context mContext = ApplicationProvider.getApplicationContext();
- @Mock
- private GlifPreferenceLayout mGlifLayoutView;
- @Mock
- private FooterBarMixin mFooterBarMixin;
+ private FragmentScenario<AutoBrightnessPreferenceFragmentForSetupWizard> mFragmentScenario;
+
private AutoBrightnessPreferenceFragmentForSetupWizard mFragment;
+ private GlifLayout mGlifLayout;
@Before
public void setUp() {
- mFragment = spy(new AutoBrightnessPreferenceFragmentForSetupWizard());
- doReturn(mock(LifecycleOwner.class)).when(mFragment).getViewLifecycleOwner();
- doReturn(mContext).when(mFragment).getContext();
- when(mGlifLayoutView.getMixin(eq(FooterBarMixin.class))).thenReturn(mFooterBarMixin);
+ 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 setHeaderText_onViewCreated_verifyAction() {
- final String title = "title";
- doReturn(title).when(mContext).getString(R.string.auto_brightness_title);
+ public void onViewCreated_verifyGlifHerderText() {
+ assertThat(mGlifLayout.getHeaderText())
+ .isEqualTo(mFragment.getString(R.string.auto_brightness_title));
+ }
- mFragment.onViewCreated(mGlifLayoutView, null);
+ @Test
+ public void onViewCreated_verifyGlifFooter() {
+ FooterBarMixin footerMixin = mGlifLayout.getMixin(FooterBarMixin.class);
+ assertThat(footerMixin).isNotNull();
- verify(mGlifLayoutView).setHeaderText(title);
+ 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
@@ -85,11 +116,4 @@
assertThat(mFragment.getMetricsCategory()).isEqualTo(
SettingsEnums.SUW_ACCESSIBILITY_AUTO_BRIGHTNESS);
}
-
- @Test
- public void onViewCreated_verifyAction() {
- mFragment.onViewCreated(mGlifLayoutView, null);
-
- verify(mFooterBarMixin).setPrimaryButton(any());
- }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
index ce2a571..d74794f 100644
--- a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
@@ -28,23 +28,32 @@
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;
+import com.android.settings.R;
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;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import java.util.Locale;
+
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
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;
@@ -143,6 +152,58 @@
assertThat(mSeekBar.getProgress()).isEqualTo(progressWithoutThreshold);
}
+ @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);
+ mSeekBar.setMax(MAX_PROGRESS_VALUE);
+
+ mProxySeekBarListener.onProgressChanged(mSeekBar, progress, true);
+
+ assertThat(mSeekBar.getStateDescription()).isEqualTo(
+ mContext.getString(R.string.audio_seek_bar_state_left_first, 50, 50));
+ }
+
+ @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"));
+ // Seek bar centered
+ int progress = (int) (0.50f * MAX_PROGRESS_VALUE);
+ mSeekBar.setMax(MAX_PROGRESS_VALUE);
+
+ mProxySeekBarListener.onProgressChanged(mSeekBar, progress, true);
+
+ assertThat(mSeekBar.getStateDescription()).isEqualTo(
+ mContext.getString(R.string.audio_seek_bar_state_right_first, 50, 50));
+ }
+
+ @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);
+ mSeekBar.setMax(MAX_PROGRESS_VALUE);
+ mProxySeekBarListener.onProgressChanged(mSeekBar, progress, true);
+
+ assertThat(mSeekBar.getStateDescription()).isEqualTo(
+ mContext.getString(R.string.audio_seek_bar_state_left_first, 75, 25));
+ }
+
+ @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);
+ mSeekBar.setMax(MAX_PROGRESS_VALUE);
+ mProxySeekBarListener.onProgressChanged(mSeekBar, progress, true);
+
+ assertThat(mSeekBar.getStateDescription()).isEqualTo(
+ mContext.getString(R.string.audio_seek_bar_state_right_first, 75, 25));
+ }
+
// method to get the center from BalanceSeekBar for testing setMax().
private int getBalanceSeekBarCenter(BalanceSeekBar seekBar) {
return seekBar.getMax() / 2;
diff --git a/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
index b9de66d..b4dd2fc 100644
--- a/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/CaptioningAppearancePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
@@ -188,7 +189,8 @@
R.array.captioning_font_size_selector_titles);
final String[] presetArray = mContext.getResources().getStringArray(
R.array.captioning_preset_selector_titles);
- return mContext.getString(R.string.preference_summary_default_combination,
+ return mContext.getString(
+ com.android.settingslib.R.string.preference_summary_default_combination,
fontScaleArray[fontScaleIndex], presetArray[presetIndex]);
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java
index 28954c5..56c0842 100644
--- a/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerRadioButtonPreferenceControllerTest.java
@@ -18,61 +18,65 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import android.content.Context;
import android.provider.Settings;
-import androidx.preference.Preference;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
+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.ShadowLooper;
+/**
+ * Tests for {@link DaltonizerRadioButtonPreferenceController}
+ */
@RunWith(RobolectricTestRunner.class)
-public class DaltonizerRadioButtonPreferenceControllerTest implements
- DaltonizerRadioButtonPreferenceController.OnChangeListener {
- private static final String PREF_KEY = "daltonizer_mode_protanomaly";
- private static final String PREF_VALUE = "11";
- private static final String PREF_FAKE_VALUE = "-1";
+public class DaltonizerRadioButtonPreferenceControllerTest {
+ private static final int DALTONIZER_MODE_INDEX = 0;
+ private static final String PREF_INVALID_VALUE = "-1";
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private final String mPrefKey =
+ mContext.getResources()
+ .getStringArray(R.array.daltonizer_mode_keys)[DALTONIZER_MODE_INDEX];
+ private final String mPrefValue =
+ String.valueOf(mContext.getResources()
+ .getIntArray(R.array.daltonizer_type_values)[DALTONIZER_MODE_INDEX]);
private DaltonizerRadioButtonPreferenceController mController;
-
- @Mock
- private SelectorWithWidgetPreference mMockPref;
- private Context mContext;
-
- @Mock
+ private SelectorWithWidgetPreference mPreference;
private PreferenceScreen mScreen;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
+
@Before
public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new DaltonizerRadioButtonPreferenceController(mContext, mock(Lifecycle.class),
- PREF_KEY);
- mController.setOnChangeListener(this);
-
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
- when(mMockPref.getKey()).thenReturn(PREF_KEY);
+ // initialize the value as unchecked
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_INVALID_VALUE);
+ mController = new DaltonizerRadioButtonPreferenceController(mContext, mPrefKey);
+ mPreference = new SelectorWithWidgetPreference(mContext);
+ mPreference.setKey(mPrefKey);
+ mScreen = new PreferenceManager(mContext).createPreferenceScreen(mContext);
+ mScreen.addPreference(mPreference);
mController.displayPreference(mScreen);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
}
- @Override
- public void onCheckedChanged(Preference preference) {
- mController.updateState(preference);
+ @After
+ public void cleanUp() {
+ mLifecycle.removeObserver(mController);
}
@Test
@@ -81,36 +85,62 @@
}
@Test
- public void updateState_notChecked() {
+ public void updateState_valueNotMatched_notChecked() {
Settings.Secure.putString(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_FAKE_VALUE);
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_INVALID_VALUE);
- mController.updateState(mMockPref);
+ mController.updateState(mPreference);
- // the first checked state is set to false by control
- verify(mMockPref, atLeastOnce()).setChecked(false);
- verify(mMockPref, never()).setChecked(true);
+ assertThat(mPreference.isChecked()).isFalse();
}
@Test
- public void updateState_checked() {
+ public void updateState_valueMatched_checked() {
Settings.Secure.putString(mContext.getContentResolver(),
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_VALUE);
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, mPrefValue);
- mController.updateState(mMockPref);
+ mController.updateState(mPreference);
- // the first checked state is set to false by control
- verify(mMockPref, atLeastOnce()).setChecked(false);
- verify(mMockPref, atLeastOnce()).setChecked(true);
+ assertThat(mPreference.isChecked()).isTrue();
}
@Test
public void onRadioButtonClick_shouldReturnDaltonizerValue() {
- mController.onRadioButtonClicked(mMockPref);
+ mController.onRadioButtonClicked(mPreference);
+
final String accessibilityDaltonizerValue = Settings.Secure.getString(
mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
+ assertThat(accessibilityDaltonizerValue).isEqualTo(mPrefValue);
+ }
- assertThat(accessibilityDaltonizerValue).isEqualTo(PREF_VALUE);
+ @Test
+ public void onResume_settingsValueChangedToUnmatch_preferenceBecomesUnchecked() {
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, mPrefValue);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isChecked()).isTrue();
+ mLifecycle.addObserver(mController);
+
+ mLifecycle.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_RESUME);
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, PREF_INVALID_VALUE);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void onPause_settingsValueChangedAndMatch_preferenceStateNotUpdated() {
+ assertThat(mPreference.isChecked()).isFalse();
+ mLifecycle.addObserver(mController);
+ mLifecycle.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_RESUME);
+
+ mLifecycle.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_PAUSE);
+ Settings.Secure.putString(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, mPrefValue);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.isChecked()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceControllerTest.java
index 98ed442..5fd11f9 100644
--- a/tests/robotests/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceControllerTest.java
@@ -16,38 +16,39 @@
package com.android.settings.accessibility;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
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.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
import android.content.ContentResolver;
import android.content.Context;
+import android.os.Looper;
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.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
import com.android.server.accessibility.Flags;
import com.android.settings.widget.SeekBarPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
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;
/** Tests for {@link DaltonizerSaturationSeekbarPreferenceController}. */
@@ -60,8 +61,9 @@
private int mOriginalSaturationLevel = -1;
private PreferenceScreen mScreen;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
- @Mock
private SeekBarPreference mPreference;
@Rule
@@ -69,7 +71,6 @@
@Before
public void setup() {
- MockitoAnnotations.initMocks(this);
Context context = ApplicationProvider.getApplicationContext();
mContentResolver = context.getContentResolver();
mOriginalSaturationLevel = Settings.Secure.getInt(
@@ -77,10 +78,13 @@
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL,
7);
- mScreen = spy(new PreferenceScreen(context, /* attrs= */ null));
- when(mScreen.findPreference(ToggleDaltonizerPreferenceFragment.KEY_SATURATION))
- .thenReturn(mPreference);
+ mPreference = new SeekBarPreference(context);
+ mPreference.setKey(ToggleDaltonizerPreferenceFragment.KEY_SATURATION);
+ mScreen = new PreferenceManager(context).createPreferenceScreen(context);
+ mScreen.addPreference(mPreference);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new DaltonizerSaturationSeekbarPreferenceController(
context,
ToggleDaltonizerPreferenceFragment.KEY_SATURATION);
@@ -94,6 +98,12 @@
mOriginalSaturationLevel);
}
+ @Test
+ public void constructor_defaultValuesMatch() {
+ assertThat(mController.getSliderPosition()).isEqualTo(7);
+ assertThat(mController.getMax()).isEqualTo(10);
+ assertThat(mController.getMin()).isEqualTo(1);
+ }
@Test
@DisableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
@@ -103,28 +113,72 @@
@Test
@EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
- public void getAvailabilityStatus_flagEnabled_available() {
+ public void getAvailabilityStatus_flagEnabledProtanEnabled_available() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 11);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
- public void constructor_defaultValuesMatch() {
- assertThat(mController.getSliderPosition()).isEqualTo(7);
- assertThat(mController.getMax()).isEqualTo(10);
- assertThat(mController.getMin()).isEqualTo(0);
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void getAvailabilityStatus_flagEnabledDeutranEnabled_available() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 12);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
@EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
- public void displayPreference_enabled_visible() {
+ public void getAvailabilityStatus_flagEnabledTritanEnabled_available() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 13);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void getAvailabilityStatus_flagEnabledGrayScale_disabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 0);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void getAvailabilityStatus_flagEnabledColorCorrectionDisabled_disabled() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 11);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void getAvailabilityStatus_flagEnabledColorCorrectionDisabledGrayScale_disabled() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 0);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void displayPreference_flagEnabledColorCorrectionEnabled_enabledWithDefaultValues() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 11);
mController.displayPreference(mScreen);
- verify(mPreference).setMax(eq(10));
- verify(mPreference).setMin(eq(0));
- verify(mPreference).setProgress(eq(7));
- verify(mPreference).setContinuousUpdates(eq(true));
- verify(mPreference).setOnPreferenceChangeListener(eq(mController));
- verify(mPreference).setVisible(eq(true));
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.getMax()).isEqualTo(10);
+ assertThat(mPreference.getMin()).isEqualTo(1);
+ assertThat(mPreference.getProgress()).isEqualTo(7);
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getOnPreferenceChangeListener()).isEqualTo(mController);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_COLOR_CORRECTION_SATURATION)
+ public void displayPreference_flagEnabledColorCorrectionDisabled_disabledWithDefaultValues() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 11);
+ mController.displayPreference(mScreen);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreference.getMax()).isEqualTo(10);
+ assertThat(mPreference.getMin()).isEqualTo(1);
+ assertThat(mPreference.getProgress()).isEqualTo(7);
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getOnPreferenceChangeListener()).isEqualTo(mController);
}
@Test
@@ -132,12 +186,8 @@
public void displayPreference_disabled_notVisible() {
mController.displayPreference(mScreen);
- verify(mPreference).setMax(eq(10));
- verify(mPreference).setMin(eq(0));
- verify(mPreference).setProgress(eq(7));
- verify(mPreference).setContinuousUpdates(eq(true));
- verify(mPreference, never()).setOnPreferenceChangeListener(any());
- verify(mPreference).setVisible(eq(false));
+ assertThat(mPreference.isVisible()).isFalse();
+ assertThat(mPreference.getOnPreferenceChangeListener()).isNull();
}
@Test
@@ -153,13 +203,13 @@
@Test
public void setSliderPosition_min_secureSettingsUpdated() {
- var isSliderSet = mController.setSliderPosition(0);
+ var isSliderSet = mController.setSliderPosition(1);
assertThat(isSliderSet).isTrue();
assertThat(Settings.Secure.getInt(
mContentResolver,
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL,
- 7)).isEqualTo(0);
+ 7)).isEqualTo(1);
}
@Test
@@ -194,4 +244,140 @@
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_SATURATION_LEVEL,
7)).isEqualTo(7);
}
+
+ @Test
+ public void updateState_enabledProtan_preferenceEnabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 11);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_enabledDeuteran_preferenceEnabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 12);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_enabledTritan_preferenceEnabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 13);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_disabledGrayScale_preferenceDisabled() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 0);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_nullPreference_noError() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 0);
+
+ mController.updateState(null);
+ }
+
+ @Test
+ public void updateState_enabledGrayScale_preferenceDisabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 0);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void onResume_daltonizerEnabledAfterResumed_preferenceEnabled() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 11);
+ mController.displayPreference(mScreen);
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ mLifecycle.addObserver(mController);
+ mLifecycle.handleLifecycleEvent(ON_RESUME);
+
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+ 1);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void onResume_daltonizerDisabledAfterResumed_preferenceDisabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 11);
+ mController.displayPreference(mScreen);
+ assertThat(mPreference.isEnabled()).isTrue();
+
+ mLifecycle.addObserver(mController);
+ mLifecycle.handleLifecycleEvent(ON_RESUME);
+
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+ 0);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void onResume_daltonizerGrayScaledAfterResumed_preferenceDisabled() {
+ setDaltonizerMode(/* enabled= */ 1, /* mode= */ 11);
+ mController.displayPreference(mScreen);
+ assertThat(mPreference.isEnabled()).isTrue();
+
+ mLifecycle.addObserver(mController);
+ mLifecycle.handleLifecycleEvent(ON_RESUME);
+
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+ 0);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void onStop_daltonizerEnabledAfterOnStop_preferenceNotChanged() {
+ setDaltonizerMode(/* enabled= */ 0, /* mode= */ 11);
+ mController.displayPreference(mScreen);
+ assertThat(mPreference.isEnabled()).isFalse();
+
+ mLifecycle.addObserver(mController);
+ mLifecycle.handleLifecycleEvent(ON_STOP);
+
+ // enabled.
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+ 1);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ private void setDaltonizerMode(int enabled, int mode) {
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+ enabled);
+ Settings.Secure.putInt(
+ mContentResolver,
+ Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+ mode);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
index 832a313..569109c 100644
--- a/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
@@ -88,10 +88,9 @@
@Test
public void getAvailabilityStatus_featureSupported_available() {
mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
- when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(true);
- when(mResources.getFloat(
- com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude))
- .thenReturn(0.8f);
+ when(mResources.getBoolean(
+ com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
+ .thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@@ -99,7 +98,9 @@
@Test
public void getAvailabilityStatus_featureNotSupported_unavailable() {
mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
- when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(false);
+ when(mResources.getBoolean(
+ com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
+ .thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@@ -107,7 +108,9 @@
@Test
public void getAvailabilityStatus_keyboardCategoryDisabled_unavailable() {
mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
- when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(true);
+ when(mResources.getBoolean(
+ com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
+ .thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceControllerTest.java
index 8b4bcd8..9f50146 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationOneFingerPanningPreferenceControllerTest.java
@@ -133,23 +133,23 @@
}
@Test
- public void getSummary_switchModeAndSettingsOff_disabledSummaryTextUsed() {
+ public void getSummary_switchModeAndSettingsOff_defaultSummaryTextUsed() {
MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.ALL);
Settings.Secure.putInt(mContext.getContentResolver(), ONE_FINGER_PANNING_KEY, OFF);
mController.updateState(mSwitchPreference);
- assertThat(mController.getSummary()).isEqualTo(disabledSummary());
+ assertThat(mController.getSummary().toString()).isEqualTo(defaultSummary());
}
@Test
- public void getSummary_switchModeAndSettingsOn_enabledSummaryTextUsed() {
+ public void getSummary_switchModeAndSettingsOn_defaultSummaryTextUsed() {
MagnificationCapabilities.setCapabilities(mContext, MagnificationMode.ALL);
Settings.Secure.putInt(mContext.getContentResolver(), ONE_FINGER_PANNING_KEY, ON);
mController.updateState(mSwitchPreference);
- assertThat(mController.getSummary()).isEqualTo(enabledSummary());
+ assertThat(mController.getSummary().toString()).isEqualTo(defaultSummary());
}
@Test
@@ -158,7 +158,7 @@
mController.updateState(mSwitchPreference);
- assertThat(mController.getSummary()).isEqualTo(unavailableSummary());
+ assertThat(mController.getSummary().toString()).isEqualTo(unavailableSummary());
}
@Test
@@ -199,14 +199,9 @@
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
- private String enabledSummary() {
+ private String defaultSummary() {
return mContext.getString(
- R.string.accessibility_magnification_one_finger_panning_summary_on);
- }
-
- private String disabledSummary() {
- return mContext.getString(
- R.string.accessibility_magnification_one_finger_panning_summary_off);
+ R.string.accessibility_magnification_one_finger_panning_summary);
}
private String unavailableSummary() {
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
index 5522361..008f542 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragmentTest.java
@@ -299,21 +299,6 @@
}
@Test
- @DisableFlags(
- com.android.settings.accessibility.Flags.FLAG_EDIT_SHORTCUTS_IN_FULL_SCREEN)
- public void clickShortcutSettingsPreference_warningNotRequired_dontShowWarning_showDialog()
- throws Throwable {
- setupServiceWarningRequired(false);
- mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */null);
-
- mFragment.onSettingsClicked(mFragment.mShortcutPreference);
-
- assertThat(mFragment.mLastShownDialogId).isEqualTo(
- AccessibilityDialogUtils.DialogEnums.EDIT_SHORTCUT);
- }
-
- @Test
- @EnableFlags(com.android.settings.accessibility.Flags.FLAG_EDIT_SHORTCUTS_IN_FULL_SCREEN)
public void clickShortcutSettingsPreference_warningNotRequired_dontShowWarning_launchActivity()
throws Throwable {
setupServiceWarningRequired(false);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
index 850d1d79..a5bfec2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
@@ -18,53 +18,34 @@
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_DEUTERANOMALY;
-import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_GRAYSCALE;
-import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_PROTANOMALY;
-import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_TRITANOMEALY;
import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_USE_SERVICE_PREFERENCE;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
import android.os.Bundle;
import android.platform.test.annotations.DisableFlags;
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;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
+import androidx.fragment.app.Fragment;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
+import com.android.settings.SettingsActivity;
import com.android.settings.testutils.XmlTestUtils;
-import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SettingsMainSwitchPreference;
-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.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
@@ -72,89 +53,52 @@
/** Tests for {@link ToggleDaltonizerPreferenceFragment} */
@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowFragment.class)
public class ToggleDaltonizerPreferenceFragmentTest {
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private final Context mContext = ApplicationProvider.getApplicationContext();
- private TestToggleDaltonizerPreferenceFragment mFragment;
- private PreferenceScreen mScreen;
- private SettingsMainSwitchPreference mSwitchPreference;
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private PreferenceManager mPreferenceManager;
- @Mock
- private SelectorWithWidgetPreference mMockDeuteranomalyPref;
- @Mock
- private SelectorWithWidgetPreference mMockProtanomalyPref;
- @Mock
- private SelectorWithWidgetPreference mMockTritanomalyPref;
- @Mock
- private SelectorWithWidgetPreference mMockGrayscalePref;
- @Mock
- private FragmentActivity mActivity;
+ private ActivityController<SettingsActivity> mActivityController;
@Before
- public void setUpTestFragment() {
- MockitoAnnotations.initMocks(this);
+ public void setUp() {
+ Intent intent = new Intent();
+ intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT,
+ ToggleDaltonizerPreferenceFragment.class.getName());
+ intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, new Bundle());
- mFragment = spy(new TestToggleDaltonizerPreferenceFragment(mContext));
- when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
- when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
- when(mFragment.getContext()).thenReturn(mContext);
- when(mFragment.getActivity()).thenReturn(mActivity);
- when(mActivity.getContentResolver()).thenReturn(mContext.getContentResolver());
-
- mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));
- when(mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE))
- .thenReturn(mFragment.mToggleServiceSwitchPreference);
- when(mScreen.findPreference(KEY_DEUTERANOMALY)).thenReturn(mMockDeuteranomalyPref);
- when(mMockDeuteranomalyPref.getKey()).thenReturn(KEY_DEUTERANOMALY);
- when(mScreen.findPreference(KEY_PROTANOMALY)).thenReturn(mMockProtanomalyPref);
- when(mMockProtanomalyPref.getKey()).thenReturn(KEY_PROTANOMALY);
- when(mScreen.findPreference(KEY_TRITANOMEALY)).thenReturn(mMockTritanomalyPref);
- when(mMockTritanomalyPref.getKey()).thenReturn(KEY_TRITANOMEALY);
- when(mScreen.findPreference(KEY_GRAYSCALE)).thenReturn(mMockGrayscalePref);
- when(mMockGrayscalePref.getKey()).thenReturn(KEY_GRAYSCALE);
- when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
- doReturn(mScreen).when(mFragment).getPreferenceScreen();
-
- mSwitchPreference = mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE);
+ mActivityController = ActivityController.of(new SettingsActivity(), intent);
}
@Test
public void onResume_colorCorrectEnabled_shouldReturnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, ON);
- mFragment.onAttach(mContext);
- mFragment.onCreate(Bundle.EMPTY);
- mFragment.onResume();
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
- assertThat(mSwitchPreference.isChecked()).isTrue();
+ SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
+ assertThat(switchPreference.isChecked()).isTrue();
}
@Test
public void onResume_colorCorrectDisabled_shouldReturnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
- mFragment.onAttach(mContext);
- mFragment.onCreate(Bundle.EMPTY);
- mFragment.onResume();
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
- assertThat(mSwitchPreference.isChecked()).isFalse();
+ SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
+ assertThat(switchPreference.isChecked()).isFalse();
}
@Test
public void onResume_colorCorrectEnabled_switchPreferenceChecked_notShowTooltips() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, ON);
- mSwitchPreference.setChecked(true);
- mFragment.onAttach(mContext);
- mFragment.onCreate(Bundle.EMPTY);
- mFragment.onResume();
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+ SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
+ assertThat(switchPreference.isChecked()).isTrue();
assertThat(getLatestPopupWindow()).isNull();
}
@@ -164,12 +108,10 @@
public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF);
- mSwitchPreference.setChecked(false);
- mFragment.onAttach(mContext);
- mFragment.onCreateView(LayoutInflater.from(mContext), mock(ViewGroup.class), Bundle.EMPTY);
- mFragment.onViewCreated(mFragment.getView(), Bundle.EMPTY);
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+ SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
- mFragment.onPreferenceToggled(mSwitchPreference.getKey(), true);
+ fragment.onPreferenceToggled(switchPreference.getKey(), true);
final boolean isEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF) == ON;
@@ -182,11 +124,10 @@
public void onPreferenceToggled_colorCorrectEnabled_shouldReturnFalseAndNotShowTooltipView() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, ON);
- mSwitchPreference.setChecked(true);
- mFragment.onAttach(mContext);
- mFragment.onCreate(Bundle.EMPTY);
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+ SettingsMainSwitchPreference switchPreference = getMainFeatureToggle(fragment);
- mFragment.onPreferenceToggled(mSwitchPreference.getKey(), false);
+ fragment.onPreferenceToggled(switchPreference.getKey(), false);
final boolean isEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, OFF) == ON;
@@ -196,19 +137,25 @@
@Test
public void getMetricsCategory_returnsCorrectCategory() {
- assertThat(mFragment.getMetricsCategory()).isEqualTo(
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+
+ assertThat(fragment.getMetricsCategory()).isEqualTo(
SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER);
}
@Test
public void getPreferenceScreenResId_returnsCorrectXml() {
- assertThat(mFragment.getPreferenceScreenResId()).isEqualTo(
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+
+ assertThat(fragment.getPreferenceScreenResId()).isEqualTo(
R.xml.accessibility_daltonizer_settings);
}
@Test
public void getHelpResource_returnsCorrectHelpResource() {
- assertThat(mFragment.getHelpResource()).isEqualTo(R.string.help_url_color_correction);
+ ToggleDaltonizerPreferenceFragment fragment = getFragmentInResumedState();
+
+ assertThat(fragment.getHelpResource()).isEqualTo(R.string.help_url_color_correction);
}
@Test
@@ -228,55 +175,20 @@
return shadowApplication.getLatestPopupWindow();
}
- private static class TestToggleDaltonizerPreferenceFragment extends
- ToggleDaltonizerPreferenceFragment {
- private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
- private static final String PLACEHOLDER_CLASS_NAME =
- PLACEHOLDER_PACKAGE_NAME + ".placeholder";
- private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
- PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
- private static final String PLACEHOLDER_TILE_TOOLTIP_CONTENT =
- PLACEHOLDER_PACKAGE_NAME + "tooltip_content";
+ private ToggleDaltonizerPreferenceFragment getFragmentInResumedState() {
- TestToggleDaltonizerPreferenceFragment(Context context) {
- super();
- mComponentName = PLACEHOLDER_COMPONENT_NAME;
- final SettingsMainSwitchPreference switchPreference =
- new SettingsMainSwitchPreference(context);
- switchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
- mToggleServiceSwitchPreference = switchPreference;
- setArguments(new Bundle());
- }
+ mActivityController.create().start().resume();
+ Fragment fragment = mActivityController.get().getSupportFragmentManager().findFragmentById(
+ R.id.main_content);
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- // do nothing
- }
+ assertThat(fragment).isNotNull();
+ assertThat(fragment).isInstanceOf(ToggleDaltonizerPreferenceFragment.class);
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- return mock(View.class);
- }
+ return (ToggleDaltonizerPreferenceFragment) fragment;
+ }
- @Override
- protected void updateShortcutPreference() {
- // UI related function, do nothing in tests
- }
-
- @Override
- ComponentName getTileComponentName() {
- return PLACEHOLDER_COMPONENT_NAME;
- }
-
- @Override
- protected CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {
- return PLACEHOLDER_TILE_TOOLTIP_CONTENT;
- }
-
- @Override
- public View getView() {
- return mock(View.class);
- }
+ private SettingsMainSwitchPreference getMainFeatureToggle(
+ ToggleDaltonizerPreferenceFragment fragment) {
+ return fragment.findPreference(KEY_USE_SERVICE_PREFERENCE);
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index af94723..71855e0 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,7 +16,9 @@
package com.android.settings.accessibility;
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
+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.google.common.truth.Truth.assertThat;
@@ -32,7 +34,6 @@
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.icu.text.CaseMap;
@@ -44,10 +45,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.CheckBox;
import android.widget.PopupWindow;
-import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
@@ -55,9 +54,7 @@
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
-import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.widget.TopIntroPreference;
@@ -76,7 +73,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowLooper;
import java.util.Locale;
@@ -204,7 +200,7 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.mComponentName.flattenToString());
// Compare to default UserShortcutType
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(SOFTWARE);
}
@Test
@@ -219,104 +215,21 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.mComponentName.flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ assertThat(expectedType).isEqualTo(SOFTWARE | HARDWARE);
}
@Test
public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
final PreferredShortcut hardwareShortcut = new PreferredShortcut(
- PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+ PLACEHOLDER_COMPONENT_NAME.flattenToString(), HARDWARE);
putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
mFragment.updateShortcutPreferenceData();
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
mFragment.mComponentName.flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE);
- }
-
- @Test
- public void dialogCheckboxClicked_hardwareType_skipTimeoutRestriction() {
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
- mFragment.mShortcutPreference = shortcutPreference;
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE,
- mFragment::callOnAlertDialogCheckboxClicked);
- mFragment.setupEditShortcutDialog(dialog);
-
- final View dialogHardwareView = dialog.findViewById(R.id.hardware_shortcut);
- final CheckBox hardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
- hardwareTypeCheckBox.setChecked(true);
- dialog.getButton(DialogInterface.BUTTON_POSITIVE).callOnClick();
- ShadowLooper.idleMainLooper();
- final boolean skipTimeoutRestriction = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.SKIP_ACCESSIBILITY_SHORTCUT_DIALOG_TIMEOUT_RESTRICTION, 0) != 0;
-
- assertThat(skipTimeoutRestriction).isTrue();
- }
-
- @Test
- public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
- mFragment.mShortcutPreference = shortcutPreference;
-
- mFragment.mShortcutPreference.setChecked(false);
- mFragment.setupEditShortcutDialog(dialog);
-
- final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
- }
-
- @Test
- public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- final PreferredShortcut hardwareShortcut = new PreferredShortcut(
- PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
- mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
- mFragment.mShortcutPreference = shortcutPreference;
-
- PreferredShortcuts.saveUserShortcutType(mContext, hardwareShortcut);
- mFragment.mShortcutPreference.setChecked(true);
- mFragment.setupEditShortcutDialog(dialog);
-
- final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.HARDWARE);
- }
-
- @Test
- @Config(shadows = ShadowFragment.class)
- public void restoreValueFromSavedInstanceState_assignShortcutTypeToVariable() {
- final AlertDialog dialog = AccessibilityDialogUtils.showEditShortcutDialog(
- mContext, DialogType.EDIT_SHORTCUT_GENERIC, PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- final Bundle savedInstanceState = new Bundle();
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
- mFragment.mShortcutPreference = shortcutPreference;
-
- savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
- mFragment.onCreate(savedInstanceState);
- mFragment.setupEditShortcutDialog(dialog);
- final int value = mFragment.getShortcutTypeCheckBoxValue();
- mFragment.saveNonEmptyUserShortcutType(value);
-
- final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
- mFragment.mComponentName.flattenToString());
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+ assertThat(expectedType).isEqualTo(HARDWARE);
}
@Test
@@ -470,7 +383,7 @@
public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
PLACEHOLDER_COMPONENT_NAME.flattenToString(),
- UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+ HARDWARE | QUICK_SETTINGS);
putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
final ShortcutPreference shortcutPreference =
new ShortcutPreference(mContext, /* attrs= */ null);
@@ -502,9 +415,6 @@
PreferredShortcut shortcut) {
PreferredShortcuts.saveUserShortcutType(context, shortcut);
}
-
- private void callEmptyOnClicked(DialogInterface dialog, int which) {}
-
private static PopupWindow getLatestPopupWindow() {
final ShadowApplication shadowApplication =
Shadow.extract(ApplicationProvider.getApplicationContext());
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index ab2e9d1..22bb266 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -16,14 +16,18 @@
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.internal.accessibility.common.ShortcutConstants.UserShortcutType.TRIPLETAP;
+import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.TWOFINGER_DOUBLETAP;
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import static com.android.settings.accessibility.MagnificationCapabilities.MagnificationMode;
-import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -36,7 +40,6 @@
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.database.ContentObserver;
@@ -51,7 +54,6 @@
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
-import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import androidx.test.core.app.ApplicationProvider;
@@ -60,7 +62,6 @@
import com.android.settings.DialogCreatable;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
-import com.android.settings.accessibility.AccessibilityDialogUtils.DialogType;
import com.android.settings.testutils.AccessibilityTestUtils;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -394,11 +395,45 @@
}
@Test
+ @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
+ public void onResume_oneFingerPanningFlagOn_registerToSpecificUri() {
+ ShadowContentResolver shadowContentResolver = Shadows.shadowOf(
+ mContext.getContentResolver());
+ Uri observedUri = Settings.Secure.getUriFor(
+ Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED);
+ // verify no one finger panning settings observer registered before launching the fragment
+ assertThat(shadowContentResolver.getContentObservers(observedUri)).isEmpty();
+
+ mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
+
+ Collection<ContentObserver> observers =
+ shadowContentResolver.getContentObservers(observedUri);
+ assertThat(observers.size()).isEqualTo(1);
+ assertThat(observers.stream().findFirst().get()).isInstanceOf(
+ AccessibilitySettingsContentObserver.class);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
+ public void onResume_oneFingerPanningFlagOff_notRegisterToSpecificUri() {
+ ShadowContentResolver shadowContentResolver = Shadows.shadowOf(
+ mContext.getContentResolver());
+ Uri observedUri = Settings.Secure.getUriFor(
+ Settings.Secure.ACCESSIBILITY_SINGLE_FINGER_PANNING_ENABLED);
+ // verify no one finger panning settings observer registered before launching the fragment
+ assertThat(shadowContentResolver.getContentObservers(observedUri)).isEmpty();
+
+ mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
+ // verify no one finger panning settings observer registered after launching the fragment
+ assertThat(shadowContentResolver.getContentObservers(observedUri)).isEmpty();
+ }
+
+ @Test
public void hasValueInSettings_putValue_hasValue() {
setMagnificationTripleTapEnabled(/* enabled= */ true);
assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
- mContext, UserShortcutType.TRIPLETAP)).isTrue();
+ mContext, TRIPLETAP)).isTrue();
}
@Test
@@ -408,7 +443,7 @@
mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
- mContext, UserShortcutType.TWOFINGER_DOUBLETAP)).isTrue();
+ mContext, TWOFINGER_DOUBLETAP)).isTrue();
}
@Test
@@ -418,13 +453,13 @@
mContext.getContentResolver(), TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, OFF);
assertThat(ToggleScreenMagnificationPreferenceFragment.hasMagnificationValuesInSettings(
- mContext, UserShortcutType.TWOFINGER_DOUBLETAP)).isFalse();
+ mContext, TWOFINGER_DOUBLETAP)).isFalse();
}
@Test
@DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void optInAllValuesToSettings_optInValue_haveMatchString() {
- int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP;
+ int shortcutTypes = SOFTWARE | TRIPLETAP;
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
shortcutTypes);
@@ -438,24 +473,24 @@
@EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void optInAllValuesToSettings_optInValue_callA11yManager() {
int shortcutTypes =
- UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP | UserShortcutType.HARDWARE
- | UserShortcutType.QUICK_SETTINGS;
+ SOFTWARE | TRIPLETAP | HARDWARE
+ | QUICK_SETTINGS;
Set<String> shortcutTargets = Set.of(MAGNIFICATION_CONTROLLER_NAME);
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
shortcutTypes);
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ true, UserShortcutType.SOFTWARE,
+ /* enable= */ true, SOFTWARE,
shortcutTargets, UserHandle.myUserId());
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ true, UserShortcutType.HARDWARE,
+ /* enable= */ true, HARDWARE,
shortcutTargets, UserHandle.myUserId());
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ true, UserShortcutType.QUICK_SETTINGS,
+ /* enable= */ true, QUICK_SETTINGS,
shortcutTargets, UserHandle.myUserId());
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ true, UserShortcutType.TRIPLETAP,
+ /* enable= */ true, TRIPLETAP,
shortcutTargets, UserHandle.myUserId());
verifyNoMoreInteractions(mAccessibilityManager);
}
@@ -464,7 +499,7 @@
@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 = UserShortcutType.TWOFINGER_DOUBLETAP;
+ int shortcutTypes = TWOFINGER_DOUBLETAP;
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
shortcutTypes);
@@ -479,7 +514,7 @@
putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
- UserShortcutType.SOFTWARE);
+ SOFTWARE);
assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
@@ -491,7 +526,7 @@
ShadowSettings.ShadowSecure.reset();
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
- UserShortcutType.SOFTWARE);
+ SOFTWARE);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
@@ -508,7 +543,7 @@
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(
mContext,
- UserShortcutType.SOFTWARE);
+ SOFTWARE);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
@@ -527,7 +562,7 @@
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(
mContext,
- UserShortcutType.HARDWARE);
+ HARDWARE);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, size + 1)).isEqualTo(
@@ -545,7 +580,7 @@
ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(
mContext,
- UserShortcutType.TRIPLETAP);
+ TRIPLETAP);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, size + 1)).isEqualTo(
@@ -560,7 +595,7 @@
putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
setMagnificationTripleTapEnabled(/* enabled= */ true);
int shortcutTypes =
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+ SOFTWARE | HARDWARE | TRIPLETAP;
ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
mContext, shortcutTypes);
@@ -578,19 +613,19 @@
putStringIntoSettings(HARDWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
setMagnificationTripleTapEnabled(/* enabled= */ true);
int shortcutTypes =
- UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP;
+ SOFTWARE | HARDWARE | TRIPLETAP;
ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
mContext, shortcutTypes);
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ false, UserShortcutType.SOFTWARE,
+ /* enable= */ false, SOFTWARE,
shortcutTargets, UserHandle.myUserId());
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ false, UserShortcutType.HARDWARE,
+ /* enable= */ false, HARDWARE,
shortcutTargets, UserHandle.myUserId());
verify(mAccessibilityManager).enableShortcutsForTargets(
- /* enable= */ false, UserShortcutType.TRIPLETAP,
+ /* enable= */ false, TRIPLETAP,
shortcutTargets, UserHandle.myUserId());
verifyNoMoreInteractions(mAccessibilityManager);
}
@@ -603,7 +638,7 @@
TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON);
ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
- mContext, UserShortcutType.TWOFINGER_DOUBLETAP);
+ mContext, TWOFINGER_DOUBLETAP);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
TWO_FINGER_TRIPLE_TAP_SHORTCUT_KEY, ON)).isEqualTo(OFF);
@@ -616,7 +651,7 @@
PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
putStringIntoSettings(HARDWARE_SHORTCUT_KEY,
PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
- int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
+ int shortcutTypes = SOFTWARE | HARDWARE;
ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
mContext, shortcutTypes);
@@ -636,7 +671,7 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
MAGNIFICATION_CONTROLLER_NAME);
// Compare to default UserShortcutType
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
+ assertThat(expectedType).isEqualTo(SOFTWARE);
}
@Test
@@ -649,13 +684,13 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
MAGNIFICATION_CONTROLLER_NAME);
- assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
+ assertThat(expectedType).isEqualTo(SOFTWARE | TRIPLETAP);
}
@Test
public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
final PreferredShortcut tripleTapShortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+ MAGNIFICATION_CONTROLLER_NAME, TRIPLETAP);
putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
@@ -663,7 +698,7 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
MAGNIFICATION_CONTROLLER_NAME);
- assertThat(expectedType).isEqualTo(UserShortcutType.TRIPLETAP);
+ assertThat(expectedType).isEqualTo(TRIPLETAP);
}
@Test
@@ -677,14 +712,14 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
MAGNIFICATION_CONTROLLER_NAME);
- assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
+ assertThat(expectedType).isEqualTo(TWOFINGER_DOUBLETAP);
}
@Test
@EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
public void updateShortcutPreferenceData_hasTwoFingerTripleTapInSharedPref_assignToVariable() {
final PreferredShortcut tripleTapShortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGER_DOUBLETAP);
+ MAGNIFICATION_CONTROLLER_NAME, TWOFINGER_DOUBLETAP);
putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
mFragController.create(R.id.main_content, /* bundle= */ null).start().resume();
@@ -692,106 +727,7 @@
final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
MAGNIFICATION_CONTROLLER_NAME);
- assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
- }
-
- @Test
- public void setupMagnificationEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
- ToggleScreenMagnificationPreferenceFragment fragment =
- mFragController.create(R.id.main_content, /* bundle= */
- null).start().resume().get();
- fragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
-
- fragment.mShortcutPreference.setChecked(false);
- fragment.setupMagnificationEditShortcutDialog(
- createEditShortcutDialog(fragment.getActivity()));
-
- final int checkboxValue = fragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
- }
-
- @Test
- public void setupMagnificationEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
- ToggleScreenMagnificationPreferenceFragment fragment =
- mFragController.create(R.id.main_content, /* bundle= */
- null).start().resume().get();
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- final PreferredShortcut tripletapShortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
- fragment.mShortcutPreference = shortcutPreference;
-
- PreferredShortcuts.saveUserShortcutType(mContext, tripletapShortcut);
- fragment.mShortcutPreference.setChecked(true);
- fragment.setupMagnificationEditShortcutDialog(
- createEditShortcutDialog(fragment.getActivity()));
-
- final int checkboxValue = fragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.TRIPLETAP);
- }
-
- @Test
- @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
- public void setupMagnificationEditShortcutDialog_twoFingerTripleTapOn_checkboxIsSavedValue() {
- ToggleScreenMagnificationPreferenceFragment fragment =
- mFragController.create(R.id.main_content, /* bundle= */
- null).start().resume().get();
- final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
- null);
- final PreferredShortcut twoFingerTripleTapShortcut = new PreferredShortcut(
- MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TWOFINGER_DOUBLETAP);
- fragment.mShortcutPreference = shortcutPreference;
-
- PreferredShortcuts.saveUserShortcutType(mContext, twoFingerTripleTapShortcut);
- fragment.mShortcutPreference.setChecked(true);
- fragment.setupMagnificationEditShortcutDialog(
- createEditShortcutDialog(fragment.getActivity()));
-
- final int checkboxValue = fragment.getShortcutTypeCheckBoxValue();
- assertThat(checkboxValue).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
- }
-
- @Test
- public void restoreValueFromSavedInstanceState_assignToVariable() {
- final Bundle fragmentState = createFragmentSavedInstanceState(
- UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
- ToggleScreenMagnificationPreferenceFragment fragment = mFragController.get();
- // Had to use reflection to pass the savedInstanceState when launching the fragment
- ReflectionHelpers.setField(fragment, "mSavedFragmentState", fragmentState);
-
- FragmentController.of(fragment, SettingsActivity.class).create(
- R.id.main_content, /* bundle= */ null).start().resume().get();
- fragment.setupMagnificationEditShortcutDialog(
- createEditShortcutDialog(fragment.getActivity()));
- final int value = fragment.getShortcutTypeCheckBoxValue();
- fragment.saveNonEmptyUserShortcutType(value);
-
- final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
- MAGNIFICATION_CONTROLLER_NAME);
- assertThat(value).isEqualTo(6);
- assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
- }
-
- @Test
- @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)
- public void restoreValueFromSavedInstanceState_twoFingerTripleTap_assignToVariable() {
- final Bundle fragmentState =
- createFragmentSavedInstanceState(UserShortcutType.TWOFINGER_DOUBLETAP);
- ToggleScreenMagnificationPreferenceFragment fragment = mFragController.get();
- // Had to use reflection to pass the savedInstanceState when launching the fragment
- ReflectionHelpers.setField(fragment, "mSavedFragmentState", fragmentState);
-
- FragmentController.of(fragment, SettingsActivity.class).create(
- R.id.main_content, /* bundle= */ null).start().resume().get();
- fragment.setupMagnificationEditShortcutDialog(
- createEditShortcutDialog(fragment.getActivity()));
- final int value = fragment.getShortcutTypeCheckBoxValue();
- fragment.saveNonEmptyUserShortcutType(value);
-
- final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
- MAGNIFICATION_CONTROLLER_NAME);
- assertThat(value).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
- assertThat(expectedType).isEqualTo(UserShortcutType.TWOFINGER_DOUBLETAP);
+ assertThat(expectedType).isEqualTo(TWOFINGER_DOUBLETAP);
}
@Test
@@ -934,7 +870,9 @@
}
@Test
- public void onProcessArguments_defaultArgumentUnavailable_shouldSetDefaultArguments() {
+ @DisableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
+ public void
+ onProcessArguments_defaultArgumentUnavailableAndFlagOff_shouldSetDefaultArguments() {
ToggleScreenMagnificationPreferenceFragment fragment =
mFragController.create(
R.id.main_content, /* bundle= */ null).start().resume().get();
@@ -948,13 +886,41 @@
}
@Test
+ @EnableFlags(Flags.FLAG_ENABLE_MAGNIFICATION_ONE_FINGER_PANNING_GESTURE)
+ public void
+ onProcessArguments_defaultArgumentUnavailableAndFlagOn_shouldSetDefaultArguments() {
+ ToggleScreenMagnificationPreferenceFragment fragment =
+ mFragController.create(
+ R.id.main_content, /* bundle= */ null).start().resume().get();
+ Bundle arguments = new Bundle();
+
+ fragment.onProcessArguments(arguments);
+
+ assertTrue(arguments.containsKey(AccessibilitySettings.EXTRA_PREFERENCE_KEY));
+ assertTrue(arguments.containsKey(AccessibilitySettings.EXTRA_INTRO));
+ // If OneFingerPanning flag is on, the EXTRA_HTML_DESCRIPTION should not be set. The html
+ // description would be decided dynamically based on the OneFingerPanning preference state.
+ assertFalse(arguments.containsKey(AccessibilitySettings.EXTRA_HTML_DESCRIPTION));
+ }
+
+ @Test
+ public void getCurrentHtmlDescription_shouldNotBeEmpty() {
+ ToggleScreenMagnificationPreferenceFragment fragment =
+ mFragController.create(
+ R.id.main_content, /* bundle= */ null).start().resume().get();
+ assertThat(fragment.getCurrentHtmlDescription().toString()).isNotEmpty();
+ }
+
+ @Test
public void getSummary_magnificationEnabled_returnShortcutOnWithSummary() {
setMagnificationTripleTapEnabled(true);
assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string
+ .preference_summary_default_combination,
mContext.getText(R.string.accessibility_summary_shortcut_enabled),
mContext.getText(R.string.magnification_feature_summary)));
}
@@ -966,7 +932,9 @@
assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string
+ .preference_summary_default_combination,
mContext.getText(
R.string.generic_accessibility_feature_shortcut_off),
mContext.getText(R.string.magnification_feature_summary)));
@@ -981,7 +949,9 @@
assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string
+ .preference_summary_default_combination,
mContext.getText(R.string.accessibility_summary_shortcut_enabled),
mContext.getText(R.string.magnification_feature_summary)));
}
@@ -995,7 +965,9 @@
assertThat(
ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString())
.isEqualTo(
- mContext.getString(R.string.preference_summary_default_combination,
+ mContext.getString(
+ com.android.settingslib.R.string
+ .preference_summary_default_combination,
mContext.getText(
R.string.generic_accessibility_feature_shortcut_off),
mContext.getText(R.string.magnification_feature_summary)));
@@ -1006,7 +978,7 @@
public void getShortcutTypeSummary_shortcutSummaryIsCorrectlySet() {
final PreferredShortcut userPreferredShortcut = new PreferredShortcut(
MAGNIFICATION_CONTROLLER_NAME,
- UserShortcutType.HARDWARE | UserShortcutType.QUICK_SETTINGS);
+ HARDWARE | QUICK_SETTINGS);
putUserShortcutTypeIntoSharedPreference(mContext, userPreferredShortcut);
final ShortcutPreference shortcutPreference =
new ShortcutPreference(mContext, /* attrs= */ null);
@@ -1091,9 +1063,6 @@
== ON;
}
- private void callEmptyOnClicked(DialogInterface dialog, int which) {
- }
-
private void setWindowMagnificationSupported(boolean magnificationAreaSupported,
boolean windowMagnificationSupported) {
when(mSpyResources.getBoolean(
@@ -1103,24 +1072,6 @@
windowMagnificationSupported);
}
- private AlertDialog createEditShortcutDialog(Context context) {
- context.setTheme(androidx.appcompat.R.style.Theme_AppCompat);
- return AccessibilityDialogUtils.showEditShortcutDialog(
- context,
- DialogType.EDIT_SHORTCUT_MAGNIFICATION, PLACEHOLDER_DIALOG_TITLE,
- this::callEmptyOnClicked);
- }
-
- private Bundle createFragmentSavedInstanceState(int userShortcutType) {
- final Bundle savedInstanceState = new Bundle();
- savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, userShortcutType);
- final Bundle fragmentState = new Bundle();
- fragmentState.putBundle(
- /* FragmentStateManager.SAVED_INSTANCE_STATE_KEY */ "savedInstanceState",
- savedInstanceState);
- return fragmentState;
- }
-
/**
* A test fragment that provides a way to change the context
*/
diff --git a/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
index 954c72d..17d416f 100644
--- a/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/shortcuts/ShortcutOptionPreferenceTest.java
@@ -62,7 +62,7 @@
@Test
public void bindViewHolder_imageResIdSet_shouldShowImageView() {
mShortcutOptionPreference.setIntroImageResId(
- R.drawable.accessibility_shortcut_type_hardware);
+ R.drawable.accessibility_shortcut_type_volume_keys);
mShortcutOptionPreference.onBindViewHolder(mViewHolder);
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 a0ef57f..4f8860e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java
@@ -24,19 +24,26 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
+import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.Flags;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.util.AndroidRuntimeException;
import android.view.LayoutInflater;
import android.view.View;
@@ -55,6 +62,7 @@
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowSettingsPreferenceFragment;
@@ -90,6 +98,8 @@
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Captor
private ArgumentCaptor<Preference> mPreferenceCaptor;
@Mock
@@ -102,6 +112,8 @@
private FaceStatusPreferenceController mFaceStatusPreferenceController;
@Mock
private FaceManager mFaceManager;
+ @Mock
+ private BiometricManager mBiometricManager;
@Before
public void setUp() {
@@ -114,6 +126,10 @@
mContext = spy(ApplicationProvider.getApplicationContext());
mFragment = spy(new TestCombinedBiometricProfileSettings(mContext));
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_HW_UNAVAILABLE);
ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider",
FakeFeatureFactory.setupForTest().dashboardFeatureProvider);
@@ -161,6 +177,26 @@
}
@Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testLaunchBiometricPrompt_onCreateFragment() {
+ ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ doNothing().when(mFragment).startActivityForResult(any(), anyInt());
+ when(mBiometricManager.canAuthenticate(anyInt(),
+ eq(BiometricManager.Authenticators.MANDATORY_BIOMETRICS)))
+ .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
+
+ mFragment.onAttach(mContext);
+ mFragment.onCreate(null);
+
+ verify(mFragment).startActivityForResult(intentArgumentCaptor.capture(),
+ eq(BiometricsSettingsBase.BIOMETRIC_AUTH_REQUEST));
+
+ Intent intent = intentArgumentCaptor.getValue();
+ assertThat(intent.getComponent().getClassName()).isEqualTo(
+ ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
+ }
+
+ @Test
public void testClickFingerprintUnlockWithValidGkPwHandle() {
doAnswer(invocation -> {
final FingerprintManager.GenerateChallengeCallback callback =
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 6407f64..29b2961 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSettingsFragmentTest.java
@@ -17,9 +17,9 @@
package com.android.settings.biometrics.fingerprint;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR;
import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
+import static com.android.settings.biometrics.BiometricEnrollBase.BIOMETRIC_AUTH_REQUEST;
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.CHOOSE_LOCK_GENERIC_REQUEST;
import static com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.KEY_REQUIRE_SCREEN_ON_TO_AUTH;
@@ -34,14 +34,16 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
+import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.ComponentInfoInternal;
+import android.hardware.biometrics.Flags;
import android.hardware.biometrics.SensorProperties;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
@@ -49,7 +51,10 @@
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
import android.os.CancellationSignal;
+import android.os.Looper;
import android.os.UserHandle;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.ViewGroup;
@@ -57,9 +62,11 @@
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmDeviceCredentialActivity;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
@@ -90,6 +97,11 @@
@Config(shadows = {ShadowSettingsPreferenceFragment.class, ShadowUtils.class, ShadowFragment.class,
ShadowUserManager.class, ShadowLockPatternUtils.class})
public class FingerprintSettingsFragmentTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ @Rule
+ public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+
private static final int PRIMARY_USER_ID = 0;
private static final int GUEST_USER_ID = 10;
@@ -97,12 +109,12 @@
private Context mContext;
private FragmentActivity mActivity;
- @Rule
- public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
private FingerprintManager mFingerprintManager;
@Mock
private FragmentTransaction mFragmentTransaction;
+ @Mock
+ private BiometricManager mBiometricManager;
@Captor
private ArgumentCaptor<CancellationSignal> mCancellationSignalArgumentCaptor =
@@ -113,6 +125,7 @@
FingerprintManager.AuthenticationCallback.class);
private FingerprintAuthenticateSidecar mFingerprintAuthenticateSidecar;
+ private FingerprintRemoveSidecar mFingerprintRemoveSidecar;
@Before
public void setUp() {
@@ -122,8 +135,11 @@
mContext = spy(ApplicationProvider.getApplicationContext());
mFragment = spy(new FingerprintSettingsFragment());
doReturn(mContext).when(mFragment).getContext();
-
+ doReturn(mBiometricManager).when(mContext).getSystemService(BiometricManager.class);
doReturn(true).when(mFingerprintManager).isHardwareDetected();
+ when(mBiometricManager.canAuthenticate(
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+ .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE);
}
@After
@@ -144,6 +160,25 @@
false)).isTrue();
}
+ @Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void testLaunchBiometricPromptForFingerprint() {
+ when(mBiometricManager.canAuthenticate(
+ BiometricManager.Authenticators.MANDATORY_BIOMETRICS))
+ .thenReturn(BiometricManager.BIOMETRIC_SUCCESS);
+
+ setUpFragment(false);
+ ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(
+ Intent.class);
+
+ verify(mFragment).startActivityForResult(intentArgumentCaptor.capture(),
+ eq(BIOMETRIC_AUTH_REQUEST));
+
+ Intent intent = intentArgumentCaptor.getValue();
+ assertThat(intent.getComponent().getClassName()).isEqualTo(
+ ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
+ }
+
// Test the case when FingerprintAuthenticateSidecar receives an error callback from the
// framework or from another authentication client. The cancellation signal should not be set
// to null because there may exist a running authentication client.
@@ -152,6 +187,7 @@
public void testCancellationSignalLifeCycle() {
setUpFragment(false);
+ mFingerprintAuthenticateSidecar.setFingerprintManager(mFingerprintManager);
doNothing().when(mFingerprintManager).authenticate(any(),
mCancellationSignalArgumentCaptor.capture(),
@@ -186,7 +222,7 @@
1,
UserHandle.of(GUEST_USER_ID).getIdentifier());
- setUpFragment(false, GUEST_USER_ID, TYPE_POWER_BUTTON);
+ setUpFragment(false, GUEST_USER_ID, TYPE_POWER_BUTTON, 1);
final RestrictedSwitchPreference requireScreenOnToAuthPreference = mFragment.findPreference(
KEY_REQUIRE_SCREEN_ON_TO_AUTH);
@@ -194,11 +230,15 @@
}
private void setUpFragment(boolean showChooseLock) {
- setUpFragment(showChooseLock, PRIMARY_USER_ID, TYPE_UDFPS_OPTICAL);
+ setUpFragment(showChooseLock, PRIMARY_USER_ID, TYPE_UDFPS_OPTICAL, 1);
+ }
+
+ private void setUpFragment(boolean showChooseLock, int maxFingerprints) {
+ setUpFragment(showChooseLock, PRIMARY_USER_ID, TYPE_UDFPS_OPTICAL, maxFingerprints);
}
private void setUpFragment(boolean showChooseLock, int userId,
- @FingerprintSensorProperties.SensorType int sensorType) {
+ @FingerprintSensorProperties.SensorType int sensorType, int maxFingerprints) {
ShadowUserManager.getShadow().addProfile(new UserInfo(userId, "", 0));
Intent intent = new Intent();
@@ -217,13 +257,16 @@
doReturn(fragmentManager).when(mActivity).getSupportFragmentManager();
mFingerprintAuthenticateSidecar = new FingerprintAuthenticateSidecar();
- mFingerprintAuthenticateSidecar.setFingerprintManager(mFingerprintManager);
doReturn(mFingerprintAuthenticateSidecar).when(fragmentManager).findFragmentByTag(
"authenticate_sidecar");
+ mFingerprintRemoveSidecar = new FingerprintRemoveSidecar();
+ doReturn(mFingerprintRemoveSidecar).when(fragmentManager).findFragmentByTag(
+ "removal_sidecar");
+
doNothing().when(mFragment).startActivityForResult(any(Intent.class), anyInt());
- setSensor(sensorType);
+ setSensor(sensorType, maxFingerprints);
// Start fragment
mFragment.onAttach(mContext);
@@ -240,38 +283,41 @@
assertThat(mFragment.isVisible()).isTrue();
}
- private void setSensor(@FingerprintSensorProperties.SensorType int sensorType) {
+ @Ignore("b/353726774")
+ @Test
+ public void testAddButtonWorksAfterRemovalError() {
+ final Fingerprint fingerprint = new Fingerprint("Test", 0, 0);
+ doReturn(List.of(fingerprint)).when(mFingerprintManager).getEnrolledFingerprints(anyInt());
+ setUpFragment(false, 5);
+ shadowOf(Looper.getMainLooper()).idle();
+ final Preference addPref = mFragment.findPreference("key_fingerprint_add");
+ final FingerprintSettings.FingerprintPreference fpPref =
+ mFragment.findPreference("key_fingerprint_item_0");
+ assertThat(fpPref).isNotNull();
+ assertThat(addPref).isNotNull();
+ assertThat(addPref.isEnabled()).isTrue();
+
+ mFingerprintRemoveSidecar.setListener(mFragment.mRemovalListener);
+ mFragment.deleteFingerPrint(fingerprint);
+ verify(mFingerprintManager).remove(any(), anyInt(), any());
+ assertThat(addPref.isEnabled()).isFalse();
+
+ mFingerprintRemoveSidecar.mRemoveCallback.onRemovalError(fingerprint, 0, "failure");
+
+ shadowOf(Looper.getMainLooper()).idle();
+ assertThat(addPref.isEnabled()).isTrue();
+ }
+
+ private void setSensor(@FingerprintSensorProperties.SensorType int sensorType,
+ int maxFingerprints) {
final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
props.add(new FingerprintSensorPropertiesInternal(
0 /* sensorId */,
SensorProperties.STRENGTH_STRONG,
- 1 /* maxEnrollmentsPerUser */,
+ maxFingerprints /* maxEnrollmentsPerUser */,
new ArrayList<ComponentInfoInternal>(),
sensorType,
true /* resetLockoutRequiresHardwareAuthToken */));
doReturn(props).when(mFingerprintManager).getSensorPropertiesInternal();
}
-
- @Test
- public void testAuthOnFragmentSetup() {
- doReturn(List.of(new Fingerprint("Finger 1", 1, 2, 3)))
- .when(mFingerprintManager).getEnrolledFingerprints(anyInt());
- setUpFragment(false, 1, TYPE_REAR);
-
- verify(mFingerprintManager).authenticate(any(), any(),
- any(), any(), anyInt());
- }
-
- @Test
- public void testErrorCancelledRestartsAuth() {
- doReturn(List.of(new Fingerprint("Finger 1", 1, 2, 3)))
- .when(mFingerprintManager).getEnrolledFingerprints(anyInt());
- setUpFragment(false, 1, TYPE_REAR);
-
- // When we receive a cancel, we should restart auth.
- mFragment.handleError(FingerprintManager.FINGERPRINT_ERROR_CANCELED, "blah");
-
- verify(mFingerprintManager, times(2)).authenticate(any(), any(),
- any(), any(), anyInt());
- }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index d24a83b..8d96f21 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -28,16 +28,20 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.DeviceConfig;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SettingsUIDeviceConfig;
+import com.android.settings.flags.Flags;
import com.android.settings.fuelgauge.BatteryMeterView;
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
@@ -48,12 +52,13 @@
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.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.HashSet;
@@ -62,6 +67,8 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {ShadowEntityHeaderController.class, ShadowDeviceConfig.class})
public class AdvancedBluetoothDetailsHeaderControllerTest {
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
private static final int BATTERY_LEVEL_MAIN = 30;
private static final int BATTERY_LEVEL_LEFT = 25;
private static final int BATTERY_LEVEL_RIGHT = 45;
@@ -93,7 +100,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = Robolectric.buildActivity(SettingsActivity.class).get();
mController = new AdvancedBluetoothDetailsHeaderController(mContext, "pref_Key");
when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice);
mController.init(mCachedDevice);
@@ -272,6 +279,7 @@
View.GONE);
assertThat(layout.findViewById(R.id.bt_battery_icon).getVisibility()).isEqualTo(View.GONE);
assertThat(layout.findViewById(R.id.header_icon).getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(layout.findViewById(R.id.battery_ring).getVisibility()).isEqualTo(View.GONE);
}
@Ignore
@@ -546,6 +554,10 @@
final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
assertThat(textView.getText().toString()).isEqualTo(
com.android.settings.Utils.formatPercentage(batteryLevel));
+ if (Flags.enableBluetoothDeviceDetailsPolish()) {
+ final ProgressBar bar = linearLayout.findViewById(R.id.battery_ring);
+ assertThat(bar.getProgress()).isEqualTo(batteryLevel);
+ }
}
private void assertBatteryIcon(LinearLayout linearLayout, int resId) {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsControllerTest.java
index cf80a87..7c865f3 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHearingAidsPresetsControllerTest.java
@@ -38,6 +38,7 @@
import androidx.preference.ListPreference;
import androidx.preference.PreferenceCategory;
+import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.HapClientProfile;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -215,11 +216,13 @@
assertThat(mController.getPreference()).isNotNull();
assertThat(mController.getPreference().isEnabled()).isFalse();
+ assertThat(String.valueOf(mController.getPreference().getSummary())).isEqualTo(
+ mContext.getString(R.string.bluetooth_hearing_aids_presets_empty_list_message));
}
@Test
public void refresh_validPresetInfo_preferenceEnabled() {
- BluetoothHapPresetInfo info = getTestPresetInfo();
+ BluetoothHapPresetInfo info = getTestPresetInfo(true);
when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info));
mController.refresh();
@@ -230,7 +233,7 @@
@Test
public void refresh_invalidActivePresetIndex_summaryIsNull() {
- BluetoothHapPresetInfo info = getTestPresetInfo();
+ BluetoothHapPresetInfo info = getTestPresetInfo(true);
when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info));
when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(PRESET_INDEX_UNAVAILABLE);
@@ -242,7 +245,7 @@
@Test
public void refresh_validActivePresetIndex_summaryIsNotNull() {
- BluetoothHapPresetInfo info = getTestPresetInfo();
+ BluetoothHapPresetInfo info = getTestPresetInfo(true);
when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info));
when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(TEST_PRESET_INDEX);
@@ -262,10 +265,30 @@
verify(mHapClientProfile).selectPreset(mDevice, TEST_PRESET_INDEX);
}
- private BluetoothHapPresetInfo getTestPresetInfo() {
+ @Test
+ public void loadAllPresetInfo_unavailablePreset_notAddedToEntries() {
+ BluetoothHapPresetInfo info = getTestPresetInfo(false);
+ when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info));
+
+ mController.refresh();
+
+ assertThat(mController.getPreference().getEntries().length).isEqualTo(0);
+ }
+
+ @Test
+ public void loadAllPresetInfo_availablePreset_addedToEntries() {
+ BluetoothHapPresetInfo info = getTestPresetInfo(true);
+ when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info));
+
+ mController.refresh();
+
+ assertThat(mController.getPreference().getEntries().length).isEqualTo(1);
+ }
+ private BluetoothHapPresetInfo getTestPresetInfo(boolean available) {
BluetoothHapPresetInfo info = mock(BluetoothHapPresetInfo.class);
when(info.getName()).thenReturn(TEST_PRESET_NAME);
when(info.getIndex()).thenReturn(TEST_PRESET_INDEX);
+ when(info.isAvailable()).thenReturn(available);
return info;
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 9b92234..2d1f4c0 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -90,6 +90,9 @@
@Mock
private CachedBluetoothDeviceManager mCachedBluetoothDeviceManager;
+ private @Mock A2dpProfile mA2dpProfile;
+ private @Mock LeAudioProfile mLeAudioProfile;
+
@Override
public void setUp() {
super.setUp();
@@ -103,11 +106,13 @@
mConnectableProfiles = new ArrayList<>();
when(mLocalManager.getProfileManager()).thenReturn(mProfileManager);
when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedBluetoothDeviceManager);
+ setUpMockProfiles();
when(mCachedBluetoothDeviceManager.getCachedDevicesCopy())
.thenReturn(ImmutableList.of(mCachedDevice));
- when(mCachedDevice.getConnectableProfiles()).thenAnswer(invocation ->
- new ArrayList<>(mConnectableProfiles)
- );
+ when(mCachedDevice.getConnectableProfiles())
+ .thenAnswer(invocation -> new ArrayList<>(mConnectableProfiles));
+ when(mCachedDevice.getProfiles())
+ .thenAnswer(invocation -> ImmutableList.of(mConnectableProfiles));
setupDevice(mDeviceConfig);
mController = new BluetoothDetailsProfilesController(mContext, mFragment, mLocalManager,
@@ -389,21 +394,36 @@
assertThat(mDevice.getMessageAccessPermission()).isEqualTo(BluetoothDevice.ACCESS_ALLOWED);
}
- private A2dpProfile addMockA2dpProfile(boolean preferred, boolean supportsHighQualityAudio,
- boolean highQualityAudioEnabled) {
- A2dpProfile profile = mock(A2dpProfile.class);
- when(mProfileManager.getProfileByName(eq(profile.toString()))).thenReturn(profile);
- when(profile.getNameResource(mDevice))
+ private void setUpMockProfiles() {
+ when(mA2dpProfile.toString()).thenReturn("A2DP");
+ when(mProfileManager.getProfileByName(eq(mA2dpProfile.toString())))
+ .thenReturn(mA2dpProfile);
+ when(mA2dpProfile.getNameResource(any()))
.thenReturn(com.android.settingslib.R.string.bluetooth_profile_a2dp);
- when(profile.getHighQualityAudioOptionLabel(mDevice)).thenReturn(
+ when(mA2dpProfile.getHighQualityAudioOptionLabel(any())).thenReturn(
mContext.getString(com.android.settingslib.R
.string.bluetooth_profile_a2dp_high_quality_unknown_codec));
- when(profile.supportsHighQualityAudio(mDevice)).thenReturn(supportsHighQualityAudio);
- when(profile.isHighQualityAudioEnabled(mDevice)).thenReturn(highQualityAudioEnabled);
- when(profile.isEnabled(mDevice)).thenReturn(preferred);
- when(profile.isProfileReady()).thenReturn(true);
- mConnectableProfiles.add(profile);
- return profile;
+ when(mA2dpProfile.isProfileReady()).thenReturn(true);
+ when(mProfileManager.getA2dpProfile()).thenReturn(mA2dpProfile);
+
+ when(mLeAudioProfile.toString()).thenReturn("LE_AUDIO");
+ when(mLeAudioProfile.getNameResource(any()))
+ .thenReturn(com.android.settingslib.R.string.bluetooth_profile_le_audio);
+ when(mLeAudioProfile.isProfileReady()).thenReturn(true);
+ when(mProfileManager.getLeAudioProfile()).thenReturn(mLeAudioProfile);
+ }
+
+ private void addA2dpProfileToDevice(boolean preferred, boolean supportsHighQualityAudio,
+ boolean highQualityAudioEnabled) {
+ when(mA2dpProfile.supportsHighQualityAudio(any())).thenReturn(supportsHighQualityAudio);
+ when(mA2dpProfile.isHighQualityAudioEnabled(any())).thenReturn(highQualityAudioEnabled);
+ when(mA2dpProfile.isEnabled(any())).thenReturn(preferred);
+ mConnectableProfiles.add(mA2dpProfile);
+ }
+
+ private void addLeAudioProfileToDevice(boolean enabled) {
+ when(mLeAudioProfile.isEnabled(any())).thenReturn(enabled);
+ mConnectableProfiles.add(mLeAudioProfile);
}
private SwitchPreferenceCompat getHighQualityAudioPref() {
@@ -414,7 +434,7 @@
@Test
public void highQualityAudio_prefIsPresentWhenSupported() {
setupDevice(makeDefaultDeviceConfig());
- addMockA2dpProfile(true, true, true);
+ addA2dpProfileToDevice(true, true, true);
showScreen(mController);
SwitchPreferenceCompat pref = getHighQualityAudioPref();
assertThat(pref.getKey()).isEqualTo(
@@ -431,7 +451,7 @@
@Test
public void highQualityAudio_prefIsAbsentWhenNotSupported() {
setupDevice(makeDefaultDeviceConfig());
- addMockA2dpProfile(true, false, false);
+ addA2dpProfileToDevice(true, false, false);
showScreen(mController);
assertThat(mProfiles.getPreferenceCount()).isEqualTo(2);
SwitchPreferenceCompat pref = (SwitchPreferenceCompat) mProfiles.getPreference(0);
@@ -444,7 +464,7 @@
@Test
public void highQualityAudio_busyDeviceDisablesSwitch() {
setupDevice(makeDefaultDeviceConfig());
- addMockA2dpProfile(true, true, true);
+ addA2dpProfileToDevice(true, true, true);
when(mCachedDevice.isBusy()).thenReturn(true);
showScreen(mController);
SwitchPreferenceCompat pref = getHighQualityAudioPref();
@@ -454,17 +474,17 @@
@Test
public void highQualityAudio_mediaAudioDisabledAndReEnabled() {
setupDevice(makeDefaultDeviceConfig());
- A2dpProfile audioProfile = addMockA2dpProfile(true, true, true);
+ addA2dpProfileToDevice(true, true, true);
showScreen(mController);
assertThat(mProfiles.getPreferenceCount()).isEqualTo(3);
// Disabling media audio should cause the high quality audio switch to disappear, but not
// the regular audio one.
SwitchPreferenceCompat audioPref =
- (SwitchPreferenceCompat) mScreen.findPreference(audioProfile.toString());
+ (SwitchPreferenceCompat) mScreen.findPreference(mA2dpProfile.toString());
audioPref.performClick();
- verify(audioProfile).setEnabled(mDevice, false);
- when(audioProfile.isEnabled(mDevice)).thenReturn(false);
+ verify(mA2dpProfile).setEnabled(mDevice, false);
+ when(mA2dpProfile.isEnabled(mDevice)).thenReturn(false);
mController.onDeviceAttributesChanged();
assertThat(audioPref.isVisible()).isTrue();
SwitchPreferenceCompat highQualityAudioPref = getHighQualityAudioPref();
@@ -472,8 +492,8 @@
// And re-enabling media audio should make high quality switch to reappear.
audioPref.performClick();
- verify(audioProfile).setEnabled(mDevice, true);
- when(audioProfile.isEnabled(mDevice)).thenReturn(true);
+ verify(mA2dpProfile).setEnabled(mDevice, true);
+ when(mA2dpProfile.isEnabled(mDevice)).thenReturn(true);
mController.onDeviceAttributesChanged();
highQualityAudioPref = getHighQualityAudioPref();
assertThat(highQualityAudioPref.isVisible()).isTrue();
@@ -482,9 +502,9 @@
@Test
public void highQualityAudio_mediaAudioStartsDisabled() {
setupDevice(makeDefaultDeviceConfig());
- A2dpProfile audioProfile = addMockA2dpProfile(false, true, true);
+ addA2dpProfileToDevice(false, true, true);
showScreen(mController);
- SwitchPreferenceCompat audioPref = mScreen.findPreference(audioProfile.toString());
+ SwitchPreferenceCompat audioPref = mScreen.findPreference(mA2dpProfile.toString());
SwitchPreferenceCompat highQualityAudioPref = getHighQualityAudioPref();
assertThat(audioPref).isNotNull();
assertThat(audioPref.isChecked()).isFalse();
@@ -522,15 +542,9 @@
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_BLUETOOTH_PROFILE_TOGGLE_VISIBILITY_CHECKER);
setupDevice(makeDefaultDeviceConfig());
- LeAudioProfile leAudioProfile = mock(LeAudioProfile.class);
- when(leAudioProfile.getNameResource(mDevice))
- .thenReturn(com.android.settingslib.R.string.bluetooth_profile_le_audio);
- when(leAudioProfile.isProfileReady()).thenReturn(true);
- when(leAudioProfile.toString()).thenReturn("LE_AUDIO");
- when(mProfileManager.getLeAudioProfile()).thenReturn(leAudioProfile);
+ addA2dpProfileToDevice(true, true, true);
when(mFeatureProvider.getInvisibleProfilePreferenceKeys(any(), any()))
- .thenReturn(ImmutableSet.of("LE_AUDIO"));
- mConnectableProfiles.add(leAudioProfile);
+ .thenReturn(ImmutableSet.of("A2DP"));
showScreen(mController);
@@ -543,15 +557,9 @@
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_BLUETOOTH_PROFILE_TOGGLE_VISIBILITY_CHECKER);
setupDevice(makeDefaultDeviceConfig());
- LeAudioProfile leAudioProfile = mock(LeAudioProfile.class);
- when(leAudioProfile.getNameResource(mDevice))
- .thenReturn(com.android.settingslib.R.string.bluetooth_profile_le_audio);
- when(leAudioProfile.isProfileReady()).thenReturn(true);
- when(leAudioProfile.toString()).thenReturn("LE_AUDIO");
- when(mProfileManager.getLeAudioProfile()).thenReturn(leAudioProfile);
+ addA2dpProfileToDevice(true, true, true);
when(mFeatureProvider.getInvisibleProfilePreferenceKeys(any(), any()))
- .thenReturn(ImmutableSet.of("A2DP"));
- mConnectableProfiles.add(leAudioProfile);
+ .thenReturn(ImmutableSet.of("LE_AUDIO"));
showScreen(mController);
@@ -563,19 +571,8 @@
public void classicAudioDeviceWithLeAudio_showLeAudioToggle() {
mSetFlagsRule.enableFlags(Flags.FLAG_HIDE_LE_AUDIO_TOGGLE_FOR_LE_AUDIO_ONLY_DEVICE);
setupDevice(makeDefaultDeviceConfig());
-
- LeAudioProfile leAudioProfile = mock(LeAudioProfile.class);
- when(leAudioProfile.getNameResource(mDevice))
- .thenReturn(com.android.settingslib.R.string.bluetooth_profile_le_audio);
- when(leAudioProfile.isProfileReady()).thenReturn(true);
- when(leAudioProfile.toString()).thenReturn("LE_AUDIO");
- when(mProfileManager.getLeAudioProfile()).thenReturn(leAudioProfile);
- mConnectableProfiles.add(leAudioProfile);
- when(mCachedDevice.getProfiles())
- .thenAnswer(
- invocation ->
- ImmutableList.of(
- leAudioProfile, addMockA2dpProfile(false, false, false)));
+ addLeAudioProfileToDevice(false);
+ addA2dpProfileToDevice(false, false, false);
showScreen(mController);
@@ -587,16 +584,7 @@
public void leAudioOnlyDevice_hideLeAudioToggle() {
mSetFlagsRule.enableFlags(Flags.FLAG_HIDE_LE_AUDIO_TOGGLE_FOR_LE_AUDIO_ONLY_DEVICE);
setupDevice(makeDefaultDeviceConfig());
-
- LeAudioProfile leAudioProfile = mock(LeAudioProfile.class);
- when(leAudioProfile.getNameResource(mDevice))
- .thenReturn(com.android.settingslib.R.string.bluetooth_profile_le_audio);
- when(leAudioProfile.isProfileReady()).thenReturn(true);
- when(leAudioProfile.toString()).thenReturn("LE_AUDIO");
- when(mProfileManager.getLeAudioProfile()).thenReturn(leAudioProfile);
- mConnectableProfiles.add(leAudioProfile);
- when(mCachedDevice.getProfiles())
- .thenAnswer(invocation -> ImmutableList.of(leAudioProfile));
+ addLeAudioProfileToDevice(false);
showScreen(mController);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioControllerTest.java
index d9a917b..24528ae 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsSpatialAudioControllerTest.java
@@ -21,26 +21,35 @@
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.app.settings.SettingsEnums;
import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
import android.media.AudioDeviceAttributes;
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.media.Spatializer;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import androidx.preference.PreferenceCategory;
import androidx.preference.TwoStatePreference;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.bluetooth.A2dpProfile;
+import com.android.settingslib.bluetooth.HearingAidProfile;
+import com.android.settingslib.bluetooth.LeAudioProfile;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.flags.Flags;
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;
@@ -54,7 +63,8 @@
@RunWith(RobolectricTestRunner.class)
public class BluetoothDetailsSpatialAudioControllerTest extends BluetoothDetailsControllerTestBase {
-
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
private static final String KEY_SPATIAL_AUDIO = "spatial_audio";
private static final String KEY_HEAD_TRACKING = "head_tracking";
@@ -64,6 +74,9 @@
@Mock private Lifecycle mSpatialAudioLifecycle;
@Mock private PreferenceCategory mProfilesContainer;
@Mock private BluetoothDevice mBluetoothDevice;
+ @Mock private A2dpProfile mA2dpProfile;
+ @Mock private LeAudioProfile mLeAudioProfile;
+ @Mock private HearingAidProfile mHearingAidProfile;
private AudioDeviceAttributes mAvailableDevice;
@@ -83,6 +96,12 @@
when(mAudioManager.getSpatializer()).thenReturn(mSpatializer);
when(mCachedDevice.getAddress()).thenReturn(MAC_ADDRESS);
when(mCachedDevice.getDevice()).thenReturn(mBluetoothDevice);
+ when(mCachedDevice.getProfiles())
+ .thenReturn(List.of(mA2dpProfile, mLeAudioProfile, mHearingAidProfile));
+ when(mA2dpProfile.isEnabled(mBluetoothDevice)).thenReturn(true);
+ when(mA2dpProfile.getProfileId()).thenReturn(BluetoothProfile.A2DP);
+ when(mLeAudioProfile.getProfileId()).thenReturn(BluetoothProfile.LE_AUDIO);
+ when(mHearingAidProfile.getProfileId()).thenReturn(BluetoothProfile.HEARING_AID);
when(mBluetoothDevice.getAnonymizedAddress()).thenReturn(MAC_ADDRESS);
when(mFeatureFactory.getBluetoothFeatureProvider().getSpatializer(mContext))
.thenReturn(mSpatializer);
@@ -273,6 +292,52 @@
}
@Test
+ @EnableFlags(Flags.FLAG_ENABLE_DETERMINING_SPATIAL_AUDIO_ATTRIBUTES_BY_PROFILE)
+ public void refresh_leAudioProfileEnabledForHeadset_useLeAudioHeadsetAttributes() {
+ when(mLeAudioProfile.isEnabled(mBluetoothDevice)).thenReturn(true);
+ when(mA2dpProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mHearingAidProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mAudioManager.getBluetoothAudioDeviceCategory(MAC_ADDRESS))
+ .thenReturn(AudioManager.AUDIO_DEVICE_CATEGORY_HEADPHONES);
+ when(mSpatializer.isAvailableForDevice(any())).thenReturn(true);
+
+ mController.refresh();
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mController.mAudioDevice.getType()).isEqualTo(AudioDeviceInfo.TYPE_BLE_HEADSET);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_DETERMINING_SPATIAL_AUDIO_ATTRIBUTES_BY_PROFILE)
+ public void refresh_leAudioProfileEnabledForSpeaker_useLeAudioSpeakerAttributes() {
+ when(mLeAudioProfile.isEnabled(mBluetoothDevice)).thenReturn(true);
+ when(mA2dpProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mHearingAidProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mAudioManager.getBluetoothAudioDeviceCategory(MAC_ADDRESS))
+ .thenReturn(AudioManager.AUDIO_DEVICE_CATEGORY_SPEAKER);
+ when(mSpatializer.isAvailableForDevice(any())).thenReturn(true);
+
+ mController.refresh();
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mController.mAudioDevice.getType()).isEqualTo(AudioDeviceInfo.TYPE_BLE_SPEAKER);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_DETERMINING_SPATIAL_AUDIO_ATTRIBUTES_BY_PROFILE)
+ public void refresh_hearingAidProfileEnabled_useHearingAidAttributes() {
+ when(mLeAudioProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mA2dpProfile.isEnabled(mBluetoothDevice)).thenReturn(false);
+ when(mHearingAidProfile.isEnabled(mBluetoothDevice)).thenReturn(true);
+ when(mSpatializer.isAvailableForDevice(any())).thenReturn(true);
+
+ mController.refresh();
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mController.mAudioDevice.getType()).isEqualTo(AudioDeviceInfo.TYPE_HEARING_AID);
+ }
+
+ @Test
public void turnedOnSpatialAudio_invokesAddCompatibleAudioDevice() {
mController.setAvailableDevice(mAvailableDevice);
mSpatialAudioPref.setChecked(true);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index d165aa5..4bfe335 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -275,7 +275,7 @@
}
@Override
- protected String getPreferenceKey() {
+ protected String getPreferenceKeyPrefix() {
return "test_bt";
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index d28ab3b..5a9f2bc 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -17,6 +17,8 @@
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_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING;
+import static com.android.settings.flags.Flags.FLAG_ROTATION_CONNECTED_DISPLAY_SETTING;
import static com.google.common.truth.Truth.assertThat;
@@ -30,6 +32,7 @@
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.hardware.input.InputManager;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
@@ -40,13 +43,16 @@
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.bluetooth.Utils;
+import com.android.settings.connecteddevice.display.ExternalDisplayUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.flags.FakeFeatureFlagsImpl;
import com.android.settings.flags.Flags;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
@@ -65,7 +71,6 @@
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.ShadowApplicationPackageManager;
@@ -84,6 +89,8 @@
@Mock
private DashboardFragment mDashboardFragment;
@Mock
+ private ExternalDisplayUpdater mExternalDisplayUpdater;
+ @Mock
private ConnectedBluetoothDeviceUpdater mConnectedBluetoothDeviceUpdater;
@Mock
private ConnectedUsbDeviceUpdater mConnectedUsbDeviceUpdater;
@@ -105,6 +112,9 @@
private CachedBluetoothDevice mCachedDevice;
@Mock
private BluetoothDevice mDevice;
+ @Mock
+ private Resources mResources;
+ private final FakeFeatureFlagsImpl mFakeFeatureFlags = new FakeFeatureFlagsImpl();
private ShadowApplicationPackageManager mPackageManager;
private PreferenceGroup mPreferenceGroup;
@@ -118,8 +128,10 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mFakeFeatureFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, true);
+ mFakeFeatureFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, true);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(ApplicationProvider.getApplicationContext());
mPreference = new Preference(mContext);
mPreference.setKey(PREFERENCE_KEY_1);
mPackageManager = (ShadowApplicationPackageManager) Shadows.shadowOf(
@@ -129,15 +141,19 @@
doReturn(mContext).when(mDashboardFragment).getContext();
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
when(mContext.getSystemService(InputManager.class)).thenReturn(mInputManager);
+ when(mContext.getResources()).thenReturn(mResources);
when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
- mConnectedDeviceGroupController = new ConnectedDeviceGroupController(mContext);
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, mConnectedDockUpdater, mStylusDeviceUpdater);
+ mConnectedDeviceGroupController = spy(new ConnectedDeviceGroupController(mContext));
+ when(mConnectedDeviceGroupController.getFeatureFlags()).thenReturn(mFakeFeatureFlags);
+
+ mConnectedDeviceGroupController.init(mExternalDisplayUpdater,
+ mConnectedBluetoothDeviceUpdater, mConnectedUsbDeviceUpdater, mConnectedDockUpdater,
+ mStylusDeviceUpdater);
mConnectedDeviceGroupController.mPreferenceGroup = mPreferenceGroup;
when(mCachedDevice.getName()).thenReturn(DEVICE_NAME);
@@ -147,6 +163,7 @@
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES,
true);
+ when(mPreferenceScreen.getContext()).thenReturn(mContext);
}
@Test
@@ -193,6 +210,7 @@
// register the callback in onStart()
mConnectedDeviceGroupController.onStart();
+ verify(mExternalDisplayUpdater).registerCallback();
verify(mConnectedBluetoothDeviceUpdater).registerCallback();
verify(mConnectedUsbDeviceUpdater).registerCallback();
verify(mConnectedDockUpdater).registerCallback();
@@ -204,6 +222,7 @@
public void onStop_shouldUnregisterUpdaters() {
// unregister the callback in onStop()
mConnectedDeviceGroupController.onStop();
+ verify(mExternalDisplayUpdater).unregisterCallback();
verify(mConnectedBluetoothDeviceUpdater).unregisterCallback();
verify(mConnectedUsbDeviceUpdater).unregisterCallback();
verify(mConnectedDockUpdater).unregisterCallback();
@@ -212,10 +231,12 @@
@Test
public void getAvailabilityStatus_noBluetoothUsbDockFeature_returnUnSupported() {
+ mFakeFeatureFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, false);
+ mFakeFeatureFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -223,11 +244,23 @@
}
@Test
+ public void getAvailabilityStatus_connectedDisplay_returnSupported() {
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
+ mConnectedUsbDeviceUpdater, null, null);
+
+ assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
+ AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
public void getAvailabilityStatus_BluetoothFeature_returnSupported() {
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -239,7 +272,7 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, true);
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -251,7 +284,7 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, mConnectedDockUpdater, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -261,6 +294,8 @@
@Test
public void getAvailabilityStatus_noUsiStylusFeature_returnUnSupported() {
+ mFakeFeatureFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, false);
+ mFakeFeatureFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
@@ -268,7 +303,7 @@
when(mInputManager.getInputDevice(0)).thenReturn(new InputDevice.Builder().setSources(
InputDevice.SOURCE_DPAD).setExternal(false).build());
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, null, mStylusDeviceUpdater);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -284,7 +319,7 @@
when(mInputManager.getInputDevice(0)).thenReturn(new InputDevice.Builder().setSources(
InputDevice.SOURCE_STYLUS).setExternal(false).build());
- mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedDeviceGroupController.init(null, mConnectedBluetoothDeviceUpdater,
mConnectedUsbDeviceUpdater, mConnectedDockUpdater, mStylusDeviceUpdater);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
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 785b1dc..879c6a4 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
@@ -16,6 +16,8 @@
package com.android.settings.connecteddevice.audiosharing;
+import static com.android.settings.connecteddevice.audiosharing.AudioSharingBluetoothDeviceUpdater.PREF_KEY_PREFIX;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -85,7 +87,6 @@
public class AudioSharingBluetoothDeviceUpdaterTest {
private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
private static final String TEST_DEVICE_NAME = "test";
- private static final String PREF_KEY = "audio_sharing_bt";
private static final String TAG = "AudioSharingBluetoothDeviceUpdater";
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -263,7 +264,7 @@
@Test
public void getPreferenceKey_returnsCorrectKey() {
- assertThat(mDeviceUpdater.getPreferenceKey()).isEqualTo(PREF_KEY);
+ assertThat(mDeviceUpdater.getPreferenceKeyPrefix()).isEqualTo(PREF_KEY_PREFIX);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
index 7f0c1c9..51ed899 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragmentTest.java
@@ -23,6 +23,7 @@
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothStatusCodes;
+import android.os.Bundle;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.appcompat.app.AlertDialog;
@@ -78,10 +79,6 @@
BluetoothStatusCodes.FEATURE_SUPPORTED);
shadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
BluetoothStatusCodes.FEATURE_SUPPORTED);
- mFragment = new AudioSharingCallAudioDialogFragment();
- mParent = new Fragment();
- FragmentController.setupFragment(
- mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
}
@After
@@ -91,6 +88,7 @@
@Test
public void getMetricsCategory_correctValue() {
+ mFragment = new AudioSharingCallAudioDialogFragment();
assertThat(mFragment.getMetricsCategory())
.isEqualTo(SettingsEnums.DIALOG_AUDIO_SHARING_CALL_AUDIO);
}
@@ -98,21 +96,52 @@
@Test
public void onCreateDialog_flagOff_dialogNotExist() {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
- mFragment.show(mParent, new ArrayList<>(), (item) -> {});
+ mParent = new Fragment();
+ FragmentController.setupFragment(
+ mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
+ AudioSharingCallAudioDialogFragment.show(mParent, new ArrayList<>(), (item) -> {});
shadowMainLooper().idle();
AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNull();
}
@Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mParent = new Fragment();
+ AudioSharingCallAudioDialogFragment.show(mParent, new ArrayList<>(), (item) -> {});
+ shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+
+ @Test
+ public void onCreateDialog_nullDeviceItems_showEmptyDialog() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mFragment = new AudioSharingCallAudioDialogFragment();
+ mFragment.setArguments(Bundle.EMPTY);
+ FragmentController.setupFragment(
+ mFragment, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
+ AlertDialog dialog = (AlertDialog) mFragment.onCreateDialog(Bundle.EMPTY);
+ dialog.show();
+ shadowMainLooper().idle();
+ assertThat(dialog.isShowing()).isTrue();
+ assertThat(dialog.getListView()).isNull();
+ }
+
+ @Test
public void onCreateDialog_showCorrectItems() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mParent = new Fragment();
+ FragmentController.setupFragment(
+ mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
ArrayList<AudioSharingDeviceItem> deviceItemList = new ArrayList<>();
deviceItemList.add(TEST_DEVICE_ITEM1);
deviceItemList.add(TEST_DEVICE_ITEM2);
- mFragment.show(mParent, deviceItemList, (item) -> {});
+ AudioSharingCallAudioDialogFragment.show(mParent, deviceItemList, (item) -> {});
shadowMainLooper().idle();
AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNotNull();
assertThat(dialog.getListView().getCount()).isEqualTo(2);
}
}
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 32f666f..9aa00fb 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragmentTest.java
@@ -96,6 +96,15 @@
}
@Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ AudioSharingConfirmDialogFragment.show(new Fragment());
+ shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+
+ @Test
public void onCreateDialog_flagOn_showDialog() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
AudioSharingConfirmDialogFragment.show(mParent);
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 18f75ba..f3f32ae 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
@@ -30,9 +30,11 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
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.BluetoothLeBroadcastAssistant;
@@ -57,6 +59,7 @@
import com.android.settings.SettingsActivity;
import com.android.settings.bluetooth.Utils;
import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -136,6 +139,7 @@
private LifecycleOwner mLifecycleOwner;
private PreferenceCategory mPreferenceGroup;
private Preference mAudioSharingPreference;
+ private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
@@ -148,6 +152,7 @@
BluetoothStatusCodes.FEATURE_SUPPORTED);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
mLocalBtManager = Utils.getLocalBtManager(mContext);
when(mLocalBtManager.getEventManager()).thenReturn(mEventManager);
@@ -175,6 +180,7 @@
.thenReturn(mAudioSharingPreference);
when(mScreen.findPreference(KEY)).thenReturn(mPreferenceGroup);
mController = new AudioSharingDevicePreferenceController(mContext);
+ mController.init(mFragment);
mController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater);
mController.setDialogHandler(mDialogHandler);
doReturn(mActivity).when(mFragment).getActivity();
@@ -527,6 +533,25 @@
}
@Test
+ public void testBluetoothLeBroadcastAssistantCallbacks_logAction() {
+ mController.mBroadcastAssistantCallback.onSourceAddFailed(
+ mDevice, mSource, /* reason= */ 1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_JOIN_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+
+ mController.mBroadcastAssistantCallback.onSourceRemoveFailed(
+ mDevice, /* sourceId= */ 1, /* reason= */ 1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_LEAVE_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ }
+
+ @Test
public void testBluetoothLeBroadcastAssistantCallbacks_doNothing() {
mController.mBroadcastAssistantCallback.onSearchStarted(/* reason= */ 1);
mController.mBroadcastAssistantCallback.onSearchStartFailed(/* reason= */ 1);
@@ -534,10 +559,6 @@
mController.mBroadcastAssistantCallback.onSearchStopFailed(/* reason= */ 1);
mController.mBroadcastAssistantCallback.onSourceAdded(
mDevice, /* sourceId= */ 1, /* reason= */ 1);
- mController.mBroadcastAssistantCallback.onSourceAddFailed(
- mDevice, mSource, /* reason= */ 1);
- mController.mBroadcastAssistantCallback.onSourceRemoveFailed(
- mDevice, /* sourceId= */ 1, /* reason= */ 1);
mController.mBroadcastAssistantCallback.onSourceModified(
mDevice, /* sourceId= */ 1, /* reason= */ 1);
mController.mBroadcastAssistantCallback.onSourceModifyFailed(
@@ -546,7 +567,8 @@
mController.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 1);
shadowOf(Looper.getMainLooper()).idle();
- // Above callbacks won't update group preference
+ // Above callbacks won't update group preference and log actions
verify(mBluetoothDeviceUpdater, never()).forceUpdate();
+ verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
index e7cfb85..3c12946 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdaterTest.java
@@ -16,6 +16,8 @@
package com.android.settings.connecteddevice.audiosharing;
+import static com.android.settings.connecteddevice.audiosharing.AudioSharingDeviceVolumeControlUpdater.PREF_KEY_PREFIX;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -79,7 +81,6 @@
public class AudioSharingDeviceVolumeControlUpdaterTest {
private static final String TEST_DEVICE_NAME = "test";
private static final String TAG = "AudioSharingDeviceVolumeControlUpdater";
- private static final String PREF_KEY = "audio_sharing_volume_control";
private static final String TEST_SETTINGS_KEY =
"bluetooth_le_broadcast_fallback_active_group_id";
private static final int TEST_DEVICE_GROUP_ID = 1;
@@ -326,7 +327,7 @@
@Test
public void getPreferenceKey_returnsCorrectKey() {
- assertThat(mDeviceUpdater.getPreferenceKey()).isEqualTo(PREF_KEY);
+ assertThat(mDeviceUpdater.getPreferenceKeyPrefix()).isEqualTo(PREF_KEY_PREFIX);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java
index 39709c1..20c225c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogFragmentTest.java
@@ -130,7 +130,16 @@
AudioSharingDialogFragment.show(
mParent, new ArrayList<>(), EMPTY_EVENT_LISTENER, TEST_EVENT_DATA_LIST);
shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+ @Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ AudioSharingDialogFragment.show(
+ new Fragment(), new ArrayList<>(), EMPTY_EVENT_LISTENER, TEST_EVENT_DATA_LIST);
+ shadowMainLooper().idle();
AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNull();
}
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 4c060d4..e71e876 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDialogHandlerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@@ -248,6 +249,23 @@
}
@Test
+ public void handleUserTriggeredLeaDeviceConnected_noSharingLeaDeviceInErrorState_setActive() {
+ setUpBroadcast(false);
+ when(mCachedDevice1.getGroupId()).thenReturn(-1);
+ when(mLeAudioProfile.getGroupId(mDevice1)).thenReturn(-1);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(deviceList);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of());
+ mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ true);
+ shadowOf(Looper.getMainLooper()).idle();
+ List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
+ assertThat(childFragments).isEmpty();
+ verify(mCachedDevice1).setActive();
+ }
+
+ @Test
public void handleUserTriggeredLeaDeviceConnected_noSharingTwoLeaDevices_showJoinDialog() {
setUpBroadcast(false);
ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
@@ -288,6 +306,8 @@
assertThat(listener).isNotNull();
listener.onShareClick();
verify(mBroadcast).startPrivateBroadcast();
+ listener.onCancelClick();
+ verify(mCachedDevice1).setActive();
}
@Test
@@ -330,6 +350,8 @@
1));
AudioSharingJoinDialogFragment.DialogEventListener listener = fragment.getListener();
assertThat(listener).isNotNull();
+ listener.onCancelClick();
+ verify(mAssistant, never()).addSource(mDevice1, mMetadata, /* isGroupOp= */ false);
listener.onShareClick();
verify(mAssistant).addSource(mDevice1, mMetadata, /* isGroupOp= */ false);
}
@@ -397,7 +419,7 @@
@Test
public void handleNonLeaDeviceConnected_sharing_showStopDialog() {
setUpBroadcast(true);
- ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice2);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1);
when(mAssistant.getDevicesMatchingConnectionStates(
new int[] {BluetoothProfile.STATE_CONNECTED}))
.thenReturn(deviceList);
@@ -447,6 +469,23 @@
}
@Test
+ public void handleLeaDeviceConnected_noSharingLeaDeviceInErrorState_doNothing() {
+ setUpBroadcast(false);
+ when(mCachedDevice1.getGroupId()).thenReturn(-1);
+ when(mLeAudioProfile.getGroupId(mDevice1)).thenReturn(-1);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(deviceList);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of());
+ mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ false);
+ shadowOf(Looper.getMainLooper()).idle();
+ List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
+ assertThat(childFragments).isEmpty();
+ verify(mCachedDevice1, never()).setActive();
+ }
+
+ @Test
public void handleLeaDeviceConnected_noSharingTwoLeaDevices_showJoinDialog() {
setUpBroadcast(false);
ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
@@ -487,6 +526,8 @@
assertThat(listener).isNotNull();
listener.onShareClick();
verify(mBroadcast).startPrivateBroadcast();
+ listener.onCancelClick();
+ verify(mCachedDevice1, never()).setActive();
}
@Test
@@ -529,6 +570,8 @@
1));
AudioSharingJoinDialogFragment.DialogEventListener listener = fragment.getListener();
assertThat(listener).isNotNull();
+ listener.onCancelClick();
+ verify(mAssistant, never()).addSource(mDevice1, mMetadata, /* isGroupOp= */ false);
listener.onShareClick();
verify(mAssistant).addSource(mDevice1, mMetadata, /* isGroupOp= */ false);
}
@@ -605,10 +648,55 @@
}
@Test
+ public void closeOpeningDialogsForLeaDevice_unattachedFragment_doNothing() {
+ mParentFragment = new Fragment();
+ mHandler = new AudioSharingDialogHandler(mContext, mParentFragment);
+ mHandler.closeOpeningDialogsForLeaDevice(mCachedDevice1);
+ shadowOf(Looper.getMainLooper()).idle();
+ verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
+ }
+
+ @Test
+ public void closeOpeningDialogsForLeaDevice_closeDisconnectDialog() {
+ // Show disconnect dialog
+ setUpBroadcast(true);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3, mDevice4);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(deviceList);
+ when(mAssistant.getAllSources(mDevice1)).thenReturn(ImmutableList.of());
+ when(mAssistant.getAllSources(mDevice3)).thenReturn(ImmutableList.of(mState));
+ when(mAssistant.getAllSources(mDevice4)).thenReturn(ImmutableList.of(mState));
+ mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ false);
+ shadowOf(Looper.getMainLooper()).idle();
+ assertThat(mParentFragment.getChildFragmentManager().getFragments())
+ .comparingElementsUsing(TAG_EQUALS)
+ .containsExactly(AudioSharingDisconnectDialogFragment.tag());
+ // Close opening dialogs
+ mHandler.closeOpeningDialogsForLeaDevice(mCachedDevice1);
+ shadowOf(Looper.getMainLooper()).idle();
+ assertThat(mParentFragment.getChildFragmentManager().getFragments()).isEmpty();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_DIALOG_AUTO_DISMISS,
+ SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_DEVICE);
+ }
+
+ @Test
+ public void closeOpeningDialogsForNonLeaDevice_unattachedFragment_doNothing() {
+ mParentFragment = new Fragment();
+ mHandler = new AudioSharingDialogHandler(mContext, mParentFragment);
+ mHandler.closeOpeningDialogsForNonLeaDevice(mCachedDevice2);
+ shadowOf(Looper.getMainLooper()).idle();
+ verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
+ }
+
+ @Test
public void closeOpeningDialogsForNonLeaDevice_closeStopDialog() {
// Show stop dialog
setUpBroadcast(true);
- ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice2);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1);
when(mAssistant.getDevicesMatchingConnectionStates(
new int[] {BluetoothProfile.STATE_CONNECTED}))
.thenReturn(deviceList);
@@ -678,6 +766,34 @@
}
@Test
+ public void onBroadcastStartFailed_logAction() {
+ setUpBroadcast(false);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(deviceList);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of());
+ mHandler.handleDeviceConnected(mCachedDevice1, /* userTriggered= */ false);
+ shadowOf(Looper.getMainLooper()).idle();
+ List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
+ assertThat(childFragments)
+ .comparingElementsUsing(TAG_EQUALS)
+ .containsExactly(AudioSharingJoinDialogFragment.tag());
+ AudioSharingJoinDialogFragment fragment =
+ (AudioSharingJoinDialogFragment) Iterables.getOnlyElement(childFragments);
+ AudioSharingJoinDialogFragment.DialogEventListener listener = fragment.getListener();
+ assertThat(listener).isNotNull();
+ listener.onShareClick();
+
+ mHandler.mBroadcastCallback.onBroadcastStartFailed(/* reason= */ 1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_START_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ }
+
+ @Test
public void onPlaybackStarted_addSource() {
setUpBroadcast(false);
ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1, mDevice3);
@@ -706,15 +822,41 @@
}
@Test
+ public void onBroadcastStopFailed_logAction() {
+ setUpBroadcast(true);
+ ImmutableList<BluetoothDevice> deviceList = ImmutableList.of(mDevice1);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(deviceList);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(mState));
+ mHandler.handleDeviceConnected(mCachedDevice2, /* userTriggered= */ false);
+ shadowOf(Looper.getMainLooper()).idle();
+ List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
+ assertThat(childFragments)
+ .comparingElementsUsing(TAG_EQUALS)
+ .containsExactly(AudioSharingStopDialogFragment.tag());
+
+ AudioSharingStopDialogFragment fragment =
+ (AudioSharingStopDialogFragment) Iterables.getOnlyElement(childFragments);
+ AudioSharingStopDialogFragment.DialogEventListener listener = fragment.getListener();
+ assertThat(listener).isNotNull();
+ listener.onStopSharingClick();
+
+ mHandler.mBroadcastCallback.onBroadcastStopFailed(/* reason= */ 1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_STOP_FAILED,
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ }
+
+ @Test
public void testBluetoothLeBroadcastCallbacks_doNothing() {
mHandler.mBroadcastCallback.onBroadcastStarted(/* reason= */ 1, /* broadcastId= */ 1);
- mHandler.mBroadcastCallback.onBroadcastStopped(/* reason= */ 1, /* broadcastId= */ 1);
mHandler.mBroadcastCallback.onBroadcastMetadataChanged(/* reason= */ 1, mMetadata);
mHandler.mBroadcastCallback.onBroadcastUpdated(/* reason= */ 1, /* broadcastId= */ 1);
mHandler.mBroadcastCallback.onPlaybackStarted(/* reason= */ 1, /* broadcastId= */ 1);
mHandler.mBroadcastCallback.onPlaybackStopped(/* reason= */ 1, /* broadcastId= */ 1);
- mHandler.mBroadcastCallback.onBroadcastStartFailed(/* reason= */ 1);
- mHandler.mBroadcastCallback.onBroadcastStopFailed(/* reason= */ 1);
mHandler.mBroadcastCallback.onBroadcastUpdateFailed(/* reason= */ 1, /* broadcastId= */ 1);
verify(mAssistant, never())
@@ -723,6 +865,7 @@
any(BluetoothLeBroadcastMetadata.class),
anyBoolean());
verify(mAssistant, never()).removeSource(any(BluetoothDevice.class), anyInt());
+ verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
}
private void setUpBroadcast(boolean isBroadcasting) {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java
index 6b984af..86b0d65 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java
@@ -154,6 +154,23 @@
}
@Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mDeviceItems = new ArrayList<>();
+ mDeviceItems.add(TEST_DEVICE_ITEM1);
+ mDeviceItems.add(TEST_DEVICE_ITEM2);
+ AudioSharingDisconnectDialogFragment.show(
+ new Fragment(),
+ mDeviceItems,
+ mCachedDevice3,
+ EMPTY_EVENT_LISTENER,
+ TEST_EVENT_DATA_LIST);
+ shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+
+ @Test
public void onCreateDialog_flagOn_dialogShowBtnForTwoDevices() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
mDeviceItems = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
index 13ea965..2310d75 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinDialogFragmentTest.java
@@ -164,6 +164,20 @@
}
@Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ AudioSharingJoinDialogFragment.show(
+ new Fragment(),
+ new ArrayList<>(),
+ mCachedDevice2,
+ EMPTY_EVENT_LISTENER,
+ TEST_EVENT_DATA_LIST);
+ shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+
+ @Test
public void onCreateDialog_flagOn_dialogShowTextForSingleDevice() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
AudioSharingJoinDialogFragment.show(
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceControllerTest.java
new file mode 100644
index 0000000..618e021
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceControllerTest.java
@@ -0,0 +1,319 @@
+/*
+ * 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.audiosharing;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+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.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothLeBroadcast;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.bluetooth.BluetoothStatusCodes;
+import android.content.Context;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.BluetoothEventManager;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.VolumeControlProfile;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+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.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.ShadowLooper;
+
+import java.util.concurrent.Executor;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowBluetoothAdapter.class,
+ ShadowBluetoothUtils.class,
+ })
+public class AudioSharingNamePreferenceControllerTest {
+ private static final String PREF_KEY = "audio_sharing_stream_name";
+ private static final String BROADCAST_NAME = "broadcast_name";
+ private static final CharSequence UPDATED_NAME = "updated_name";
+
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ @Spy Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private LocalBluetoothLeBroadcast mBroadcast;
+ @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+ @Mock private VolumeControlProfile mVolumeControl;
+ @Mock private LocalBluetoothManager mLocalBtManager;
+ @Mock private BluetoothEventManager mEventManager;
+ @Mock private LocalBluetoothProfileManager mProfileManager;
+ @Mock private PreferenceScreen mScreen;
+ private AudioSharingNamePreferenceController mController;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
+ private AudioSharingNamePreference mPreference;
+ private FakeFeatureFactory mFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mShadowBluetoothAdapter.setEnabled(true);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
+ mLocalBtManager = Utils.getLocalBtManager(mContext);
+ when(mLocalBtManager.getEventManager()).thenReturn(mEventManager);
+ when(mLocalBtManager.getProfileManager()).thenReturn(mProfileManager);
+ when(mProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
+ when(mProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(mAssistant);
+ when(mProfileManager.getVolumeControlProfile()).thenReturn(mVolumeControl);
+ when(mBroadcast.isProfileReady()).thenReturn(true);
+ when(mAssistant.isProfileReady()).thenReturn(true);
+ when(mVolumeControl.isProfileReady()).thenReturn(true);
+ when(mBroadcast.isProfileReady()).thenReturn(true);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ mController = new AudioSharingNamePreferenceController(mContext, PREF_KEY);
+ mPreference = spy(new AudioSharingNamePreference(mContext));
+ when(mScreen.findPreference(PREF_KEY)).thenReturn(mPreference);
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagOn_available() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagOff_unsupported() {
+ 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_SHARING);
+ mController.onStart(mLifecycleOwner);
+ verify(mBroadcast, never())
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcast.Callback.class));
+ }
+
+ @Test
+ public void onStart_flagOn_registerCallbacks() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStart(mLifecycleOwner);
+ verify(mBroadcast)
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcast.Callback.class));
+ }
+
+ @Test
+ public void onStart_flagOn_serviceNotReady_registerCallbacks() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mBroadcast.isProfileReady()).thenReturn(false);
+ mController.onStart(mLifecycleOwner);
+ verify(mProfileManager)
+ .addServiceListener(any(LocalBluetoothProfileManager.ServiceListener.class));
+ }
+
+ @Test
+ public void onServiceConnected_removeCallbacks() {
+ mController.onServiceConnected();
+ verify(mProfileManager)
+ .removeServiceListener(any(LocalBluetoothProfileManager.ServiceListener.class));
+ }
+
+ @Test
+ public void onStop_flagOff_doNothing() {
+ mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStart(mLifecycleOwner);
+ mController.onStop(mLifecycleOwner);
+ verify(mBroadcast, never())
+ .unregisterServiceCallBack(any(BluetoothLeBroadcast.Callback.class));
+ }
+
+ @Test
+ public void onStop_flagOn_unregisterCallbacks() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStart(mLifecycleOwner);
+ mController.onStop(mLifecycleOwner);
+ verify(mBroadcast).unregisterServiceCallBack(any(BluetoothLeBroadcast.Callback.class));
+ }
+
+ @Test
+ public void displayPreference_updateName_showIcon() {
+ when(mBroadcast.getBroadcastName()).thenReturn(BROADCAST_NAME);
+ when(mBroadcast.isEnabled(any())).thenReturn(true);
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.getText()).isEqualTo(BROADCAST_NAME);
+ assertThat(mPreference.getSummary()).isEqualTo(BROADCAST_NAME);
+ verify(mPreference).setValidator(any());
+ verify(mPreference).setShowQrCodeIcon(true);
+ }
+
+ @Test
+ public void displayPreference_updateName_hideIcon() {
+ when(mBroadcast.getBroadcastName()).thenReturn(BROADCAST_NAME);
+ when(mBroadcast.isEnabled(any())).thenReturn(false);
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.getText()).isEqualTo(BROADCAST_NAME);
+ assertThat(mPreference.getSummary()).isEqualTo(BROADCAST_NAME);
+ verify(mPreference).setValidator(any());
+ verify(mPreference).setShowQrCodeIcon(false);
+ }
+
+ @Test
+ public void onPreferenceChange_noChange_doNothing() {
+ when(mPreference.getSummary()).thenReturn(BROADCAST_NAME);
+ mController.displayPreference(mScreen);
+ boolean changed = mController.onPreferenceChange(mPreference, BROADCAST_NAME);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast, never()).setBroadcastName(anyString());
+ verify(mBroadcast, never()).setProgramInfo(anyString());
+ verify(mBroadcast, never()).updateBroadcast();
+ verify(mFeatureFactory.metricsFeatureProvider, never()).action(any(), anyInt(), anyInt());
+
+ assertThat(changed).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_changed_updateName_broadcasting() {
+ when(mPreference.getSummary()).thenReturn(BROADCAST_NAME);
+ when(mBroadcast.isEnabled(any())).thenReturn(true);
+ mController.displayPreference(mScreen);
+ boolean changed = mController.onPreferenceChange(mPreference, UPDATED_NAME);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast).setBroadcastName(UPDATED_NAME.toString());
+ verify(mBroadcast).setProgramInfo(UPDATED_NAME.toString());
+ verify(mBroadcast).updateBroadcast();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_STREAM_NAME_UPDATED, 1);
+ assertThat(changed).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChange_changed_updateName_notBroadcasting() {
+ when(mPreference.getSummary()).thenReturn(BROADCAST_NAME);
+ when(mBroadcast.isEnabled(any())).thenReturn(false);
+ mController.displayPreference(mScreen);
+ boolean changed = mController.onPreferenceChange(mPreference, UPDATED_NAME);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast).setBroadcastName(UPDATED_NAME.toString());
+ verify(mBroadcast).setProgramInfo(UPDATED_NAME.toString());
+ verify(mBroadcast, never()).updateBroadcast();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_STREAM_NAME_UPDATED, 0);
+ assertThat(changed).isTrue();
+ }
+
+ @Test
+ public void unrelatedCallbacks_doNotUpdateIcon() {
+ mController.displayPreference(mScreen);
+ mController.mBroadcastCallback.onBroadcastStartFailed(/* reason= */ 0);
+ mController.mBroadcastCallback.onBroadcastStarted(/* reason= */ 0, /* broadcastId= */ 0);
+ mController.mBroadcastCallback.onBroadcastStopFailed(/* reason= */ 0);
+ mController.mBroadcastCallback.onBroadcastUpdateFailed(
+ /* reason= */ 0, /* broadcastId= */ 0);
+ mController.mBroadcastCallback.onBroadcastUpdated(/* reason= */ 0, /* broadcastId= */ 0);
+ mController.mBroadcastCallback.onPlaybackStarted(/* reason= */ 0, /* broadcastId= */ 0);
+ mController.mBroadcastCallback.onPlaybackStopped(/* reason= */ 0, /* broadcastId= */ 0);
+
+ ShadowLooper.idleMainLooper();
+ // Should be called once in displayPreference, but not called after callbacks
+ verify(mPreference).setShowQrCodeIcon(anyBoolean());
+ }
+
+ @Test
+ public void broadcastOnCallback_updateIcon() {
+ mController.displayPreference(mScreen);
+ mController.mBroadcastCallback.onBroadcastMetadataChanged(
+ /* broadcastId= */ 0, mock(BluetoothLeBroadcastMetadata.class));
+
+ ShadowLooper.idleMainLooper();
+
+ // Should be called twice, in displayPreference and also after callback
+ verify(mPreference, times(2)).setShowQrCodeIcon(anyBoolean());
+ }
+
+ @Test
+ public void broadcastStopCallback_updateIcon() {
+ mController.displayPreference(mScreen);
+ mController.mBroadcastCallback.onBroadcastStopped(/* reason= */ 0, /* broadcastId= */ 0);
+
+ ShadowLooper.idleMainLooper();
+
+ // Should be called twice, in displayPreference and also after callback
+ verify(mPreference, times(2)).setShowQrCodeIcon(anyBoolean());
+ }
+
+ @Test
+ public void idTextValid_emptyString() {
+ boolean valid = mController.isTextValid("");
+
+ assertThat(valid).isFalse();
+ }
+
+ @Test
+ public void idTextValid_validName() {
+ boolean valid = mController.isTextValid("valid name");
+
+ assertThat(valid).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java
new file mode 100644
index 0000000..be62414
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreferenceTest.java
@@ -0,0 +1,142 @@
+/*
+ * 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.audiosharing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsQrCodeFragment;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioSharingNamePreferenceTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private Context mContext;
+ private AudioSharingNamePreference mPreference;
+
+ @Before
+ public void setup() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mPreference = spy(new AudioSharingNamePreference(mContext, null));
+ }
+
+ @Test
+ public void initialize_correctLayout() {
+ assertThat(mPreference.getLayoutResource())
+ .isEqualTo(
+ com.android.settingslib.widget.preference.twotarget.R.layout
+ .preference_two_target);
+ assertThat(mPreference.getWidgetLayoutResource())
+ .isEqualTo(R.layout.preference_widget_qrcode);
+ }
+
+ @Test
+ public void onBindViewHolder_correctLayout_noQrCodeButton() {
+ LayoutInflater inflater = LayoutInflater.from(mContext);
+ View view = inflater.inflate(mPreference.getLayoutResource(), null);
+ LinearLayout widgetView = view.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+ inflater.inflate(mPreference.getWidgetLayoutResource(), widgetView, true);
+
+ var holder = PreferenceViewHolder.createInstanceForTests(view);
+ mPreference.setShowQrCodeIcon(false);
+ mPreference.onBindViewHolder(holder);
+
+ ImageButton shareButton = (ImageButton) holder.findViewById(R.id.button_icon);
+ View divider =
+ holder.findViewById(
+ com.android.settingslib.widget.preference.twotarget.R.id
+ .two_target_divider);
+
+ assertThat(shareButton).isNotNull();
+ assertThat(shareButton.getVisibility()).isEqualTo(View.GONE);
+ assertThat(shareButton.hasOnClickListeners()).isFalse();
+ assertThat(divider).isNotNull();
+ assertThat(divider.getVisibility()).isEqualTo(View.GONE);
+ }
+
+ @Test
+ public void onBindViewHolder_correctLayout_showQrCodeButton() {
+ LayoutInflater inflater = LayoutInflater.from(mContext);
+ View view = inflater.inflate(mPreference.getLayoutResource(), null);
+ LinearLayout widgetView = view.findViewById(android.R.id.widget_frame);
+ assertThat(widgetView).isNotNull();
+ inflater.inflate(mPreference.getWidgetLayoutResource(), widgetView, true);
+
+ var holder = PreferenceViewHolder.createInstanceForTests(view);
+ mPreference.setShowQrCodeIcon(true);
+ mPreference.onBindViewHolder(holder);
+
+ ImageButton shareButton = (ImageButton) holder.findViewById(R.id.button_icon);
+ View divider =
+ holder.findViewById(
+ com.android.settingslib.widget.preference.twotarget.R.id
+ .two_target_divider);
+
+ assertThat(shareButton).isNotNull();
+ assertThat(shareButton.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(shareButton.getDrawable()).isNotNull();
+ assertThat(shareButton.hasOnClickListeners()).isTrue();
+ assertThat(shareButton.getContentDescription()).isNotNull();
+ assertThat(divider).isNotNull();
+ assertThat(divider.getVisibility()).isEqualTo(View.VISIBLE);
+
+ // mContext is not an Activity context, calling startActivity() from outside of an Activity
+ // context requires the FLAG_ACTIVITY_NEW_TASK flag, create a mock to avoid this
+ // AndroidRuntimeException.
+ Context activityContext = mock(Context.class);
+ when(mPreference.getContext()).thenReturn(activityContext);
+ shareButton.callOnClick();
+
+ ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(activityContext).startActivity(argumentCaptor.capture());
+
+ Intent intent = argumentCaptor.getValue();
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(AudioStreamsQrCodeFragment.class.getName());
+ assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+ .isEqualTo(R.string.audio_streams_qr_code_page_title);
+ assertThat(intent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ .isEqualTo(SettingsEnums.AUDIO_SHARING_SETTINGS);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNameTextValidatorTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNameTextValidatorTest.java
new file mode 100644
index 0000000..ada6117
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingNameTextValidatorTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.audiosharing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioSharingNameTextValidatorTest {
+ private AudioSharingNameTextValidator mValidator;
+
+ @Before
+ public void setUp() {
+ mValidator = new AudioSharingNameTextValidator();
+ }
+
+ @Test
+ public void testValidNames() {
+ assertThat(mValidator.isTextValid("ValidName")).isTrue();
+ assertThat(mValidator.isTextValid("12345678")).isTrue();
+ assertThat(mValidator.isTextValid("Name_With_Underscores")).isTrue();
+ assertThat(mValidator.isTextValid("ÄÖÜß")).isTrue();
+ assertThat(mValidator.isTextValid("ThisNameIsExactly32Characters!")).isTrue();
+ }
+
+ @Test
+ public void testInvalidNames() {
+ assertThat(mValidator.isTextValid(null)).isFalse();
+ assertThat(mValidator.isTextValid("")).isFalse();
+ assertThat(mValidator.isTextValid("abc")).isFalse();
+ assertThat(mValidator.isTextValid("ThisNameIsWayTooLongForAnAudioSharingName")).isFalse();
+ assertThat(mValidator.isTextValid("Invalid\uDC00")).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java
new file mode 100644
index 0000000..5bfb966
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceControllerTest.java
@@ -0,0 +1,335 @@
+/*
+ * 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.audiosharing;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothStatusCodes;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.bluetooth.Utils;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+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.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.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowLooper;
+
+import java.nio.charset.StandardCharsets;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowBluetoothAdapter.class,
+ ShadowBluetoothUtils.class,
+ })
+public class AudioSharingPasswordPreferenceControllerTest {
+ private static final String PREF_KEY = "audio_sharing_stream_password";
+ private static final String SHARED_PREF_KEY = "default_password";
+ private static final String BROADCAST_PASSWORD = "password";
+ private static final String EDITTEXT_PASSWORD = "edittext_password";
+ private static final String HIDDEN_PASSWORD = "********";
+
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ @Spy Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private LocalBluetoothLeBroadcast mBroadcast;
+ @Mock private LocalBluetoothManager mLocalBtManager;
+ @Mock private LocalBluetoothProfileManager mProfileManager;
+ @Mock private SharedPreferences mSharedPreferences;
+ @Mock private SharedPreferences.Editor mEditor;
+ @Mock private ContentResolver mContentResolver;
+ @Mock private PreferenceScreen mScreen;
+ private AudioSharingPasswordPreferenceController mController;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
+ private AudioSharingPasswordPreference mPreference;
+ private FakeFeatureFactory mFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mShadowBluetoothAdapter.setEnabled(true);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ mLocalBtManager = Utils.getLocalBtManager(mContext);
+ when(mLocalBtManager.getProfileManager()).thenReturn(mProfileManager);
+ when(mProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ when(mContext.getContentResolver()).thenReturn(mContentResolver);
+ when(mContext.getSharedPreferences(anyString(), anyInt())).thenReturn(mSharedPreferences);
+ when(mSharedPreferences.edit()).thenReturn(mEditor);
+ when(mEditor.putString(anyString(), anyString())).thenReturn(mEditor);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+ mController = new AudioSharingPasswordPreferenceController(mContext, PREF_KEY);
+ mPreference = spy(new AudioSharingPasswordPreference(mContext));
+ when(mScreen.findPreference(PREF_KEY)).thenReturn(mPreference);
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagOn_available() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagOff_unsupported() {
+ 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_SHARING);
+ mController.onStart(mLifecycleOwner);
+ verify(mContentResolver, never()).registerContentObserver(any(), anyBoolean(), any());
+ verify(mSharedPreferences, never()).registerOnSharedPreferenceChangeListener(any());
+ }
+
+ @Test
+ public void onStart_flagOn_registerCallbacks() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStart(mLifecycleOwner);
+ verify(mContentResolver).registerContentObserver(any(), anyBoolean(), any());
+ verify(mSharedPreferences).registerOnSharedPreferenceChangeListener(any());
+ }
+
+ @Test
+ public void onStop_flagOff_doNothing() {
+ mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStop(mLifecycleOwner);
+ verify(mContentResolver, never()).unregisterContentObserver(any());
+ verify(mSharedPreferences, never()).unregisterOnSharedPreferenceChangeListener(any());
+ }
+
+ @Test
+ public void onStop_flagOn_registerCallbacks() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.onStop(mLifecycleOwner);
+ verify(mContentResolver).unregisterContentObserver(any());
+ verify(mSharedPreferences).unregisterOnSharedPreferenceChangeListener(any());
+ }
+
+ @Test
+ public void displayPreference_setupPreference_noPassword() {
+ when(mSharedPreferences.getString(anyString(), anyString())).thenReturn(EDITTEXT_PASSWORD);
+ when(mBroadcast.getBroadcastCode()).thenReturn(new byte[] {});
+
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.isPassword()).isTrue();
+ assertThat(mPreference.getDialogLayoutResource())
+ .isEqualTo(R.layout.audio_sharing_password_dialog);
+ assertThat(mPreference.getText()).isEqualTo(EDITTEXT_PASSWORD);
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getString(R.string.audio_streams_no_password_summary));
+ verify(mPreference).setValidator(any());
+ verify(mPreference).setOnDialogEventListener(any());
+ }
+
+ @Test
+ public void contentObserver_updatePreferenceOnChange() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mBroadcast.getBroadcastCode())
+ .thenReturn(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ mController.onStart(mLifecycleOwner);
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ ArgumentCaptor<ContentObserver> observerCaptor =
+ ArgumentCaptor.forClass(ContentObserver.class);
+ verify(mContentResolver)
+ .registerContentObserver(any(), anyBoolean(), observerCaptor.capture());
+
+ var observer = observerCaptor.getValue();
+ assertThat(observer).isNotNull();
+ observer.onChange(true);
+ verify(mPreference).setText(anyString());
+ verify(mPreference).setSummary(anyString());
+ }
+
+ @Test
+ public void sharedPrefChangeListener_updatePreferenceOnChange() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mBroadcast.getBroadcastCode())
+ .thenReturn(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ mController.onStart(mLifecycleOwner);
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ ArgumentCaptor<SharedPreferences.OnSharedPreferenceChangeListener> captor =
+ ArgumentCaptor.forClass(SharedPreferences.OnSharedPreferenceChangeListener.class);
+ verify(mSharedPreferences).registerOnSharedPreferenceChangeListener(captor.capture());
+
+ var observer = captor.getValue();
+ assertThat(captor).isNotNull();
+ observer.onSharedPreferenceChanged(mSharedPreferences, SHARED_PREF_KEY);
+ verify(mPreference).setText(anyString());
+ verify(mPreference).setSummary(anyString());
+ }
+
+ @Test
+ public void displayPreference_setupPreference_hasPassword() {
+ when(mBroadcast.getBroadcastCode())
+ .thenReturn(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ mController.displayPreference(mScreen);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(mPreference.isPassword()).isTrue();
+ assertThat(mPreference.getDialogLayoutResource())
+ .isEqualTo(R.layout.audio_sharing_password_dialog);
+ assertThat(mPreference.getText()).isEqualTo(BROADCAST_PASSWORD);
+ assertThat(mPreference.getSummary()).isEqualTo(HIDDEN_PASSWORD);
+ verify(mPreference).setValidator(any());
+ verify(mPreference).setOnDialogEventListener(any());
+ }
+
+ @Test
+ public void onBindDialogView_updatePreference_isBroadcasting_noPassword() {
+ when(mBroadcast.getBroadcastCode()).thenReturn(new byte[] {});
+ when(mBroadcast.isEnabled(any())).thenReturn(true);
+ mController.displayPreference(mScreen);
+ mController.onBindDialogView();
+ ShadowLooper.idleMainLooper();
+
+ verify(mPreference).setEditable(false);
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void onBindDialogView_updatePreference_isNotBroadcasting_hasPassword() {
+ when(mBroadcast.getBroadcastCode())
+ .thenReturn(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ mController.displayPreference(mScreen);
+ mController.onBindDialogView();
+ ShadowLooper.idleMainLooper();
+
+ verify(mPreference).setEditable(true);
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onPreferenceDataChanged_isBroadcasting_doNothing() {
+ when(mBroadcast.isEnabled(any())).thenReturn(true);
+ mController.displayPreference(mScreen);
+ mController.onPreferenceDataChanged(BROADCAST_PASSWORD, /* isPublicBroadcast= */ false);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast, never()).setBroadcastCode(any());
+ verify(mFeatureFactory.metricsFeatureProvider, never()).action(any(), anyInt(), anyInt());
+ }
+
+ @Test
+ public void onPreferenceDataChanged_noChange_doNothing() {
+ when(mSharedPreferences.getString(anyString(), anyString())).thenReturn(EDITTEXT_PASSWORD);
+ when(mBroadcast.getBroadcastCode()).thenReturn(new byte[] {});
+ mController.displayPreference(mScreen);
+ mController.onPreferenceDataChanged(EDITTEXT_PASSWORD, /* isPublicBroadcast= */ true);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast, never()).setBroadcastCode(any());
+ verify(mFeatureFactory.metricsFeatureProvider, never()).action(any(), anyInt(), anyInt());
+ }
+
+ @Test
+ public void onPreferenceDataChanged_updateToNonPublicBroadcast() {
+ when(mSharedPreferences.getString(anyString(), anyString())).thenReturn(EDITTEXT_PASSWORD);
+ when(mBroadcast.getBroadcastCode()).thenReturn(new byte[] {});
+ mController.displayPreference(mScreen);
+ mController.onPreferenceDataChanged(BROADCAST_PASSWORD, /* isPublicBroadcast= */ false);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast).setBroadcastCode(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ verify(mEditor).putString(anyString(), eq(BROADCAST_PASSWORD));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_STREAM_PASSWORD_UPDATED, 0);
+ }
+
+ @Test
+ public void onPreferenceDataChanged_updateToPublicBroadcast() {
+ when(mSharedPreferences.getString(anyString(), anyString())).thenReturn(EDITTEXT_PASSWORD);
+ when(mBroadcast.getBroadcastCode())
+ .thenReturn(BROADCAST_PASSWORD.getBytes(StandardCharsets.UTF_8));
+ mController.displayPreference(mScreen);
+ mController.onPreferenceDataChanged(EDITTEXT_PASSWORD, /* isPublicBroadcast= */ true);
+ ShadowLooper.idleMainLooper();
+
+ verify(mBroadcast).setBroadcastCode("".getBytes(StandardCharsets.UTF_8));
+ verify(mEditor, never()).putString(anyString(), eq(EDITTEXT_PASSWORD));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(mContext, SettingsEnums.ACTION_AUDIO_STREAM_PASSWORD_UPDATED, 1);
+ }
+
+ @Test
+ public void idTextValid_emptyString() {
+ boolean valid = mController.isTextValid("");
+
+ assertThat(valid).isFalse();
+ }
+
+ @Test
+ public void idTextValid_validPassword() {
+ boolean valid = mController.isTextValid(BROADCAST_PASSWORD);
+
+ assertThat(valid).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java
new file mode 100644
index 0000000..0b87e8c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordPreferenceTest.java
@@ -0,0 +1,215 @@
+/*
+ * 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.audiosharing;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+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.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+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;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioSharingPasswordPreferenceTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final String EDIT_TEXT_CONTENT = "text";
+ private Context mContext;
+ private AudioSharingPasswordPreference mPreference;
+
+ @Before
+ public void setup() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mPreference = new AudioSharingPasswordPreference(mContext, null);
+ }
+
+ @Test
+ public void onBindDialogView_correctLayout() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ 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);
+
+ assertThat(editText).isNotNull();
+ assertThat(checkBox).isNotNull();
+ assertThat(dialogMessage).isNotNull();
+ }
+
+ @Test
+ public void setEditable_true() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ 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);
+
+ mPreference.setEditable(true);
+
+ assertThat(editText).isNotNull();
+ assertThat(editText.isEnabled()).isTrue();
+ assertThat(editText.getAlpha()).isEqualTo(1.0f);
+ assertThat(checkBox).isNotNull();
+ assertThat(checkBox.isEnabled()).isTrue();
+ assertThat(dialogMessage).isNotNull();
+ assertThat(dialogMessage.getVisibility()).isEqualTo(GONE);
+ }
+
+ @Test
+ public void setEditable_false() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ 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);
+
+ mPreference.setEditable(false);
+
+ assertThat(editText).isNotNull();
+ assertThat(editText.isEnabled()).isFalse();
+ assertThat(editText.getAlpha()).isLessThan(1.0f);
+ assertThat(checkBox).isNotNull();
+ assertThat(checkBox.isEnabled()).isFalse();
+ assertThat(dialogMessage).isNotNull();
+ assertThat(dialogMessage.getVisibility()).isEqualTo(VISIBLE);
+ }
+
+ @Test
+ public void setChecked_true() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ CheckBox checkBox = view.findViewById(R.id.audio_sharing_stream_password_checkbox);
+
+ mPreference.setChecked(true);
+
+ assertThat(checkBox).isNotNull();
+ assertThat(checkBox.isChecked()).isTrue();
+ }
+
+ @Test
+ public void setChecked_false() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ CheckBox checkBox = view.findViewById(R.id.audio_sharing_stream_password_checkbox);
+
+ mPreference.setChecked(false);
+
+ assertThat(checkBox).isNotNull();
+ assertThat(checkBox.isChecked()).isFalse();
+ }
+
+ @Test
+ public void onDialogEventListener_onClick_positiveButton() {
+ AudioSharingPasswordPreference.OnDialogEventListener listener =
+ mock(AudioSharingPasswordPreference.OnDialogEventListener.class);
+ mPreference.setOnDialogEventListener(listener);
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ EditText editText = view.findViewById(android.R.id.edit);
+ assertThat(editText).isNotNull();
+ editText.setText(EDIT_TEXT_CONTENT);
+
+ mPreference.onClick(mock(DialogInterface.class), DialogInterface.BUTTON_POSITIVE);
+
+ verify(listener).onBindDialogView();
+ verify(listener).onPreferenceDataChanged(eq(EDIT_TEXT_CONTENT), anyBoolean());
+ }
+
+ @Test
+ public void onDialogEventListener_onClick_negativeButton_doNothing() {
+ AudioSharingPasswordPreference.OnDialogEventListener listener =
+ mock(AudioSharingPasswordPreference.OnDialogEventListener.class);
+ mPreference.setOnDialogEventListener(listener);
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+
+ EditText editText = view.findViewById(android.R.id.edit);
+ assertThat(editText).isNotNull();
+ editText.setText(EDIT_TEXT_CONTENT);
+
+ mPreference.onClick(mock(DialogInterface.class), DialogInterface.BUTTON_NEGATIVE);
+
+ verify(listener).onBindDialogView();
+ verify(listener, never()).onPreferenceDataChanged(anyString(), anyBoolean());
+ }
+
+ @Test
+ public void onPrepareDialogBuilder_editable_doNothing() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+ mPreference.setEditable(true);
+
+ var dialogBuilder = mock(AlertDialog.Builder.class);
+ mPreference.onPrepareDialogBuilder(
+ dialogBuilder, mock(DialogInterface.OnClickListener.class));
+
+ verify(dialogBuilder, never()).setPositiveButton(any(), any());
+ }
+
+ @Test
+ public void onPrepareDialogBuilder_notEditable_disableButton() {
+ View view =
+ LayoutInflater.from(mContext).inflate(R.layout.audio_sharing_password_dialog, null);
+ mPreference.onBindDialogView(view);
+ mPreference.setEditable(false);
+
+ var dialogBuilder = mock(AlertDialog.Builder.class);
+ mPreference.onPrepareDialogBuilder(
+ dialogBuilder, mock(DialogInterface.OnClickListener.class));
+
+ verify(dialogBuilder).setPositiveButton(any(), any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordValidatorTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordValidatorTest.java
new file mode 100644
index 0000000..5c96fe1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingPasswordValidatorTest.java
@@ -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.connecteddevice.audiosharing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioSharingPasswordValidatorTest {
+ private AudioSharingPasswordValidator mValidator;
+
+ @Before
+ public void setUp() {
+ mValidator = new AudioSharingPasswordValidator();
+ }
+
+ @Test
+ public void testValidPasswords() {
+ assertThat(mValidator.isTextValid("1234")).isTrue();
+ assertThat(mValidator.isTextValid("Password")).isTrue();
+ assertThat(mValidator.isTextValid("SecurePass123!")).isTrue();
+ assertThat(mValidator.isTextValid("ÄÖÜß")).isTrue();
+ assertThat(mValidator.isTextValid("1234567890abcdef")).isTrue();
+ }
+
+ @Test
+ public void testInvalidPasswords() {
+ assertThat(mValidator.isTextValid(null)).isFalse();
+ assertThat(mValidator.isTextValid("")).isFalse();
+ assertThat(mValidator.isTextValid("abc")).isFalse();
+ assertThat(mValidator.isTextValid("ThisIsAVeryLongPasswordThatExceedsSixteenOctets"))
+ .isFalse();
+ assertThat(mValidator.isTextValid("Invalid\uDC00")).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java
index b6babfb..c0af09f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingStopDialogFragmentTest.java
@@ -149,6 +149,20 @@
}
@Test
+ public void onCreateDialog_unattachedFragment_dialogNotExist() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ AudioSharingStopDialogFragment.show(
+ new Fragment(),
+ ImmutableList.of(TEST_DEVICE_ITEM2),
+ mCachedDevice1,
+ EMPTY_EVENT_LISTENER,
+ TEST_EVENT_DATA_LIST);
+ shadowMainLooper().idle();
+ AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+ }
+
+ @Test
public void onCreateDialog_oneDeviceInSharing_showDialogWithCorrectMessage() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
AudioSharingStopDialogFragment.show(
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 45d99c7..d68b68b 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingSwitchBarControllerTest.java
@@ -30,6 +30,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
@@ -39,6 +40,7 @@
import android.bluetooth.BluetoothLeBroadcast;
import android.bluetooth.BluetoothLeBroadcastAssistant;
import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothStatusCodes;
import android.content.BroadcastReceiver;
@@ -431,6 +433,38 @@
}
@Test
+ public void onPlaybackStarted_notInit_noDialog() {
+ FeatureFlagUtils.setEnabled(
+ mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
+ when(mBtnView.isEnabled()).thenReturn(true);
+ when(mAssistant.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED}))
+ .thenReturn(ImmutableList.of(mDevice2, mDevice1));
+ doNothing().when(mBroadcast).startPrivateBroadcast();
+ mController =
+ new AudioSharingSwitchBarController(
+ mContext,
+ mSwitchBar,
+ new AudioSharingSwitchBarController.OnAudioSharingStateChangedListener() {
+ @Override
+ public void onAudioSharingStateChanged() {}
+
+ @Override
+ public void onAudioSharingProfilesConnected() {}
+ });
+ mController.onCheckedChanged(mBtnView, /* isChecked= */ true);
+ verify(mBroadcast).startPrivateBroadcast();
+ mController.mBroadcastCallback.onPlaybackStarted(0, 0);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(Context.class), eq(SettingsEnums.ACTION_AUTO_JOIN_AUDIO_SHARING));
+
+ List<Fragment> childFragments = mParentFragment.getChildFragmentManager().getFragments();
+ assertThat(childFragments).isEmpty();
+ }
+
+ @Test
public void onPlaybackStarted_showJoinAudioSharingDialog() {
FeatureFlagUtils.setEnabled(
mContext, FeatureFlagUtils.SETTINGS_NEED_CONNECTED_BLE_DEVICE_FOR_BROADCAST, true);
@@ -485,6 +519,11 @@
shadowOf(Looper.getMainLooper()).idle();
assertThat(mSwitchBar.isChecked()).isFalse();
assertThat(mOnAudioSharingStateChanged).isFalse();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_START_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
when(mBroadcast.isEnabled(any())).thenReturn(true);
mController.mBroadcastCallback.onBroadcastStarted(/* reason= */ 1, /* broadcastId= */ 1);
@@ -497,6 +536,11 @@
shadowOf(Looper.getMainLooper()).idle();
assertThat(mSwitchBar.isChecked()).isTrue();
assertThat(mOnAudioSharingStateChanged).isFalse();
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_STOP_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
when(mBroadcast.isEnabled(any())).thenReturn(false);
mController.mBroadcastCallback.onBroadcastStopped(/* reason= */ 1, /* broadcastId= */ 1);
@@ -517,4 +561,43 @@
verify(mSwitchBar, never()).setChecked(anyBoolean());
assertThat(mOnAudioSharingStateChanged).isFalse();
}
+
+ @Test
+ public void testBluetoothLeBroadcastAssistantCallbacks_logAction() {
+ BluetoothLeBroadcastMetadata metadata = mock(BluetoothLeBroadcastMetadata.class);
+ mController.mBroadcastAssistantCallback.onSourceAddFailed(
+ mDevice1, metadata, /* reason= */ 1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ mContext,
+ SettingsEnums.ACTION_AUDIO_SHARING_JOIN_FAILED,
+ SettingsEnums.AUDIO_SHARING_SETTINGS);
+ }
+
+ @Test
+ public void testBluetoothLeBroadcastAssistantCallbacks_doNothing() {
+ BluetoothLeBroadcastReceiveState state = mock(BluetoothLeBroadcastReceiveState.class);
+ BluetoothLeBroadcastMetadata metadata = mock(BluetoothLeBroadcastMetadata.class);
+
+ // Do nothing
+ mController.mBroadcastAssistantCallback.onReceiveStateChanged(
+ mDevice1, /* sourceId= */ 1, state);
+ mController.mBroadcastAssistantCallback.onSearchStarted(/* reason= */ 1);
+ 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(
+ mDevice1, /* sourceId= */ 1, /* reason= */ 1);
+ mController.mBroadcastAssistantCallback.onSourceModified(
+ mDevice1, /* sourceId= */ 1, /* reason= */ 1);
+ mController.mBroadcastAssistantCallback.onSourceModifyFailed(
+ mDevice1, /* sourceId= */ 1, /* reason= */ 1);
+ mController.mBroadcastAssistantCallback.onSourceFound(metadata);
+ mController.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 1);
+ verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceBadCodeStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceBadCodeStateTest.java
index 2fddff5..391a7b1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceBadCodeStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceBadCodeStateTest.java
@@ -20,22 +20,45 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+
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;
@RunWith(RobolectricTestRunner.class)
public class AddSourceBadCodeStateTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private AudioStreamPreference mPreference;
+ @Mock private AudioStreamsProgressCategoryController mController;
+ @Mock private AudioStreamsHelper mHelper;
+ private FakeFeatureFactory mFeatureFactory;
private AddSourceBadCodeState mInstance;
@Before
public void setUp() {
- mInstance = AddSourceBadCodeState.getInstance();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mInstance = new AddSourceBadCodeState();
}
@Test
public void testGetInstance() {
+ mInstance = AddSourceBadCodeState.getInstance();
assertThat(mInstance).isNotNull();
assertThat(mInstance).isInstanceOf(SyncedState.class);
}
@@ -55,4 +78,19 @@
AudioStreamsProgressCategoryController.AudioStreamState
.ADD_SOURCE_BAD_CODE);
}
+
+ @Test
+ public void testPerformAction() {
+ when(mPreference.getContext()).thenReturn(mContext);
+ when(mPreference.getSourceOriginForLogging())
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
+
+ mInstance.performAction(mPreference, mController, mHelper);
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_FAILED_BAD_CODE),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceFailedStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceFailedStateTest.java
index d8b1fcf..917d8de 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceFailedStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceFailedStateTest.java
@@ -20,22 +20,45 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+
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;
@RunWith(RobolectricTestRunner.class)
public class AddSourceFailedStateTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private AudioStreamPreference mPreference;
+ @Mock private AudioStreamsProgressCategoryController mController;
+ @Mock private AudioStreamsHelper mHelper;
+ private FakeFeatureFactory mFeatureFactory;
private AddSourceFailedState mInstance;
@Before
public void setUp() {
- mInstance = AddSourceFailedState.getInstance();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mInstance = new AddSourceFailedState();
}
@Test
public void testGetInstance() {
+ mInstance = AddSourceFailedState.getInstance();
assertThat(mInstance).isNotNull();
assertThat(mInstance).isInstanceOf(SyncedState.class);
}
@@ -54,4 +77,19 @@
.isEqualTo(
AudioStreamsProgressCategoryController.AudioStreamState.ADD_SOURCE_FAILED);
}
+
+ @Test
+ public void testPerformAction() {
+ when(mPreference.getContext()).thenReturn(mContext);
+ when(mPreference.getSourceOriginForLogging())
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
+
+ mInstance.performAction(mPreference, mController, mHelper);
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_FAILED_OTHER),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseStateTest.java
index 6e5342b..ce21658 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseStateTest.java
@@ -22,11 +22,21 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Rule;
@@ -36,27 +46,41 @@
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
import org.robolectric.shadows.ShadowLooper;
import java.util.concurrent.TimeUnit;
@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowAlertDialog.class,
+ })
public class AddSourceWaitForResponseStateTest {
- private static final int BROADCAST_ID = 1;
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final int BROADCAST_ID = 1;
+ private final Context mContext = spy(ApplicationProvider.getApplicationContext());
@Mock private AudioStreamPreference mMockPreference;
@Mock private AudioStreamsProgressCategoryController mMockController;
@Mock private AudioStreamsHelper mMockHelper;
@Mock private BluetoothLeBroadcastMetadata mMockMetadata;
+ @Mock private AudioStreamsRepository mMockRepository;
+ private FakeFeatureFactory mFeatureFactory;
private AddSourceWaitForResponseState mInstance;
@Before
public void setUp() {
- mInstance = AddSourceWaitForResponseState.getInstance();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mInstance = new AddSourceWaitForResponseState();
+ when(mMockPreference.getContext()).thenReturn(mContext);
+ when(mMockPreference.getSourceOriginForLogging())
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
}
@Test
public void testGetInstance() {
+ mInstance = AddSourceWaitForResponseState.getInstance();
assertThat(mInstance).isNotNull();
assertThat(mInstance).isInstanceOf(AudioStreamStateHandler.class);
}
@@ -93,11 +117,18 @@
public void testPerformAction_metadataIsNotNull_addSource() {
when(mMockPreference.getAudioStreamMetadata()).thenReturn(mMockMetadata);
when(mMockPreference.getSourceOriginForLogging())
- .thenReturn(SourceOriginForLogging.UNKNOWN);
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
+ mInstance.setAudioStreamsRepositoryForTesting(mMockRepository);
mInstance.performAction(mMockPreference, mMockController, mMockHelper);
verify(mMockHelper).addSource(mMockMetadata);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ verify(mMockRepository).cacheMetadata(mMockMetadata);
verify(mMockController, never()).handleSourceFailedToConnect(anyInt());
}
@@ -108,12 +139,28 @@
when(mMockPreference.getAudioStreamState()).thenReturn(mInstance.getStateEnum());
when(mMockPreference.getAudioStreamBroadcastId()).thenReturn(BROADCAST_ID);
when(mMockPreference.getSourceOriginForLogging())
- .thenReturn(SourceOriginForLogging.UNKNOWN);
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
+ when(mMockController.getFragment()).thenReturn(mock(AudioStreamsDashboardFragment.class));
+ mInstance.setAudioStreamsRepositoryForTesting(mMockRepository);
mInstance.performAction(mMockPreference, mMockController, mMockHelper);
ShadowLooper.idleMainLooper(ADD_SOURCE_WAIT_FOR_RESPONSE_TIMEOUT_MILLIS, TimeUnit.SECONDS);
verify(mMockHelper).addSource(mMockMetadata);
verify(mMockController).handleSourceFailedToConnect(BROADCAST_ID);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ verify(mMockRepository).cacheMetadata(mMockMetadata);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_FAILED_TIMEOUT),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ verify(mContext).getString(R.string.audio_streams_dialog_stream_is_not_available);
+ verify(mContext).getString(R.string.audio_streams_is_not_playing);
+ verify(mContext).getString(R.string.audio_streams_dialog_close);
}
}
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 cbf1432..c6fb361 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
@@ -16,22 +16,36 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothLeBroadcastAssistant;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.content.Context;
import android.view.View;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
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.ShadowThreadUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.ActionButtonsPreference;
import org.junit.After;
@@ -39,14 +53,17 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.Executor;
@RunWith(RobolectricTestRunner.class)
@Config(
@@ -63,14 +80,23 @@
@Mock private AudioStreamsHelper mAudioStreamsHelper;
@Mock private PreferenceScreen mScreen;
@Mock private BluetoothLeBroadcastReceiveState mBroadcastReceiveState;
+ @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+ @Mock private AudioStreamsRepository mRepository;
@Mock private ActionButtonsPreference mPreference;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
+ private FakeFeatureFactory mFeatureFactory;
private AudioStreamButtonController mController;
@Before
public void setUp() {
ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mAssistant);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
mController = new AudioStreamButtonController(mContext, KEY);
mController.init(BROADCAST_ID);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
when(mScreen.findPreference(KEY)).thenReturn(mPreference);
when(mPreference.getContext()).thenReturn(mContext);
when(mPreference.setButton1Text(anyInt())).thenReturn(mPreference);
@@ -86,6 +112,40 @@
}
@Test
+ public void onStart_registerCallbacks() {
+ mController.onStart(mLifecycleOwner);
+ verify(mAssistant)
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStart_profileNull_doNothing() {
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(null);
+ mController = new AudioStreamButtonController(mContext, KEY);
+ mController.onStart(mLifecycleOwner);
+ verify(mAssistant, never())
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStop_unregisterCallbacks() {
+ mController.onStop(mLifecycleOwner);
+ verify(mAssistant)
+ .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStop_profileNull_doNothing() {
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(null);
+ mController = new AudioStreamButtonController(mContext, KEY);
+ mController.onStop(mLifecycleOwner);
+ verify(mAssistant, never())
+ .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
public void testDisplayPreference_sourceConnected_setDisconnectButton() {
when(mAudioStreamsHelper.getAllConnectedSources())
.thenReturn(List.of(mBroadcastReceiveState));
@@ -96,18 +156,133 @@
verify(mPreference).setButton1Enabled(true);
verify(mPreference).setButton1Text(R.string.audio_streams_disconnect);
verify(mPreference).setButton1Icon(com.android.settings.R.drawable.ic_settings_close);
- verify(mPreference).setButton1OnClickListener(any(View.OnClickListener.class));
+
+ ArgumentCaptor<View.OnClickListener> listenerCaptor =
+ ArgumentCaptor.forClass(View.OnClickListener.class);
+ verify(mPreference).setButton1OnClickListener(listenerCaptor.capture());
+ var listener = listenerCaptor.getValue();
+
+ assertThat(listener).isNotNull();
+ listener.onClick(mock(View.class));
+ verify(mAudioStreamsHelper).removeSource(BROADCAST_ID);
+ verify(mPreference).setButton1Enabled(false);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_LEAVE_BUTTON_CLICK));
}
@Test
public void testDisplayPreference_sourceNotConnected_setConnectButton() {
when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+ mController.setAudioStreamsRepositoryForTesting(mRepository);
+ var metadataToRejoin = mock(BluetoothLeBroadcastMetadata.class);
+ when(mRepository.getSavedMetadata(any(), anyInt())).thenReturn(metadataToRejoin);
mController.displayPreference(mScreen);
verify(mPreference).setButton1Enabled(true);
verify(mPreference).setButton1Text(R.string.audio_streams_connect);
verify(mPreference).setButton1Icon(com.android.settings.R.drawable.ic_add_24dp);
- verify(mPreference).setButton1OnClickListener(any(View.OnClickListener.class));
+
+ ArgumentCaptor<View.OnClickListener> listenerCaptor =
+ ArgumentCaptor.forClass(View.OnClickListener.class);
+ verify(mPreference).setButton1OnClickListener(listenerCaptor.capture());
+ var listener = listenerCaptor.getValue();
+
+ assertThat(listener).isNotNull();
+ listener.onClick(mock(View.class));
+ verify(mAudioStreamsHelper).addSource(metadataToRejoin);
+ verify(mPreference).setButton1Enabled(false);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN), anyInt());
+ }
+
+ @Test
+ public void testCallback_onSourceRemoved_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceRemoved(
+ mock(BluetoothDevice.class), /* sourceId= */ 0, /* reason= */ 0);
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mPreference, times(2)).setButton1Enabled(true);
+ verify(mPreference, times(2)).setButton1Text(R.string.audio_streams_connect);
+ verify(mPreference, times(2)).setButton1Icon(com.android.settings.R.drawable.ic_add_24dp);
+ }
+
+ @Test
+ public void testCallback_onSourceRemovedFailed_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources())
+ .thenReturn(List.of(mBroadcastReceiveState));
+ when(mBroadcastReceiveState.getBroadcastId()).thenReturn(BROADCAST_ID);
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceRemoveFailed(
+ mock(BluetoothDevice.class), /* sourceId= */ 0, /* reason= */ 0);
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_LEAVE_FAILED));
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mPreference, times(2)).setButton1Enabled(true);
+ verify(mPreference, times(2)).setButton1Text(R.string.audio_streams_disconnect);
+ verify(mPreference, times(2))
+ .setButton1Icon(com.android.settings.R.drawable.ic_settings_close);
+ }
+
+ @Test
+ public void testCallback_onReceiveStateChanged_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources())
+ .thenReturn(List.of(mBroadcastReceiveState));
+ when(mBroadcastReceiveState.getBroadcastId()).thenReturn(BROADCAST_ID);
+ BluetoothLeBroadcastReceiveState state = mock(BluetoothLeBroadcastReceiveState.class);
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(state.getBisSyncState()).thenReturn(bisSyncState);
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onReceiveStateChanged(
+ mock(BluetoothDevice.class), /* sourceId= */ 0, state);
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_SUCCEED), anyInt());
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mPreference, times(2)).setButton1Enabled(true);
+ verify(mPreference, times(2)).setButton1Text(R.string.audio_streams_disconnect);
+ verify(mPreference, times(2))
+ .setButton1Icon(com.android.settings.R.drawable.ic_settings_close);
+ }
+
+ @Test
+ public void testCallback_onSourceAddFailed_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceAddFailed(
+ mock(BluetoothDevice.class),
+ mock(BluetoothLeBroadcastMetadata.class),
+ /* reason= */ 0);
+
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_FAILED_OTHER), anyInt());
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mPreference, times(2)).setButton1Enabled(true);
+ verify(mPreference, times(2)).setButton1Text(R.string.audio_streams_connect);
+ verify(mPreference, times(2)).setButton1Icon(com.android.settings.R.drawable.ic_add_24dp);
+ }
+
+ @Test
+ public void testCallback_onSourceLost_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 0);
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mPreference, times(2)).setButton1Enabled(true);
+ verify(mPreference, times(2)).setButton1Text(R.string.audio_streams_connect);
+ verify(mPreference, times(2)).setButton1Icon(com.android.settings.R.drawable.ic_add_24dp);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivityTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivityTest.java
index e967a12..1f05cbb 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogActivityTest.java
@@ -18,28 +18,132 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothStatusCodes;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+import com.android.settingslib.bluetooth.VolumeControlProfile;
+import com.android.settingslib.flags.Flags;
+
+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.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowBluetoothAdapter.class,
+ ShadowBluetoothUtils.class,
+ })
public class AudioStreamConfirmDialogActivityTest {
+ @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ @Mock private LocalBluetoothManager mLocalBluetoothManager;
+ @Mock private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
+ @Mock private LocalBluetoothLeBroadcast mBroadcast;
+ @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+ @Mock private VolumeControlProfile mVolumeControl;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
private AudioStreamConfirmDialogActivity mActivity;
@Before
public void setUp() {
- mActivity = Robolectric.buildActivity(AudioStreamConfirmDialogActivity.class).get();
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mShadowBluetoothAdapter.setEnabled(true);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
+ BluetoothStatusCodes.FEATURE_SUPPORTED);
+ ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
+ when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
+ when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(mBroadcast);
+ when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile())
+ .thenReturn(mAssistant);
+ when(mLocalBluetoothProfileManager.getVolumeControlProfile()).thenReturn(mVolumeControl);
+ when(mBroadcast.isProfileReady()).thenReturn(true);
+ when(mAssistant.isProfileReady()).thenReturn(true);
+ when(mVolumeControl.isProfileReady()).thenReturn(true);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowBluetoothUtils.reset();
}
@Test
public void isValidFragment_returnsTrue() {
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
assertThat(mActivity.isValidFragment(AudioStreamConfirmDialog.class.getName())).isTrue();
}
@Test
public void isValidFragment_returnsFalse() {
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
assertThat(mActivity.isValidFragment("")).isFalse();
}
+
+ @Test
+ public void isToolbarEnabled_returnsFalse() {
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
+ assertThat(mActivity.isToolbarEnabled()).isFalse();
+ }
+
+ @Test
+ public void setupActivity_serviceNotReady_registerCallback() {
+ when(mBroadcast.isProfileReady()).thenReturn(false);
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
+
+ verify(mLocalBluetoothProfileManager).addServiceListener(any());
+ }
+
+ @Test
+ public void setupActivity_serviceNotReady_registerCallback_onServiceCallback() {
+ when(mBroadcast.isProfileReady()).thenReturn(false);
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
+
+ verify(mLocalBluetoothProfileManager).addServiceListener(any());
+
+ when(mBroadcast.isProfileReady()).thenReturn(true);
+ mActivity.onServiceConnected();
+ verify(mLocalBluetoothProfileManager).removeServiceListener(any());
+
+ mActivity.onServiceDisconnected();
+ // Do nothing.
+ }
+
+ @Test
+ public void setupActivity_serviceReady_doNothing() {
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
+
+ verify(mLocalBluetoothProfileManager, never()).addServiceListener(any());
+ }
+
+ @Test
+ public void onStop_unregisterCallback() {
+ mActivity = Robolectric.setupActivity(AudioStreamConfirmDialogActivity.class);
+ mActivity.onStop();
+
+ verify(mLocalBluetoothProfileManager).removeServiceListener(any());
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogTest.java
index c7aafe8..601c432 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamConfirmDialogTest.java
@@ -16,14 +16,21 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static android.app.settings.SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_LISTEN;
+
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog.DEFAULT_DEVICE_NAME;
import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsDashboardFragment.KEY_BROADCAST_METADATA;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
+import android.app.Dialog;
import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@@ -127,6 +134,8 @@
assertThat(mDialogFragment.getMetricsCategory())
.isEqualTo(SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_FEATURE_UNSUPPORTED);
+ assertThat(mDialogFragment.mActivity).isNotNull();
+ mDialogFragment.mActivity = spy(mDialogFragment.mActivity);
var dialog = mDialogFragment.getDialog();
assertThat(dialog).isNotNull();
@@ -152,6 +161,10 @@
assertThat(rightButton).isNotNull();
assertThat(rightButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ rightButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+ verify(mDialogFragment.mActivity).finish();
}
@Test
@@ -165,6 +178,8 @@
assertThat(mDialogFragment.getMetricsCategory())
.isEqualTo(SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_NO_LE_DEVICE);
+ assertThat(mDialogFragment.mActivity).isNotNull();
+ mDialogFragment.mActivity = spy(mDialogFragment.mActivity);
var dialog = mDialogFragment.getDialog();
assertThat(dialog).isNotNull();
@@ -184,11 +199,20 @@
View leftButton = dialog.findViewById(R.id.left_button);
assertThat(leftButton).isNotNull();
assertThat(leftButton.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(leftButton.hasOnClickListeners()).isTrue();
+
+ leftButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+
Button rightButton = dialog.findViewById(R.id.right_button);
assertThat(rightButton).isNotNull();
assertThat(rightButton.getText())
.isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_button));
assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ rightButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+ verify(mDialogFragment.mActivity, times(2)).finish();
}
@Test
@@ -207,6 +231,8 @@
assertThat(mDialogFragment.getMetricsCategory())
.isEqualTo(SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_DATA_ERROR);
+ assertThat(mDialogFragment.mActivity).isNotNull();
+ mDialogFragment.mActivity = spy(mDialogFragment.mActivity);
var dialog = mDialogFragment.getDialog();
assertThat(dialog).isNotNull();
@@ -231,6 +257,10 @@
assertThat(rightButton).isNotNull();
assertThat(rightButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ rightButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+ verify(mDialogFragment.mActivity).finish();
}
@Test
@@ -252,6 +282,8 @@
assertThat(mDialogFragment.getMetricsCategory())
.isEqualTo(SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_DATA_ERROR);
+ assertThat(mDialogFragment.mActivity).isNotNull();
+ mDialogFragment.mActivity = spy(mDialogFragment.mActivity);
var dialog = mDialogFragment.getDialog();
assertThat(dialog).isNotNull();
@@ -276,6 +308,10 @@
assertThat(rightButton).isNotNull();
assertThat(rightButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ rightButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+ verify(mDialogFragment.mActivity).finish();
}
@Test
@@ -283,7 +319,7 @@
List<BluetoothDevice> devices = new ArrayList<>();
devices.add(mBluetoothDevice);
when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
- when(mBluetoothDevice.getAlias()).thenReturn(DEVICE_NAME);
+ when(mBluetoothDevice.getAlias()).thenReturn("");
Intent intent = new Intent();
intent.putExtra(KEY_BROADCAST_METADATA, VALID_METADATA);
@@ -296,9 +332,11 @@
shadowMainLooper().idle();
assertThat(mDialogFragment.getMetricsCategory())
- .isEqualTo(SettingsEnums.DIALOG_AUDIO_STREAM_CONFIRM_LISTEN);
+ .isEqualTo(DIALOG_AUDIO_STREAM_CONFIRM_LISTEN);
+ assertThat(mDialogFragment.mActivity).isNotNull();
+ mDialogFragment.mActivity = spy(mDialogFragment.mActivity);
- var dialog = mDialogFragment.getDialog();
+ Dialog dialog = mDialogFragment.getDialog();
assertThat(dialog).isNotNull();
assertThat(dialog.isShowing()).isTrue();
TextView title = dialog.findViewById(R.id.dialog_title);
@@ -311,17 +349,27 @@
assertThat(subtitle1.getVisibility()).isEqualTo(View.VISIBLE);
TextView subtitle2 = dialog.findViewById(R.id.dialog_subtitle_2);
assertThat(subtitle2).isNotNull();
+ var defaultName = mContext.getString(DEFAULT_DEVICE_NAME);
assertThat(subtitle2.getText())
.isEqualTo(
mContext.getString(
- R.string.audio_streams_dialog_control_volume, DEVICE_NAME));
+ R.string.audio_streams_dialog_control_volume, defaultName));
View leftButton = dialog.findViewById(R.id.left_button);
assertThat(leftButton).isNotNull();
assertThat(leftButton.getVisibility()).isEqualTo(View.VISIBLE);
+ assertThat(leftButton.hasOnClickListeners()).isTrue();
+
+ leftButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+
Button rightButton = dialog.findViewById(R.id.right_button);
assertThat(rightButton).isNotNull();
assertThat(rightButton.getText())
.isEqualTo(mContext.getString(R.string.audio_streams_dialog_listen));
assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ rightButton.callOnClick();
+ assertThat(dialog.isShowing()).isFalse();
+ verify(mDialogFragment.mActivity, times(2)).finish();
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamDetailsFragmentTest.java
index 724c772..46d481a 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamDetailsFragmentTest.java
@@ -16,22 +16,48 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamDetailsFragment.BROADCAST_ID_ARG;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamDetailsFragment.BROADCAST_NAME_ARG;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.test.core.app.ApplicationProvider;
+
import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
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;
@RunWith(RobolectricTestRunner.class)
public class AudioStreamDetailsFragmentTest {
- private AudioStreamDetailsFragment mFragment;
+ @Rule public final MockitoRule mocks = MockitoJUnit.rule();
+ private static final String BROADCAST_NAME = "name";
+ private static final int BROADCAST_ID = 1;
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private AudioStreamHeaderController mHeaderController;
+ @Mock private AudioStreamButtonController mButtonController;
+ private TestFragment mFragment;
@Before
public void setUp() {
- mFragment = new AudioStreamDetailsFragment();
+ mFragment = spy(new TestFragment());
+ doReturn(mHeaderController).when(mFragment).use(AudioStreamHeaderController.class);
+ doReturn(mButtonController).when(mFragment).use(AudioStreamButtonController.class);
}
@Test
@@ -44,4 +70,29 @@
public void getLogTag_returnsCorrectTag() {
assertThat(mFragment.getLogTag()).isEqualTo(AudioStreamDetailsFragment.TAG);
}
+
+ @Test
+ public void getMetricsCategory_returnsCorrectEnum() {
+ assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.AUDIO_STREAM_DETAIL);
+ }
+
+ @Test
+ public void onAttach_getArguments() {
+ Bundle bundle = new Bundle();
+ bundle.putString(BROADCAST_NAME_ARG, BROADCAST_NAME);
+ bundle.putInt(BROADCAST_ID_ARG, BROADCAST_ID);
+ mFragment.setArguments(bundle);
+
+ mFragment.onAttach(mContext);
+
+ verify(mButtonController).init(BROADCAST_ID);
+ verify(mHeaderController).init(mFragment, BROADCAST_NAME, BROADCAST_ID);
+ }
+
+ public static class TestFragment extends AudioStreamDetailsFragment {
+ @Override
+ protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
+ return super.use(clazz);
+ }
+ }
}
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 0cd5d61..327090d 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
@@ -19,12 +19,20 @@
import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController.AUDIO_STREAM_HEADER_LISTENING_NOW_SUMMARY;
import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController.AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothLeBroadcastAssistant;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.content.Context;
+import android.graphics.drawable.Drawable;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
@@ -32,6 +40,8 @@
import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowEntityHeaderController;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.After;
@@ -45,8 +55,10 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.Executor;
@RunWith(RobolectricTestRunner.class)
@Config(
@@ -65,15 +77,21 @@
@Mock private AudioStreamsHelper mAudioStreamsHelper;
@Mock private PreferenceScreen mScreen;
@Mock private BluetoothLeBroadcastReceiveState mBroadcastReceiveState;
+ @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
@Mock private AudioStreamDetailsFragment mFragment;
@Mock private LayoutPreference mPreference;
@Mock private EntityHeaderController mHeaderController;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
private AudioStreamHeaderController mController;
@Before
public void setUp() {
ShadowEntityHeaderController.setUseMock(mHeaderController);
ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mAssistant);
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mController = new AudioStreamHeaderController(mContext, KEY);
mController.init(mFragment, BROADCAST_NAME, BROADCAST_ID);
when(mScreen.findPreference(KEY)).thenReturn(mPreference);
@@ -88,6 +106,40 @@
}
@Test
+ public void onStart_registerCallbacks() {
+ mController.onStart(mLifecycleOwner);
+ verify(mAssistant)
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStart_profileNull_doNothing() {
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(null);
+ mController = new AudioStreamHeaderController(mContext, KEY);
+ mController.onStart(mLifecycleOwner);
+ verify(mAssistant, never())
+ .registerServiceCallBack(
+ any(Executor.class), any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStop_unregisterCallbacks() {
+ mController.onStop(mLifecycleOwner);
+ verify(mAssistant)
+ .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
+ public void onStop_profileNull_doNothing() {
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(null);
+ mController = new AudioStreamHeaderController(mContext, KEY);
+ mController.onStop(mLifecycleOwner);
+ verify(mAssistant, never())
+ .unregisterServiceCallBack(any(BluetoothLeBroadcastAssistant.Callback.class));
+ }
+
+ @Test
public void testDisplayPreference_sourceConnected_setSummary() {
when(mAudioStreamsHelper.getAllConnectedSources())
.thenReturn(List.of(mBroadcastReceiveState));
@@ -96,9 +148,11 @@
mController.displayPreference(mScreen);
verify(mHeaderController).setLabel(BROADCAST_NAME);
+ verify(mHeaderController).setIcon(any(Drawable.class));
verify(mHeaderController)
.setSummary(mContext.getString(AUDIO_STREAM_HEADER_LISTENING_NOW_SUMMARY));
verify(mHeaderController).done(true);
+ verify(mScreen).addPreference(any());
}
@Test
@@ -108,7 +162,54 @@
mController.displayPreference(mScreen);
verify(mHeaderController).setLabel(BROADCAST_NAME);
+ verify(mHeaderController).setIcon(any(Drawable.class));
verify(mHeaderController).setSummary(AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY);
verify(mHeaderController).done(true);
+ verify(mScreen).addPreference(any());
+ }
+
+ @Test
+ public void testCallback_onSourceRemoved_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceRemoved(
+ mock(BluetoothDevice.class), /* sourceId= */ 0, /* reason= */ 0);
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mHeaderController, times(2)).setSummary(AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY);
+ verify(mHeaderController, times(2)).done(true);
+ }
+
+ @Test
+ public void testCallback_onSourceLost_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(Collections.emptyList());
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 1);
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mHeaderController, times(2)).setSummary(AUDIO_STREAM_HEADER_NOT_LISTENING_SUMMARY);
+ verify(mHeaderController, times(2)).done(true);
+ }
+
+ @Test
+ public void testCallback_onReceiveStateChanged_updateButton() {
+ when(mAudioStreamsHelper.getAllConnectedSources())
+ .thenReturn(List.of(mBroadcastReceiveState));
+ when(mBroadcastReceiveState.getBroadcastId()).thenReturn(BROADCAST_ID);
+ BluetoothLeBroadcastReceiveState state = mock(BluetoothLeBroadcastReceiveState.class);
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(state.getBisSyncState()).thenReturn(bisSyncState);
+
+ mController.displayPreference(mScreen);
+ mController.mBroadcastAssistantCallback.onReceiveStateChanged(
+ mock(BluetoothDevice.class), /* sourceId= */ 0, state);
+
+ // Called twice, once in displayPreference, the other one in callback
+ verify(mHeaderController, times(2))
+ .setSummary(mContext.getString(AUDIO_STREAM_HEADER_LISTENING_NOW_SUMMARY));
+ verify(mHeaderController, times(2)).done(true);
}
}
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 b184d88..abdd743 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
@@ -18,22 +18,29 @@
import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.BROADCAST_ID;
import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.DEVICES;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService.LEAVE_BROADCAST_ACTION;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.NotificationManager;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothStatusCodes;
import android.content.Context;
import android.content.Intent;
@@ -43,14 +50,20 @@
import android.media.session.ISession;
import android.media.session.ISessionController;
import android.media.session.MediaSessionManager;
+import android.os.Bundle;
+import android.os.IBinder;
import android.os.RemoteException;
import android.platform.test.flag.junit.SetFlagsRule;
import android.util.DisplayMetrics;
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.ShadowBluetoothUtils;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settingslib.bluetooth.BluetoothEventManager;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -72,10 +85,12 @@
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
+import java.util.Set;
@RunWith(RobolectricTestRunner.class)
@Config(
shadows = {
+ ShadowThreadUtils.class,
ShadowBluetoothAdapter.class,
ShadowBluetoothUtils.class,
ShadowAudioStreamsHelper.class,
@@ -83,6 +98,8 @@
public class AudioStreamMediaServiceTest {
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+ private static final String CHANNEL_ID = "bluetooth_notification_channel";
+ private static final String DEVICE_NAME = "name";
@Mock private Resources mResources;
@Mock private LocalBluetoothManager mLocalBtManager;
@Mock private LocalBluetoothLeBroadcastAssistant mLeBroadcastAssistant;
@@ -91,17 +108,21 @@
@Mock private MediaSessionManager mMediaSessionManager;
@Mock private BluetoothEventManager mBluetoothEventManager;
@Mock private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
+ @Mock private CachedBluetoothDeviceManager mCachedDeviceManager;
@Mock private VolumeControlProfile mVolumeControlProfile;
+ @Mock private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock private BluetoothDevice mDevice;
@Mock private ISession mISession;
@Mock private ISessionController mISessionController;
@Mock private PackageManager mPackageManager;
@Mock private DisplayMetrics mDisplayMetrics;
@Mock private Context mContext;
+ private FakeFeatureFactory mFeatureFactory;
private AudioStreamMediaService mAudioStreamMediaService;
@Before
public void setUp() {
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mLeBroadcastAssistant);
ShadowBluetoothAdapter shadowBluetoothAdapter =
@@ -114,6 +135,9 @@
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
when(mLocalBtManager.getEventManager()).thenReturn(mBluetoothEventManager);
when(mLocalBtManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
+ when(mLocalBtManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
+ when(mCachedDeviceManager.findDevice(any())).thenReturn(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.getName()).thenReturn(DEVICE_NAME);
when(mLocalBluetoothProfileManager.getVolumeControlProfile())
.thenReturn(mVolumeControlProfile);
@@ -169,6 +193,25 @@
}
@Test
+ public void onCreate_flagOn_createNewChannel() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mNotificationManager.getNotificationChannel(anyString())).thenReturn(null);
+
+ mAudioStreamMediaService.onCreate();
+
+ ArgumentCaptor<NotificationChannel> notificationChannelCapture =
+ ArgumentCaptor.forClass(NotificationChannel.class);
+ verify(mNotificationManager)
+ .createNotificationChannel(notificationChannelCapture.capture());
+ NotificationChannel newChannel = notificationChannelCapture.getValue();
+ assertThat(newChannel).isNotNull();
+ assertThat(newChannel.getId()).isEqualTo(CHANNEL_ID);
+ assertThat(newChannel.getName())
+ .isEqualTo(mContext.getString(com.android.settings.R.string.bluetooth));
+ assertThat(newChannel.getImportance()).isEqualTo(NotificationManager.IMPORTANCE_HIGH);
+ }
+
+ @Test
public void onDestroy_flagOff_doNothing() {
mSetFlagsRule.disableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
@@ -183,8 +226,15 @@
@Test
public void onDestroy_flagOn_cleanup() {
mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ var devices = new ArrayList<BluetoothDevice>();
+ devices.add(mDevice);
+
+ Intent intent = new Intent();
+ intent.putExtra(BROADCAST_ID, 1);
+ intent.putParcelableArrayListExtra(DEVICES, devices);
mAudioStreamMediaService.onCreate();
+ mAudioStreamMediaService.onStartCommand(intent, /* flags= */ 0, /* startId= */ 0);
mAudioStreamMediaService.onDestroy();
verify(mBluetoothEventManager).unregisterCallback(any());
@@ -196,7 +246,6 @@
public void onStartCommand_noBroadcastId_stopSelf() {
mAudioStreamMediaService.onStartCommand(new Intent(), /* flags= */ 0, /* startId= */ 0);
- assertThat(mAudioStreamMediaService.mLocalSession).isNull();
verify(mAudioStreamMediaService).stopSelf();
}
@@ -207,7 +256,6 @@
mAudioStreamMediaService.onStartCommand(intent, /* flags= */ 0, /* startId= */ 0);
- assertThat(mAudioStreamMediaService.mLocalSession).isNull();
verify(mAudioStreamMediaService).stopSelf();
}
@@ -222,12 +270,179 @@
mAudioStreamMediaService.onStartCommand(intent, /* flags= */ 0, /* startId= */ 0);
- assertThat(mAudioStreamMediaService.mLocalSession).isNotNull();
- verify(mAudioStreamMediaService, never()).stopSelf();
+ ArgumentCaptor<Notification> notificationCapture =
+ ArgumentCaptor.forClass(Notification.class);
+ verify(mAudioStreamMediaService).startForeground(anyInt(), notificationCapture.capture());
+ var notification = notificationCapture.getValue();
+ assertThat(notification.getSmallIcon()).isNotNull();
+ assertThat(notification.isStyle(Notification.MediaStyle.class)).isTrue();
- ArgumentCaptor<Notification> notification = ArgumentCaptor.forClass(Notification.class);
- verify(mAudioStreamMediaService).startForeground(anyInt(), notification.capture());
- assertThat(notification.getValue().getSmallIcon()).isNotNull();
- assertThat(notification.getValue().isStyle(Notification.MediaStyle.class)).isTrue();
+ verify(mAudioStreamMediaService, never()).stopSelf();
+ }
+
+ @Test
+ public void assistantCallback_onSourceLost_stopSelf() {
+ mAudioStreamMediaService.onCreate();
+
+ assertThat(mAudioStreamMediaService.mBroadcastAssistantCallback).isNotNull();
+ mAudioStreamMediaService.mBroadcastAssistantCallback.onSourceLost(/* broadcastId= */ 0);
+
+ verify(mAudioStreamMediaService).stopSelf();
+ }
+
+ @Test
+ public void assistantCallback_onSourceRemoved_stopSelf() {
+ mAudioStreamMediaService.onCreate();
+
+ assertThat(mAudioStreamMediaService.mBroadcastAssistantCallback).isNotNull();
+ mAudioStreamMediaService.mBroadcastAssistantCallback.onSourceRemoved(
+ mDevice, /* sourceId= */ 0, /* reason= */ 0);
+
+ verify(mAudioStreamMediaService).stopSelf();
+ }
+
+ @Test
+ public void bluetoothCallback_onBluetoothOff_stopSelf() {
+ mAudioStreamMediaService.onCreate();
+
+ assertThat(mAudioStreamMediaService.mBluetoothCallback).isNotNull();
+ mAudioStreamMediaService.mBluetoothCallback.onBluetoothStateChanged(
+ BluetoothAdapter.STATE_OFF);
+
+ verify(mAudioStreamMediaService).stopSelf();
+ }
+
+ @Test
+ public void bluetoothCallback_onDeviceDisconnect_stopSelf() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mAudioStreamMediaService.onCreate();
+ assertThat(mAudioStreamMediaService.mBluetoothCallback).isNotNull();
+ mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
+
+ mAudioStreamMediaService.mBluetoothCallback.onProfileConnectionStateChanged(
+ mCachedBluetoothDevice,
+ BluetoothAdapter.STATE_DISCONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+
+ verify(mAudioStreamMediaService).stopSelf();
+ }
+
+ @Test
+ public void bluetoothCallback_onMemberDeviceDisconnect_stopSelf() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ when(mCachedBluetoothDevice.getDevice()).thenReturn(mock(BluetoothDevice.class));
+ CachedBluetoothDevice member = mock(CachedBluetoothDevice.class);
+ when(mCachedBluetoothDevice.getMemberDevice()).thenReturn(Set.of(member));
+ when(member.getDevice()).thenReturn(mDevice);
+ var devices = new ArrayList<BluetoothDevice>();
+ devices.add(mDevice);
+
+ Intent intent = new Intent();
+ intent.putExtra(BROADCAST_ID, 1);
+ intent.putParcelableArrayListExtra(DEVICES, devices);
+
+ mAudioStreamMediaService.onCreate();
+ assertThat(mAudioStreamMediaService.mBluetoothCallback).isNotNull();
+ mAudioStreamMediaService.onStartCommand(intent, /* flags= */ 0, /* startId= */ 0);
+ mAudioStreamMediaService.mBluetoothCallback.onProfileConnectionStateChanged(
+ mCachedBluetoothDevice,
+ BluetoothAdapter.STATE_DISCONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+
+ 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);
+
+ mAudioStreamMediaService.onCreate();
+ mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
+ assertThat(mAudioStreamMediaService.mMediaSessionCallback).isNotNull();
+ mAudioStreamMediaService.mMediaSessionCallback.onPause();
+
+ verify(mVolumeControlProfile).setDeviceVolume(any(), anyInt(), anyBoolean());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_MUTE_BUTTON_CLICK),
+ eq(1));
+ }
+
+ @Test
+ public void mediaSessionCallback_onPlay_setVolume() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+
+ mAudioStreamMediaService.onCreate();
+ mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
+ assertThat(mAudioStreamMediaService.mMediaSessionCallback).isNotNull();
+ mAudioStreamMediaService.mMediaSessionCallback.onPlay();
+
+ verify(mVolumeControlProfile).setDeviceVolume(any(), anyInt(), anyBoolean());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_NOTIFICATION_MUTE_BUTTON_CLICK),
+ eq(0));
+ }
+
+ @Test
+ public void mediaSessionCallback_onCustomAction_leaveBroadcast() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+
+ mAudioStreamMediaService.onCreate();
+ mAudioStreamMediaService.onStartCommand(setupIntent(), /* flags= */ 0, /* startId= */ 0);
+ assertThat(mAudioStreamMediaService.mMediaSessionCallback).isNotNull();
+ mAudioStreamMediaService.mMediaSessionCallback.onCustomAction(
+ LEAVE_BROADCAST_ACTION, Bundle.EMPTY);
+
+ verify(mAudioStreamsHelper).removeSource(anyInt());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(),
+ 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());
+
+ assertThat(binder).isNull();
+ }
+
+ private Intent setupIntent() {
+ when(mCachedBluetoothDevice.getDevice()).thenReturn(mDevice);
+ var devices = new ArrayList<BluetoothDevice>();
+ devices.add(mDevice);
+
+ Intent intent = new Intent();
+ intent.putExtra(BROADCAST_ID, 1);
+ intent.putParcelableArrayListExtra(DEVICES, devices);
+ return 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
new file mode 100644
index 0000000..adc77a1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamStateHandlerTest.java
@@ -0,0 +1,143 @@
+/*
+ * 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.audiosharing.audiostreams;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+
+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;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioStreamStateHandlerTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final int SUMMARY_RES = 1;
+ private static final String SUMMARY = "summary";
+ private final Context mContext = spy(ApplicationProvider.getApplicationContext());
+ @Mock private AudioStreamsProgressCategoryController mController;
+ @Mock private AudioStreamsHelper mHelper;
+ @Mock private AudioStreamPreference mPreference;
+ private AudioStreamStateHandler mHandler;
+
+ @Before
+ public void setUp() {
+ mHandler = spy(new AudioStreamStateHandler());
+ }
+
+ @Test
+ public void testHandleStateChange_noChange_doNothing() {
+ when(mHandler.getStateEnum())
+ .thenReturn(
+ AudioStreamsProgressCategoryController.AudioStreamState
+ .ADD_SOURCE_BAD_CODE);
+ when(mPreference.getAudioStreamState())
+ .thenReturn(
+ AudioStreamsProgressCategoryController.AudioStreamState
+ .ADD_SOURCE_BAD_CODE);
+
+ mHandler.handleStateChange(mPreference, mController, mHelper);
+
+ verify(mPreference, never()).setAudioStreamState(any());
+ verify(mHandler, never()).performAction(any(), any(), any());
+ verify(mPreference, never()).setIsConnected(anyBoolean(), anyString(), any());
+ }
+
+ @Test
+ public void testHandleStateChange_setNewState() {
+ when(mHandler.getStateEnum())
+ .thenReturn(AudioStreamsProgressCategoryController.AudioStreamState.SOURCE_ADDED);
+ when(mPreference.getAudioStreamState())
+ .thenReturn(
+ AudioStreamsProgressCategoryController.AudioStreamState
+ .ADD_SOURCE_BAD_CODE);
+
+ mHandler.handleStateChange(mPreference, mController, mHelper);
+
+ verify(mPreference)
+ .setAudioStreamState(
+ AudioStreamsProgressCategoryController.AudioStreamState.SOURCE_ADDED);
+ verify(mHandler).performAction(any(), any(), any());
+ verify(mPreference).setIsConnected(eq(true), eq(""), eq(null));
+ }
+
+ @Test
+ public void testHandleStateChange_setNewState_newSummary_newListener() {
+ Preference.OnPreferenceClickListener listener =
+ mock(Preference.OnPreferenceClickListener.class);
+ when(mHandler.getStateEnum())
+ .thenReturn(
+ AudioStreamsProgressCategoryController.AudioStreamState
+ .ADD_SOURCE_BAD_CODE);
+ when(mHandler.getSummary()).thenReturn(SUMMARY_RES);
+ when(mHandler.getOnClickListener(any())).thenReturn(listener);
+ when(mPreference.getAudioStreamState())
+ .thenReturn(
+ AudioStreamsProgressCategoryController.AudioStreamState.ADD_SOURCE_FAILED);
+ when(mPreference.getContext()).thenReturn(mContext);
+ doReturn(SUMMARY).when(mContext).getString(anyInt());
+
+ mHandler.handleStateChange(mPreference, mController, mHelper);
+
+ verify(mPreference)
+ .setAudioStreamState(
+ AudioStreamsProgressCategoryController.AudioStreamState
+ .ADD_SOURCE_BAD_CODE);
+ verify(mHandler).performAction(any(), any(), any());
+ verify(mPreference).setIsConnected(eq(false), eq(SUMMARY), eq(listener));
+ }
+
+ @Test
+ public void testGetSummary() {
+ int res = mHandler.getSummary();
+ assertThat(res).isEqualTo(AudioStreamStateHandler.EMPTY_STRING_RES);
+ }
+
+ @Test
+ public void testGetOnClickListener() {
+ Preference.OnPreferenceClickListener listener = mHandler.getOnClickListener(mController);
+ assertThat(listener).isNull();
+ }
+
+ @Test
+ public void testGetStateEnum() {
+ var state = mHandler.getStateEnum();
+ assertThat(state)
+ .isEqualTo(AudioStreamsProgressCategoryController.AudioStreamState.UNKNOWN);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdaterTest.java
index 4403528..d6b99a1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdaterTest.java
@@ -20,6 +20,7 @@
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
@@ -76,25 +77,46 @@
}
@Test
- public void onActiveDeviceChanged_notLeProfile_doNothing() {
- mUpdater.onActiveDeviceChanged(mCachedBluetoothDevice, 0);
+ public void unregister_doNothing() {
+ mUpdater.register(false);
assertThat(mUpdatedSummary).isNull();
}
@Test
- public void onActiveDeviceChanged_leProfile_summaryUpdated() {
+ public void onProfileConnectionStateChanged_notLeAssistProfile_doNothing() {
+ mUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice, 0, 0);
+
+ assertThat(mUpdatedSummary).isNull();
+ }
+
+ @Test
+ public void onProfileConnectionStateChanged_leAssistantProfile_summaryUpdated() {
ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(
mCachedBluetoothDevice);
when(mCachedBluetoothDevice.getName()).thenReturn(DEVICE_NAME);
- mUpdater.onActiveDeviceChanged(mCachedBluetoothDevice, BluetoothProfile.LE_AUDIO);
+ mUpdater.onProfileConnectionStateChanged(
+ mCachedBluetoothDevice,
+ BluetoothAdapter.STATE_CONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
assertThat(mUpdatedSummary).isEqualTo(DEVICE_NAME);
}
@Test
- public void onActiveDeviceChanged_leProfile_noDevice_summaryUpdated() {
- mUpdater.onActiveDeviceChanged(mCachedBluetoothDevice, BluetoothProfile.LE_AUDIO);
+ public void onActiveDeviceChanged_leAssistantProfile_noDevice_summaryUpdated() {
+ mUpdater.onProfileConnectionStateChanged(
+ mCachedBluetoothDevice,
+ BluetoothAdapter.STATE_CONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+
+ assertThat(mUpdatedSummary)
+ .isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_title));
+ }
+
+ @Test
+ public void onBluetoothStateOff_summaryUpdated() {
+ mUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
assertThat(mUpdatedSummary)
.isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_title));
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 e4b6903..0e00309 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
@@ -23,11 +23,13 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothStatusCodes;
import android.content.Context;
import android.os.Looper;
@@ -42,6 +44,7 @@
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.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.BluetoothEventManager;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
@@ -57,6 +60,7 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -116,7 +120,7 @@
when(mBroadcast.isProfileReady()).thenReturn(true);
when(mAssistant.isProfileReady()).thenReturn(true);
when(mVolumeControl.isProfileReady()).thenReturn(true);
- mController = new AudioStreamsCategoryController(mContext, KEY);
+ mController = spy(new AudioStreamsCategoryController(mContext, KEY));
mPreference = new Preference(mContext);
when(mScreen.findPreference(KEY)).thenReturn(mPreference);
mController.displayPreference(mScreen);
@@ -228,4 +232,21 @@
shadowOf(Looper.getMainLooper()).idle();
assertThat(mPreference.isVisible()).isTrue();
}
+
+ @Test
+ public void onProfileConnectionStateChanged_updateVisibility() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_QR_CODE_PRIVATE_BROADCAST_SHARING);
+ ArgumentCaptor<BluetoothCallback> argumentCaptor =
+ ArgumentCaptor.forClass(BluetoothCallback.class);
+ mController.onStart(mLifecycleOwner);
+ verify(mBluetoothEventManager).registerCallback(argumentCaptor.capture());
+
+ BluetoothCallback callback = argumentCaptor.getValue();
+ callback.onProfileConnectionStateChanged(
+ mCachedBluetoothDevice,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT,
+ BluetoothAdapter.STATE_DISCONNECTED);
+
+ verify(mController).updateVisibility();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragmentTest.java
index 9058ab6..dd3d8b7 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDashboardFragmentTest.java
@@ -22,18 +22,25 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.content.Context;
import android.content.Intent;
+import android.os.Bundle;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
@@ -53,12 +60,14 @@
+ "MD:BgNwVGVzdA==;AS:1;PI:A0;NS:1;BS:3;NB:2;SM:BQNUZXN0BARlbmc=;;";
private Context mContext;
+ private FakeFeatureFactory mFeatureFactory;
private AudioStreamsProgressCategoryController mController;
private TestFragment mTestFragment;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
mTestFragment = spy(new TestFragment());
doReturn(mContext).when(mTestFragment).getContext();
mController = spy(new AudioStreamsProgressCategoryController(mContext, "key"));
@@ -114,6 +123,28 @@
mTestFragment.onActivityResult(
REQUEST_SCAN_BT_BROADCAST_QR_CODE, Activity.RESULT_OK, intent);
verify(mController).setSourceFromQrCode(any(), any());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_QR_CODE_SCAN_SUCCEED),
+ anyInt());
+ }
+
+ @Test
+ public void onAttach_hasArgument() {
+ BluetoothLeBroadcastMetadata data = mock(BluetoothLeBroadcastMetadata.class);
+ Bundle bundle = new Bundle();
+ bundle.putParcelable(KEY_BROADCAST_METADATA, data);
+ mTestFragment.setArguments(bundle);
+
+ mTestFragment.onAttach(mContext);
+
+ verify(mController).setSourceFromQrCode(eq(data), any());
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ any(),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_QR_CODE_SCAN_SUCCEED),
+ anyInt());
}
public static class TestFragment extends AudioStreamsDashboardFragment {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDialogFragmentTest.java
new file mode 100644
index 0000000..efdd389
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDialogFragmentTest.java
@@ -0,0 +1,88 @@
+/*
+ * 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.audiosharing.audiostreams;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowLooper;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowAlertDialog.class,
+ })
+public class AudioStreamsDialogFragmentTest {
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ private AudioStreamsDialogFragment.DialogBuilder mDialogBuilder;
+ private AudioStreamsDialogFragment mFragment;
+
+ @Before
+ public void setUp() {
+ mDialogBuilder = spy(new AudioStreamsDialogFragment.DialogBuilder(mContext));
+ mFragment = new AudioStreamsDialogFragment(mDialogBuilder, SettingsEnums.PAGE_UNKNOWN);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowAlertDialog.reset();
+ }
+
+ @Test
+ public void testGetMetricsCategory() {
+ int dialogId = mFragment.getMetricsCategory();
+
+ assertThat(dialogId).isEqualTo(SettingsEnums.PAGE_UNKNOWN);
+ }
+
+ @Test
+ public void testOnCreateDialog() {
+ mFragment.onCreateDialog(Bundle.EMPTY);
+
+ verify(mDialogBuilder).build();
+ }
+
+ @Test
+ public void testShowDialog_dismissAll() {
+ FragmentController.setupFragment(mFragment);
+ AudioStreamsDialogFragment.show(mFragment, mDialogBuilder, SettingsEnums.PAGE_UNKNOWN);
+ ShadowLooper.idleMainLooper();
+
+ var dialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(dialog).isNotNull();
+ assertThat(dialog.isShowing()).isTrue();
+
+ AudioStreamsDialogFragment.dismissAll(mFragment);
+ assertThat(dialog.isShowing()).isFalse();
+ }
+}
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
new file mode 100644
index 0000000..66ef5fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java
@@ -0,0 +1,239 @@
+/*
+ * 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.audiosharing.audiostreams;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
+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;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowThreadUtils.class,
+ })
+public class AudioStreamsHelperTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final int GROUP_ID = 1;
+ private static final int BROADCAST_ID_1 = 1;
+ private static final int BROADCAST_ID_2 = 2;
+ private static final String BROADCAST_NAME = "name";
+ private final Context mContext = spy(ApplicationProvider.getApplicationContext());
+ @Mock private LocalBluetoothManager mLocalBluetoothManager;
+ @Mock private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
+ @Mock private LocalBluetoothLeBroadcastAssistant mAssistant;
+ @Mock private CachedBluetoothDeviceManager mDeviceManager;
+ @Mock private BluetoothLeBroadcastMetadata mMetadata;
+ @Mock private CachedBluetoothDevice mCachedDevice;
+ @Mock private BluetoothDevice mDevice;
+ private AudioStreamsHelper mHelper;
+
+ @Before
+ public void setUp() {
+ when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
+ when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mDeviceManager);
+ when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile())
+ .thenReturn(mAssistant);
+ mHelper = spy(new AudioStreamsHelper(mLocalBluetoothManager));
+ }
+
+ @Test
+ public void addSource_noDevice_doNothing() {
+ when(mAssistant.getDevicesMatchingConnectionStates(any()))
+ .thenReturn(Collections.emptyList());
+ mHelper.addSource(mMetadata);
+
+ verify(mAssistant, never()).addSource(any(), any(), anyBoolean());
+ }
+
+ @Test
+ public void addSource_hasDevice() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ devices.add(mDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+
+ mHelper.addSource(mMetadata);
+
+ verify(mAssistant).addSource(eq(mDevice), eq(mMetadata), anyBoolean());
+ }
+
+ @Test
+ public void removeSource_noDevice_doNothing() {
+ when(mAssistant.getDevicesMatchingConnectionStates(any()))
+ .thenReturn(Collections.emptyList());
+ mHelper.removeSource(BROADCAST_ID_1);
+
+ verify(mAssistant, never()).removeSource(any(), anyInt());
+ }
+
+ @Test
+ public void removeSource_noConnectedSource_doNothing() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ devices.add(mDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ BluetoothLeBroadcastReceiveState source = mock(BluetoothLeBroadcastReceiveState.class);
+ when(source.getBroadcastId()).thenReturn(BROADCAST_ID_2);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(source));
+
+ mHelper.removeSource(BROADCAST_ID_1);
+
+ verify(mAssistant, never()).removeSource(any(), anyInt());
+ }
+
+ @Test
+ public void removeSource_hasConnectedSource() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ devices.add(mDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ BluetoothLeBroadcastReceiveState source = mock(BluetoothLeBroadcastReceiveState.class);
+ when(source.getBroadcastId()).thenReturn(BROADCAST_ID_2);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(source));
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(source.getBisSyncState()).thenReturn(bisSyncState);
+
+ mHelper.removeSource(BROADCAST_ID_2);
+
+ verify(mAssistant).removeSource(eq(mDevice), anyInt());
+ }
+
+ @Test
+ public void removeSource_memberHasConnectedSource() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ var memberDevice = mock(BluetoothDevice.class);
+ devices.add(mDevice);
+ devices.add(memberDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ BluetoothLeBroadcastReceiveState source = mock(BluetoothLeBroadcastReceiveState.class);
+ when(source.getBroadcastId()).thenReturn(BROADCAST_ID_2);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ var memberCachedDevice = mock(CachedBluetoothDevice.class);
+ when(memberCachedDevice.getDevice()).thenReturn(memberDevice);
+ when(mCachedDevice.getMemberDevice()).thenReturn(ImmutableSet.of(memberCachedDevice));
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+ when(mAssistant.getAllSources(mDevice)).thenReturn(ImmutableList.of());
+ when(mAssistant.getAllSources(memberDevice)).thenReturn(ImmutableList.of(source));
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(source.getBisSyncState()).thenReturn(bisSyncState);
+
+ mHelper.removeSource(BROADCAST_ID_2);
+
+ verify(mAssistant).removeSource(eq(memberDevice), anyInt());
+ }
+
+ @Test
+ public void getAllConnectedSources_noAssistant() {
+ when(mLocalBluetoothProfileManager.getLeAudioBroadcastAssistantProfile()).thenReturn(null);
+ mHelper = new AudioStreamsHelper(mLocalBluetoothManager);
+
+ assertThat(mHelper.getAllConnectedSources()).isEmpty();
+ }
+
+ @Test
+ public void getAllConnectedSources_returnSource() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ devices.add(mDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ BluetoothLeBroadcastReceiveState source = mock(BluetoothLeBroadcastReceiveState.class);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(source));
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(source.getBisSyncState()).thenReturn(bisSyncState);
+
+ var list = mHelper.getAllConnectedSources();
+ assertThat(list).isNotEmpty();
+ assertThat(list.get(0)).isEqualTo(source);
+ }
+
+ @Test
+ public void startMediaService_noDevice_doNothing() {
+ mHelper.startMediaService(mContext, BROADCAST_ID_1, BROADCAST_NAME);
+
+ verify(mContext, never()).startService(any());
+ }
+
+ @Test
+ public void startMediaService_hasDevice() {
+ List<BluetoothDevice> devices = new ArrayList<>();
+ devices.add(mDevice);
+ when(mAssistant.getDevicesMatchingConnectionStates(any())).thenReturn(devices);
+ BluetoothLeBroadcastReceiveState source = mock(BluetoothLeBroadcastReceiveState.class);
+ when(mDeviceManager.findDevice(any())).thenReturn(mCachedDevice);
+ when(mCachedDevice.getDevice()).thenReturn(mDevice);
+ when(mCachedDevice.getGroupId()).thenReturn(GROUP_ID);
+ when(mAssistant.getAllSources(any())).thenReturn(ImmutableList.of(source));
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(source.getBisSyncState()).thenReturn(bisSyncState);
+
+ mHelper.startMediaService(mContext, BROADCAST_ID_1, BROADCAST_NAME);
+
+ verify(mContext).startService(any());
+ }
+}
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
new file mode 100644
index 0000000..164c2f0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryCallbackTest.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.connecteddevice.audiosharing.audiostreams;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.bluetooth.BluetoothLeBroadcastReceiveState;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class AudioStreamsProgressCategoryCallbackTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Mock private AudioStreamsProgressCategoryController mController;
+ @Mock private BluetoothDevice mDevice;
+ @Mock private BluetoothLeBroadcastReceiveState mState;
+ @Mock private BluetoothLeBroadcastMetadata mMetadata;
+ private AudioStreamsProgressCategoryCallback mCallback;
+
+ @Before
+ public void setUp() {
+ mCallback = new AudioStreamsProgressCategoryCallback(mController);
+ }
+
+ @Test
+ public void testOnReceiveStateChanged_connected() {
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(mState.getBisSyncState()).thenReturn(bisSyncState);
+ mCallback.onReceiveStateChanged(mDevice, /* sourceId= */ 0, mState);
+
+ verify(mController).handleSourceConnected(any());
+ }
+
+ @Test
+ public void testOnReceiveStateChanged_badCode() {
+ when(mState.getPaSyncState())
+ .thenReturn(BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED);
+ when(mState.getBigEncryptionState())
+ .thenReturn(BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_BAD_CODE);
+ mCallback.onReceiveStateChanged(mDevice, /* sourceId= */ 0, mState);
+
+ verify(mController).handleSourceConnectBadCode(any());
+ }
+
+ @Test
+ public void testOnSearchStartFailed() {
+ mCallback.onSearchStartFailed(/* reason= */ 0);
+
+ verify(mController).showToast(anyString());
+ verify(mController).setScanning(anyBoolean());
+ }
+
+ @Test
+ public void testOnSearchStarted() {
+ mCallback.onSearchStarted(/* reason= */ 0);
+
+ verify(mController).setScanning(anyBoolean());
+ }
+
+ @Test
+ public void testOnSearchStopFailed() {
+ mCallback.onSearchStopFailed(/* reason= */ 0);
+
+ verify(mController).showToast(anyString());
+ }
+
+ @Test
+ public void testOnSearchStopped() {
+ mCallback.onSearchStopped(/* reason= */ 0);
+
+ verify(mController).setScanning(anyBoolean());
+ }
+
+ @Test
+ public void testOnSourceAddFailed() {
+ when(mMetadata.getBroadcastId()).thenReturn(1);
+ mCallback.onSourceAddFailed(mDevice, mMetadata, /* reason= */ 0);
+
+ verify(mController).handleSourceFailedToConnect(1);
+ }
+
+ @Test
+ public void testOnSourceFound() {
+ mCallback.onSourceFound(mMetadata);
+
+ verify(mController).handleSourceFound(mMetadata);
+ }
+
+ @Test
+ public void testOnSourceLost() {
+ mCallback.onSourceLost(/* broadcastId= */ 1);
+
+ verify(mController).handleSourceLost(1);
+ }
+
+ @Test
+ public void testOnSourceRemoveFailed() {
+ mCallback.onSourceRemoveFailed(mDevice, /* sourceId= */ 0, /* reason= */ 0);
+
+ verify(mController).showToast(anyString());
+ }
+
+ @Test
+ public void testOnSourceRemoved() {
+ mCallback.onSourceRemoved(mDevice, /* sourceId= */ 0, /* reason= */ 0);
+
+ verify(mController).handleSourceRemoved();
+ }
+}
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
new file mode 100644
index 0000000..fd1b649
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryControllerTest.java
@@ -0,0 +1,788 @@
+/*
+ * 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.audiosharing.audiostreams;
+
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.ADD_SOURCE_BAD_CODE;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.ADD_SOURCE_FAILED;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.ADD_SOURCE_WAIT_FOR_RESPONSE;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.SOURCE_ADDED;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.SYNCED;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.AudioStreamState.WAIT_FOR_SYNC;
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryController.UNSET_BROADCAST_ID;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyString;
+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 static org.robolectric.Shadows.shadowOf;
+
+import static java.util.Collections.emptyList;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothLeAudioContentMetadata;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.bluetooth.BluetoothLeBroadcastReceiveState;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.os.Looper;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+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.ShadowBluetoothUtils;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+import com.android.settingslib.bluetooth.BluetoothEventManager;
+import com.android.settingslib.bluetooth.BluetoothLeBroadcastMetadataExt;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.After;
+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.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowBluetoothUtils.class,
+ ShadowAudioStreamsHelper.class,
+ ShadowThreadUtils.class,
+ ShadowAlertDialog.class,
+ })
+public class AudioStreamsProgressCategoryControllerTest {
+ @Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final String VALID_METADATA =
+ "BLUETOOTH:UUID:184F;BN:VGVzdA==;AT:1;AD:00A1A1A1A1A1;BI:1E240;BC:VGVzdENvZGU=;"
+ + "MD:BgNwVGVzdA==;AS:1;PI:A0;NS:1;BS:3;NB:2;SM:BQNUZXN0BARlbmc=;;";
+ private static final String KEY = "audio_streams_nearby_category";
+ private static final int QR_CODE_BROADCAST_ID = 1;
+ private static final int ALREADY_CONNECTED_BROADCAST_ID = 2;
+ private static final int NEWLY_FOUND_BROADCAST_ID = 3;
+ private static final String BROADCAST_NAME_1 = "name_1";
+ private static final String BROADCAST_NAME_2 = "name_2";
+ private static final byte[] BROADCAST_CODE = new byte[] {1};
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private LocalBluetoothManager mLocalBtManager;
+ @Mock private BluetoothEventManager mBluetoothEventManager;
+ @Mock private PreferenceScreen mScreen;
+ @Mock private AudioStreamsHelper mAudioStreamsHelper;
+ @Mock private LocalBluetoothLeBroadcastAssistant mLeBroadcastAssistant;
+ @Mock private BluetoothLeBroadcastMetadata mMetadata;
+ @Mock private CachedBluetoothDevice mDevice;
+ @Mock private AudioStreamsProgressCategoryPreference mPreference;
+ private Lifecycle mLifecycle;
+ private LifecycleOwner mLifecycleOwner;
+ private Fragment mFragment;
+ private TestController mController;
+
+ @Before
+ public void setUp() {
+ ShadowAudioStreamsHelper.setUseMock(mAudioStreamsHelper);
+ when(mAudioStreamsHelper.getLeBroadcastAssistant()).thenReturn(mLeBroadcastAssistant);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(emptyList());
+
+ ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
+ when(mLocalBtManager.getEventManager()).thenReturn(mBluetoothEventManager);
+ when(mLeBroadcastAssistant.isSearchInProgress()).thenReturn(false);
+
+ when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
+
+ mFragment = new Fragment();
+ mController = spy(new TestController(mContext, KEY));
+ }
+
+ @After
+ public void tearDown() {
+ ShadowBluetoothUtils.reset();
+ ShadowAudioStreamsHelper.reset();
+ }
+
+ @Test
+ public void testGetAvailabilityStatus() {
+ int status = mController.getAvailabilityStatus();
+
+ assertThat(status).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void testDisplayPreference() {
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).setVisible(true);
+ }
+
+ @Test
+ public void testSetScanning() {
+ mController.displayPreference(mScreen);
+ mController.setScanning(true);
+
+ verify(mPreference).setProgress(true);
+ }
+
+ @Test
+ public void testShowToast_noError() {
+ mController.showToast(BROADCAST_NAME_1);
+ }
+
+ @Test
+ public void testOnStop_unregister() {
+ mController.onStop(mLifecycleOwner);
+
+ verify(mBluetoothEventManager).unregisterCallback(any());
+ }
+
+ @Test
+ public void testGetFragment_returnFragment() {
+ mController.setFragment(mFragment);
+
+ assertThat(mController.getFragment()).isEqualTo(mFragment);
+ }
+
+ @Test
+ public void testOnStart_initNoDevice_showDialog() {
+ when(mLeBroadcastAssistant.isSearchInProgress()).thenReturn(true);
+
+ FragmentController.setupFragment(mFragment);
+ mController.setFragment(mFragment);
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Called twice, once in displayPreference, the other in init()
+ verify(mPreference, times(2)).setVisible(anyBoolean());
+ verify(mPreference).removeAudioStreamPreferences();
+ verify(mLeBroadcastAssistant).stopSearchingForSources();
+ verify(mLeBroadcastAssistant).unregisterServiceCallBack(any());
+
+ var dialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(dialog).isNotNull();
+ assertThat(dialog.isShowing()).isTrue();
+
+ TextView title = dialog.findViewById(R.id.dialog_title);
+ assertThat(title).isNotNull();
+ assertThat(title.getText())
+ .isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_title));
+ TextView subtitle1 = dialog.findViewById(R.id.dialog_subtitle);
+ assertThat(subtitle1).isNotNull();
+ assertThat(subtitle1.getVisibility()).isEqualTo(View.GONE);
+ TextView subtitle2 = dialog.findViewById(R.id.dialog_subtitle_2);
+ assertThat(subtitle2).isNotNull();
+ assertThat(subtitle2.getText())
+ .isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_subtitle));
+ View leftButton = dialog.findViewById(R.id.left_button);
+ assertThat(leftButton).isNotNull();
+ assertThat(leftButton.getVisibility()).isEqualTo(View.VISIBLE);
+ Button rightButton = dialog.findViewById(R.id.right_button);
+ assertThat(rightButton).isNotNull();
+ assertThat(rightButton.getText())
+ .isEqualTo(mContext.getString(R.string.audio_streams_dialog_no_le_device_button));
+ assertThat(rightButton.hasOnClickListeners()).isTrue();
+
+ dialog.cancel();
+ }
+
+ @Test
+ public void testBluetoothOff_triggerRunnable() {
+ mController.mBluetoothCallback.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
+
+ verify(mController.mExecutor).execute(any());
+ }
+
+ @Test
+ public void testDeviceConnectionStateChanged_triggerRunnable() {
+ mController.mBluetoothCallback.onProfileConnectionStateChanged(
+ mDevice,
+ BluetoothAdapter.STATE_DISCONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+
+ verify(mController.mExecutor).execute(any());
+ }
+
+ @Test
+ public void testOnStart_initHasDevice_noPreference() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ verify(mLeBroadcastAssistant).registerServiceCallBack(any(), any());
+ verify(mLeBroadcastAssistant).startSearchingForSources(any());
+
+ var dialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+
+ verify(mController, never()).moveToState(any(), any());
+ }
+
+ @Test
+ public void testOnStart_initHasDevice_scanningInProgress() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+ when(mLeBroadcastAssistant.isSearchInProgress()).thenReturn(true);
+
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ verify(mLeBroadcastAssistant).registerServiceCallBack(any(), any());
+ verify(mLeBroadcastAssistant).stopSearchingForSources();
+ verify(mLeBroadcastAssistant).startSearchingForSources(any());
+
+ var dialog = ShadowAlertDialog.getLatestAlertDialog();
+ assertThat(dialog).isNull();
+
+ verify(mController, never()).moveToState(any(), any());
+ }
+
+ @Test
+ public void testOnStart_handleSourceFromQrCode() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup a source from qr code
+ mController.setSourceFromQrCode(mMetadata, SourceOriginForLogging.UNKNOWN);
+ when(mMetadata.getBroadcastId()).thenReturn(QR_CODE_BROADCAST_ID);
+
+ // Handle the source from qr code in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify the connected source is created and moved to WAIT_FOR_SYNC
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController).moveToState(preference.capture(), state.capture());
+ assertThat(preference.getValue()).isNotNull();
+ assertThat(preference.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(QR_CODE_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(WAIT_FOR_SYNC);
+ }
+
+ @Test
+ public void testOnStart_handleSourceAlreadyConnected() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup a connected source
+ BluetoothLeBroadcastReceiveState connected =
+ createConnectedMock(ALREADY_CONNECTED_BROADCAST_ID);
+ List<BluetoothLeBroadcastReceiveState> list = new ArrayList<>();
+ list.add(connected);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(list);
+
+ // Handle already connected source in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ // Verify the connected source is created and moved to SOURCE_ADDED
+ verify(mController).moveToState(preference.capture(), state.capture());
+ assertThat(preference.getValue()).isNotNull();
+ assertThat(preference.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(SOURCE_ADDED);
+ }
+
+ @Test
+ public void testOnStart_sourceFromQrCodeNoId_sourceAlreadyConnected_sameName_updateId() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup source from qr code with unset id and BROADCAST_NAME_1. Creating a real metadata
+ // for properly update its id.
+ var metadata =
+ BluetoothLeBroadcastMetadataExt.INSTANCE.convertToBroadcastMetadata(VALID_METADATA);
+ assertThat(metadata).isNotNull();
+ var metadataWithNoIdAndSameName =
+ new BluetoothLeBroadcastMetadata.Builder(metadata)
+ .setBroadcastId(UNSET_BROADCAST_ID)
+ .setBroadcastName(BROADCAST_NAME_1)
+ .build();
+ mController.setSourceFromQrCode(
+ metadataWithNoIdAndSameName, SourceOriginForLogging.UNKNOWN);
+
+ // Setup a connected source with name BROADCAST_NAME_1 and id
+ BluetoothLeBroadcastReceiveState connected =
+ createConnectedMock(ALREADY_CONNECTED_BROADCAST_ID);
+ var data = mock(BluetoothLeAudioContentMetadata.class);
+ when(connected.getSubgroupMetadata()).thenReturn(ImmutableList.of(data));
+ when(data.getProgramInfo()).thenReturn(BROADCAST_NAME_1);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(ImmutableList.of(connected));
+
+ // Handle both source from qr code and already connected source in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify two preferences created, one moved to state WAIT_FOR_SYNC, one to SOURCE_ADDED.
+ // Both has ALREADY_CONNECTED_BROADCAST_ID as the UNSET_ID is updated to match.
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+ verify(mController, times(2)).moveToState(preference.capture(), state.capture());
+
+ List<AudioStreamPreference> preferences = preference.getAllValues();
+ assertThat(preferences.size()).isEqualTo(2);
+ List<AudioStreamsProgressCategoryController.AudioStreamState> states = state.getAllValues();
+ assertThat(states.size()).isEqualTo(2);
+
+ // The preference contains source from qr code
+ assertThat(preferences.get(0).getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(states.get(0)).isEqualTo(WAIT_FOR_SYNC);
+
+ // The preference contains already connected source
+ assertThat(preferences.get(1).getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(states.get(1)).isEqualTo(SOURCE_ADDED);
+ }
+
+ @Test
+ public void testHandleSourceFound_addNew() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ when(mMetadata.getBroadcastId()).thenReturn(NEWLY_FOUND_BROADCAST_ID);
+ // A new source is found
+ mController.handleSourceFound(mMetadata);
+
+ // Verify a preference is created with state SYNCED.
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController).moveToState(preference.capture(), state.capture());
+ assertThat(preference.getValue()).isNotNull();
+ assertThat(preference.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(SYNCED);
+ }
+
+ @Test
+ public void testHandleSourceAddRequest_updateMetadataAndState() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ var metadata =
+ BluetoothLeBroadcastMetadataExt.INSTANCE.convertToBroadcastMetadata(VALID_METADATA);
+ assertThat(metadata).isNotNull();
+ var metadataWithNoCode =
+ new BluetoothLeBroadcastMetadata.Builder(metadata)
+ .setBroadcastId(NEWLY_FOUND_BROADCAST_ID)
+ .setBroadcastName(BROADCAST_NAME_1)
+ .build();
+ // A new source is found
+ mController.handleSourceFound(metadataWithNoCode);
+
+ ArgumentCaptor<AudioStreamPreference> preferenceCaptor =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> stateCaptor =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ // moving state to SYNCED
+ verify(mController).moveToState(preferenceCaptor.capture(), stateCaptor.capture());
+ var preference = preferenceCaptor.getValue();
+ var state = stateCaptor.getValue();
+
+ assertThat(preference).isNotNull();
+ assertThat(preference.getAudioStreamBroadcastId()).isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(state).isEqualTo(SYNCED);
+
+ var updatedMetadata =
+ new BluetoothLeBroadcastMetadata.Builder(metadataWithNoCode)
+ .setBroadcastCode(BROADCAST_CODE)
+ .build();
+ mController.handleSourceAddRequest(preference, updatedMetadata);
+ // state updated to ADD_SOURCE_WAIT_FOR_RESPONSE
+ assertThat(preference.getAudioStreamBroadcastId()).isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(preference.getAudioStreamMetadata().getBroadcastCode())
+ .isEqualTo(BROADCAST_CODE);
+ assertThat(preference.getAudioStreamState()).isEqualTo(ADD_SOURCE_WAIT_FOR_RESPONSE);
+ }
+
+ @Test
+ public void testHandleSourceFound_sameIdWithSourceFromQrCode_updateMetadataAndState() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup source from qr code with QR_CODE_BROADCAST_ID, BROADCAST_NAME_1 and BROADCAST_CODE.
+ var metadata =
+ BluetoothLeBroadcastMetadataExt.INSTANCE.convertToBroadcastMetadata(VALID_METADATA);
+ assertThat(metadata).isNotNull();
+ var metadataFromQrCode =
+ new BluetoothLeBroadcastMetadata.Builder(metadata)
+ .setBroadcastId(QR_CODE_BROADCAST_ID)
+ .setBroadcastName(BROADCAST_NAME_1)
+ .setBroadcastCode(BROADCAST_CODE)
+ .build();
+ mController.setSourceFromQrCode(metadataFromQrCode, SourceOriginForLogging.UNKNOWN);
+
+ // Handle the source from qr code in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // A new source is found
+ mController.handleSourceFound(
+ new BluetoothLeBroadcastMetadata.Builder(metadata)
+ .setBroadcastId(QR_CODE_BROADCAST_ID)
+ .setBroadcastName(BROADCAST_NAME_2)
+ .build());
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController, times(2)).moveToState(preference.capture(), state.capture());
+ List<AudioStreamPreference> preferences = preference.getAllValues();
+ List<AudioStreamsProgressCategoryController.AudioStreamState> states = state.getAllValues();
+
+ // Verify the qr code source is created with WAIT_FOR_SYNC, broadcast name got updated to
+ // BROADCAST_NAME_2
+ var sourceFromQrCode = preferences.get(0);
+ assertThat(sourceFromQrCode.getAudioStreamBroadcastId()).isEqualTo(QR_CODE_BROADCAST_ID);
+ assertThat(sourceFromQrCode.getAudioStreamMetadata()).isNotNull();
+ assertThat(sourceFromQrCode.getAudioStreamMetadata().getBroadcastName())
+ .isEqualTo(BROADCAST_NAME_2);
+ assertThat(sourceFromQrCode.getAudioStreamMetadata().getBroadcastCode())
+ .isEqualTo(BROADCAST_CODE);
+ assertThat(states.get(0)).isEqualTo(WAIT_FOR_SYNC);
+
+ // Verify the newly found source is created, broadcast code is retrieved from the source
+ // from qr code, and state updated to ADD_SOURCE_WAIT_FOR_RESPONSE
+ var newlyFoundSource = preferences.get(1);
+ assertThat(newlyFoundSource.getAudioStreamBroadcastId()).isEqualTo(QR_CODE_BROADCAST_ID);
+ assertThat(newlyFoundSource.getAudioStreamMetadata()).isNotNull();
+ assertThat(newlyFoundSource.getAudioStreamMetadata().getBroadcastName())
+ .isEqualTo(BROADCAST_NAME_2);
+ assertThat(newlyFoundSource.getAudioStreamMetadata().getBroadcastCode())
+ .isEqualTo(BROADCAST_CODE);
+ assertThat(states.get(1)).isEqualTo(ADD_SOURCE_WAIT_FOR_RESPONSE);
+ }
+
+ @Test
+ public void testHandleSourceFound_sameIdWithOtherState_doNothing() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup source already connected
+ BluetoothLeBroadcastReceiveState connected =
+ createConnectedMock(ALREADY_CONNECTED_BROADCAST_ID);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(ImmutableList.of(connected));
+
+ // Handle source already connected in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // A new source found
+ when(mMetadata.getBroadcastId()).thenReturn(ALREADY_CONNECTED_BROADCAST_ID);
+ mController.handleSourceFound(mMetadata);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify only the connected source has created a preference, and its state remains as
+ // SOURCE_ADDED
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController).moveToState(preference.capture(), state.capture());
+ assertThat(preference.getValue()).isNotNull();
+ assertThat(preference.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(preference.getValue().getAudioStreamState()).isEqualTo(SOURCE_ADDED);
+ }
+
+ @Test
+ public void testHandleSourceLost_removed() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup mPreference so it's not null
+ mController.displayPreference(mScreen);
+
+ // A new source found
+ when(mMetadata.getBroadcastId()).thenReturn(NEWLY_FOUND_BROADCAST_ID);
+ mController.handleSourceFound(mMetadata);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // A new source found is lost
+ mController.handleSourceLost(NEWLY_FOUND_BROADCAST_ID);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preferenceToAdd =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamPreference> preferenceToRemove =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ // Verify a new preference is created with state SYNCED.
+ verify(mController).moveToState(preferenceToAdd.capture(), state.capture());
+ assertThat(preferenceToAdd.getValue()).isNotNull();
+ assertThat(preferenceToAdd.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(SYNCED);
+
+ // Verify the preference with NEWLY_FOUND_BROADCAST_ID is removed.
+ verify(mPreference).removePreference(preferenceToRemove.capture());
+ assertThat(preferenceToRemove.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ }
+
+ @Test
+ public void testHandleSourceLost_sourceConnected_doNothing() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup mPreference so it's not null
+ mController.displayPreference(mScreen);
+
+ // A new source found
+ when(mMetadata.getBroadcastId()).thenReturn(NEWLY_FOUND_BROADCAST_ID);
+ mController.handleSourceFound(mMetadata);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // A new source found is lost, but the source is still connected
+ BluetoothLeBroadcastReceiveState connected = createConnectedMock(NEWLY_FOUND_BROADCAST_ID);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(ImmutableList.of(connected));
+ mController.handleSourceLost(NEWLY_FOUND_BROADCAST_ID);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preferenceToAdd =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ // Verify a new preference is created with state SYNCED.
+ verify(mController).moveToState(preferenceToAdd.capture(), state.capture());
+ assertThat(preferenceToAdd.getValue()).isNotNull();
+ assertThat(preferenceToAdd.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(SYNCED);
+
+ // No preference is removed.
+ verify(mPreference, never()).removePreference(any());
+ }
+
+ @Test
+ public void testHandleSourceRemoved_removed() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup already connected source
+ BluetoothLeBroadcastReceiveState connected =
+ createConnectedMock(ALREADY_CONNECTED_BROADCAST_ID);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(ImmutableList.of(connected));
+
+ // Handle connected source in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // The connect source is no longer connected
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(emptyList());
+ mController.handleSourceRemoved();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preferenceToAdd =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamPreference> preferenceToRemove =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ // Verify a new preference is created with state SOURCE_ADDED.
+ verify(mController).moveToState(preferenceToAdd.capture(), state.capture());
+ assertThat(preferenceToAdd.getValue()).isNotNull();
+ assertThat(preferenceToAdd.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(state.getValue()).isEqualTo(SOURCE_ADDED);
+
+ // Verify the preference with ALREADY_CONNECTED_BROADCAST_ID is removed.
+ verify(mPreference).removePreference(preferenceToRemove.capture());
+ assertThat(preferenceToRemove.getValue().getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ }
+
+ @Test
+ public void testHandleSourceRemoved_updateState() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup a connected source
+ BluetoothLeBroadcastReceiveState connected =
+ createConnectedMock(ALREADY_CONNECTED_BROADCAST_ID);
+ when(mAudioStreamsHelper.getAllConnectedSources()).thenReturn(ImmutableList.of(connected));
+
+ // Handle connected source in onStart
+ mController.displayPreference(mScreen);
+ mController.onStart(mLifecycleOwner);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // The connected source is identified as having a bad code
+ BluetoothLeBroadcastReceiveState badCode = mock(BluetoothLeBroadcastReceiveState.class);
+ when(badCode.getBroadcastId()).thenReturn(ALREADY_CONNECTED_BROADCAST_ID);
+ when(badCode.getPaSyncState())
+ .thenReturn(BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED);
+ when(badCode.getBigEncryptionState())
+ .thenReturn(BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_BAD_CODE);
+ mController.handleSourceConnectBadCode(badCode);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController, times(2)).moveToState(preference.capture(), state.capture());
+ List<AudioStreamPreference> preferences = preference.getAllValues();
+ assertThat(preferences.size()).isEqualTo(2);
+ List<AudioStreamsProgressCategoryController.AudioStreamState> states = state.getAllValues();
+ assertThat(states.size()).isEqualTo(2);
+
+ // Verify the connected source is created state SOURCE_ADDED
+ assertThat(preferences.get(0).getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(states.get(0)).isEqualTo(SOURCE_ADDED);
+
+ // Verify the connected source is updated to state ADD_SOURCE_BAD_CODE
+ assertThat(preferences.get(1).getAudioStreamBroadcastId())
+ .isEqualTo(ALREADY_CONNECTED_BROADCAST_ID);
+ assertThat(states.get(1)).isEqualTo(ADD_SOURCE_BAD_CODE);
+ }
+
+ @Test
+ public void testHandleSourceFailedToConnect_updateState() {
+ // Setup a device
+ ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
+
+ // Setup mPreference so it's not null
+ mController.displayPreference(mScreen);
+
+ // A new source found
+ when(mMetadata.getBroadcastId()).thenReturn(NEWLY_FOUND_BROADCAST_ID);
+ mController.handleSourceFound(mMetadata);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // The new found source is identified as failed to connect
+ mController.handleSourceFailedToConnect(NEWLY_FOUND_BROADCAST_ID);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ ArgumentCaptor<AudioStreamPreference> preference =
+ ArgumentCaptor.forClass(AudioStreamPreference.class);
+ ArgumentCaptor<AudioStreamsProgressCategoryController.AudioStreamState> state =
+ ArgumentCaptor.forClass(
+ AudioStreamsProgressCategoryController.AudioStreamState.class);
+
+ verify(mController, times(2)).moveToState(preference.capture(), state.capture());
+ List<AudioStreamPreference> preferences = preference.getAllValues();
+ assertThat(preferences.size()).isEqualTo(2);
+ List<AudioStreamsProgressCategoryController.AudioStreamState> states = state.getAllValues();
+ assertThat(states.size()).isEqualTo(2);
+
+ // Verify one preference is created with SYNCED
+ assertThat(preferences.get(0).getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(states.get(0)).isEqualTo(SYNCED);
+
+ // Verify the preference is updated to state ADD_SOURCE_FAILED
+ assertThat(preferences.get(1).getAudioStreamBroadcastId())
+ .isEqualTo(NEWLY_FOUND_BROADCAST_ID);
+ assertThat(states.get(1)).isEqualTo(ADD_SOURCE_FAILED);
+ }
+
+ private static BluetoothLeBroadcastReceiveState createConnectedMock(int id) {
+ var connected = mock(BluetoothLeBroadcastReceiveState.class);
+ List<Long> bisSyncState = new ArrayList<>();
+ bisSyncState.add(1L);
+ when(connected.getBroadcastId()).thenReturn(id);
+ when(connected.getBisSyncState()).thenReturn(bisSyncState);
+ return connected;
+ }
+
+ static class TestController extends AudioStreamsProgressCategoryController {
+ TestController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mExecutor = spy(mContext.getMainExecutor());
+ }
+
+ @Override
+ void moveToState(AudioStreamPreference preference, AudioStreamState state) {
+ preference.setAudioStreamState(state);
+ // Do nothing else to avoid side effect from AudioStreamStateHandler#performAction
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryPreferenceTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryPreferenceTest.java
index 337d64d..76bd5ec 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryPreferenceTest.java
@@ -53,6 +53,8 @@
@Test
public void addAudioStreamPreference_singlePreference() {
+ mPreference = spy(new AudioStreamsProgressCategoryPreference(mContext, null));
+ when(mPreference.getPreferenceManager()).thenReturn(mPreferenceManager);
AudioStreamPreference first = new AudioStreamPreference(mContext, null);
mPreference.addAudioStreamPreference(first, (p1, p2) -> 0);
@@ -62,6 +64,8 @@
@Test
public void addAudioStreamPreference_multiPreference_sorted() {
+ mPreference = spy(new AudioStreamsProgressCategoryPreference(mContext, null, 0));
+ when(mPreference.getPreferenceManager()).thenReturn(mPreferenceManager);
Comparator<AudioStreamPreference> c =
Comparator.comparingInt(AudioStreamPreference::getOrder);
AudioStreamPreference first = new AudioStreamPreference(mContext, null);
@@ -78,6 +82,8 @@
@Test
public void removeAudioStreamPreferences_shouldBeEmpty() {
+ mPreference = spy(new AudioStreamsProgressCategoryPreference(mContext, null, 0, 0));
+ when(mPreference.getPreferenceManager()).thenReturn(mPreferenceManager);
Comparator<AudioStreamPreference> c =
Comparator.comparingInt(AudioStreamPreference::getOrder);
AudioStreamPreference first = new AudioStreamPreference(mContext, null);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragmentTest.java
index 7d85b7a..06e4837 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsQrCodeFragmentTest.java
@@ -98,6 +98,22 @@
}
@Test
+ public void onCreateView_noProfile_noQrCode() {
+ when(mBtProfileManager.getLeAudioBroadcastProfile()).thenReturn(null);
+ FragmentController.setupFragment(
+ mFragment, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
+ View view = mFragment.getView();
+
+ assertThat(view).isNotNull();
+ ImageView qrCodeView = view.findViewById(R.id.qrcode_view);
+ TextView passwordView = view.requireViewById(R.id.password);
+ assertThat(qrCodeView).isNotNull();
+ assertThat(qrCodeView.getDrawable()).isNull();
+ assertThat(passwordView).isNotNull();
+ assertThat(passwordView.getText().toString()).isEqualTo("");
+ }
+
+ @Test
public void onCreateView_noMetadata_noQrCode() {
List<BluetoothLeBroadcastMetadata> list = new ArrayList<>();
when(mBroadcast.getAllBroadcastMetadata()).thenReturn(list);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeControllerTest.java
index 4990f26..a83cbf0 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsScanQrCodeControllerTest.java
@@ -16,29 +16,38 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static android.app.settings.SettingsEnums.AUDIO_STREAM_MAIN;
+
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsScanQrCodeController.REQUEST_SCAN_BT_BROADCAST_QR_CODE;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.content.Intent;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
import com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows.ShadowAudioStreamsHelper;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.BluetoothEventManager;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
@@ -46,6 +55,7 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -139,17 +149,46 @@
public void onPreferenceClick_hasFragment_launchSubSetting() {
mController.displayPreference(mScreen);
mController.setFragment(mFragment);
+ when(mFragment.getMetricsCategory()).thenReturn(AUDIO_STREAM_MAIN);
var listener = mPreference.getOnPreferenceClickListener();
assertThat(listener).isNotNull();
+
+ // mContext is not an Activity context, calling startActivity() from outside of an Activity
+ // context requires the FLAG_ACTIVITY_NEW_TASK flag, create a mock to avoid this
+ // AndroidRuntimeException.
+ Context activityContext = mock(Context.class);
+ when(mPreference.getContext()).thenReturn(activityContext);
+ when(mPreference.getKey()).thenReturn(AudioStreamsScanQrCodeController.KEY);
+
var clicked = listener.onPreferenceClick(mPreference);
+
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ ArgumentCaptor<Integer> requestCodeCaptor = ArgumentCaptor.forClass(Integer.class);
+ verify(mFragment)
+ .startActivityForResult(intentCaptor.capture(), requestCodeCaptor.capture());
+
+ Intent intent = intentCaptor.getValue();
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(AudioStreamsQrCodeScanFragment.class.getName());
+ assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+ .isEqualTo(R.string.audio_streams_main_page_scan_qr_code_title);
+ assertThat(intent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ .isEqualTo(AUDIO_STREAM_MAIN);
+
+ int requestCode = requestCodeCaptor.getValue();
+ assertThat(requestCode).isEqualTo(REQUEST_SCAN_BT_BROADCAST_QR_CODE);
+
assertThat(clicked).isTrue();
}
@Test
public void updateVisibility_noConnected_invisible() {
mController.displayPreference(mScreen);
- mController.mBluetoothCallback.onActiveDeviceChanged(mDevice, BluetoothProfile.LE_AUDIO);
+ mController.mBluetoothCallback.onProfileConnectionStateChanged(
+ mDevice,
+ BluetoothAdapter.STATE_DISCONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
assertThat(mPreference.isVisible()).isFalse();
}
@@ -158,7 +197,10 @@
public void updateVisibility_hasConnected_visible() {
mController.displayPreference(mScreen);
ShadowAudioStreamsHelper.setCachedBluetoothDeviceInSharingOrLeConnected(mDevice);
- mController.mBluetoothCallback.onActiveDeviceChanged(mDevice, BluetoothProfile.LE_AUDIO);
+ mController.mBluetoothCallback.onProfileConnectionStateChanged(
+ mDevice,
+ BluetoothAdapter.STATE_CONNECTED,
+ BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
assertThat(mPreference.isVisible()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedStateTest.java
index 0f0bafe..59a42a1 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SourceAddedStateTest.java
@@ -16,31 +16,76 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static android.app.settings.SettingsEnums.AUDIO_STREAM_MAIN;
+
import static com.android.settings.connecteddevice.audiosharing.audiostreams.SourceAddedState.AUDIO_STREAM_SOURCE_ADDED_STATE_SUMMARY;
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.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFragment;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
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.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowFragment.class,
+ })
public class SourceAddedStateTest {
-
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final int BROADCAST_ID = 1;
+ private static final String BROADCAST_TITLE = "title";
+ private final Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock private AudioStreamPreference mPreference;
+ @Mock private AudioStreamsProgressCategoryController mController;
+ @Mock private AudioStreamsHelper mHelper;
+ @Mock private AudioStreamsRepository mRepository;
+ @Mock private AudioStreamsDashboardFragment mFragment;
+ @Mock private FragmentActivity mActivity;
+ private FakeFeatureFactory mFeatureFactory;
private SourceAddedState mInstance;
@Before
public void setUp() {
- mInstance = SourceAddedState.getInstance();
+ when(mFragment.getActivity()).thenReturn(mActivity);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mInstance = new SourceAddedState();
+ when(mPreference.getAudioStreamBroadcastId()).thenReturn(BROADCAST_ID);
+ when(mPreference.getTitle()).thenReturn(BROADCAST_TITLE);
}
@Test
public void testGetInstance() {
+ mInstance = SourceAddedState.getInstance();
assertThat(mInstance).isNotNull();
assertThat(mInstance).isInstanceOf(SourceAddedState.class);
}
@@ -58,4 +103,59 @@
assertThat(stateEnum)
.isEqualTo(AudioStreamsProgressCategoryController.AudioStreamState.SOURCE_ADDED);
}
+
+ @Test
+ public void testPerformAction() {
+ mInstance.setAudioStreamsRepositoryForTesting(mRepository);
+ BluetoothLeBroadcastMetadata mockMetadata = mock(BluetoothLeBroadcastMetadata.class);
+ when(mRepository.getCachedMetadata(anyInt())).thenReturn(mockMetadata);
+ when(mPreference.getContext()).thenReturn(mContext);
+ when(mPreference.getSourceOriginForLogging())
+ .thenReturn(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS);
+
+ mInstance.performAction(mPreference, mController, mHelper);
+
+ verify(mRepository).saveMetadata(eq(mContext), eq(mockMetadata));
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_SUCCEED),
+ eq(SourceOriginForLogging.QR_CODE_SCAN_SETTINGS.ordinal()));
+ verify(mHelper).startMediaService(eq(mContext), eq(BROADCAST_ID), eq(BROADCAST_TITLE));
+ }
+
+ @Test
+ public void testGetOnClickListener_startSubSettings() {
+ when(mController.getFragment()).thenReturn(mFragment);
+ when(mFragment.getMetricsCategory()).thenReturn(AUDIO_STREAM_MAIN);
+
+ Preference.OnPreferenceClickListener listener = mInstance.getOnClickListener(mController);
+ assertThat(listener).isNotNull();
+
+ // mContext is not an Activity context, calling startActivity() from outside of an Activity
+ // context requires the FLAG_ACTIVITY_NEW_TASK flag, create a mock to avoid this
+ // AndroidRuntimeException.
+ Context activityContext = mock(Context.class);
+ when(mPreference.getContext()).thenReturn(activityContext);
+
+ listener.onPreferenceClick(mPreference);
+
+ ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
+ verify(activityContext).startActivity(argumentCaptor.capture());
+
+ Intent intent = argumentCaptor.getValue();
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(AudioStreamDetailsFragment.class.getName());
+ assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+ .isEqualTo(R.string.audio_streams_detail_page_title);
+ assertThat(intent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ .isEqualTo(AUDIO_STREAM_MAIN);
+
+ Bundle bundle = intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ assertThat(bundle).isNotNull();
+ assertThat(bundle.getString(AudioStreamDetailsFragment.BROADCAST_NAME_ARG))
+ .isEqualTo(BROADCAST_TITLE);
+ assertThat(bundle.getInt(AudioStreamDetailsFragment.BROADCAST_ID_ARG))
+ .isEqualTo(BROADCAST_ID);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SyncedStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SyncedStateTest.java
index e9eab50..2b19e20 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SyncedStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/SyncedStateTest.java
@@ -20,7 +20,7 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.never;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;
@@ -28,10 +28,16 @@
import android.app.AlertDialog;
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.content.Context;
+import android.content.DialogInterface;
+import android.widget.Button;
+import android.widget.TextView;
import androidx.preference.Preference;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.BluetoothLeBroadcastMetadataExt;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -42,7 +48,9 @@
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.ShadowLooper;
@RunWith(RobolectricTestRunner.class)
@Config(
@@ -51,6 +59,10 @@
})
public class SyncedStateTest {
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private static final String ENCRYPTED_METADATA =
+ "BLUETOOTH:UUID:184F;BN:VGVzdA==;AT:1;AD:00A1A1A1A1A1;BI:1E240;BC:VGVzdENvZGU=;"
+ + "MD:BgNwVGVzdA==;AS:1;PI:A0;NS:1;BS:3;NB:2;SM:BQNUZXN0BARlbmc=;;";
+ private static final String BROADCAST_TITLE = "title";
@Mock private AudioStreamsProgressCategoryController mMockController;
@Mock private AudioStreamPreference mMockPreference;
@Mock private BluetoothLeBroadcastMetadata mMockMetadata;
@@ -105,18 +117,47 @@
@Test
public void testGetOnClickListener_isEncrypted_passwordDialogShowing() {
+ when(mMockPreference.getAudioStreamMetadata())
+ .thenReturn(
+ BluetoothLeBroadcastMetadataExt.INSTANCE.convertToBroadcastMetadata(
+ ENCRYPTED_METADATA));
+ when(mMockPreference.getContext()).thenReturn(mMockContext);
+ when(mMockPreference.getTitle()).thenReturn(BROADCAST_TITLE);
+
Preference.OnPreferenceClickListener listener =
mInstance.getOnClickListener(mMockController);
- when(mMockPreference.getAudioStreamMetadata()).thenReturn(mMockMetadata);
- when(mMockPreference.getContext()).thenReturn(mMockContext);
- when(mMockMetadata.isEncrypted()).thenReturn(true);
+ assertThat(listener).isNotNull();
listener.onPreferenceClick(mMockPreference);
shadowMainLooper().idle();
AlertDialog dialog = ShadowAlertDialog.getLatestAlertDialog();
+
assertThat(dialog).isNotNull();
assertThat(dialog.isShowing()).isTrue();
- verify(mMockController, never()).handleSourceAddRequest(mMockPreference, mMockMetadata);
+
+ Button neutralButton = dialog.getButton(DialogInterface.BUTTON_NEUTRAL);
+ assertThat(neutralButton).isNotNull();
+ assertThat(neutralButton.getText().toString())
+ .isEqualTo(mMockContext.getString(android.R.string.cancel));
+
+ Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+ assertThat(positiveButton).isNotNull();
+ assertThat(positiveButton.getText().toString())
+ .isEqualTo(
+ mMockContext.getString(R.string.bluetooth_connect_access_dialog_positive));
+
+ positiveButton.callOnClick();
+ ShadowLooper.idleMainLooper();
+ verify(mMockController).handleSourceAddRequest(any(), any());
+
+ ShadowAlertDialog shadowDialog = Shadow.extract(dialog);
+ TextView title = shadowDialog.getView().findViewById(R.id.broadcast_name_text);
+ assertThat(title).isNotNull();
+ assertThat(title.getText().toString()).isEqualTo(BROADCAST_TITLE);
+ assertThat(shadowDialog.getTitle().toString())
+ .isEqualTo(mMockContext.getString(R.string.find_broadcast_password_dialog_title));
+
+ dialog.cancel();
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncStateTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncStateTest.java
index 3eb07a4..813ed2b 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncStateTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncStateTest.java
@@ -16,22 +16,39 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
+import static android.app.settings.SettingsEnums.DIALOG_AUDIO_STREAM_MAIN_WAIT_FOR_SYNC_TIMEOUT;
+
+import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsScanQrCodeController.REQUEST_SCAN_BT_BROADCAST_QR_CODE;
import static com.android.settings.connecteddevice.audiosharing.audiostreams.WaitForSyncState.AUDIO_STREAM_WAIT_FOR_SYNC_STATE_SUMMARY;
import static com.android.settings.connecteddevice.audiosharing.audiostreams.WaitForSyncState.WAIT_FOR_SYNC_TIMEOUT_MILLIS;
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.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothLeBroadcastMetadata;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
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.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -43,19 +60,23 @@
@RunWith(RobolectricTestRunner.class)
public class WaitForSyncStateTest {
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ private final Context mContext = spy(ApplicationProvider.getApplicationContext());
@Mock private AudioStreamPreference mMockPreference;
@Mock private AudioStreamsProgressCategoryController mMockController;
@Mock private AudioStreamsHelper mMockHelper;
@Mock private BluetoothLeBroadcastMetadata mMockMetadata;
+ private FakeFeatureFactory mFeatureFactory;
private WaitForSyncState mInstance;
@Before
public void setUp() {
- mInstance = WaitForSyncState.getInstance();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mInstance = new WaitForSyncState();
}
@Test
public void testGetInstance() {
+ mInstance = WaitForSyncState.getInstance();
assertThat(mInstance).isNotNull();
assertThat(mInstance).isInstanceOf(AudioStreamStateHandler.class);
}
@@ -93,12 +114,49 @@
.thenReturn(AudioStreamsProgressCategoryController.AudioStreamState.WAIT_FOR_SYNC);
when(mMockPreference.getAudioStreamBroadcastId()).thenReturn(1);
when(mMockPreference.getAudioStreamMetadata()).thenReturn(mMockMetadata);
+ when(mMockPreference.getContext()).thenReturn(mContext);
when(mMockPreference.getSourceOriginForLogging())
- .thenReturn(SourceOriginForLogging.UNKNOWN);
+ .thenReturn(SourceOriginForLogging.BROADCAST_SEARCH);
+ when(mMockController.getFragment()).thenReturn(mock(AudioStreamsDashboardFragment.class));
mInstance.performAction(mMockPreference, mMockController, mMockHelper);
ShadowLooper.idleMainLooper(WAIT_FOR_SYNC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
verify(mMockController).handleSourceLost(1);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(
+ eq(mContext),
+ eq(SettingsEnums.ACTION_AUDIO_STREAM_JOIN_FAILED_WAIT_FOR_SYNC_TIMEOUT),
+ eq(SourceOriginForLogging.BROADCAST_SEARCH.ordinal()));
+ verify(mContext).getString(R.string.audio_streams_dialog_stream_is_not_available);
+ verify(mContext).getString(R.string.audio_streams_is_not_playing);
+ verify(mContext).getString(R.string.audio_streams_dialog_close);
+ verify(mContext).getString(R.string.audio_streams_dialog_retry);
+ }
+
+ @Test
+ public void testLaunchQrCodeScanFragment() {
+ // mContext is not an Activity context, calling startActivity() from outside of an Activity
+ // context requires the FLAG_ACTIVITY_NEW_TASK flag, create a mock to avoid this
+ // AndroidRuntimeException.
+ Context activityContext = mock(Context.class);
+ AudioStreamsDashboardFragment fragment = mock(AudioStreamsDashboardFragment.class);
+ mInstance.launchQrCodeScanFragment(activityContext, fragment);
+
+ ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+ ArgumentCaptor<Integer> requestCodeCaptor = ArgumentCaptor.forClass(Integer.class);
+ verify(fragment)
+ .startActivityForResult(intentCaptor.capture(), requestCodeCaptor.capture());
+
+ Intent intent = intentCaptor.getValue();
+ assertThat(intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(AudioStreamsQrCodeScanFragment.class.getName());
+ assertThat(intent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+ .isEqualTo(R.string.audio_streams_main_page_scan_qr_code_title);
+ assertThat(intent.getIntExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, 0))
+ .isEqualTo(DIALOG_AUDIO_STREAM_MAIN_WAIT_FOR_SYNC_TIMEOUT);
+
+ int requestCode = requestCodeCaptor.getValue();
+ assertThat(requestCode).isEqualTo(REQUEST_SCAN_BT_BROADCAST_QR_CODE);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/testshadows/ShadowAudioStreamsHelper.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/testshadows/ShadowAudioStreamsHelper.java
index 3a0a6c4..051eda7 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/testshadows/ShadowAudioStreamsHelper.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/testshadows/ShadowAudioStreamsHelper.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams.testshadows;
+import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import androidx.annotation.Nullable;
@@ -32,7 +33,7 @@
import java.util.List;
import java.util.Optional;
-@Implements(value = AudioStreamsHelper.class, callThroughByDefault = false)
+@Implements(value = AudioStreamsHelper.class, callThroughByDefault = true)
public class ShadowAudioStreamsHelper {
private static AudioStreamsHelper sMockHelper;
@Nullable private static CachedBluetoothDevice sCachedBluetoothDevice;
@@ -69,4 +70,16 @@
public LocalBluetoothLeBroadcastAssistant getLeBroadcastAssistant() {
return sMockHelper.getLeBroadcastAssistant();
}
+
+ /** Removes sources from LE broadcasts associated for all active sinks based on broadcast Id. */
+ @Implementation
+ public void removeSource(int broadcastId) {
+ sMockHelper.removeSource(broadcastId);
+ }
+
+ /** Adds the specified LE broadcast source to all active sinks. */
+ @Implementation
+ public void addSource(BluetoothLeBroadcastMetadata source) {
+ sMockHelper.addSource(source);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
index 3aad02e..4509c7c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
@@ -33,9 +33,9 @@
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.settingslib.widget.LayoutPreference;
import org.junit.Before;
@@ -43,6 +43,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
@@ -72,7 +73,7 @@
when(mBatteryState.getCapacity()).thenReturn(1f);
when(mBatteryState.isPresent()).thenReturn(true);
- mContext = spy(ApplicationProvider.getApplicationContext());
+ mContext = spy(Robolectric.buildActivity(SettingsActivity.class).get());
when(mContext.getSystemService(InputManager.class)).thenReturn(mInputManager);
mController = new StylusUsiHeaderController(mContext, mInputDevice);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index eea4f52..9427bbe 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -35,6 +35,8 @@
import android.hardware.usb.UsbManager;
import android.net.TetheringManager;
import android.platform.test.annotations.RequiresFlagsEnabled;
+import android.platform.test.flag.junit.CheckFlagsRule;
+import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceCategory;
@@ -48,6 +50,7 @@
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;
@@ -82,6 +85,8 @@
private FragmentActivity mActivity;
@Mock
private TetheringManager mTetheringManager;
+ @Rule
+ public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Before
public void setUp() {
@@ -349,6 +354,30 @@
assertThat(mFragment.isUserAuthenticated()).isTrue();
}
+ @Test
+ @RequiresFlagsEnabled(Flags.FLAG_EXCLUDE_WEBCAM_AUTH_CHALLENGE)
+ public void onRadioButtonClicked_webcamNoAuthNeeded() {
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_UVC));
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+ setAuthPassesAutomatically();
+
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ assertThat(mFragment.isUserAuthenticated()).isFalse();
+ }
+
+ @Test
+ @RequiresFlagsEnabled(Flags.FLAG_EXCLUDE_WEBCAM_AUTH_CHALLENGE)
+ public void onRadioButtonClicked_MidiNoAuthNeeded() {
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MIDI));
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+ setAuthPassesAutomatically();
+
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ assertThat(mFragment.isUserAuthenticated()).isFalse();
+ }
+
private void setAuthPassesAutomatically() {
Shadows.shadowOf(mContext.getSystemService(KeyguardManager.class))
.setIsKeyguardSecure(false);
diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
index 460f6f9..0fd4d85 100644
--- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * 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.
@@ -16,10 +16,11 @@
package com.android.settings.development;
-import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
+import static android.provider.Settings.Global.DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES;
-import static com.android.settings.development.DesktopModePreferenceController.SETTING_VALUE_OFF;
-import static com.android.settings.development.DesktopModePreferenceController.SETTING_VALUE_ON;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_ON;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_OFF;
+import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.ToggleOverride.OVERRIDE_UNSET;
import static com.google.common.truth.Truth.assertThat;
@@ -30,6 +31,10 @@
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.Settings;
import androidx.fragment.app.FragmentActivity;
@@ -37,24 +42,30 @@
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.R;
+import com.android.window.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.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowSystemProperties;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowFragment.class,
})
+@EnableFlags(Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
public class DesktopModePreferenceControllerTest {
- private static final String ENG_BUILD_TYPE = "eng";
- private static final String USER_BUILD_TYPE = "user";
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Mock
private SwitchPreference mPreference;
@@ -69,61 +80,76 @@
@Mock
private FragmentTransaction mTransaction;
+ private Resources mResources;
private Context mContext;
private DesktopModePreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+
+ mContext = spy(ApplicationProvider.getApplicationContext());
doReturn(mTransaction).when(mFragmentManager).beginTransaction();
doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mActivity).when(mFragment).getActivity();
+
+ mResources = spy(mContext.getResources());
+ when(mContext.getResources()).thenReturn(mResources);
+
mController = new DesktopModePreferenceController(mContext, mFragment);
+
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
+
+ // Set desktop mode available
+ when(mResources.getBoolean(R.bool.config_isDesktopModeSupported))
+ .thenReturn(true);
+ ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions",
+ "false");
}
@Test
- public void isAvailable_engBuild_shouldBeTrue() {
+ public void isAvailable_desktopModeDevOptionNotSupported_returnsFalse() {
mController = spy(mController);
- doReturn(ENG_BUILD_TYPE).when(mController).getBuildType();
+ // Dev option is not supported if Desktop mode is not supported
+ when(mResources.getBoolean(R.bool.config_isDesktopModeSupported)).thenReturn(false);
+ ShadowSystemProperties.override("persist.wm.debug.desktop_mode_enforce_device_restrictions",
+ "true");
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_desktopModeDevOptionSupported_returnsTrue() {
+ mController = spy(mController);
assertThat(mController.isAvailable()).isTrue();
}
@Test
- public void isAvaiable_userBuild_shouldBeTrue() {
- mController = spy(mController);
- doReturn(USER_BUILD_TYPE).when(mController).getBuildType();
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void onPreferenceChange_switchEnabled_shouldEnableDesktopMode() {
+ public void onPreferenceChange_switchEnabled_putsSettingsOverrideOnAndTriggersRestart() {
mController.onPreferenceChange(mPreference, true /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
- assertThat(mode).isEqualTo(SETTING_VALUE_ON);
-
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -1 /* default */);
+ assertThat(mode).isEqualTo(OVERRIDE_ON.getSetting());
verify(mTransaction).add(any(RebootConfirmationDialogFragment.class), any());
}
@Test
- public void onPreferenceChange_switchDisabled_shouldDisableDesktopMode() {
+ public void onPreferenceChange_switchDisabled_putsSettingsOverrideOffAndTriggersRestart() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final int mode = Settings.Global.getInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
- assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -1 /* default */);
+ assertThat(mode).isEqualTo(OVERRIDE_OFF.getSetting());
+ verify(mTransaction).add(any(RebootConfirmationDialogFragment.class), any());
}
@Test
- public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ public void updateState_overrideOn_checksPreference() {
Settings.Global.putInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_ON);
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_ON.getSetting());
mController.updateState(mPreference);
@@ -131,9 +157,9 @@
}
@Test
- public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+ public void updateState_overrideOff_unchecksPreference() {
Settings.Global.putInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_OFF.getSetting());
mController.updateState(mPreference);
@@ -141,12 +167,92 @@
}
@Test
- public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_overrideUnset_defaultDevOptionStatusOn_checksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting());
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_overrideUnset_defaultDevOptionStatusOff_unchecksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, OVERRIDE_UNSET.getSetting());
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_noOverride_defaultDevOptionStatusOn_checksPreference() {
+ // Set no override
+ Settings.Global.putString(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, null);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_noOverride_defaultDevOptionStatusOff_unchecksPreference() {
+ // Set no override
+ Settings.Global.putString(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, null);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void updateState_noOverride_noNewSettingsOverride() {
+ // Set no override
+ Settings.Global.putString(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, null);
+
+ mController.updateState(mPreference);
+
+ int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -2 /* default */);
+ assertThat(mode).isEqualTo(-2);
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_overrideUnknown_defaultDevOptionStatusOn_checksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -2);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
+ public void updateState_overrideUnknown_defaultDevOptionStatusOff_unchecksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -2);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_putsSettingsOverrideOff() {
mController.onDeveloperOptionsSwitchDisabled();
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
- DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
- assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
- verify(mPreference).setEnabled(false);
+ DEVELOPMENT_OVERRIDE_DESKTOP_MODE_FEATURES, -2 /* default */);
+ assertThat(mode).isEqualTo(OVERRIDE_UNSET.getSetting());
}
}
diff --git a/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java
new file mode 100644
index 0000000..5931004
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DesktopModeSecondaryDisplayPreferenceControllerTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static android.provider.Settings.Global.DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS;
+
+import static com.android.settings.development.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_OFF;
+import static com.android.settings.development.DesktopModeSecondaryDisplayPreferenceController.SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+ com.android.settings.testutils.shadow.ShadowFragment.class,
+})
+public class DesktopModeSecondaryDisplayPreferenceControllerTest {
+
+ private static final String ENG_BUILD_TYPE = "eng";
+ private static final String USER_BUILD_TYPE = "user";
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private DevelopmentSettingsDashboardFragment mFragment;
+ @Mock
+ private FragmentActivity mActivity;
+ @Mock
+ private FragmentManager mFragmentManager;
+ @Mock
+ private FragmentTransaction mTransaction;
+
+ private Context mContext;
+ private DesktopModeSecondaryDisplayPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ doReturn(mTransaction).when(mFragmentManager).beginTransaction();
+ doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager();
+ doReturn(mActivity).when(mFragment).getActivity();
+ mController = new DesktopModeSecondaryDisplayPreferenceController(mContext, mFragment);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ mController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void isAvailable_engBuild_shouldBeTrue() {
+ mController = spy(mController);
+ doReturn(ENG_BUILD_TYPE).when(mController).getBuildType();
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_userBuild_shouldBeTrue() {
+ mController = spy(mController);
+ doReturn(USER_BUILD_TYPE).when(mController).getBuildType();
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChange_switchEnabled_enablesDesktopModeOnSecondaryDisplay() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
+ assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+
+ verify(mTransaction).add(any(RebootConfirmationDialogFragment.class), any());
+ }
+
+ @Test
+ public void onPreferenceChange_switchDisabled_disablesDesktopModeOnSecondaryDisplay() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ }
+
+ @Test
+ public void updateState_settingEnabled_checksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_ON);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void updateState_settingDisabled_unchecksPreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, SETTING_VALUE_OFF);
+
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_disablesPreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ DEVELOPMENT_FORCE_DESKTOP_MODE_ON_EXTERNAL_DISPLAYS, -1 /* default */);
+ assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+ verify(mPreference).setEnabled(false);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
index bd005b3..978380e 100644
--- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
@@ -16,8 +16,9 @@
package com.android.settings.development;
-import static com.android.settings.development.FreeformWindowsPreferenceController
- .SETTING_VALUE_OFF;
+import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
+
+import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF;
import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
@@ -29,6 +30,7 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.provider.Settings;
import androidx.fragment.app.FragmentActivity;
@@ -43,7 +45,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@@ -52,9 +53,10 @@
})
public class FreeformWindowsPreferenceControllerTest {
- private static final String ENG_BUILD_TYPE = "eng";
- private static final String USER_BUILD_TYPE = "user";
-
+ @Mock
+ Context mContext;
+ @Mock
+ private PackageManager mPackageManager;
@Mock
private SwitchPreference mPreference;
@Mock
@@ -68,33 +70,33 @@
@Mock
private FragmentTransaction mTransaction;
- private Context mContext;
private FreeformWindowsPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
doReturn(mTransaction).when(mFragmentManager).beginTransaction();
doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mActivity).when(mFragment).getActivity();
mController = new FreeformWindowsPreferenceController(mContext, mFragment);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
mController.displayPreference(mScreen);
}
@Test
- public void isAvailable_engBuild_shouldBeTrue() {
+ public void isAvailable_deviceHasFreeformWindowSystemFeature_returnsFalse() {
mController = spy(mController);
- doReturn(ENG_BUILD_TYPE).when(mController).getBuildType();
+ when(mPackageManager.hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT)).thenReturn(true);
- assertThat(mController.isAvailable()).isTrue();
+ assertThat(mController.isAvailable()).isFalse();
}
@Test
- public void isAvailable_userBuild_shouldBeTrue() {
+ public void isAvailable_deviceDoesNotHaveFreeformWindowSystemFeature_returnsTrue() {
mController = spy(mController);
- doReturn(USER_BUILD_TYPE).when(mController).getBuildType();
+ when(mPackageManager.hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT)).thenReturn(
+ false);
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java
index 7c1650d2..952af67 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java
@@ -31,10 +31,10 @@
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -76,17 +76,17 @@
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
- @Ignore("b/315267179")
@Test
public void getSummary_available_returnExpectedDate() {
when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext),
anyLong())).thenReturn(true);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE,
1669680000L);
+ final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);
final CharSequence result = mController.getSummary();
- assertThat(result.toString()).isEqualTo("November 29, 2022");
+ assertThat(result).isEqualTo(expectedDate);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java
index e50aa1c..6e3b1aa 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java
@@ -31,10 +31,10 @@
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -77,17 +77,17 @@
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
- @Ignore("b/315267179")
@Test
public void getSummary_available_returnExpectedDate() {
when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext),
anyLong())).thenReturn(true);
mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE,
1669680000L);
+ final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L);
final CharSequence result = mController.getSummary();
- assertThat(result.toString()).isEqualTo("November 29, 2022");
+ assertThat(result).isEqualTo(expectedDate);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 80739e9..1bc00a1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -441,4 +441,9 @@
TimeUnit.SECONDS.sleep(1);
verifyNoInteractions(mMetricsFeatureProvider);
}
+
+ @Test
+ public void shouldSkipForInitialSUW_returnTrue() {
+ assertThat(mFragment.shouldSkipForInitialSUW()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index b949a3e..fdb075d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -389,6 +389,28 @@
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,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 7bafc6d..851dc79 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -48,6 +48,7 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.UsageView;
import com.android.settingslib.fuelgauge.Estimate;
+import com.android.settingslib.utils.PowerUtil;
import org.junit.After;
import org.junit.Before;
@@ -93,7 +94,8 @@
Map.of(
ChargingType.WIRED, BatteryManager.BATTERY_PLUGGED_AC,
ChargingType.WIRELESS, BatteryManager.BATTERY_PLUGGED_WIRELESS,
- ChargingType.DOCKED, BatteryManager.BATTERY_PLUGGED_DOCK);
+ ChargingType.DOCKED, BatteryManager.BATTERY_PLUGGED_DOCK,
+ ChargingType.NONE, 0);
private static final Map<ChargingSpeed, Integer> CHARGING_SPEED_MAP =
Map.of(
ChargingSpeed.FAST, 1501000,
@@ -789,6 +791,126 @@
expectedChargeLabel);
}
+ @Test
+ public void getBatteryInfo_longlife_shouldSetLonglife() {
+ var batteryIntent = createIntentForLongLifeTest(/* hasLongLife= */ true);
+
+ var batteryInfo =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ batteryIntent,
+ mBatteryUsageStats,
+ /* estimate= */ MOCK_ESTIMATE,
+ /* elapsedRealtimeUs= */ 0L,
+ /* shortString= */ false,
+ /* currentTimeMs= */ 0L);
+
+ assertThat(batteryInfo.isLongLife).isTrue();
+ }
+
+ @Test
+ public void getBatteryInfo_noLonglife_shouldNotLonglife() {
+ var batteryIntent = createIntentForLongLifeTest(/* hasLongLife= */ false);
+
+ var batteryInfo =
+ BatteryInfo.getBatteryInfo(
+ mContext,
+ batteryIntent,
+ mBatteryUsageStats,
+ /* estimate= */ MOCK_ESTIMATE,
+ /* elapsedRealtimeUs= */ 0L,
+ /* shortString= */ false,
+ /* currentTimeMs= */ 0L);
+
+ assertThat(batteryInfo.isLongLife).isFalse();
+ }
+
+ @Test
+ public void getBatteryInfo_plugTypeNoneWithLonglifeAndChargeOptimization_chargingString() {
+ prepareTestGetBatteryInfoEnvironment(
+ /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+ /* chargingStringV2Enabled= */ false);
+ Intent batteryIntent =
+ createIntentForGetBatteryInfoTest(
+ ChargingType.NONE,
+ ChargingSpeed.REGULAR,
+ /* batteryLevel= */ 85,
+ BatteryManager.BATTERY_STATUS_DISCHARGING,
+ /* isLonglife= */ true);
+ var expectedRemainingLabel = "Expected remaining label";
+ var expectedChargeLabel = "85% - " + expectedRemainingLabel;
+ when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+ .thenReturn(true);
+ when(mFeatureFactory.batterySettingsFeatureProvider.getChargingOptimizationRemainingLabel(
+ eq(mContext), anyInt(), anyInt(), anyLong(), anyLong()))
+ .thenReturn(expectedRemainingLabel);
+ when(mFeatureFactory.batterySettingsFeatureProvider.getChargingOptimizationChargeLabel(
+ eq(mContext), anyInt(), anyString(), anyLong(), anyLong()))
+ .thenReturn(expectedChargeLabel);
+ var expectedStatusLabel = "Not charging";
+
+ assertGetBatteryInfo(
+ batteryIntent,
+ /* currentTimeMillis= */ UNUSED_TIME_MS,
+ expectedStatusLabel,
+ expectedRemainingLabel,
+ expectedChargeLabel);
+ }
+
+ @Test
+ public void getBatteryInfo_plugTypeNoneNotChargeOptimizationLonglife_dischargingString() {
+ prepareTestGetBatteryInfoEnvironment(
+ /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+ /* chargingStringV2Enabled= */ false);
+ Intent batteryIntent =
+ createIntentForGetBatteryInfoTest(
+ ChargingType.NONE,
+ ChargingSpeed.REGULAR,
+ /* batteryLevel= */ 85,
+ BatteryManager.BATTERY_STATUS_DISCHARGING,
+ /* isLonglife= */ true);
+ var expectedRemainingLabel =
+ PowerUtil.getBatteryRemainingShortStringFormatted(
+ mContext, PowerUtil.convertUsToMs(1000L));
+ when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+ .thenReturn(false);
+ var expectedStatusLabel = "Not charging";
+
+ assertGetBatteryInfo(
+ batteryIntent,
+ /* currentTimeMillis= */ UNUSED_TIME_MS,
+ expectedStatusLabel,
+ expectedRemainingLabel,
+ expectedRemainingLabel);
+ }
+
+ @Test
+ public void getBatteryInfo_plugTypeNoneChargeOptimizationNotLonglife_dischargingString() {
+ prepareTestGetBatteryInfoEnvironment(
+ /* remainingTimeMs= */ Duration.ofMinutes(130).toMillis(),
+ /* chargingStringV2Enabled= */ false);
+ Intent batteryIntent =
+ createIntentForGetBatteryInfoTest(
+ ChargingType.NONE,
+ ChargingSpeed.REGULAR,
+ /* batteryLevel= */ 85,
+ BatteryManager.BATTERY_STATUS_DISCHARGING,
+ /* isLonglife= */ false);
+ var expectedRemainingLabel =
+ PowerUtil.getBatteryRemainingShortStringFormatted(
+ mContext, PowerUtil.convertUsToMs(1000L));
+ when(mFeatureFactory.batterySettingsFeatureProvider.isChargingOptimizationMode(mContext))
+ .thenReturn(true);
+ var expectedStatusLabel = "Not charging";
+
+ assertGetBatteryInfo(
+ batteryIntent,
+ /* currentTimeMillis= */ UNUSED_TIME_MS,
+ expectedStatusLabel,
+ expectedRemainingLabel,
+ expectedRemainingLabel);
+ }
+
private enum ChargingSpeed {
FAST,
REGULAR,
@@ -798,19 +920,46 @@
private enum ChargingType {
WIRED,
WIRELESS,
- DOCKED
+ DOCKED,
+ NONE
}
- private Intent createIntentForGetBatteryInfoTest(
+ private static Intent createIntentForLongLifeTest(Boolean hasLongLife) {
+ return new Intent(Intent.ACTION_BATTERY_CHANGED)
+ .putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
+ hasLongLife
+ ? BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE
+ : BatteryManager.CHARGING_POLICY_DEFAULT);
+ }
+
+ private static Intent createIntentForGetBatteryInfoTest(
ChargingType chargingType, ChargingSpeed chargingSpeed, int batteryLevel) {
+ return createIntentForGetBatteryInfoTest(
+ chargingType,
+ chargingSpeed,
+ batteryLevel,
+ BatteryManager.BATTERY_STATUS_CHARGING,
+ /* isLonglife= */ false);
+ }
+
+ private static Intent createIntentForGetBatteryInfoTest(
+ ChargingType chargingType,
+ ChargingSpeed chargingSpeed,
+ int batteryLevel,
+ int chargingStatus,
+ boolean isLonglife) {
return createBatteryIntent(
- CHARGING_TYPE_MAP.get(chargingType),
- batteryLevel,
- BatteryManager.BATTERY_STATUS_CHARGING)
+ CHARGING_TYPE_MAP.get(chargingType), batteryLevel, chargingStatus)
.putExtra(
BatteryManager.EXTRA_MAX_CHARGING_CURRENT,
CHARGING_SPEED_MAP.get(chargingSpeed))
- .putExtra(BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE, 5000000);
+ .putExtra(BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE, 5000000)
+ .putExtra(
+ BatteryManager.EXTRA_CHARGING_STATUS,
+ isLonglife
+ ? BatteryManager.CHARGING_POLICY_ADAPTIVE_LONGLIFE
+ : BatteryManager.CHARGING_POLICY_DEFAULT);
}
private void prepareTestGetBatteryInfoEnvironment(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index 84f549e..72b49e2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -164,7 +164,7 @@
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
- verify(mObserver).onChanged(DataChangeReason.UPDATE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
}
@Test
@@ -178,7 +178,7 @@
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
- verify(mObserver).onChanged(DataChangeReason.UPDATE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
}
@Test
@@ -192,7 +192,7 @@
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
- verify(mObserver).onChanged(DataChangeReason.UPDATE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.UPDATE);
}
@Test
@@ -301,7 +301,7 @@
inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
verifyNoMoreInteractions(mMockBackend);
- verify(mObserver).onChanged(DataChangeReason.DELETE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
}
@Test
@@ -312,7 +312,7 @@
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
- verify(mObserver).onChanged(DataChangeReason.DELETE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
}
@Test
@@ -323,7 +323,7 @@
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
- verify(mObserver).onChanged(DataChangeReason.DELETE);
+ verify(mObserver).onChanged(mBatterySettingsStorage, DataChangeReason.DELETE);
}
private void runTestForResetWithMode(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index 354afd0..962c40f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -78,6 +78,16 @@
}
@Test
+ public void isRestrictedModeOverwriteEnabled_returnFalse() {
+ assertThat(mPowerFeatureProvider.isRestrictedModeOverwriteEnabled()).isFalse();
+ }
+
+ @Test
+ public void isForceExpireAppOptimizationModeEnabled_returnFalse() {
+ assertThat(mPowerFeatureProvider.isForceExpireAppOptimizationModeEnabled()).isFalse();
+ }
+
+ @Test
public void isAppOptimizationModeLogged_returnFalse() {
assertThat(mPowerFeatureProvider.isAppOptimizationModeLogged()).isFalse();
}
@@ -160,7 +170,7 @@
@Test
public void isBatteryDefend_defenderModeAndExtraDefendAreFalse_returnFalse() {
- mBatteryInfo.isBatteryDefender = false;
+ mBatteryInfo.isLongLife = false;
doReturn(false).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
@@ -168,7 +178,7 @@
@Test
public void isBatteryDefend_defenderModeIsFalse_returnFalse() {
- mBatteryInfo.isBatteryDefender = false;
+ mBatteryInfo.isLongLife = false;
doReturn(true).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
@@ -176,7 +186,7 @@
@Test
public void isBatteryDefend_defenderModeAndExtraDefendAreTrue_returnFalse() {
- mBatteryInfo.isBatteryDefender = true;
+ mBatteryInfo.isLongLife = true;
doReturn(true).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isFalse();
@@ -184,7 +194,7 @@
@Test
public void isBatteryDefend_extraDefendIsFalse_returnTrue() {
- mBatteryInfo.isBatteryDefender = true;
+ mBatteryInfo.isLongLife = true;
doReturn(false).when(mPowerFeatureProvider).isExtraDefend();
assertThat(mPowerFeatureProvider.isBatteryDefend(mBatteryInfo)).isTrue();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
index ab1ceb5..7643c41 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
@@ -18,15 +18,12 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
import org.junit.Test;
@@ -41,28 +38,23 @@
@Mock private BatteryInfo mBatteryInfo;
private BatteryDefenderDetector mBatteryDefenderDetector;
- private FakeFeatureFactory mFakeFeatureFactory;
-
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
final Context context = ApplicationProvider.getApplicationContext();
mBatteryDefenderDetector = new BatteryDefenderDetector(mBatteryInfo, context);
- mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
}
@Test
public void detect_notBatteryDefend_tipInvisible() {
- when(mFakeFeatureFactory.powerUsageFeatureProvider.isBatteryDefend(mBatteryInfo))
- .thenReturn(false);
+ mBatteryInfo.isBatteryDefender = false;
assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse();
}
@Test
public void detect_isBatteryDefend_tipNew() {
- when(mFakeFeatureFactory.powerUsageFeatureProvider.isBatteryDefend(mBatteryInfo))
- .thenReturn(true);
+ mBatteryInfo.isBatteryDefender = true;
assertThat(mBatteryDefenderDetector.detect().getState())
.isEqualTo(BatteryTip.StateType.NEW);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
index 4567bc3..0e10a15 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryDiffEntryTest.java
@@ -494,6 +494,7 @@
final ContentValues values =
getContentValuesWithType(ConvertUtils.CONSUMER_TYPE_UID_BATTERY);
values.put(BatteryHistEntry.KEY_UID, /*invalid uid*/ 10001);
+ values.put(BatteryHistEntry.KEY_USER_ID, /*valid userid*/ USER_ID);
values.put(BatteryHistEntry.KEY_PACKAGE_NAME, fakePackageName);
final BatteryDiffEntry entry = createBatteryDiffEntry(10, new BatteryHistEntry(values));
@@ -503,14 +504,16 @@
doReturn(BatteryUtils.UID_NULL)
.when(mMockPackageManager)
- .getPackageUid(entry.getPackageName(), PackageManager.GET_META_DATA);
+ .getPackageUidAsUser(
+ entry.getPackageName(), PackageManager.GET_META_DATA, USER_ID);
entry.updateRestrictionFlagState();
// Sets false if the app is invalid package name.
assertThat(entry.mValidForRestriction).isFalse();
doReturn(1000)
.when(mMockPackageManager)
- .getPackageUid(entry.getPackageName(), PackageManager.GET_META_DATA);
+ .getPackageUidAsUser(
+ entry.getPackageName(), PackageManager.GET_META_DATA, USER_ID);
entry.updateRestrictionFlagState();
// Sets false if the app PackageInfo cannot be found.
assertThat(entry.mValidForRestriction).isFalse();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
index 450d058..6147778 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryEntryTest.java
@@ -132,7 +132,7 @@
createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME, HIGH_DRAIN_PACKAGE);
assertThat(entry.getDefaultPackageName()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
- assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + APP_DEFAULT_PACKAGE_NAME);
+ assertThat(entry.getLabel()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
}
@Test
@@ -152,7 +152,7 @@
BatteryEntry entry = createBatteryEntryForApp(null, null, HIGH_DRAIN_PACKAGE);
- assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);
+ assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
}
@Test
@@ -163,7 +163,7 @@
null,
HIGH_DRAIN_PACKAGE);
- assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);
+ assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
index af0cb91..63d44d0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
@@ -28,9 +28,9 @@
import android.content.pm.PackageManager;
import android.os.BatteryManager;
import android.os.SystemClock;
+import android.os.UserManager;
import android.text.format.DateUtils;
-import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -49,6 +49,7 @@
private FakeFeatureFactory mFakeFeatureFactory;
@Mock private PackageManager mPackageManager;
+ @Mock private UserManager mUserManager;
@Before
public void setUp() {
@@ -57,6 +58,7 @@
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mBatteryUsageBroadcastReceiver = new BatteryUsageBroadcastReceiver();
doReturn(mPackageManager).when(mContext).getPackageManager();
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
DatabaseUtils.getSharedPreferences(mContext).edit().clear().apply();
}
@@ -69,7 +71,17 @@
@Test
public void onReceive_workProfile_doNothing() {
- BatteryTestUtils.setWorkProfile(mContext);
+ doReturn(true).when(mUserManager).isManagedProfile();
+
+ mBatteryUsageBroadcastReceiver.onReceive(
+ mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
+
+ assertThat(mBatteryUsageBroadcastReceiver.mFetchBatteryUsageData).isFalse();
+ }
+
+ @Test
+ public void onReceive_privateProfile_doNothing() {
+ doReturn(true).when(mUserManager).isPrivateProfile();
mBatteryUsageBroadcastReceiver.onReceive(
mContext, new Intent(BatteryUsageBroadcastReceiver.ACTION_BATTERY_UNPLUGGING));
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
index 950f828..ac711a4 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageContentProviderTest.java
@@ -19,12 +19,16 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
+import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
@@ -39,6 +43,8 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.time.Duration;
@@ -62,9 +68,14 @@
private Context mContext;
private BatteryUsageContentProvider mProvider;
+ @Mock
+ private UserManager mUserManager;
+
@Before
public void setUp() {
- mContext = ApplicationProvider.getApplicationContext();
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
mProvider = new BatteryUsageContentProvider();
mProvider.attachInfo(mContext, /* info= */ null);
BatteryTestUtils.setUpBatteryStateDatabase(mContext);
@@ -77,7 +88,13 @@
@Test
public void onCreate_withWorkProfileMode_returnsFalse() {
- BatteryTestUtils.setWorkProfile(mContext);
+ doReturn(true).when(mUserManager).isManagedProfile();
+ assertThat(mProvider.onCreate()).isFalse();
+ }
+
+ @Test
+ public void onCreate_withPrivateProfileMode_returnsFalse() {
+ doReturn(true).when(mUserManager).isPrivateProfile();
assertThat(mProvider.onCreate()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
index 704637f..3cf6e61 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java
@@ -18,6 +18,9 @@
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 static org.robolectric.Shadows.shadowOf;
import android.app.AlarmManager;
@@ -26,9 +29,11 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryEventDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
import com.android.settings.testutils.BatteryTestUtils;
@@ -37,6 +42,8 @@
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.Shadows;
import org.robolectric.shadows.ShadowAlarmManager;
@@ -50,23 +57,31 @@
@RunWith(RobolectricTestRunner.class)
public final class BootBroadcastReceiverTest {
private Context mContext;
- private BatteryStateDao mDao;
+ private BatteryStateDao mBatteryStateDao;
+ private BatteryEventDao mBatteryEventDao;
private BootBroadcastReceiver mReceiver;
private ShadowAlarmManager mShadowAlarmManager;
private PeriodicJobManager mPeriodicJobManager;
+ @Mock
+ private UserManager mUserManager;
+
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
- mContext = ApplicationProvider.getApplicationContext();
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
mPeriodicJobManager = PeriodicJobManager.getInstance(mContext);
mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class));
mReceiver = new BootBroadcastReceiver();
// Inserts fake data into database for testing.
final BatteryStateDatabase database = BatteryTestUtils.setUpBatteryStateDatabase(mContext);
- mDao = database.batteryStateDao();
- mDao.clearAll();
+ mBatteryStateDao = database.batteryStateDao();
+ mBatteryStateDao.clearAll();
+ mBatteryEventDao = database.batteryEventDao();
+ mBatteryEventDao.clearAll();
clearSharedPreferences();
}
@@ -78,7 +93,15 @@
@Test
public void onReceive_withWorkProfile_notRefreshesJob() {
- BatteryTestUtils.setWorkProfile(mContext);
+ doReturn(true).when(mUserManager).isManagedProfile();
+ mReceiver.onReceive(mContext, new Intent(Intent.ACTION_BOOT_COMPLETED));
+
+ assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
+ }
+
+ @Test
+ public void onReceive_withPrivateProfile_notRefreshesJob() {
+ doReturn(true).when(mUserManager).isPrivateProfile();
mReceiver.onReceive(mContext, new Intent(Intent.ACTION_BOOT_COMPLETED));
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
@@ -132,36 +155,32 @@
@Test
public void onReceive_withTimeChangedIntentSetEarlierTime_refreshesJob()
throws InterruptedException {
- BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, Clock.systemUTC().millis() + 60000, "com.android.systemui");
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ insertDataToTable(Clock.systemUTC().millis() + 60000);
mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIME_CHANGED));
TimeUnit.MILLISECONDS.sleep(1000);
- assertThat(mDao.getAllAfter(0)).isEmpty();
+ assertThat(mBatteryStateDao.getAllAfter(0)).isEmpty();
+ assertThat(mBatteryEventDao.getAllAfterForLog(0)).isEmpty();
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
}
@Test
public void onReceive_withTimeChangedIntentSetLaterTime_clearNoDataAndRefreshesJob()
throws InterruptedException {
- BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, Clock.systemUTC().millis() - 60000, "com.android.systemui");
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ insertDataToTable(Clock.systemUTC().millis() - 60000);
mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIME_CHANGED));
TimeUnit.MILLISECONDS.sleep(1000);
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ assertThat(mBatteryStateDao.getAllAfter(0)).hasSize(1);
+ assertThat(mBatteryEventDao.getAllAfterForLog(0)).hasSize(1);
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
}
@Test
public void onReceive_withTimeFormatChangedIntent_skipRefreshJob() throws InterruptedException {
- BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, Clock.systemUTC().millis() + 60000, "com.android.systemui");
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ insertDataToTable(Clock.systemUTC().millis() + 60000);
mReceiver.onReceive(
mContext,
@@ -171,21 +190,24 @@
Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR));
TimeUnit.MILLISECONDS.sleep(1000);
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ assertThat(mBatteryStateDao.getAllAfter(0)).hasSize(1);
+ assertThat(mBatteryEventDao.getAllAfterForLog(0)).hasSize(1);
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
}
@Test
- public void onReceive_withTimeZoneChangedIntent_clearAllDataAndRefreshesJob()
+ public void onReceive_withTimeZoneChangedIntent_clearCacheDataAndRefreshesJob()
throws InterruptedException {
- BatteryTestUtils.insertDataToBatteryStateTable(
- mContext, Clock.systemUTC().millis(), "com.android.systemui");
- assertThat(mDao.getAllAfter(0).size()).isEqualTo(1);
+ insertDataToTable(Clock.systemUTC().millis());
+
+ assertThat(mBatteryStateDao.getAllAfter(0)).hasSize(1);
mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIMEZONE_CHANGED));
TimeUnit.MILLISECONDS.sleep(1000);
- assertThat(mDao.getAllAfter(0)).isEmpty();
+ // Only clear cache data.
+ assertThat(mBatteryStateDao.getAllAfter(0)).hasSize(1);
+ assertThat(mBatteryEventDao.getAllAfterForLog(0)).isEmpty();
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull();
}
@@ -202,4 +224,13 @@
private void clearSharedPreferences() {
DatabaseUtils.getSharedPreferences(mContext).edit().clear().apply();
}
+
+ private void insertDataToTable(long recordTimeMs) {
+ BatteryTestUtils.insertDataToBatteryStateTable(
+ mContext, recordTimeMs, "com.android.systemui");
+ BatteryTestUtils.insertDataToBatteryEventTable(
+ mContext, recordTimeMs, BatteryEventType.EVEN_HOUR.getNumber(), 50);
+ assertThat(mBatteryStateDao.getAllAfter(0)).hasSize(1);
+ assertThat(mBatteryEventDao.getAllAfterForLog(0)).hasSize(1);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
index b5cb446..a3b35be 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
@@ -703,4 +703,26 @@
/* taskRootPackageName= */ ""))
.isEqualTo(packageName);
}
+
+ @Test
+ public void decodeBatteryReattribute_returnExpectedResult() {
+ final BatteryReattribute batteryReattribute =
+ BatteryReattribute.newBuilder()
+ .setTimestampStart(100L)
+ .setTimestampEnd(200L)
+ .putReattributeData(1001, 0.2f)
+ .putReattributeData(2001, 0.8f)
+ .build();
+
+ final BatteryReattribute decodeResult = ConvertUtils.decodeBatteryReattribute(
+ ConvertUtils.encodeBatteryReattribute(batteryReattribute));
+
+ assertThat(decodeResult.getTimestampStart()).isEqualTo(100L);
+ assertThat(decodeResult.getTimestampEnd()).isEqualTo(200L);
+ final Map<Integer, Float> reattributeDataMap = decodeResult.getReattributeDataMap();
+ // Verify the reattribute data in the map.
+ assertThat(reattributeDataMap).hasSize(2);
+ assertThat(reattributeDataMap.get(1001)).isEqualTo(0.2f);
+ assertThat(reattributeDataMap.get(2001)).isEqualTo(0.8f);
+ }
}
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 6042801..2f20b42 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
@@ -112,6 +112,7 @@
mContext,
/* handler= */ null,
mUserIdsSeries,
+ /* isFromPeriodJob= */ false,
/* rawStartTimestamp= */ 0L,
/* lastFullChargeTimestamp= */ 0L,
/* callbackFunction= */ null,
@@ -258,6 +259,7 @@
mContext,
/* handler= */ null,
mUserIdsSeries,
+ /* isFromPeriodJob= */ false,
/* rawStartTimestamp= */ 2L,
/* lastFullChargeTimestamp= */ 1L,
/* callbackFunction= */ null,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
index d89e61b..2fda277 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtilsTest.java
@@ -47,7 +47,6 @@
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
import com.android.settings.fuelgauge.batteryusage.db.BatteryEventEntity;
-import com.android.settings.testutils.BatteryTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -451,6 +450,26 @@
}
@Test
+ public void getHistoryMap_withPrivateProfile_returnExpectedMap()
+ throws PackageManager.NameNotFoundException {
+ doReturn("com.fake.package").when(mContext).getPackageName();
+ doReturn(mMockContext)
+ .when(mContext)
+ .createPackageContextAsUser("com.fake.package", /* flags= */ 0, UserHandle.OWNER);
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+ doReturn(UserHandle.CURRENT).when(mContext).getUser();
+ doReturn(true).when(mUserManager).isPrivateProfile();
+ doReturn(UserHandle.SYSTEM).when(mUserManager).getProfileParent(UserHandle.CURRENT);
+
+ DatabaseUtils.sFakeSupplier = () -> getMatrixCursor();
+
+ final Map<Long, Map<String, BatteryHistEntry>> batteryHistMap =
+ DatabaseUtils.getHistoryMapSinceQueryTimestamp(mContext, 0);
+
+ assertThat(batteryHistMap).isEmpty();
+ }
+
+ @Test
public void removeUsageSource_hasNoData() {
DatabaseUtils.removeUsageSource(mContext);
assertThat(
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
index d111de2..ea3c04c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PeriodicJobReceiverTest.java
@@ -18,11 +18,15 @@
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 static org.robolectric.Shadows.shadowOf;
import android.app.AlarmManager;
import android.content.Context;
import android.content.Intent;
+import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
@@ -34,6 +38,8 @@
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.shadows.ShadowAlarmManager;
@@ -53,12 +59,17 @@
private PeriodicJobManager mPeriodicJobManager;
private ShadowAlarmManager mShadowAlarmManager;
+ @Mock
+ private UserManager mUserManager;
+
@Before
public void setUp() {
- mContext = ApplicationProvider.getApplicationContext();
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(ApplicationProvider.getApplicationContext());
mPeriodicJobManager = PeriodicJobManager.getInstance(mContext);
mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class));
mReceiver = new PeriodicJobReceiver();
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
// Inserts fake data into database for testing.
final BatteryStateDatabase database = BatteryTestUtils.setUpBatteryStateDatabase(mContext);
@@ -114,7 +125,14 @@
@Test
public void onReceive_inWorkProfileMode_notRefreshesJob() {
- BatteryTestUtils.setWorkProfile(mContext);
+ doReturn(true).when(mUserManager).isManagedProfile();
+ mReceiver.onReceive(mContext, JOB_UPDATE_INTENT);
+ assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
+ }
+
+ @Test
+ public void onReceive_inPrivateProfileMode_notRefreshesJob() {
+ doReturn(true).when(mUserManager).isPrivateProfile();
mReceiver.onReceive(mContext, JOB_UPDATE_INTENT);
assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
index d998106..0dd18c5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/BugReportContentProviderTest.java
@@ -18,7 +18,11 @@
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
import android.content.Context;
+import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
@@ -27,6 +31,8 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import java.io.FileDescriptor;
@@ -46,11 +52,17 @@
private StringWriter mStringWriter;
private BugReportContentProvider mBugReportContentProvider;
+ @Mock
+ private UserManager mUserManager;
+
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
mStringWriter = new StringWriter();
mPrintWriter = new PrintWriter(mStringWriter);
- mContext = ApplicationProvider.getApplicationContext();
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ doReturn(mContext).when(mContext).getApplicationContext();
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
mBugReportContentProvider = new BugReportContentProvider();
mBugReportContentProvider.attachInfo(mContext, /* info= */ null);
// Inserts fake data into database for testing.
@@ -77,7 +89,14 @@
@Test
public void dump_inWorkProfileMode_notDumpsBatteryUsageData() {
- BatteryTestUtils.setWorkProfile(mContext);
+ doReturn(true).when(mUserManager).isManagedProfile();
+ mBugReportContentProvider.dump(FileDescriptor.out, mPrintWriter, new String[] {});
+ assertThat(mStringWriter.toString()).isEmpty();
+ }
+
+ @Test
+ public void dump_inPrivateProfileMode_notDumpsBatteryUsageData() {
+ doReturn(true).when(mUserManager).isPrivateProfile();
mBugReportContentProvider.dump(FileDescriptor.out, mPrintWriter, new String[] {});
assertThat(mStringWriter.toString()).isEmpty();
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtilsTest.java
new file mode 100644
index 0000000..9b459c5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/bugreport/LogUtilsTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.bugreport;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryReattributeDao;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryReattributeEntity;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
+import com.android.settings.testutils.BatteryTestUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.robolectric.RobolectricTestRunner;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@RunWith(RobolectricTestRunner.class)
+public final class LogUtilsTest {
+
+ private StringWriter mTestStringWriter;
+ private PrintWriter mTestPrintWriter;
+ private Context mContext;
+ private BatteryStateDatabase mDatabase;
+ private BatteryReattributeDao mBatteryReattributeDao;
+ private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mTestStringWriter = new StringWriter();
+ mTestPrintWriter = new PrintWriter(mTestStringWriter);
+ mDatabase = BatteryTestUtils.setUpBatteryStateDatabase(mContext);
+ mBatteryReattributeDao = mDatabase.batteryReattributeDao();
+ mPowerUsageFeatureProvider = FakeFeatureFactory.setupForTest().powerUsageFeatureProvider;
+ when(mPowerUsageFeatureProvider.isBatteryUsageReattributeEnabled()).thenReturn(true);
+ }
+
+ @After
+ public void cleanUp() {
+ mBatteryReattributeDao.clearAll();
+ }
+
+ @Test
+ public void dumpBatteryReattributeDatabaseHist_noData_printExpectedResult() {
+ LogUtils.dumpBatteryReattributeDatabaseHist(mBatteryReattributeDao, mTestPrintWriter);
+
+ assertThat(mTestStringWriter.toString())
+ .contains("BatteryReattribute DatabaseHistory:");
+ }
+
+ @Test
+ public void dumpBatteryReattributeDatabaseHist_printExpectedResult() {
+ final long currentTimeMillis = System.currentTimeMillis();
+ // Insert the first testing data.
+ final BatteryReattribute batteryReattribute1 =
+ BatteryReattribute.newBuilder()
+ .setTimestampStart(currentTimeMillis - 20000)
+ .setTimestampEnd(currentTimeMillis - 10000)
+ .putReattributeData(1001, 0.1f)
+ .putReattributeData(1002, 0.99f)
+ .build();
+ mBatteryReattributeDao.insert(new BatteryReattributeEntity(batteryReattribute1));
+ // Insert the second testing data.
+ final BatteryReattribute batteryReattribute2 =
+ BatteryReattribute.newBuilder()
+ .setTimestampStart(currentTimeMillis - 40000)
+ .setTimestampEnd(currentTimeMillis - 20000)
+ .putReattributeData(1003, 1f)
+ .build();
+ mBatteryReattributeDao.insert(new BatteryReattributeEntity(batteryReattribute2));
+
+ LogUtils.dumpBatteryReattributeDatabaseHist(mBatteryReattributeDao, mTestPrintWriter);
+
+ final String result = mTestStringWriter.toString();
+ assertThat(result).contains("BatteryReattribute DatabaseHistory:");
+ assertThat(result).contains(batteryReattribute1.toString());
+ assertThat(result).contains(batteryReattribute2.toString());
+ }
+
+ @Test
+ public void dumpBatteryReattributeDatabaseHist_featureDisable_notPrintData() {
+ mBatteryReattributeDao.insert(new BatteryReattributeEntity(
+ BatteryReattribute.getDefaultInstance()));
+ when(mPowerUsageFeatureProvider.isBatteryUsageReattributeEnabled()).thenReturn(false);
+
+ LogUtils.dumpBatteryReattributeDatabaseHist(mBatteryReattributeDao, mTestPrintWriter);
+
+ final String result = mTestStringWriter.toString();
+ assertThat(result).contains("BatteryReattribute is disabled!");
+ assertThat(result.contains("BatteryReattribute DatabaseHistory:")).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
index d36f2b5..cb1f2d0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryEventDaoTest.java
@@ -175,4 +175,31 @@
mBatteryEventDao.clearAll();
assertThat(mBatteryEventDao.getAll()).isEmpty();
}
+
+ @Test
+ public void clearEvenHourEvent_normalFlow_expectedBehavior() {
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(100L)
+ .setBatteryEventType(1)
+ .setBatteryLevel(66)
+ .build());
+ mBatteryEventDao.insert(
+ BatteryEventEntity.newBuilder()
+ .setTimestamp(200L)
+ .setBatteryEventType(4)
+ .setBatteryLevel(88)
+ .build());
+ assertThat(mBatteryEventDao.getAll()).hasSize(2);
+
+ mBatteryEventDao.clearEvenHourEvent();
+
+ final List<BatteryEventEntity> events = mBatteryEventDao.getAll();
+ assertThat(events).hasSize(1);
+ assertThat(events.get(0).timestamp).isEqualTo(100L);
+ assertThat(events.get(0).batteryEventType).isEqualTo(1);
+ assertThat(events.get(0).batteryLevel).isEqualTo(66);
+ mBatteryEventDao.clearAll();
+ assertThat(mBatteryEventDao.getAll()).isEmpty();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDaoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDaoTest.java
new file mode 100644
index 0000000..8cb0e12
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeDaoTest.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.fuelgauge.batteryusage.db;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.BatteryTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+/** Tests for {@link BatteryReattributeDao}. */
+@RunWith(RobolectricTestRunner.class)
+public final class BatteryReattributeDaoTest {
+
+ private Context mContext;
+ private BatteryStateDatabase mDatabase;
+ private BatteryReattributeDao mBatteryReattributeDao;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mDatabase = BatteryTestUtils.setUpBatteryStateDatabase(mContext);
+ mBatteryReattributeDao = mDatabase.batteryReattributeDao();
+ insert(100L, 200L, "reattributeData1");
+ insert(300L, 400L, "reattributeData3");
+ insert(200L, 300L, "reattributeData2");
+ insert(400L, 500L, "reattributeData4");
+ // Ensure there was data inserted into the database.
+ assertThat(getAllEntityData()).isNotEmpty();
+ }
+
+ @Test
+ public void getAllAfter_returnExpectedEntityData() {
+ final List<BatteryReattributeEntity> entityDataList =
+ mBatteryReattributeDao.getAllAfter(/* timestampStart= */ 300L);
+
+ assertThat(entityDataList).hasSize(2);
+ assertEntity(entityDataList.get(0), 400L, 500L, "reattributeData4");
+ assertEntity(entityDataList.get(1), 300L, 400L, "reattributeData3");
+ }
+
+ @Test
+ public void clearAll_clearAllData() {
+ mBatteryReattributeDao.clearAll();
+
+ assertThat(getAllEntityData()).isEmpty();
+ }
+
+ @Test
+ public void clearAllBefore_clearAllExpectedData() {
+ mBatteryReattributeDao.clearAllBefore(/* timestampStart= */ 300L);
+
+ final List<BatteryReattributeEntity> entityDataList = getAllEntityData();
+ assertThat(entityDataList).hasSize(1);
+ assertEntity(entityDataList.get(0), 400L, 500L, "reattributeData4");
+ }
+
+ @Test
+ public void clearAllAfter_clearAllExpectedData() {
+ mBatteryReattributeDao.clearAllAfter(/* timestampStart= */ 300L);
+
+ final List<BatteryReattributeEntity> entityDataList = getAllEntityData();
+ assertThat(entityDataList).hasSize(2);
+ assertEntity(entityDataList.get(0), 200L, 300L, "reattributeData2");
+ assertEntity(entityDataList.get(1), 100L, 200L, "reattributeData1");
+ }
+
+ @Test
+ public void insert_samePrimaryKeyEntityData_replaceIntoNewEntityData() {
+ // Verify the original data before update.
+ assertEntity(getAllEntityData().get(0), 400L, 500L, "reattributeData4");
+
+ insert(400L, 600L, "reattribute4Update");
+
+ // Verify the new update entity data.
+ assertEntity(getAllEntityData().get(0), 400L, 600L, "reattribute4Update");
+ }
+
+ private void insert(long timestampStart, long timestampEnd, String reattributeData) {
+ mBatteryReattributeDao.insert(
+ new BatteryReattributeEntity(
+ timestampStart, timestampEnd, reattributeData));
+ }
+
+ private List<BatteryReattributeEntity> getAllEntityData() {
+ return mBatteryReattributeDao.getAllAfter(/* timestampStart= */ 0L);
+ }
+
+ private static void assertEntity(BatteryReattributeEntity entity, long timestampStart,
+ long timestampEnd, String reattributeData) {
+ assertThat(entity.timestampStart).isEqualTo(timestampStart);
+ assertThat(entity.timestampEnd).isEqualTo(timestampEnd);
+ assertThat(entity.reattributeData).isEqualTo(reattributeData);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntityTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntityTest.java
new file mode 100644
index 0000000..04912aa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/db/BatteryReattributeEntityTest.java
@@ -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.fuelgauge.batteryusage.db;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.fuelgauge.batteryusage.BatteryReattribute;
+import com.android.settings.fuelgauge.batteryusage.ConvertUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link BatteryReattributeEntity}. */
+@RunWith(RobolectricTestRunner.class)
+public final class BatteryReattributeEntityTest {
+
+ @Test
+ public void constructor_createExpectedData() {
+ final BatteryReattribute batteryReattribute =
+ BatteryReattribute.newBuilder()
+ .setTimestampStart(100L)
+ .setTimestampEnd(200L)
+ .putReattributeData(1001, 0.2f)
+ .putReattributeData(2001, 0.8f)
+ .build();
+
+ final BatteryReattributeEntity batteryReattributeEntity =
+ new BatteryReattributeEntity(batteryReattribute);
+
+ assertThat(batteryReattributeEntity.timestampStart)
+ .isEqualTo(batteryReattribute.getTimestampStart());
+ assertThat(batteryReattributeEntity.timestampEnd)
+ .isEqualTo(batteryReattribute.getTimestampEnd());
+ // Verify the BatteryReattribute data.
+ final BatteryReattribute decodeResult =
+ ConvertUtils.decodeBatteryReattribute(batteryReattributeEntity.reattributeData);
+ assertThat(decodeResult).isEqualTo(batteryReattribute);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PointerFillStylePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PointerFillStylePreferenceControllerTest.java
new file mode 100644
index 0000000..d8765f2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/PointerFillStylePreferenceControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.view.flags.Flags.enableVectorCursorA11ySettings;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.inputmethod.PointerFillStylePreferenceController.KEY_POINTER_FILL_STYLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+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 PointerFillStylePreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+ ShadowSystemSettings.class,
+})
+public class PointerFillStylePreferenceControllerTest {
+ @Rule
+ public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+ @Mock
+ PreferenceScreen mPreferenceScreen;
+ @Mock
+ LifecycleOwner mLifecycleOwner;
+
+ private Context mContext;
+ private PointerFillStylePreferenceController mController;
+ private FakeFeatureFactory mFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mController = new PointerFillStylePreferenceController(mContext);
+ }
+
+ @Test
+ public void displayPreference_initializeDataStore() {
+ Preference fillPreference = new Preference(mContext);
+ fillPreference.setKey(KEY_POINTER_FILL_STYLE);
+ when(mPreferenceScreen.findPreference(eq(KEY_POINTER_FILL_STYLE))).thenReturn(
+ fillPreference);
+
+ mController.displayPreference(mPreferenceScreen);
+
+ assertNotNull(fillPreference.getPreferenceDataStore());
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagEnabled() {
+ assumeTrue(enableVectorCursorA11ySettings());
+
+ assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
+ }
+
+ @Test
+ public void onPause_logCurrentFillValue() {
+ int fillStyle = 1;
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_FILL_STYLE, fillStyle, UserHandle.USER_CURRENT);
+
+ mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(
+ any(), eq(SettingsEnums.ACTION_POINTER_ICON_FILL_STYLE_CHANGED),
+ eq(fillStyle));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PointerScaleSeekBarControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PointerScaleSeekBarControllerTest.java
new file mode 100644
index 0000000..18705c4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/PointerScaleSeekBarControllerTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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.inputmethod;
+
+import static android.view.flags.Flags.enableVectorCursorA11ySettings;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.widget.SeekBar;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowSystemSettings;
+import com.android.settings.widget.LabeledSeekBarPreference;
+
+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;
+
+/** Tests for {@link PointerScaleSeekBarController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+ ShadowSystemSettings.class,
+})
+public class PointerScaleSeekBarControllerTest {
+
+ private static final String PREFERENCE_KEY = "pointer_scale";
+
+ @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+ @Mock private PreferenceScreen mPreferenceScreen;
+ @Mock private LifecycleOwner mLifecycleOwner;
+
+ private Context mContext;
+ private LabeledSeekBarPreference mPreference;
+ private PointerScaleSeekBarController mController;
+ private FakeFeatureFactory mFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mPreference = new LabeledSeekBarPreference(mContext, null);
+ mController = new PointerScaleSeekBarController(mContext, PREFERENCE_KEY);
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagEnabled() {
+ assumeTrue(enableVectorCursorA11ySettings());
+
+ assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
+ }
+
+ @Test
+ public void onProgressChanged_changeListenerUpdatesSetting() {
+ when(mPreferenceScreen.findPreference(anyString())).thenReturn(mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ SeekBar seekBar = mPreference.getSeekbar();
+ int sliderValue = 1;
+
+ mPreference.onProgressChanged(seekBar, sliderValue, false);
+
+ float expectedScale = 1.5f;
+ float currentScale = Settings.System.getFloatForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_SCALE, -1, UserHandle.USER_CURRENT);
+ assertEquals(expectedScale, currentScale, /* delta= */ 0.001f);
+ }
+
+ @Test
+ public void onPause_logCurrentScaleValue() {
+ float scale = 1.5f;
+ Settings.System.putFloatForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_SCALE, scale, UserHandle.USER_CURRENT);
+
+ mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(
+ any(), eq(SettingsEnums.ACTION_POINTER_ICON_SCALE_CHANGED),
+ eq(Float.toString(scale)));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceControllerTest.java
new file mode 100644
index 0000000..9fffdc3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.view.flags.Flags.enableVectorCursorA11ySettings;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.inputmethod.PointerStrokeStylePreferenceController.KEY_POINTER_STROKE_STYLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+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 PointerStrokeStylePreferenceController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+ ShadowSystemSettings.class,
+})
+public class PointerStrokeStylePreferenceControllerTest {
+ @Rule
+ public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+ @Mock
+ PreferenceScreen mPreferenceScreen;
+ @Mock
+ LifecycleOwner mLifecycleOwner;
+
+ private Context mContext;
+ private PointerStrokeStylePreferenceController mController;
+ private FakeFeatureFactory mFeatureFactory;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mController = new PointerStrokeStylePreferenceController(mContext);
+ }
+
+ @Test
+ public void displayPreference_initializeDataStore() {
+ Preference strokePreference = new Preference(mContext);
+ strokePreference.setKey(KEY_POINTER_STROKE_STYLE);
+ when(mPreferenceScreen.findPreference(eq(KEY_POINTER_STROKE_STYLE))).thenReturn(
+ strokePreference);
+
+ mController.displayPreference(mPreferenceScreen);
+
+ assertNotNull(strokePreference.getPreferenceDataStore());
+ }
+
+ @Test
+ public void getAvailabilityStatus_flagEnabled() {
+ assumeTrue(enableVectorCursorA11ySettings());
+
+ assertEquals(mController.getAvailabilityStatus(), AVAILABLE);
+ }
+
+ @Test
+ public void onPause_logCurrentStrokeValue() {
+ int strokeStyle = 1;
+ Settings.System.putIntForUser(mContext.getContentResolver(),
+ Settings.System.POINTER_STROKE_STYLE, strokeStyle, UserHandle.USER_CURRENT);
+
+ mController.onStateChanged(mLifecycleOwner, Lifecycle.Event.ON_PAUSE);
+
+ verify(mFeatureFactory.metricsFeatureProvider).action(
+ any(), eq(SettingsEnums.ACTION_POINTER_ICON_STROKE_STYLE_CHANGED),
+ eq(strokeStyle));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceTest.java b/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceTest.java
new file mode 100644
index 0000000..33b8592
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/PointerStrokeStylePreferenceTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_BLACK;
+import static android.view.PointerIcon.POINTER_ICON_VECTOR_STYLE_STROKE_WHITE;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.view.View;
+import android.widget.RadioButton;
+
+import androidx.preference.PreferenceDataStore;
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+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;
+
+/** Tests for {@link PointerStrokeStylePreference} */
+@RunWith(RobolectricTestRunner.class)
+public class PointerStrokeStylePreferenceTest {
+ @Rule
+ public MockitoRule mMockitoRule = MockitoJUnit.rule();
+
+ @Mock
+ PreferenceDataStore mPreferenceDataStore;
+
+ private Context mContext;
+ private PreferenceViewHolder mViewHolder;
+ private PointerStrokeStylePreference mPreference;
+
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mPreference = new PointerStrokeStylePreference(mContext, null);
+ }
+
+ @Test
+ public void onBindViewHolder_getCurrentStrokeStyleFromDataStore() {
+ final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+ mPreference.setPreferenceDataStore(mPreferenceDataStore);
+
+ mPreference.onBindViewHolder(mViewHolder);
+
+ verify(mPreferenceDataStore).getInt(Settings.System.POINTER_STROKE_STYLE,
+ POINTER_ICON_VECTOR_STYLE_STROKE_WHITE);
+ }
+
+ @Test
+ public void setChecked_radioButtonUpdatesDataStore() {
+ final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+ mPreference.setPreferenceDataStore(mPreferenceDataStore);
+ RadioButton radioButton = (RadioButton) view.findViewById(R.id.stroke_style_black);
+ mPreference.onBindViewHolder(mViewHolder);
+
+ radioButton.setChecked(true);
+
+ verify(mPreferenceDataStore).getInt(Settings.System.POINTER_STROKE_STYLE,
+ POINTER_ICON_VECTOR_STYLE_STROKE_WHITE);
+ verify(mPreferenceDataStore).putInt(Settings.System.POINTER_STROKE_STYLE,
+ POINTER_ICON_VECTOR_STYLE_STROKE_BLACK);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
index fa73768..a7d4bf4 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/TrackpadBottomPreferenceControllerTest.java
@@ -26,12 +26,14 @@
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
+import android.view.InputDevice;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
import org.junit.Before;
import org.junit.Rule;
@@ -46,6 +48,7 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+ com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadBottomPreferenceControllerTest {
@Rule
@@ -67,6 +70,12 @@
@Test
public void getAvailabilityStatus_expected() {
+ 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/TrackpadReverseScrollingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
index f545c38..16b17f3 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/TrackpadReverseScrollingPreferenceControllerTest.java
@@ -26,12 +26,14 @@
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
+import android.view.InputDevice;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
import org.junit.Before;
import org.junit.Rule;
@@ -46,6 +48,7 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+ com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadReverseScrollingPreferenceControllerTest {
@Rule
@@ -67,6 +70,12 @@
@Test
public void getAvailabilityStatus_expected() {
+ 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/TrackpadSettingsControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TrackpadSettingsControllerTest.java
new file mode 100644
index 0000000..bb97d71
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/TrackpadSettingsControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.view.flags.Flags.enableVectorCursorA11ySettings;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.view.InputDevice;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+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 TrackpadSettingsController} */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+ com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+ ShadowInputDevice.class,
+})
+public class TrackpadSettingsControllerTest {
+ @Rule
+ public MockitoRule rule = MockitoJUnit.rule();
+
+ private static final String PREFERENCE_KEY = "trackpad_settings";
+
+ private Context mContext;
+ private TrackpadSettingsController mController;
+
+ @Before
+ public void setUp() {
+ mContext = ApplicationProvider.getApplicationContext();
+ mController = new TrackpadSettingsController(mContext, PREFERENCE_KEY);
+ ShadowInputDevice.reset();
+ }
+
+ @Test
+ public void getAvailabilityStatus_isTouchpadAvailable() {
+ 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);
+ }
+
+ @Test
+ public void getAvailabilityStatus_isMouseAvailable() {
+ assumeTrue(enableVectorCursorA11ySettings());
+
+ 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);
+ }
+
+ @Test
+ public void getAvailabilityStatus_noMouseOrTouchpadUnavailable() {
+ int deviceId = 1;
+ ShadowInputDevice.sDeviceIds = new int[]{deviceId};
+ InputDevice device = ShadowInputDevice.makeInputDevicebyIdWithSources(deviceId,
+ InputDevice.SOURCE_UNKNOWN);
+ ShadowInputDevice.addDevice(deviceId, device);
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
index 8e9d026..979f568 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/TrackpadTapToClickPreferenceControllerTest.java
@@ -26,12 +26,14 @@
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
+import android.view.InputDevice;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowInputDevice;
import org.junit.Before;
import org.junit.Rule;
@@ -46,6 +48,7 @@
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
com.android.settings.testutils.shadow.ShadowSystemSettings.class,
+ com.android.settings.testutils.shadow.ShadowInputDevice.class,
})
public class TrackpadTapToClickPreferenceControllerTest {
@Rule
@@ -67,6 +70,12 @@
@Test
public void getAvailabilityStatus_expected() {
+ 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/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
index fb29e05..0161178 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -51,6 +51,7 @@
import android.os.PowerManager;
import android.os.UserManager;
import android.provider.Settings;
+import android.telephony.SubscriptionManager;
import android.view.ContextMenu;
import android.view.Menu;
import android.view.MenuItem;
@@ -319,7 +320,8 @@
mNetworkProviderSettings.onCreate(Bundle.EMPTY);
verify(mDataUsagePreference).setVisible(true);
- verify(mDataUsagePreference).setTemplate(any(), eq(0) /*subId*/);
+ verify(mDataUsagePreference)
+ .setTemplate(any(), eq(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceControllerTest.java
index 8db4681..29592cf 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/AutoDataSwitchPreferenceControllerTest.java
@@ -85,7 +85,7 @@
return true;
}
};
- mController.init(SUB_ID_1, null);
+ mController.init(SUB_ID_1);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java
new file mode 100644
index 0000000..8b8c77e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/app/BundleListPreferenceControllerTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.notification.app;
+
+import static android.app.NotificationChannel.NEWS_ID;
+import static android.app.NotificationChannel.PROMOTIONS_ID;
+import static android.app.NotificationChannel.RECS_ID;
+import static android.app.NotificationChannel.SOCIAL_MEDIA_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.content.Context;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.Flags;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SmallTest;
+
+import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.PrimarySwitchPreference;
+
+import com.google.common.collect.ImmutableMap;
+
+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)
+@SmallTest
+@EnableFlags(Flags.FLAG_NOTIFICATION_CLASSIFICATION)
+public class BundleListPreferenceControllerTest {
+ private Context mContext;
+ @Mock
+ private NotificationBackend mBackend;
+ private NotificationBackend.AppRow mAppRow;
+ private BundleListPreferenceController mController;
+ private PreferenceManager mPreferenceManager;
+ private PreferenceScreen mPreferenceScreen;
+ private PreferenceCategory mGroupList;
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+
+ mAppRow = new NotificationBackend.AppRow();
+ mAppRow.pkg = "pkg";
+ mAppRow.uid = 1111111;
+ NotificationBackend.NotificationsSentState
+ sentA = new NotificationBackend.NotificationsSentState();
+ sentA.avgSentDaily = 2;
+ sentA.avgSentWeekly = 10;
+ NotificationBackend.NotificationsSentState
+ sentB = new NotificationBackend.NotificationsSentState();
+ sentB.avgSentDaily = 0;
+ sentB.avgSentWeekly = 2;
+ mAppRow.sentByChannel = ImmutableMap.of(
+ PROMOTIONS_ID, sentA, NEWS_ID, sentA, SOCIAL_MEDIA_ID, sentB, RECS_ID, sentB);
+ mController = new BundleListPreferenceController(mContext, mBackend);
+ mController.onResume(mAppRow, null, null, null, null, null, null);
+ mPreferenceManager = new PreferenceManager(mContext);
+ 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
+ public void isAvailable_null() {
+ mController.onResume(null, null, null, null, null, null, null);
+ assertThat(mController.isAvailable()).isFalse();
+ mAppRow.banned = true;
+ }
+
+ @Test
+ public void isAvailable_banned() {
+ mAppRow.banned = true;
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_locked() {
+ mAppRow.lockedImportance = true;
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_system() {
+ mAppRow.systemApp = true;
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable() {
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void updateState() {
+ mController.updateState(mGroupList);
+ assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
+ assertThat(mGroupList.findPreference(PROMOTIONS_ID).getTitle()).isEqualTo(PROMOTIONS_ID);
+ assertThat(mGroupList.findPreference(NEWS_ID).getTitle()).isEqualTo(NEWS_ID);
+ assertThat(mGroupList.findPreference(SOCIAL_MEDIA_ID).getTitle())
+ .isEqualTo(SOCIAL_MEDIA_ID);
+ assertThat(mGroupList.findPreference(RECS_ID).getTitle()).isEqualTo(RECS_ID);
+ }
+
+ @Test
+ public void updateState_updateChildren() {
+ mController.updateState(mGroupList);
+ assertThat(mGroupList.getPreferenceCount()).isEqualTo(4);
+
+ when(mBackend.getChannel(mAppRow.pkg, mAppRow.uid, PROMOTIONS_ID)).thenReturn(
+ new NotificationChannel(PROMOTIONS_ID, PROMOTIONS_ID, 2));
+
+ 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/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
index 5c9de7c..267b8d7 100644
--- a/tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/DeletedChannelsPreferenceControllerTest.java
@@ -31,12 +31,17 @@
import android.app.NotificationManager;
import android.content.Context;
import android.os.UserManager;
+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.server.notification.Flags;
import com.android.settings.notification.NotificationBackend;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -60,6 +65,8 @@
private UserManager mUm;
private DeletedChannelsPreferenceController mController;
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -109,6 +116,16 @@
}
@Test
+ @EnableFlags(Flags.FLAG_NOTIFICATION_HIDE_UNUSED_CHANNELS)
+ public void isAvailable_notIfFlagEnabled() {
+ when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
+ mController.onResume(
+ new NotificationBackend.AppRow(), null, null, null, null, null, new ArrayList<>());
+ assertFalse(mController.isAvailable());
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_NOTIFICATION_HIDE_UNUSED_CHANNELS)
public void isAvailable_appScreen() {
when(mBackend.getDeletedChannelCount(any(), anyInt())).thenReturn(1);
mController.onResume(
diff --git a/tests/robotests/src/com/android/settings/notification/app/ShowMorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/ShowMorePreferenceControllerTest.java
new file mode 100644
index 0000000..611c80a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/app/ShowMorePreferenceControllerTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import androidx.preference.Preference;
+
+import com.android.server.notification.Flags;
+import com.android.settings.notification.NotificationBackend;
+
+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)
+@EnableFlags(Flags.FLAG_NOTIFICATION_HIDE_UNUSED_CHANNELS)
+public class ShowMorePreferenceControllerTest {
+
+ private Context mContext;
+ @Mock
+ private NotificationBackend mBackend;
+ @Mock
+ private NotificationManager mNm;
+ @Mock
+ private UserManager mUm;
+ @Mock
+ private NotificationSettings.DependentFieldListener mDependentFieldListener;
+
+ private ShowMorePreferenceController mController;
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
+ shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
+ mContext = RuntimeEnvironment.application;
+ mController = new ShowMorePreferenceController(mContext, mDependentFieldListener, mBackend);
+ }
+
+ @Test
+ public void noCrashIfNoOnResume() {
+ mController.isAvailable();
+ mController.updateState(mock(Preference.class));
+ }
+
+ @Test
+ public void isAvailable_notIfAppBlocked() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = true;
+ appRow.showAllChannels = false;
+ mController.onResume(appRow, null, null, null, null, null, null);
+ assertFalse(mController.isAvailable());
+ }
+
+ @Test
+ public void isAvailable_notIfShowingAll() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ mController.onResume(appRow, null, mock(NotificationChannelGroup.class), null, null, null,
+ null);
+ assertFalse(mController.isAvailable());
+ }
+
+ @Test
+ public void updateState() {
+ NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+ appRow.banned = false;
+ appRow.showAllChannels = false;
+ mController.onResume(appRow, null, null, null, null, null, null);
+
+ Preference pref = new Preference(mContext);
+ mController.updateState(pref);
+
+ pref.performClick();
+
+ verify(mDependentFieldListener).onFieldValueChanged();
+ assertThat(appRow.showAllChannels).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/CharSequenceTruth.java b/tests/robotests/src/com/android/settings/notification/modes/CharSequenceTruth.java
new file mode 100644
index 0000000..94b932f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/CharSequenceTruth.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.notification.modes;
+
+import androidx.annotation.Nullable;
+
+import com.google.common.truth.StringSubject;
+import com.google.common.truth.Truth;
+
+class CharSequenceTruth {
+ /**
+ * Shortcut version of {@link Truth#assertThat(String)} suitable for {@link CharSequence}.
+ * {@link CharSequence} doesn't necessarily provide a good {@code equals()} implementation;
+ * however we don't care about formatting in most cases, and we want to assert on the resulting
+ * string (without needing to worry that {@code assertThat(x.getText().toString())} can
+ * throw if the text is null).
+ */
+ static StringSubject assertThat(@Nullable CharSequence actual) {
+ return Truth.assertThat((String) (actual != null ? actual.toString() : null));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/CircularIconSetTest.java b/tests/robotests/src/com/android/settings/notification/modes/CircularIconSetTest.java
new file mode 100644
index 0000000..826c9df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/CircularIconSetTest.java
@@ -0,0 +1,207 @@
+/*
+ * 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.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+
+import com.google.common.base.Equivalence;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+import java.util.function.Function;
+
+@RunWith(RobolectricTestRunner.class)
+public class CircularIconSetTest {
+
+ @Mock private Function<Integer, Drawable> mDrawableLoader;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ CircularIconSet.sExecutorService = MoreExecutors.newDirectExecutorService();
+ when(mDrawableLoader.apply(anyInt())).thenReturn(new ColorDrawable(Color.BLACK));
+ }
+
+ @Test
+ public void hasSameItemsAs_sameItems_true() {
+ CircularIconSet<Integer> items1 = new CircularIconSet<>(ImmutableList.of(1, 2),
+ num -> new ColorDrawable(Color.BLUE));
+ CircularIconSet<Integer> items2 = new CircularIconSet<>(ImmutableList.of(1, 2),
+ num -> new ColorDrawable(Color.GREEN));
+
+ assertThat(items1.hasSameItemsAs(items2, null)).isTrue();
+ }
+
+ @Test
+ public void hasSameItemsAs_differentTypes_false() {
+ CircularIconSet<Integer> items1 = new CircularIconSet<>(ImmutableList.of(1, 2),
+ num -> new ColorDrawable(Color.BLUE));
+ CircularIconSet<String> items2 = new CircularIconSet<>(ImmutableList.of("a", "b"),
+ str -> new ColorDrawable(Color.GREEN));
+
+ assertThat(items1.hasSameItemsAs(items2, null)).isFalse();
+ }
+
+ @Test
+ public void hasSameItemsAs_differentItems_false() {
+ CircularIconSet<String> items1 = new CircularIconSet<>(ImmutableList.of("a", "b"),
+ str -> new ColorDrawable(Color.GREEN));
+ CircularIconSet<String> items2 = new CircularIconSet<>(ImmutableList.of("a", "b", "c"),
+ str -> new ColorDrawable(Color.GREEN));
+
+ assertThat(items1.hasSameItemsAs(items2, null)).isFalse();
+ }
+
+ private static class WrapperWithoutEquals<T> {
+ private final T mValue;
+ private WrapperWithoutEquals(T value) {
+ mValue = value;
+ }
+ }
+
+ @Test
+ public void hasSameItemsAs_withEquivalence_trueIfEquivalentItems() {
+ CircularIconSet<WrapperWithoutEquals<Integer>> items1 = new CircularIconSet<>(
+ ImmutableList.of(
+ new WrapperWithoutEquals<>(1),
+ new WrapperWithoutEquals<>(2)),
+ unused -> new ColorDrawable(Color.BLACK));
+ CircularIconSet<WrapperWithoutEquals<Integer>> items2 = new CircularIconSet<>(
+ ImmutableList.of(
+ new WrapperWithoutEquals<>(1),
+ new WrapperWithoutEquals<>(2)),
+ unused -> new ColorDrawable(Color.BLACK));
+ CircularIconSet<WrapperWithoutEquals<Integer>> items3 = new CircularIconSet<>(
+ ImmutableList.of(
+ new WrapperWithoutEquals<>(2),
+ new WrapperWithoutEquals<>(3)),
+ unused -> new ColorDrawable(Color.BLACK));
+ // Needs special equivalence, equals is not enough.
+ assertThat(items1.hasSameItemsAs(items2, null)).isFalse();
+
+ Equivalence<WrapperWithoutEquals<Integer>> equivalence = new Equivalence<>() {
+ @Override
+ protected boolean doEquivalent(WrapperWithoutEquals<Integer> a,
+ WrapperWithoutEquals<Integer> b) {
+ return a.mValue.equals(b.mValue);
+ }
+
+ @Override
+ protected int doHash(WrapperWithoutEquals<Integer> t) {
+ return t.mValue;
+ }
+ };
+
+ assertThat(items1.hasSameItemsAs(items2, equivalence)).isTrue();
+ assertThat(items1.hasSameItemsAs(items3, equivalence)).isFalse();
+ }
+
+ @Test
+ public void hasSameItemsAs_withEquivalenceButDifferentTypes_falseAndNoClassCastExceptions() {
+ CircularIconSet<Integer> items1 = new CircularIconSet<>(ImmutableList.of(1, 2),
+ num -> new ColorDrawable(Color.BLUE));
+ CircularIconSet<String> items2 = new CircularIconSet<>(ImmutableList.of("one", "two"),
+ num -> new ColorDrawable(Color.GREEN));
+
+ Equivalence<String> stringEquivalence = new Equivalence<String>() {
+ @Override
+ protected boolean doEquivalent(String a, String b) {
+ return a.equals(b);
+ }
+
+ @Override
+ protected int doHash(String t) {
+ return t.hashCode();
+ }
+ };
+ Equivalence<Integer> integerEquivalence = new Equivalence<Integer>() {
+ @Override
+ protected boolean doEquivalent(Integer a, Integer b) {
+ return a.equals(b);
+ }
+
+ @Override
+ protected int doHash(Integer t) {
+ return t.hashCode();
+ }
+ };
+
+ assertThat(items1.hasSameItemsAs(items2, stringEquivalence)).isFalse();
+ assertThat(items2.hasSameItemsAs(items1, integerEquivalence)).isFalse();
+ }
+
+ @Test
+ public void getIcons_loadsAllIcons() {
+ CircularIconSet<Integer> set = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ mDrawableLoader);
+
+ List<ListenableFuture<Drawable>> iconFutures = set.getIcons();
+
+ assertThat(iconFutures).hasSize(3);
+ verify(mDrawableLoader).apply(1);
+ verify(mDrawableLoader).apply(2);
+ verify(mDrawableLoader).apply(3);
+ }
+
+ @Test
+ public void getIcons_loadsRequestedIcons() {
+ CircularIconSet<Integer> set = new CircularIconSet<>(ImmutableList.of(1, 2, 3, 4, 5),
+ mDrawableLoader);
+
+ List<ListenableFuture<Drawable>> iconFutures = set.getIcons(2);
+
+ assertThat(iconFutures).hasSize(2);
+ verify(mDrawableLoader).apply(1);
+ verify(mDrawableLoader).apply(2);
+ verifyNoMoreInteractions(mDrawableLoader);
+ }
+
+ @Test
+ public void getIcons_cachesIcons() {
+ CircularIconSet<Integer> set = new CircularIconSet<>(ImmutableList.of(1, 2, 3, 4, 5),
+ mDrawableLoader);
+
+ List<ListenableFuture<Drawable>> iconFutures = set.getIcons(2);
+ assertThat(iconFutures).hasSize(2);
+ verify(mDrawableLoader).apply(1);
+ verify(mDrawableLoader).apply(2);
+ verifyNoMoreInteractions(mDrawableLoader);
+
+ List<ListenableFuture<Drawable>> iconFuturesAgain = set.getIcons(3);
+ assertThat(iconFuturesAgain).hasSize(3);
+ verify(mDrawableLoader).apply(3);
+ verifyNoMoreInteractions(mDrawableLoader);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/CircularIconsPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/modes/CircularIconsPreferenceTest.java
new file mode 100644
index 0000000..d145f25
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/CircularIconsPreferenceTest.java
@@ -0,0 +1,337 @@
+/*
+ * 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 android.view.View.MeasureSpec.makeMeasureSpec;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+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.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+@RunWith(RobolectricTestRunner.class)
+public class CircularIconsPreferenceTest {
+
+ private static final int VIEW_WIDTH = 800;
+
+ private Context mContext;
+ private CircularIconsPreference mPreference;
+ private PreferenceViewHolder mViewHolder;
+ private ViewGroup mContainer;
+
+ private int mOneIconWidth;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ CircularIconSet.sExecutorService = MoreExecutors.newDirectExecutorService();
+ mPreference = new TestableCircularIconsPreference(mContext);
+ // Tests should call bindAndMeasureViewHolder() so that icons can be added.
+
+ Resources res = mContext.getResources();
+ mOneIconWidth = res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_diameter)
+ + res.getDimensionPixelSize(R.dimen.zen_mode_circular_icon_margin_between);
+ }
+
+ private void bindAndMeasureViewHolder(int viewWidth) {
+ bindViewHolder();
+ measureViewHolder(viewWidth);
+ }
+
+ private void bindViewHolder() {
+ View preferenceView = LayoutInflater.from(mContext).inflate(mPreference.getLayoutResource(),
+ null);
+ mContainer = checkNotNull(preferenceView.findViewById(R.id.circles_container));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(preferenceView);
+ mPreference.onBindViewHolder(mViewHolder);
+ }
+
+ private void measureViewHolder(int viewWidth) {
+ checkState(mContainer != null, "Call bindViewHolder() first!");
+ mContainer.measure(makeMeasureSpec(viewWidth, View.MeasureSpec.EXACTLY),
+ makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+ mContainer.getViewTreeObserver().dispatchOnGlobalLayout();
+ }
+
+ @Test
+ public void displayIcons_loadsIcons() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+ mPreference.displayIcons(iconSet);
+
+ assertThat(getIcons(mContainer)).hasSize(2);
+ assertThat(((ColorDrawable) getIcons(mContainer).get(0)).getColor()).isEqualTo(1);
+ assertThat(((ColorDrawable) getIcons(mContainer).get(1)).getColor()).isEqualTo(2);
+ assertThat(getPlusText(mContainer)).isNull();
+ }
+
+ @Test
+ public void displayIcons_noIcons_hidesRow() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(),
+ ColorDrawable::new);
+
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+ mPreference.displayIcons(iconSet);
+
+ assertThat(mContainer.getVisibility()).isEqualTo(View.GONE);
+ }
+
+ @Test
+ public void displayIcons_exactlyMaxIcons_loadsAllIcons() throws Exception {
+ int width = 300;
+ int fittingCircles = width / mOneIconWidth;
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(
+ IntStream.range(0, fittingCircles).boxed().toList(),
+ ColorDrawable::new);
+
+ bindAndMeasureViewHolder(width);
+ mPreference.displayIcons(iconSet);
+
+ assertThat(getIcons(mContainer)).hasSize(fittingCircles);
+ assertThat(getIcons(mContainer)).containsExactlyElementsIn(
+ Futures.allAsList(iconSet.getIcons()).get()).inOrder();
+ assertThat(getPlusText(mContainer)).isNull();
+
+ }
+
+ @Test
+ public void displayIcons_tooManyIcons_loadsFirstNAndPlusIcon() throws Exception {
+ int width = 300;
+ int fittingCircles = width / mOneIconWidth;
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(
+ IntStream.range(0, fittingCircles + 5).boxed().toList(),
+ ColorDrawable::new);
+
+ bindAndMeasureViewHolder(width);
+ mPreference.displayIcons(iconSet);
+
+ // N-1 icons, plus (+6) text.
+ assertThat(getIcons(mContainer)).hasSize(fittingCircles - 1);
+ assertThat(getIcons(mContainer)).containsExactlyElementsIn(
+ Futures.allAsList(iconSet.getIcons(fittingCircles - 1)).get())
+ .inOrder();
+ assertThat(getPlusText(mContainer)).isEqualTo("+6");
+ }
+
+ @Test
+ public void displayIcons_teenyTinySpace_showsPlusIcon_noCrash() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+
+ bindAndMeasureViewHolder(1);
+ mPreference.displayIcons(iconSet);
+
+ assertThat(getIcons(mContainer)).isEmpty();
+ assertThat(getPlusText(mContainer)).isEqualTo("+2");
+ }
+
+ @Test
+ public void displayIcons_beforeBind_loadsIconsOnBindAndMeasure() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new);
+
+ mPreference.displayIcons(iconSet);
+ assertThat(mPreference.getLoadedIcons()).isNull(); // Hold...
+
+ bindViewHolder();
+ assertThat(mPreference.getLoadedIcons()).isNull(); // Hooooold...
+
+ measureViewHolder(VIEW_WIDTH);
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(3);
+ assertThat(getIcons(mContainer)).hasSize(3);
+ }
+
+ @Test
+ public void displayIcons_beforeMeasure_loadsIconsOnMeasure() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new);
+ bindViewHolder();
+
+ mPreference.displayIcons(iconSet);
+ assertThat(mPreference.getLoadedIcons()).isNull();
+
+ measureViewHolder(VIEW_WIDTH);
+ assertThat(getIcons(mContainer)).hasSize(3);
+ }
+
+ @Test
+ public void displayIcons_calledAgain_reloadsIcons() {
+ CircularIconSet<Integer> threeIcons = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new);
+ CircularIconSet<Integer> twoIcons = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+ CircularIconSet<Integer> fourIcons = new CircularIconSet<>(ImmutableList.of(1, 2, 3, 4),
+ ColorDrawable::new);
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+
+ mPreference.displayIcons(threeIcons);
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(getIcons(mContainer)).hasSize(3);
+
+ mPreference.displayIcons(twoIcons);
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(getIcons(mContainer)).hasSize(2);
+
+ mPreference.displayIcons(fourIcons);
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(getIcons(mContainer)).hasSize(4);
+ }
+
+ @Test
+ public void displayIcons_sameSet_doesNotReloadIcons() {
+ CircularIconSet<Integer> one = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new);
+ CircularIconSet<Integer> same = Mockito.spy(new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new));
+ when(same.getIcons()).thenThrow(new RuntimeException("Shouldn't be called!"));
+
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+
+ mPreference.displayIcons(one);
+
+ mPreference.displayIcons(same); // if no exception, wasn't called.
+ }
+
+ @Test
+ public void onBindViewHolder_withDifferentView_reloadsIconsCorrectly() {
+ View preferenceViewOne = LayoutInflater.from(mContext).inflate(
+ mPreference.getLayoutResource(), null);
+ ViewGroup containerOne = preferenceViewOne.findViewById(R.id.circles_container);
+ PreferenceViewHolder viewHolderOne = PreferenceViewHolder.createInstanceForTests(
+ preferenceViewOne);
+ containerOne.measure(makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+ makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+
+ View preferenceViewTwo = LayoutInflater.from(mContext).inflate(
+ mPreference.getLayoutResource(), null);
+ ViewGroup containerTwo = preferenceViewTwo.findViewById(R.id.circles_container);
+ PreferenceViewHolder viewHolderTwo = PreferenceViewHolder.createInstanceForTests(
+ preferenceViewTwo);
+ containerTwo.measure(makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+ makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+
+ CircularIconSet<Integer> iconSetOne = new CircularIconSet<>(ImmutableList.of(1, 2, 3),
+ ColorDrawable::new);
+ CircularIconSet<Integer> iconSetTwo = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+
+ mPreference.onBindViewHolder(viewHolderOne);
+ mPreference.displayIcons(iconSetOne);
+ assertThat(getIcons(containerOne)).hasSize(3);
+
+ mPreference.onBindViewHolder(viewHolderTwo);
+ assertThat(getIcons(containerTwo)).hasSize(3);
+
+ mPreference.displayIcons(iconSetTwo);
+
+ // The second view is updated and the first view is unaffected.
+ assertThat(getIcons(containerTwo)).hasSize(2);
+ assertThat(getIcons(containerOne)).hasSize(3);
+ }
+
+ @Test
+ public void setEnabled_afterDisplayIcons_showsEnabledOrDisabledImages() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+ mPreference.displayIcons(iconSet);
+ assertThat(getViews(mContainer)).hasSize(2);
+
+ mPreference.setEnabled(false);
+ assertThat(getViews(mContainer).get(0).getAlpha()).isLessThan(1f);
+
+ mPreference.setEnabled(true);
+ assertThat(getViews(mContainer).get(0).getAlpha()).isEqualTo(1f);
+ }
+
+ @Test
+ public void setEnabled_beforeDisplayIcons_showsEnabledOrDisabledImages() {
+ CircularIconSet<Integer> iconSet = new CircularIconSet<>(ImmutableList.of(1, 2),
+ ColorDrawable::new);
+
+ mPreference.setEnabled(false);
+ bindAndMeasureViewHolder(VIEW_WIDTH);
+ mPreference.displayIcons(iconSet);
+
+ assertThat(getViews(mContainer)).hasSize(2);
+ assertThat(getViews(mContainer).get(0).getAlpha()).isLessThan(1f);
+ }
+
+ private static List<View> getViews(ViewGroup container) {
+ ArrayList<View> views = new ArrayList<>();
+ for (int i = 0; i < container.getChildCount(); i++) {
+ views.add(container.getChildAt(i));
+ }
+ return views;
+ }
+
+ private static List<Drawable> getIcons(ViewGroup container) {
+ ArrayList<Drawable> drawables = new ArrayList<>();
+ for (int i = 0; i < container.getChildCount(); i++) {
+ if (container.getChildAt(i) instanceof ImageView imageView) {
+ drawables.add(imageView.getDrawable());
+
+ }
+ }
+ return drawables;
+ }
+
+ @Nullable
+ private static String getPlusText(ViewGroup container) {
+ View lastChild = container.getChildAt(container.getChildCount() - 1);
+ if (lastChild instanceof TextView tv) {
+ return tv.getText() != null ? tv.getText().toString() : null;
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ConfigurationActivityHelperTest.java b/tests/robotests/src/com/android/settings/notification/modes/ConfigurationActivityHelperTest.java
new file mode 100644
index 0000000..47291a0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ConfigurationActivityHelperTest.java
@@ -0,0 +1,184 @@
+/*
+ * 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 android.app.NotificationManager.EXTRA_AUTOMATIC_RULE_ID;
+import static android.service.notification.ConditionProviderService.EXTRA_RULE_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.service.notification.ConditionProviderService;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+@RunWith(RobolectricTestRunner.class)
+public class ConfigurationActivityHelperTest {
+
+ private Context mContext;
+ private ConfigurationActivityHelper mHelper;
+
+ @Mock private PackageManager mPm;
+ @Mock private Function<ComponentName, ComponentInfo> mApprovedServiceFinder;
+
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.getApplication();
+ mHelper = new ConfigurationActivityHelper(mPm);
+
+ when(mPm.queryIntentActivities(any(), anyInt())).thenReturn(List.of(new ResolveInfo()));
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_configActivity() throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setId("id")
+ .setPackage(mContext.getPackageName())
+ .setConfigurationActivity(new ComponentName(mContext.getPackageName(), "test"))
+ .build();
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNotNull();
+ assertThat(res.getStringExtra(EXTRA_RULE_ID)).isEqualTo("id");
+ assertThat(res.getStringExtra(EXTRA_AUTOMATIC_RULE_ID)).isEqualTo("id");
+ assertThat(res.getComponent()).isEqualTo(
+ new ComponentName(mContext.getPackageName(), "test"));
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_configActivityNotResolvable_returnsNull()
+ throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setId("id")
+ .setPackage(mContext.getPackageName())
+ .setConfigurationActivity(new ComponentName(mContext.getPackageName(), "test"))
+ .build();
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+ when(mPm.queryIntentActivities(any(), anyInt())).thenReturn(new ArrayList<>());
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNull();
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_configActivityAndWrongPackage_returnsNull()
+ throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(mContext.getPackageName())
+ .setConfigurationActivity(new ComponentName("another", "test"))
+ .build();
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNull();
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_configActivityAndUnspecifiedOwner()
+ throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setId("id")
+ .setPackage(null)
+ .setConfigurationActivity(new ComponentName("another", "test"))
+ .build();
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNotNull();
+ assertThat(res.getStringExtra(EXTRA_RULE_ID)).isEqualTo("id");
+ assertThat(res.getStringExtra(EXTRA_AUTOMATIC_RULE_ID)).isEqualTo("id");
+ assertThat(res.getComponent()).isEqualTo(new ComponentName("another", "test"));
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_cps() throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setId("id")
+ .setPackage(mContext.getPackageName())
+ .setOwner(new ComponentName(mContext.getPackageName(), "service"))
+ .build();
+ ComponentInfo ci = new ComponentInfo();
+ ci.packageName = mContext.getPackageName();
+ ci.metaData = new Bundle();
+ ci.metaData.putString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY,
+ ComponentName.flattenToShortString(
+ new ComponentName(mContext.getPackageName(), "activity")));
+ when(mApprovedServiceFinder.apply(new ComponentName(mContext.getPackageName(), "service")))
+ .thenReturn(ci);
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNotNull();
+ assertThat(res.getStringExtra(EXTRA_RULE_ID)).isEqualTo("id");
+ assertThat(res.getStringExtra(EXTRA_AUTOMATIC_RULE_ID)).isEqualTo("id");
+ assertThat(res.getComponent()).isEqualTo(
+ new ComponentName(mContext.getPackageName(), "activity"));
+ }
+
+ @Test
+ public void getConfigurationActivityIntentForMode_cpsAndWrongPackage_returnsNull()
+ throws Exception {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("other")
+ .setOwner(new ComponentName(mContext.getPackageName(), "service"))
+ .build();
+ ComponentInfo ci = new ComponentInfo();
+ ci.packageName = mContext.getPackageName();
+ ci.metaData = new Bundle();
+ ci.metaData.putString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY,
+ ComponentName.flattenToShortString(
+ new ComponentName(mContext.getPackageName(), "activity")));
+ when(mApprovedServiceFinder.apply(new ComponentName(mContext.getPackageName(), "service")))
+ .thenReturn(ci);
+ when(mPm.getPackageUid(mContext.getPackageName(), 0)).thenReturn(1);
+
+ Intent res = mHelper.getConfigurationActivityIntentForMode(mode, mApprovedServiceFinder);
+
+ assertThat(res).isNull();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/IconLoaderTest.java b/tests/robotests/src/com/android/settings/notification/modes/IconLoaderTest.java
deleted file mode 100644
index 7d4a367..0000000
--- a/tests/robotests/src/com/android/settings/notification/modes/IconLoaderTest.java
+++ /dev/null
@@ -1,91 +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.notification.modes;
-
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AutomaticZenRule;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.service.notification.ZenPolicy;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class IconLoaderTest {
-
- private Context mContext;
- private IconLoader mLoader;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mLoader = new IconLoader(MoreExecutors.newDirectExecutorService());
- }
-
- @Test
- public void getIcon_systemOwnedRuleWithIcon_loads() throws Exception {
- AutomaticZenRule systemRule = newRuleBuilder()
- .setPackage("android")
- .setIconResId(android.R.drawable.ic_media_play)
- .build();
-
- ListenableFuture<Drawable> loadFuture = mLoader.getIcon(mContext, systemRule);
- assertThat(loadFuture.isDone()).isTrue();
- assertThat(loadFuture.get()).isNotNull();
- }
-
- @Test
- public void getIcon_ruleWithoutSpecificIcon_loadsFallback() throws Exception {
- AutomaticZenRule rule = newRuleBuilder()
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setPackage("com.blah")
- .build();
-
- ListenableFuture<Drawable> loadFuture = mLoader.getIcon(mContext, rule);
- assertThat(loadFuture.isDone()).isTrue();
- assertThat(loadFuture.get()).isNotNull();
- }
-
- @Test
- public void getIcon_ruleWithAppIconWithLoadFailure_loadsFallback() throws Exception {
- AutomaticZenRule rule = newRuleBuilder()
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setPackage("com.blah")
- .setIconResId(-123456)
- .build();
-
- ListenableFuture<Drawable> loadFuture = mLoader.getIcon(mContext, rule);
- assertThat(loadFuture.get()).isNotNull();
- }
-
- private static AutomaticZenRule.Builder newRuleBuilder() {
- return new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().build());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/InterruptionFilterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/InterruptionFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..0c3f8e1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/InterruptionFilterPreferenceControllerTest.java
@@ -0,0 +1,143 @@
+/*
+ * 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 android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+import static android.service.notification.ZenPolicy.STATE_DISALLOW;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+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.ZenPolicy;
+
+import androidx.preference.TwoStatePreference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+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.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public final class InterruptionFilterPreferenceControllerTest {
+
+ private InterruptionFilterPreferenceController mController;
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private Context mContext;
+ @Mock private ZenModesBackend mBackend;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mController = new InterruptionFilterPreferenceController(mContext, "something", mBackend);
+ }
+
+ @Test
+ public void testUpdateState_disabled() {
+ TwoStatePreference preference = mock(TwoStatePreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setEnabled(false)
+ .build();
+
+ mController.updateZenMode(preference, zenMode);
+
+ verify(preference).setEnabled(false);
+ }
+
+ @Test
+ public void testUpdateState_all() {
+ TwoStatePreference preference = mock(TwoStatePreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setInterruptionFilter(INTERRUPTION_FILTER_ALL)
+ .build();
+ mController.updateZenMode(preference, zenMode);
+
+ verify(preference).setChecked(false);
+ }
+
+ @Test
+ public void testOnPreferenceChange_fromAll() {
+ TwoStatePreference preference = mock(TwoStatePreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setInterruptionFilter(INTERRUPTION_FILTER_ALL)
+ .build();
+
+ mController.updateZenMode(preference, zenMode);
+
+ mController.onPreferenceChange(preference, true);
+
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ assertThat(captor.getValue().getPolicy().getPriorityCategoryAlarms())
+ .isEqualTo(STATE_DISALLOW);
+ assertThat(captor.getValue().getRule().getInterruptionFilter())
+ .isEqualTo(INTERRUPTION_FILTER_PRIORITY);
+ }
+
+ @Test
+ public void testUpdateState_priority() {
+ TwoStatePreference preference = mock(TwoStatePreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
+ .build();
+ mController.updateZenMode(preference, zenMode);
+
+ verify(preference).setChecked(true);
+ }
+
+ @Test
+ public void testOnPreferenceChange_fromPriority() {
+ TwoStatePreference preference = mock(TwoStatePreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ .setZenPolicy(new ZenPolicy.Builder().allowAlarms(false).build())
+ .build();
+
+ mController.updateZenMode(preference, zenMode);
+
+ mController.onPreferenceChange(preference, false);
+
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ assertThat(captor.getValue().getPolicy().getPriorityCategoryAlarms())
+ .isEqualTo(STATE_DISALLOW);
+ assertThat(captor.getValue().getRule().getInterruptionFilter())
+ .isEqualTo(INTERRUPTION_FILTER_ALL);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ManualDurationHelperTest.java b/tests/robotests/src/com/android/settings/notification/modes/ManualDurationHelperTest.java
new file mode 100644
index 0000000..18ee2cf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ManualDurationHelperTest.java
@@ -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.notification.modes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class ManualDurationHelperTest {
+ private Context mContext;
+ private ContentResolver mContentResolver;
+
+ private ManualDurationHelper mHelper;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+
+ mHelper = new ManualDurationHelper(mContext);
+ }
+
+ @Test
+ public void getDurationSummary_durationForever() {
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
+ Settings.Secure.ZEN_DURATION_FOREVER);
+ assertThat(mHelper.getSummary()).isEqualTo(
+ mContext.getString(R.string.zen_mode_duration_summary_forever));
+ }
+
+ @Test
+ public void getDurationSummary_durationPrompt() {
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
+ Settings.Secure.ZEN_DURATION_PROMPT);
+ assertThat(mHelper.getSummary()).isEqualTo(
+ mContext.getString(R.string.zen_mode_duration_summary_always_prompt));
+ }
+
+ @Test
+ public void getDurationSummary_durationCustom() {
+ // minutes
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION, 45);
+ assertThat(mHelper.getSummary()).isEqualTo("45 minutes");
+
+ // hours
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION, 300);
+ assertThat(mHelper.getSummary()).isEqualTo("5 hours");
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ManualDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ManualDurationPreferenceControllerTest.java
new file mode 100644
index 0000000..29fdfdd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ManualDurationPreferenceControllerTest.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.notification.modes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.AutomaticZenRule;
+import android.app.Flags;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.provider.Settings;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+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;
+
+@RunWith(RobolectricTestRunner.class)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public class ManualDurationPreferenceControllerTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+ private Context mContext;
+ private ContentResolver mContentResolver;
+
+ @Mock
+ private ZenModesBackend mBackend;
+
+ @Mock
+ private Fragment mParent;
+
+ private ManualDurationPreferenceController mPrefController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mPrefController = new ManualDurationPreferenceController(mContext, "key", mParent,
+ mBackend);
+ }
+
+ @Test
+ public void testIsAvailable_onlyForManualDnd() {
+ assertThat(mPrefController.isAvailable(TestModeBuilder.EXAMPLE)).isFalse();
+
+ ZenMode manualDnd = ZenMode.manualDndMode(
+ new AutomaticZenRule.Builder("id", Uri.EMPTY).build(), false);
+ assertThat(mPrefController.isAvailable(manualDnd)).isTrue();
+ }
+
+ @Test
+ public void testUpdateState_durationSummary() {
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
+ 45 /* minutes */);
+
+ Preference pref = new Preference(mContext);
+ mPrefController.updateState(pref, TestModeBuilder.EXAMPLE);
+
+ assertThat(pref.getSummary().toString()).contains("45");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/TestableCircularIconsPreference.java b/tests/robotests/src/com/android/settings/notification/modes/TestableCircularIconsPreference.java
new file mode 100644
index 0000000..6fefcac
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/TestableCircularIconsPreference.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.modes;
+
+import android.content.Context;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.google.common.util.concurrent.MoreExecutors;
+
+class TestableCircularIconsPreference extends CircularIconsPreference {
+
+ private PreferenceViewHolder mLastViewHolder;
+
+ TestableCircularIconsPreference(Context context) {
+ super(context, MoreExecutors.directExecutor());
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ mLastViewHolder = holder;
+ }
+
+ @Override
+ protected void notifyChanged() {
+ // Calling androidx.preference.Preference.notifyChanged() will, through an internal
+ // listener added by PreferenceGroupAdapter, eventually rebind the Preference to its
+ // corresponding view in the RecyclerView. This will not happen to a Preference that is
+ // created without a proper PreferencesScreen/RecyclerView/etc, so we simulate it here.
+ if (mLastViewHolder != null) {
+ onBindViewHolder(mLastViewHolder);
+ }
+ }
+}
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 c8b1185..9263ffd 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsLinkPreferenceControllerTest.java
@@ -17,63 +17,76 @@
package com.android.settings.notification.modes;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-
-import static com.android.settings.notification.modes.ZenModeFragmentBase.MODE_ID;
+import static android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
-import android.net.Uri;
+import android.content.pm.UserInfo;
import android.os.Bundle;
+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.ZenPolicy;
+import android.view.LayoutInflater;
+import android.view.View;
import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
import com.android.settings.SettingsActivity;
-import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.SelectorWithWidgetPreference;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.MoreExecutors;
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.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
@RunWith(RobolectricTestRunner.class)
@EnableFlags(Flags.FLAG_MODES_UI)
public final class ZenModeAppsLinkPreferenceControllerTest {
private ZenModeAppsLinkPreferenceController mController;
+ private CircularIconsPreference mPreference;
private Context mContext;
@Mock
private ZenModesBackend mZenModesBackend;
@Mock
- private NotificationBackend mNotificationBackend;
+ private ZenHelperBackend mHelperBackend;
@Mock
private ApplicationsState mApplicationsState;
@@ -87,31 +100,40 @@
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ CircularIconSet.sExecutorService = MoreExecutors.newDirectExecutorService();
+ mPreference = new TestableCircularIconsPreference(mContext);
+
when(mApplicationsState.newSession(any(), any())).thenReturn(mSession);
mController = new ZenModeAppsLinkPreferenceController(
mContext, "controller_key", mock(Fragment.class), mApplicationsState,
- mZenModesBackend);
- ReflectionHelpers.setField(mController, "mNotificationBackend", mNotificationBackend);
+ mZenModesBackend, mHelperBackend);
+
+ // Ensure the preference view is bound & measured (needed to add child ImageViews).
+ View preferenceView = LayoutInflater.from(mContext).inflate(mPreference.getLayoutResource(),
+ null);
+ preferenceView.measure(View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+ View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+ PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(preferenceView);
+ mPreference.onBindViewHolder(holder);
}
- private ApplicationsState.AppEntry createAppEntry(String packageName, String label) {
- ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
- entry.info = new ApplicationInfo();
- entry.info.packageName = packageName;
- entry.label = label;
- entry.info.uid = 0;
- return entry;
+ private AppEntry createAppEntry(String packageName, int userId) {
+ ApplicationInfo applicationInfo = new ApplicationInfo();
+ applicationInfo.packageName = packageName;
+ applicationInfo.uid = UserHandle.getUid(userId, new Random().nextInt(100));
+ AppEntry appEntry = new AppEntry(mContext, applicationInfo, 1);
+ appEntry.label = packageName;
+ return appEntry;
}
private ZenMode createPriorityChannelsZenMode() {
- return new ZenMode("id", new AutomaticZenRule.Builder("Bedtime",
- Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
+ return new TestModeBuilder()
+ .setId("id")
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(new ZenPolicy.Builder()
.allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
.build())
- .build(), true);
+ .build();
}
@Test
@@ -120,17 +142,23 @@
}
@Test
+ public void testUpdateState_disabled() {
+ ZenMode zenMode = new TestModeBuilder()
+ .setEnabled(false)
+ .build();
+
+ mController.updateState(mPreference, zenMode);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
public void testUpdateSetsIntent() {
- // Creates the preference
- SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class);
// Create a zen mode that allows priority channels to breakthrough.
ZenMode zenMode = createPriorityChannelsZenMode();
- // Capture the intent
- ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- mController.updateState((Preference) preference, zenMode);
- verify(preference).setIntent(captor.capture());
- Intent launcherIntent = captor.getValue();
+ mController.updateState(mPreference, zenMode);
+ Intent launcherIntent = mPreference.getIntent();
assertThat(launcherIntent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
.isEqualTo("com.android.settings.notification.modes.ZenModeAppsFragment");
@@ -140,56 +168,135 @@
Bundle bundle = launcherIntent.getBundleExtra(
SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
assertThat(bundle).isNotNull();
- assertThat(bundle.getString(MODE_ID)).isEqualTo("id");
+ assertThat(bundle.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID)).isEqualTo("id");
}
@Test
public void testGetAppsBypassingDnd() {
- ApplicationsState.AppEntry entry = createAppEntry("test", "testLabel");
- ApplicationsState.AppEntry entryConv = createAppEntry("test_conv", "test_convLabel");
- List<ApplicationsState.AppEntry> appEntries = List.of(entry, entryConv);
+ ApplicationsState.AppEntry app1 = createAppEntry("app1", mContext.getUserId());
+ ApplicationsState.AppEntry app2 = createAppEntry("app2", mContext.getUserId());
+ List<ApplicationsState.AppEntry> allApps = List.of(app1, app2);
- when(mNotificationBackend.getPackagesBypassingDnd(mContext.getUserId(),
- false)).thenReturn(List.of("test"));
+ when(mHelperBackend.getPackagesBypassingDnd(mContext.getUserId(),
+ false)).thenReturn(List.of("app1"));
- assertThat(mController.getAppsBypassingDnd(appEntries)).containsExactly("testLabel");
+ assertThat(mController.getAppsBypassingDndSortedByName(allApps)).containsExactly(app1);
}
@Test
- public void testUpdateTriggersRebuild() {
- // Creates the preference
- SelectorWithWidgetPreference preference = mock(SelectorWithWidgetPreference.class);
+ public void testGetAppsBypassingDnd_sortsByName() {
+ ApplicationsState.AppEntry appC = createAppEntry("C", mContext.getUserId());
+ ApplicationsState.AppEntry appA = createAppEntry("A", mContext.getUserId());
+ 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"));
+
+ assertThat(mController.getAppsBypassingDndSortedByName(allApps))
+ .containsExactly(appA, appB, appC).inOrder();
+ }
+
+ @Test
+ public void testGetAppsBypassingDnd_withWorkProfile_includesProfileAndSorts() {
+ UserInfo workProfile = new UserInfo(10, "Work Profile", 0);
+ workProfile.userType = UserManager.USER_TYPE_PROFILE_MANAGED;
+ UserManager userManager = mContext.getSystemService(UserManager.class);
+ shadowOf(userManager).addProfile(mContext.getUserId(), 10, workProfile);
+
+ ApplicationsState.AppEntry personalCopy = createAppEntry("app", mContext.getUserId());
+ ApplicationsState.AppEntry workCopy = createAppEntry("app", 10);
+ ApplicationsState.AppEntry otherPersonal = createAppEntry("p2", mContext.getUserId());
+ ApplicationsState.AppEntry otherWork = createAppEntry("w2", 10);
+ 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"));
+
+ // Personal copy before work copy (names match).
+ assertThat(mController.getAppsBypassingDndSortedByName(allApps))
+ .containsExactly(personalCopy, workCopy, otherPersonal).inOrder();
+ }
+
+ @Test
+ public void updateState_withPolicyAllowingNoChannels_doesNotLoadPriorityApps() {
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowPriorityChannels(false).build())
+ .build();
+
+ mController.updateState(mPreference, zenMode);
+
+ verifyNoMoreInteractions(mSession);
+ verify(mHelperBackend, never()).getPackagesBypassingDnd(anyInt(), anyBoolean());
+ assertThat(String.valueOf(mPreference.getSummary())).isEqualTo("None");
+ }
+
+ @Test
+ public void updateState_withPolicyAllowingPriorityChannels_triggersRebuild() {
// Create a zen mode that allows priority channels to breakthrough.
ZenMode zenMode = createPriorityChannelsZenMode();
// Create some applications.
- ArrayList<ApplicationsState.AppEntry> appEntries =
- new ArrayList<ApplicationsState.AppEntry>();
- appEntries.add(createAppEntry("test", "pkgLabel"));
+ ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
+ appEntries.add(createAppEntry("test", mContext.getUserId()));
- when(mNotificationBackend.getPackagesBypassingDnd(
+ when(mHelperBackend.getPackagesBypassingDnd(
mContext.getUserId(), false))
.thenReturn(List.of("test"));
// Updates the preference with the zen mode. We expect that this causes the app session
- // to trigger a rebuild.
- mController.updateZenMode((Preference) preference, zenMode);
+ // to trigger a rebuild (and display a temporary text in the meantime).
+ mController.updateZenMode(mPreference, zenMode);
verify(mSession).rebuild(any(), any(), eq(false));
+ assertThat(String.valueOf(mPreference.getSummary())).isEqualTo("Calculating…");
// Manually triggers the callback that will happen on rebuild.
mController.mAppSessionCallbacks.onRebuildComplete(appEntries);
- verify(preference).setSummary("pkgLabel can interrupt");
+ assertThat(String.valueOf(mPreference.getSummary())).isEqualTo("test can interrupt");
+ }
+
+ @Test
+ public void updateState_withPolicyAllowingPriorityChannels_loadsIcons() {
+ ZenMode zenMode = createPriorityChannelsZenMode();
+
+ mController.updateState(mPreference, zenMode);
+ when(mHelperBackend.getPackagesBypassingDnd(anyInt(), anyBoolean()))
+ .thenReturn(ImmutableList.of("test1", "test2"));
+ ArrayList<ApplicationsState.AppEntry> appEntries = new ArrayList<>();
+ appEntries.add(createAppEntry("test1", mContext.getUserId()));
+ appEntries.add(createAppEntry("test2", mContext.getUserId()));
+ mController.mAppSessionCallbacks.onRebuildComplete(appEntries);
+
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(2);
}
@Test
public void testOnPackageListChangedTriggersRebuild() {
- mController.mAppSessionCallbacks.onPackageListChanged();
+ // Create a zen mode that allows priority channels to breakthrough.
+ ZenMode zenMode = createPriorityChannelsZenMode();
+ mController.updateState(mPreference, zenMode);
verify(mSession).rebuild(any(), any(), eq(false));
+
+ mController.mAppSessionCallbacks.onPackageListChanged();
+ verify(mSession, times(2)).rebuild(any(), any(), eq(false));
}
@Test
public void testOnLoadEntriesCompletedTriggersRebuild() {
- mController.mAppSessionCallbacks.onLoadEntriesCompleted();
+ // Create a zen mode that allows priority channels to breakthrough.
+ ZenMode zenMode = createPriorityChannelsZenMode();
+ mController.updateState(mPreference, zenMode);
verify(mSession).rebuild(any(), any(), eq(false));
+
+ mController.mAppSessionCallbacks.onLoadEntriesCompleted();
+ verify(mSession, times(2)).rebuild(any(), any(), eq(false));
+ }
+
+ @Test
+ public void testNoCrashIfAppsReadyBeforeRuleAvailable() {
+ mController.mAppSessionCallbacks.onLoadEntriesCompleted();
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsPreferenceControllerTest.java
index 750453d..1140238 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeAppsPreferenceControllerTest.java
@@ -16,11 +16,8 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static com.android.settings.notification.modes.ZenModeAppsPreferenceController.KEY_ALL;
import static com.android.settings.notification.modes.ZenModeAppsPreferenceController.KEY_NONE;
import static com.android.settings.notification.modes.ZenModeAppsPreferenceController.KEY_PRIORITY;
@@ -29,10 +26,8 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
@@ -42,6 +37,9 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
import org.junit.Before;
@@ -62,11 +60,9 @@
@Mock
private ZenModesBackend mBackend;
private ZenModeAppsPreferenceController mPriorityController;
- private ZenModeAppsPreferenceController mAllController;
private ZenModeAppsPreferenceController mNoneController;
private SelectorWithWidgetPreference mPriorityPref;
- private SelectorWithWidgetPreference mAllPref;
private SelectorWithWidgetPreference mNonePref;
private PreferenceCategory mPrefCategory;
private PreferenceScreen mPreferenceScreen;
@@ -81,10 +77,8 @@
mPriorityController = new ZenModeAppsPreferenceController(mContext, KEY_PRIORITY, mBackend);
mNoneController = new ZenModeAppsPreferenceController(mContext, KEY_NONE, mBackend);
- mAllController = new ZenModeAppsPreferenceController(mContext, KEY_ALL, mBackend);
mPriorityPref = makePreference(KEY_PRIORITY, mPriorityController);
- mAllPref = makePreference(KEY_ALL, mAllController);
mNonePref = makePreference(KEY_NONE, mNoneController);
mPrefCategory = new PreferenceCategory(mContext);
@@ -95,10 +89,8 @@
mPreferenceScreen.addPreference(mPrefCategory);
mPrefCategory.addPreference(mPriorityPref);
- mPrefCategory.addPreference(mAllPref);
mPrefCategory.addPreference(mNonePref);
- mAllController.displayPreference(mPreferenceScreen);
mPriorityController.displayPreference(mPreferenceScreen);
mNoneController.displayPreference(mPreferenceScreen);
}
@@ -112,45 +104,14 @@
}
@Test
- public void testUpdateState_All() {
- TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .build())
- .build(), true);
- mAllController.updateZenMode(preference, zenMode);
-
- verify(preference).setChecked(true);
- }
-
- @Test
- public void testUpdateState_All_Unchecked() {
- TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
- .build())
- .build(), true);
- mAllController.updateZenMode(preference, zenMode);
-
- verify(preference).setChecked(false);
- }
-
- @Test
public void testUpdateState_None() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
+ .build())
+ .build();
+
mNoneController.updateZenMode(preference, zenMode);
verify(preference).setChecked(true);
@@ -159,13 +120,12 @@
@Test
public void testUpdateState_None_Unchecked() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
+ .build())
+ .build();
+
mNoneController.updateZenMode(preference, zenMode);
verify(preference).setChecked(false);
@@ -174,13 +134,12 @@
@Test
public void testUpdateState_Priority() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
+ .build())
+ .build();
+
mPriorityController.updateZenMode(preference, zenMode);
verify(preference).setChecked(true);
@@ -189,99 +148,32 @@
@Test
public void testUpdateState_Priority_Unchecked() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
+ .build())
+ .build();
+
mPriorityController.updateZenMode(preference, zenMode);
verify(preference).setChecked(false);
}
@Test
- public void testOnPreferenceChange_All() {
- TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_NONE)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .build())
- .build(), true);
-
- mAllController.updateZenMode(preference, zenMode);
- mAllController.onPreferenceChange(preference, true);
- ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
- verify(mBackend).updateMode(captor.capture());
-
- assertThat(captor.getValue().getPolicy().getAllowedChannels())
- .isEqualTo(ZenMode.CHANNEL_POLICY_ALL);
- }
-
- @Test
- public void testPreferenceClick_passesCorrectCheckedState_All() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
- .build())
- .build(), true);
-
-
- mAllController.updateZenMode(mAllPref, zenMode);
- mNoneController.updateZenMode(mNonePref, zenMode);
- mPriorityController.updateZenMode(mPriorityPref, zenMode);
-
- // MPME is checked; ALL and PRIORITY are unchecked.
- assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
-
- mPrefCategory.findPreference(KEY_ALL).performClick();
-
- ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
- verify(mBackend).updateMode(captor.capture());
- // Checks the policy value for ALL is set.
- // The important part is that the interruption filter is propagated to the backend.
- assertThat(captor.getValue().getRule().getInterruptionFilter())
- .isEqualTo(INTERRUPTION_FILTER_ALL);
- // ALL is now checked; others are unchecked.
- assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
- }
-
- @Test
public void testPreferenceClick_passesCorrectCheckedState_None() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
+ .build())
+ .build();
- mAllController.updateZenMode(mAllPref, zenMode);
mNoneController.updateZenMode(mNonePref, zenMode);
mPriorityController.updateZenMode(mPriorityPref, zenMode);
- assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
+ .isChecked()).isFalse();
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
+ .isChecked()).isTrue();
// Click on NONE
mPrefCategory.findPreference(KEY_NONE).performClick();
@@ -293,35 +185,31 @@
// See AbstractZenModePreferenceController.
assertThat(captor.getValue().getRule().getInterruptionFilter())
.isEqualTo(INTERRUPTION_FILTER_PRIORITY);
- // NONE is now checked; others are unchecked.
+
+ // After screen is refreshed, NONE is now checked; others are unchecked.
+ mNoneController.updateZenMode(mNonePref, captor.getValue());
+ mPriorityController.updateZenMode(mPriorityPref, captor.getValue());
assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
+ .isChecked()).isTrue();
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
+ .isChecked()).isFalse();
}
@Test
public void testPreferenceClick_passesCorrectCheckedState_Priority() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
+ .build())
+ .build();
- mAllController.updateZenMode(mAllPref, zenMode);
mNoneController.updateZenMode(mNonePref, zenMode);
mPriorityController.updateZenMode(mPriorityPref, zenMode);
assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
+ .isChecked()).isTrue();
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
+ .isChecked()).isFalse();
// Click on PRIORITY
mPrefCategory.findPreference(KEY_PRIORITY).performClick();
@@ -331,13 +219,13 @@
// Checks the policy value for PRIORITY is propagated to the backend.
assertThat(captor.getValue().getRule().getInterruptionFilter())
.isEqualTo(INTERRUPTION_FILTER_PRIORITY);
- // PRIORITY is now checked; others are unchecked.
- assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_ALL))
- .isChecked());
- assertThat(!((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
- .isChecked());
- }
+ // After screen is refreshed, PRIORITY is now checked; others are unchecked.
+ mNoneController.updateZenMode(mNonePref, captor.getValue());
+ mPriorityController.updateZenMode(mPriorityPref, captor.getValue());
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_PRIORITY))
+ .isChecked()).isTrue();
+ assertThat(((SelectorWithWidgetPreference) mPrefCategory.findPreference(KEY_NONE))
+ .isChecked()).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeButtonPreferenceControllerTest.java
index bda3843..47078b0 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeButtonPreferenceControllerTest.java
@@ -16,8 +16,6 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -27,13 +25,19 @@
import android.app.AutomaticZenRule;
import android.app.Flags;
+import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenPolicy;
+import android.provider.Settings;
import android.widget.Button;
+import androidx.fragment.app.Fragment;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before;
@@ -45,6 +49,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.time.Duration;
+
@EnableFlags(Flags.FLAG_MODES_UI)
@RunWith(RobolectricTestRunner.class)
public final class ZenModeButtonPreferenceControllerTest {
@@ -54,60 +60,66 @@
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
private Context mContext;
+ private ContentResolver mContentResolver;
+
@Mock
private ZenModesBackend mBackend;
+ @Mock
+ private Fragment mParent;
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
mController = new ZenModeButtonPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mParent, mBackend);
}
@Test
public void isAvailable_notIfAppOptsOut() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
+ ZenMode zenMode = new TestModeBuilder()
.setManualInvocationAllowed(false)
- .setEnabled(true)
- .build(), false);
+ .build();
mController.setZenMode(zenMode);
assertThat(mController.isAvailable()).isFalse();
}
@Test
- public void isAvailable_notIfModeDisabled() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(false)
- .build(), false);
+ public void isAvailable_ifModeActiveEvenIfAppOptsOut() {
+ ZenMode zenMode = new TestModeBuilder()
+ .setManualInvocationAllowed(false)
+ .setActive(true)
+ .build();
mController.setZenMode(zenMode);
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_notIfModeDisabled() {
+ ZenMode zenMode = new TestModeBuilder()
+ .setManualInvocationAllowed(true)
+ .setEnabled(false)
+ .build();
+
+ mController.setZenMode(zenMode);
+
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_appOptedIn_modeEnabled() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(true)
- .build(), false);
+ ZenMode zenMode = new TestModeBuilder()
+ .setManualInvocationAllowed(true)
+ .setEnabled(true)
+ .build();
+
mController.setZenMode(zenMode);
+
assertThat(mController.isAvailable()).isTrue();
}
@@ -116,15 +128,12 @@
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(true)
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setActive(true)
+ .build();
+
mController.updateZenMode(pref, zenMode);
+
assertThat(button.getText().toString()).contains("off");
assertThat(button.hasOnClickListeners()).isTrue();
}
@@ -134,15 +143,13 @@
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(true)
- .build(), false);
+ ZenMode zenMode = new TestModeBuilder()
+ .setManualInvocationAllowed(true)
+ .setActive(false)
+ .build();
+
mController.updateZenMode(pref, zenMode);
+
assertThat(button.getText().toString()).contains("on");
assertThat(button.hasOnClickListeners()).isTrue();
}
@@ -152,14 +159,10 @@
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(true)
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setActive(true)
+ .build();
+
mController.updateZenMode(pref, zenMode);
button.callOnClick();
@@ -171,17 +174,44 @@
Button button = new Button(mContext);
LayoutPreference pref = mock(LayoutPreference.class);
when(pref.findViewById(anyInt())).thenReturn(button);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .setManualInvocationAllowed(true)
- .setEnabled(true)
- .build(), false);
+ ZenMode zenMode = new TestModeBuilder()
+ .setManualInvocationAllowed(true)
+ .setActive(false)
+ .build();
+
mController.updateZenMode(pref, zenMode);
button.callOnClick();
verify(mBackend).activateMode(zenMode, null);
}
+
+ @Test
+ public void updateStateThenClick_withDuration() {
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
+ 45 /* minutes */);
+ Button button = new Button(mContext);
+ LayoutPreference pref = mock(LayoutPreference.class);
+ when(pref.findViewById(anyInt())).thenReturn(button);
+ ZenMode zenMode = ZenMode.manualDndMode(
+ new AutomaticZenRule.Builder("manual", Uri.EMPTY).build(), false);
+
+ mController.updateZenMode(pref, zenMode);
+ button.callOnClick();
+ verify(mBackend).activateMode(zenMode, Duration.ofMinutes(45));
+ }
+
+ @Test
+ public void updateStateThenClick_durationForever() {
+ Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
+ Settings.Secure.ZEN_DURATION_FOREVER);
+ Button button = new Button(mContext);
+ LayoutPreference pref = mock(LayoutPreference.class);
+ when(pref.findViewById(anyInt())).thenReturn(button);
+ ZenMode zenMode = ZenMode.manualDndMode(
+ new AutomaticZenRule.Builder("manual", Uri.EMPTY).build(), false);
+
+ mController.updateZenMode(pref, zenMode);
+ button.callOnClick();
+ verify(mBackend).activateMode(zenMode, null);
+ }
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceControllerTest.java
index 04d625a..862cf77 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeCallsLinkPreferenceControllerTest.java
@@ -16,20 +16,19 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenPolicy;
+
import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -38,8 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public final class ZenModeCallsLinkPreferenceControllerTest {
@@ -49,10 +46,8 @@
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
-
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
@Before
public void setup() {
@@ -61,20 +56,14 @@
mContext = RuntimeEnvironment.application;
mController = new ZenModeCallsLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mHelperBackend);
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testHasSummary() {
Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
- mController.updateZenMode(pref, zenMode);
+ mController.updateZenMode(pref, TestModeBuilder.EXAMPLE);
verify(pref).setSummary(any());
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceControllerTest.java
index 1a62b75..f2c6006 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayEffectPreferenceControllerTest.java
@@ -16,22 +16,23 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static android.service.notification.ZenPolicy.STATE_ALLOW;
-import static android.service.notification.ZenPolicy.STATE_UNSET;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenDeviceEffects;
-import android.service.notification.ZenPolicy;
+
import androidx.preference.TwoStatePreference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -62,15 +63,11 @@
@Test
public void testUpdateState_grayscale() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDisplayGrayscale(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldDisplayGrayscale(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(
@@ -84,15 +81,11 @@
@Test
public void testOnPreferenceChange_grayscale() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(false).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDisplayGrayscale(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldDisplayGrayscale(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(mContext, "effect_greyscale", mBackend);
@@ -103,22 +96,18 @@
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().getDeviceEffects().shouldDisplayGrayscale())
+ assertThat(captor.getValue().getDeviceEffects().shouldDisplayGrayscale())
.isFalse();
}
@Test
public void testUpdateState_aod() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowMedia(true).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldSuppressAmbientDisplay(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldSuppressAmbientDisplay(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(mContext, "effect_aod", mBackend);
@@ -131,15 +120,11 @@
@Test
public void testOnPreferenceChange_aod() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowMedia(false).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldSuppressAmbientDisplay(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldSuppressAmbientDisplay(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(mContext, "effect_aod", mBackend);
@@ -150,22 +135,18 @@
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().getDeviceEffects().shouldSuppressAmbientDisplay())
+ assertThat(captor.getValue().getDeviceEffects().shouldSuppressAmbientDisplay())
.isFalse();
}
@Test
public void testUpdateState_wallpaper() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowSystem(true).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDimWallpaper(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldDimWallpaper(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(
@@ -179,15 +160,11 @@
@Test
public void testOnPreferenceChange_wallpaper() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowSystem(false).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDimWallpaper(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldDimWallpaper(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(
@@ -199,21 +176,17 @@
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().getDeviceEffects().shouldDimWallpaper()).isFalse();
+ assertThat(captor.getValue().getDeviceEffects().shouldDimWallpaper()).isFalse();
}
@Test
public void testUpdateState_darkTheme() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowReminders(true).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldUseNightMode(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldUseNightMode(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(mContext, "effect_dark_theme",
@@ -227,15 +200,11 @@
@Test
public void testOnPreferenceChange_darkTheme() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowReminders(false).build())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldUseNightMode(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setDeviceEffects(new ZenDeviceEffects.Builder()
+ .setShouldUseNightMode(true)
+ .build())
+ .build();
ZenModeDisplayEffectPreferenceController controller =
new ZenModeDisplayEffectPreferenceController(mContext, "effect_dark_theme",
@@ -247,6 +216,6 @@
ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().getDeviceEffects().shouldUseNightMode()).isFalse();
+ assertThat(captor.getValue().getDeviceEffects().shouldUseNightMode()).isFalse();
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java
index 9d33b0b..29350f6 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeDisplayLinkPreferenceControllerTest.java
@@ -16,19 +16,21 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenPolicy;
+
import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -47,8 +49,8 @@
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
@Before
public void setup() {
@@ -57,20 +59,26 @@
mContext = RuntimeEnvironment.application;
mController = new ZenModeDisplayLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mBackend, mHelperBackend);
+ }
+
+ @Test
+ public void testUpdateState_disabled() {
+ Preference preference = mock(Preference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setEnabled(false)
+ .build();
+
+ mController.updateState(preference, zenMode);
+
+ verify(preference).setEnabled(false);
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testHasSummary() {
Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
- mController.updateZenMode(pref, zenMode);
+ mController.updateZenMode(pref, TestModeBuilder.EXAMPLE);
verify(pref).setSummary(any());
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java
new file mode 100644
index 0000000..b15d4d6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditDonePreferenceControllerTest.java
@@ -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.notification.modes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.content.Context;
+import android.widget.Button;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModeEditDonePreferenceControllerTest {
+
+ private ZenModeEditDonePreferenceController mController;
+ private LayoutPreference mPreference;
+ private Button mButton;
+ @Mock private Runnable mConfirmSave;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+
+ Context context = RuntimeEnvironment.application;
+ PreferenceManager preferenceManager = new PreferenceManager(context);
+ PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(context,
+ R.xml.modes_edit_name_icon, null);
+ mPreference = preferenceScreen.findPreference("done");
+
+ mController = new ZenModeEditDonePreferenceController(context, "done", mConfirmSave);
+ mController.displayPreference(preferenceScreen);
+
+ mButton = mPreference.findViewById(R.id.done);
+ assertThat(mButton).isNotNull();
+ }
+
+ @Test
+ public void updateState_nameNonEmpty_buttonEnabled() {
+ 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();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentTest.java
new file mode 100644
index 0000000..2441803
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNameIconFragmentTest.java
@@ -0,0 +1,213 @@
+/*
+ * 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 android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.testing.FragmentScenario;
+import androidx.lifecycle.Lifecycle;
+
+import com.android.internal.R;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModeEditNameIconFragmentTest {
+
+ private static final ZenMode MODE = new TestModeBuilder().setId("id").setName("Mode").build();
+
+ private Activity mActivity;
+ private ZenModeEditNameIconFragment mFragment;
+ private FragmentScenario<ZenModeEditNameIconFragment> mScenario;
+
+ @Mock
+ private ZenModesBackend mBackend;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ // Note: Each test should call startFragment() to set mScenario, mFragment and mActivity.
+ }
+
+ @After
+ public void tearDown() {
+ if (mScenario != null) {
+ mScenario.close();
+ }
+ }
+
+ @Test
+ public void onCreate_loadsMode() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+
+ startFragment(MODE.getId());
+
+ assertThat(mFragment.getZenMode()).isEqualTo(MODE);
+ assertThat(mActivity.isFinishing()).isFalse();
+ }
+
+ @Test
+ public void onCreate_noModeId_exits() {
+ when(mBackend.getMode(any())).thenReturn(MODE);
+
+ startFragment(null);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ verifyNoMoreInteractions(mBackend);
+ }
+ @Test
+ public void onCreate_missingMode_exits() {
+ when(mBackend.getMode(any())).thenReturn(null);
+
+ startFragment(MODE.getId());
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ verify(mBackend).getMode(MODE.getId());
+ }
+
+ @Test
+ public void saveMode_appliesChangesAndFinishes() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+ startFragment(MODE.getId());
+
+ mFragment.setModeName("A new name");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_theater);
+ mFragment.setModeName("A newer name");
+
+ mFragment.saveMode();
+
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ ZenMode savedMode = captor.getValue();
+ assertThat(savedMode.getName()).isEqualTo("A newer name");
+ assertThat(savedMode.getRule().getIconResId()).isEqualTo(
+ R.drawable.ic_zen_mode_type_theater);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ @Test
+ public void saveMode_appliesOnyNameAndIconChanges() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+ startFragment(MODE.getId());
+ mFragment.setModeName("A new name");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_theater);
+ // Before the user saves, something else about the mode was modified by someone else.
+ ZenMode newerMode = new TestModeBuilder(MODE).setTriggerDescription("Whenever").build();
+ when(mBackend.getMode(MODE.getId())).thenReturn(newerMode);
+
+ mFragment.saveMode();
+
+ // Verify that saving only wrote the mode name, and didn't accidentally stomp over
+ // unrelated fields of the mode.
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ ZenMode savedMode = captor.getValue();
+ assertThat(savedMode.getName()).isEqualTo("A new name");
+ assertThat(savedMode.getTriggerDescription()).isEqualTo("Whenever");
+ }
+
+ @Test
+ public void saveMode_forModeThatDisappeared_ignoresSave() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+ startFragment(MODE.getId());
+ mFragment.setModeName("A new name");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_theater);
+ // Before the user saves, the mode was removed by someone else.
+ when(mBackend.getMode(MODE.getId())).thenReturn(null);
+
+ mFragment.saveMode();
+
+ verify(mBackend, never()).updateMode(any());
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ @Test
+ public void setModeFields_withoutSaveMode_doesNotSaveChanges() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+ startFragment(MODE.getId());
+
+ mFragment.setModeName("Not a good idea");
+ mFragment.setModeIcon(R.drawable.emergency_icon);
+ mActivity.finish();
+
+ verify(mBackend, never()).updateMode(any());
+ }
+
+ @Test
+ public void onCreate_whenRecreating_preservesEdits() {
+ when(mBackend.getMode(MODE.getId())).thenReturn(MODE);
+ startFragment(MODE.getId());
+
+ mFragment.setModeName("A better name");
+ mScenario.recreate().onFragment(newFragment -> {
+ assertThat(newFragment).isNotSameInstanceAs(mFragment);
+ newFragment.setBackend(mBackend);
+ mActivity = newFragment.getActivity();
+ mFragment = newFragment;
+ });
+ mFragment.saveMode();
+
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ ZenMode savedMode = captor.getValue();
+ assertThat(savedMode.getName()).isEqualTo("A better name");
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ private void startFragment(@Nullable String modeId) {
+ Bundle fragmentArgs = null;
+ if (modeId != null) {
+ fragmentArgs = new Bundle();
+ fragmentArgs.putString(EXTRA_AUTOMATIC_ZEN_RULE_ID, modeId);
+ }
+
+ mScenario = FragmentScenario.launch(ZenModeEditNameIconFragment.class, fragmentArgs, 0,
+ Lifecycle.State.INITIALIZED);
+
+ mScenario.onFragment(fragment -> {
+ fragment.setBackend(mBackend); // Before onCreate().
+ mFragment = fragment;
+ });
+
+ mScenario.moveToState(Lifecycle.State.RESUMED).onFragment(fragment -> {
+ mActivity = fragment.requireActivity();
+ });
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.java
new file mode 100644
index 0000000..b54727c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeEditNamePreferenceControllerTest.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.modes;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.content.Context;
+import android.widget.EditText;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.function.Consumer;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModeEditNamePreferenceControllerTest {
+
+ private ZenModeEditNamePreferenceController mController;
+ private LayoutPreference mPreference;
+ private EditText mEditText;
+ @Mock private Consumer<String> mNameSetter;
+
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+
+ Context context = RuntimeEnvironment.application;
+ PreferenceManager preferenceManager = new PreferenceManager(context);
+ PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(context,
+ R.xml.modes_edit_name_icon, null);
+ mPreference = preferenceScreen.findPreference("name");
+
+ mController = new ZenModeEditNamePreferenceController(context, "name", mNameSetter);
+ mController.displayPreference(preferenceScreen);
+ mEditText = mPreference.findViewById(android.R.id.edit);
+ assertThat(mEditText).isNotNull();
+ }
+
+ @Test
+ public void updateState_showsName() {
+ ZenMode mode = new TestModeBuilder().setName("A fancy name").build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mEditText.getText().toString()).isEqualTo("A fancy name");
+ verifyNoMoreInteractions(mNameSetter);
+ }
+
+ @Test
+ 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");
+
+ verify(mNameSetter).accept("An even fancier name");
+ verifyNoMoreInteractions(mNameSetter);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceControllerTest.java
index c1c4d61..4c8db07 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeExitAtAlarmPreferenceControllerTest.java
@@ -21,13 +21,16 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.content.Context;
import android.service.notification.ZenModeConfig;
import androidx.preference.TwoStatePreference;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -65,10 +68,9 @@
scheduleInfo.endHour = 2;
scheduleInfo.exitAtAlarm = false;
- ZenMode mode = new ZenMode("id",
- new AutomaticZenRule.Builder("name",
- ZenModeConfig.toScheduleConditionId(scheduleInfo)).build(),
- true); // is active
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
+ .build();
// need to call updateZenMode for the first call
mPrefController.updateZenMode(preference, mode);
@@ -94,10 +96,9 @@
scheduleInfo.endHour = 2;
scheduleInfo.exitAtAlarm = true;
- ZenMode mode = new ZenMode("id",
- new AutomaticZenRule.Builder("name",
- ZenModeConfig.toScheduleConditionId(scheduleInfo)).build(),
- true); // is active
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
+ .build();
mPrefController.updateZenMode(preference, mode);
// turn off exit at alarm
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceControllerTest.java
index ba9a6b8..1904734 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeIconPickerListPreferenceControllerTest.java
@@ -19,20 +19,21 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.AutomaticZenRule;
import android.content.Context;
-import android.net.Uri;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceScreen;
import androidx.recyclerview.widget.RecyclerView;
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.widget.LayoutPreference;
import com.google.common.collect.ImmutableList;
@@ -40,38 +41,34 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class ZenModeIconPickerListPreferenceControllerTest {
- private static final ZenMode ZEN_MODE = new ZenMode(
- "mode_id",
- new AutomaticZenRule.Builder("mode name", Uri.parse("mode")).build(),
- /* isActive= */ false);
-
- private ZenModesBackend mBackend;
+ private Context mContext;
private ZenModeIconPickerListPreferenceController mController;
- private PreferenceScreen mPreferenceScreen;
+ @Mock private PreferenceScreen mPreferenceScreen;
+ private LayoutPreference mLayoutPreference;
private RecyclerView mRecyclerView;
+ @Mock private ZenModeIconPickerListPreferenceController.IconPickerListener mListener;
@Before
public void setUp() {
- Context context = RuntimeEnvironment.getApplication();
- mBackend = mock(ZenModesBackend.class);
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.getApplication();
- DashboardFragment fragment = mock(DashboardFragment.class);
mController = new ZenModeIconPickerListPreferenceController(
- RuntimeEnvironment.getApplication(), "icon_list", fragment,
- new TestIconOptionsProvider(), mBackend);
+ RuntimeEnvironment.getApplication(), "icon_list", mListener,
+ new TestIconOptionsProvider());
- mRecyclerView = new RecyclerView(context);
+ mRecyclerView = new RecyclerView(mContext);
mRecyclerView.setId(R.id.icon_list);
- LayoutPreference layoutPreference = new LayoutPreference(context, mRecyclerView);
- mPreferenceScreen = mock(PreferenceScreen.class);
- when(mPreferenceScreen.findPreference(eq("icon_list"))).thenReturn(layoutPreference);
+ mLayoutPreference = new LayoutPreference(mContext, mRecyclerView);
+ when(mPreferenceScreen.findPreference(eq("icon_list"))).thenReturn(mLayoutPreference);
}
@Test
@@ -83,14 +80,32 @@
}
@Test
- public void selectIcon_updatesMode() {
- mController.setZenMode(ZEN_MODE);
+ public void updateState_highlightsCurrentIcon() {
+ ZenMode mode = new TestModeBuilder().setIconResId(R.drawable.ic_hearing).build();
+ mController.displayPreference(mPreferenceScreen);
- mController.onIconSelected(R.drawable.ic_android);
+ mController.updateZenMode(mLayoutPreference, mode);
- ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
- verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().getIconResId()).isEqualTo(R.drawable.ic_android);
+ assertThat(getItemViewAt(0).isSelected()).isFalse();
+ assertThat(getItemViewAt(1).isSelected()).isFalse();
+ assertThat(getItemViewAt(2).isSelected()).isTrue();
+ }
+
+ @Test
+ public void performClick_onIconItem_notifiesListener() {
+ mController.displayPreference(mPreferenceScreen);
+
+ getItemViewAt(1).performClick();
+
+ verify(mListener).onIconSelected(R.drawable.ic_info);
+ }
+
+ private View getItemViewAt(int position) {
+ ViewGroup fakeParent = new FrameLayout(mContext);
+ RecyclerView.ViewHolder viewHolder = mRecyclerView.getAdapter().onCreateViewHolder(
+ fakeParent, 0);
+ mRecyclerView.getAdapter().bindViewHolder(viewHolder, position);
+ return viewHolder.itemView;
}
private static class TestIconOptionsProvider implements IconOptionsProvider {
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceControllerTest.java
index cfeefb4..100ff43 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeMessagesLinkPreferenceControllerTest.java
@@ -16,20 +16,19 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenPolicy;
+
import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -48,8 +47,7 @@
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
@Before
public void setup() {
@@ -58,20 +56,14 @@
mContext = RuntimeEnvironment.application;
mController = new ZenModeMessagesLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mHelperBackend);
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testHasSummary() {
Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
- mController.updateZenMode(pref, zenMode);
+ mController.updateZenMode(pref, TestModeBuilder.EXAMPLE);
verify(pref).setSummary(any());
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeNewCustomFragmentTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNewCustomFragmentTest.java
new file mode 100644
index 0000000..dd2b49b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNewCustomFragmentTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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 android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
+
+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.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.fragment.app.testing.EmptyFragmentActivity;
+import androidx.fragment.app.testing.FragmentScenario;
+import androidx.lifecycle.Lifecycle;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+
+import com.android.internal.R;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+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.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModeNewCustomFragmentTest {
+
+ @Rule
+ public ActivityScenarioRule<EmptyFragmentActivity> mActivityScenario =
+ new ActivityScenarioRule<>(EmptyFragmentActivity.class);
+
+ private Activity mActivity;
+ private ZenModeNewCustomFragment mFragment;
+ @Mock
+ private ZenModesBackend mBackend;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mFragment = new ZenModeNewCustomFragment();
+ mFragment.setBackend(mBackend); // before onAttach()
+
+ mActivityScenario.getScenario().onActivity(activity -> {
+ mActivity = activity;
+ activity.getSupportFragmentManager().beginTransaction()
+ .add(mFragment, "tag").commitNow();
+ });
+ }
+
+ @Test
+ public void saveMode_addsCustomManualMode() {
+ mFragment.setModeName("The first name");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_theater);
+ mFragment.setModeName("Actually no, this name");
+
+ mFragment.saveMode();
+
+ verify(mBackend).addCustomManualMode("Actually no, this name",
+ R.drawable.ic_zen_mode_type_theater);
+ }
+
+ @Test
+ public void saveMode_withoutEdits_addsModeWithDefaultValues() {
+ mFragment.saveMode();
+
+ verify(mBackend).addCustomManualMode("Custom mode", 0);
+ }
+
+ @Test
+ public void saveMode_redirectsToModeView() {
+ when(mBackend.addCustomManualMode(any(), anyInt())).then(
+ (Answer<ZenMode>) invocationOnMock -> new TestModeBuilder()
+ .setId("Id of a mode named " + invocationOnMock.getArgument(0))
+ .setName(invocationOnMock.getArgument(0))
+ .setIconResId(invocationOnMock.getArgument(1))
+ .build());
+
+ mFragment.setModeName("something");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_immersive);
+ mFragment.saveMode();
+
+ Intent nextIntent = shadowOf(mActivity).getNextStartedActivity();
+ assertThat(nextIntent.getStringExtra(EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ZenModeFragment.class.getName());
+ Bundle fragmentArgs = nextIntent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ assertThat(fragmentArgs).isNotNull();
+ assertThat(fragmentArgs.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID)).isEqualTo(
+ "Id of a mode named something");
+ }
+
+ @Test
+ public void onCreate_whenRecreating_preservesEdits() {
+ FragmentScenario<ZenModeNewCustomFragment> scenario =
+ FragmentScenario.launch(ZenModeNewCustomFragment.class, /* bundle= */ null, 0,
+ Lifecycle.State.INITIALIZED);
+ scenario.onFragment(first -> {
+ first.setBackend(mBackend);
+ mFragment = first;
+ });
+ scenario.moveToState(Lifecycle.State.RESUMED);
+
+ // Perform some edits in the first fragment.
+ mFragment.setModeName("Don't forget me!");
+ mFragment.setModeIcon(R.drawable.ic_zen_mode_type_immersive);
+
+ // Destroy the first fragment and creates a new one (which should restore state).
+ scenario.recreate().onFragment(second -> {
+ assertThat(second).isNotSameInstanceAs(mFragment);
+ second.setBackend(mBackend);
+ mFragment = second;
+ });
+
+ mFragment.saveMode();
+ verify(mBackend).addCustomManualMode("Don't forget me!",
+ R.drawable.ic_zen_mode_type_immersive);
+ scenario.close();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceControllerTest.java
index 646c7aa..554fc6e 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisLinkPreferenceControllerTest.java
@@ -16,19 +16,19 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenPolicy;
+
import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -47,8 +47,7 @@
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
@Before
public void setup() {
@@ -57,20 +56,14 @@
mContext = RuntimeEnvironment.application;
mController = new ZenModeNotifVisLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mHelperBackend);
}
@Test
@EnableFlags(Flags.FLAG_MODES_UI)
public void testHasSummary() {
Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
- mController.updateZenMode(pref, zenMode);
+ mController.updateZenMode(pref, TestModeBuilder.EXAMPLE);
verify(pref).setSummary(any());
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceControllerTest.java
index 54edaf4..0820846 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeNotifVisPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.service.notification.ZenPolicy.STATE_ALLOW;
import static android.service.notification.ZenPolicy.STATE_DISALLOW;
import static android.service.notification.ZenPolicy.VISUAL_EFFECT_LIGHTS;
@@ -32,17 +31,19 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
import android.content.res.Resources;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
import androidx.preference.TwoStatePreference;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -96,15 +97,12 @@
@Test
public void updateState_notChecked() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .showAllVisualEffects()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .showAllVisualEffects()
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
@@ -115,15 +113,12 @@
@Test
public void updateState_checked() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .showVisualEffect(VISUAL_EFFECT_PEEK, false)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .showVisualEffect(VISUAL_EFFECT_PEEK, false)
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
@@ -138,16 +133,13 @@
"zen_effect_status", VISUAL_EFFECT_STATUS_BAR,
new int[]{VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .showVisualEffect(VISUAL_EFFECT_NOTIFICATION_LIST, false)
- .showVisualEffect(VISUAL_EFFECT_STATUS_BAR, true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .showVisualEffect(VISUAL_EFFECT_NOTIFICATION_LIST, false)
+ .showVisualEffect(VISUAL_EFFECT_STATUS_BAR, true)
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
@@ -168,15 +160,12 @@
"zen_effect_status", VISUAL_EFFECT_STATUS_BAR,
new int[]{VISUAL_EFFECT_NOTIFICATION_LIST}, mBackend);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .showAllVisualEffects()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .showAllVisualEffects()
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
@@ -188,15 +177,12 @@
@Test
public void onPreferenceChanged_checkedFalse() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .hideAllVisualEffects()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .hideAllVisualEffects()
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
@@ -213,15 +199,12 @@
@Test
public void onPreferenceChanged_checkedTrue() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAlarms(true)
- .showAllVisualEffects()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAlarms(true)
+ .showAllVisualEffects()
+ .build())
+ .build();
mController.updateZenMode(preference, zenMode);
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java
index 26da6ab..8aa87e6 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherLinkPreferenceControllerTest.java
@@ -16,19 +16,20 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
-import androidx.preference.Preference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -48,8 +49,7 @@
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
@Before
public void setup() {
@@ -58,20 +58,56 @@
mContext = RuntimeEnvironment.application;
mController = new ZenModeOtherLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mHelperBackend);
}
@Test
- @EnableFlags(Flags.FLAG_MODES_UI)
- public void testHasSummary() {
- Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
+ public void updateState_disabled() {
+ CircularIconsPreference pref = mock(CircularIconsPreference.class);
+ ZenMode zenMode = new TestModeBuilder()
+ .setEnabled(false)
+ .build();
+
mController.updateZenMode(pref, zenMode);
+
+ verify(pref).setEnabled(false);
+ }
+
+ @Test
+ public void updateState_loadsSummary() {
+ CircularIconsPreference pref = mock(CircularIconsPreference.class);
+ mController.updateZenMode(pref, TestModeBuilder.EXAMPLE);
+
verify(pref).setSummary(any());
}
+
+ @Test
+ public void updateState_loadsIcons() {
+ CircularIconsPreference pref = mock(CircularIconsPreference.class);
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .disallowAllSounds()
+ .allowMedia(true)
+ .allowSystem(true)
+ .allowReminders(true)
+ .build())
+ .build();
+
+ mController.updateState(pref, mode);
+
+ verify(pref).displayIcons(argThat(iconSet -> iconSet.size() == 3));
+ }
+
+ @Test
+ public void updateState_loadsAllIcons() {
+ CircularIconsPreference pref = mock(CircularIconsPreference.class);
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
+ .build();
+
+ mController.updateState(pref, mode);
+
+ verify(pref).displayIcons(argThat(iconSet ->
+ iconSet.size() == ZenModeSummaryHelper.OTHER_SOUND_CATEGORIES.size()));
+ }
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherPreferenceControllerTest.java
index 6dd918a..8272773 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeOtherPreferenceControllerTest.java
@@ -16,21 +16,26 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.service.notification.ZenPolicy.STATE_ALLOW;
import static android.service.notification.ZenPolicy.STATE_UNSET;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
+
import androidx.preference.TwoStatePreference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -61,12 +66,9 @@
@Test
public void testUpdateState_alarms() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_alarm", mBackend);
@@ -79,12 +81,9 @@
@Test
public void testOnPreferenceChange_alarms() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(false).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowAlarms(false).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_alarm", mBackend);
@@ -104,12 +103,9 @@
@Test
public void testUpdateState_media() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowMedia(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowMedia(true).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_media", mBackend);
@@ -122,12 +118,9 @@
@Test
public void testOnPreferenceChange_media() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowMedia(false).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowMedia(false).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_media", mBackend);
@@ -147,12 +140,9 @@
@Test
public void testUpdateState_system() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowSystem(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowSystem(true).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_system", mBackend);
@@ -165,12 +155,9 @@
@Test
public void testOnPreferenceChange_system() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowSystem(false).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowSystem(false).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_system", mBackend);
@@ -190,12 +177,9 @@
@Test
public void testUpdateState_reminders() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowReminders(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowReminders(true).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_reminders",
@@ -209,12 +193,9 @@
@Test
public void testOnPreferenceChange_reminders() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowReminders(false).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowReminders(false).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_reminders",
@@ -235,12 +216,9 @@
@Test
public void testUpdateState_events() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowEvents(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowEvents(true).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_events", mBackend);
@@ -253,12 +231,9 @@
@Test
public void testOnPreferenceChange_events() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowEvents(false).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowEvents(false).build())
+ .build();
ZenModeOtherPreferenceController controller =
new ZenModeOtherPreferenceController(mContext, "modes_category_events", mBackend);
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 81e6464..a4d141e 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModePeopleLinkPreferenceControllerTest.java
@@ -16,62 +16,223 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_IMPORTANT;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_NONE;
+import static android.service.notification.ZenPolicy.PEOPLE_TYPE_STARRED;
-import android.app.AutomaticZenRule;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import android.app.Flags;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.ConversationChannelWrapper;
import android.service.notification.ZenPolicy;
-import androidx.preference.Preference;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.notification.modes.ZenHelperBackend.Contact;
+import com.android.settingslib.notification.ConversationIconFactory;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.MoreExecutors;
+
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.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.util.Collection;
+
+@EnableFlags(Flags.FLAG_MODES_UI)
@RunWith(RobolectricTestRunner.class)
public final class ZenModePeopleLinkPreferenceControllerTest {
private ZenModePeopleLinkPreferenceController mController;
+ private CircularIconsPreference mPreference;
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
+ @Mock private ConversationIconFactory mConversationIconFactory;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
-
mContext = RuntimeEnvironment.application;
+ CircularIconSet.sExecutorService = MoreExecutors.newDirectExecutorService();
+ mPreference = new TestableCircularIconsPreference(mContext);
+
+ // Ensure the preference view is bound & measured (needed to add icons).
+ View preferenceView = LayoutInflater.from(mContext).inflate(mPreference.getLayoutResource(),
+ null);
+ preferenceView.measure(View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+ View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+ PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(preferenceView);
+ mPreference.onBindViewHolder(holder);
mController = new ZenModePeopleLinkPreferenceController(
- mContext, "something", mBackend);
+ mContext, "something", mHelperBackend, mConversationIconFactory);
+
+ setUpContacts(ImmutableList.of(), ImmutableList.of());
+ setUpImportantConversations(ImmutableList.of());
+
+ when(mHelperBackend.getContactPhoto(any())).then(
+ (Answer<Drawable>) invocationOnMock -> photoOf(invocationOnMock.getArgument(0)));
+ when(mConversationIconFactory.getConversationDrawable((ShortcutInfo) any(), any(), anyInt(),
+ anyBoolean())).thenReturn(new ColorDrawable(Color.BLACK));
}
@Test
- @EnableFlags(Flags.FLAG_MODES_UI)
- public void testHasSummary() {
- Preference pref = mock(Preference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), true);
- mController.updateZenMode(pref, zenMode);
- verify(pref).setSummary(any());
+ public void updateState_disabled() {
+ ZenMode zenMode = new TestModeBuilder()
+ .setEnabled(false)
+ .build();
+
+ mController.updateState(mPreference, zenMode);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_setsSummary() {
+ mController.updateState(mPreference, TestModeBuilder.EXAMPLE);
+
+ assertThat(mPreference.getSummary()).isNotNull();
+ assertThat(mPreference.getSummary().toString()).isNotEmpty();
+ }
+
+ @Test
+ public void updateState_starredCallsNoMessages_displaysStarredContacts() {
+ setUpContacts(ImmutableList.of(1, 2, 3, 4), ImmutableList.of(2, 3));
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_STARRED)
+ .allowMessages(PEOPLE_TYPE_NONE)
+ .build())
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(2);
+ assertThat(mPreference.getLoadedIcons().icons().stream()
+ .map(ColorDrawable.class::cast)
+ .map(d -> d.getColor()).toList())
+ .containsExactly(2, 3).inOrder();
+ }
+
+ @Test
+ public void updateState_starredCallsContactMessages_displaysAllContacts() {
+ setUpContacts(ImmutableList.of(1, 2, 3, 4), ImmutableList.of(2, 3));
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_STARRED)
+ .allowMessages(PEOPLE_TYPE_CONTACTS)
+ .build())
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(4);
+ assertThat(mPreference.getLoadedIcons().icons().stream()
+ .map(ColorDrawable.class::cast)
+ .map(d -> d.getColor()).toList())
+ .containsExactly(1, 2, 3, 4).inOrder();
+ }
+
+ @Test
+ public void updateState_anyoneCallsContactMessages_displaysAnyonePlaceholder() {
+ setUpContacts(ImmutableList.of(1, 2, 3, 4), ImmutableList.of(2, 3));
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_ANYONE)
+ .allowMessages(PEOPLE_TYPE_CONTACTS)
+ .build())
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(1);
+ verify(mHelperBackend, never()).getContactPhoto(any());
+ }
+
+ @Test
+ public void updateState_noContactsButImportantConversations_displaysConversations() {
+ setUpContacts(ImmutableList.of(), ImmutableList.of());
+ setUpImportantConversations(ImmutableList.of(1, 2, 3));
+ ZenMode mode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_CONTACTS)
+ .allowMessages(PEOPLE_TYPE_CONTACTS)
+ .allowConversations(CONVERSATION_SENDERS_IMPORTANT)
+ .build())
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.getLoadedIcons()).isNotNull();
+ assertThat(mPreference.getLoadedIcons().icons()).hasSize(3);
+ verify(mConversationIconFactory, times(3)).getConversationDrawable((ShortcutInfo) any(),
+ any(), anyInt(), anyBoolean());
+ }
+
+ 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)))
+ .toList()));
+
+ when(mHelperBackend.getStarredContacts()).thenReturn(ImmutableList.copyOf(
+ starredIds.stream()
+ .map(id -> new Contact(id, "#" + id, Uri.parse("photo://" + id)))
+ .toList()));
+ }
+
+ private void setUpImportantConversations(Collection<Integer> ids) {
+ when(mHelperBackend.getImportantConversations()).thenReturn(ImmutableList.copyOf(
+ ids.stream()
+ .map(id -> {
+ ConversationChannelWrapper channel = new ConversationChannelWrapper();
+ channel.setNotificationChannel(
+ new NotificationChannel(id.toString(), id.toString(),
+ NotificationManager.IMPORTANCE_DEFAULT));
+ return channel;
+ })
+ .toList()));
+ }
+
+ private static ColorDrawable photoOf(Contact contact) {
+ return new ColorDrawable((int) contact.id());
}
}
\ 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 c915974..64de141 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModePrioritySendersPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_IMPORTANT;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_NONE;
@@ -36,15 +35,11 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
@@ -54,8 +49,13 @@
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
+import com.google.common.collect.ImmutableList;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -77,8 +77,8 @@
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
- @Mock
- private ZenModesBackend mBackend;
+ @Mock private ZenModesBackend mBackend;
+ @Mock private ZenHelperBackend mHelperBackend;
private PreferenceCategory mMessagesPrefCategory, mCallsPrefCategory;
@@ -90,10 +90,11 @@
mContext = RuntimeEnvironment.application;
- mMessagesController = new ZenModePrioritySendersPreferenceController(
- mContext, "messages", true, mBackend);
- mCallsController = new ZenModePrioritySendersPreferenceController(
- mContext, "calls", false, mBackend);
+ mMessagesController = new ZenModePrioritySendersPreferenceController(mContext, "messages",
+ true, mBackend, mHelperBackend);
+ mCallsController = new ZenModePrioritySendersPreferenceController(mContext, "calls", false,
+ mBackend, mHelperBackend);
+
mMessagesPrefCategory = new PreferenceCategory(mContext);
mMessagesPrefCategory.setKey(mMessagesController.getPreferenceKey());
mCallsPrefCategory = new PreferenceCategory(mContext);
@@ -104,22 +105,11 @@
mPreferenceScreen.addPreference(mCallsPrefCategory);
mPreferenceScreen.addPreference(mMessagesPrefCategory);
- Cursor cursor = mock(Cursor.class);
- when(cursor.getCount()).thenReturn(1);
- when(mBackend.queryAllContactsData()).thenReturn(cursor);
- }
-
- // Makes a preference with the provided key and whether it's a checkbox with
- // mSelectorClickListener as the onClickListener set.
- private SelectorWithWidgetPreference makePreference(
- String key, boolean isCheckbox, boolean isMessages) {
- final SelectorWithWidgetPreference pref =
- new SelectorWithWidgetPreference(mContext, isCheckbox);
- pref.setKey(key);
- pref.setOnClickListener(
- isMessages ? mMessagesController.mSelectorClickListener
- : mCallsController.mSelectorClickListener);
- return pref;
+ when(mHelperBackend.getStarredContacts()).thenReturn(ImmutableList.of());
+ when(mHelperBackend.getAllContacts()).thenReturn(
+ ImmutableList.of(new ZenHelperBackend.Contact(1, "The only contact", null)));
+ when(mHelperBackend.getAllContactsCount()).thenReturn(1);
+ when(mHelperBackend.getImportantConversations()).thenReturn(ImmutableList.of());
}
@Test
@@ -438,20 +428,17 @@
@Test
public void testPreferenceClick_passesCorrectCheckedState_startingUnchecked_messages() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .disallowAllSounds()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .disallowAllSounds()
+ .build())
+ .build();
mMessagesController.displayPreference(mPreferenceScreen);
mMessagesController.updateZenMode(mMessagesPrefCategory, zenMode);
assertThat(((SelectorWithWidgetPreference) mMessagesPrefCategory.findPreference(KEY_NONE))
- .isChecked());
+ .isChecked()).isTrue();
mMessagesPrefCategory.findPreference(KEY_STARRED).performClick();
@@ -463,14 +450,11 @@
@Test
public void testPreferenceClick_passesCorrectCheckedState_startingChecked_messages() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowAllSounds()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowAllSounds()
+ .build())
+ .build();
mMessagesController.displayPreference(mPreferenceScreen);
mMessagesController.updateZenMode(mMessagesPrefCategory, zenMode);
@@ -489,14 +473,11 @@
@Test
public void testPreferenceClick_passesCorrectCheckedState_startingUnchecked_calls() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .disallowAllSounds()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .disallowAllSounds()
+ .build())
+ .build();
mCallsController.displayPreference(mPreferenceScreen);
mCallsController.updateZenMode(mCallsPrefCategory, zenMode);
@@ -514,14 +495,11 @@
@Test
public void testPreferenceClick_passesCorrectCheckedState_startingChecked_calls() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .disallowAllSounds()
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .disallowAllSounds()
+ .build())
+ .build();
mCallsController.displayPreference(mPreferenceScreen);
mCallsController.updateZenMode(mCallsPrefCategory, zenMode);
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceControllerTest.java
index 7bbb042..c453403 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -16,24 +16,28 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_STARRED;
-import static android.service.notification.ZenPolicy.STATE_ALLOW;
import static android.service.notification.ZenPolicy.STATE_DISALLOW;
import static android.service.notification.ZenPolicy.STATE_UNSET;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.service.notification.ZenPolicy;
+
import androidx.preference.TwoStatePreference;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -64,14 +68,11 @@
@Test
public void testUpdateState_allCalls() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowCalls(PEOPLE_TYPE_ANYONE)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_ANYONE)
+ .build())
+ .build();
ZenModeRepeatCallersPreferenceController controller =
new ZenModeRepeatCallersPreferenceController(mContext, "repeat", mBackend, 1);
@@ -85,15 +86,12 @@
@Test
public void testUpdateState_someCalls() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowCalls(PEOPLE_TYPE_STARRED)
- .allowRepeatCallers(true)
- .build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_STARRED)
+ .allowRepeatCallers(true)
+ .build())
+ .build();
ZenModeRepeatCallersPreferenceController controller =
new ZenModeRepeatCallersPreferenceController(mContext, "repeat", mBackend, 1);
@@ -107,12 +105,9 @@
@Test
public void testOnPreferenceChange() {
TwoStatePreference preference = mock(TwoStatePreference.class);
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowRepeatCallers(true).build())
- .build(), true);
+ ZenMode zenMode = new TestModeBuilder()
+ .setZenPolicy(new ZenPolicy.Builder().allowRepeatCallers(true).build())
+ .build();
ZenModeRepeatCallersPreferenceController controller =
new ZenModeRepeatCallersPreferenceController(mContext, "repeat", mBackend, 1);
@@ -130,4 +125,4 @@
assertThat(captor.getValue().getPolicy().getPriorityCallSenders())
.isEqualTo(STATE_UNSET);
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceControllerTest.java
index 6b24fa2..42aa498 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetCalendarPreferenceControllerTest.java
@@ -28,18 +28,21 @@
import static org.mockito.Mockito.when;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.SystemZenRules;
import android.service.notification.ZenModeConfig;
import androidx.preference.DropDownPreference;
import androidx.preference.PreferenceCategory;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -84,9 +87,9 @@
@Test
@EnableFlags({Flags.FLAG_MODES_API, Flags.FLAG_MODES_UI})
public void updateEventMode_updatesConditionAndTriggerDescription() {
- ZenMode mode = new ZenMode("id",
- new AutomaticZenRule.Builder("name", Uri.parse("condition")).build(),
- true); // is active
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .build();
// Explicitly update preference controller with mode info first, which will also call
// updateState()
@@ -99,6 +102,7 @@
// apply event mode updater to existing mode
ZenMode out = mPrefController.updateEventMode(eventInfo).apply(mode);
+ assertThat(out.getRule().getOwner()).isEqualTo(ZenModeConfig.getEventConditionProvider());
assertThat(out.getRule().getConditionId()).isEqualTo(
ZenModeConfig.toEventConditionId(eventInfo));
assertThat(out.getRule().getTriggerDescription()).isEqualTo("My events");
@@ -111,10 +115,9 @@
eventInfo.calName = "Definitely A Calendar";
eventInfo.reply = REPLY_YES;
- ZenMode mode = new ZenMode("id",
- new AutomaticZenRule.Builder("name",
- ZenModeConfig.toEventConditionId(eventInfo)).build(),
- true); // is active
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toEventConditionId(eventInfo))
+ .build();
mPrefController.updateZenMode(mPrefCategory, mode);
// We should see mCalendar, mReply have their values set
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 7cf327c..d5c7f61 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceControllerTest.java
@@ -23,12 +23,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.AutomaticZenRule;
import android.app.Flags;
import android.content.Context;
-import android.net.Uri;
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.view.ViewGroup;
import android.widget.ToggleButton;
@@ -37,6 +36,9 @@
import androidx.test.core.app.ApplicationProvider;
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;
import org.junit.Before;
import org.junit.Rule;
@@ -80,9 +82,9 @@
@Test
@EnableFlags({Flags.FLAG_MODES_API, Flags.FLAG_MODES_UI})
public void updateScheduleRule_updatesConditionAndTriggerDescription() {
- ZenMode mode = new ZenMode("id",
- new AutomaticZenRule.Builder("name", Uri.parse("condition")).build(),
- true); // is active
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .build();
ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
scheduleInfo.days = new int[] { Calendar.MONDAY };
@@ -93,6 +95,8 @@
assertThat(out.getRule().getConditionId())
.isEqualTo(ZenModeConfig.toScheduleConditionId(scheduleInfo));
assertThat(out.getRule().getTriggerDescription()).isNotEmpty();
+ assertThat(out.getRule().getOwner()).isEqualTo(
+ ZenModeConfig.getScheduleConditionProvider());
}
@Test
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceControllerTest.java
deleted file mode 100644
index 91de4ea..0000000
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeSetTriggerLinkPreferenceControllerTest.java
+++ /dev/null
@@ -1,198 +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.notification.modes;
-
-import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
-import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
-
-import static com.android.settings.notification.modes.ZenModeSetTriggerLinkPreferenceController.AUTOMATIC_TRIGGER_PREF_KEY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.AutomaticZenRule;
-import android.app.Flags;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.service.notification.ZenModeConfig;
-import android.service.notification.ZenPolicy;
-
-import androidx.preference.PreferenceCategory;
-import androidx.test.core.app.ApplicationProvider;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-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.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import java.util.Calendar;
-
-@RunWith(RobolectricTestRunner.class)
-public class ZenModeSetTriggerLinkPreferenceControllerTest {
- @Rule
- public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
-
- @Mock
- private ZenModesBackend mBackend;
- private Context mContext;
-
- @Mock
- private PreferenceCategory mPrefCategory;
- @Mock
- private PrimarySwitchPreference mPreference;
- private ZenModeSetTriggerLinkPreferenceController mPrefController;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = ApplicationProvider.getApplicationContext();
-
- mPrefController = new ZenModeSetTriggerLinkPreferenceController(mContext,
- "zen_automatic_trigger_category", mBackend);
- when(mPrefCategory.findPreference(AUTOMATIC_TRIGGER_PREF_KEY)).thenReturn(mPreference);
- }
-
- @Test
- @EnableFlags(Flags.FLAG_MODES_UI)
- public void testIsAvailable() {
- // should not be available for manual DND
- ZenMode manualMode = ZenMode.manualDndMode(new AutomaticZenRule.Builder("Do Not Disturb",
- Uri.parse("manual"))
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .build(), true);
-
- mPrefController.updateZenMode(mPrefCategory, manualMode);
- assertThat(mPrefController.isAvailable()).isFalse();
-
- // should be available for other modes
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
- .setEnabled(false)
- .build(), false);
- mPrefController.updateZenMode(mPrefCategory, zenMode);
- assertThat(mPrefController.isAvailable()).isTrue();
- }
-
- @Test
- public void testUpdateState() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
- .setEnabled(false)
- .build(), false);
-
- // Update preference controller with a zen mode that is not enabled
- mPrefController.updateZenMode(mPrefCategory, zenMode);
- verify(mPreference).setChecked(false);
-
- // Now with the rule enabled
- zenMode.getRule().setEnabled(true);
- mPrefController.updateZenMode(mPrefCategory, zenMode);
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void testOnPreferenceChange() {
- ZenMode zenMode = new ZenMode("id",
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
- .setEnabled(false)
- .build(), false);
-
- // start with disabled rule
- mPrefController.updateZenMode(mPrefCategory, zenMode);
-
- // then update the preference to be checked
- mPrefController.mSwitchChangeListener.onPreferenceChange(mPreference, true);
-
- // verify the backend got asked to update the mode to be enabled
- ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
- verify(mBackend).updateMode(captor.capture());
- assertThat(captor.getValue().getRule().isEnabled()).isTrue();
- }
-
- @Test
- public void testRuleLink_calendar() {
- ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
- eventInfo.calendarId = 1L;
- eventInfo.calName = "My events";
- ZenMode mode = new ZenMode("id", new AutomaticZenRule.Builder("name",
- ZenModeConfig.toEventConditionId(eventInfo))
- .setType(TYPE_SCHEDULE_CALENDAR)
- .setTriggerDescription("My events")
- .build(),
- true); // is active
- mPrefController.updateZenMode(mPrefCategory, mode);
-
- verify(mPreference).setTitle(R.string.zen_mode_set_calendar_link);
- verify(mPreference).setSummary(mode.getRule().getTriggerDescription());
-
- ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- verify(mPreference).setIntent(captor.capture());
- // Destination as written into the intent by SubSettingLauncher
- assertThat(
- captor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ZenModeSetCalendarFragment.class.getName());
- }
-
- @Test
- public void testRuleLink_schedule() {
- ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
- scheduleInfo.days = new int[] { Calendar.MONDAY, Calendar.TUESDAY, Calendar.THURSDAY };
- scheduleInfo.startHour = 1;
- scheduleInfo.endHour = 15;
- ZenMode mode = new ZenMode("id", new AutomaticZenRule.Builder("name",
- ZenModeConfig.toScheduleConditionId(scheduleInfo))
- .setType(TYPE_SCHEDULE_TIME)
- .setTriggerDescription("some schedule")
- .build(),
- true); // is active
- mPrefController.updateZenMode(mPrefCategory, mode);
-
- verify(mPreference).setTitle(R.string.zen_mode_set_schedule_link);
- verify(mPreference).setSummary(mode.getRule().getTriggerDescription());
-
- ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
- verify(mPreference).setIntent(captor.capture());
- // Destination as written into the intent by SubSettingLauncher
- assertThat(
- captor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)).isEqualTo(
- ZenModeSetScheduleFragment.class.getName());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTest.java
deleted file mode 100644
index 0528621..0000000
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTest.java
+++ /dev/null
@@ -1,194 +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.notification.modes;
-
-import static android.app.NotificationManager.INTERRUPTION_FILTER_ALARMS;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_NONE;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AutomaticZenRule;
-import android.net.Uri;
-import android.service.notification.ZenPolicy;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ZenModeTest {
-
- private static final ZenPolicy ZEN_POLICY = new ZenPolicy.Builder().allowAllSounds().build();
-
- private static final AutomaticZenRule ZEN_RULE =
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(ZEN_POLICY)
- .build();
-
- @Test
- public void testBasicMethods() {
- ZenMode zenMode = new ZenMode("id", ZEN_RULE, true);
-
- assertThat(zenMode.getId()).isEqualTo("id");
- assertThat(zenMode.getRule()).isEqualTo(ZEN_RULE);
- assertThat(zenMode.isManualDnd()).isFalse();
- assertThat(zenMode.canBeDeleted()).isTrue();
- assertThat(zenMode.isActive()).isTrue();
-
- ZenMode manualMode = ZenMode.manualDndMode(ZEN_RULE, false);
- assertThat(manualMode.getId()).isEqualTo(ZenMode.MANUAL_DND_MODE_ID);
- assertThat(manualMode.isManualDnd()).isTrue();
- assertThat(manualMode.canBeDeleted()).isFalse();
- assertThat(manualMode.isActive()).isFalse();
- }
-
- @Test
- public void getPolicy_interruptionFilterPriority_returnsZenPolicy() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(ZEN_POLICY)
- .build(), false);
-
- assertThat(zenMode.getPolicy()).isEqualTo(ZEN_POLICY);
- }
-
- @Test
- public void getPolicy_interruptionFilterAll_returnsPolicyAllowingAll() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_ALL)
- .setZenPolicy(ZEN_POLICY) // should be ignored
- .build(), false);
-
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .allowAllSounds().showAllVisualEffects().build());
- }
-
- @Test
- public void getPolicy_interruptionFilterAlarms_returnsPolicyAllowingAlarms() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_ALARMS)
- .setZenPolicy(ZEN_POLICY) // should be ignored
- .build(), false);
-
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder()
- .disallowAllSounds()
- .allowAlarms(true)
- .allowMedia(true)
- .allowPriorityChannels(false)
- .build());
- }
-
- @Test
- public void getPolicy_interruptionFilterNone_returnsPolicyAllowingNothing() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_NONE)
- .setZenPolicy(ZEN_POLICY) // should be ignored
- .build(), false);
-
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder()
- .disallowAllSounds()
- .hideAllVisualEffects()
- .allowPriorityChannels(false)
- .build());
- }
-
- @Test
- public void setPolicy_setsInterruptionFilterPriority() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_ALARMS)
- .build(), false);
-
- zenMode.setPolicy(ZEN_POLICY);
-
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(
- INTERRUPTION_FILTER_PRIORITY);
- assertThat(zenMode.getPolicy()).isEqualTo(ZEN_POLICY);
- assertThat(zenMode.getRule().getZenPolicy()).isEqualTo(ZEN_POLICY);
- }
-
- @Test
- public void setPolicy_withAllChannelsAllowed_setsInterruptionFilterAll() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_ALARMS)
- .setZenPolicy(ZEN_POLICY)
- .build(), false);
-
- zenMode.setPolicy(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL).build());
-
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(INTERRUPTION_FILTER_ALL);
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .allowAllSounds().showAllVisualEffects().build());
- }
-
- @Test
- public void setPolicy_priorityToAllChannelsAndBack_restoresOldPolicy() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(ZEN_POLICY)
- .build(), false);
-
- zenMode.setPolicy(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL).build());
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(INTERRUPTION_FILTER_ALL);
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .allowAllSounds().showAllVisualEffects().build());
-
- zenMode.setPolicy(
- new ZenPolicy.Builder().allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY).build());
-
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(
- INTERRUPTION_FILTER_PRIORITY);
- assertThat(zenMode.getPolicy()).isEqualTo(ZEN_POLICY);
- assertThat(zenMode.getRule().getZenPolicy()).isEqualTo(ZEN_POLICY);
- }
-
- @Test
- public void setPolicy_alarmsOnlyToAllChannelsAndBack_restoresPolicySimilarToAlarmsOnly() {
- ZenMode zenMode = new ZenMode("id", new AutomaticZenRule.Builder("Rule", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_ALARMS)
- .build(), false);
-
- zenMode.setPolicy(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL).build());
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(INTERRUPTION_FILTER_ALL);
- assertThat(zenMode.getPolicy()).isEqualTo(
- new ZenPolicy.Builder().allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .allowAllSounds().showAllVisualEffects().build());
-
- zenMode.setPolicy(
- new ZenPolicy.Builder().allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY).build());
-
- // We don't go back to ALARMS, but the policy must be the one the user was seeing before.
- ZenPolicy alarmsOnlyLikePolicy = new ZenPolicy.Builder().disallowAllSounds()
- .allowAlarms(true).allowMedia(true).allowPriorityChannels(false)
- .build();
- assertThat(zenMode.getRule().getInterruptionFilter()).isEqualTo(
- INTERRUPTION_FILTER_PRIORITY);
- assertThat(zenMode.getPolicy()).isEqualTo(alarmsOnlyLikePolicy);
- assertThat(zenMode.getRule().getZenPolicy()).isEqualTo(alarmsOnlyLikePolicy);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceControllerTest.java
new file mode 100644
index 0000000..a56e723
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerAddPreferenceControllerTest.java
@@ -0,0 +1,183 @@
+/*
+ * 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 android.app.AutomaticZenRule.TYPE_OTHER;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
+
+import static com.android.settings.notification.modes.CharSequenceTruth.assertThat;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.app.AutomaticZenRule;
+import android.app.Flags;
+import android.content.Context;
+import android.net.Uri;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.SystemZenRules;
+import android.service.notification.ZenModeConfig;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+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;
+
+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.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Calendar;
+
+@RunWith(RobolectricTestRunner.class)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public class ZenModeTriggerAddPreferenceControllerTest {
+
+ private static final ZenMode CUSTOM_MANUAL_MODE = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toCustomManualConditionId())
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_OTHER)
+ .setTriggerDescription("Will not be shown")
+ .build();
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
+
+ private ZenModeTriggerAddPreferenceController mController;
+
+ private Context mContext;
+ private Preference mPreference;
+ @Mock private ZenModesBackend mBackend;
+ @Mock private DashboardFragment mFragment;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+
+ PreferenceManager preferenceManager = new PreferenceManager(mContext);
+ PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(mContext,
+ R.xml.modes_rule_settings, null);
+
+ mController = new ZenModeTriggerAddPreferenceController(mContext,
+ "zen_add_automatic_trigger", mFragment, mBackend);
+ mPreference = preferenceScreen.findPreference("zen_add_automatic_trigger");
+ }
+
+ @Test
+ public void isAvailable_customManualMode_true() {
+ mController.setZenMode(CUSTOM_MANUAL_MODE);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_systemMode_false() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_SCHEDULE_CALENDAR)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_appProvidedMode_false() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("com.some.package")
+ .setType(TYPE_OTHER)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_manualDND_false() {
+ ZenMode manualMode = ZenMode.manualDndMode(new AutomaticZenRule.Builder("Do Not Disturb",
+ Uri.parse("manual"))
+ .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ .build(), /* isActive= */ false);
+
+ mController.setZenMode(manualMode);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void updateState_customManualRule() {
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toCustomManualConditionId())
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_OTHER)
+ .setTriggerDescription("Will not be shown")
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.getTitle()).isEqualTo(
+ mContext.getString(R.string.zen_mode_select_schedule));
+ assertThat(mPreference.getSummary()).isNull();
+ // Sets up a click listener to open the dialog.
+ assertThat(mPreference.getOnPreferenceClickListener()).isNotNull();
+ }
+
+ @Test
+ public void onScheduleChosen_updatesMode() {
+ ZenMode originalMode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toCustomManualConditionId())
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_OTHER)
+ .setTriggerDescription("")
+ .build();
+ mController.updateZenMode(mPreference, originalMode);
+
+ ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
+ scheduleInfo.days = new int[] { Calendar.MONDAY };
+ scheduleInfo.startHour = 12;
+ scheduleInfo.endHour = 15;
+ Uri scheduleUri = ZenModeConfig.toScheduleConditionId(scheduleInfo);
+
+ mController.mOnScheduleOptionListener.onScheduleSelected(scheduleUri);
+
+ // verify the backend got asked to update the mode to be schedule-based.
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ ZenMode updatedMode = captor.getValue();
+ assertThat(updatedMode.getType()).isEqualTo(TYPE_SCHEDULE_TIME);
+ assertThat(updatedMode.getRule().getConditionId()).isEqualTo(scheduleUri);
+ assertThat(updatedMode.getRule().getTriggerDescription()).isNotEmpty();
+ assertThat(updatedMode.getRule().getOwner()).isEqualTo(
+ ZenModeConfig.getScheduleConditionProvider());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceControllerTest.java
new file mode 100644
index 0000000..4510e20
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerCategoryPreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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 android.app.AutomaticZenRule.TYPE_OTHER;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.AutomaticZenRule;
+import android.app.Flags;
+import android.content.Context;
+import android.net.Uri;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.SystemZenRules;
+import android.service.notification.ZenModeConfig;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+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;
+
+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)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public class ZenModeTriggerCategoryPreferenceControllerTest {
+
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
+
+ private ZenModeTriggerCategoryPreferenceController mController;
+
+ private Context mContext;
+ private Preference mPreference;
+ @Mock private ZenModesBackend mBackend;
+ @Mock private DashboardFragment mFragment;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = ApplicationProvider.getApplicationContext();
+
+ PreferenceManager preferenceManager = new PreferenceManager(mContext);
+ PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(mContext,
+ R.xml.modes_rule_settings, null);
+
+ mController = new ZenModeTriggerCategoryPreferenceController(mContext,
+ "zen_automatic_trigger_category");
+ mPreference = preferenceScreen.findPreference("zen_automatic_trigger_category");
+ }
+
+ @Test
+ public void isAvailable_customManualMode_true() {
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toCustomManualConditionId())
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_OTHER)
+ .setTriggerDescription("Will not be shown")
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_systemMode_true() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_SCHEDULE_CALENDAR)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_appProvidedMode_true() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("com.some.package")
+ .setType(TYPE_OTHER)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_manualDND_false() {
+ ZenMode manualMode = ZenMode.manualDndMode(new AutomaticZenRule.Builder("Do Not Disturb",
+ Uri.parse("manual"))
+ .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ .build(), /* isActive= */ false);
+
+ mController.setZenMode(manualMode);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
new file mode 100644
index 0000000..a3fe57e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModeTriggerUpdatePreferenceControllerTest.java
@@ -0,0 +1,371 @@
+/*
+ * 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 android.app.AutomaticZenRule.TYPE_OTHER;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_CALENDAR;
+import static android.app.AutomaticZenRule.TYPE_SCHEDULE_TIME;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;
+
+import static com.android.settings.notification.modes.CharSequenceTruth.assertThat;
+
+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.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.AlertDialog;
+import android.app.AutomaticZenRule;
+import android.app.Flags;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Looper;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+import android.service.notification.SystemZenRules;
+import android.service.notification.ZenModeConfig;
+
+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.settingslib.PrimarySwitchPreference;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+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.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowAlertDialog;
+
+import java.util.Calendar;
+
+@RunWith(RobolectricTestRunner.class)
+@EnableFlags(Flags.FLAG_MODES_UI)
+public class ZenModeTriggerUpdatePreferenceControllerTest {
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
+
+ private ZenModeTriggerUpdatePreferenceController mController;
+
+ private PrimarySwitchPreference mPreference;
+ @Mock private ZenModesBackend mBackend;
+ @Mock private PackageManager mPm;
+ @Mock private ConfigurationActivityHelper mConfigurationActivityHelper;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ Context context = ApplicationProvider.getApplicationContext();
+
+ PreferenceManager preferenceManager = new PreferenceManager(context);
+ PreferenceScreen preferenceScreen = preferenceManager.inflateFromResource(context,
+ R.xml.modes_rule_settings, null);
+
+ mController = new ZenModeTriggerUpdatePreferenceController(context,
+ "zen_automatic_trigger_settings", mBackend, mPm,
+ mConfigurationActivityHelper, mock(ZenServiceListing.class));
+
+ mPreference = preferenceScreen.findPreference("zen_automatic_trigger_settings");
+
+ when(mPm.getApplicationInfo(any(), anyInt())).then(
+ (Answer<ApplicationInfo>) invocationOnMock -> {
+ ApplicationInfo appInfo = new ApplicationInfo();
+ appInfo.packageName = invocationOnMock.getArgument(0);
+ appInfo.labelRes = 1; // Whatever, but != 0 so that loadLabel calls PM.getText()
+ return appInfo;
+ });
+ when(mPm.getText(any(), anyInt(), any())).then(
+ (Answer<CharSequence>) invocationOnMock ->
+ "App named " + invocationOnMock.getArgument(0));
+ }
+
+ @Test
+ public void isAvailable_systemModeNotCustomManual_true() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_SCHEDULE_CALENDAR)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_appProvidedMode_true() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("com.some.package")
+ .setType(TYPE_OTHER)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_customManualMode_false() {
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toCustomManualConditionId())
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_OTHER)
+ .build();
+ mController.setZenMode(mode);
+
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isAvailable_manualDND_false() {
+ ZenMode manualMode = ZenMode.manualDndMode(new AutomaticZenRule.Builder("Do Not Disturb",
+ Uri.parse("manual"))
+ .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ .build(), /* isActive= */ false);
+
+ mController.setZenMode(manualMode);
+ assertThat(mController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void updateState_switchCheckedIfRuleEnabled() {
+ ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
+
+ // Update preference controller with a zen mode that is not enabled
+ mController.updateZenMode(mPreference, zenMode);
+ assertThat(mPreference.getCheckedState()).isFalse();
+
+ // Now with the rule enabled
+ zenMode.getRule().setEnabled(true);
+ mController.updateZenMode(mPreference, zenMode);
+ assertThat(mPreference.getCheckedState()).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChange_toggleOn_enablesModeAfterConfirmation() {
+ // Start with a disabled mode
+ ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
+ mController.updateZenMode(mPreference, zenMode);
+
+ // Flip the switch
+ mPreference.callChangeListener(true);
+ verify(mBackend, never()).updateMode(any());
+
+ // Oh wait, I forgot to confirm! Let's do that
+ assertThat(ShadowAlertDialog.getLatestAlertDialog()).isNotNull();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isTrue();
+ ShadowAlertDialog.getLatestAlertDialog()
+ .getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify the backend got asked to update the mode to be enabled
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ assertThat(captor.getValue().getRule().isEnabled()).isTrue();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_toggleOff_disablesModeAfterConfirmation() {
+ // Start with an enabled mode
+ ZenMode zenMode = new TestModeBuilder().setEnabled(true).build();
+ mController.updateZenMode(mPreference, zenMode);
+
+ // Flip the switch
+ mPreference.callChangeListener(false);
+ verify(mBackend, never()).updateMode(any());
+
+ // Oh wait, I forgot to confirm! Let's do that
+ assertThat(ShadowAlertDialog.getLatestAlertDialog()).isNotNull();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isTrue();
+ ShadowAlertDialog.getLatestAlertDialog()
+ .getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify the backend got asked to update the mode to be disabled
+ ArgumentCaptor<ZenMode> captor = ArgumentCaptor.forClass(ZenMode.class);
+ verify(mBackend).updateMode(captor.capture());
+ assertThat(captor.getValue().getRule().isEnabled()).isFalse();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_ifPressCancelButton_doesNotUpdateMode() {
+ // Start with a disabled mode
+ ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
+ mController.updateZenMode(mPreference, zenMode);
+
+ // Flip the switch, then have second thoughts about it
+ mPreference.callChangeListener(true);
+ ShadowAlertDialog.getLatestAlertDialog()
+ .getButton(AlertDialog.BUTTON_NEGATIVE).performClick();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify nothing changed, and the switch shows the correct (pre-change) value.
+ verify(mBackend, never()).updateMode(any());
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isFalse();
+ }
+
+ @Test
+ public void onPreferenceChange_ifExitingDialog_doesNotUpdateMode() {
+ // Start with a disabled mode
+ ZenMode zenMode = new TestModeBuilder().setEnabled(false).build();
+ mController.updateZenMode(mPreference, zenMode);
+
+ // Flip the switch, but close the dialog without selecting either button.
+ mPreference.callChangeListener(true);
+ ShadowAlertDialog.getLatestAlertDialog().dismiss();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ // Verify nothing changed, and the switch shows the correct (pre-change) value.
+ verify(mBackend, never()).updateMode(any());
+ assertThat(mPreference.isChecked()).isFalse();
+ assertThat(ShadowAlertDialog.getLatestAlertDialog().isShowing()).isFalse();
+ }
+
+ @Test
+ public void updateState_scheduleCalendarRule() {
+ ZenModeConfig.EventInfo eventInfo = new ZenModeConfig.EventInfo();
+ eventInfo.calendarId = 1L;
+ eventInfo.calName = "My events";
+ ZenMode mode = new TestModeBuilder()
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setConditionId(ZenModeConfig.toEventConditionId(eventInfo))
+ .setType(TYPE_SCHEDULE_CALENDAR)
+ .setTriggerDescription("My events")
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("Calendar events");
+ assertThat(mPreference.getSummary()).isEqualTo("My events");
+ // Destination as written into the intent by SubSettingLauncher
+ assertThat(
+ mPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ZenModeSetCalendarFragment.class.getName());
+ }
+
+ @Test
+ public void updateState_scheduleTimeRule() {
+ ZenModeConfig.ScheduleInfo scheduleInfo = new ZenModeConfig.ScheduleInfo();
+ scheduleInfo.days = new int[]{Calendar.MONDAY, Calendar.TUESDAY, Calendar.THURSDAY};
+ scheduleInfo.startHour = 1;
+ scheduleInfo.endHour = 15;
+ ZenMode mode = new TestModeBuilder()
+ .setConditionId(ZenModeConfig.toScheduleConditionId(scheduleInfo))
+ .setPackage(SystemZenRules.PACKAGE_ANDROID)
+ .setType(TYPE_SCHEDULE_TIME)
+ .setTriggerDescription("some schedule")
+ .build();
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("1:00 AM - 3:00 PM");
+ assertThat(mPreference.getSummary()).isEqualTo("Mon - Tue, Thu");
+ // Destination as written into the intent by SubSettingLauncher
+ assertThat(
+ mPreference.getIntent().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ZenModeSetScheduleFragment.class.getName());
+ }
+
+ @Test
+ public void updateState_appWithConfigActivity_showsLinkToConfigActivity() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("some.package")
+ .setTriggerDescription("When The Music's Over")
+ .build();
+ Intent configurationIntent = new Intent("configure the mode");
+ when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
+ .thenReturn(configurationIntent);
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("Linked to app");
+ assertThat(mPreference.getSummary()).isEqualTo("When The Music's Over");
+ assertThat(mPreference.getIntent()).isEqualTo(configurationIntent);
+ }
+
+ @Test
+ public void updateState_appWithoutConfigActivity_showsWithoutLinkToConfigActivity() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("some.package")
+ .setTriggerDescription("When the saints go marching in")
+ .build();
+ when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
+ .thenReturn(null);
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("Linked to app");
+ assertThat(mPreference.getSummary()).isEqualTo("When the saints go marching in");
+ assertThat(mPreference.getIntent()).isNull();
+ }
+
+ @Test
+ public void updateState_appWithoutTriggerDescriptionWithConfigActivity_showsAppNameInSummary() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("some.package")
+ .build();
+ Intent configurationIntent = new Intent("configure the mode");
+ when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
+ .thenReturn(configurationIntent);
+ when(mPm.getText(any(), anyInt(), any())).thenReturn("The App Name");
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("Linked to app");
+ assertThat(mPreference.getSummary()).isEqualTo("Info and settings in The App Name");
+ }
+
+ @Test
+ public void updateState_appWithoutTriggerDescriptionNorConfigActivity_showsAppNameInSummary() {
+ ZenMode mode = new TestModeBuilder()
+ .setPackage("some.package")
+ .build();
+ when(mConfigurationActivityHelper.getConfigurationActivityIntentForMode(any(), any()))
+ .thenReturn(null);
+ when(mPm.getText(any(), anyInt(), any())).thenReturn("The App Name");
+
+ mController.updateState(mPreference, mode);
+
+ assertThat(mPreference.isVisible()).isTrue();
+ assertThat(mPreference.getTitle()).isEqualTo("Linked to app");
+ assertThat(mPreference.getSummary()).isEqualTo("Managed by The App Name");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java
deleted file mode 100644
index 9483683..0000000
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesBackendTest.java
+++ /dev/null
@@ -1,363 +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.notification.modes;
-
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
-import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
-import static android.provider.Settings.Global.ZEN_MODE_OFF;
-import static android.service.notification.Condition.SOURCE_UNKNOWN;
-import static android.service.notification.Condition.STATE_FALSE;
-import static android.service.notification.Condition.STATE_TRUE;
-import static android.service.notification.ZenPolicy.STATE_ALLOW;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.AutomaticZenRule;
-import android.app.Flags;
-import android.app.NotificationManager;
-import android.app.NotificationManager.Policy;
-import android.content.Context;
-import android.net.Uri;
-import android.platform.test.annotations.EnableFlags;
-import android.platform.test.flag.junit.SetFlagsRule;
-import android.provider.Settings;
-import android.service.notification.Condition;
-import android.service.notification.ZenAdapters;
-import android.service.notification.ZenDeviceEffects;
-import android.service.notification.ZenModeConfig;
-import android.service.notification.ZenPolicy;
-
-import com.android.settings.R;
-
-import com.google.common.collect.ImmutableMap;
-
-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;
-
-import java.time.Duration;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@EnableFlags(Flags.FLAG_MODES_UI)
-public class ZenModesBackendTest {
-
- private static final String ZEN_RULE_ID = "rule";
- private static final AutomaticZenRule ZEN_RULE =
- new AutomaticZenRule.Builder("Driving", Uri.parse("drive"))
- .setType(AutomaticZenRule.TYPE_DRIVING)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build();
-
- private static final AutomaticZenRule MANUAL_DND_RULE =
- new AutomaticZenRule.Builder("Do Not Disturb", Uri.EMPTY)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build();
-
- @Mock
- private NotificationManager mNm;
-
- private Context mContext;
- private ZenModesBackend mBackend;
-
- @Rule
- public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(
- SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT);
-
- // Helper methods to add active/inactive rule state to a config. Returns a copy.
- private ZenModeConfig configWithManualRule(ZenModeConfig base, boolean active) {
- ZenModeConfig out = base.copy();
-
- if (active) {
- out.manualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
- out.manualRule.condition =
- new Condition(out.manualRule.conditionId, "", STATE_TRUE, SOURCE_UNKNOWN);
- } else {
- out.manualRule.zenMode = ZEN_MODE_OFF;
- out.manualRule.condition =
- new Condition(out.manualRule.conditionId, "", STATE_FALSE, SOURCE_UNKNOWN);
- }
- return out;
- }
-
- private ZenModeConfig configWithRule(ZenModeConfig base, String ruleId, AutomaticZenRule rule,
- boolean active) {
- ZenModeConfig out = base.copy();
-
- // Note that there are many other fields of zenRule, but here we only set the ones
- // relevant to determining whether or not it is active.
- ZenModeConfig.ZenRule zenRule = new ZenModeConfig.ZenRule();
- zenRule.pkg = "package";
- zenRule.enabled = active;
- zenRule.snoozing = false;
- zenRule.condition = new Condition(rule.getConditionId(), "",
- active ? Condition.STATE_TRUE : Condition.STATE_FALSE,
- Condition.SOURCE_USER_ACTION);
- out.automaticRules.put(ruleId, zenRule);
-
- return out;
- }
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- ShadowApplication shadowApplication = ShadowApplication.getInstance();
- shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
-
- mContext = RuntimeEnvironment.application;
- mBackend = new ZenModesBackend(mContext);
-
- // Default catch-all case with no data. This isn't realistic, but tests below that rely
- // on the config to get data on rules active will create those individually.
- when(mNm.getZenModeConfig()).thenReturn(new ZenModeConfig());
- }
-
- @Test
- public void getModes_containsManualDndAndZenRules() {
- AutomaticZenRule rule2 = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())
- .build();
- Policy dndPolicy = new Policy(Policy.PRIORITY_CATEGORY_ALARMS,
- Policy.PRIORITY_SENDERS_CONTACTS, Policy.PRIORITY_SENDERS_CONTACTS);
- when(mNm.getAutomaticZenRules()).thenReturn(
- ImmutableMap.of("rule1", ZEN_RULE, "rule2", rule2));
- ZenModeConfig config = new ZenModeConfig();
- config.applyNotificationPolicy(dndPolicy);
- assertThat(config.manualRule.zenPolicy.getPriorityCategoryAlarms()).isEqualTo(STATE_ALLOW);
- when(mNm.getZenModeConfig()).thenReturn(config);
-
- List<ZenMode> modes = mBackend.getModes();
-
- // all modes exist, but none of them are currently active
- assertThat(modes).containsExactly(
- ZenMode.manualDndMode(
- new AutomaticZenRule.Builder(
- mContext.getString(R.string.zen_mode_settings_title), Uri.EMPTY)
- .setType(AutomaticZenRule.TYPE_OTHER)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
- .setManualInvocationAllowed(true)
- .build(),
- false),
- new ZenMode("rule2", rule2, false),
- new ZenMode("rule1", ZEN_RULE, false))
- .inOrder();
- }
-
- @Test
- public void getMode_manualDnd_returnsMode() {
- Policy dndPolicy = new Policy(Policy.PRIORITY_CATEGORY_ALARMS,
- Policy.PRIORITY_SENDERS_CONTACTS, Policy.PRIORITY_SENDERS_CONTACTS);
- ZenModeConfig config = new ZenModeConfig();
- config.applyNotificationPolicy(dndPolicy);
- when(mNm.getZenModeConfig()).thenReturn(config);
-
- ZenMode mode = mBackend.getMode(ZenMode.MANUAL_DND_MODE_ID);
-
- assertThat(mode).isEqualTo(
- ZenMode.manualDndMode(
- new AutomaticZenRule.Builder(
- mContext.getString(R.string.zen_mode_settings_title), Uri.EMPTY)
- .setType(AutomaticZenRule.TYPE_OTHER)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(ZenAdapters.notificationPolicyToZenPolicy(dndPolicy))
- .setManualInvocationAllowed(true)
- .build(), false));
- }
-
- @Test
- public void getMode_zenRule_returnsMode() {
- when(mNm.getAutomaticZenRule(eq(ZEN_RULE_ID))).thenReturn(ZEN_RULE);
-
- ZenMode mode = mBackend.getMode(ZEN_RULE_ID);
-
- assertThat(mode).isEqualTo(new ZenMode(ZEN_RULE_ID, ZEN_RULE, false));
- }
-
- @Test
- public void getMode_missingRule_returnsNull() {
- when(mNm.getAutomaticZenRule(any())).thenReturn(null);
-
- ZenMode mode = mBackend.getMode(ZEN_RULE_ID);
-
- assertThat(mode).isNull();
- verify(mNm).getAutomaticZenRule(eq(ZEN_RULE_ID));
- }
-
- @Test
- public void getMode_manualDnd_returnsCorrectActiveState() {
- // Set up a base config with an active rule to make sure we're looking at the correct info
- ZenModeConfig configWithActiveRule = configWithRule(new ZenModeConfig(), ZEN_RULE_ID,
- ZEN_RULE, true);
-
- // Equivalent to disallowAllSounds()
- Policy dndPolicy = new Policy(0, 0, 0);
- configWithActiveRule.applyNotificationPolicy(dndPolicy);
- when(mNm.getZenModeConfig()).thenReturn(configWithActiveRule);
-
- ZenMode mode = mBackend.getMode(ZenMode.MANUAL_DND_MODE_ID);
-
- // By default, manual rule is inactive
- assertThat(mode.isActive()).isFalse();
-
- // Now the returned config will represent the manual rule being active
- when(mNm.getZenModeConfig()).thenReturn(configWithManualRule(configWithActiveRule, true));
- ZenMode activeMode = mBackend.getMode(ZenMode.MANUAL_DND_MODE_ID);
- assertThat(activeMode.isActive()).isTrue();
- }
-
- @Test
- public void getMode_zenRule_returnsCorrectActiveState() {
- // Set up a base config that has an active manual rule and "rule2", to make sure we're
- // looking at the correct rule's info.
- ZenModeConfig configWithActiveRules = configWithRule(
- configWithManualRule(new ZenModeConfig(), true), // active manual rule
- "rule2", ZEN_RULE, true); // active rule 2
-
- when(mNm.getAutomaticZenRule(eq(ZEN_RULE_ID))).thenReturn(ZEN_RULE);
- when(mNm.getZenModeConfig()).thenReturn(
- configWithRule(configWithActiveRules, ZEN_RULE_ID, ZEN_RULE, false));
-
- // Round 1: the current config should indicate that the rule is not active
- ZenMode mode = mBackend.getMode(ZEN_RULE_ID);
- assertThat(mode.isActive()).isFalse();
-
- when(mNm.getZenModeConfig()).thenReturn(
- configWithRule(configWithActiveRules, ZEN_RULE_ID, ZEN_RULE, true));
- ZenMode activeMode = mBackend.getMode(ZEN_RULE_ID);
- assertThat(activeMode.isActive()).isTrue();
- }
-
- @Test
- public void updateMode_manualDnd_setsDeviceEffects() throws Exception {
- ZenMode manualDnd = ZenMode.manualDndMode(
- new AutomaticZenRule.Builder("DND", Uri.EMPTY)
- .setZenPolicy(new ZenPolicy())
- .setDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDimWallpaper(true)
- .build())
- .build(), false);
-
- mBackend.updateMode(manualDnd);
-
- verify(mNm).setManualZenRuleDeviceEffects(new ZenDeviceEffects.Builder()
- .setShouldDimWallpaper(true)
- .build());
- }
-
- @Test
- public void updateMode_manualDnd_setsNotificationPolicy() {
- ZenMode manualDnd = ZenMode.manualDndMode(
- new AutomaticZenRule.Builder("DND", Uri.EMPTY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(), false);
-
- mBackend.updateMode(manualDnd);
-
- verify(mNm).setNotificationPolicy(eq(new ZenModeConfig().toNotificationPolicy(
- new ZenPolicy.Builder().allowAllSounds().build())), eq(true));
- }
-
- @Test
- public void updateMode_zenRule_updatesRule() {
- ZenMode ruleMode = new ZenMode("rule", ZEN_RULE, false);
-
- mBackend.updateMode(ruleMode);
-
- verify(mNm).updateAutomaticZenRule(eq("rule"), eq(ZEN_RULE), eq(true));
- }
-
- @Test
- public void activateMode_manualDnd_setsZenModeImportant() {
- mBackend.activateMode(ZenMode.manualDndMode(MANUAL_DND_RULE, false), null);
-
- verify(mNm).setZenMode(eq(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS), eq(null),
- any(), eq(true));
- }
-
- @Test
- public void activateMode_manualDndWithDuration_setsZenModeImportantWithCondition() {
- mBackend.activateMode(ZenMode.manualDndMode(MANUAL_DND_RULE, false),
- Duration.ofMinutes(30));
-
- verify(mNm).setZenMode(eq(Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS),
- eq(ZenModeConfig.toTimeCondition(mContext, 30, 0, true).id),
- any(),
- eq(true));
- }
-
- @Test
- public void activateMode_zenRule_setsRuleStateActive() {
- mBackend.activateMode(new ZenMode(ZEN_RULE_ID, ZEN_RULE, false), null);
-
- verify(mNm).setAutomaticZenRuleState(eq(ZEN_RULE_ID),
- eq(new Condition(ZEN_RULE.getConditionId(), "", Condition.STATE_TRUE,
- Condition.SOURCE_USER_ACTION)));
- }
-
- @Test
- public void activateMode_zenRuleWithDuration_fails() {
- assertThrows(IllegalArgumentException.class,
- () -> mBackend.activateMode(new ZenMode(ZEN_RULE_ID, ZEN_RULE, false),
- Duration.ofMinutes(30)));
- }
-
- @Test
- public void deactivateMode_manualDnd_setsZenModeOff() {
- mBackend.deactivateMode(ZenMode.manualDndMode(MANUAL_DND_RULE, true));
-
- verify(mNm).setZenMode(eq(ZEN_MODE_OFF), eq(null), any(), eq(true));
- }
-
- @Test
- public void deactivateMode_zenRule_setsRuleStateInactive() {
- mBackend.deactivateMode(new ZenMode(ZEN_RULE_ID, ZEN_RULE, false));
-
- verify(mNm).setAutomaticZenRuleState(eq(ZEN_RULE_ID),
- eq(new Condition(ZEN_RULE.getConditionId(), "", Condition.STATE_FALSE,
- Condition.SOURCE_USER_ACTION)));
- }
-
- @Test
- public void removeMode_zenRule_deletesRule() {
- mBackend.removeMode(new ZenMode(ZEN_RULE_ID, ZEN_RULE, false));
-
- verify(mNm).removeAutomaticZenRule(ZEN_RULE_ID, true);
- }
-
- @Test
- public void removeMode_manualDnd_fails() {
- assertThrows(IllegalArgumentException.class,
- () -> mBackend.removeMode(ZenMode.manualDndMode(MANUAL_DND_RULE, false)));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
new file mode 100644
index 0000000..fe530c1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListAddModePreferenceControllerTest.java
@@ -0,0 +1,225 @@
+/*
+ * 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 android.app.NotificationManager.META_DATA_AUTOMATIC_RULE_TYPE;
+import static android.app.NotificationManager.META_DATA_RULE_INSTANCE_LIMIT;
+
+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.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+
+import com.android.settings.notification.modes.ZenModesListAddModePreferenceController.ModeType;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.MoreExecutors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+import java.util.function.Function;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModesListAddModePreferenceControllerTest {
+
+ private Context mContext;
+ private ZenModesListAddModePreferenceController mController;
+
+ @Mock private ZenModesListAddModePreferenceController.OnAddModeListener mListener;
+ @Mock private ZenServiceListing mZenServiceListing;
+ @Mock private ConfigurationActivityHelper mConfigurationActivityHelper;
+ @Mock private NotificationManager mNm;
+ @Mock private PackageManager mPm;
+
+ @Captor private ArgumentCaptor<List<ModeType>> mListenerCaptor;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.getApplication();
+ Function<ApplicationInfo, Drawable> appIconRetriever = appInfo -> new ColorDrawable();
+
+ mController = new ZenModesListAddModePreferenceController(mContext, mListener,
+ mZenServiceListing, mConfigurationActivityHelper, mNm, mPm, appIconRetriever,
+ MoreExecutors.newDirectExecutorService(), MoreExecutors.directExecutor());
+
+ when(mConfigurationActivityHelper.getConfigurationActivityFromApprovedComponent(any()))
+ .thenAnswer((Answer<ComponentName>) invocationOnMock -> {
+ // By default, assume the ComponentInfo is also the configurationActivity.
+ ComponentInfo ci = invocationOnMock.getArgument(0);
+ return ci != null ? ci.getComponentName() : null;
+ });
+ }
+
+ @Test
+ public void onClickAddMode_noAppProviders_onlyOptionIsCustom() {
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(ImmutableSet.of());
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(1);
+ assertThat(options.get(0).name()).isEqualTo("Custom");
+ assertThat(options.get(0).summary()).isNull();
+ assertThat(options.get(0).icon()).isNotNull();
+ assertThat(options.get(0).creationActivityIntent()).isNull();
+ }
+
+ @Test
+ public void onClickAddMode_someAppProviders_includedInOptions() {
+ ImmutableSet<ComponentInfo> approvedComponents = ImmutableSet.of(
+ newComponentInfoWithValidMetadata("pkg1"),
+ newComponentInfoWithValidMetadata("pkg2"));
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(approvedComponents);
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(3);
+
+ assertThat(options.get(1).name()).isEqualTo("Rule by pkg1");
+ assertThat(options.get(1).summary()).isEqualTo("A package called pkg1");
+ assertThat(options.get(1).icon()).isNotNull();
+ assertThat(options.get(1).creationActivityIntent()).isNotNull();
+ assertThat(options.get(1).creationActivityIntent().getComponent()).isEqualTo(
+ new ComponentName("pkg1", "pkg1.activity"));
+
+ assertThat(options.get(0).name()).isEqualTo("Custom");
+ assertThat(options.get(2).name()).isEqualTo("Rule by pkg2");
+ }
+
+ @Test
+ public void onClickAddMode_someAppProviders_optionsAreSorted() {
+ ImmutableSet<ComponentInfo> approvedComponents = ImmutableSet.of(
+ newComponentInfoWithValidMetadata("pkg_Z"),
+ newComponentInfoWithValidMetadata("pkg_A"),
+ newComponentInfoWithValidMetadata("pkg_F"),
+ newComponentInfoWithValidMetadata("pkg_C"));
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(approvedComponents);
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(5);
+ assertThat(options.stream().map(o -> o.name()).toList())
+ .containsExactly("Custom", "Rule by pkg_A", "Rule by pkg_C", "Rule by pkg_F",
+ "Rule by pkg_Z")
+ .inOrder();
+ }
+
+ @Test
+ public void onClickAddMode_appProviderWithMissingMetadata_notAnOption() {
+ ComponentInfo componentWithoutRuleType = newComponentInfoWithValidMetadata("pkg1");
+ componentWithoutRuleType.metaData.remove(META_DATA_AUTOMATIC_RULE_TYPE);
+ ImmutableSet<ComponentInfo> approvedComponents = ImmutableSet.of(
+ componentWithoutRuleType, newComponentInfoWithValidMetadata("pkg2"));
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(approvedComponents);
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(2);
+ assertThat(options.get(0).name()).isEqualTo("Custom");
+ assertThat(options.get(1).name()).isEqualTo("Rule by pkg2");
+ }
+
+ @Test
+ public void onClickAddMode_appProviderWithRuleLimitExceeded_notAnOption() {
+ ComponentInfo componentWithLimitThreeRules = newComponentInfoWithValidMetadata("pkg1");
+ componentWithLimitThreeRules.metaData.putInt(META_DATA_RULE_INSTANCE_LIMIT, 3);
+ ImmutableSet<ComponentInfo> approvedComponents = ImmutableSet.of(
+ componentWithLimitThreeRules, newComponentInfoWithValidMetadata("pkg2"));
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(approvedComponents);
+ when(mNm.getRuleInstanceCount(any())).thenReturn(3); // Already 3 created rules.
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(2);
+ assertThat(options.get(0).name()).isEqualTo("Custom");
+ assertThat(options.get(1).name()).isEqualTo("Rule by pkg2");
+ verify(mNm).getRuleInstanceCount(eq(componentWithLimitThreeRules.getComponentName()));
+ }
+
+ @Test
+ public void onClickAddMode_appProviderWithoutConfigurationActivity_notAnOption() {
+ ComponentInfo componentWithoutConfigActivity = newComponentInfoWithValidMetadata("pkg2");
+ ImmutableSet<ComponentInfo> approvedComponents = ImmutableSet.of(
+ newComponentInfoWithValidMetadata("pkg1"), componentWithoutConfigActivity);
+ when(mZenServiceListing.loadApprovedComponents()).thenReturn(approvedComponents);
+ when(mConfigurationActivityHelper.getConfigurationActivityFromApprovedComponent(any()))
+ .thenAnswer((Answer<ComponentName>) invocationOnMock -> {
+ ComponentInfo ci = invocationOnMock.getArgument(0);
+ if (ci == componentWithoutConfigActivity) {
+ return null;
+ } else {
+ return ci.getComponentName();
+ }
+ });
+
+ mController.onClickAddMode();
+
+ verify(mListener).onAvailableModeTypesForAdd(mListenerCaptor.capture());
+ List<ModeType> options = mListenerCaptor.getValue();
+ assertThat(options).hasSize(2);
+ assertThat(options.get(0).name()).isEqualTo("Custom");
+ assertThat(options.get(1).name()).isEqualTo("Rule by pkg1");
+ }
+
+ private ComponentInfo newComponentInfoWithValidMetadata(String pkg) {
+ ComponentInfo ci = new ActivityInfo();
+
+ ci.applicationInfo = mock(ApplicationInfo.class);
+ when(ci.applicationInfo.loadLabel(any())).thenReturn("A package called " + pkg);
+ when(ci.applicationInfo.loadUnbadgedIcon(any())).thenReturn(new ColorDrawable());
+ ci.packageName = pkg;
+ ci.name = pkg + ".activity";
+ ci.metaData = new Bundle();
+ ci.metaData.putString(META_DATA_AUTOMATIC_RULE_TYPE, "Rule by " + pkg);
+
+ return ci;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListFragmentTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListFragmentTest.java
new file mode 100644
index 0000000..e105641
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListFragmentTest.java
@@ -0,0 +1,163 @@
+/*
+ * 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 android.provider.Settings.EXTRA_AUTOMATIC_ZEN_RULE_ID;
+
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
+import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
+import static com.android.settings.notification.modes.ZenModesListFragment.REQUEST_NEW_MODE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.testing.EmptyFragmentActivity;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+
+import com.android.settings.notification.modes.ZenModesListAddModePreferenceController.ModeType;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
+
+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.shadows.ShadowActivity.IntentForResult;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModesListFragmentTest {
+
+ private static final ModeType APP_PROVIDED_MODE_TYPE = new ModeType("Mode", new ColorDrawable(),
+ "Details", new Intent().setComponent(new ComponentName("pkg", "configActivity")));
+
+ private static final ModeType CUSTOM_MANUAL_TYPE = new ModeType("Custom", new ColorDrawable(),
+ null, null); // null creationActivityIntent means custom_manual.
+
+ private static final ImmutableList<ZenMode> EXISTING_MODES = ImmutableList.of(
+ new TestModeBuilder().setId("A").build(),
+ new TestModeBuilder().setId("B").build(),
+ new TestModeBuilder().setId("C").build());
+
+ @Rule
+ public ActivityScenarioRule<EmptyFragmentActivity> mActivityScenario =
+ new ActivityScenarioRule<>(EmptyFragmentActivity.class);
+
+ private FragmentActivity mActivity;
+ private ZenModesListFragment mFragment;
+ @Mock private ZenModesBackend mBackend;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mFragment = new ZenModesListFragment();
+ mActivityScenario.getScenario().onActivity(activity -> {
+ activity.getSupportFragmentManager().beginTransaction()
+ .add(mFragment, "tag").commitNow();
+ mActivity = activity;
+ });
+
+ mFragment.setBackend(mBackend); // after onAttach()
+ }
+
+ @Test
+ public void onChosenModeTypeForAdd_appProvidedMode_startsCreationActivity() {
+ when(mBackend.getModes()).thenReturn(EXISTING_MODES);
+
+ mFragment.onChosenModeTypeForAdd(APP_PROVIDED_MODE_TYPE);
+
+ IntentForResult intent = shadowOf(mActivity).getNextStartedActivityForResult();
+ assertThat(intent).isNotNull();
+ assertThat(intent.intent).isEqualTo(APP_PROVIDED_MODE_TYPE.creationActivityIntent());
+ }
+
+ @Test
+ public void onChosenModeTypeForAdd_customManualMode_startsNameAndIconPicker() {
+ mFragment.onChosenModeTypeForAdd(CUSTOM_MANUAL_TYPE);
+
+ Intent nextIntent = shadowOf(mActivity).getNextStartedActivity();
+ assertThat(nextIntent).isNotNull();
+ assertThat(nextIntent.getStringExtra(EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ZenModeNewCustomFragment.class.getName());
+ }
+
+ @Test
+ public void onActivityResult_modeWasCreated_opensIt() {
+ when(mBackend.getModes()).thenReturn(EXISTING_MODES);
+ mFragment.onChosenModeTypeForAdd(APP_PROVIDED_MODE_TYPE);
+
+ // App creates the new mode.
+ ZenMode createdMode = new TestModeBuilder().setId("new_id").setPackage("pkg").build();
+ when(mBackend.getModes()).thenReturn(new ImmutableList.Builder<ZenMode>()
+ .addAll(EXISTING_MODES)
+ .add(createdMode)
+ .build());
+ mFragment.onActivityResult(REQUEST_NEW_MODE, 0, new Intent());
+
+ Intent openModePageIntent = shadowOf(mActivity).getNextStartedActivity();
+ assertThat(openModePageIntent.getStringExtra(EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(ZenModeFragment.class.getName());
+ Bundle fragmentArgs = openModePageIntent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ assertThat(fragmentArgs).isNotNull();
+ assertThat(fragmentArgs.getString(EXTRA_AUTOMATIC_ZEN_RULE_ID)).isEqualTo("new_id");
+ }
+
+ @Test
+ public void onActivityResult_secondTime_doesNothing() {
+ when(mBackend.getModes()).thenReturn(EXISTING_MODES);
+ mFragment.onChosenModeTypeForAdd(APP_PROVIDED_MODE_TYPE);
+ // App creates a new mode, we redirect to its page when coming back.
+ ZenMode createdMode = new TestModeBuilder().setId("new_id").setPackage("pkg").build();
+ when(mBackend.getModes()).thenReturn(new ImmutableList.Builder<ZenMode>()
+ .addAll(EXISTING_MODES)
+ .add(createdMode)
+ .build());
+ mFragment.onActivityResult(REQUEST_NEW_MODE, 0, new Intent());
+ shadowOf(mActivity).clearNextStartedActivities();
+
+ mFragment.onActivityResult(REQUEST_NEW_MODE, 0, new Intent());
+
+ Intent nextIntent = shadowOf(mActivity).getNextStartedActivity();
+ assertThat(nextIntent).isNull();
+ }
+
+ @Test
+ public void onActivityResult_modeWasNotCreated_doesNothing() {
+ when(mBackend.getModes()).thenReturn(EXISTING_MODES);
+ mFragment.onChosenModeTypeForAdd(APP_PROVIDED_MODE_TYPE);
+ shadowOf(mActivity).clearNextStartedActivities();
+
+ // Returning to settings without creating a new mode.
+ mFragment.onActivityResult(REQUEST_NEW_MODE, 0, new Intent());
+
+ Intent nextIntent = shadowOf(mActivity).getNextStartedActivity();
+ assertThat(nextIntent).isNull();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
new file mode 100644
index 0000000..dafcee7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListItemPreferenceTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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 android.content.Context;
+import android.service.notification.ZenModeConfig;
+
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowLooper;
+
+@RunWith(RobolectricTestRunner.class)
+public class ZenModesListItemPreferenceTest {
+
+ private Context mContext;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ public void constructor_setsMode() {
+ ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext,
+ TestModeBuilder.EXAMPLE);
+
+ assertThat(preference.getKey()).isEqualTo(TestModeBuilder.EXAMPLE.getId());
+ assertThat(preference.getZenMode()).isEqualTo(TestModeBuilder.EXAMPLE);
+ }
+
+ @Test
+ public void setZenMode_modeEnabled() {
+ ZenMode mode = new TestModeBuilder()
+ .setName("Enabled mode")
+ .setTriggerDescription("When the thrush knocks")
+ .setEnabled(true)
+ .build();
+
+ ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);
+ ShadowLooper.idleMainLooper(); // To load icon.
+
+ assertThat(preference.getTitle()).isEqualTo("Enabled mode");
+ assertThat(preference.getSummary()).isEqualTo("When the thrush knocks");
+ assertThat(preference.getIcon()).isNotNull();
+ }
+
+ @Test
+ public void setZenMode_modeActive() {
+ ZenMode mode = new TestModeBuilder()
+ .setName("Active mode")
+ .setTriggerDescription("When Birnam forest comes to Dunsinane")
+ .setEnabled(true)
+ .setActive(true)
+ .build();
+
+ ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(preference.getTitle()).isEqualTo("Active mode");
+ assertThat(preference.getSummary()).isEqualTo("ON • When Birnam forest comes to Dunsinane");
+ assertThat(preference.getIcon()).isNotNull();
+ }
+
+ @Test
+ public void setZenMode_modeDisabledByApp() {
+ ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule();
+ configRule.enabled = false;
+ configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_APP;
+ ZenMode mode = new TestModeBuilder()
+ .setName("Mode disabled by app")
+ .setTriggerDescription("When the cat's away")
+ .setEnabled(false)
+ .setConfigZenRule(configRule)
+ .build();
+
+ ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(preference.getTitle()).isEqualTo("Mode disabled by app");
+ assertThat(preference.getSummary()).isEqualTo("Not set");
+ assertThat(preference.getIcon()).isNotNull();
+ }
+
+ @Test
+ public void setZenMode_modeDisabledByUser() {
+ ZenModeConfig.ZenRule configRule = new ZenModeConfig.ZenRule();
+ configRule.enabled = false;
+ configRule.disabledOrigin = ZenModeConfig.UPDATE_ORIGIN_USER;
+ ZenMode mode = new TestModeBuilder()
+ .setName("Mode disabled by user")
+ .setTriggerDescription("When the Levee Breaks")
+ .setEnabled(false)
+ .setConfigZenRule(configRule)
+ .build();
+
+ ZenModesListItemPreference preference = new ZenModesListItemPreference(mContext, mode);
+ ShadowLooper.idleMainLooper();
+
+ assertThat(preference.getTitle()).isEqualTo("Mode disabled by user");
+ assertThat(preference.getSummary()).isEqualTo("Disabled");
+ assertThat(preference.getIcon()).isNotNull();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListPreferenceControllerTest.java
index 9a4de60..4c16f26 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesListPreferenceControllerTest.java
@@ -37,6 +37,9 @@
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+import com.android.settingslib.notification.modes.ZenModesBackend;
import com.android.settingslib.search.SearchIndexableRaw;
import com.google.common.collect.ImmutableList;
@@ -58,14 +61,15 @@
public class ZenModesListPreferenceControllerTest {
private static final String TEST_MODE_ID = "test_mode";
private static final String TEST_MODE_NAME = "Test Mode";
- private static final ZenMode TEST_MODE = new ZenMode(
- TEST_MODE_ID,
- new AutomaticZenRule.Builder(TEST_MODE_NAME, Uri.parse("test_uri"))
+
+ private static final ZenMode TEST_MODE = new TestModeBuilder()
+ .setId(TEST_MODE_ID)
+ .setAzr(new AutomaticZenRule.Builder(TEST_MODE_NAME, Uri.parse("test_uri"))
.setType(AutomaticZenRule.TYPE_BEDTIME)
.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
.setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(),
- false);
+ .build())
+ .build();
private static final ZenMode TEST_MANUAL_MODE = ZenMode.manualDndMode(
new AutomaticZenRule.Builder("Do Not Disturb", Uri.EMPTY)
@@ -96,7 +100,7 @@
PreferenceScreen preferenceScreen = preferenceManager.createPreferenceScreen(mContext);
preferenceScreen.addPreference(mPreference);
- mPrefController = new ZenModesListPreferenceController(mContext, null, mBackend);
+ mPrefController = new ZenModesListPreferenceController(mContext, mBackend);
}
@Test
@@ -110,14 +114,9 @@
assertThat(mPreference.getPreferenceCount()).isEqualTo(5);
List<ZenModesListItemPreference> itemPreferences = getModeListItems(mPreference);
- assertThat(itemPreferences.stream().map(pref -> pref.mZenMode).toList())
+ assertThat(itemPreferences.stream().map(ZenModesListItemPreference::getZenMode).toList())
.containsExactlyElementsIn(modes)
.inOrder();
-
- for (int i = 0; i < modes.size(); i++) {
- assertThat(((ZenModesListItemPreference) (mPreference.getPreference(i))).mZenMode)
- .isEqualTo(modes.get(i));
- }
}
@Test
@@ -138,7 +137,7 @@
mPrefController.updateState(mPreference);
List<ZenModesListItemPreference> newPreferences = getModeListItems(mPreference);
- assertThat(newPreferences.stream().map(pref -> pref.mZenMode).toList())
+ assertThat(newPreferences.stream().map(ZenModesListItemPreference::getZenMode).toList())
.containsExactlyElementsIn(updatedModes)
.inOrder();
@@ -194,7 +193,7 @@
assertThat(newData).hasSize(1);
SearchIndexableRaw newItem = newData.get(0);
- assertThat(newItem.key).isEqualTo(ZenMode.MANUAL_DND_MODE_ID);
+ assertThat(newItem.key).isEqualTo(TEST_MANUAL_MODE.getId());
assertThat(newItem.title).isEqualTo("Do Not Disturb"); // set above
}
@@ -209,7 +208,7 @@
// Should keep the order presented by getModes()
SearchIndexableRaw item0 = data.get(0);
- assertThat(item0.key).isEqualTo(ZenMode.MANUAL_DND_MODE_ID);
+ assertThat(item0.key).isEqualTo(TEST_MANUAL_MODE.getId());
assertThat(item0.title).isEqualTo("Do Not Disturb"); // set above
SearchIndexableRaw item1 = data.get(1);
@@ -218,13 +217,7 @@
}
private static ZenMode newMode(String id) {
- return new ZenMode(
- id,
- new AutomaticZenRule.Builder("Mode " + id, Uri.parse("test_uri"))
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowAllSounds().build())
- .build(),
- false);
+ return new TestModeBuilder().setId(id).setName("Mode " + id).build();
}
/**
diff --git a/tests/robotests/src/com/android/settings/notification/modes/ZenModesSummaryHelperTest.java b/tests/robotests/src/com/android/settings/notification/modes/ZenModesSummaryHelperTest.java
index ef8290a..a7257f5 100644
--- a/tests/robotests/src/com/android/settings/notification/modes/ZenModesSummaryHelperTest.java
+++ b/tests/robotests/src/com/android/settings/notification/modes/ZenModesSummaryHelperTest.java
@@ -16,7 +16,10 @@
package com.android.settings.notification.modes;
-import static android.app.NotificationManager.INTERRUPTION_FILTER_PRIORITY;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_OFF;
+import static android.service.notification.Condition.SOURCE_UNKNOWN;
+import static android.service.notification.Condition.STATE_TRUE;
import static android.service.notification.ZenPolicy.CONVERSATION_SENDERS_ANYONE;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_ANYONE;
import static android.service.notification.ZenPolicy.PEOPLE_TYPE_CONTACTS;
@@ -25,83 +28,106 @@
import static com.google.common.truth.Truth.assertThat;
-import android.app.AutomaticZenRule;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Flags;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
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.service.notification.Condition;
import android.service.notification.ZenDeviceEffects;
+import android.service.notification.ZenModeConfig;
import android.service.notification.ZenPolicy;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.notification.modes.TestModeBuilder;
+import com.android.settingslib.notification.modes.ZenMode;
+
+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.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.Random;
@RunWith(RobolectricTestRunner.class)
public class ZenModesSummaryHelperTest {
+ private static final int WORK_PROFILE_ID = 3;
+
private Context mContext;
- private ZenModesBackend mBackend;
+ private ZenHelperBackend mBackend;
private ZenModeSummaryHelper mSummaryHelper;
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(
+ SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT);
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mBackend = new ZenModesBackend(mContext);
+ mBackend = new ZenHelperBackend(mContext);
mSummaryHelper = new ZenModeSummaryHelper(mContext, mBackend);
+
+ UserInfo workProfile = new UserInfo(WORK_PROFILE_ID, "Work Profile", 0);
+ workProfile.userType = UserManager.USER_TYPE_PROFILE_MANAGED;
+ UserManager userManager = mContext.getSystemService(UserManager.class);
+ shadowOf(userManager).addProfile(mContext.getUserId(), WORK_PROFILE_ID, workProfile);
}
@Test
public void getPeopleSummary_noOne() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().disallowAllSounds().build())
- .build();
- ZenMode zenMode = new ZenMode("id", rule, true);
+ ZenPolicy policy = new ZenPolicy.Builder().disallowAllSounds().build();
- assertThat(mSummaryHelper.getPeopleSummary(zenMode)).isEqualTo("No one can interrupt");
+ assertThat(mSummaryHelper.getPeopleSummary(policy)).isEqualTo("No one can interrupt");
}
@Test
public void getPeopleSummary_some() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowCalls(PEOPLE_TYPE_CONTACTS).build())
- .build();
- ZenMode zenMode = new ZenMode("id", rule, true);
+ ZenPolicy policy = new ZenPolicy.Builder().allowCalls(PEOPLE_TYPE_CONTACTS).build();
- assertThat(mSummaryHelper.getPeopleSummary(zenMode)).isEqualTo("Some people can interrupt");
+ assertThat(mSummaryHelper.getPeopleSummary(policy)).isEqualTo("Some people can interrupt");
+ }
+
+ @Test
+ public void getPeopleSummary_onlyRepeatCallers() {
+ ZenPolicy policy = new ZenPolicy.Builder()
+ .disallowAllSounds()
+ .allowRepeatCallers(true)
+ .build();
+
+ assertThat(mSummaryHelper.getPeopleSummary(policy)).isEqualTo(
+ "Repeat callers can interrupt");
}
@Test
public void getPeopleSummary_all() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder().allowCalls(PEOPLE_TYPE_ANYONE).
- allowConversations(CONVERSATION_SENDERS_ANYONE)
- .allowMessages(PEOPLE_TYPE_ANYONE).build())
+ ZenPolicy policy = new ZenPolicy.Builder()
+ .allowCalls(PEOPLE_TYPE_ANYONE)
+ .allowConversations(CONVERSATION_SENDERS_ANYONE)
+ .allowMessages(PEOPLE_TYPE_ANYONE)
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
- assertThat(mSummaryHelper.getPeopleSummary(zenMode)).isEqualTo("All people can interrupt");
+ assertThat(mSummaryHelper.getPeopleSummary(policy)).isEqualTo("All people can interrupt");
}
@Test
public void getOtherSoundCategoriesSummary_single() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
"Alarms can interrupt");
@@ -109,12 +135,9 @@
@Test
public void getOtherSoundCategoriesSummary_duo() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder().allowAlarms(true).allowMedia(true).build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
"Alarms and media can interrupt");
@@ -122,16 +145,13 @@
@Test
public void getOtherSoundCategoriesSummary_trio() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowAlarms(true)
.allowMedia(true)
.allowSystem(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
"Alarms, media, and touch sounds can interrupt");
@@ -139,9 +159,7 @@
@Test
public void getOtherSoundCategoriesSummary_quad() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowAlarms(true)
.allowMedia(true)
@@ -149,7 +167,6 @@
.allowReminders(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
"Alarms, media, and 2 more can interrupt");
@@ -157,9 +174,7 @@
@Test
public void getOtherSoundCategoriesSummary_all() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowAlarms(true)
.allowMedia(true)
@@ -168,7 +183,6 @@
.allowEvents(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getOtherSoundCategoriesSummary(zenMode)).isEqualTo(
"Alarms, media, and 3 more can interrupt");
@@ -176,61 +190,52 @@
@Test
public void getBlockedEffectsSummary_none() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.showAllVisualEffects()
.allowAlarms(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
+
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
.isEqualTo("Notifications shown");
}
@Test
public void getBlockedEffectsSummary_some() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowAlarms(true)
.showAllVisualEffects()
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
+
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
.isEqualTo("Notifications partially hidden");
}
@Test
public void getBlockedEffectsSummary_all() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowAlarms(true)
.hideAllVisualEffects()
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
+
assertThat(mSummaryHelper.getBlockedEffectsSummary(zenMode))
.isEqualTo("Notifications hidden");
}
@Test
public void getDisplayEffectsSummary_single_notifVis() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.showAllVisualEffects()
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Notifications partially hidden");
@@ -238,15 +243,12 @@
@Test
public void getDisplayEffectsSummary_single_notifVis_unusedEffect() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.showAllVisualEffects()
.showVisualEffect(VISUAL_EFFECT_LIGHTS, false)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Notifications shown");
@@ -254,15 +256,12 @@
@Test
public void getDisplayEffectsSummary_single_displayEffect() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder().showAllVisualEffects().build())
.setDeviceEffects(new ZenDeviceEffects.Builder()
.setShouldDimWallpaper(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Dim the wallpaper");
@@ -270,16 +269,13 @@
@Test
public void getDisplayEffectsSummary_duo() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder().showAllVisualEffects().build())
.setDeviceEffects(new ZenDeviceEffects.Builder()
.setShouldDimWallpaper(true)
.setShouldDisplayGrayscale(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Grayscale and dim the wallpaper");
@@ -287,9 +283,7 @@
@Test
public void getDisplayEffectsSummary_trio() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.hideAllVisualEffects()
.allowAlarms(true)
@@ -301,7 +295,6 @@
.setShouldDimWallpaper(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Notifications hidden, grayscale, and dim the wallpaper");
@@ -309,9 +302,7 @@
@Test
public void getDisplayEffectsSummary_quad() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.showAllVisualEffects()
.showVisualEffect(VISUAL_EFFECT_AMBIENT, false)
@@ -325,104 +316,193 @@
.setShouldUseNightMode(true)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getDisplayEffectsSummary(zenMode)).isEqualTo(
"Notifications partially hidden, grayscale, and 2 more");
}
@Test
- public void getAppsSummary_all() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
- .setZenPolicy(new ZenPolicy.Builder()
- .allowChannels(ZenMode.CHANNEL_POLICY_ALL)
- .build())
- .build();
- ZenMode zenMode = new ZenMode("id", rule, true);
-
- assertThat(mSummaryHelper.getAppsSummary(zenMode, new LinkedHashSet<>())).isEqualTo("All");
- }
-
- @Test
public void getAppsSummary_none() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowChannels(ZenPolicy.CHANNEL_POLICY_NONE)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
- assertThat(mSummaryHelper.getAppsSummary(zenMode, new LinkedHashSet<>())).isEqualTo("None");
+ assertThat(mSummaryHelper.getAppsSummary(zenMode, ImmutableList.of())).isEqualTo("None");
}
@Test
public void getAppsSummary_priorityAppsNoList() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
assertThat(mSummaryHelper.getAppsSummary(zenMode, null)).isEqualTo("Selected apps");
}
@Test
- public void getAppsSummary_formatAppsListEmpty() {
- Set<String> apps = new LinkedHashSet<>();
+ public void formatAppsList_listEmpty() {
+ ImmutableList<AppEntry> apps = ImmutableList.of();
assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("No apps can interrupt");
}
@Test
- public void getAppsSummary_formatAppsListSingle() {
- Set<String> apps = Set.of("My App");
+ public void formatAppsList_single() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App"));
assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App can interrupt");
}
@Test
- public void getAppsSummary_formatAppsListTwo() {
- Set<String> apps = Set.of("My App", "SecondApp");
+ public void formatAppsList_two() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App"),
+ newAppEntry("SecondApp"));
assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App and SecondApp "
+ "can interrupt");
}
@Test
- public void getAppsSummary_formatAppsListThree() {
- Set<String> apps = Set.of("My App", "SecondApp", "ThirdApp");
+ public void formatAppsList_three() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App"),
+ newAppEntry("SecondApp"), newAppEntry("ThirdApp"));
assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App, SecondApp, "
+ "and ThirdApp can interrupt");
}
@Test
- public void getAppsSummary_formatAppsListMany() {
- Set<String> apps = Set.of("My App", "SecondApp", "ThirdApp", "FourthApp",
- "FifthApp", "SixthApp");
- // Note that apps are selected alphabetically.
- assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("FifthApp, FourthApp, "
+ public void formatAppsList_many() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App"),
+ newAppEntry("SecondApp"), newAppEntry("ThirdApp"), newAppEntry("FourthApp"),
+ newAppEntry("FifthApp"), newAppEntry("SixthApp"));
+ assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App, SecondApp, "
+ "and 4 more can interrupt");
}
@Test
+ public void formatAppsList_singleWorkProfile() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App", WORK_PROFILE_ID));
+ assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App (Work) can interrupt");
+ }
+
+ @Test
+ public void formatAppsList_mixOfProfiles() {
+ ImmutableList<AppEntry> apps = ImmutableList.of(
+ newAppEntry("My App", mContext.getUserId()),
+ newAppEntry("My App", WORK_PROFILE_ID),
+ newAppEntry("SecondApp", mContext.getUserId()));
+ assertThat(mSummaryHelper.formatAppsList(apps)).isEqualTo("My App, My App (Work), "
+ + "and SecondApp can interrupt");
+ }
+
+ @Test
public void getAppsSummary_priorityApps() {
- AutomaticZenRule rule = new AutomaticZenRule.Builder("Bedtime", Uri.parse("bed"))
- .setType(AutomaticZenRule.TYPE_BEDTIME)
- .setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY)
+ ZenMode zenMode = new TestModeBuilder()
.setZenPolicy(new ZenPolicy.Builder()
.allowChannels(ZenPolicy.CHANNEL_POLICY_PRIORITY)
.build())
.build();
- ZenMode zenMode = new ZenMode("id", rule, true);
- Set<String> apps = Set.of("My App", "SecondApp", "ThirdApp", "FourthApp",
- "FifthApp", "SixthApp");
+ ImmutableList<AppEntry> apps = ImmutableList.of(newAppEntry("My App"),
+ newAppEntry("SecondApp"), newAppEntry("ThirdApp"), newAppEntry("FourthApp"),
+ newAppEntry("FifthApp"), newAppEntry("SixthApp"));
- assertThat(mSummaryHelper.getAppsSummary(zenMode, apps)).isEqualTo("FifthApp, FourthApp, "
+ assertThat(mSummaryHelper.getAppsSummary(zenMode, apps)).isEqualTo("My App, SecondApp, "
+ "and 4 more can interrupt");
}
+ private AppEntry newAppEntry(String name) {
+ return newAppEntry(name, mContext.getUserId());
+ }
+
+ private AppEntry newAppEntry(String name, int userId) {
+ ApplicationInfo applicationInfo = new ApplicationInfo();
+ applicationInfo.uid = UserHandle.getUid(userId, new Random().nextInt(100));
+ AppEntry appEntry = new AppEntry(mContext, applicationInfo, 1);
+ appEntry.label = name;
+ return appEntry;
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_off_noRules() {
+ ZenModeConfig config = new ZenModeConfig();
+
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config)).isEqualTo("Off");
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_off_oneRule() {
+ ZenModeConfig config = new ZenModeConfig();
+ ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
+ rule.enabled = true;
+ config.automaticRules.put("key", rule);
+
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config))
+ .isEqualTo("Off / 1 mode can turn on automatically");
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_off_twoRules() {
+ ZenModeConfig config = new ZenModeConfig();
+ ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
+ rule.enabled = true;
+ ZenModeConfig.ZenRule rule2 = new ZenModeConfig.ZenRule();
+ rule2.enabled = true;
+ config.automaticRules.put("key", rule);
+ config.automaticRules.put("key2", rule2);
+
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_OFF, config))
+ .isEqualTo("Off / 2 modes can turn on automatically");
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_on_noDescription() {
+ ZenModeConfig config = new ZenModeConfig();
+ config.manualRule.conditionId = Uri.EMPTY;
+ config.manualRule.pkg = "android";
+ config.manualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+ config.manualRule.condition = new Condition(Uri.EMPTY, "", STATE_TRUE, SOURCE_UNKNOWN);
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
+ .isEqualTo("On");
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_on_manualDescription() {
+ ZenModeConfig config = new ZenModeConfig();
+ config.manualRule.conditionId = ZenModeConfig.toCountdownConditionId(
+ System.currentTimeMillis() + 10000, false);
+ config.manualRule.pkg = "android";
+ config.manualRule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+ config.manualRule.condition = new Condition(Uri.EMPTY, "", STATE_TRUE, SOURCE_UNKNOWN);
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
+ .startsWith("On /");
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_MODES_UI)
+ public void getSoundSummary_on_automatic() {
+ ZenModeConfig config = new ZenModeConfig();
+ ZenModeConfig.ZenRule rule = new ZenModeConfig.ZenRule();
+ rule.configurationActivity = new ComponentName("a", "a");
+ rule.component = new ComponentName("b", "b");
+ rule.conditionId = new Uri.Builder().scheme("hello").build();
+ rule.condition = new Condition(rule.conditionId, "", STATE_TRUE);
+ rule.enabled = true;
+ rule.creationTime = 123;
+ rule.id = "id";
+ rule.zenMode = ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+ rule.modified = true;
+ rule.name = "name";
+ rule.snoozing = false;
+ rule.pkg = "b";
+ config.automaticRules.put("key", rule);
+
+ assertThat(mSummaryHelper.getSoundSummary(ZEN_MODE_IMPORTANT_INTERRUPTIONS, config))
+ .startsWith("On /");
+ }
}
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
index f611c9b..8d551e5 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
@@ -109,20 +109,4 @@
verify(mPreference, never()).setSummary(anyString());
}
-
- @Test
- @EnableFlags(Flags.FLAG_MODES_UI)
- public void updateState_modesUi_resetsTitleAndFragment() {
- mController.updateState(mPreference);
- verify(mPreference).setTitle(anyInt()); // Resource IDs are ints
- verify(mPreference).setFragment(ZenModesListFragment.class.getCanonicalName());
- }
-
- @Test
- @DisableFlags(Flags.FLAG_MODES_UI)
- public void updateState_noModesUi_doesNotSetTitleAndFragment() {
- mController.updateState(mPreference);
- verify(mPreference, never()).setTitle(anyInt());
- verify(mPreference, never()).setFragment(anyString());
- }
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index e7e0b92..204bfe5 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -50,9 +50,13 @@
import android.app.admin.PasswordPolicy;
import android.content.Context;
import android.content.Intent;
+import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.Flags;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings.Global;
import android.widget.TextView;
@@ -86,9 +90,13 @@
import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivity;
import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowBiometricManager;
@RunWith(RobolectricTestRunner.class)
@Config(
@@ -98,18 +106,23 @@
ShadowStorageManager.class,
ShadowUserManager.class,
ShadowUtils.class,
- ShadowInteractionJankMonitor.class
+ ShadowInteractionJankMonitor.class,
+ ShadowBiometricManager.class
})
@Ignore("b/179136903: Tests failed with collapsing toolbar, plan to figure out root cause later.")
public class ChooseLockGenericTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+ @Rule
+ public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private ActivityController<ChooseLockGeneric> mActivityController;
private FakeFeatureFactory mFakeFeatureFactory;
private ChooseLockGenericFragment mFragment;
private ChooseLockGeneric mActivity;
+ private ShadowBiometricManager mShadowBiometricManager;
+ private ShadowActivity mShadowActivity;
@Mock
private FingerprintManager mFingerprintManager;
@Mock
@@ -125,6 +138,7 @@
.postCreate(null)
.resume()
.get();
+ mShadowActivity = Shadows.shadowOf(mActivity);
Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
mFragment = new ChooseLockGenericFragment();
@@ -295,6 +309,21 @@
}
@Test
+ @EnableFlags(Flags.FLAG_MANDATORY_BIOMETRICS)
+ public void onActivityResult_requestcode100_shouldLaunchBiometricPrompt() {
+ initActivity(null);
+ mShadowBiometricManager.setCanAuthenticate(true);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.CONFIRM_EXISTING_REQUEST,
+ Activity.RESULT_OK, null /* data */);
+
+ assertThat(mActivity.isFinishing()).isFalse();
+ assertThat(mShadowActivity.getNextStartedActivity().getComponent().getClassName())
+ .isEqualTo(ConfirmDeviceCredentialActivity.class.getName());
+ }
+
+ @Test
public void onActivityResult_requestcode102_shouldFinish() {
initActivity(null);
@@ -337,6 +366,17 @@
}
@Test
+ public void onActivityResult_requestcode105_shouldNotFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.BIOMETRIC_AUTH_REQUEST, Activity.RESULT_OK,
+ null /* data */);
+
+ assertThat(mActivity.isFinishing()).isFalse();
+ }
+
+ @Test
public void securedScreenLock_notChangingConfig_notWaitForConfirmation_onStopFinishSelf() {
Intent intent = new Intent().putExtra(
LockPatternUtils.PASSWORD_TYPE_KEY, DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
@@ -676,6 +716,13 @@
mActivity = Robolectric.buildActivity(ChooseLockGeneric.InternalActivity.class, intent)
.create().start().postCreate(null).resume().get();
mActivity.getSupportFragmentManager().beginTransaction().add(mFragment, null).commitNow();
+ mShadowBiometricManager = Shadow.extract(mFragment.getContext().getSystemService(
+ BiometricManager.class));
+ //TODO(b/352603684): Should be Authenticators.MANDATORY_BIOMETRICS,
+ // but it is not supported by ShadowBiometricManager
+ mShadowBiometricManager.setAuthenticatorType(
+ BiometricManager.Authenticators.BIOMETRIC_STRONG);
+ mShadowBiometricManager.setCanAuthenticate(false);
}
private static String capitalize(final String input) {
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index dea936d..1e81ec0 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -36,19 +36,25 @@
import static com.google.common.truth.Truth.assertWithMessage;
import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+import android.annotation.ColorInt;
import android.app.admin.DevicePolicyManager;
import android.app.admin.DevicePolicyManager.PasswordComplexity;
import android.app.admin.PasswordMetrics;
import android.app.admin.PasswordPolicy;
import android.content.Intent;
+import android.os.Looper;
import android.os.UserHandle;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.widget.LockscreenCredential;
import com.android.settings.R;
+import com.android.settings.Utils;
import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -515,6 +521,52 @@
assertThat(pinAutoConfirmOption.isChecked()).isFalse();
}
+ @Test
+ public void defaultMessage_shouldBeInTextColorPrimary() {
+ final ChooseLockPassword passwordActivity = setupActivityWithPinTypeAndDefaultPolicy();
+
+ final ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity);
+ final ScrollToParentEditText passwordEntry = passwordActivity.findViewById(R.id.password_entry);
+ final RecyclerView view = (RecyclerView) fragment.getPasswordRequirementsView();
+ @ColorInt final int textColorPrimary = Utils.getColorAttrDefaultColor(passwordActivity,
+ android.R.attr.textColorPrimary);
+
+ passwordEntry.setText("");
+ fragment.updateUi();
+ shadowOf(Looper.getMainLooper()).idle();
+ TextView textView = (TextView)view.getLayoutManager().findViewByPosition(0);
+
+ assertThat(textView.getCurrentTextColor()).isEqualTo(textColorPrimary);
+ }
+
+ @Test
+ public void errorMessage_shouldBeColorError() {
+ final ChooseLockPassword passwordActivity = setupActivityWithPinTypeAndDefaultPolicy();
+
+ final ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity);
+ final ScrollToParentEditText passwordEntry = passwordActivity.findViewById(R.id.password_entry);
+ final RecyclerView view = (RecyclerView) fragment.getPasswordRequirementsView();
+ @ColorInt final int textColorPrimary = Utils.getColorAttrDefaultColor(passwordActivity,
+ android.R.attr.textColorPrimary);
+ @ColorInt final int colorError = Utils.getColorAttrDefaultColor(passwordActivity,
+ android.R.attr.colorError);
+
+ passwordEntry.setText("");
+ fragment.updateUi();
+ shadowOf(Looper.getMainLooper()).idle();
+ TextView textView = (TextView)view.getLayoutManager().findViewByPosition(0);
+
+ assertThat(textView.getCurrentTextColor()).isEqualTo(textColorPrimary);
+
+ // Password must be fewer than 17 digits, so this should give an error.
+ passwordEntry.setText("a".repeat(17));
+ fragment.updateUi();
+ shadowOf(Looper.getMainLooper()).idle();
+ textView = (TextView)view.getLayoutManager().findViewByPosition(0);
+
+ assertThat(textView.getCurrentTextColor()).isEqualTo(colorError);
+ }
+
private ChooseLockPassword setupActivityWithPinTypeAndDefaultPolicy() {
PasswordPolicy policy = new PasswordPolicy();
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
@@ -543,7 +595,7 @@
.setForFingerprint(addFingerprintExtra)
.build());
ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity);
- return Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
+ return shadowOf(((GlifLayout) fragment.getView()).getIcon());
}
private void assertPasswordValidationResult(PasswordMetrics minMetrics,
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 8a7419b..599649b 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -124,8 +124,8 @@
}
@Test(expected = IllegalArgumentException.class)
- public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
- mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);
+ public void verifyLaunchSearchResultPageCaller_emptyCaller_shouldCrash() {
+ mProvider.verifyLaunchSearchResultPageCaller(mActivity, "");
}
@Test(expected = SecurityException.class)
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index e408cd0..b555f00 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -29,6 +29,7 @@
import android.text.TextUtils;
import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.spa.search.SearchablePage;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.FakeIndexProvider;
import com.android.settingslib.search.SearchIndexableData;
@@ -117,8 +118,10 @@
public void testAllClassNamesHaveProviders() {
for (SearchIndexableData data :
mSearchProvider.getSearchIndexableResources().getProviderValues()) {
- if (DatabaseIndexingUtils.getSearchIndexProvider(data.getTargetClass()) == null) {
- fail(data.getTargetClass().getName() + "is not an index provider");
+ Class<?> targetClass = data.getTargetClass();
+ if (DatabaseIndexingUtils.getSearchIndexProvider(targetClass) == null
+ && !SearchablePage.class.isAssignableFrom(targetClass)) {
+ fail(targetClass.getName() + " is not an index provider");
}
}
}
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
index 8339798..766855c 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
@@ -21,14 +21,10 @@
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
+import android.content.IntentFilter;
+import android.content.pm.PackageInfo;
import android.service.trust.TrustAgentService;
-import android.text.TextUtils;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
@@ -38,34 +34,30 @@
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
-import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowApplicationPackageManager;
-import java.util.ArrayList;
-import java.util.List;
-
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {
ShadowLockPatternUtils.class,
ShadowRestrictedLockUtilsInternal.class,
- ShadowDevicePolicyManager.class,
- ShadowApplicationPackageManager.class,
- TrustAgentsPreferenceControllerTest.ShadowTrustAgentManager.class
+ ShadowDevicePolicyManager.class, ShadowApplicationPackageManager.class
})
public class TrustAgentsPreferenceControllerTest {
-
- private static final Intent TEST_INTENT =
- new Intent(TrustAgentService.SERVICE_INTERFACE);
+ private static final ComponentName TRUST_AGENT_A = new ComponentName(
+ "test.data.packageA", "clzAAA");
+ private static final ComponentName TRUST_AGENT_B = new ComponentName(
+ "test.data.packageB", "clzBBB");
+ private static final ComponentName TRUST_AGENT_C = new ComponentName(
+ "test.data.packageC", "clzCCC");
+ private static final ComponentName TRUST_AGENT_D = new ComponentName(
+ "test.data.packageD", "clzDDD");
private Context mContext;
private ShadowApplicationPackageManager mPackageManager;
@@ -84,11 +76,6 @@
mPreferenceScreen.setKey("pref_key");
}
- @After
- public void tearDown() {
- ShadowTrustAgentManager.clearPermissionGrantedList();
- }
-
@Test
public void getAvailabilityStatus_byDefault_shouldBeShown() {
assertThat(mController.getAvailabilityStatus())
@@ -97,8 +84,7 @@
@Test
public void onStart_noTrustAgent_shouldNotAddPreference() {
- final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
+ installFakeAvailableAgents(/* grantPermission= */ false);
mController.displayPreference(mPreferenceScreen);
mController.onStart();
@@ -106,57 +92,34 @@
assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(0);
}
- @Ignore("b/313612480")
@Test
- public void
- onStart_hasAUninstalledTrustAgent_shouldRemoveOnePreferenceAndLeaveTwoPreferences() {
- final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
- final ResolveInfo uninstalledTrustAgent = availableAgents.get(0);
-
- for (ResolveInfo rInfo : availableAgents) {
- ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
- }
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
+ public void onStart_uninstalledTrustAgent_shouldRemoveOnePreferenceAndLeaveTwoPreferences() {
+ installFakeAvailableAgents(/* grantPermission= */ true);
mController.displayPreference(mPreferenceScreen);
mController.onStart();
- availableAgents.remove(uninstalledTrustAgent);
+ uninstallAgent(TRUST_AGENT_A);
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
mController.onStart();
assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(2);
}
- @Ignore("b/313612480")
@Test
public void onStart_hasANewTrustAgent_shouldAddOnePreferenceAndHaveFourPreferences() {
- final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
- final ComponentName newComponentName = new ComponentName("test.data.packageD", "clzDDD");
- final ResolveInfo newTrustAgent = createFakeResolveInfo(newComponentName);
- for (ResolveInfo rInfo : availableAgents) {
- ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
- }
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
+ installFakeAvailableAgents(/* grantPermission= */ true);
mController.displayPreference(mPreferenceScreen);
mController.onStart();
- availableAgents.add(newTrustAgent);
- ShadowTrustAgentManager.grantPermissionToResolveInfo(newTrustAgent);
+ installFakeAvailableAgent(TRUST_AGENT_D, /* grantPermission= */ true);
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
mController.onStart();
assertThat(mPreferenceScreen.getPreferenceCount()).isEqualTo(4);
}
- @Ignore("b/313612480")
@Test
public void onStart_hasUnrestrictedTrustAgent_shouldAddThreeChangeablePreferences() {
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(0);
- final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
- for (ResolveInfo rInfo : availableAgents) {
- ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
- }
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
+ installFakeAvailableAgents(/* grantPermission= */ true);
mController.displayPreference(mPreferenceScreen);
mController.onStart();
@@ -169,14 +132,9 @@
}
}
- @Ignore("b/313612480")
@Test
- public void onStart_hasRestrictedTructAgent_shouldAddThreeUnchangeablePreferences() {
- final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
- for (ResolveInfo rInfo : availableAgents) {
- ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
- }
- mPackageManager.setResolveInfosForIntent(TEST_INTENT, availableAgents);
+ public void onStart_hasRestrictedTrustAgent_shouldAddThreeUnchangeablePreferences() {
+ installFakeAvailableAgents(/* grantPermission= */ true);
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS);
@@ -191,51 +149,30 @@
}
}
- private List<ResolveInfo> createFakeAvailableAgents() {
- final List<ComponentName> componentNames = new ArrayList<>();
- componentNames.add(new ComponentName("test.data.packageA", "clzAAA"));
- componentNames.add(new ComponentName("test.data.packageB", "clzBBB"));
- componentNames.add(new ComponentName("test.data.packageC", "clzCCC"));
- final List<ResolveInfo> result = new ArrayList<>();
- for (ComponentName cn : componentNames) {
- final ResolveInfo ri = createFakeResolveInfo(cn);
- result.add(ri);
- }
- return result;
+ private void installFakeAvailableAgents(boolean grantPermission) {
+ installFakeAvailableAgent(TRUST_AGENT_A, grantPermission);
+ installFakeAvailableAgent(TRUST_AGENT_B, grantPermission);
+ installFakeAvailableAgent(TRUST_AGENT_C, grantPermission);
}
- private ResolveInfo createFakeResolveInfo(ComponentName cn) {
- final ResolveInfo ri = new ResolveInfo();
- ri.serviceInfo = new ServiceInfo();
- ri.serviceInfo.packageName = cn.getPackageName();
- ri.serviceInfo.name = cn.getClassName();
- ri.serviceInfo.applicationInfo = new ApplicationInfo();
- ri.serviceInfo.applicationInfo.packageName = cn.getPackageName();
- ri.serviceInfo.applicationInfo.name = cn.getClassName();
- return ri;
+ private void installFakeAvailableAgent(ComponentName name,
+ boolean grantPermission) {
+ mPackageManager.addServiceIfNotPresent(name);
+ mPackageManager.addIntentFilterForService(name,
+ new IntentFilter(TrustAgentService.SERVICE_INTERFACE));
+ if (!grantPermission) {
+ return;
+ }
+ PackageInfo pkgInfo = mPackageManager.getInternalMutablePackageInfo(
+ name.getPackageName());
+ pkgInfo.requestedPermissions =
+ new String[]{android.Manifest.permission.PROVIDE_TRUST_AGENT};
+ pkgInfo.requestedPermissionsFlags =
+ new int[]{PackageInfo.REQUESTED_PERMISSION_GRANTED};
}
- @Implements(TrustAgentManager.class)
- public static class ShadowTrustAgentManager {
- private final static List<ResolveInfo> sPermissionGrantedList = new ArrayList<>();
-
- @Implementation
- protected boolean shouldProvideTrust(ResolveInfo resolveInfo, PackageManager pm) {
- for (ResolveInfo info : sPermissionGrantedList) {
- if (info.serviceInfo.equals(resolveInfo.serviceInfo)) {
- return true;
- }
- }
-
- return false;
- }
-
- private static void grantPermissionToResolveInfo(ResolveInfo rInfo) {
- sPermissionGrantedList.add(rInfo);
- }
-
- private static void clearPermissionGrantedList() {
- sPermissionGrantedList.clear();
- }
+ private void uninstallAgent(ComponentName name) {
+ mPackageManager.removeService(name);
+ mPackageManager.removePackage(name.getPackageName());
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
index 915231f..a151632 100644
--- a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -43,6 +43,8 @@
import com.android.settings.fuelgauge.batteryusage.WarningItemInfo;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventDao;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryEventDao;
+import com.android.settings.fuelgauge.batteryusage.db.BatteryEventEntity;
import com.android.settings.fuelgauge.batteryusage.db.BatteryState;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDao;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
@@ -184,6 +186,15 @@
}
}
+ /** Inserts a fake data into the database for testing. */
+ public static void insertDataToBatteryEventTable(
+ Context context, long timestamp, int batteryEventType, int batteryLevel) {
+ final BatteryEventEntity entity =
+ new BatteryEventEntity(timestamp, batteryEventType, batteryLevel);
+ BatteryEventDao dao = BatteryStateDatabase.getInstance(context).batteryEventDao();
+ dao.insert(entity);
+ }
+
/** Gets customized battery changed intent. */
public static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) {
Intent intent = new Intent();
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java
index c21f7cc..145c2e9 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowInputDevice.java
@@ -35,6 +35,8 @@
private int mDeviceId;
+ private int mSources;
+
@Implementation
protected static int[] getDeviceIds() {
return sDeviceIds;
@@ -70,4 +72,21 @@
public void setId(int id) {
mDeviceId = id;
}
+
+ public static InputDevice makeInputDevicebyIdWithSources(int id, int sources) {
+ final InputDevice inputDevice = Shadow.newInstanceOf(InputDevice.class);
+ final ShadowInputDevice shadowInputDevice = Shadow.extract(inputDevice);
+ shadowInputDevice.setId(id);
+ shadowInputDevice.setSources(sources);
+ return inputDevice;
+ }
+
+ @Implementation
+ public int getSources() {
+ return mSources;
+ }
+
+ public void setSources(int sources) {
+ mSources = sources;
+ }
}
diff --git a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
index 7bc66c8..fe88148 100644
--- a/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/TimeoutToDockUserPreferenceControllerTest.java
@@ -39,7 +39,6 @@
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;
@@ -126,7 +125,6 @@
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
}
- @Ignore("b/313530297")
@Test
public void getAvailabilityStatus_isCurrentlyMainUser_returnDisabledForUser() {
when(mUserManager.getMainUser()).thenReturn(UserHandle.CURRENT);
@@ -136,7 +134,6 @@
BasePreferenceController.DISABLED_FOR_USER);
}
- @Ignore("b/313530297")
@Test
public void getAvailabilityStatus_featureAndMultiUserEnabledAndNonMainUser_returnAvailable() {
when(mUserManager.isUserForeground()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 7f27324..e035274 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -22,7 +22,7 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -42,9 +42,13 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
+import android.multiuser.Flags;
import android.os.Bundle;
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.telephony.TelephonyManager;
import androidx.fragment.app.FragmentActivity;
@@ -63,7 +67,7 @@
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;
import org.mockito.Mock;
@@ -124,6 +128,8 @@
private Bundle mArguments;
private UserInfo mUserInfo;
+ @Rule
+ public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -222,8 +228,8 @@
}
@Test
- @Ignore("b/313530297")
public void onResume_canSwitch_shouldEnableSwitchPref() {
+ setupSelectedUser();
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_OK);
mFragment.mSwitchUserPref = mSwitchUserPref;
mFragment.onAttach(mContext);
@@ -234,8 +240,8 @@
}
@Test
- @Ignore("b/313530297")
public void onResume_userInCall_shouldDisableSwitchPref() {
+ setupSelectedUser();
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_USER_IN_CALL);
mFragment.mSwitchUserPref = mSwitchUserPref;
mFragment.onAttach(mContext);
@@ -246,8 +252,21 @@
}
@Test
- @Ignore("b/313530297")
+ @RequiresFlagsEnabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
+ public void onResume_UserSwitcherDisabled_shouldDisableSwitchPref() {
+ setupSelectedUser();
+ mUserCapabilities.mUserSwitcherEnabled = false;
+ mFragment.mSwitchUserPref = mSwitchUserPref;
+ mFragment.onAttach(mContext);
+
+ mFragment.onResume();
+
+ verify(mSwitchUserPref).setEnabled(false);
+ }
+
+ @Test
public void onResume_switchDisallowed_shouldDisableSwitchPref() {
+ setupSelectedUser();
mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_USER_SWITCH_DISALLOWED);
mFragment.mSwitchUserPref = mSwitchUserPref;
mFragment.onAttach(mContext);
@@ -258,8 +277,8 @@
}
@Test
- @Ignore("b/313530297")
public void onResume_systemUserLocked_shouldDisableSwitchPref() {
+ setupSelectedUser();
mUserManager.setSwitchabilityStatus(UserManager.SWITCHABILITY_STATUS_SYSTEM_USER_LOCKED);
mFragment.mSwitchUserPref = mSwitchUserPref;
mFragment.onAttach(mContext);
@@ -269,7 +288,6 @@
verify(mSwitchUserPref).setEnabled(false);
}
- @Ignore("b/313530297")
@Test
public void initialize_adminWithTelephony_shouldShowPhonePreference() {
setupSelectedUser();
@@ -315,7 +333,6 @@
verify(mFragment).removePreference(KEY_APP_AND_CONTENT_ACCESS);
}
- @Ignore("b/313530297")
@Test
public void initialize_adminSelectsSecondaryUser_shouldShowRemovePreference() {
setupSelectedUser();
@@ -328,7 +345,6 @@
verify(mFragment, never()).removePreference(KEY_REMOVE_USER);
}
- @Ignore("b/313530297")
@Test
public void initialize_adminSelectsNewRestrictedUser_shouldOpenAppContentScreen() {
setupSelectedRestrictedUser();
@@ -351,7 +367,6 @@
.isEqualTo(true);
}
- @Ignore("b/313530297")
@Test
public void initialize_adminSelectsRestrictedUser_shouldSetupPreferences() {
setupSelectedRestrictedUser();
@@ -381,7 +396,6 @@
verify(mActivity, never()).startActivity(any(Intent.class));
}
- @Ignore("b/313530297")
@Test
public void initialize_adminSelectsGuest_shouldShowRemovePreference() {
setupSelectedGuest();
@@ -425,7 +439,6 @@
verify(mFragment).removePreference(KEY_REMOVE_USER);
}
- @Ignore("b/313530297")
@Test
public void initialize_userHasCallRestriction_shouldSetPhoneSwitchUnChecked() {
setupSelectedUser();
@@ -438,7 +451,6 @@
verify(mPhonePref).setChecked(false);
}
- @Ignore("b/313530297")
@Test
public void initialize_noCallRestriction_shouldSetPhoneSwitchChecked() {
setupSelectedUser();
@@ -537,7 +549,6 @@
verify(mFragment, never()).switchUser();
}
- @Ignore("b/313530297")
@Test
public void onPreferenceClick_removeGuestClicked_canDelete_shouldShowDialog() {
setupSelectedGuest();
@@ -555,7 +566,6 @@
verify(mFragment).showDialog(DIALOG_CONFIRM_RESET_GUEST);
}
- @Ignore("b/313530297")
@Test
public void onPreferenceClick_removeRestrictedClicked_canDelete_shouldShowDialog() {
setupSelectedRestrictedUser();
@@ -574,7 +584,6 @@
verify(mFragment).showDialog(DIALOG_CONFIRM_REMOVE);
}
- @Ignore("b/313530297")
@Test
public void onPreferenceClick_removeClicked_canDelete_shouldShowDialog() {
setupSelectedUser();
@@ -666,7 +675,6 @@
assertThat(result).isFalse();
}
- @Ignore("b/313530297")
@Test
public void canDeleteUser_adminSelectsUser_noRestrictions_shouldReturnTrue() {
setupSelectedUser();
@@ -700,17 +708,16 @@
assertThat(result).isFalse();
}
- @Ignore("b/313530297")
@Test
public void initialize_userSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() {
+ assumeTrue(UserManager.isHeadlessSystemUserMode());
setupSelectedUser();
+ mUserManager.setIsAdminUser(true);
ShadowUserManager.setIsMultipleAdminEnabled(true);
mFragment.initialize(mActivity, mArguments);
- assertTrue(UserManager.isMultipleAdminEnabled());
verify(mFragment, never()).removePreference(KEY_GRANT_ADMIN);
}
- @Ignore("b/313530297")
@Test
public void initialize_userSelected_shouldNotShowGrantAdminPref() {
setupSelectedUser();
@@ -718,7 +725,6 @@
verify(mFragment).removePreference(KEY_GRANT_ADMIN);
}
- @Ignore("b/313530297")
@Test
public void initialize_restrictUserSelected_shouldNotShowGrantAdminPref_MultipleAdminEnabled() {
setupSelectedUser();
@@ -729,7 +735,6 @@
verify(mFragment).removePreference(KEY_GRANT_ADMIN);
}
- @Ignore("b/313530297")
@Test
public void initialize_mainUserSelected_shouldShowGrantAdminPref_MultipleAdminEnabled() {
setupSelectedMainUser();
@@ -738,7 +743,6 @@
verify(mFragment).removePreference(KEY_GRANT_ADMIN);
}
- @Ignore("b/313530297")
@Test
public void initialize_guestSelected_shouldNotShowGrantAdminPref_MultipleAdminEnabled() {
setupSelectedGuest();
@@ -778,7 +782,7 @@
mUserInfo = new UserInfo(1, "Tom", null,
UserInfo.FLAG_FULL | UserInfo.FLAG_INITIALIZED,
UserManager.USER_TYPE_FULL_SECONDARY);
-
+ mFragment.mUserInfo = mUserInfo;
mUserManager.addProfile(mUserInfo);
}
@@ -787,7 +791,7 @@
mUserInfo = new UserInfo(11, "Jerry", null,
UserInfo.FLAG_FULL | UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_MAIN,
UserManager.USER_TYPE_FULL_SECONDARY);
-
+ mFragment.mUserInfo = mUserInfo;
mUserManager.addProfile(mUserInfo);
}
@@ -796,7 +800,7 @@
mUserInfo = new UserInfo(12, "Andy", null,
UserInfo.FLAG_FULL | UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_ADMIN,
UserManager.USER_TYPE_FULL_SECONDARY);
-
+ mFragment.mUserInfo = mUserInfo;
mUserManager.addProfile(mUserInfo);
}
@@ -805,7 +809,7 @@
mUserInfo = new UserInfo(23, "Guest", null,
UserInfo.FLAG_FULL | UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_GUEST,
UserManager.USER_TYPE_FULL_GUEST);
-
+ mFragment.mUserInfo = mUserInfo;
mUserManager.addProfile(mUserInfo);
}
@@ -814,7 +818,7 @@
mUserInfo = new UserInfo(21, "Bob", null,
UserInfo.FLAG_FULL | UserInfo.FLAG_INITIALIZED | UserInfo.FLAG_RESTRICTED,
UserManager.USER_TYPE_FULL_RESTRICTED);
-
+ mFragment.mUserInfo = mUserInfo;
mUserManager.addProfile(mUserInfo);
}
}
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 5826ca2..85db0bd 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -34,6 +34,7 @@
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 static org.robolectric.Shadows.shadowOf;
import android.app.settings.SettingsEnums;
@@ -46,10 +47,15 @@
import android.content.pm.UserInfo;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
+import android.multiuser.Flags;
import android.os.Bundle;
import android.os.Looper;
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.provider.Settings;
import android.text.SpannableStringBuilder;
import android.view.Menu;
@@ -75,6 +81,7 @@
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;
import org.mockito.AdditionalMatchers;
@@ -142,6 +149,9 @@
private UserSettings mFragment;
private UserCapabilities mUserCapabilities;
+ @Rule
+ public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -359,6 +369,7 @@
}
@Test
+ @RequiresFlagsDisabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
public void updateUserList_cannotSwitchUser_shouldDisableAddUser() {
mUserCapabilities.mCanAddUser = true;
doReturn(true).when(mUserManager).canAddMoreUsers(anyString());
@@ -375,6 +386,20 @@
}
@Test
+ @RequiresFlagsEnabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
+ public void updateUserList_disallowAddUser_shouldDisableAddUserAndAddGuest() {
+ mUserCapabilities.mDisallowAddUserSetByAdmin = true;
+ doReturn(true).when(mUserManager).canAddMoreUsers(anyString());
+ doReturn(SWITCHABILITY_STATUS_OK)
+ .when(mUserManager).getUserSwitchability();
+
+ mFragment.updateUserList();
+
+ verify(mAddUserPreference).setVisible(true);
+ verify(mAddUserPreference).setDisabledByAdmin(any());
+ }
+
+ @Test
public void updateUserList_canNotAddMoreUsers_shouldDisableAddUserWithSummary() {
mUserCapabilities.mCanAddUser = true;
doReturn(false).when(mUserManager).canAddMoreUsers(anyString());
@@ -392,6 +417,7 @@
}
@Test
+ @RequiresFlagsDisabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
public void updateUserList_cannotSwitchUser_shouldDisableAddGuest() {
mUserCapabilities.mCanAddGuest = true;
doReturn(true)
@@ -406,6 +432,54 @@
}
@Test
+ @RequiresFlagsEnabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
+ public void updateUserList_cannotSwitchUser_shouldKeepPreferencesVisibleAndEnabled() {
+ givenUsers(getAdminUser(true));
+ mUserCapabilities.mCanAddGuest = true;
+ mUserCapabilities.mCanAddUser = true;
+ mUserCapabilities.mDisallowSwitchUser = true;
+ doReturn(true)
+ .when(mUserManager).canAddMoreUsers(eq(UserManager.USER_TYPE_FULL_GUEST));
+ doReturn(true)
+ .when(mUserManager).canAddMoreUsers(eq(UserManager.USER_TYPE_FULL_SECONDARY));
+
+ mFragment.updateUserList();
+
+ verify(mAddGuestPreference).setVisible(true);
+ verify(mAddGuestPreference).setEnabled(true);
+ verify(mAddUserPreference).setVisible(true);
+ verify(mAddUserPreference).setEnabled(true);
+ }
+
+ @Test
+ @RequiresFlagsEnabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
+ public void updateUserList_disallowAddUser_shouldShowButDisableAddActions() {
+ givenUsers(getAdminUser(true));
+ mUserCapabilities.mCanAddGuest = true;
+ mUserCapabilities.mCanAddUser = false;
+ mUserCapabilities.mDisallowAddUser = true;
+ mUserCapabilities.mDisallowAddUserSetByAdmin = false;
+ List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
+ enforcingUsers.add(new UserManager.EnforcingUser(UserHandle.myUserId(),
+ UserManager.RESTRICTION_SOURCE_SYSTEM));
+ when(mUserManager.getUserRestrictionSources(UserManager.DISALLOW_ADD_USER,
+ UserHandle.of(UserHandle.myUserId()))).thenReturn(enforcingUsers);
+
+ doReturn(true)
+ .when(mUserManager).canAddMoreUsers(eq(UserManager.USER_TYPE_FULL_GUEST));
+ doReturn(true)
+ .when(mUserManager).canAddMoreUsers(eq(UserManager.USER_TYPE_FULL_SECONDARY));
+
+ mFragment.updateUserList();
+
+ verify(mAddGuestPreference).setVisible(true);
+ verify(mAddGuestPreference).setEnabled(false);
+ verify(mAddUserPreference).setVisible(true);
+ verify(mAddUserPreference).setEnabled(false);
+ }
+
+ @Test
+ @RequiresFlagsDisabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
public void updateUserList_addUserDisallowedByAdmin_shouldNotShowAddUser() {
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = mock(
RestrictedLockUtils.EnforcedAdmin.class);
@@ -421,6 +495,22 @@
}
@Test
+ @RequiresFlagsEnabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
+ public void updateUserList_addUserDisallowedByAdmin_shouldShowPrefDisabledByAdmin() {
+ RestrictedLockUtils.EnforcedAdmin enforcedAdmin = mock(
+ RestrictedLockUtils.EnforcedAdmin.class);
+
+ mUserCapabilities.mEnforcedAdmin = enforcedAdmin;
+ mUserCapabilities.mCanAddUser = false;
+ mUserCapabilities.mDisallowAddUser = true;
+ mUserCapabilities.mDisallowAddUserSetByAdmin = true;
+ doReturn(true).when(mAddUserPreference).isEnabled();
+
+ mFragment.updateUserList();
+
+ verify(mAddUserPreference).setDisabledByAdmin(enforcedAdmin);
+ }
+ @Test
public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() {
mUserCapabilities.mCanAddUser = false;
@@ -461,18 +551,31 @@
}
@Test
- public void updateUserList_userSwitcherDisabled_shouldNotShowAddUser() {
+ public void updateUserList_userSwitcherDisabled_shouldShowAddUser() {
givenUsers(getAdminUser(true));
mUserCapabilities.mCanAddUser = true;
mUserCapabilities.mUserSwitcherEnabled = false;
mFragment.updateUserList();
- verify(mAddUserPreference).setVisible(false);
+ verify(mAddUserPreference).setVisible(true);
}
@Test
- public void updateUserList_userSwitcherDisabled_shouldNotShowAddGuest() {
+ public void updateUserList_userSwitcherDisabled_shouldShowAddGuest() {
+ givenUsers(getAdminUser(true));
+ mUserCapabilities.mCanAddGuest = true;
+ mUserCapabilities.mUserSwitcherEnabled = false;
+ doReturn(true)
+ .when(mUserManager).canAddMoreUsers(eq(UserManager.USER_TYPE_FULL_GUEST));
+
+ mFragment.updateUserList();
+
+ verify(mAddGuestPreference).setVisible(true);
+ }
+
+ @Test
+ public void updateUserList_userSwitcherDisabledCannotAddMoreGuests_shouldNotShowAddGuest() {
givenUsers(getAdminUser(true));
mUserCapabilities.mCanAddGuest = true;
mUserCapabilities.mUserSwitcherEnabled = false;
@@ -533,18 +636,18 @@
}
@Test
- public void updateUserList_existingSecondaryUser_shouldAddOnlyCurrUser_MultiUserIsDisabled() {
+ public void updateUserList_existingSecondaryUser_shouldAddAllUsers_MultiUserIsDisabled() {
givenUsers(getAdminUser(true), getSecondaryUser(false));
mUserCapabilities.mUserSwitcherEnabled = false;
mFragment.updateUserList();
ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
- verify(mFragment.mUserListCategory, times(1))
+ verify(mFragment.mUserListCategory, times(2))
.addPreference(captor.capture());
List<UserPreference> userPrefs = captor.getAllValues();
- assertThat(userPrefs.size()).isEqualTo(1);
+ assertThat(userPrefs.size()).isEqualTo(2);
assertThat(userPrefs.get(0)).isSameInstanceAs(mMePreference);
}
@@ -631,6 +734,7 @@
}
@Test
+ @RequiresFlagsDisabled({Flags.FLAG_NEW_MULTIUSER_SETTINGS_UX})
public void updateUserList_uninitializedUserAndCanNotSwitchUser_shouldDisablePref() {
UserInfo uninitializedUser = getSecondaryUser(false);
removeFlag(uninitializedUser, UserInfo.FLAG_INITIALIZED);
diff --git a/tests/robotests/src/com/android/settings/wifi/AddWifiNetworkPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/AddWifiNetworkPreferenceTest.java
index 5f88eb2..c0adaf3 100644
--- a/tests/robotests/src/com/android/settings/wifi/AddWifiNetworkPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AddWifiNetworkPreferenceTest.java
@@ -15,19 +15,23 @@
*/
package com.android.settings.wifi;
+import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
+
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
import android.content.Context;
import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
-import com.android.settingslib.RestrictedLockUtils;
-
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;
@@ -42,31 +46,44 @@
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Spy
Context mContext = ApplicationProvider.getApplicationContext();
+ @Mock
+ private UserManager mUserManager;
private AddWifiNetworkPreference mPreference;
@Before
public void setUp() {
- mPreference = new AddWifiNetworkPreference(mContext);
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+
+ mPreference = spy(new AddWifiNetworkPreference(mContext));
}
@Test
- public void updatePreferenceForRestriction_isAddWifiConfigAllowed_prefIsEnabled() {
- // If the user is allowed to add Wi-Fi configuration then the EnforcedAdmin will be null.
- RestrictedLockUtils.EnforcedAdmin enforcedAdmin = null;
+ public void checkRestrictionAndSetDisabled_disabledByAdmin_keepEnabledForClicks() {
+ when(mPreference.isDisabledByAdmin()).thenReturn(true);
- mPreference.setDisabledByAdmin(enforcedAdmin);
+ mPreference.checkRestrictionAndSetDisabled();
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
- public void updatePreferenceForRestriction_isAddWifiConfigNotAllowed_prefIsDisabled() {
- RestrictedLockUtils.EnforcedAdmin enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin(
- null /* component */, UserManager.DISALLOW_ADD_WIFI_CONFIG, null /* user */);
+ public void checkRestrictionAndSetDisabled_notDisabledByAdmin_setDisabled() {
+ when(mPreference.isDisabledByAdmin()).thenReturn(false);
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);
- mPreference.setDisabledByAdmin(enforcedAdmin);
+ mPreference.checkRestrictionAndSetDisabled();
assertThat(mPreference.isEnabled()).isFalse();
}
+
+ @Test
+ public void checkRestrictionAndSetDisabled_noRestriction_setEnabled() {
+ when(mPreference.isDisabledByAdmin()).thenReturn(false);
+ when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);
+
+ mPreference.checkRestrictionAndSetDisabled();
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 7d96496..d985ee5 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -459,46 +459,45 @@
public void loadMacRandomizedValue_shouldPersistentAsDefault() {
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
final int prefPersist =
- WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
- WifiConfiguration.RANDOMIZATION_PERSISTENT);
+ WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue(
+ WifiEntry.PRIVACY_RANDOMIZED_MAC);
assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(prefPersist);
}
@Test
- public void loadSavedMacRandomizedPersistentValue_shouldCorrectMacValue() {
- checkSavedMacRandomizedValue(WifiConfiguration.RANDOMIZATION_PERSISTENT);
+ public void loadSavedPrivacyRandomizedMacValue_shouldCorrectMacValue() {
+ checkSavedMacRandomizedValue(WifiEntry.PRIVACY_RANDOMIZED_MAC);
}
@Test
- public void loadSavedMacRandomizedNoneValue_shouldCorrectMacValue() {
- checkSavedMacRandomizedValue(WifiConfiguration.RANDOMIZATION_NONE);
+ public void loadSavedPrivacyDeviceMacValue_shouldCorrectMacValue() {
+ checkSavedMacRandomizedValue(WifiEntry.PRIVACY_DEVICE_MAC);
}
- private void checkSavedMacRandomizedValue(int macRandomizedValue) {
+ private void checkSavedMacRandomizedValue(@WifiEntry.Privacy int privacy) {
when(mWifiEntry.isSaved()).thenReturn(true);
final WifiConfiguration mockWifiConfig = spy(new WifiConfiguration());
when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
- mockWifiConfig.macRandomizationSetting = macRandomizedValue;
+ when(mWifiEntry.getPrivacy()).thenReturn(privacy);
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
final int expectedPrefValue =
- WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
- macRandomizedValue);
+ WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue(privacy);
assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(expectedPrefValue);
}
@Test
- public void saveMacRandomizedValue_noChanged_shouldPersistentAsDefault() {
+ public void saveMacRandomizedValue_noChanged_shouldAutoAsDefault() {
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
WifiConfiguration config = mController.getConfig();
assertThat(config.macRandomizationSetting).isEqualTo(
- WifiConfiguration.RANDOMIZATION_PERSISTENT);
+ WifiConfiguration.RANDOMIZATION_AUTO);
}
@Test
@@ -506,7 +505,7 @@
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
final int prefMacNone =
- WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
+ WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue(
WifiConfiguration.RANDOMIZATION_NONE);
privacySetting.setSelection(prefMacNone);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
deleted file mode 100644
index 9204d43..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkRequest;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
-import com.android.settingslib.PrimarySwitchPreference;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
-public class WifiPrimarySwitchPreferenceControllerTest {
-
- @Mock
- private Intent mIntentReceiver;
- @Mock
- private WifiManager mWifiManager;
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private PrimarySwitchPreference mPreference;
- @Mock
- private ConnectivityManager mConnectivityManager;
- @Mock
- private NetworkScoreManager mNetworkScoreManager;
-
- private Context mContext;
- private WifiPrimarySwitchPreferenceController mController;
- private MetricsFeatureProvider mMetricsFeatureProvider;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
- mContext = spy(RuntimeEnvironment.application.getApplicationContext());
- doReturn(mIntentReceiver).when(mContext)
- .registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class), anyInt());
- doNothing().when(mContext).unregisterReceiver(any(BroadcastReceiver.class));
- when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
- when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
- mController = new WifiPrimarySwitchPreferenceController(mContext, mMetricsFeatureProvider);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
- when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
- }
-
- @Test
- public void testWifiPrimarySwitch_byDefault_shouldBeShown() {
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- @Config(qualifiers = "mcc999")
- public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() {
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
- public void onResume_shouldRegisterCallback() {
- mController.onResume();
-
- verify(mContext).registerReceiver(
- any(BroadcastReceiver.class), any(IntentFilter.class), anyInt());
- verify(mConnectivityManager).registerNetworkCallback(
- any(NetworkRequest.class),
- any(ConnectivityManager.NetworkCallback.class),
- any(Handler.class));
- }
-
- @Test
- public void onPause_shouldUnregisterCallback() {
- mController.onResume();
- mController.onPause();
-
- verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
- verify(mConnectivityManager, times(2)).unregisterNetworkCallback(
- any(ConnectivityManager.NetworkCallback.class));
- }
-
- @Test
- public void onStart_shouldRegisterPreferenceChangeListener() {
- mController.displayPreference(mScreen);
- mController.onStart();
-
- verify(mPreference).setOnPreferenceChangeListener(any(OnPreferenceChangeListener.class));
- }
-
- @Test
- public void onStop_shouldRegisterPreferenceChangeListener() {
- mController.displayPreference(mScreen);
- mController.onStart();
-
- mController.onStop();
-
- verify(mPreference).setOnPreferenceChangeListener(null);
- }
-
- @Test
- public void onSummaryChanged_shouldUpdatePreferenceSummary() {
- mController.displayPreference(mScreen);
-
- mController.onSummaryChanged("test summary");
-
- verify(mPreference).setSummary("test summary");
- }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index 4497a0a..4440bc9 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -48,6 +48,8 @@
import android.telephony.ims.ImsMmTelManager;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -56,10 +58,14 @@
import com.android.settings.SettingsActivity;
import com.android.settings.network.ims.MockWifiCallingQueryImsState;
import com.android.settings.network.ims.WifiCallingQueryImsState;
+import com.android.settings.network.telephony.wificalling.IWifiCallingRepository;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SettingsMainSwitchBar;
import com.android.settings.widget.SettingsMainSwitchPreference;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -183,36 +189,25 @@
}
@Test
- public void onResume_provisioningAllowed_shouldNotFinish() {
- // Call onResume while provisioning is allowed.
- mFragment.onResume();
+ public void onViewCreated_provisioningAllowed_shouldNotFinish() {
+ // Call onViewCreated while provisioning is allowed.
+ mFragment.onViewCreated(mView, null);
// Verify that finish() is not called.
verify(mFragment, never()).finish();
}
@Test
- public void onResume_provisioningDisallowed_shouldFinish() {
- // Call onResume while provisioning is disallowed.
- mQueryImsState.setIsProvisionedOnDevice(false);
- mFragment.onResume();
+ public void onViewCreated_provisioningDisallowed_shouldFinish() {
+ // Call onViewCreated while provisioning is disallowed.
+ mFragment.mIsWifiCallingReady = false;
+ mFragment.onViewCreated(mView, null);
// Verify that finish() is called
verify(mFragment).finish();
}
@Test
- public void onResumeOnPause_provisioningCallbackRegistration() throws Exception {
- // Verify that provisioning callback is registered after call to onResume().
- mFragment.onResume();
- verify(mFragment).registerProvisioningChangedCallback();
-
- // Verify that provisioning callback is unregistered after call to onPause.
- mFragment.onPause();
- verify(mFragment).unregisterProvisioningChangedCallback();
- }
-
- @Test
public void onResume_useWfcHomeModeConfigFalseAndEditable_shouldShowWfcRoaming() {
// Call onResume to update the WFC roaming preference.
mFragment.onResume();
@@ -377,6 +372,7 @@
protected class TestFragment extends WifiCallingSettingsForSub {
private SettingsMainSwitchPreference mSwitchPref;
+ protected boolean mIsWifiCallingReady = true;
protected void setSwitchBar(SettingsMainSwitchPreference switchPref) {
mSwitchPref = switchPref;
@@ -422,6 +418,25 @@
}
@Override
+ @NonNull
+ IWifiCallingRepository getWifiCallingRepository() {
+ return new IWifiCallingRepository() {
+ @Override
+ public void collectIsWifiCallingReadyFlow(
+ @NonNull LifecycleOwner lifecycleOwner,
+ @NonNull Function1<? super Boolean, Unit> action) {
+ action.invoke(mIsWifiCallingReady);
+ }
+ };
+ }
+
+ @NonNull
+ @Override
+ LifecycleOwner getLifecycleOwner() {
+ return this;
+ }
+
+ @Override
void showAlert(Intent intent) {
}
}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
index 13f575f..38b4b71 100644
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -36,13 +37,19 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
import androidx.fragment.app.FragmentTransaction;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
+import com.android.settings.flags.Flags;
+
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
@@ -55,6 +62,7 @@
private WifiDppQrCodeGeneratorFragment mFragment;
private Context mContext;
+ @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
@@ -163,4 +171,18 @@
assertThat(mFragment.createNearbyButton(new Intent(), v -> {
})).isNotNull();
}
+
+ @Test
+ @EnableFlags(Flags.FLAG_ENABLE_WIFI_SHARING_RUNTIME_FRAGMENT)
+ public void getMetricsCatetory_shouldReturnDppQrSharing() {
+ assertThat(mFragment.getMetricsCategory())
+ .isEqualTo(SettingsEnums.SETTINGS_WIFI_DPP_QR_SHARING);
+ }
+
+ @Test
+ @DisableFlags(Flags.FLAG_ENABLE_WIFI_SHARING_RUNTIME_FRAGMENT)
+ public void getMetricsCatetory_shouldReturnDppConfigurator() {
+ assertThat(mFragment.getMetricsCategory())
+ .isEqualTo(SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR);
+ }
}
diff --git a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
index e0f4b9e..2cb41bc 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/FakeFeatureFactory.java
@@ -25,7 +25,6 @@
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider;
-import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider;
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
@@ -83,7 +82,6 @@
public final BluetoothFeatureProvider mBluetoothFeatureProvider;
public final FaceFeatureProvider mFaceFeatureProvider;
public final FingerprintFeatureProvider mFingerprintFeatureProvider;
- public final BiometricsRepositoryProvider mBiometricsRepositoryProvider;
public PanelFeatureProvider panelFeatureProvider;
public SlicesFeatureProvider slicesFeatureProvider;
@@ -139,7 +137,6 @@
mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
mFaceFeatureProvider = mock(FaceFeatureProvider.class);
mFingerprintFeatureProvider = mock(FingerprintFeatureProvider.class);
- mBiometricsRepositoryProvider = mock(BiometricsRepositoryProvider.class);
wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
@@ -272,11 +269,6 @@
}
@Override
- public BiometricsRepositoryProvider getBiometricsRepositoryProvider() {
- return mBiometricsRepositoryProvider;
- }
-
- @Override
public WifiTrackerLibProvider getWifiTrackerLibProvider() {
return wifiTrackerLibProvider;
}
diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
index 417b102..02ed03c 100644
--- a/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -363,6 +363,10 @@
}
@Implementation
+ protected boolean isAdminUser() {
+ return getUserInfo(UserHandle.myUserId()).isAdmin();
+ }
+ @Implementation
protected boolean isGuestUser() {
return mIsGuestUser;
}
diff --git a/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepositoryTest.kt
index 01f32bf..1c1d9df 100644
--- a/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogRepositoryTest.kt
@@ -17,65 +17,65 @@
package com.android.settings.deviceinfo.simstatus
import android.content.Context
-import android.os.PersistableBundle
import android.telephony.CarrierConfigManager
import androidx.lifecycle.testing.TestLifecycleOwner
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.deviceinfo.simstatus.SimStatusDialogRepository.SimStatusDialogInfo
+import com.android.settings.network.telephony.CarrierConfigRepository
import com.android.settings.network.telephony.SimSlotRepository
import com.android.settings.network.telephony.ims.ImsMmTelRepository
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
+import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.kotlin.anyVararg
import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
-import org.mockito.kotlin.spy
@RunWith(AndroidJUnit4::class)
class SimStatusDialogRepositoryTest {
- private val carrierConfig = PersistableBundle().apply {
- putBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true)
- }
+ private val context: Context = ApplicationProvider.getApplicationContext()
- private val mockCarrierConfigManager = mock<CarrierConfigManager> {
- on { getConfigForSubId(eq(SUB_ID), anyVararg()) } doReturn carrierConfig
- }
+ private val mockSimSlotRepository =
+ mock<SimSlotRepository> {
+ on { subIdInSimSlotFlow(SIM_SLOT_INDEX) } doReturn flowOf(SUB_ID)
+ }
- private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
- on { getSystemService(CarrierConfigManager::class.java) } doReturn mockCarrierConfigManager
- }
+ private val mockSignalStrengthRepository =
+ mock<SignalStrengthRepository> {
+ on { signalStrengthDisplayFlow(SUB_ID) } doReturn flowOf(SIGNAL_STRENGTH)
+ }
- private val mockSimSlotRepository = mock<SimSlotRepository> {
- on { subIdInSimSlotFlow(SIM_SLOT_INDEX) } doReturn flowOf(SUB_ID)
- }
+ private val mockImsMmTelRepository =
+ mock<ImsMmTelRepository> { on { imsRegisteredFlow() } doReturn flowOf(true) }
- private val mockSignalStrengthRepository = mock<SignalStrengthRepository> {
- on { signalStrengthDisplayFlow(SUB_ID) } doReturn flowOf(SIGNAL_STRENGTH)
- }
+ private val controller =
+ SimStatusDialogRepository(
+ context = context,
+ simSlotRepository = mockSimSlotRepository,
+ signalStrengthRepository = mockSignalStrengthRepository,
+ imsMmTelRepositoryFactory = { subId ->
+ assertThat(subId).isEqualTo(SUB_ID)
+ mockImsMmTelRepository
+ },
+ )
- private val mockImsMmTelRepository = mock<ImsMmTelRepository> {
- on { imsRegisteredFlow() } doReturn flowOf(true)
+ @Before
+ fun setUp() {
+ CarrierConfigRepository.resetForTest()
}
- private val controller = SimStatusDialogRepository(
- context = context,
- simSlotRepository = mockSimSlotRepository,
- signalStrengthRepository = mockSignalStrengthRepository,
- imsMmTelRepositoryFactory = { subId ->
- assertThat(subId).isEqualTo(SUB_ID)
- mockImsMmTelRepository
- },
- )
-
@Test
fun collectSimStatusDialogInfo() = runBlocking {
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL,
+ value = true,
+ )
var simStatusDialogInfo = SimStatusDialogInfo()
controller.collectSimStatusDialogInfo(TestLifecycleOwner(), SIM_SLOT_INDEX) {
@@ -83,19 +83,20 @@
}
delay(100)
- assertThat(simStatusDialogInfo).isEqualTo(
- SimStatusDialogInfo(
- signalStrength = SIGNAL_STRENGTH,
- imsRegistered = true,
- )
- )
+ assertThat(simStatusDialogInfo)
+ .isEqualTo(
+ SimStatusDialogInfo(
+ signalStrength = SIGNAL_STRENGTH,
+ imsRegistered = true,
+ ))
}
@Test
fun collectSimStatusDialogInfo_doNotShowSignalStrength() = runBlocking {
- carrierConfig.putBoolean(
- CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL,
- false
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL,
+ value = false,
)
var simStatusDialogInfo = SimStatusDialogInfo()
@@ -109,7 +110,11 @@
@Test
fun collectSimStatusDialogInfo_doNotShowImsRegistration() = runBlocking {
- carrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false)
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL,
+ value = false,
+ )
var simStatusDialogInfo = SimStatusDialogInfo()
controller.collectSimStatusDialogInfo(TestLifecycleOwner(), SIM_SLOT_INDEX) {
diff --git a/tests/spa_unit/src/com/android/settings/network/MobileDataEnabledFlowTest.kt b/tests/spa_unit/src/com/android/settings/network/MobileDataEnabledFlowTest.kt
deleted file mode 100644
index c4611ac..0000000
--- a/tests/spa_unit/src/com/android/settings/network/MobileDataEnabledFlowTest.kt
+++ /dev/null
@@ -1,91 +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.network
-
-import android.content.Context
-import android.provider.Settings
-import android.telephony.SubscriptionManager
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
-import com.android.settingslib.spa.testutils.toListWithTimeout
-import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBoolean
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class MobileDataEnabledFlowTest {
- private val context: Context = ApplicationProvider.getApplicationContext()
-
- @Test
- fun mobileDataEnabledFlow_notified(): Unit = runBlocking {
- val flow = context.mobileDataEnabledFlow(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
-
- assertThat(flow.firstWithTimeoutOrNull()).isNotNull()
- }
-
- @Test
- fun mobileDataEnabledFlow_changed_notified(): Unit = runBlocking {
- var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
- mobileDataEnabled = false
-
- val flow = context.mobileDataEnabledFlow(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
- mobileDataEnabled = true
-
- assertThat(flow.firstWithTimeoutOrNull()).isNotNull()
- }
-
- @Test
- fun mobileDataEnabledFlow_forSubIdNotChanged(): Unit = runBlocking {
- var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
- mobileDataEnabled = false
- var mobileDataEnabledForSubId
- by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA + SUB_ID)
- mobileDataEnabledForSubId = false
-
- val listDeferred = async {
- context.mobileDataEnabledFlow(SUB_ID).toListWithTimeout()
- }
-
- assertThat(listDeferred.await()).hasSize(1)
- }
-
- @Test
- fun mobileDataEnabledFlow_forSubIdChanged(): Unit = runBlocking {
- var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
- mobileDataEnabled = false
- var mobileDataEnabledForSubId
- by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA + SUB_ID)
- mobileDataEnabledForSubId = false
-
- val listDeferred = async {
- context.mobileDataEnabledFlow(SUB_ID).toListWithTimeout()
- }
- delay(100)
- mobileDataEnabledForSubId = true
-
- assertThat(listDeferred.await().size).isAtLeast(2)
- }
-
- private companion object {
- const val SUB_ID = 123
- }
-}
diff --git a/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt b/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt
new file mode 100644
index 0000000..6f9029e
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/SimOnboardingServiceTest.kt
@@ -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.network
+
+import android.telephony.SubscriptionInfo
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SimOnboardingServiceTest {
+
+ @Test
+ fun addItemForRenaming_addItemWithNewName_findItem() {
+ val simOnboardingService = SimOnboardingService()
+ val newName = "NewName"
+
+ simOnboardingService.addItemForRenaming(SUB_INFO_1, newName)
+
+ assertThat(simOnboardingService.renameMutableMap)
+ .containsEntry(SUB_INFO_1.subscriptionId, newName)
+ }
+
+ @Test
+ fun addItemForRenaming_sameNameAndItemNotInList_removeItem() {
+ val simOnboardingService = SimOnboardingService()
+
+ simOnboardingService.addItemForRenaming(SUB_INFO_1, DISPLAY_NAME_1)
+
+ assertThat(simOnboardingService.renameMutableMap)
+ .doesNotContainKey(SUB_INFO_1.subscriptionId)
+ }
+
+ @Test
+ fun addItemForRenaming_sameNameAndItemInList_removeItem() {
+ val simOnboardingService = SimOnboardingService()
+ simOnboardingService.renameMutableMap[SUB_INFO_1.subscriptionId] = "NewName"
+
+ simOnboardingService.addItemForRenaming(SUB_INFO_1, DISPLAY_NAME_1)
+
+ assertThat(simOnboardingService.renameMutableMap)
+ .doesNotContainKey(SUB_INFO_1.subscriptionId)
+ }
+
+ private companion object {
+ const val SUB_ID_1 = 1
+ const val DISPLAY_NAME_1 = "Sub 1"
+
+ val SUB_INFO_1: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+ setId(SUB_ID_1)
+ setDisplayName(DISPLAY_NAME_1)
+ }.build()
+ }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnEditCarrierEnabledTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditCarrierEnabledTest.kt
new file mode 100644
index 0000000..bd97482
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditCarrierEnabledTest.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.network.apn
+
+import android.content.Context
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.assertIsOff
+import androidx.compose.ui.test.assertIsOn
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+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.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class ApnEditCarrierEnabledTest {
+
+ @get:Rule val composeTestRule = createComposeRule()
+
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {}
+
+ private val resources = spy(context.resources) {}
+
+ @Before
+ fun setUp() {
+ context.stub { on { resources } doReturn resources }
+ }
+
+ @Test
+ fun carrierEnabled_displayed() {
+ composeTestRule.setContent { ApnEditCarrierEnabled(ApnData()) {} }
+
+ composeTestRule.onCarrierEnabled().assertIsDisplayed()
+ }
+
+ @Test
+ fun carrierEnabled_isChecked() {
+ val apnData = ApnData(carrierEnabled = true)
+
+ composeTestRule.setContent { ApnEditCarrierEnabled(apnData) {} }
+
+ composeTestRule.onCarrierEnabled().assertIsOn()
+ }
+
+ @Test
+ fun carrierEnabled_allowEdit_checkChanged() {
+ resources.stub { on { getBoolean(R.bool.config_allow_edit_carrier_enabled) } doReturn true }
+ var apnData by mutableStateOf(ApnData(carrierEnabled = true))
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) {
+ ApnEditCarrierEnabled(apnData) { apnData = apnData.copy(carrierEnabled = it) }
+ }
+ }
+
+ composeTestRule.onCarrierEnabled().performClick()
+
+ composeTestRule.onCarrierEnabled().assertIsEnabled().assertIsOff()
+ }
+
+ @Test
+ fun carrierEnabled_notAllowEdit_checkNotChanged() {
+ resources.stub {
+ on { getBoolean(R.bool.config_allow_edit_carrier_enabled) } doReturn false
+ }
+ var apnData by mutableStateOf(ApnData(carrierEnabled = true))
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) {
+ ApnEditCarrierEnabled(apnData) { apnData = apnData.copy(carrierEnabled = it) }
+ }
+ }
+
+ composeTestRule.onCarrierEnabled().performClick()
+
+ composeTestRule.onCarrierEnabled().assertIsNotEnabled().assertIsOn()
+ }
+
+ private fun ComposeTestRule.onCarrierEnabled() =
+ onNodeWithText(context.getString(R.string.carrier_enabled))
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
index 3621948..d310604 100644
--- a/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/apn/ApnEditPageProviderTest.kt
@@ -21,24 +21,17 @@
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.assertIsOff
-import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.isFocused
import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onAllNodesWithText
import androidx.compose.ui.test.onChild
import androidx.compose.ui.test.onChildAt
-import androidx.compose.ui.test.onLast
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.onRoot
-import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performScrollToNode
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R
import com.google.common.truth.Truth
-import org.junit.Ignore
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -55,7 +48,6 @@
private val port = "port"
private val apnType = context.resources.getString(R.string.apn_type)
private val apnRoaming = "IPv4"
- private val apnEnable = context.resources.getString(R.string.carrier_enabled)
private val apnProtocolOptions =
context.resources.getStringArray(R.array.apn_protocol_entries).toList()
private val passwordTitle = context.resources.getString(R.string.apn_password)
@@ -65,7 +57,6 @@
port = port,
apnType = apnType,
apnRoaming = apnProtocolOptions.indexOf(apnRoaming),
- apnEnable = true
)
private val apnData = mutableStateOf(
apnInit
@@ -133,39 +124,6 @@
composeTestRule.onNodeWithText(apnRoaming, true).assertIsDisplayed()
}
- @Ignore("b/342374681")
- @Test
- fun carrier_enabled_displayed() {
- composeTestRule.setContent {
- ApnPage(apnInit, remember { apnData }, uri)
- }
- composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(apnEnable, true))
- composeTestRule.onNodeWithText(apnEnable, true).assertIsDisplayed()
- }
-
- @Test
- fun carrier_enabled_isChecked() {
- composeTestRule.setContent {
- ApnPage(apnInit, remember { apnData }, uri)
- }
- composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(apnEnable, true))
- composeTestRule.onNodeWithText(apnEnable, true).assertIsOn()
- }
-
- @Ignore("b/342374681")
- @Test
- fun carrier_enabled_checkChanged() {
- composeTestRule.setContent {
- ApnPage(apnInit, remember { apnData }, uri)
- }
- composeTestRule.onRoot().onChild().onChildAt(0)
- .performScrollToNode(hasText(apnEnable, true))
- composeTestRule.onNodeWithText(apnEnable, true).performClick()
- composeTestRule.onNodeWithText(apnEnable, true).assertIsOff()
- }
-
@Test
fun password_displayed() {
composeTestRule.setContent {
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
index 55d520f..d192eb4 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/CallStateRepositoryTest.kt
@@ -17,7 +17,6 @@
package com.android.settings.network.telephony
import android.content.Context
-import android.telephony.SubscriptionManager
import android.telephony.TelephonyCallback
import android.telephony.TelephonyManager
import androidx.test.core.app.ApplicationProvider
@@ -27,6 +26,7 @@
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.async
import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.junit.runner.RunWith
@@ -49,20 +49,15 @@
}
}
- private val mockSubscriptionManager = mock<SubscriptionManager> {
- on { activeSubscriptionIdList } doReturn intArrayOf(SUB_ID)
- on { addOnSubscriptionsChangedListener(any(), any()) } doAnswer {
- val listener = it.arguments[1] as SubscriptionManager.OnSubscriptionsChangedListener
- listener.onSubscriptionsChanged()
- }
+ private val mockSubscriptionRepository = mock<SubscriptionRepository> {
+ on { activeSubscriptionIdListFlow() } doReturn flowOf(listOf(SUB_ID))
}
private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
- on { subscriptionManager } doReturn mockSubscriptionManager
}
- private val repository = CallStateRepository(context)
+ private val repository = CallStateRepository(context, mockSubscriptionRepository)
@Test
fun callStateFlow_initial_sendInitialState() = runBlocking {
@@ -89,8 +84,8 @@
@Test
fun isInCallFlow_noActiveSubscription() = runBlocking {
- mockSubscriptionManager.stub {
- on { activeSubscriptionIdList } doReturn intArrayOf()
+ mockSubscriptionRepository.stub {
+ on { activeSubscriptionIdListFlow() } doReturn flowOf(emptyList())
}
val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/CarrierConfigRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/CarrierConfigRepositoryTest.kt
new file mode 100644
index 0000000..8c54751
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/CarrierConfigRepositoryTest.kt
@@ -0,0 +1,138 @@
+/*
+ * 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 android.content.Context
+import android.telephony.CarrierConfigManager
+import androidx.core.os.persistableBundleOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+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.anyVararg
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stub
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class CarrierConfigRepositoryTest {
+
+ private val mockCarrierConfigManager = mock<CarrierConfigManager>()
+
+ private val context =
+ mock<Context> {
+ on { applicationContext } doReturn mock
+ on { getSystemService(CarrierConfigManager::class.java) } doReturn
+ mockCarrierConfigManager
+ }
+
+ private val repository = CarrierConfigRepository(context)
+
+ @Before
+ fun setUp() {
+ CarrierConfigRepository.resetForTest()
+ }
+
+ @Test
+ fun getBoolean_returnValue() {
+ val key = CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL
+ mockCarrierConfigManager.stub {
+ on { getConfigForSubId(any(), eq(key)) } doReturn persistableBundleOf(key to true)
+ }
+
+ val value = repository.getBoolean(SUB_ID, key)
+
+ assertThat(value).isTrue()
+ }
+
+ @Test
+ fun getInt_returnValue() {
+ val key = CarrierConfigManager.KEY_GBA_MODE_INT
+ mockCarrierConfigManager.stub {
+ on { getConfigForSubId(any(), eq(key)) } doReturn persistableBundleOf(key to 99)
+ }
+
+ val value = repository.getInt(SUB_ID, key)
+
+ assertThat(value).isEqualTo(99)
+ }
+
+ @Test
+ fun getString_returnValue() {
+ val key = CarrierConfigManager.KEY_CARRIER_NAME_STRING
+ mockCarrierConfigManager.stub {
+ on { getConfigForSubId(any(), eq(key)) } doReturn
+ persistableBundleOf(key to STRING_VALUE)
+ }
+
+ val value = repository.getString(SUB_ID, key)
+
+ assertThat(value).isEqualTo(STRING_VALUE)
+ }
+
+ @Test
+ fun transformConfig_managerThrowIllegalStateException_returnDefaultValue() {
+ mockCarrierConfigManager.stub {
+ on { getConfigForSubId(any(), anyVararg()) } doThrow IllegalStateException()
+ }
+
+ val carrierName =
+ repository.transformConfig(SUB_ID) {
+ getInt(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT)
+ }
+
+ assertThat(carrierName)
+ .isEqualTo(
+ CarrierConfigManager.getDefaultConfig()
+ .getInt(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT))
+ }
+
+ @Test
+ fun transformConfig_getValueTwice_cached() {
+ val key = CarrierConfigManager.KEY_CARRIER_NAME_STRING
+ mockCarrierConfigManager.stub {
+ on { getConfigForSubId(any(), eq(key)) } doReturn
+ persistableBundleOf(key to STRING_VALUE)
+ }
+
+ repository.transformConfig(SUB_ID) { getString(key) }
+ repository.transformConfig(SUB_ID) { getString(key) }
+
+ verify(mockCarrierConfigManager, times(1)).getConfigForSubId(any(), anyVararg())
+ }
+
+ @Test
+ fun transformConfig_registerCarrierConfigChangeListener() {
+ val key = CarrierConfigManager.KEY_CARRIER_NAME_STRING
+
+ repository.transformConfig(SUB_ID) { getString(key) }
+ repository.transformConfig(SUB_ID) { getString(key) }
+
+ verify(mockCarrierConfigManager, times(1)).registerCarrierConfigChangeListener(any(), any())
+ }
+
+ private companion object {
+ const val SUB_ID = 123
+ const val STRING_VALUE = "value"
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/MobileDataRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/MobileDataRepositoryTest.kt
new file mode 100644
index 0000000..fc762fa
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/MobileDataRepositoryTest.kt
@@ -0,0 +1,188 @@
+/*
+ * 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 android.content.Context
+import android.provider.Settings
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
+import com.android.settingslib.spa.testutils.toListWithTimeout
+import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBoolean
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.flowOf
+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
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class MobileDataRepositoryTest {
+ private val mockTelephonyManager =
+ mock<TelephonyManager> { on { createForSubscriptionId(SUB_ID) } doReturn mock }
+
+ private val context: Context =
+ spy(ApplicationProvider.getApplicationContext()) {
+ on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
+ }
+
+ private val repository = MobileDataRepository(context, flowOf(Unit))
+
+ @Test
+ fun isMobileDataPolicyEnabledFlow_invalidSub_returnFalse() = runBlocking {
+ val flow =
+ repository.isMobileDataPolicyEnabledFlow(
+ subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
+ )
+
+ assertThat(flow.firstWithTimeoutOrNull()).isFalse()
+ }
+
+ @Test
+ fun isMobileDataPolicyEnabledFlow_validSub_returnPolicyState() = runBlocking {
+ mockTelephonyManager.stub {
+ on {
+ isMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH)
+ } doReturn true
+ }
+
+ val flow =
+ repository.isMobileDataPolicyEnabledFlow(
+ subId = SUB_ID,
+ policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
+ )
+
+ assertThat(flow.firstWithTimeoutOrNull()).isTrue()
+ }
+
+ @Test
+ fun setMobileDataPolicyEnabled() = runBlocking {
+ repository.setMobileDataPolicyEnabled(
+ subId = SUB_ID,
+ policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
+ enabled = true)
+
+ verify(mockTelephonyManager)
+ .setMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH, true)
+ }
+
+ @Test
+ fun mobileDataEnabledChangedFlow_notified(): Unit = runBlocking {
+ val flow =
+ repository.mobileDataEnabledChangedFlow(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+
+ assertThat(flow.firstWithTimeoutOrNull()).isNotNull()
+ }
+
+ @Test
+ fun mobileDataEnabledChangedFlow_changed_notified(): Unit = runBlocking {
+ var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
+ mobileDataEnabled = false
+
+ val flow =
+ repository.mobileDataEnabledChangedFlow(SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+ mobileDataEnabled = true
+
+ assertThat(flow.firstWithTimeoutOrNull()).isNotNull()
+ }
+
+ @Test
+ fun mobileDataEnabledChangedFlow_forSubIdNotChanged(): Unit = runBlocking {
+ var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
+ mobileDataEnabled = false
+ var mobileDataEnabledForSubId by
+ context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA + SUB_ID)
+ mobileDataEnabledForSubId = false
+
+ val listDeferred = async {
+ repository.mobileDataEnabledChangedFlow(SUB_ID).toListWithTimeout()
+ }
+
+ assertThat(listDeferred.await()).hasSize(1)
+ }
+
+ @Test
+ fun mobileDataEnabledChangedFlow_forSubIdChanged(): Unit = runBlocking {
+ var mobileDataEnabled by context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA)
+ mobileDataEnabled = false
+ var mobileDataEnabledForSubId by
+ context.settingsGlobalBoolean(Settings.Global.MOBILE_DATA + SUB_ID)
+ mobileDataEnabledForSubId = false
+
+ val listDeferred = async {
+ repository.mobileDataEnabledChangedFlow(SUB_ID).toListWithTimeout()
+ }
+ delay(100)
+ mobileDataEnabledForSubId = true
+
+ assertThat(listDeferred.await().size).isAtLeast(2)
+ }
+
+ @Test
+ fun isMobileDataEnabledFlow_invalidSub_returnFalse() = runBlocking {
+ val state =
+ repository.isMobileDataEnabledFlow(
+ subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ )
+
+ assertThat(state.firstWithTimeoutOrNull()).isFalse()
+ }
+
+ @Test
+ fun isMobileDataEnabledFlow_validSub_returnPolicyState() = runBlocking {
+ mockTelephonyManager.stub {
+ on { isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER) } doReturn true
+ }
+
+ val state = repository.isMobileDataEnabledFlow(subId = SUB_ID)
+
+ assertThat(state.firstWithTimeoutOrNull()).isTrue()
+ }
+
+ @Test
+ fun isDataRoamingEnabledFlow_invalidSub_returnFalse() = runBlocking {
+ val isDataRoamingEnabled =
+ repository
+ .isDataRoamingEnabledFlow(subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+ .firstWithTimeoutOrNull()
+
+ assertThat(isDataRoamingEnabled).isFalse()
+ }
+
+ @Test
+ fun isDataRoamingEnabledFlow_validSub_returnCurrentValue() = runBlocking {
+ mockTelephonyManager.stub { on { isDataRoamingEnabled } doReturn true }
+
+ val isDataRoamingEnabled =
+ repository.isDataRoamingEnabledFlow(subId = SUB_ID).firstWithTimeoutOrNull()
+
+ assertThat(isDataRoamingEnabled).isTrue()
+ }
+
+ private companion object {
+ const val SUB_ID = 123
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.kt
new file mode 100644
index 0000000..ee4cff6
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.kt
@@ -0,0 +1,194 @@
+/*
+ * 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 android.content.Context
+import android.telephony.CarrierConfigManager
+import android.telephony.SubscriptionManager
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsOff
+import androidx.compose.ui.test.assertIsOn
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.fragment.app.FragmentManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.core.BasePreferenceController.AVAILABLE
+import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Before
+import org.junit.Rule
+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 RoamingPreferenceControllerTest {
+ @get:Rule val composeTestRule = createComposeRule()
+
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val mockMobileDataRepository =
+ mock<MobileDataRepository> {
+ on { isDataRoamingEnabledFlow(SUB_ID) } doReturn flowOf(false)
+ }
+
+ private val controller =
+ RoamingPreferenceController(context, TEST_KEY, mockMobileDataRepository)
+
+ @Before
+ fun setUp() {
+ CarrierConfigRepository.resetForTest()
+ }
+
+ @Test
+ fun getAvailabilityStatus_validSubId_returnAvailable() {
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ val availabilityStatus = controller.getAvailabilityStatus()
+
+ assertThat(availabilityStatus).isEqualTo(AVAILABLE)
+ }
+
+ @Test
+ fun getAvailabilityStatus_invalidSubId_returnConditionallyUnavailable() {
+ controller.init(mock<FragmentManager>(), SubscriptionManager.INVALID_SUBSCRIPTION_ID)
+
+ val availabilityStatus = controller.getAvailabilityStatus()
+
+ assertThat(availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+ }
+
+ @Test
+ fun getAvailabilityStatus_forceHomeNetworkIsTrue_returnConditionallyUnavailable() {
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL,
+ value = true,
+ )
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ val availabilityStatus = controller.getAvailabilityStatus()
+
+ assertThat(availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+ }
+
+ @Test
+ fun getAvailabilityStatus_forceHomeNetworkIsFalse_returnAvailable() {
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL,
+ value = false,
+ )
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ val availabilityStatus = controller.getAvailabilityStatus()
+
+ assertThat(availabilityStatus).isEqualTo(AVAILABLE)
+ }
+
+ @Test
+ fun title_displayed() {
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) { controller.Content() }
+ }
+
+ composeTestRule.onNodeWithText(context.getString(R.string.roaming)).assertIsDisplayed()
+ }
+
+ @Test
+ fun summary_displayed() {
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) { controller.Content() }
+ }
+
+ composeTestRule
+ .onNodeWithText(context.getString(R.string.roaming_enable))
+ .assertIsDisplayed()
+ }
+
+ @Test
+ fun isDialogNeeded_enableChargeIndication_returnTrue() {
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL,
+ value = false,
+ )
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ val isDialogNeeded = controller.isDialogNeeded()
+
+ assertThat(isDialogNeeded).isTrue()
+ }
+
+ @Test
+ fun isDialogNeeded_disableChargeIndication_returnFalse() {
+ CarrierConfigRepository.setBooleanForTest(
+ subId = SUB_ID,
+ key = CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL,
+ value = true,
+ )
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ val isDialogNeeded = controller.isDialogNeeded()
+
+ assertThat(isDialogNeeded).isFalse()
+ }
+
+ @Test
+ fun checked_roamingEnabled_isOn() {
+ mockMobileDataRepository.stub {
+ on { isDataRoamingEnabledFlow(SUB_ID) } doReturn flowOf(true)
+ }
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) { controller.Content() }
+ }
+
+ composeTestRule.onNodeWithText(context.getString(R.string.roaming)).assertIsOn()
+ }
+
+ @Test
+ fun checked_roamingDisabled_isOff() {
+ mockMobileDataRepository.stub {
+ on { isDataRoamingEnabledFlow(SUB_ID) } doReturn flowOf(false)
+ }
+ controller.init(mock<FragmentManager>(), SUB_ID)
+
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) { controller.Content() }
+ }
+
+ composeTestRule.onNodeWithText(context.getString(R.string.roaming)).assertIsOff()
+ }
+
+ private companion object {
+ const val TEST_KEY = "test_key"
+ const val SUB_ID = 2
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
index e233fa4..75c9aa1 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/SubscriptionRepositoryTest.kt
@@ -77,7 +77,7 @@
@Test
fun subscriptionsChangedFlow_hasInitialValue() = runBlocking {
- val initialValue = context.subscriptionsChangedFlow().firstWithTimeoutOrNull()
+ val initialValue = repository.subscriptionsChangedFlow().firstWithTimeoutOrNull()
assertThat(initialValue).isSameInstanceAs(Unit)
}
@@ -85,7 +85,7 @@
@Test
fun subscriptionsChangedFlow_changed() = runBlocking {
val listDeferred = async {
- context.subscriptionsChangedFlow().toListWithTimeout()
+ repository.subscriptionsChangedFlow().toListWithTimeout()
}
delay(100)
@@ -95,6 +95,17 @@
}
@Test
+ fun activeSubscriptionIdListFlow(): Unit = runBlocking {
+ mockSubscriptionManager.stub {
+ on { activeSubscriptionIdList } doReturn intArrayOf(SUB_ID_IN_SLOT_0)
+ }
+
+ val activeSubIds = repository.activeSubscriptionIdListFlow().firstWithTimeoutOrNull()
+
+ assertThat(activeSubIds).containsExactly(SUB_ID_IN_SLOT_0)
+ }
+
+ @Test
fun getSelectableSubscriptionInfoList_sortedBySimSlotIndex() {
mockSubscriptionManager.stub {
on { getAvailableSubscriptionInfoList() } doReturn listOf(
diff --git a/tests/spa_unit/src/com/android/settings/network/telephony/TelephonyRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/network/telephony/TelephonyRepositoryTest.kt
index 65e8c47..12791b8 100644
--- a/tests/spa_unit/src/com/android/settings/network/telephony/TelephonyRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/network/telephony/TelephonyRepositoryTest.kt
@@ -17,14 +17,12 @@
package com.android.settings.network.telephony
import android.content.Context
-import android.telephony.SubscriptionManager
import android.telephony.TelephonyCallback
import android.telephony.TelephonyManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.junit.runner.RunWith
@@ -33,91 +31,29 @@
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
-import org.mockito.kotlin.stub
import org.mockito.kotlin.verify
@RunWith(AndroidJUnit4::class)
class TelephonyRepositoryTest {
private var telephonyCallback: TelephonyCallback? = null
- private val mockTelephonyManager = mock<TelephonyManager> {
- on { createForSubscriptionId(SUB_ID) } doReturn mock
- on { registerTelephonyCallback(any(), any()) } doAnswer {
- telephonyCallback = it.arguments[1] as TelephonyCallback
- }
- }
-
- private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
- on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
- }
-
- private val repository = TelephonyRepository(context, flowOf(Unit))
-
- @Test
- fun isMobileDataPolicyEnabledFlow_invalidSub_returnFalse() = runBlocking {
- val flow = repository.isMobileDataPolicyEnabledFlow(
- subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
- )
-
- assertThat(flow.firstWithTimeoutOrNull()).isFalse()
- }
-
- @Test
- fun isMobileDataPolicyEnabledFlow_validSub_returnPolicyState() = runBlocking {
- mockTelephonyManager.stub {
- on {
- isMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH)
- } doReturn true
+ private val mockTelephonyManager =
+ mock<TelephonyManager> {
+ on { createForSubscriptionId(SUB_ID) } doReturn mock
+ on { registerTelephonyCallback(any(), any()) } doAnswer
+ {
+ telephonyCallback = it.arguments[1] as TelephonyCallback
+ }
}
- val flow = repository.isMobileDataPolicyEnabledFlow(
- subId = SUB_ID,
- policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
- )
-
- assertThat(flow.firstWithTimeoutOrNull()).isTrue()
- }
-
- @Test
- fun setMobileDataPolicyEnabled() = runBlocking {
- repository.setMobileDataPolicyEnabled(
- subId = SUB_ID,
- policy = TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH,
- enabled = true
- )
-
- verify(mockTelephonyManager)
- .setMobileDataPolicyEnabled(TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH, true)
- }
-
- @Test
- fun isDataEnabled_invalidSub_returnFalse() = runBlocking {
- val state = repository.isDataEnabledFlow(
- subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- )
-
- assertThat(state.firstWithTimeoutOrNull()).isFalse()
- }
-
- @Test
- fun isDataEnabled_validSub_returnPolicyState() = runBlocking {
- mockTelephonyManager.stub {
- on {
- isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
- } doReturn true
+ private val context: Context =
+ spy(ApplicationProvider.getApplicationContext()) {
+ on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
}
- val state = repository.isDataEnabledFlow(subId = SUB_ID)
-
- assertThat(state.firstWithTimeoutOrNull()).isTrue()
- }
-
@Test
fun telephonyCallbackFlow_callbackRegistered() = runBlocking {
- val flow = context.telephonyCallbackFlow<Unit>(SUB_ID) {
- object : TelephonyCallback() {}
- }
+ val flow = context.telephonyCallbackFlow<Unit>(SUB_ID) { object : TelephonyCallback() {} }
flow.firstWithTimeoutOrNull()
@@ -126,9 +62,7 @@
@Test
fun telephonyCallbackFlow_callbackUnregistered() = runBlocking {
- val flow = context.telephonyCallbackFlow<Unit>(SUB_ID) {
- object : TelephonyCallback() {}
- }
+ val flow = context.telephonyCallbackFlow<Unit>(SUB_ID) { object : TelephonyCallback() {} }
flow.firstWithTimeoutOrNull()
diff --git a/tests/spa_unit/src/com/android/settings/print/PrintSettingsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/print/PrintSettingsPageProviderTest.kt
index 746816b..2571406 100644
--- a/tests/spa_unit/src/com/android/settings/print/PrintSettingsPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/print/PrintSettingsPageProviderTest.kt
@@ -17,6 +17,7 @@
package com.android.settings.print
import android.content.Context
+import android.net.Uri
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.test.isDisplayed
@@ -31,7 +32,9 @@
import com.android.settings.print.PrintSettingsFragment.EXTRA_CHECKED
import com.android.settings.print.PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME
import com.android.settings.print.PrintSettingsFragment.EXTRA_TITLE
+import com.android.settings.print.PrintSettingsPageProvider.AddPrintService
import com.android.settings.print.PrintSettingsPageProvider.PrintService
+import kotlinx.coroutines.flow.flowOf
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -44,35 +47,32 @@
@RunWith(AndroidJUnit4::class)
class PrintSettingsPageProviderTest {
- @get:Rule
- val composeTestRule = createComposeRule()
+ @get:Rule val composeTestRule = createComposeRule()
- private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
- doNothing().whenever(mock).startActivity(any())
- }
+ private val context: Context =
+ spy(ApplicationProvider.getApplicationContext()) {
+ doNothing().whenever(mock).startActivity(any())
+ }
- private val displayInfo = PrintServiceDisplayInfo(
- title = TITLE,
- isEnabled = true,
- summary = SUMMARY,
- icon = context.getDrawable(R.drawable.ic_settings_print)!!,
- componentName = "ComponentName",
- )
+ private val displayInfo =
+ PrintServiceDisplayInfo(
+ title = TITLE,
+ isEnabled = true,
+ summary = SUMMARY,
+ icon = context.getDrawable(R.drawable.ic_settings_print)!!,
+ componentName = "ComponentName",
+ )
@Test
fun printService_titleDisplayed() {
- composeTestRule.setContent {
- PrintService(displayInfo)
- }
+ composeTestRule.setContent { PrintService(displayInfo) }
composeTestRule.onNodeWithText(TITLE).isDisplayed()
}
@Test
fun printService_summaryDisplayed() {
- composeTestRule.setContent {
- PrintService(displayInfo)
- }
+ composeTestRule.setContent { PrintService(displayInfo) }
composeTestRule.onNodeWithText(SUMMARY).isDisplayed()
}
@@ -80,25 +80,43 @@
@Test
fun printService_onClick() {
composeTestRule.setContent {
- CompositionLocalProvider(LocalContext provides context) {
- PrintService(displayInfo)
- }
+ CompositionLocalProvider(LocalContext provides context) { PrintService(displayInfo) }
}
composeTestRule.onNodeWithText(TITLE).performClick()
- verify(context).startActivity(argThat {
- val fragment = getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)
- val arguments = getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)!!
- fragment == PrintServiceSettingsFragment::class.qualifiedName &&
- arguments.getBoolean(EXTRA_CHECKED) == displayInfo.isEnabled &&
- arguments.getString(EXTRA_TITLE) == displayInfo.title &&
- arguments.getString(EXTRA_SERVICE_COMPONENT_NAME) == displayInfo.componentName
- })
+ verify(context)
+ .startActivity(
+ argThat {
+ val fragment = getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT)
+ val arguments = getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)!!
+ fragment == PrintServiceSettingsFragment::class.qualifiedName &&
+ arguments.getBoolean(EXTRA_CHECKED) == displayInfo.isEnabled &&
+ arguments.getString(EXTRA_TITLE) == displayInfo.title &&
+ arguments.getString(EXTRA_SERVICE_COMPONENT_NAME) ==
+ displayInfo.componentName
+ }
+ )
+ }
+
+ @Test
+ fun addPrintService_onClick() {
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) {
+ AddPrintService(flowOf(SEARCH_URI))
+ }
+ }
+
+ composeTestRule
+ .onNodeWithText(context.getString(R.string.print_menu_item_add_service))
+ .performClick()
+
+ verify(context).startActivity(argThat { data == Uri.parse(SEARCH_URI) })
}
private companion object {
const val TITLE = "Title"
const val SUMMARY = "Summary"
+ const val SEARCH_URI = "search.uri"
}
}
diff --git a/tests/spa_unit/src/com/android/settings/spa/SpaBridgeActivityTest.kt b/tests/spa_unit/src/com/android/settings/spa/SpaBridgeActivityTest.kt
new file mode 100644
index 0000000..e29bd96
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/spa/SpaBridgeActivityTest.kt
@@ -0,0 +1,95 @@
+/*
+ * 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
+
+import android.app.Activity
+import android.content.ComponentName
+import android.content.pm.ActivityInfo
+import android.content.pm.PackageManager
+import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
+import com.android.settings.spa.SpaBridgeActivity.Companion.META_DATA_KEY_DESTINATION
+import com.android.settings.spa.SpaBridgeActivity.Companion.getDestination
+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.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class SpaBridgeActivityTest {
+ private var activityMetadata: Bundle = bundleOf()
+
+ private val mockPackageManager =
+ mock<PackageManager> {
+ on {
+ getActivityInfo(eq(COMPONENT_NAME), any<PackageManager.ComponentInfoFlags>())
+ } doAnswer { ActivityInfo().apply { metaData = activityMetadata } }
+ }
+
+ private val activity =
+ mock<Activity> {
+ on { componentName } doReturn COMPONENT_NAME
+ on { packageManager } doReturn mockPackageManager
+ }
+
+ @Test
+ fun getDestination_noDestination_returnNull() {
+ activityMetadata = bundleOf()
+
+ val destination = activity.getDestination()
+
+ assertThat(destination).isNull()
+ }
+
+ @Test
+ fun getDestination_withoutHighlightMenuKey() {
+ activityMetadata = bundleOf(META_DATA_KEY_DESTINATION to DESTINATION)
+
+ val (destination, highlightMenuKey) = activity.getDestination()!!
+
+ assertThat(destination).isEqualTo(DESTINATION)
+ assertThat(highlightMenuKey).isNull()
+ }
+
+ @Test
+ fun getDestination_withHighlightMenuKey() {
+ activityMetadata =
+ bundleOf(
+ META_DATA_KEY_DESTINATION to DESTINATION,
+ META_DATA_KEY_HIGHLIGHT_MENU_KEY to HIGHLIGHT_MENU_KEY,
+ )
+
+ val (destination, highlightMenuKey) = activity.getDestination()!!
+
+ assertThat(destination).isEqualTo(DESTINATION)
+ assertThat(highlightMenuKey).isEqualTo(HIGHLIGHT_MENU_KEY)
+ }
+
+ private companion object {
+ const val PACKAGE_NAME = "package.name"
+ const val ACTIVITY_NAME = "ActivityName"
+ val COMPONENT_NAME = ComponentName(PACKAGE_NAME, ACTIVITY_NAME)
+ const val DESTINATION = "Destination"
+ const val HIGHLIGHT_MENU_KEY = "apps"
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/spa/SpaDestinationTest.kt b/tests/spa_unit/src/com/android/settings/spa/SpaDestinationTest.kt
index 0b9eb22..ee658c1 100644
--- a/tests/spa_unit/src/com/android/settings/spa/SpaDestinationTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/SpaDestinationTest.kt
@@ -1,5 +1,5 @@
/*
- * 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.
@@ -17,81 +17,32 @@
package com.android.settings.spa
import android.app.Activity
-import android.content.ComponentName
-import android.content.pm.ActivityInfo
-import android.content.pm.PackageManager
-import android.os.Bundle
-import androidx.core.os.bundleOf
import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.SettingsActivity.META_DATA_KEY_HIGHLIGHT_MENU_KEY
-import com.android.settings.spa.SpaDestination.Companion.META_DATA_KEY_DESTINATION
-import com.android.settings.spa.SpaDestination.Companion.getDestination
-import com.google.common.truth.Truth.assertThat
+import com.android.settingslib.spa.framework.util.KEY_DESTINATION
import org.junit.Test
import org.junit.runner.RunWith
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doAnswer
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.eq
+import org.mockito.kotlin.argThat
import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
@RunWith(AndroidJUnit4::class)
class SpaDestinationTest {
- private var activityMetadata: Bundle = bundleOf()
- private val mockPackageManager = mock<PackageManager> {
- on {
- getActivityInfo(
- eq(COMPONENT_NAME),
- any<PackageManager.ComponentInfoFlags>()
- )
- } doAnswer {
- ActivityInfo().apply { metaData = activityMetadata }
- }
- }
-
- private val activity = mock<Activity> {
- on { componentName } doReturn COMPONENT_NAME
- on { packageManager } doReturn mockPackageManager
- }
+ private val activity = mock<Activity>()
@Test
- fun getDestination_noDestination_returnNull() {
- activityMetadata = bundleOf()
+ fun startFromExportedActivity() {
+ val spaDestination = SpaDestination(destination = DESTINATION, highlightMenuKey = null)
- val destination = activity.getDestination()
+ spaDestination.startFromExportedActivity(activity)
- assertThat(destination).isNull()
- }
-
- @Test
- fun getDestination_withoutHighlightMenuKey() {
- activityMetadata = bundleOf(META_DATA_KEY_DESTINATION to DESTINATION)
-
- val (destination, highlightMenuKey) = activity.getDestination()!!
-
- assertThat(destination).isEqualTo(DESTINATION)
- assertThat(highlightMenuKey).isNull()
- }
-
- @Test
- fun getDestination_withHighlightMenuKey() {
- activityMetadata = bundleOf(
- META_DATA_KEY_DESTINATION to DESTINATION,
- META_DATA_KEY_HIGHLIGHT_MENU_KEY to HIGHLIGHT_MENU_KEY,
- )
-
- val (destination, highlightMenuKey) = activity.getDestination()!!
-
- assertThat(destination).isEqualTo(DESTINATION)
- assertThat(highlightMenuKey).isEqualTo(HIGHLIGHT_MENU_KEY)
+ verify(activity).startActivity(argThat {
+ component!!.className == SpaActivity::class.qualifiedName
+ getStringExtra(KEY_DESTINATION) == DESTINATION
+ })
}
private companion object {
- const val PACKAGE_NAME = "package.name"
- const val ACTIVITY_NAME = "ActivityName"
- val COMPONENT_NAME = ComponentName(PACKAGE_NAME, ACTIVITY_NAME)
const val DESTINATION = "Destination"
- const val HIGHLIGHT_MENU_KEY = "apps"
}
}
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
index 96e4707..6297c62 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppInstallerInfoPreferenceTest.kt
@@ -68,7 +68,6 @@
@Before
fun setUp() {
mockSession = mockitoSession()
- .initMocks(this)
.mockStatic(AppStoreUtil::class.java)
.mockStatic(Utils::class.java)
.mockStatic(AppUtils::class.java)
@@ -77,8 +76,7 @@
whenever(AppStoreUtil.getInstallerPackageName(any(), eq(PACKAGE_NAME)))
.thenReturn(INSTALLER_PACKAGE_NAME)
whenever(AppStoreUtil.getInstallerPackageNameAndInstallSourceInfo(any(), eq(PACKAGE_NAME)))
- .thenReturn(
- Pair<String, InstallSourceInfo>(INSTALLER_PACKAGE_NAME, INSTALL_SOURCE_INFO))
+ .thenReturn(Pair(INSTALLER_PACKAGE_NAME, INSTALL_SOURCE_INFO))
whenever(AppStoreUtil.getAppStoreLink(context, INSTALLER_PACKAGE_NAME, PACKAGE_NAME))
.thenReturn(STORE_LINK)
whenever(AppStoreUtil.isInitiatedFromDifferentPackage(eq(INSTALL_SOURCE_INFO)))
@@ -97,7 +95,8 @@
@Test
fun whenNoInstaller_notDisplayed() {
- whenever(AppStoreUtil.getInstallerPackageName(any(), eq(PACKAGE_NAME))).thenReturn(null)
+ whenever(AppStoreUtil.getInstallerPackageNameAndInstallSourceInfo(any(), eq(PACKAGE_NAME)))
+ .thenReturn(Pair(null, INSTALL_SOURCE_INFO))
setContent()
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
index 5c65da1..6a6b91b 100644
--- a/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
@@ -23,6 +23,7 @@
import android.content.pm.PackageManager
import android.content.pm.ParceledListSlice
import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
@@ -30,6 +31,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R
import com.android.settingslib.spa.testutils.FakeNavControllerWrapper
+import com.android.settingslib.spa.testutils.waitUntilExists
import com.android.settingslib.spaprivileged.template.app.AppListItemModel
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.flow.first
@@ -146,8 +148,9 @@
BackgroundInstalledAppList()
}
- composeTestRule.onNodeWithText(
- context.getString(R.string.background_install_title)).assertIsDisplayed()
+ composeTestRule.waitUntilExists(
+ hasText(context.getString(R.string.background_install_title))
+ )
}
@Test
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
new file mode 100644
index 0000000..459afa9
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/spa/network/PrimarySimRepositoryTest.kt
@@ -0,0 +1,206 @@
+/*
+ * 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.network
+
+import android.content.Context
+import android.content.res.Resources
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settingslib.spa.widget.preference.ListPreferenceOption
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doAnswer
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class PrimarySimRepositoryTest {
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ private val mockSubscriptionManager = mock<SubscriptionManager> {
+ on { addOnSubscriptionsChangedListener(any(), any()) } doAnswer {
+ val listener = it.arguments[1] as SubscriptionManager.OnSubscriptionsChangedListener
+ listener.onSubscriptionsChanged()
+ }
+ on { getPhoneNumber(SUB_ID_1) } doReturn NUMBER_1
+ on { getPhoneNumber(SUB_ID_2) } doReturn NUMBER_2
+ }
+
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+ on { getSystemService(SubscriptionManager::class.java) } doReturn mockSubscriptionManager
+ }
+ private val spyResources: Resources = spy(context.resources)
+
+ @Test
+ fun getPrimarySimInfo_oneSim_returnNull() {
+ val simList = listOf(
+ SUB_INFO_1,
+ )
+
+ val primarySimInfo = PrimarySimRepository(context).getPrimarySimInfo(simList)
+
+ assertThat(primarySimInfo).isNull()
+ }
+
+ @Test
+ fun getPrimarySimInfo_verifyCallsList() {
+ val simList = listOf(
+ SUB_INFO_1,
+ SUB_INFO_2
+ )
+ val expectedList = listOf(
+ ListPreferenceOption(
+ id = SUB_INFO_1.subscriptionId,
+ text = "${SUB_INFO_1.displayName}",
+ summary = NUMBER_1
+ ),
+ ListPreferenceOption(
+ id = SUB_INFO_2.subscriptionId,
+ text = "${SUB_INFO_2.displayName}",
+ summary = NUMBER_2
+ ),
+ ListPreferenceOption(
+ id = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ text = context.getString(R.string.sim_calls_ask_first_prefs_title),
+ ),
+ )
+
+ val primarySimInfo = PrimarySimRepository(context).getPrimarySimInfo(simList)
+
+ assertThat(primarySimInfo).isNotNull()
+ assertThat(primarySimInfo?.callsList).isEqualTo(expectedList)
+ }
+
+ @Test
+ fun getPrimarySimInfo_verifySmsList() {
+ val simList = listOf(
+ SUB_INFO_1,
+ SUB_INFO_2
+ )
+ val expectedList = listOf(
+ ListPreferenceOption(
+ id = SUB_INFO_1.subscriptionId,
+ text = "${SUB_INFO_1.displayName}",
+ summary = NUMBER_1
+ ),
+ ListPreferenceOption(
+ id = SUB_INFO_2.subscriptionId,
+ text = "${SUB_INFO_2.displayName}",
+ summary = NUMBER_2
+ ),
+ ListPreferenceOption(
+ id = SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+ text = context.getString(R.string.sim_calls_ask_first_prefs_title),
+ ),
+ )
+
+ val primarySimInfo = PrimarySimRepository(context).getPrimarySimInfo(simList)
+
+ assertThat(primarySimInfo).isNotNull()
+ assertThat(primarySimInfo?.smsList).isEqualTo(expectedList)
+ }
+
+ @Test
+ fun getPrimarySimInfo_noAskEveryTime_verifySmsList() {
+ val simList = listOf(
+ 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 false
+ }
+ val expectedList = listOf(
+ ListPreferenceOption(
+ id = SUB_INFO_1.subscriptionId,
+ text = "${SUB_INFO_1.displayName}",
+ summary = NUMBER_1
+ ),
+ ListPreferenceOption(
+ id = SUB_INFO_2.subscriptionId,
+ text = "${SUB_INFO_2.displayName}",
+ summary = NUMBER_2
+ ),
+ )
+
+ val primarySimInfo = PrimarySimRepository(context).getPrimarySimInfo(simList)
+
+ assertThat(primarySimInfo).isNotNull()
+ assertThat(primarySimInfo?.smsList).isEqualTo(expectedList)
+ }
+
+ @Test
+ fun getPrimarySimInfo_verifyDataList() {
+ val simList = listOf(
+ SUB_INFO_1,
+ SUB_INFO_2
+ )
+ val expectedList = listOf(
+ ListPreferenceOption(
+ id = SUB_INFO_1.subscriptionId,
+ text = "${SUB_INFO_1.displayName}",
+ summary = NUMBER_1
+ ),
+ ListPreferenceOption(
+ id = SUB_INFO_2.subscriptionId,
+ text = "${SUB_INFO_2.displayName}",
+ summary = NUMBER_2
+ ),
+ )
+
+ val primarySimInfo = PrimarySimRepository(context).getPrimarySimInfo(simList)
+
+ assertThat(primarySimInfo).isNotNull()
+ assertThat(primarySimInfo?.dataList).isEqualTo(expectedList)
+ }
+
+ private companion object {
+ const val SUB_ID_1 = 1
+ const val SUB_ID_2 = 2
+ const val DISPLAY_NAME_1 = "Sub 1"
+ const val DISPLAY_NAME_2 = "Sub 2"
+ const val NUMBER_1 = "000000001"
+ const val NUMBER_2 = "000000002"
+ const val MCC = "310"
+
+ val SUB_INFO_1: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+ setId(SUB_ID_1)
+ setDisplayName(DISPLAY_NAME_1)
+ setMcc(MCC)
+ }.build()
+
+ val SUB_INFO_2: SubscriptionInfo = SubscriptionInfo.Builder().apply {
+ setId(SUB_ID_2)
+ setDisplayName(DISPLAY_NAME_2)
+ setMcc(MCC)
+ }.build()
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/spa/search/SpaSearchRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/spa/search/SpaSearchRepositoryTest.kt
new file mode 100644
index 0000000..911dfd2
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/spa/search/SpaSearchRepositoryTest.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.search
+
+import android.content.Context
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.spa.search.SpaSearchRepository.Companion.createSearchIndexableData
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class SpaSearchRepositoryTest {
+
+ @Test
+ fun createSearchIndexableData() {
+ val pageProvider =
+ object : SettingsPageProvider {
+ override val name = PAGE_NAME
+ }
+
+ val searchIndexableData = pageProvider.createSearchIndexableData { listOf(TITLE) }
+ val dynamicRawDataToIndex =
+ searchIndexableData.searchIndexProvider.getDynamicRawDataToIndex(mock<Context>(), true)
+
+ assertThat(searchIndexableData.targetClass).isEqualTo(pageProvider::class.java)
+ assertThat(dynamicRawDataToIndex).hasSize(1)
+ assertThat(dynamicRawDataToIndex[0].title).isEqualTo(TITLE)
+ }
+
+ private companion object {
+ const val PAGE_NAME = "PageName"
+ const val TITLE = "Title"
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/system/reset/ResetNetworkConfirmTest.kt b/tests/spa_unit/src/com/android/settings/system/reset/ResetNetworkConfirmTest.kt
new file mode 100644
index 0000000..4812cfb
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/system/reset/ResetNetworkConfirmTest.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.system.reset
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.TextView
+import androidx.fragment.app.testing.launchFragment
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settings.ResetNetworkRequest
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.never
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class ResetNetworkConfirmTest {
+ private val context: Context = spy(ApplicationProvider.getApplicationContext()) {}
+
+ private val scenario = launchFragment<ResetNetworkConfirm>()
+
+ @Test
+ fun resetNetworkData_notResetEsim() {
+ scenario.recreate().onFragment { fragment ->
+ fragment.resetNetworkRequest = ResetNetworkRequest(ResetNetworkRequest.RESET_NONE)
+
+ runBlocking { fragment.onResetClicked() }
+
+ verify(context, never()).getSystemService(any())
+ }
+ }
+
+ @Test
+ fun setSubtitle_eraseEsim() {
+ scenario.onFragment { fragment ->
+ fragment.resetNetworkRequest =
+ ResetNetworkRequest(ResetNetworkRequest.RESET_NONE).apply {
+ setResetEsim(context.packageName)
+ }
+
+ val view = fragment.onCreateView(LayoutInflater.from(context), null, null)
+
+ assertThat(view.requireViewById<TextView>(R.id.reset_network_confirm).text)
+ .isEqualTo(context.getString(R.string.reset_network_final_desc_esim))
+ }
+ }
+
+ @Test
+ fun setSubtitle_notEraseEsim() {
+ scenario.onFragment { fragment ->
+ fragment.resetNetworkRequest = ResetNetworkRequest(ResetNetworkRequest.RESET_NONE)
+
+ val view = fragment.onCreateView(LayoutInflater.from(context), null, null)
+
+ assertThat(view.requireViewById<TextView>(R.id.reset_network_confirm).text)
+ .isEqualTo(context.getString(R.string.reset_network_final_desc))
+ }
+ }
+}
diff --git a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
index 5ca24a3..d7241b9 100644
--- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
+++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
@@ -23,7 +23,6 @@
import com.android.settings.applications.ApplicationFeatureProvider
import com.android.settings.biometrics.face.FaceFeatureProvider
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider
-import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
@@ -41,7 +40,6 @@
import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider
import com.android.settings.overlay.DockUpdaterFeatureProvider
import com.android.settings.overlay.FeatureFactory
-import com.android.settings.overlay.SurveyFeatureProvider
import com.android.settings.panel.PanelFeatureProvider
import com.android.settings.privatespace.PrivateSpaceLoginFeatureProvider
import com.android.settings.search.SearchFeatureProvider
@@ -99,9 +97,7 @@
override val searchFeatureProvider: SearchFeatureProvider
get() = TODO("Not yet implemented")
- override fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider? {
- TODO("Not yet implemented")
- }
+ override fun getSurveyFeatureProvider(context: Context) = null
override val securityFeatureProvider: SecurityFeatureProvider
get() = TODO("Not yet implemented")
@@ -126,8 +122,6 @@
get() = TODO("Not yet implemented")
override val fingerprintFeatureProvider: FingerprintFeatureProvider
get() = TODO("Not yet implemented")
- override val biometricsRepositoryProvider: BiometricsRepositoryProvider
- get() = TODO("Not yet implemented")
override val wifiTrackerLibProvider: WifiTrackerLibProvider
get() = TODO("Not yet implemented")
override val securitySettingsFeatureProvider: SecuritySettingsFeatureProvider
diff --git a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
index cb1f997..9260409 100644
--- a/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
+++ b/tests/spa_unit/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.kt
@@ -59,7 +59,7 @@
controller.updateState(preference)
- val prefValue = WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
+ val prefValue = WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue(
WifiEntry.PRIVACY_DEVICE_MAC
)
assertThat(preference.entry).isEqualTo(preferenceStrings[prefValue])
@@ -73,7 +73,7 @@
controller.updateState(preference)
- val prefValue = WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
+ val prefValue = WifiPrivacyPreferenceController2.translateWifiEntryPrivacyToPrefValue(
WifiEntry.PRIVACY_RANDOMIZED_MAC
)
assertThat(preference.entry).isEqualTo(preferenceStrings[prefValue])
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index bc5824f..be43f8e 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -32,7 +32,7 @@
"truth",
"kotlinx_coroutines_test",
"Settings-testutils2",
- "MediaDrmSettingsFlagsLib",
+ "servicestests-utils",
// Don't add SettingsLib libraries here - you can use them directly as they are in the
// instrumented Settings app.
],
diff --git a/tests/unit/src/com/android/settings/ResetSubscriptionContractTest.java b/tests/unit/src/com/android/settings/ResetSubscriptionContractTest.java
deleted file mode 100644
index 4443304..0000000
--- a/tests/unit/src/com/android/settings/ResetSubscriptionContractTest.java
+++ /dev/null
@@ -1,109 +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;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class ResetSubscriptionContractTest {
-
- private static final int SUB_ID_1 = 3;
- private static final int SUB_ID_2 = 8;
-
- @Mock
- private SubscriptionManager mSubscriptionManager;
- @Mock
- private OnSubscriptionsChangedListener mOnSubscriptionsChangedListener;
- @Mock
- private SubscriptionInfo mSubscriptionInfo1;
- @Mock
- private SubscriptionInfo mSubscriptionInfo2;
-
- private Context mContext;
- private ResetNetworkRequest mRequestArgs;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- mContext = spy(ApplicationProvider.getApplicationContext());
- mRequestArgs = new ResetNetworkRequest(new Bundle());
- }
-
- private ResetSubscriptionContract createTestObject() {
- return new ResetSubscriptionContract(mContext, mRequestArgs) {
- @Override
- protected SubscriptionManager getSubscriptionManager() {
- return mSubscriptionManager;
- }
- @Override
- protected OnSubscriptionsChangedListener getChangeListener() {
- return mOnSubscriptionsChangedListener;
- }
- };
- }
-
- @Test
- public void getAnyMissingSubscriptionId_returnNull_whenNoSubscriptionChange() {
- mRequestArgs.setResetTelephonyAndNetworkPolicyManager(SUB_ID_1);
- doReturn(mSubscriptionInfo1).when(mSubscriptionManager)
- .getActiveSubscriptionInfo(SUB_ID_1);
- mRequestArgs.setResetApn(SUB_ID_2);
- doReturn(mSubscriptionInfo2).when(mSubscriptionManager)
- .getActiveSubscriptionInfo(SUB_ID_2);
-
- ResetSubscriptionContract target = createTestObject();
-
- verify(mSubscriptionManager).addOnSubscriptionsChangedListener(any(), any());
-
- assertNull(target.getAnyMissingSubscriptionId());
- }
-
- @Test
- public void getAnyMissingSubscriptionId_returnSubId_whenSubscriptionNotActive() {
- mRequestArgs.setResetTelephonyAndNetworkPolicyManager(SUB_ID_1);
- doReturn(mSubscriptionInfo1).when(mSubscriptionManager)
- .getActiveSubscriptionInfo(SUB_ID_1);
- mRequestArgs.setResetApn(SUB_ID_2);
- doReturn(null).when(mSubscriptionManager)
- .getActiveSubscriptionInfo(SUB_ID_2);
-
- ResetSubscriptionContract target = createTestObject();
-
- verify(mSubscriptionManager).addOnSubscriptionsChangedListener(any(), any());
-
- assertEquals(target.getAnyMissingSubscriptionId(), new Integer(SUB_ID_2));
- }
-}
diff --git a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
index e1c0277..7229996 100644
--- a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
@@ -16,6 +16,8 @@
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;
@@ -24,7 +26,12 @@
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;
@@ -33,6 +40,7 @@
import org.junit.Before;
import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,6 +48,8 @@
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;
@@ -88,6 +98,20 @@
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/biometrics2/OWNERS b/tests/unit/src/com/android/settings/biometrics2/OWNERS
deleted file mode 100644
index a257ed8..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include /src/com/android/settings/biometrics/OWNERS
diff --git a/tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java b/tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java
deleted file mode 100644
index 8989595..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/repository/FingerprintRepositoryTest.java
+++ /dev/null
@@ -1,203 +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.biometrics2.repository;
-
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_HOME_BUTTON;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_ULTRASONIC;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UNKNOWN;
-
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.newFingerprintRepository;
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupFingerprintEnrolledFingerprints;
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupSuwMaxFingerprintsEnrollable;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.hardware.biometrics.SensorProperties;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-
-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 java.util.ArrayList;
-
-@RunWith(AndroidJUnit4.class)
-public class FingerprintRepositoryTest {
-
- @Rule public final MockitoRule mockito = MockitoJUnit.rule();
-
- @Mock private Resources mResources;
- @Mock private FingerprintManager mFingerprintManager;
-
- private Context mContext;
-
- @Before
- public void setUp() {
- mContext = ApplicationProvider.getApplicationContext();
- }
-
- @Test
- public void testCanAssumeSensorType_forUnknownSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 1);
- assertThat(repository.canAssumeUdfps()).isFalse();
- assertThat(repository.canAssumeSfps()).isFalse();
- }
-
- @Test
- public void testCanAssumeSensorType_forRearSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_REAR, 1);
- assertThat(repository.canAssumeUdfps()).isFalse();
- assertThat(repository.canAssumeSfps()).isFalse();
- }
-
- @Test
- public void testCanAssumeSensorType_forUdfpsUltrasonicSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UDFPS_ULTRASONIC, 1);
- assertThat(repository.canAssumeUdfps()).isTrue();
- assertThat(repository.canAssumeSfps()).isFalse();
- }
-
- @Test
- public void testCanAssumeSensorType_forUdfpsOpticalSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UDFPS_OPTICAL, 1);
- assertThat(repository.canAssumeUdfps()).isTrue();
- assertThat(repository.canAssumeSfps()).isFalse();
- }
-
- @Test
- public void testCanAssumeSensorType_forPowerButtonSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_POWER_BUTTON, 1);
- assertThat(repository.canAssumeUdfps()).isFalse();
- assertThat(repository.canAssumeSfps()).isTrue();
- }
-
- @Test
- public void testCanAssumeSensorType_forHomeButtonSensor() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_HOME_BUTTON, 1);
- assertThat(repository.canAssumeUdfps()).isFalse();
- assertThat(repository.canAssumeSfps()).isFalse();
- }
-
- @Test
- public void testGetMaxFingerprints() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 999);
- assertThat(repository.getMaxFingerprints()).isEqualTo(999);
- }
-
- @Test
- public void testGetNumOfEnrolledFingerprintsSize() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 999);
- setupFingerprintEnrolledFingerprints(mFingerprintManager, 10, 3);
- setupFingerprintEnrolledFingerprints(mFingerprintManager, 22, 99);
-
- assertThat(repository.getNumOfEnrolledFingerprintsSize(10)).isEqualTo(3);
- assertThat(repository.getNumOfEnrolledFingerprintsSize(22)).isEqualTo(99);
- }
-
- @Test
- public void testGetMaxFingerprintsInSuw() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 999);
- setupSuwMaxFingerprintsEnrollable(mContext, mResources, 333);
- assertThat(repository.getMaxFingerprintsInSuw(mResources))
- .isEqualTo(333);
-
- setupSuwMaxFingerprintsEnrollable(mContext, mResources, 20);
- assertThat(repository.getMaxFingerprintsInSuw(mResources)).isEqualTo(20);
- }
-
- @Test
- public void testGetFirstFingerprintSensorPropertiesInternal() {
- final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
- final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
- 0 /* sensorId */,
- SensorProperties.STRENGTH_STRONG,
- 5,
- new ArrayList<>() /* componentInfo */,
- TYPE_UDFPS_OPTICAL,
- true /* resetLockoutRequiresHardwareAuthToken */);
- props.add(prop);
- doAnswer(invocation -> {
- final IFingerprintAuthenticatorsRegisteredCallback callback =
- invocation.getArgument(0);
- callback.onAllAuthenticatorsRegistered(props);
- return null;
- }).when(mFingerprintManager).addAuthenticatorsRegisteredCallback(any());
-
- final FingerprintRepository repository = new FingerprintRepository(mFingerprintManager);
- assertThat(repository.getFirstFingerprintSensorPropertiesInternal()).isEqualTo(prop);
- }
-
- @Test
- public void testGetEnrollStageCount() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 999);
-
- final int expectedValue = 24;
- doReturn(expectedValue).when(mFingerprintManager).getEnrollStageCount();
-
- assertThat(repository.getEnrollStageCount()).isEqualTo(expectedValue);
- }
-
- @Test
- public void testGetEnrollStageThreshold() {
- final FingerprintRepository repository = newFingerprintRepository(mFingerprintManager,
- TYPE_UNKNOWN, 999);
-
- final float expectedValue0 = 0.42f;
- final float expectedValue1 = 0.24f;
- final float expectedValue2 = 0.33f;
- final float expectedValue3 = 0.90f;
- doReturn(expectedValue0).when(mFingerprintManager).getEnrollStageThreshold(0);
- doReturn(expectedValue1).when(mFingerprintManager).getEnrollStageThreshold(1);
- doReturn(expectedValue2).when(mFingerprintManager).getEnrollStageThreshold(2);
- doReturn(expectedValue3).when(mFingerprintManager).getEnrollStageThreshold(3);
-
- assertThat(repository.getEnrollStageThreshold(2)).isEqualTo(expectedValue2);
- assertThat(repository.getEnrollStageThreshold(1)).isEqualTo(expectedValue1);
- assertThat(repository.getEnrollStageThreshold(3)).isEqualTo(expectedValue3);
- assertThat(repository.getEnrollStageThreshold(0)).isEqualTo(expectedValue0);
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.kt
deleted file mode 100644
index ac62232..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/model/CredentialModelTest.kt
+++ /dev/null
@@ -1,136 +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.biometrics2.ui.model
-
-import android.content.Intent
-import android.os.Bundle
-import android.os.SystemClock
-import android.os.UserHandle
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.password.ChooseLockSettingsHelper
-import com.google.common.truth.Truth
-import org.junit.Test
-import org.junit.runner.RunWith
-import java.util.Arrays
-
-@RunWith(AndroidJUnit4::class)
-class CredentialModelTest {
-
- private val clock = SystemClock.elapsedRealtimeClock()
-
- @Test
- fun testNullBundle() {
- val credentialModel = CredentialModel(null, clock)
- Truth.assertThat(credentialModel.userId).isEqualTo(UserHandle.myUserId())
- }
-
- companion object {
- @JvmStatic
- fun newCredentialModelIntentExtras(
- userId: Int, challenge: Long,
- token: ByteArray?, gkPwHandle: Long
- ): Bundle {
- val bundle = Bundle()
- bundle.putInt(Intent.EXTRA_USER_ID, userId)
- bundle.putLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge)
- bundle.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token)
- bundle.putLong(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle)
- return bundle
- }
-
- @JvmStatic
- fun newValidTokenCredentialIntentExtras(userId: Int): Bundle {
- return newCredentialModelIntentExtras(
- userId, 1L, byteArrayOf(0, 1, 2),
- CredentialModel.INVALID_GK_PW_HANDLE
- )
- }
-
- @JvmStatic
- fun newOnlySensorValidCredentialIntentExtras(userId: Int): Bundle {
- return newCredentialModelIntentExtras(
- userId, CredentialModel.INVALID_CHALLENGE, null,
- CredentialModel.INVALID_GK_PW_HANDLE
- )
- }
-
- @JvmStatic
- fun newGkPwHandleCredentialIntentExtras(userId: Int, gkPwHandle: Long): Bundle {
- return newCredentialModelIntentExtras(
- userId,
- CredentialModel.INVALID_CHALLENGE,
- null,
- gkPwHandle
- )
- }
-
- private fun checkBundleLongValue(
- bundle1: Bundle, bundle2: Bundle,
- key: String
- ) {
- if (!bundle1.containsKey(key)) {
- return
- }
- val value1 = bundle1.getInt(key)
- val value2 = bundle2.getInt(key)
- Truth.assertWithMessage(
- "bundle not match, key:" + key + ", value1:" + value1 + ", value2:"
- + value2
- ).that(value1).isEqualTo(value2)
- }
-
- private fun checkBundleIntValue(
- bundle1: Bundle, bundle2: Bundle,
- key: String
- ) {
- if (!bundle1.containsKey(key)) {
- return
- }
- val value1 = bundle1.getLong(key)
- val value2 = bundle2.getLong(key)
- Truth.assertWithMessage(
- "bundle not match, key:" + key + ", value1:" + value1 + ", value2:"
- + value2
- ).that(value1).isEqualTo(value2)
- }
-
- private fun checkBundleByteArrayValue(
- bundle1: Bundle, bundle2: Bundle,
- key: String
- ) {
- if (!bundle1.containsKey(key)) {
- return
- }
- val value1 = bundle1.getByteArray(key)
- val value2 = bundle2.getByteArray(key)
- val errMsg = ("bundle not match, key:" + key + ", value1:" + Arrays.toString(value1)
- + ", value2:" + Arrays.toString(value2))
- if (value1 == null) {
- Truth.assertWithMessage(errMsg).that(value2).isNull()
- } else {
- Truth.assertWithMessage(errMsg).that(value1.size).isEqualTo(
- value2!!.size
- )
- for (i in value1.indices) {
- Truth.assertWithMessage(errMsg).that(value1[i]).isEqualTo(
- value2[i]
- )
- }
- }
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/model/EnrollmentRequestTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/model/EnrollmentRequestTest.kt
deleted file mode 100644
index b301433..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/model/EnrollmentRequestTest.kt
+++ /dev/null
@@ -1,175 +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.biometrics2.ui.model
-
-import android.content.Context
-import android.content.Intent
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.biometrics.BiometricEnrollActivity
-import com.google.android.setupcompat.util.WizardManagerHelper
-import com.google.common.truth.Truth
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class EnrollmentRequestTest {
-
- private val context = ApplicationProvider.getApplicationContext<Context>()
-
- @Test
- fun testIsSuw() {
- // Default false
- Truth.assertThat(EnrollmentRequest(Intent(), context, true).isSuw).isFalse()
- Truth.assertThat(EnrollmentRequest(Intent(), context, false).isSuw).isFalse()
- val trueIntent = Intent()
- trueIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
- Truth.assertThat(EnrollmentRequest(trueIntent, context, true).isSuw).isTrue()
- Truth.assertThat(EnrollmentRequest(trueIntent, context, false).isSuw).isFalse()
- val falseIntent = Intent()
- trueIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false)
- Truth.assertThat(EnrollmentRequest(falseIntent, context, true).isSuw).isFalse()
- Truth.assertThat(EnrollmentRequest(falseIntent, context, false).isSuw).isFalse()
- }
-
- @Test
- fun testIsAfterSuwOrSuwSuggestedAction() {
- // Default false
- Truth.assertThat(
- EnrollmentRequest(Intent(), context, true)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- Truth.assertThat(
- EnrollmentRequest(Intent(), context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val deferredTrueIntent = Intent()
- deferredTrueIntent.putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, true)
- Truth.assertThat(
- EnrollmentRequest(deferredTrueIntent, context, true)
- .isAfterSuwOrSuwSuggestedAction
- ).isTrue()
- Truth.assertThat(
- EnrollmentRequest(deferredTrueIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val deferredFalseIntent = Intent()
- deferredFalseIntent.putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, false)
- Truth.assertThat(
- EnrollmentRequest(deferredFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- Truth.assertThat(
- EnrollmentRequest(deferredFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val portalTrueIntent = Intent()
- portalTrueIntent.putExtra(WizardManagerHelper.EXTRA_IS_PORTAL_SETUP, true)
- Truth.assertThat(
- EnrollmentRequest(portalTrueIntent, context, true)
- .isAfterSuwOrSuwSuggestedAction
- ).isTrue()
- Truth.assertThat(
- EnrollmentRequest(portalTrueIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val portalFalseIntent = Intent()
- portalFalseIntent.putExtra(WizardManagerHelper.EXTRA_IS_PORTAL_SETUP, false)
- Truth.assertThat(
- EnrollmentRequest(portalFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- Truth.assertThat(
- EnrollmentRequest(portalFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val suggestedTrueIntent = Intent()
- suggestedTrueIntent.putExtra(WizardManagerHelper.EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW, true)
- Truth.assertThat(
- EnrollmentRequest(suggestedTrueIntent, context, true)
- .isAfterSuwOrSuwSuggestedAction
- ).isTrue()
- Truth.assertThat(
- EnrollmentRequest(suggestedTrueIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- val suggestedFalseIntent = Intent()
- suggestedFalseIntent.putExtra(WizardManagerHelper.EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW, false)
- Truth.assertThat(
- EnrollmentRequest(suggestedFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- Truth.assertThat(
- EnrollmentRequest(suggestedFalseIntent, context, false)
- .isAfterSuwOrSuwSuggestedAction
- ).isFalse()
- }
-
- @Test
- fun testGetSuwExtras_inSuw() {
- val suwIntent = Intent()
- suwIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
- val setupRequest = EnrollmentRequest(suwIntent, context, true)
- val bundle = setupRequest.suwExtras
- Truth.assertThat(bundle).isNotNull()
- Truth.assertThat(bundle.size()).isAtLeast(1)
- Truth.assertThat(bundle.getBoolean(WizardManagerHelper.EXTRA_IS_SETUP_FLOW)).isTrue()
- }
-
- @Test
- fun testGetSuwExtras_notInSuw() {
- val suwIntent = Intent()
- suwIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
- val setupRequest = EnrollmentRequest(suwIntent, context, false)
- val bundle = setupRequest.suwExtras
- Truth.assertThat(bundle).isNotNull()
- Truth.assertThat(bundle.size()).isEqualTo(0)
- }
-
- @Test
- fun testIsSkipIntro() {
- // Default false
- Truth.assertThat(EnrollmentRequest(Intent(), context, true).isSkipIntro).isFalse()
- Truth.assertThat(EnrollmentRequest(Intent(), context, false).isSkipIntro).isFalse()
- val trueIntent = Intent()
- trueIntent.putExtra(BiometricEnrollActivity.EXTRA_SKIP_INTRO, true)
- Truth.assertThat(EnrollmentRequest(trueIntent, context, true).isSkipIntro).isTrue()
- Truth.assertThat(EnrollmentRequest(trueIntent, context, false).isSkipIntro).isTrue()
- val falseIntent = Intent()
- falseIntent.putExtra(BiometricEnrollActivity.EXTRA_SKIP_INTRO, false)
- Truth.assertThat(EnrollmentRequest(falseIntent, context, false).isSkipIntro).isFalse()
- Truth.assertThat(EnrollmentRequest(falseIntent, context, false).isSkipIntro).isFalse()
- }
-
- @Test
- fun testIsSkipFindSensor() {
- // Default false
- Truth.assertThat(EnrollmentRequest(Intent(), context, true).isSkipFindSensor)
- .isFalse()
- Truth.assertThat(EnrollmentRequest(Intent(), context, false).isSkipFindSensor)
- .isFalse()
- val trueIntent = Intent()
- trueIntent.putExtra(EnrollmentRequest.EXTRA_SKIP_FIND_SENSOR, true)
- Truth.assertThat(EnrollmentRequest(trueIntent, context, true).isSkipFindSensor).isTrue()
- Truth.assertThat(EnrollmentRequest(trueIntent, context, false).isSkipFindSensor).isTrue()
- val falseIntent = Intent()
- falseIntent.putExtra(EnrollmentRequest.EXTRA_SKIP_FIND_SENSOR, false)
- Truth.assertThat(EnrollmentRequest(falseIntent, context, false).isSkipFindSensor)
- .isFalse()
- Truth.assertThat(EnrollmentRequest(falseIntent, context, false).isSkipFindSensor)
- .isFalse()
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.kt
deleted file mode 100644
index e708f3b..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/AutoCredentialViewModelTest.kt
+++ /dev/null
@@ -1,519 +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.biometrics2.ui.viewmodel
-
-import android.app.Activity
-import android.app.admin.DevicePolicyManager
-import android.content.Intent
-import android.os.Bundle
-import android.os.SystemClock
-import android.os.UserHandle
-import androidx.activity.result.ActivityResult
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.internal.widget.LockPatternUtils
-import com.android.internal.widget.VerifyCredentialResponse
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics2.ui.model.CredentialModel
-import com.android.settings.biometrics2.ui.model.CredentialModelTest.Companion.newGkPwHandleCredentialIntentExtras
-import com.android.settings.biometrics2.ui.model.CredentialModelTest.Companion.newOnlySensorValidCredentialIntentExtras
-import com.android.settings.biometrics2.ui.model.CredentialModelTest.Companion.newValidTokenCredentialIntentExtras
-import com.android.settings.biometrics2.ui.viewmodel.AutoCredentialViewModel.ChallengeGenerator
-import com.android.settings.password.ChooseLockPattern
-import com.android.settings.password.ChooseLockSettingsHelper
-import com.google.common.truth.Truth.assertThat
-import java.util.concurrent.atomic.AtomicBoolean
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-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
-import org.mockito.junit.MockitoJUnit
-import org.mockito.junit.MockitoRule
-import org.mockito.Mockito.`when` as whenever
-
-@RunWith(AndroidJUnit4::class)
-class AutoCredentialViewModelTest {
-
- @get:Rule val mockito: MockitoRule = MockitoJUnit.rule()
-
- @Mock private lateinit var lockPatternUtils: LockPatternUtils
-
- private var challengeGenerator: TestChallengeGenerator = TestChallengeGenerator()
-
- private lateinit var viewModel: AutoCredentialViewModel
- private fun newAutoCredentialViewModel(bundle: Bundle?): AutoCredentialViewModel {
- return AutoCredentialViewModel(
- ApplicationProvider.getApplicationContext(),
- lockPatternUtils,
- challengeGenerator,
- CredentialModel(bundle, SystemClock.elapsedRealtimeClock())
- )
- }
-
- @Before
- fun setUp() {
- challengeGenerator = TestChallengeGenerator()
- }
-
- private fun setupGenerateChallenge(userId: Int, newSensorId: Int, newChallenge: Long) {
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
- challengeGenerator.userId = userId
- challengeGenerator.sensorId = newSensorId
- challengeGenerator.challenge = newChallenge
- }
-
- @Test
- fun testCheckCredential_validCredentialCase() = runTest {
- val userId = 99
- viewModel = newAutoCredentialViewModel(newValidTokenCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(backgroundScope)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.CREDENTIAL_VALID)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
-
- @Test
- fun testCheckCredential_needToChooseLock() = runTest {
- val userId = 100
- viewModel = newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED
- )
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(backgroundScope)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.FAIL_NEED_TO_CHOOSE_LOCK)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
-
- @Test
- fun testCheckCredential_needToConfirmLockForSomething() = runTest {
- val userId = 101
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(backgroundScope)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.FAIL_NEED_TO_CONFIRM_LOCK)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
-
- @Test
- fun testCheckCredential_needToConfirmLockForNumeric() = runTest {
- val userId = 102
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_NUMERIC
- )
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(backgroundScope)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.FAIL_NEED_TO_CONFIRM_LOCK)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
-
- @Test
- fun testCheckCredential_needToConfirmLockForAlphabetic() = runTest {
- val userId = 103
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC
- )
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(this)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.FAIL_NEED_TO_CONFIRM_LOCK)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
-
- @Test
- fun testCheckCredential_generateChallenge() = runTest {
- val userId = 104
- val gkPwHandle = 1111L
- viewModel =
- newAutoCredentialViewModel(newGkPwHandleCredentialIntentExtras(userId, gkPwHandle))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
- val newSensorId = 10
- val newChallenge = 20L
- setupGenerateChallenge(userId, newSensorId, newChallenge)
- whenever(
- lockPatternUtils.verifyGatekeeperPasswordHandle(
- gkPwHandle,
- newChallenge,
- userId
- )
- )
- .thenReturn(newGoodCredential(gkPwHandle, byteArrayOf(1)))
- val hasCalledRemoveGkPwHandle = AtomicBoolean()
- Mockito.doAnswer {
- hasCalledRemoveGkPwHandle.set(true)
- null
- }.`when`(lockPatternUtils).removeGatekeeperPasswordHandle(gkPwHandle)
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(backgroundScope)
- runCurrent()
-
- // Check viewModel behavior
- assertThat(action).isEqualTo(CredentialAction.IS_GENERATING_CHALLENGE)
- assertThat(generateFails.size).isEqualTo(0)
-
- // Check data inside CredentialModel
- assertThat(viewModel.token).isNotNull()
- assertThat(challengeGenerator.callbackRunCount).isEqualTo(1)
- assertThat(hasCalledRemoveGkPwHandle.get()).isFalse()
-
- // Check createGeneratingChallengeExtras()
- val generatingChallengeExtras = viewModel.createGeneratingChallengeExtras()
- assertThat(generatingChallengeExtras).isNotNull()
- assertThat(generatingChallengeExtras!!.getLong(BiometricEnrollBase.EXTRA_KEY_CHALLENGE))
- .isEqualTo(newChallenge)
- val tokens =
- generatingChallengeExtras.getByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN)
- assertThat(tokens).isNotNull()
- assertThat(tokens!!.size).isEqualTo(1)
- assertThat(tokens[0]).isEqualTo(1)
- }
-
- @Test
- fun testCheckCredential_generateChallengeFail() = runTest {
- backgroundScope.launch {
- val userId = 104
- val gkPwHandle = 1111L
- viewModel =
- newAutoCredentialViewModel(newGkPwHandleCredentialIntentExtras(userId, gkPwHandle))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
- val newSensorId = 10
- val newChallenge = 20L
- setupGenerateChallenge(userId, newSensorId, newChallenge)
- whenever(
- lockPatternUtils.verifyGatekeeperPasswordHandle(
- gkPwHandle,
- newChallenge,
- userId
- )
- )
- .thenReturn(newBadCredential(0))
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run credential check
- val action = viewModel.checkCredential(this)
- runCurrent()
-
- assertThat(action).isEqualTo(CredentialAction.IS_GENERATING_CHALLENGE)
- assertThat(generateFails.size).isEqualTo(1)
- assertThat(generateFails[0]).isEqualTo(true)
- assertThat(challengeGenerator.callbackRunCount).isEqualTo(1)
-
- // Check createGeneratingChallengeExtras()
- assertThat(viewModel.createGeneratingChallengeExtras()).isNull()
- }
- }
-
- @Test
- fun testGetUserId_fromIntent() {
- val userId = 106
- viewModel = newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
-
- // Get userId
- assertThat(viewModel.userId).isEqualTo(userId)
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_invalidChooseLock() = runTest {
- backgroundScope.launch {
- val userId = 107
- val gkPwHandle = 3333L
- viewModel =
- newAutoCredentialViewModel(newGkPwHandleCredentialIntentExtras(userId, gkPwHandle))
- val intent = Intent()
- intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle)
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- true,
- ActivityResult(ChooseLockPattern.RESULT_FINISHED + 1, intent),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isFalse()
- assertThat(generateFails.size).isEqualTo(0)
- }
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_invalidConfirmLock() = runTest {
- backgroundScope.launch {
- val userId = 107
- val gkPwHandle = 3333L
- viewModel =
- newAutoCredentialViewModel(newGkPwHandleCredentialIntentExtras(userId, gkPwHandle))
- val intent = Intent()
- intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle)
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- false,
- ActivityResult(Activity.RESULT_OK + 1, intent),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isFalse()
- assertThat(generateFails.size).isEqualTo(0)
- }
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_nullDataChooseLock() = runTest {
- val userId = 108
- val gkPwHandle = 4444L
- viewModel =
- newAutoCredentialViewModel(newGkPwHandleCredentialIntentExtras(userId, gkPwHandle))
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- true,
- ActivityResult(ChooseLockPattern.RESULT_FINISHED, null),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isFalse()
- assertThat(generateFails.size).isEqualTo(0)
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_nullDataConfirmLock() = runTest {
- val userId = 109
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- false,
- ActivityResult(Activity.RESULT_OK, null),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isFalse()
- assertThat(generateFails.size).isEqualTo(0)
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_validChooseLock() = runTest {
- val userId = 108
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
- val gkPwHandle = 6666L
- val newSensorId = 50
- val newChallenge = 60L
- setupGenerateChallenge(userId, newSensorId, newChallenge)
- whenever(
- lockPatternUtils.verifyGatekeeperPasswordHandle(
- gkPwHandle,
- newChallenge,
- userId
- )
- )
- .thenReturn(newGoodCredential(gkPwHandle, byteArrayOf(1)))
- val hasCalledRemoveGkPwHandle = AtomicBoolean()
- Mockito.doAnswer {
- hasCalledRemoveGkPwHandle.set(true)
- null
- }.`when`(lockPatternUtils).removeGatekeeperPasswordHandle(gkPwHandle)
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val intent =
- Intent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle)
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- true,
- ActivityResult(ChooseLockPattern.RESULT_FINISHED, intent),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isTrue()
- assertThat(generateFails.size).isEqualTo(0)
- assertThat(viewModel.token).isNotNull()
- assertThat(challengeGenerator.callbackRunCount).isEqualTo(1)
- assertThat(hasCalledRemoveGkPwHandle.get()).isTrue()
- }
-
- @Test
- fun testGenerateChallengeAsCredentialActivityResult_validConfirmLock() = runTest {
- val userId = 109
- viewModel =
- newAutoCredentialViewModel(newOnlySensorValidCredentialIntentExtras(userId))
- whenever(lockPatternUtils.getActivePasswordQuality(userId)).thenReturn(
- DevicePolicyManager.PASSWORD_QUALITY_SOMETHING
- )
- val gkPwHandle = 5555L
- val newSensorId = 80
- val newChallenge = 90L
- setupGenerateChallenge(userId, newSensorId, newChallenge)
- whenever(
- lockPatternUtils.verifyGatekeeperPasswordHandle(
- gkPwHandle,
- newChallenge,
- userId
- )
- )
- .thenReturn(newGoodCredential(gkPwHandle, byteArrayOf(1)))
- val hasCalledRemoveGkPwHandle = AtomicBoolean()
- Mockito.doAnswer {
- hasCalledRemoveGkPwHandle.set(true)
- null
- }.`when`(lockPatternUtils).removeGatekeeperPasswordHandle(gkPwHandle)
-
- val generateFails = listOfGenerateChallengeFailedFlow()
-
- // Run generateChallengeAsCredentialActivityResult()
- val intent =
- Intent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle)
- val ret = viewModel.generateChallengeAsCredentialActivityResult(
- false,
- ActivityResult(Activity.RESULT_OK, intent),
- backgroundScope
- )
- runCurrent()
-
- assertThat(ret).isTrue()
- assertThat(generateFails.size).isEqualTo(0)
- assertThat(viewModel.token).isNotNull()
- assertThat(challengeGenerator.callbackRunCount).isEqualTo(1)
- assertThat(hasCalledRemoveGkPwHandle.get()).isTrue()
- }
-
- private fun TestScope.listOfGenerateChallengeFailedFlow(): List<Boolean> =
- mutableListOf<Boolean>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.generateChallengeFailedFlow.toList(it)
- }
- }
-
- class TestChallengeGenerator : ChallengeGenerator {
- var sensorId = -1
- var userId = UserHandle.myUserId()
- var challenge = CredentialModel.INVALID_CHALLENGE
- var callbackRunCount = 0
-
- override var callback: AutoCredentialViewModel.GenerateChallengeCallback? = null
-
- override fun generateChallenge(userId: Int) {
- callback?.let {
- it.onChallengeGenerated(sensorId, this.userId, challenge)
- ++callbackRunCount
- }
- }
- }
-
- private fun newGoodCredential(gkPwHandle: Long, hat: ByteArray): VerifyCredentialResponse {
- return VerifyCredentialResponse.Builder()
- .setGatekeeperPasswordHandle(gkPwHandle)
- .setGatekeeperHAT(hat)
- .build()
- }
-
- private fun newBadCredential(timeout: Int): VerifyCredentialResponse {
- return if (timeout > 0) {
- VerifyCredentialResponse.fromTimeout(timeout)
- } else {
- VerifyCredentialResponse.fromError()
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModelTest.java
deleted file mode 100644
index c4ee18e..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceFoldedViewModelTest.java
+++ /dev/null
@@ -1,61 +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.biometrics2.ui.viewmodel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Application;
-import android.content.res.Configuration;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.InstantTaskExecutorRule;
-import com.android.systemui.unfold.compat.ScreenSizeFoldProvider;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class DeviceFoldedViewModelTest {
-
- @Rule public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- private DeviceFoldedViewModel mViewModel;
-
- @Before
- public void setUp() {
- final Application application = ApplicationProvider.getApplicationContext();
- mViewModel = new DeviceFoldedViewModel(new ScreenSizeFoldProvider(application),
- application.getMainExecutor());
- }
-
- @Test
- public void testLiveData() {
- final Configuration config1 = new Configuration();
- config1.smallestScreenWidthDp = 601;
- mViewModel.onConfigurationChanged(config1);
- assertThat(mViewModel.getLiveData().getValue()).isFalse();
-
- final Configuration config2 = new Configuration();
- config2.smallestScreenWidthDp = 599;
- mViewModel.onConfigurationChanged(config2);
- assertThat(mViewModel.getLiveData().getValue()).isTrue();
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModelTest.java
deleted file mode 100644
index 0b7c53c..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/DeviceRotationViewModelTest.java
+++ /dev/null
@@ -1,80 +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.biometrics2.ui.viewmodel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Application;
-import android.view.Surface;
-
-import androidx.annotation.NonNull;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.InstantTaskExecutorRule;
-
-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;
-
-@RunWith(AndroidJUnit4.class)
-public class DeviceRotationViewModelTest {
-
- @Rule public final MockitoRule mockito = MockitoJUnit.rule();
- @Rule public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- private TestDeviceRotationViewModel mViewModel;
-
- @Before
- public void setUp() {
- TestDeviceRotationViewModel.sTestRotation = 3;
- mViewModel = new TestDeviceRotationViewModel(ApplicationProvider.getApplicationContext());
- }
-
- @Test
- public void testDefaultLiveDataNotNull() {
- assertThat(mViewModel.getLiveData().getValue()).isEqualTo(mViewModel.sTestRotation);
- }
-
- @Test
- public void testOnDisplayChange() {
- mViewModel.sTestRotation = 3;
- mViewModel.triggerOnDisplayChanged();
- assertThat(mViewModel.getLiveData().getValue()).isEqualTo(mViewModel.sTestRotation);
- }
-
- public static class TestDeviceRotationViewModel extends DeviceRotationViewModel {
-
- @Surface.Rotation static int sTestRotation = 0;
-
- public TestDeviceRotationViewModel(@NonNull Application application) {
- super(application);
- }
-
- void triggerOnDisplayChanged() {
- mDisplayListener.onDisplayChanged(0);
- }
-
- @Override
- protected int getRotation() {
- return sTestRotation;
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModelTest.java
deleted file mode 100644
index d4fae60..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollEnrollingViewModelTest.java
+++ /dev/null
@@ -1,173 +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.biometrics2.ui.viewmodel;
-
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
-
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG;
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED;
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollEnrollingViewModel.FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP;
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.newFingerprintRepository;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doReturn;
-
-import android.app.Application;
-import android.hardware.biometrics.SensorProperties;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback;
-
-import androidx.lifecycle.LiveData;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-import com.android.settings.testutils.InstantTaskExecutorRule;
-
-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 java.util.ArrayList;
-
-@RunWith(AndroidJUnit4.class)
-public class FingerprintEnrollEnrollingViewModelTest {
-
- private static final int TEST_USER_ID = 33;
-
- @Rule
- public final MockitoRule mockito = MockitoJUnit.rule();
- @Rule
- public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- @Mock
- private FingerprintManager mFingerprintManager;
-
- private Application mApplication;
- private FingerprintEnrollEnrollingViewModel mViewModel;
-
- @Before
- public void setUp() {
- mApplication = ApplicationProvider.getApplicationContext();
- mViewModel = new FingerprintEnrollEnrollingViewModel(
- mApplication,
- TEST_USER_ID,
- newFingerprintRepository(mFingerprintManager, TYPE_UDFPS_OPTICAL, 5)
- );
- }
-
- @Test
- public void testIconTouchDialog() {
- final LiveData<Integer> actionLiveData = mViewModel.getActionLiveData();
- assertThat(actionLiveData.getValue()).isEqualTo(null);
-
- mViewModel.showIconTouchDialog();
- assertThat(actionLiveData.getValue()).isEqualTo(
- FINGERPRINT_ENROLL_ENROLLING_ACTION_SHOW_ICON_TOUCH_DIALOG);
- }
-
- @Test
- public void tesBackPressedScenario() {
- final LiveData<Integer> actionLiveData = mViewModel.getActionLiveData();
- assertThat(actionLiveData.getValue()).isEqualTo(null);
- assertThat(mViewModel.getOnBackPressed()).isEqualTo(false);
-
- mViewModel.setOnBackPressed();
- assertThat(mViewModel.getOnBackPressed()).isEqualTo(true);
-
- mViewModel.onCancelledDueToOnBackPressed();
- assertThat(mViewModel.getOnBackPressed()).isEqualTo(false);
- assertThat(actionLiveData.getValue()).isEqualTo(
- FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_BACK_PRESSED);
- }
-
- @Test
- public void testSkipPressedScenario() {
- final LiveData<Integer> actionLiveData = mViewModel.getActionLiveData();
- assertThat(actionLiveData.getValue()).isEqualTo(null);
- assertThat(mViewModel.getOnSkipPressed()).isEqualTo(false);
-
- mViewModel.setOnSkipPressed();
- assertThat(mViewModel.getOnSkipPressed()).isEqualTo(true);
-
- mViewModel.onCancelledDueToOnSkipPressed();
- assertThat(mViewModel.getOnSkipPressed()).isEqualTo(false);
- assertThat(actionLiveData.getValue()).isEqualTo(
- FINGERPRINT_ENROLL_ENROLLING_CANCELED_BECAUSE_USER_SKIP);
- }
-
- @Test
- public void testGetFirstFingerprintSensorPropertiesInternal() {
- final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
- final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
- 0 /* sensorId */,
- SensorProperties.STRENGTH_STRONG,
- 5,
- new ArrayList<>() /* componentInfo */,
- TYPE_UDFPS_OPTICAL,
- true /* resetLockoutRequiresHardwareAuthToken */);
- props.add(prop);
- doAnswer(invocation -> {
- final IFingerprintAuthenticatorsRegisteredCallback callback =
- invocation.getArgument(0);
- callback.onAllAuthenticatorsRegistered(props);
- return null;
- }).when(mFingerprintManager).addAuthenticatorsRegisteredCallback(any());
-
- mViewModel = new FingerprintEnrollEnrollingViewModel(
- mApplication,
- TEST_USER_ID,
- new FingerprintRepository(mFingerprintManager)
- );
-
- assertThat(mViewModel.getFirstFingerprintSensorPropertiesInternal()).isEqualTo(prop);
- }
-
- @Test
- public void testGetEnrollStageCount() {
- final int expectedValue = 24;
- doReturn(expectedValue).when(mFingerprintManager).getEnrollStageCount();
-
- assertThat(mViewModel.getEnrollStageCount()).isEqualTo(expectedValue);
- }
-
- @Test
- public void testGetEnrollStageThreshold() {
- final float expectedValue0 = 0.42f;
- final float expectedValue1 = 0.24f;
- final float expectedValue2 = 0.33f;
- final float expectedValue3 = 0.90f;
-
- doReturn(expectedValue0).when(mFingerprintManager).getEnrollStageThreshold(0);
- doReturn(expectedValue1).when(mFingerprintManager).getEnrollStageThreshold(1);
- doReturn(expectedValue2).when(mFingerprintManager).getEnrollStageThreshold(2);
- doReturn(expectedValue3).when(mFingerprintManager).getEnrollStageThreshold(3);
-
- assertThat(mViewModel.getEnrollStageThreshold(2)).isEqualTo(expectedValue2);
- assertThat(mViewModel.getEnrollStageThreshold(1)).isEqualTo(expectedValue1);
- assertThat(mViewModel.getEnrollStageThreshold(3)).isEqualTo(expectedValue3);
- assertThat(mViewModel.getEnrollStageThreshold(0)).isEqualTo(expectedValue0);
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModelTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModelTest.kt
deleted file mode 100644
index 379a5c1..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollErrorDialogViewModelTest.kt
+++ /dev/null
@@ -1,121 +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.biometrics2.ui.viewmodel
-
-import android.app.Application
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintErrorDialogSetResultAction.FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.runCurrent
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class FingerprintEnrollErrorDialogViewModelTest {
-
- private val application = ApplicationProvider.getApplicationContext<Application>()
- private var viewModel: FingerprintEnrollErrorDialogViewModel =
- FingerprintEnrollErrorDialogViewModel(application, false)
-
- @Before
- fun setUp() {
- // Make sure viewModel is new for each test
- viewModel = FingerprintEnrollErrorDialogViewModel(application, false)
- }
-
- @Test
- fun testIsDialogNotShownDefaultFalse() {
- assertThat(viewModel.isDialogShown).isFalse()
- }
-
- @Test
- fun testIsSuw() {
- assertThat(FingerprintEnrollErrorDialogViewModel(application, false).isSuw).isFalse()
- assertThat(FingerprintEnrollErrorDialogViewModel(application, true).isSuw).isTrue()
- }
-
- @Test
- fun testNewDialog() = runTest {
- val newDialogs: List<Int> = mutableListOf<Int>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.newDialogFlow.toList(it)
- }
- }
-
- runCurrent()
-
- // Default values
- assertThat(viewModel.isDialogShown).isFalse()
- assertThat(newDialogs.size).isEqualTo(0)
-
- val testErrorMsgId = 3456
- viewModel.newDialog(testErrorMsgId)
- runCurrent()
-
- // verify after emit
- assertThat(viewModel.isDialogShown).isTrue()
- assertThat(newDialogs.size).isEqualTo(1)
- assertThat(newDialogs[0]).isEqualTo(testErrorMsgId)
- }
-
- @Test
- fun testTriggerRetry() = runTest {
- val triggerRetries: List<Any> = mutableListOf<Any>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.triggerRetryFlow.toList(it)
- }
- }
-
- runCurrent()
-
- // Default values
- assertThat(triggerRetries.size).isEqualTo(0)
-
- viewModel.triggerRetry()
- runCurrent()
-
- // verify after emit
- assertThat(triggerRetries.size).isEqualTo(1)
- }
-
- @Test
- fun testSetResultFinish() = runTest {
- val setResults: List<FingerprintErrorDialogSetResultAction> =
- mutableListOf<FingerprintErrorDialogSetResultAction>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.setResultFlow.toList(it)
- }
- }
-
- runCurrent()
-
- // Default values
- assertThat(setResults.size).isEqualTo(0)
-
- viewModel.setResultAndFinish(FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH)
- runCurrent()
-
- // verify after emit
- assertThat(setResults.size).isEqualTo(1)
- assertThat(setResults[0]).isEqualTo(FINGERPRINT_ERROR_DIALOG_ACTION_SET_RESULT_FINISH)
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModelTest.java
deleted file mode 100644
index 18bd61a..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFindSensorViewModelTest.java
+++ /dev/null
@@ -1,91 +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.biometrics2.ui.viewmodel;
-
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG;
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP;
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFindSensorViewModel.FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Application;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.InstantTaskExecutorRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class FingerprintEnrollFindSensorViewModelTest {
-
- @Rule public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- private Application mApplication;
- private FingerprintEnrollFindSensorViewModel mViewModel;
-
- @Before
- public void setUp() {
- mApplication = ApplicationProvider.getApplicationContext();
- mViewModel = new FingerprintEnrollFindSensorViewModel(mApplication, false);
- }
-
- @Test
- public void testClickSkipButtonNotInSuw() {
- mViewModel = new FingerprintEnrollFindSensorViewModel(mApplication, false);
- mViewModel.onSkipButtonClick();
- assertThat(mViewModel.getActionLiveData().getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP);
- }
-
- @Test
- public void testClickSkipButtonInSuw() {
- mViewModel = new FingerprintEnrollFindSensorViewModel(mApplication, true);
- mViewModel.onSkipButtonClick();
- assertThat(mViewModel.getActionLiveData().getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_DIALOG);
- }
-
- @Test
- public void testClickSkipDialogButton() {
- mViewModel.onSkipDialogButtonClick();
- assertThat(mViewModel.getActionLiveData().getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_SKIP);
- }
-
- @Test
- public void testClickStartDialogButton() {
- mViewModel.onStartButtonClick();
- assertThat(mViewModel.getActionLiveData().getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FIND_SENSOR_ACTION_START);
- }
-
- @Test
- public void testClearActionLiveData() {
- assertThat(mViewModel.getActionLiveData().getValue()).isNull();
-
- mViewModel.onStartButtonClick();
- assertThat(mViewModel.getActionLiveData().getValue()).isNotNull();
-
- mViewModel.clearActionLiveData();
- assertThat(mViewModel.getActionLiveData().getValue()).isNull();
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModelTest.java
deleted file mode 100644
index ac97e72..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollFinishViewModelTest.java
+++ /dev/null
@@ -1,134 +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.biometrics2.ui.viewmodel;
-
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_POWER_BUTTON;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_REAR;
-import static android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL;
-
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel.FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK;
-import static com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollFinishViewModel.FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK;
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.newFingerprintRepository;
-import static com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupFingerprintEnrolledFingerprints;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Application;
-import android.content.Intent;
-import android.hardware.fingerprint.FingerprintManager;
-
-import androidx.lifecycle.LiveData;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest;
-import com.android.settings.testutils.InstantTaskExecutorRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class FingerprintEnrollFinishViewModelTest {
-
- private static final int USER_ID = 334;
- private static final int MAX_ENROLLABLE = 5;
-
- @Rule public final MockitoRule mockito = MockitoJUnit.rule();
- @Rule public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- @Mock private FingerprintManager mFingerprintManager;
-
- private Application mApplication;
- private EnrollmentRequest mRequest;
- private FingerprintEnrollFinishViewModel mViewModel;
-
- @Before
- public void setUp() {
- mApplication = ApplicationProvider.getApplicationContext();
- mRequest = new EnrollmentRequest(new Intent(), mApplication, true);
- mViewModel = new FingerprintEnrollFinishViewModel(mApplication, USER_ID, mRequest,
- newFingerprintRepository(mFingerprintManager, TYPE_UDFPS_OPTICAL, MAX_ENROLLABLE));
- }
-
- @Test
- public void testCanAssumeSfps() {
- mViewModel = new FingerprintEnrollFinishViewModel(mApplication, USER_ID, mRequest,
- newFingerprintRepository(mFingerprintManager, TYPE_UDFPS_OPTICAL, MAX_ENROLLABLE));
- assertThat(mViewModel.canAssumeSfps()).isFalse();
-
- mViewModel = new FingerprintEnrollFinishViewModel(mApplication, USER_ID, mRequest,
- newFingerprintRepository(mFingerprintManager, TYPE_REAR, MAX_ENROLLABLE));
- assertThat(mViewModel.canAssumeSfps()).isFalse();
-
- mViewModel = new FingerprintEnrollFinishViewModel(mApplication, USER_ID, mRequest,
- newFingerprintRepository(mFingerprintManager, TYPE_POWER_BUTTON, MAX_ENROLLABLE));
- assertThat(mViewModel.canAssumeSfps()).isTrue();
- }
-
- @Test
- public void testIsAnotherFingerprintEnrollable() {
- setupFingerprintEnrolledFingerprints(mFingerprintManager, USER_ID, MAX_ENROLLABLE);
- assertThat(mViewModel.isAnotherFingerprintEnrollable()).isFalse();
-
- setupFingerprintEnrolledFingerprints(mFingerprintManager, USER_ID, MAX_ENROLLABLE - 1);
- assertThat(mViewModel.isAnotherFingerprintEnrollable()).isTrue();
- }
-
- @Test
- public void testGetRequest() {
- assertThat(mViewModel.getRequest()).isEqualTo(mRequest);
- }
-
- @Test
- public void testOnAddButtonClick() {
- final LiveData<Integer> actionLiveData = mViewModel.getActionLiveData();
-
- // Test init value
- assertThat(actionLiveData.getValue()).isNull();
-
- // Test onAddButtonClick()
- mViewModel.onAddButtonClick();
- assertThat(actionLiveData.getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FINISH_ACTION_ADD_BUTTON_CLICK);
-
- // Clear
- mViewModel.clearActionLiveData();
- assertThat(actionLiveData.getValue()).isNull();
- }
-
- @Test
- public void testOnNextButtonClick() {
- final LiveData<Integer> actionLiveData = mViewModel.getActionLiveData();
-
- // Test init value
- assertThat(actionLiveData.getValue()).isNull();
-
- // Test onNextButtonClick()
- mViewModel.onNextButtonClick();
- assertThat(actionLiveData.getValue()).isEqualTo(
- FINGERPRINT_ENROLL_FINISH_ACTION_NEXT_BUTTON_CLICK);
-
- // Clear
- mViewModel.clearActionLiveData();
- assertThat(actionLiveData.getValue()).isNull();
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.kt
deleted file mode 100644
index 7494aef..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollIntroViewModelTest.kt
+++ /dev/null
@@ -1,357 +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.biometrics2.ui.viewmodel
-
-import android.app.Application
-import android.content.res.Resources
-import android.hardware.fingerprint.FingerprintManager
-import android.hardware.fingerprint.FingerprintSensorProperties.TYPE_UDFPS_OPTICAL
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.biometrics2.data.repository.FingerprintRepository
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollIntroStatus
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
-import com.android.settings.biometrics2.ui.model.FingerprintEnrollable.FINGERPRINT_ENROLLABLE_OK
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.CONTINUE_ENROLL
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.DONE_AND_FINISH
-import com.android.settings.biometrics2.ui.viewmodel.FingerprintEnrollIntroAction.SKIP_OR_CANCEL
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newAllFalseRequest
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newIsSuwDeferredRequest
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newIsSuwPortalRequest
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newIsSuwRequest
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newIsSuwSuggestedActionFlowRequest
-import com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.newFingerprintRepository
-import com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupFingerprintEnrolledFingerprints
-import com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupSuwMaxFingerprintsEnrollable
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-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
-import org.mockito.junit.MockitoJUnit
-
-@RunWith(AndroidJUnit4::class)
-class FingerprintEnrollIntroViewModelTest {
-
- @get:Rule val mockito = MockitoJUnit.rule()
-
- @Mock private lateinit var resources: Resources
- @Mock private lateinit var fingerprintManager: FingerprintManager
-
- private var application: Application = ApplicationProvider.getApplicationContext()
-
- private fun newFingerprintEnrollIntroViewModel(
- fingerprintRepository: FingerprintRepository,
- enrollmentRequest: EnrollmentRequest
- ) = FingerprintEnrollIntroViewModel(
- application,
- fingerprintRepository,
- enrollmentRequest,
- TEST_USER_ID
- )
-
- @Before
- fun setUp() {
- application = ApplicationProvider.getApplicationContext()
- }
-
- @Test
- fun testPageStatusFlowDefaultAndUpdate() = runTest {
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 1),
- newAllFalseRequest(application)
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
-
- runCurrent()
-
- // assert default values
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].hasScrollToBottom()).isFalse()
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_OK)
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 1)
- viewModel.updateEnrollableStatus(backgroundScope)
- runCurrent()
-
- // assert new updated value
- assertThat(statusList.size).isEqualTo(2)
- assertThat(statusList[1].hasScrollToBottom()).isFalse()
- assertThat(statusList[1].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX)
- }
-
- fun testOnStartToUpdateEnrollableStatusOk_isSuw() = runTest {
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 0)
- setupSuwMaxFingerprintsEnrollable(application, resources, 1)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newIsSuwRequest(application)
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
-
- runCurrent()
-
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_OK)
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusReachMax_isSuw() = runTest {
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 1)
- setupSuwMaxFingerprintsEnrollable(application, resources, 1)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newIsSuwRequest(application)
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
-
- runCurrent()
-
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX)
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusOk_isNotSuw() = runTest {
- testOnStartToUpdateEnrollableStatusOk(newAllFalseRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusReachMax_isNotSuw() = runTest {
- testOnStartToUpdateEnrollableStatusReachMax(newAllFalseRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusOk_isSuwDeferred() = runTest {
- testOnStartToUpdateEnrollableStatusOk(newIsSuwDeferredRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusReachMax_isSuwDeferred() = runTest {
- testOnStartToUpdateEnrollableStatusReachMax(newIsSuwDeferredRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusOk_isSuwPortal() = runTest {
- testOnStartToUpdateEnrollableStatusOk(newIsSuwPortalRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusReachMax_isSuwPortal() = runTest {
- testOnStartToUpdateEnrollableStatusReachMax(newIsSuwPortalRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusOk_isSuwSuggestedActionFlow() = runTest {
- testOnStartToUpdateEnrollableStatusOk(newIsSuwSuggestedActionFlowRequest(application))
- }
-
- @Test
- fun testOnStartToUpdateEnrollableStatusReachMax_isSuwSuggestedActionFlow() = runTest {
- testOnStartToUpdateEnrollableStatusReachMax(
- newIsSuwSuggestedActionFlowRequest(application)
- )
- }
-
- private fun TestScope.testOnStartToUpdateEnrollableStatusOk(request: EnrollmentRequest) {
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 0)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- request
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
-
- runCurrent()
-
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_OK)
- }
-
- private fun TestScope.testOnStartToUpdateEnrollableStatusReachMax(request: EnrollmentRequest) {
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 5)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- request
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
-
- runCurrent()
-
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX)
- }
-
- @Test
- fun testIsParentalConsentRequired() {
- // We shall not mock FingerprintRepository, but
- // FingerprintRepository.isParentalConsentRequired() calls static method inside, we can't
- // mock static method
- val fingerprintRepository = Mockito.mock(
- FingerprintRepository::class.java
- )
- val viewModel = FingerprintEnrollIntroViewModel(
- application,
- fingerprintRepository,
- newAllFalseRequest(application),
- TEST_USER_ID
- )
- Mockito.`when`(
- fingerprintRepository.isParentalConsentRequired(application)
- ).thenReturn(true)
- assertThat(viewModel.isParentalConsentRequired).isEqualTo(true)
- Mockito.`when`(
- fingerprintRepository.isParentalConsentRequired(application)
- ).thenReturn(false)
- assertThat(viewModel.isParentalConsentRequired).isEqualTo(false)
- }
-
- @Test
- fun testIsBiometricUnlockDisabledByAdmin() {
- // We shall not mock FingerprintRepository, but
- // FingerprintRepository.isDisabledByAdmin() calls static method inside, we can't mock
- // static method
- val fingerprintRepository = Mockito.mock(FingerprintRepository::class.java)
- val viewModel = FingerprintEnrollIntroViewModel(
- application,
- fingerprintRepository,
- newAllFalseRequest(application),
- TEST_USER_ID
- )
- Mockito.`when`(
- fingerprintRepository.isDisabledByAdmin(application, TEST_USER_ID)
- ).thenReturn(true)
- assertThat(viewModel.isBiometricUnlockDisabledByAdmin).isEqualTo(true)
- Mockito.`when`(
- fingerprintRepository.isDisabledByAdmin(application, TEST_USER_ID)
- ).thenReturn(false)
- assertThat(viewModel.isBiometricUnlockDisabledByAdmin).isEqualTo(false)
- }
-
- @Test
- fun testSetHasScrolledToBottom() = runTest {
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newAllFalseRequest(application)
- )
-
- val pageStatusList = listOfPageStatusFlow(viewModel)
-
- viewModel.setHasScrolledToBottom(true, backgroundScope)
- runCurrent()
-
- assertThat(pageStatusList[pageStatusList.size-1].hasScrollToBottom()).isEqualTo(true)
- }
-
- @Test
- fun testOnNextButtonClick_enrollNext() = runTest {
- // Set latest status to FINGERPRINT_ENROLLABLE_OK
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 0)
- setupSuwMaxFingerprintsEnrollable(application, resources, 1)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newIsSuwRequest(application)
- )
-
- val actions = listOfActionFlow(viewModel)
-
- // Perform click on `next`
- viewModel.onNextButtonClick(backgroundScope)
- runCurrent()
-
- assertThat(actions.size).isEqualTo(1)
- assertThat(actions[0]).isEqualTo(CONTINUE_ENROLL)
- }
-
- @Test
- fun testOnNextButtonClick_doneAndFinish() = runTest {
- // Set latest status to FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX
- setupFingerprintEnrolledFingerprints(fingerprintManager, TEST_USER_ID, 1)
- setupSuwMaxFingerprintsEnrollable(application, resources, 1)
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newIsSuwRequest(application)
- )
-
- val statusList = listOfPageStatusFlow(viewModel)
- val actionList = listOfActionFlow(viewModel)
-
- runCurrent()
-
- assertThat(statusList.size).isEqualTo(1)
- assertThat(statusList[0].enrollableStatus).isEqualTo(FINGERPRINT_ENROLLABLE_ERROR_REACH_MAX)
-
- val actions = listOfActionFlow(viewModel)
-
- // Perform click on `next`
- viewModel.onNextButtonClick(backgroundScope)
- runCurrent()
-
- assertThat(actionList.size).isEqualTo(1)
- assertThat(actionList[0]).isEqualTo(DONE_AND_FINISH)
- }
-
- @Test
- fun testOnSkipOrCancelButtonClick() = runTest {
- val viewModel = newFingerprintEnrollIntroViewModel(
- newFingerprintRepository(fingerprintManager, TYPE_UDFPS_OPTICAL, 5),
- newAllFalseRequest(application)
- )
-
- val actions = listOfActionFlow(viewModel)
-
- viewModel.onSkipOrCancelButtonClick(backgroundScope)
- runCurrent()
-
- assertThat(actions.size).isEqualTo(1)
- assertThat(actions[0]).isEqualTo(SKIP_OR_CANCEL)
- }
-
- private fun TestScope.listOfActionFlow(
- viewModel: FingerprintEnrollIntroViewModel
- ): List<FingerprintEnrollIntroAction> =
- mutableListOf<FingerprintEnrollIntroAction>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.actionFlow.toList(it)
- }
- }
-
- private fun TestScope.listOfPageStatusFlow(
- viewModel: FingerprintEnrollIntroViewModel
- ): List<FingerprintEnrollIntroStatus> =
- mutableListOf<FingerprintEnrollIntroStatus>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.pageStatusFlow.toList(it)
- }
- }
-
- companion object {
- private const val TEST_USER_ID = 33
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java
deleted file mode 100644
index 2c7afa6..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollProgressViewModelTest.java
+++ /dev/null
@@ -1,421 +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.biometrics2.ui.viewmodel;
-
-import static android.hardware.fingerprint.FingerprintManager.ENROLL_ENROLL;
-import static android.hardware.fingerprint.FingerprintManager.ENROLL_FIND_SENSOR;
-import static android.hardware.fingerprint.FingerprintManager.EnrollReason;
-import static android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-
-import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.only;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Application;
-import android.content.res.Resources;
-import android.os.CancellationSignal;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-
-import androidx.annotation.NonNull;
-import androidx.lifecycle.LiveData;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.biometrics.fingerprint.FingerprintUpdater;
-import com.android.settings.biometrics.fingerprint.MessageDisplayController;
-import com.android.settings.biometrics2.ui.model.EnrollmentProgress;
-import com.android.settings.biometrics2.ui.model.EnrollmentStatusMessage;
-import com.android.settings.testutils.InstantTaskExecutorRule;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class FingerprintEnrollProgressViewModelTest {
-
- private static final int TEST_USER_ID = 334;
-
- @Rule public final MockitoRule mockito = MockitoJUnit.rule();
- @Rule public final InstantTaskExecutorRule mTaskExecutorRule = new InstantTaskExecutorRule();
-
- @Mock private Application mApplication;
- @Mock private Resources mResources;
- @Mock private FingerprintUpdater mFingerprintUpdater;
-
- private FingerprintEnrollProgressViewModel mViewModel;
- private final TestWrapper<CancellationSignal> mCancellationSignalWrapper = new TestWrapper<>();
- private final TestWrapper<EnrollmentCallback> mCallbackWrapper = new TestWrapper<>();
- private int mEnrollmentMessageDisplayControllerFlagResId;
-
- @Before
- public void setUp() {
- mEnrollmentMessageDisplayControllerFlagResId = ApplicationProvider.getApplicationContext()
- .getResources().getIdentifier("enrollment_message_display_controller_flag", "bool",
- SETTINGS_PACKAGE_NAME);
-
- when(mApplication.getResources()).thenReturn(mResources);
-
- // Not use MessageDisplayController by default
- when(mResources.getBoolean(mEnrollmentMessageDisplayControllerFlagResId)).thenReturn(false);
- mViewModel = new FingerprintEnrollProgressViewModel(mApplication, mFingerprintUpdater,
- TEST_USER_ID);
-
- mCancellationSignalWrapper.mValue = null;
- mCallbackWrapper.mValue = null;
- doAnswer(invocation -> {
- mCancellationSignalWrapper.mValue = invocation.getArgument(1);
- mCallbackWrapper.mValue = invocation.getArgument(3);
- return null;
- }).when(mFingerprintUpdater).enroll(any(byte[].class), any(CancellationSignal.class),
- eq(TEST_USER_ID), any(EnrollmentCallback.class), anyInt(), any());
- }
-
- @Test
- public void testStartFindSensor() {
- @EnrollReason final int enrollReason = ENROLL_FIND_SENSOR;
- final byte[] token = new byte[] { 1, 2, 3 };
- mViewModel.setToken(token);
-
- // Start enrollment
- final Object ret = mViewModel.startEnrollment(enrollReason);
-
- assertThat(ret).isNotNull();
- verify(mFingerprintUpdater, only()).enroll(eq(token), any(CancellationSignal.class),
- eq(TEST_USER_ID), any(EnrollmentCallback.class), eq(enrollReason), any());
- assertThat(mCallbackWrapper.mValue instanceof MessageDisplayController).isFalse();
- }
-
- @Test
- public void testStartEnrolling() {
- @EnrollReason final int enrollReason = ENROLL_ENROLL;
- final byte[] token = new byte[] { 1, 2, 3 };
- mViewModel.setToken(token);
-
- // Start enrollment
- final Object ret = mViewModel.startEnrollment(enrollReason);
-
- assertThat(ret).isNotNull();
- verify(mFingerprintUpdater, only()).enroll(eq(token), any(CancellationSignal.class),
- eq(TEST_USER_ID), any(EnrollmentCallback.class), eq(enrollReason), any());
- assertThat(mCallbackWrapper.mValue instanceof MessageDisplayController).isFalse();
- }
-
- @Test
- public void testStartEnrollingWithMessageDisplayController() {
- // Enable MessageDisplayController and mock handler for it
- when(mResources.getBoolean(mEnrollmentMessageDisplayControllerFlagResId)).thenReturn(true);
- when(mApplication.getMainThreadHandler()).thenReturn(new TestHandler());
-
- @EnrollReason final int enrollReason = ENROLL_ENROLL;
- final byte[] token = new byte[] { 1, 2, 3 };
- mViewModel.setToken(token);
-
- // Start enrollment
- final Object ret = mViewModel.startEnrollment(enrollReason);
-
- assertThat(ret).isNotNull();
- verify(mFingerprintUpdater, only()).enroll(eq(token), any(CancellationSignal.class),
- eq(TEST_USER_ID), any(MessageDisplayController.class), eq(enrollReason), any());
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- assertThat(mCallbackWrapper.mValue instanceof MessageDisplayController).isTrue();
- final EnrollmentCallback callback1 = mCallbackWrapper.mValue;
-
- // Cancel and start again
- mViewModel.cancelEnrollment();
- mViewModel.startEnrollment(enrollReason);
-
- // Shall not use the same MessageDisplayController
- verify(mFingerprintUpdater, times(2)).enroll(eq(token), any(CancellationSignal.class),
- eq(TEST_USER_ID), any(MessageDisplayController.class), eq(enrollReason), any());
- assertThat(mCallbackWrapper.mValue).isNotNull();
- assertThat(callback1).isNotEqualTo(mCallbackWrapper.mValue);
- }
-
- @Test
- public void testStartEnrollmentFailBecauseOfNoToken() {
- // Start enrollment
- final Object ret = mViewModel.startEnrollment(ENROLL_FIND_SENSOR);
-
- assertThat(ret).isNull();
- verify(mFingerprintUpdater, never()).enroll(any(byte[].class),
- any(CancellationSignal.class), anyInt(), any(EnrollmentCallback.class), anyInt(),
- any());
- }
-
- @Test
- public void testCancelEnrollment() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCancellationSignalWrapper.mValue).isNotNull();
-
- // Cancel enrollment
- mViewModel.cancelEnrollment();
-
- assertThat(mCancellationSignalWrapper.mValue.isCanceled()).isTrue();
- }
-
- @Test
- public void testProgressUpdate() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Test default value
- final LiveData<EnrollmentProgress> progressLiveData = mViewModel.getProgressLiveData();
- EnrollmentProgress progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(-1);
- assertThat(progress.getRemaining()).isEqualTo(0);
-
- // Update first progress
- mCallbackWrapper.mValue.onEnrollmentProgress(25);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(25);
-
- // Update second progress
- mCallbackWrapper.mValue.onEnrollmentProgress(20);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(20);
-
- // Update latest progress
- mCallbackWrapper.mValue.onEnrollmentProgress(0);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(0);
- }
-
- @Test
- public void testProgressUpdateClearHelpMessage() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
- final LiveData<EnrollmentProgress> progressLiveData = mViewModel.getProgressLiveData();
- final LiveData<EnrollmentStatusMessage> helpMsgLiveData =
- mViewModel.getHelpMessageLiveData();
-
- // Update first progress
- mCallbackWrapper.mValue.onEnrollmentProgress(25);
- EnrollmentProgress progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(25);
-
- // Update help message
- final int testHelpMsgId = 3;
- final String testHelpString = "Test Help String";
- mCallbackWrapper.mValue.onEnrollmentHelp(testHelpMsgId, testHelpString);
- final EnrollmentStatusMessage helpMsg = helpMsgLiveData.getValue();
- assertThat(helpMsg).isNotNull();
- assertThat(helpMsg.getMsgId()).isEqualTo(testHelpMsgId);
- assertThat(helpMsg.getStr().toString()).isEqualTo(testHelpString);
-
- // Update second progress
- mCallbackWrapper.mValue.onEnrollmentProgress(20);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(20);
-
- // Help message shall be set to null
- assertThat(helpMsgLiveData.getValue()).isNull();
- }
-
- @Test
- public void testProgressUpdateWithMessageDisplayController() {
- // Enable MessageDisplayController and mock handler for it
- when(mResources.getBoolean(mEnrollmentMessageDisplayControllerFlagResId)).thenReturn(true);
- when(mApplication.getMainThreadHandler()).thenReturn(new TestHandler());
-
- mViewModel.setToken(new byte[] { 1, 2, 3 });
-
- // Start enrollment
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Test default value
- final LiveData<EnrollmentProgress> progressLiveData = mViewModel.getProgressLiveData();
- EnrollmentProgress progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(-1);
- assertThat(progress.getRemaining()).isEqualTo(0);
-
- // Update first progress
- mCallbackWrapper.mValue.onEnrollmentProgress(25);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(25);
-
- // Update second progress
- mCallbackWrapper.mValue.onEnrollmentProgress(20);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(20);
-
- // Update latest progress
- mCallbackWrapper.mValue.onEnrollmentProgress(0);
- progress = progressLiveData.getValue();
- assertThat(progress).isNotNull();
- assertThat(progress.getSteps()).isEqualTo(25);
- assertThat(progress.getRemaining()).isEqualTo(0);
- }
-
- @Test
- public void testGetErrorMessageLiveData() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Check default value
- final LiveData<EnrollmentStatusMessage> liveData = mViewModel.getErrorMessageLiveData();
- assertThat(liveData.getValue()).isNull();
-
- // Notify error message
- final int errMsgId = 3;
- final String errMsg = "test error message";
- mCallbackWrapper.mValue.onEnrollmentError(errMsgId, errMsg);
- final EnrollmentStatusMessage value = liveData.getValue();
- assertThat(value).isNotNull();
- assertThat(value.getMsgId()).isEqualTo(errMsgId);
- assertThat(value.getStr().toString()).isEqualTo(errMsg);
- }
-
- @Test
- public void testGetHelpMessageLiveData() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Check default value
- final LiveData<EnrollmentStatusMessage> liveData = mViewModel.getHelpMessageLiveData();
- assertThat(liveData.getValue()).isNull();
-
- // Notify help message
- final int errMsgId = 3;
- final String errMsg = "test error message";
- mCallbackWrapper.mValue.onEnrollmentHelp(errMsgId, errMsg);
- final EnrollmentStatusMessage value = liveData.getValue();
- assertThat(value).isNotNull();
- assertThat(value.getMsgId()).isEqualTo(errMsgId);
- assertThat(value.getStr().toString()).isEqualTo(errMsg);
- }
-
- @Test
- public void testGetAcquireLiveData() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Check default value
- final LiveData<Boolean> liveData = mViewModel.getAcquireLiveData();
- assertThat(liveData.getValue()).isNull();
-
- // Notify acquire message
- mCallbackWrapper.mValue.onAcquired(true);
- assertThat(liveData.getValue()).isTrue();
- }
-
- @Test
- public void testGetPointerDownLiveData() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Check default value
- final LiveData<Integer> liveData = mViewModel.getPointerDownLiveData();
- assertThat(liveData.getValue()).isNull();
-
- // Notify acquire message
- final int value = 33;
- mCallbackWrapper.mValue.onUdfpsPointerDown(value);
- assertThat(liveData.getValue()).isEqualTo(value);
- }
-
- @Test
- public void testGetPointerUpLiveData() {
- // Start enrollment
- mViewModel.setToken(new byte[] { 1, 2, 3 });
- final Object ret = mViewModel.startEnrollment(ENROLL_ENROLL);
- assertThat(ret).isNotNull();
- assertThat(mCallbackWrapper.mValue).isNotNull();
-
- // Check default value
- final LiveData<Integer> liveData = mViewModel.getPointerUpLiveData();
- assertThat(liveData.getValue()).isNull();
-
- // Notify acquire message
- final int value = 44;
- mCallbackWrapper.mValue.onUdfpsPointerUp(value);
- assertThat(liveData.getValue()).isEqualTo(value);
- }
-
- private static class TestWrapper<T> {
- T mValue;
- }
-
- private static class TestHandler extends Handler {
-
- TestHandler() {
- super(Looper.getMainLooper());
- }
-
- @Override
- public boolean sendMessageAtTime(@NonNull Message msg, long uptimeMillis) {
- msg.getCallback().run();
- return true;
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.kt b/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.kt
deleted file mode 100644
index 6d04f35..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/ui/viewmodel/FingerprintEnrollmentViewModelTest.kt
+++ /dev/null
@@ -1,322 +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.biometrics2.ui.viewmodel
-
-import android.app.Application
-import android.content.Intent
-import android.hardware.fingerprint.FingerprintManager
-import android.hardware.fingerprint.FingerprintSensorProperties
-import android.os.Bundle
-import androidx.activity.result.ActivityResult
-import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics2.data.repository.FingerprintRepository
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newAllFalseRequest
-import com.android.settings.biometrics2.utils.EnrollmentRequestUtils.newIsSuwRequest
-import com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.newFingerprintRepository
-import com.android.settings.biometrics2.utils.FingerprintRepositoryUtils.setupFingerprintEnrolledFingerprints
-import com.google.common.truth.Truth.assertThat
-import kotlinx.coroutines.flow.toList
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-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.junit.MockitoJUnit
-import org.mockito.junit.MockitoRule
-
-@RunWith(AndroidJUnit4::class)
-class FingerprintEnrollmentViewModelTest {
-
- @get:Rule val mockito: MockitoRule = MockitoJUnit.rule()
-
- private val application: Application
- get() = ApplicationProvider.getApplicationContext()
-
- @Mock
- private lateinit var fingerprintManager: FingerprintManager
-
- private lateinit var fingerprintRepository: FingerprintRepository
- private lateinit var viewModel: FingerprintEnrollmentViewModel
-
- @Before
- fun setUp() {
- fingerprintRepository = newFingerprintRepository(
- fingerprintManager,
- FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
- 5
- )
- viewModel = FingerprintEnrollmentViewModel(
- application,
- fingerprintRepository,
- newAllFalseRequest(application)
- )
- }
-
- @Test
- fun testGetRequest() {
- assertThat(viewModel.request).isNotNull()
- }
-
- @Test
- fun testIsWaitingActivityResultDefaultFalse() {
- assertThat(viewModel.isWaitingActivityResult.value).isFalse()
- }
-
-
- @Test
- fun testOverrideActivityResult_shallKeepNullIntent_woChallengeExtra() {
- val retResult = viewModel.getOverrideActivityResult(
- ActivityResult(22, null), null
- )
- assertThat(retResult).isNotNull()
- assertThat(retResult.data).isNull()
- }
-
- @Test
- fun testOverrideActivityResult_shallKeepNullIntent_noIntent_woChallengeExtra() {
- val intent = Intent()
- val retResult = viewModel.getOverrideActivityResult(
- ActivityResult(33, intent), null
- )
- assertThat(retResult).isNotNull()
- assertThat(retResult.data).isEqualTo(intent)
- }
-
- @Test
- fun testOverrideActivityResult_shallKeepNull_woAdded_woIntent_withChallenge() {
- val extra = Bundle()
- extra.putString("test1", "test123")
-
- val retResult = viewModel.getOverrideActivityResult(
- ActivityResult(33, null), extra
- )
-
- assertThat(retResult).isNotNull()
- assertThat(retResult.data).isNull()
- }
-
- @Test
- fun testOverrideActivityResult_shallCreateNew_woIntent_withChallenge() {
- val key1 = "test1"
- val key2 = "test2"
- val extra = Bundle().apply {
- putString(key1, "test123")
- putInt(key2, 9999)
- }
-
- viewModel.isNewFingerprintAdded = true
-
- val retResult = viewModel.getOverrideActivityResult(
- ActivityResult(33, null), extra
- )
- assertThat(retResult).isNotNull()
-
- val retIntent = retResult.data
- assertThat(retIntent).isNotNull()
-
- val retExtra = retIntent!!.extras
- assertThat(retExtra).isNotNull()
- assertThat(retExtra!!.size).isEqualTo(extra.size)
- assertThat(retExtra.getString(key1)).isEqualTo(extra.getString(key1))
- assertThat(retExtra.getInt(key2)).isEqualTo(extra.getInt(key2))
- }
-
- @Test
- fun testOverrideActivityResult_shallNotMerge_nonAdded_woIntent_withChallenge() {
- val extra = Bundle().apply {
- putString("test2", "test123")
- }
-
- val key2 = "test2"
- val intent = Intent().apply {
- putExtra(key2, 3456L)
- }
-
- val retResult = viewModel.getOverrideActivityResult(ActivityResult(33, intent), extra)
-
- assertThat(retResult).isNotNull()
-
- val retIntent = retResult.data
- assertThat(retIntent).isNotNull()
-
- val retExtra = retIntent!!.extras
- assertThat(retExtra).isNotNull()
- assertThat(retExtra!!.size).isEqualTo(intent.extras!!.size)
- assertThat(retExtra.getString(key2)).isEqualTo(intent.extras!!.getString(key2))
- }
-
- @Test
- fun testOverrideActivityResult_shallMerge_added_woIntent_withChallenge() {
- val key1 = "test1"
- val key2 = "test2"
- val extra = Bundle().apply {
- putString(key1, "test123")
- putInt(key2, 9999)
- }
-
- val key3 = "test3"
- val intent = Intent().apply {
- putExtra(key3, 3456L)
- }
-
- viewModel.isNewFingerprintAdded = true
-
- val retResult = viewModel.getOverrideActivityResult(ActivityResult(33, intent), extra)
- assertThat(retResult).isNotNull()
-
- val retIntent = retResult.data
- assertThat(retIntent).isNotNull()
-
- val retExtra = retIntent!!.extras
- assertThat(retExtra).isNotNull()
- assertThat(retExtra!!.size).isEqualTo(extra.size + intent.extras!!.size)
- assertThat(retExtra.getString(key1)).isEqualTo(extra.getString(key1))
- assertThat(retExtra.getInt(key2)).isEqualTo(extra.getInt(key2))
- assertThat(retExtra.getLong(key3)).isEqualTo(intent.extras!!.getLong(key3))
- }
-
- @Test
- fun testIsMaxEnrolledReached() {
- val uid = 100
- fingerprintRepository = newFingerprintRepository(
- fingerprintManager,
- FingerprintSensorProperties.TYPE_UDFPS_OPTICAL,
- 3
- )
- viewModel = FingerprintEnrollmentViewModel(
- application,
- fingerprintRepository,
- newAllFalseRequest(application)
- )
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, uid, 0)
- assertThat(viewModel.isMaxEnrolledReached(uid)).isFalse()
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, uid, 1)
- assertThat(viewModel.isMaxEnrolledReached(uid)).isFalse()
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, uid, 2)
- assertThat(viewModel.isMaxEnrolledReached(uid)).isFalse()
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, uid, 3)
- assertThat(viewModel.isMaxEnrolledReached(uid)).isTrue()
-
- setupFingerprintEnrolledFingerprints(fingerprintManager, uid, 4)
- assertThat(viewModel.isMaxEnrolledReached(uid)).isTrue()
- }
-
- @Test
- fun testSetResultFlow_defaultEmpty() = runTest {
- val activityResults = listOfSetResultFlow()
-
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(0)
- }
-
- @Test
- fun testCheckFinishActivityDuringOnPause_doNothingIfIsSuw() = runTest {
- viewModel = FingerprintEnrollmentViewModel(
- application,
- fingerprintRepository,
- newIsSuwRequest(application)
- )
-
- val activityResults = listOfSetResultFlow()
-
- viewModel.checkFinishActivityDuringOnPause(
- isActivityFinishing = false,
- isChangingConfigurations = false,
- scope = this
- )
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(0)
- }
-
- @Test
- fun testCheckFinishActivityDuringOnPause_doNothingIfIsWaitingActivity() = runTest {
- val activityResults = listOfSetResultFlow()
-
- viewModel.isWaitingActivityResult.value = true
- viewModel.checkFinishActivityDuringOnPause(
- isActivityFinishing = false,
- isChangingConfigurations = false,
- scope = this
- )
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(0)
- }
-
- @Test
- fun testCheckFinishActivityDuringOnPause_doNothingIfIsActivityFinishing() = runTest {
- val activityResults = listOfSetResultFlow()
-
- viewModel.checkFinishActivityDuringOnPause(
- isActivityFinishing = true,
- isChangingConfigurations = false,
- scope = this
- )
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(0)
- }
-
- @Test
- fun testCheckFinishActivityDuringOnPause_doNothingIfIsChangingConfigurations() = runTest {
- val activityResults = listOfSetResultFlow()
-
- viewModel.checkFinishActivityDuringOnPause(
- isActivityFinishing = false,
- isChangingConfigurations = true,
- scope = this
- )
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(0)
- }
-
- @Test
- fun testCheckFinishActivityDuringOnPause_defaultFinishSelf() = runTest {
- val activityResults = listOfSetResultFlow()
-
- viewModel.checkFinishActivityDuringOnPause(
- isActivityFinishing = false,
- isChangingConfigurations = false,
- scope = backgroundScope
- )
- runCurrent()
-
- assertThat(activityResults.size).isEqualTo(1)
- assertThat(activityResults[0].resultCode).isEqualTo(BiometricEnrollBase.RESULT_TIMEOUT)
- assertThat(activityResults[0].data).isEqualTo(null)
- }
-
- private fun TestScope.listOfSetResultFlow(): List<ActivityResult> =
- mutableListOf<ActivityResult>().also {
- backgroundScope.launch(UnconfinedTestDispatcher(testScheduler)) {
- viewModel.setResultFlow.toList(it)
- }
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.kt b/tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.kt
deleted file mode 100644
index 755f6d0..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/utils/EnrollmentRequestUtils.kt
+++ /dev/null
@@ -1,110 +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.biometrics2.utils
-
-import android.content.Context
-import android.content.Intent
-import android.text.TextUtils
-import com.android.settings.biometrics.BiometricEnrollBase
-import com.android.settings.biometrics2.ui.model.EnrollmentRequest
-import com.google.android.setupcompat.util.WizardManagerHelper
-
-object EnrollmentRequestUtils {
- @JvmStatic
- fun newAllFalseRequest(context: Context): EnrollmentRequest {
- return newRequest(
- context = context,
- isSuw = false,
- isSuwDeferred = false,
- isSuwPortal = false,
- isSuwSuggestedActionFlow = false,
- isSuwFirstRun = false,
- isFromSettingsSummery = false)
- }
-
- @JvmStatic
- fun newIsSuwRequest(context: Context): EnrollmentRequest {
- return newRequest(
- context = context,
- isSuw = true,
- isSuwDeferred = false,
- isSuwPortal = false,
- isSuwSuggestedActionFlow = false,
- isSuwFirstRun = false,
- isFromSettingsSummery = false)
- }
-
- @JvmStatic
- fun newIsSuwDeferredRequest(context: Context): EnrollmentRequest {
- return newRequest(
- context = context,
- isSuw = true,
- isSuwDeferred = true,
- isSuwPortal = false,
- isSuwSuggestedActionFlow = false,
- isSuwFirstRun = false,
- isFromSettingsSummery = false, null)
- }
-
- @JvmStatic
- fun newIsSuwPortalRequest(context: Context): EnrollmentRequest {
- return newRequest(
- context = context,
- isSuw = true,
- isSuwDeferred = false,
- isSuwPortal = true,
- isSuwSuggestedActionFlow = false,
- isSuwFirstRun = false,
- isFromSettingsSummery = false)
- }
-
- @JvmStatic
- fun newIsSuwSuggestedActionFlowRequest(
- context: Context
- ): EnrollmentRequest {
- return newRequest(
- context = context,
- isSuw = true,
- isSuwDeferred = false,
- isSuwPortal = false,
- isSuwSuggestedActionFlow = true,
- isSuwFirstRun = false,
- isFromSettingsSummery = false)
- }
-
- fun newRequest(
- context: Context,
- isSuw: Boolean,
- isSuwDeferred: Boolean,
- isSuwPortal: Boolean,
- isSuwSuggestedActionFlow: Boolean,
- isSuwFirstRun: Boolean,
- isFromSettingsSummery: Boolean,
- theme: String? = null
- ): EnrollmentRequest {
- val i = Intent()
- i.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, isSuw)
- i.putExtra(WizardManagerHelper.EXTRA_IS_DEFERRED_SETUP, isSuwDeferred)
- i.putExtra(WizardManagerHelper.EXTRA_IS_PORTAL_SETUP, isSuwPortal)
- i.putExtra(WizardManagerHelper.EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW, isSuwSuggestedActionFlow)
- i.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, isSuwFirstRun)
- i.putExtra(BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY, isFromSettingsSummery)
- if (!TextUtils.isEmpty(theme)) {
- i.putExtra(WizardManagerHelper.EXTRA_THEME, theme)
- }
- return EnrollmentRequest(i, context, true)
- }
-}
diff --git a/tests/unit/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java b/tests/unit/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java
deleted file mode 100644
index fcf926e..0000000
--- a/tests/unit/src/com/android/settings/biometrics2/utils/FingerprintRepositoryUtils.java
+++ /dev/null
@@ -1,81 +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.biometrics2.utils;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.hardware.biometrics.SensorProperties;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorProperties;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.hardware.fingerprint.IFingerprintAuthenticatorsRegisteredCallback;
-
-import androidx.annotation.NonNull;
-
-import com.android.settings.biometrics2.data.repository.FingerprintRepository;
-
-import java.util.ArrayList;
-
-public class FingerprintRepositoryUtils {
-
- public static void setupSuwMaxFingerprintsEnrollable(
- @NonNull Context context,
- @NonNull Resources mockedResources,
- int numOfFp) {
- final int resId = context.getResources().getIdentifier("suw_max_fingerprints_enrollable",
- "integer", context.getPackageName());
- when(mockedResources.getInteger(resId)).thenReturn(numOfFp);
- }
-
- public static FingerprintRepository newFingerprintRepository(
- @NonNull FingerprintManager mockedFingerprintManager,
- @FingerprintSensorProperties.SensorType int sensorType,
- int maxEnrollmentsPerUser) {
-
- final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
- props.add(new FingerprintSensorPropertiesInternal(
- 0 /* sensorId */,
- SensorProperties.STRENGTH_STRONG,
- maxEnrollmentsPerUser,
- new ArrayList<>() /* componentInfo */,
- sensorType,
- true /* resetLockoutRequiresHardwareAuthToken */));
- doAnswer(invocation -> {
- final IFingerprintAuthenticatorsRegisteredCallback callback =
- invocation.getArgument(0);
- callback.onAllAuthenticatorsRegistered(props);
- return null;
- }).when(mockedFingerprintManager).addAuthenticatorsRegisteredCallback(any());
- return new FingerprintRepository(mockedFingerprintManager);
- }
-
- public static void setupFingerprintEnrolledFingerprints(
- @NonNull FingerprintManager mockedFingerprintManager,
- int userId,
- int enrolledFingerprints) {
- final ArrayList<Fingerprint> ret = new ArrayList<>();
- for (int i = 0; i < enrolledFingerprints; ++i) {
- ret.add(new Fingerprint("name", 0, 0, 0L));
- }
- when(mockedFingerprintManager.getEnrolledFingerprints(userId)).thenReturn(ret);
- }
-}
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
new file mode 100644
index 0000000..019ade7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayPreferenceFragmentTest.java
@@ -0,0 +1,409 @@
+/*
+ * 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 static android.view.Display.INVALID_DISPLAY;
+
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.PREVIOUSLY_SHOWN_LIST_KEY;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.DISPLAYS_LIST_PREFERENCE_KEY;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_NOT_FOUND_FOOTER_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_ROTATION_KEY;
+import static com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.EXTERNAL_DISPLAY_ROTATION_TITLE_RESOURCE;
+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.settingslib.widget.FooterPreference.KEY_FOOTER;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.connecteddevice.display.ExternalDisplayPreferenceFragment.DisplayPreference;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.MainSwitchPreference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+/** Unit tests for {@link ExternalDisplayPreferenceFragment}. */
+@RunWith(AndroidJUnit4.class)
+public class ExternalDisplayPreferenceFragmentTest extends ExternalDisplayTestBase {
+ @Nullable
+ private ExternalDisplayPreferenceFragment mFragment;
+ private int mPreferenceIdFromResource;
+ private int mDisplayIdArg = INVALID_DISPLAY;
+ private int mResolutionSelectorDisplayId = INVALID_DISPLAY;
+ @Mock
+ private MetricsLogger mMockedMetricsLogger;
+
+ @Test
+ @UiThreadTest
+ public void testCreateAndStart() {
+ initFragment();
+ assertThat(mPreferenceIdFromResource).isEqualTo(EXTERNAL_DISPLAY_SETTINGS_RESOURCE);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testShowDisplayList() {
+ var fragment = initFragment();
+ var outState = new Bundle();
+ fragment.onSaveInstanceStateCallback(outState);
+ assertThat(outState.getBoolean(PREVIOUSLY_SHOWN_LIST_KEY)).isFalse();
+ assertThat(mHandler.getPendingMessages().size()).isEqualTo(1);
+ PreferenceCategory pref = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+ assertThat(pref).isNull();
+ verify(mMockedInjector, never()).getAllDisplays();
+ mHandler.flush();
+ assertThat(mHandler.getPendingMessages().size()).isEqualTo(0);
+ verify(mMockedInjector).getAllDisplays();
+ pref = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+ assertThat(pref).isNotNull();
+ assertThat(pref.getPreferenceCount()).isEqualTo(2);
+ fragment.onSaveInstanceStateCallback(outState);
+ assertThat(outState.getBoolean(PREVIOUSLY_SHOWN_LIST_KEY)).isTrue();
+ }
+
+ @Test
+ @UiThreadTest
+ public void testLaunchDisplaySettingFromList() {
+ initFragment();
+ mHandler.flush();
+ PreferenceCategory pref = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+ assertThat(pref).isNotNull();
+ DisplayPreference display1Pref = (DisplayPreference) pref.getPreference(0);
+ DisplayPreference display2Pref = (DisplayPreference) pref.getPreference(1);
+ assertThat(display1Pref.getKey()).isEqualTo("display_id_" + 1);
+ assertThat("" + display1Pref.getTitle()).isEqualTo("HDMI");
+ assertThat("" + display1Pref.getSummary()).isEqualTo("1920 x 1080");
+ display1Pref.onPreferenceClick(display1Pref);
+ assertThat(mDisplayIdArg).isEqualTo(1);
+ verify(mMockedMetricsLogger).writePreferenceClickMetric(display1Pref);
+ assertThat(display2Pref.getKey()).isEqualTo("display_id_" + 2);
+ assertThat("" + display2Pref.getTitle()).isEqualTo("Overlay #1");
+ assertThat("" + display2Pref.getSummary()).isEqualTo("1240 x 780");
+ display2Pref.onPreferenceClick(display2Pref);
+ assertThat(mDisplayIdArg).isEqualTo(2);
+ verify(mMockedMetricsLogger).writePreferenceClickMetric(display2Pref);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testShowDisplayListForOnlyOneDisplay_PreviouslyShownList() {
+ var fragment = initFragment();
+ // Previously shown list of displays
+ fragment.onActivityCreatedCallback(createBundleForPreviouslyShownList());
+ // Only one display available
+ doReturn(new Display[] {mDisplays[1]}).when(mMockedInjector).getAllDisplays();
+ mHandler.flush();
+ PreferenceCategory pref = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+ assertThat(pref).isNotNull();
+ assertThat(pref.getPreferenceCount()).isEqualTo(1);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testShowEnabledDisplay_OnlyOneDisplayAvailable() {
+ doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+ // Only one display available
+ doReturn(new Display[] {mDisplays[1]}).when(mMockedInjector).getAllDisplays();
+ // Init
+ initFragment();
+ mHandler.flush();
+ PreferenceCategory list = mPreferenceScreen.findPreference(DISPLAYS_LIST_PREFERENCE_KEY);
+ assertThat(list).isNull();
+ var pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+ assertThat(pref).isNotNull();
+ pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_ROTATION_KEY);
+ assertThat(pref).isNotNull();
+ var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
+ assertThat(footerPref).isNotNull();
+ verify(footerPref).setTitle(EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testShowOneEnabledDisplay_FewAvailable() {
+ mDisplayIdArg = 1;
+ doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+ initFragment();
+ verify(mMockedInjector, never()).getDisplay(anyInt());
+ mHandler.flush();
+ verify(mMockedInjector).getDisplay(mDisplayIdArg);
+ var pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+ assertThat(pref).isNotNull();
+ pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_ROTATION_KEY);
+ assertThat(pref).isNotNull();
+ var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
+ assertThat(footerPref).isNotNull();
+ verify(footerPref).setTitle(EXTERNAL_DISPLAY_CHANGE_RESOLUTION_FOOTER_RESOURCE);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testShowDisabledDisplay() {
+ mDisplayIdArg = 1;
+ initFragment();
+ verify(mMockedInjector, never()).getDisplay(anyInt());
+ mHandler.flush();
+ verify(mMockedInjector).getDisplay(mDisplayIdArg);
+ var mainPref = (MainSwitchPreference) mPreferenceScreen.findPreference(
+ EXTERNAL_DISPLAY_USE_PREFERENCE_KEY);
+ assertThat(mainPref).isNotNull();
+ assertThat("" + mainPref.getTitle()).isEqualTo(
+ getText(EXTERNAL_DISPLAY_USE_TITLE_RESOURCE));
+ assertThat(mainPref.isChecked()).isFalse();
+ assertThat(mainPref.isEnabled()).isTrue();
+ assertThat(mainPref.getOnPreferenceChangeListener()).isNotNull();
+ var pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+ assertThat(pref).isNull();
+ pref = mPreferenceScreen.findPreference(EXTERNAL_DISPLAY_ROTATION_KEY);
+ assertThat(pref).isNull();
+ var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
+ assertThat(footerPref).isNull();
+ }
+
+ @Test
+ @UiThreadTest
+ public void testNoDisplays() {
+ doReturn(new Display[0]).when(mMockedInjector).getAllDisplays();
+ initFragment();
+ mHandler.flush();
+ var mainPref = (MainSwitchPreference) mPreferenceScreen.findPreference(
+ EXTERNAL_DISPLAY_USE_PREFERENCE_KEY);
+ assertThat(mainPref).isNotNull();
+ assertThat("" + mainPref.getTitle()).isEqualTo(
+ getText(EXTERNAL_DISPLAY_USE_TITLE_RESOURCE));
+ assertThat(mainPref.isChecked()).isFalse();
+ assertThat(mainPref.isEnabled()).isFalse();
+ assertThat(mainPref.getOnPreferenceChangeListener()).isNull();
+ var footerPref = (FooterPreference) mPreferenceScreen.findPreference(KEY_FOOTER);
+ assertThat(footerPref).isNotNull();
+ verify(footerPref).setTitle(EXTERNAL_DISPLAY_NOT_FOUND_FOOTER_RESOURCE);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testDisplayRotationPreference() {
+ mDisplayIdArg = 1;
+ doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+ var fragment = initFragment();
+ mHandler.flush();
+ var pref = fragment.getRotationPreference(mContext);
+ assertThat(pref.getKey()).isEqualTo(EXTERNAL_DISPLAY_ROTATION_KEY);
+ assertThat("" + pref.getTitle()).isEqualTo(
+ getText(EXTERNAL_DISPLAY_ROTATION_TITLE_RESOURCE));
+ assertThat(pref.getEntries().length).isEqualTo(4);
+ assertThat(pref.getEntryValues().length).isEqualTo(4);
+ assertThat(pref.getEntryValues()[0].toString()).isEqualTo("0");
+ assertThat(pref.getEntryValues()[1].toString()).isEqualTo("1");
+ assertThat(pref.getEntryValues()[2].toString()).isEqualTo("2");
+ assertThat(pref.getEntryValues()[3].toString()).isEqualTo("3");
+ assertThat(pref.getEntries()[0].length()).isGreaterThan(0);
+ assertThat(pref.getEntries()[1].length()).isGreaterThan(0);
+ assertThat("" + pref.getSummary()).isEqualTo(pref.getEntries()[0].toString());
+ assertThat(pref.getValue()).isEqualTo("0");
+ assertThat(pref.getOnPreferenceChangeListener()).isNotNull();
+ assertThat(pref.isEnabled()).isTrue();
+ var rotation = 1;
+ doReturn(true).when(mMockedInjector).freezeDisplayRotation(mDisplayIdArg, rotation);
+ assertThat(pref.getOnPreferenceChangeListener().onPreferenceChange(pref, rotation + ""))
+ .isTrue();
+ verify(mMockedInjector).freezeDisplayRotation(mDisplayIdArg, rotation);
+ assertThat(pref.getValue()).isEqualTo(rotation + "");
+ verify(mMockedMetricsLogger).writePreferenceClickMetric(pref);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testDisplayResolutionPreference() {
+ mDisplayIdArg = 1;
+ doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+ var fragment = initFragment();
+ mHandler.flush();
+ var pref = fragment.getResolutionPreference(mContext);
+ assertThat(pref.getKey()).isEqualTo(EXTERNAL_DISPLAY_RESOLUTION_PREFERENCE_KEY);
+ assertThat("" + pref.getTitle()).isEqualTo(
+ getText(EXTERNAL_DISPLAY_RESOLUTION_TITLE_RESOURCE));
+ assertThat("" + pref.getSummary()).isEqualTo("1920 x 1080");
+ assertThat(pref.isEnabled()).isTrue();
+ assertThat(pref.getOnPreferenceClickListener()).isNotNull();
+ assertThat(pref.getOnPreferenceClickListener().onPreferenceClick(pref)).isTrue();
+ assertThat(mResolutionSelectorDisplayId).isEqualTo(mDisplayIdArg);
+ verify(mMockedMetricsLogger).writePreferenceClickMetric(pref);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testUseDisplayPreference_EnabledDisplay() {
+ mDisplayIdArg = 1;
+ doReturn(true).when(mMockedInjector).isDisplayEnabled(any());
+ doReturn(true).when(mMockedInjector).enableConnectedDisplay(mDisplayIdArg);
+ doReturn(true).when(mMockedInjector).disableConnectedDisplay(mDisplayIdArg);
+ var fragment = initFragment();
+ mHandler.flush();
+ var pref = fragment.getUseDisplayPreference(mContext);
+ assertThat(pref.getKey()).isEqualTo(EXTERNAL_DISPLAY_USE_PREFERENCE_KEY);
+ assertThat("" + pref.getTitle()).isEqualTo(getText(EXTERNAL_DISPLAY_USE_TITLE_RESOURCE));
+ assertThat(pref.isEnabled()).isTrue();
+ assertThat(pref.isChecked()).isTrue();
+ assertThat(pref.getOnPreferenceChangeListener()).isNotNull();
+ assertThat(pref.getOnPreferenceChangeListener().onPreferenceChange(pref, false)).isTrue();
+ verify(mMockedInjector).disableConnectedDisplay(mDisplayIdArg);
+ assertThat(pref.isChecked()).isFalse();
+ assertThat(pref.getOnPreferenceChangeListener().onPreferenceChange(pref, true)).isTrue();
+ verify(mMockedInjector).enableConnectedDisplay(mDisplayIdArg);
+ assertThat(pref.isChecked()).isTrue();
+ verify(mMockedMetricsLogger, times(2)).writePreferenceClickMetric(pref);
+ }
+
+ @NonNull
+ private ExternalDisplayPreferenceFragment initFragment() {
+ if (mFragment != null) {
+ return mFragment;
+ }
+ mFragment = new TestableExternalDisplayPreferenceFragment();
+ mFragment.onCreateCallback(null);
+ mFragment.onActivityCreatedCallback(null);
+ mFragment.onStartCallback();
+ return mFragment;
+ }
+
+ @NonNull
+ private Bundle createBundleForPreviouslyShownList() {
+ var state = new Bundle();
+ state.putBoolean(PREVIOUSLY_SHOWN_LIST_KEY, true);
+ return state;
+ }
+
+ @NonNull
+ private String getText(int id) {
+ return mContext.getResources().getText(id).toString();
+ }
+
+ private class TestableExternalDisplayPreferenceFragment extends
+ ExternalDisplayPreferenceFragment {
+ private final View mMockedRootView;
+ private final TextView mEmptyView;
+ private final Activity mMockedActivity;
+ private final FooterPreference mMockedFooterPreference;
+ private final MetricsLogger mLogger;
+
+ TestableExternalDisplayPreferenceFragment() {
+ super(mMockedInjector);
+ mMockedActivity = mock(Activity.class);
+ mMockedRootView = mock(View.class);
+ mMockedFooterPreference = mock(FooterPreference.class);
+ doReturn(KEY_FOOTER).when(mMockedFooterPreference).getKey();
+ mEmptyView = new TextView(mContext);
+ doReturn(mEmptyView).when(mMockedRootView).findViewById(android.R.id.empty);
+ mLogger = mMockedMetricsLogger;
+ }
+
+ @Override
+ public PreferenceScreen getPreferenceScreen() {
+ return mPreferenceScreen;
+ }
+
+ @Override
+ protected Activity getCurrentActivity() {
+ return mMockedActivity;
+ }
+
+ @Override
+ public View getView() {
+ return mMockedRootView;
+ }
+
+ @Override
+ public void setEmptyView(View view) {
+ assertThat(view).isEqualTo(mEmptyView);
+ }
+
+ @Override
+ public View getEmptyView() {
+ return mEmptyView;
+ }
+
+ @Override
+ public void addPreferencesFromResource(int resource) {
+ mPreferenceIdFromResource = resource;
+ }
+
+ @Override
+ @NonNull
+ FooterPreference getFooterPreference(@NonNull Context context) {
+ return mMockedFooterPreference;
+ }
+
+ @Override
+ protected int getDisplayIdArg() {
+ return mDisplayIdArg;
+ }
+
+ @Override
+ protected void launchResolutionSelector(@NonNull Context context, int displayId) {
+ mResolutionSelectorDisplayId = displayId;
+ }
+
+ @Override
+ protected void launchDisplaySettings(final int displayId) {
+ mDisplayIdArg = displayId;
+ }
+
+ @Override
+ protected void writePreferenceClickMetric(Preference preference) {
+ mLogger.writePreferenceClickMetric(preference);
+ }
+ }
+
+ /**
+ * Interface allowing to mock and spy on log events.
+ */
+ public interface MetricsLogger {
+
+ /**
+ * On preference click metric
+ */
+ void writePreferenceClickMetric(Preference 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
new file mode 100644
index 0000000..4cba1ef
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayTestBase.java
@@ -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.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_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING;
+
+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.spy;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.hardware.display.DisplayManagerGlobal;
+import android.hardware.display.IDisplayManager;
+import android.os.RemoteException;
+import android.view.Display;
+import android.view.DisplayAdjustments;
+import android.view.DisplayInfo;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.server.testutils.TestHandler;
+import com.android.settings.connecteddevice.display.ExternalDisplaySettingsConfiguration.DisplayListener;
+import com.android.settings.flags.FakeFeatureFlagsImpl;
+
+import org.junit.Before;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class ExternalDisplayTestBase {
+ @Mock
+ ExternalDisplaySettingsConfiguration.Injector mMockedInjector;
+ @Mock
+ IDisplayManager mMockedIDisplayManager;
+ Resources mResources;
+ DisplayManagerGlobal mDisplayManagerGlobal;
+ FakeFeatureFlagsImpl mFlags = new FakeFeatureFlagsImpl();
+ Context mContext;
+ DisplayListener mListener;
+ TestHandler mHandler = new TestHandler(null);
+ PreferenceManager mPreferenceManager;
+ PreferenceScreen mPreferenceScreen;
+ Display[] mDisplays;
+
+ /**
+ * Setup.
+ */
+ @Before
+ public void setUp() throws RemoteException {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(ApplicationProvider.getApplicationContext());
+ mResources = spy(mContext.getResources());
+ doReturn(mResources).when(mContext).getResources();
+ mPreferenceManager = new PreferenceManager(mContext);
+ mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+ doReturn(0).when(mMockedIDisplayManager).getPreferredWideGamutColorSpaceId();
+ mDisplayManagerGlobal = new DisplayManagerGlobal(mMockedIDisplayManager);
+ mFlags.setFlag(FLAG_ROTATION_CONNECTED_DISPLAY_SETTING, true);
+ mFlags.setFlag(FLAG_RESOLUTION_AND_ENABLE_CONNECTED_DISPLAY_SETTING, true);
+ mDisplays = new Display[] {
+ createDefaultDisplay(), createExternalDisplay(), createOverlayDisplay()};
+ doReturn(mDisplays).when(mMockedInjector).getAllDisplays();
+ doReturn(mDisplays).when(mMockedInjector).getEnabledDisplays();
+ for (var display : mDisplays) {
+ doReturn(display).when(mMockedInjector).getDisplay(display.getDisplayId());
+ }
+ doReturn(mFlags).when(mMockedInjector).getFlags();
+ doReturn(mHandler).when(mMockedInjector).getHandler();
+ doReturn("").when(mMockedInjector).getSystemProperty(
+ VIRTUAL_DISPLAY_PACKAGE_NAME_SYSTEM_PROPERTY);
+ doReturn(true).when(mMockedInjector).isModeLimitForExternalDisplayEnabled();
+ doAnswer((arg) -> {
+ mListener = arg.getArgument(0);
+ return null;
+ }).when(mMockedInjector).registerDisplayListener(any());
+ doReturn(0).when(mMockedInjector).getDisplayUserRotation(anyInt());
+ doReturn(mContext).when(mMockedInjector).getContext();
+ }
+
+ Display createDefaultDisplay() throws RemoteException {
+ int displayId = 0;
+ var displayInfo = new DisplayInfo();
+ doReturn(displayInfo).when(mMockedIDisplayManager).getDisplayInfo(displayId);
+ displayInfo.displayId = displayId;
+ displayInfo.name = "Built-in";
+ displayInfo.type = Display.TYPE_INTERNAL;
+ displayInfo.supportedModes = new Display.Mode[]{
+ new Display.Mode(0, 2048, 1024, 60, 60, new float[0],
+ new int[0])};
+ displayInfo.appsSupportedModes = displayInfo.supportedModes;
+ return createDisplay(displayInfo);
+ }
+
+ Display createExternalDisplay() throws RemoteException {
+ int displayId = 1;
+ var displayInfo = new DisplayInfo();
+ doReturn(displayInfo).when(mMockedIDisplayManager).getDisplayInfo(displayId);
+ displayInfo.displayId = displayId;
+ displayInfo.name = "HDMI";
+ displayInfo.type = Display.TYPE_EXTERNAL;
+ displayInfo.supportedModes = new Display.Mode[]{
+ new Display.Mode(0, 1920, 1080, 60, 60, new float[0], new int[0]),
+ new Display.Mode(1, 800, 600, 60, 60, new float[0], new int[0]),
+ new Display.Mode(2, 320, 240, 70, 70, new float[0], new int[0]),
+ new Display.Mode(3, 640, 480, 60, 60, new float[0], new int[0]),
+ new Display.Mode(4, 640, 480, 50, 60, new float[0], new int[0]),
+ new Display.Mode(5, 2048, 1024, 60, 60, new float[0], new int[0]),
+ new Display.Mode(6, 720, 480, 60, 60, new float[0], new int[0])};
+ displayInfo.appsSupportedModes = displayInfo.supportedModes;
+ return createDisplay(displayInfo);
+ }
+
+ Display createOverlayDisplay() throws RemoteException {
+ int displayId = 2;
+ var displayInfo = new DisplayInfo();
+ doReturn(displayInfo).when(mMockedIDisplayManager).getDisplayInfo(displayId);
+ displayInfo.displayId = displayId;
+ displayInfo.name = "Overlay #1";
+ displayInfo.type = Display.TYPE_OVERLAY;
+ displayInfo.supportedModes = new Display.Mode[]{
+ new Display.Mode(0, 1240, 780, 60, 60, new float[0],
+ new int[0])};
+ displayInfo.appsSupportedModes = displayInfo.supportedModes;
+ return createDisplay(displayInfo);
+ }
+
+ Display createDisplay(DisplayInfo displayInfo) {
+ return new Display(mDisplayManagerGlobal, displayInfo.displayId, displayInfo,
+ (DisplayAdjustments) null);
+ }
+}
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java
new file mode 100644
index 0000000..824974a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ExternalDisplayUpdaterTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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 static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.RemoteException;
+import android.view.Display;
+
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+/** Unit tests for {@link ExternalDisplayUpdater}. */
+@RunWith(AndroidJUnit4.class)
+public class ExternalDisplayUpdaterTest extends ExternalDisplayTestBase {
+
+ private ExternalDisplayUpdater mUpdater;
+ @Mock
+ private DevicePreferenceCallback mMockedCallback;
+ @Mock
+ private Drawable mMockedDrawable;
+ private RestrictedPreference mPreferenceAdded;
+ private RestrictedPreference mPreferenceRemoved;
+
+ @Before
+ public void setUp() throws RemoteException {
+ super.setUp();
+ mUpdater = new TestableExternalDisplayUpdater(mMockedCallback, /*metricsCategory=*/ 0);
+ }
+
+ @Test
+ public void testPreferenceAdded() {
+ doAnswer((v) -> {
+ mPreferenceAdded = v.getArgument(0);
+ return null;
+ }).when(mMockedCallback).onDeviceAdded(any());
+ mUpdater.initPreference(mContext, mMockedInjector);
+ mUpdater.registerCallback();
+ mHandler.flush();
+ assertThat(mPreferenceAdded).isNotNull();
+ var summary = mPreferenceAdded.getSummary();
+ assertThat(summary).isNotNull();
+ assertThat(summary.length()).isGreaterThan(0);
+ var title = mPreferenceAdded.getTitle();
+ assertThat(title).isNotNull();
+ assertThat(title.length()).isGreaterThan(0);
+ }
+
+ @Test
+ public void testPreferenceRemoved() {
+ doAnswer((v) -> {
+ mPreferenceAdded = v.getArgument(0);
+ return null;
+ }).when(mMockedCallback).onDeviceAdded(any());
+ doAnswer((v) -> {
+ mPreferenceRemoved = v.getArgument(0);
+ return null;
+ }).when(mMockedCallback).onDeviceRemoved(any());
+ mUpdater.initPreference(mContext, mMockedInjector);
+ mUpdater.registerCallback();
+ mHandler.flush();
+ assertThat(mPreferenceAdded).isNotNull();
+ assertThat(mPreferenceRemoved).isNull();
+ // Remove display
+ doReturn(new Display[0]).when(mMockedInjector).getAllDisplays();
+ doReturn(new Display[0]).when(mMockedInjector).getEnabledDisplays();
+ mListener.onDisplayRemoved(1);
+ mHandler.flush();
+ assertThat(mPreferenceRemoved).isEqualTo(mPreferenceAdded);
+ }
+
+ class TestableExternalDisplayUpdater extends ExternalDisplayUpdater {
+ TestableExternalDisplayUpdater(
+ DevicePreferenceCallback callback,
+ int metricsCategory) {
+ super(callback, metricsCategory);
+ }
+
+ @Override
+ @Nullable
+ protected RestrictedLockUtils.EnforcedAdmin checkIfUsbDataSignalingIsDisabled(
+ Context context) {
+ // if null is returned - usb signalling is enabled
+ return null;
+ }
+
+ @Override
+ @Nullable
+ protected Drawable getDrawable(Context context) {
+ return mMockedDrawable;
+ }
+ }
+}
diff --git a/tests/unit/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragmentTest.java b/tests/unit/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragmentTest.java
new file mode 100644
index 0000000..c866362
--- /dev/null
+++ b/tests/unit/src/com/android/settings/connecteddevice/display/ResolutionPreferenceFragmentTest.java
@@ -0,0 +1,242 @@
+/*
+ * 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 static android.view.Display.INVALID_DISPLAY;
+
+import static com.android.settings.connecteddevice.display.ResolutionPreferenceFragment.DISPLAY_MODE_LIMIT_OVERRIDE_PROP;
+import static com.android.settings.connecteddevice.display.ResolutionPreferenceFragment.EXTERNAL_DISPLAY_RESOLUTION_SETTINGS_RESOURCE;
+import static com.android.settings.connecteddevice.display.ResolutionPreferenceFragment.MORE_OPTIONS_KEY;
+import static com.android.settings.connecteddevice.display.ResolutionPreferenceFragment.TOP_OPTIONS_KEY;
+
+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.verify;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.Pair;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.widget.SelectorWithWidgetPreference;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+/** Unit tests for {@link ResolutionPreferenceFragment}. */
+@RunWith(AndroidJUnit4.class)
+public class ResolutionPreferenceFragmentTest extends ExternalDisplayTestBase {
+ @Nullable
+ private ResolutionPreferenceFragment mFragment;
+ private int mPreferenceIdFromResource;
+ private int mDisplayIdArg = INVALID_DISPLAY;
+ @Mock
+ private MetricsLogger mMockedMetricsLogger;
+
+ @Test
+ @UiThreadTest
+ public void testCreateAndStart() {
+ initFragment();
+ mHandler.flush();
+ assertThat(mPreferenceIdFromResource).isEqualTo(
+ EXTERNAL_DISPLAY_RESOLUTION_SETTINGS_RESOURCE);
+ var pref = mPreferenceScreen.findPreference(TOP_OPTIONS_KEY);
+ assertThat(pref).isNull();
+ pref = mPreferenceScreen.findPreference(MORE_OPTIONS_KEY);
+ assertThat(pref).isNull();
+ }
+
+ @Test
+ @UiThreadTest
+ public void testCreateAndStartDefaultDisplayNotAllowed() {
+ mDisplayIdArg = 0;
+ initFragment();
+ mHandler.flush();
+ var pref = mPreferenceScreen.findPreference(TOP_OPTIONS_KEY);
+ assertThat(pref).isNull();
+ pref = mPreferenceScreen.findPreference(MORE_OPTIONS_KEY);
+ assertThat(pref).isNull();
+ }
+
+ @Test
+ @UiThreadTest
+ public void testModePreferences_modeLimitFlagIsOn_noOverride() {
+ doReturn(true).when(mMockedInjector).isModeLimitForExternalDisplayEnabled();
+ doReturn(null).when(mMockedInjector).getSystemProperty(
+ DISPLAY_MODE_LIMIT_OVERRIDE_PROP);
+ var topAndMorePref = runTestModePreferences();
+ PreferenceCategory topPref = topAndMorePref.first, morePref = topAndMorePref.second;
+ assertThat(topPref.getPreferenceCount()).isEqualTo(3);
+ assertThat(morePref.getPreferenceCount()).isEqualTo(1);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testModePreferences_noModeLimitFlag_overrideIsTrue() {
+ doReturn(false).when(mMockedInjector).isModeLimitForExternalDisplayEnabled();
+ doReturn("true").when(mMockedInjector).getSystemProperty(
+ DISPLAY_MODE_LIMIT_OVERRIDE_PROP);
+ var topAndMorePref = runTestModePreferences();
+ PreferenceCategory topPref = topAndMorePref.first, morePref = topAndMorePref.second;
+ assertThat(topPref.getPreferenceCount()).isEqualTo(3);
+ assertThat(morePref.getPreferenceCount()).isEqualTo(1);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testModePreferences_noModeLimitFlag_noOverride() {
+ doReturn(false).when(mMockedInjector).isModeLimitForExternalDisplayEnabled();
+ doReturn(null).when(mMockedInjector).getSystemProperty(
+ DISPLAY_MODE_LIMIT_OVERRIDE_PROP);
+ var topAndMorePref = runTestModePreferences();
+ PreferenceCategory topPref = topAndMorePref.first, morePref = topAndMorePref.second;
+ assertThat(topPref.getPreferenceCount()).isEqualTo(3);
+ assertThat(morePref.getPreferenceCount()).isEqualTo(2);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testModePreferences_modeLimitFlagIsOn_butOverrideIsFalse() {
+ doReturn(true).when(mMockedInjector).isModeLimitForExternalDisplayEnabled();
+ doReturn("false").when(mMockedInjector).getSystemProperty(
+ DISPLAY_MODE_LIMIT_OVERRIDE_PROP);
+ var topAndMorePref = runTestModePreferences();
+ PreferenceCategory topPref = topAndMorePref.first, morePref = topAndMorePref.second;
+ assertThat(topPref.getPreferenceCount()).isEqualTo(3);
+ assertThat(morePref.getPreferenceCount()).isEqualTo(2);
+ }
+
+ @Test
+ @UiThreadTest
+ public void testModeChange() {
+ mDisplayIdArg = 1;
+ initFragment();
+ mHandler.flush();
+ PreferenceCategory topPref = mPreferenceScreen.findPreference(TOP_OPTIONS_KEY);
+ assertThat(topPref).isNotNull();
+ var modePref = (SelectorWithWidgetPreference) topPref.getPreference(1);
+ modePref.onClick();
+ var mode = mDisplays[mDisplayIdArg].getSupportedModes()[1];
+ verify(mMockedInjector).setUserPreferredDisplayMode(mDisplayIdArg, mode);
+ }
+
+ private Pair<PreferenceCategory, PreferenceCategory> runTestModePreferences() {
+ mDisplayIdArg = 1;
+ initFragment();
+ mHandler.flush();
+ PreferenceCategory topPref = mPreferenceScreen.findPreference(TOP_OPTIONS_KEY);
+ assertThat(topPref).isNotNull();
+ PreferenceCategory morePref = mPreferenceScreen.findPreference(MORE_OPTIONS_KEY);
+ assertThat(morePref).isNotNull();
+ return new Pair<>(topPref, morePref);
+ }
+
+ private void initFragment() {
+ if (mFragment != null) {
+ return;
+ }
+ mFragment = new TestableResolutionPreferenceFragment();
+ mFragment.onCreateCallback(null);
+ mFragment.onActivityCreatedCallback(null);
+ mFragment.onStartCallback();
+ }
+
+ private class TestableResolutionPreferenceFragment extends ResolutionPreferenceFragment {
+ private final View mMockedRootView;
+ private final TextView mEmptyView;
+ private final Resources mMockedResources;
+ private final MetricsLogger mLogger;
+ TestableResolutionPreferenceFragment() {
+ super(mMockedInjector);
+ mMockedResources = mock(Resources.class);
+ doReturn(61).when(mMockedResources).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakRefreshRate);
+ doReturn(1920).when(mMockedResources).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakWidth);
+ doReturn(1080).when(mMockedResources).getInteger(
+ com.android.internal.R.integer.config_externalDisplayPeakHeight);
+ doReturn(true).when(mMockedResources).getBoolean(
+ com.android.internal.R.bool.config_refreshRateSynchronizationEnabled);
+ mMockedRootView = mock(View.class);
+ mEmptyView = new TextView(mContext);
+ doReturn(mEmptyView).when(mMockedRootView).findViewById(android.R.id.empty);
+ mLogger = mMockedMetricsLogger;
+ }
+
+ @Override
+ public PreferenceScreen getPreferenceScreen() {
+ return mPreferenceScreen;
+ }
+
+ @Override
+ public View getView() {
+ return mMockedRootView;
+ }
+
+ @Override
+ public void setEmptyView(View view) {
+ assertThat(view).isEqualTo(mEmptyView);
+ }
+
+ @Override
+ public View getEmptyView() {
+ return mEmptyView;
+ }
+
+ @Override
+ public void addPreferencesFromResource(int resource) {
+ mPreferenceIdFromResource = resource;
+ }
+
+ @Override
+ protected int getDisplayIdArg() {
+ return mDisplayIdArg;
+ }
+
+ @Override
+ protected void writePreferenceClickMetric(Preference preference) {
+ mLogger.writePreferenceClickMetric(preference);
+ }
+
+ @Override
+ @NonNull
+ protected Resources getResources(@NonNull Context context) {
+ return mMockedResources;
+ }
+ }
+
+ /**
+ * Interface allowing to mock and spy on log events.
+ */
+ public interface MetricsLogger {
+ /**
+ * On preference click metric
+ */
+ void writePreferenceClickMetric(Preference preference);
+ }
+}
diff --git a/tests/unit/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceControllerTest.java
index ab1f469..2aa10bb 100644
--- a/tests/unit/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/development/bluetooth/BluetoothStackLogPreferenceControllerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.development.bluetooth;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BTSTACK_LOG_MODE_VERBOSE_INDEX;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BTSTACK_LOG_MODE_DEBUG_INDEX;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BTSTACK_LOG_MODE_INFO_INDEX;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BTSTACK_LOG_MODE_WARN_INDEX;
-import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BTSTACK_LOG_MODE_ERROR_INDEX;
+import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BT_LOG_LEVEL_DEFAULT_INDEX;
+import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BT_LOG_LEVEL_PROP;
+import static com.android.settings.development.bluetooth.BluetoothStackLogPreferenceController.BT_LOG_LEVEL_PROP_PERSIST;
import static com.google.common.truth.Truth.assertThat;
@@ -37,18 +33,21 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
-@Ignore("b/339148064")
public class BluetoothStackLogPreferenceControllerTest {
- private static final String TAG = "BluetoothStackLogPreferenceControllerTest";
+ private static final String COM_ANDROID_SETTINGS = "com.android.settings";
+ private static final String TYPE_ARRAY = "array";
- @Mock private Context mContext;
+ private static final String XML_DEFINED_PREFERENCE_KEY = "bt_stack_log_level";
+ private static final String XML_DEFINED_ENTRIES_RESOURCE = "bt_stack_log_level_entries";
+ private static final String XML_DEFINED_VALUES_RESOURCE = "bt_stack_log_level_values";
+
+ private static final String PROPERTY_CLEARED = "";
+
+ private Context mContext;
private ListPreference mPreference;
private PreferenceManager mPreferenceManager;
@@ -61,7 +60,6 @@
@Before
public void setup() {
- MockitoAnnotations.initMocks(this);
mContext = ApplicationProvider.getApplicationContext();
if (Looper.myLooper() == null) {
@@ -71,12 +69,11 @@
mPreferenceManager = new PreferenceManager(mContext);
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreference = new ListPreference(mContext);
-
mController = new BluetoothStackLogPreferenceController(mContext);
mPreference.setKey(mController.getPreferenceKey());
- mPreference.setEntries(com.android.settings.R.array.bt_stack_log_level_entries);
- mPreference.setEntryValues(com.android.settings.R.array.bt_stack_log_level_values);
+ mPreference.setEntries(getStringArrayResourceId(XML_DEFINED_ENTRIES_RESOURCE));
+ mPreference.setEntryValues(getStringArrayResourceId(XML_DEFINED_VALUES_RESOURCE));
mPreferenceScreen.addPreference(mPreference);
mController.displayPreference(mPreferenceScreen);
@@ -86,134 +83,109 @@
}
/**
- * Test that default log level is set to INFO
+ * Get the resource ID associated with a resource name
+ *
+ * This looks up the resource id by name using our device's context. This way, we can avoid
+ * hardcoding a resource ID or value from the R class which may not match the resource IDs on
+ * the device under test.
+ *
+ * Usage: int valuesResId = getStringArrayResource("bt_stack_log_level_values");
+ * Usage: int entriesResId = getStringArrayResource("bt_stack_log_level_entries");
+ *
+ * @param res - The resource name to look up
+ * @return The integer resource ID corresponding to the given resource name
*/
- @Test
- public void verifyDefaultState_enablesDefaultLogLevelEntriesAndValuesSameSize() {
- mController.onPreferenceChange(mPreference, mController.getDefaultModeIndex());
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
- [BTSTACK_LOG_MODE_INFO_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_INFO_INDEX].toString());
+ public int getStringArrayResourceId(String res) {
+ return mContext.getResources().getIdentifier(res, TYPE_ARRAY, COM_ANDROID_SETTINGS);
}
/**
- * Test that log level is changed to VERBOSE when VERBOSE is selected
+ * Test that, for each possible value a user can select, our controller properly handles the
+ * value to update the underlying system property _and_ set the UI entry to the proper value.
*/
@Test
- public void onPreferenceChanged_enableBluetoothStackVerboseLogLevel() {
- mController.onPreferenceChange(mPreference, mListValues[BTSTACK_LOG_MODE_VERBOSE_INDEX]
- .toString());
+ public void onPreferenceChange_withEachValue_uiSetProperlyAndAllValuesWrittenToProperties() {
+ for (int index = 0; index < mListValues.length; index++) {
+ String value = mListValues[index].toString();
+ String entry = mListEntries[index].toString();
- final String persistedLogLevel = SystemProperties.get(
- BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST);
- final String logLevel = SystemProperties.get(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY);
- assertThat(persistedLogLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_VERBOSE_INDEX]
- .toString());
- assertThat(logLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_VERBOSE_INDEX].toString());
+ mController.onPreferenceChange(mPreference, value);
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
- [BTSTACK_LOG_MODE_VERBOSE_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_VERBOSE_INDEX].toString());
+ final String persistedLogLevel = SystemProperties.get(BT_LOG_LEVEL_PROP_PERSIST);
+ final String logLevel = SystemProperties.get(BT_LOG_LEVEL_PROP);
+ final String currentValue = mPreference.getValue().toString();
+ final String currentEntry = mPreference.getEntry().toString();
+ final String currentSummary = mPreference.getSummary().toString();
+ final int currentIndex = mPreference.findIndexOfValue(currentValue);
+
+ assertThat(persistedLogLevel).isEqualTo(value);
+ assertThat(logLevel).isEqualTo(value);
+ assertThat(currentIndex).isEqualTo(index);
+ assertThat(currentValue).isEqualTo(value);
+ assertThat(currentEntry).isEqualTo(entry);
+ assertThat(currentSummary).isEqualTo(entry);
+ }
}
/**
- * Test that log level is changed to DEBUG when DEBUG is selected
+ * Test that, for each possible log tag log level value, our controller properly handles the
+ * value to set the UI entry to the proper value.
*/
@Test
- public void onPreferenceChanged_enableBluetoothStackDebugLogLevel() {
- mController.onPreferenceChange(mPreference, mListValues[BTSTACK_LOG_MODE_DEBUG_INDEX]
- .toString());
+ public void updateState_withEachValue_uiSetProperly() {
+ for (int index = 0; index < mListValues.length; index++) {
+ String value = mListValues[index].toString();
+ String entry = mListEntries[index].toString();
- final String persistedLogLevel = SystemProperties.get(
- BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST);
- final String logLevel = SystemProperties.get(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY);
- assertThat(persistedLogLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_DEBUG_INDEX]
- .toString());
- assertThat(logLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_DEBUG_INDEX].toString());
+ SystemProperties.set(BT_LOG_LEVEL_PROP_PERSIST, value);
+ SystemProperties.set(BT_LOG_LEVEL_PROP, value);
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
- [BTSTACK_LOG_MODE_DEBUG_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_DEBUG_INDEX].toString());
+ mController.updateState(mPreference);
+
+ final String currentValue = mPreference.getValue().toString();
+ final String currentEntry = mPreference.getEntry().toString();
+ final String currentSummary = mPreference.getSummary().toString();
+ final int currentIndex = mPreference.findIndexOfValue(currentValue);
+
+ assertThat(currentIndex).isEqualTo(index);
+ assertThat(currentValue).isEqualTo(value);
+ assertThat(currentEntry).isEqualTo(entry);
+ assertThat(currentSummary).isEqualTo(entry);
+ }
}
/**
- * Test that log level is changed to INFO when INFO is selected
+ * Test that our controller reverts the log level back to a missing/default value when we're
+ * notified that Developer Options has been disabled.
*/
@Test
- public void onPreferenceChanged_enableBluetoothStackInfoLogLevel() {
- mController.onPreferenceChange(mPreference, mListValues[BTSTACK_LOG_MODE_INFO_INDEX]
- .toString());
+ public void onDeveloperOptionsSwitchDisabled_preferenceSetToDefault() {
+ mController.onDeveloperOptionsSwitchDisabled();
- final String persistedLogLevel = SystemProperties.get(
- BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST);
- final String logLevel = SystemProperties.get(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY);
- assertThat(persistedLogLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_INFO_INDEX]
- .toString());
- assertThat(logLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_INFO_INDEX].toString());
+ final String defaultEntry = mListEntries[BT_LOG_LEVEL_DEFAULT_INDEX].toString();
+ final String defaultValue = mListValues[BT_LOG_LEVEL_DEFAULT_INDEX].toString();
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
- [BTSTACK_LOG_MODE_INFO_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_INFO_INDEX].toString());
+ final String persistedLogLevel = SystemProperties.get(BT_LOG_LEVEL_PROP_PERSIST);
+ final String logLevel = SystemProperties.get(BT_LOG_LEVEL_PROP);
+ final String currentValue = mPreference.getValue().toString();
+ final String currentEntry = mPreference.getEntry().toString();
+ final String currentSummary = mPreference.getSummary().toString();
+ final int currentIndex = mPreference.findIndexOfValue(currentValue);
+
+ assertThat(persistedLogLevel).isEqualTo(PROPERTY_CLEARED);
+ assertThat(logLevel).isEqualTo(PROPERTY_CLEARED);
+ assertThat(currentIndex).isEqualTo(BT_LOG_LEVEL_DEFAULT_INDEX);
+ assertThat(currentValue).isEqualTo(defaultValue);
+ assertThat(currentEntry).isEqualTo(defaultEntry);
+ assertThat(currentSummary).isEqualTo(defaultEntry);
}
/**
- * Test that log level is changed to WARN when WARN is selected
+ * Test that our preference key returned by our controller matches the one defined in the XML
+ * definition.
*/
@Test
- public void onPreferenceChanged_enableBluetoothStackWarnLogLevel() {
- mController.onPreferenceChange(mPreference, mListValues[BTSTACK_LOG_MODE_WARN_INDEX]
- .toString());
-
- final String persistedLogLevel = SystemProperties.get(
- BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST);
- final String logLevel = SystemProperties.get(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY);
- assertThat(persistedLogLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_WARN_INDEX]
- .toString());
- assertThat(logLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_WARN_INDEX].toString());
-
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
-
- [BTSTACK_LOG_MODE_WARN_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_WARN_INDEX].toString());
- }
-
- /**
- * Test that log level is changed to ERROR when ERROR is selected
- */
- @Test
- public void onPreferenceChanged_enableBluetoothStackErrorLogLevel() {
- mController.onPreferenceChange(mPreference, mListValues[BTSTACK_LOG_MODE_ERROR_INDEX]
- .toString());
-
- final String persistedLogLevel = SystemProperties.get(
- BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY_PERSIST);
- final String logLevel = SystemProperties.get(BLUETOOTH_BTSTACK_LOG_MODE_PROPERTY);
- assertThat(persistedLogLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_ERROR_INDEX]
- .toString());
- assertThat(logLevel).isEqualTo(mListValues[BTSTACK_LOG_MODE_ERROR_INDEX].toString());
-
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues
- [BTSTACK_LOG_MODE_ERROR_INDEX].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries
- [BTSTACK_LOG_MODE_ERROR_INDEX].toString());
- }
-
- /**
- * Test that preference is disabled when developer options is disabled
- * Log level is also reset to default
- */
- @Test
- public void onDeveloperOptionsDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsDisabled();
- assertThat(mPreference.isEnabled()).isFalse();
- assertThat(mPreference.getValue().toString()).isEqualTo(mListValues[mController
- .getDefaultModeIndex()].toString());
- assertThat(mPreference.getSummary().toString()).isEqualTo(mListEntries[mController
- .getDefaultModeIndex()].toString());
+ public void getPreferenceKey_matchesXmlDefinedPreferenceKey() {
+ assertThat(mController.getPreferenceKey()).isEqualTo(XML_DEFINED_PREFERENCE_KEY);
}
}
diff --git a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
index 2a0cd05..5eb76f1 100644
--- a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
@@ -29,6 +29,8 @@
import android.content.Context;
import com.android.settings.media_drm.Flags;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.preference.SwitchPreference;
@@ -65,10 +67,10 @@
}
@Test
+ @EnableFlags(Flags.FLAG_FORCE_L3_ENABLED)
public void updateState_flagEnabled_checkPreference() {
- mSetFlagsRule.enableFlags(Flags.FLAG_FORCE_L3_ENABLED);
mController.updateState(mPreference);
- assumeTrue(mPreference.isEnabled());
+ assertThat(mPreference.isEnabled()).isTrue();
assertThat(mPreference.isChecked()).isFalse();
assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isFalse();
@@ -85,33 +87,22 @@
assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isFalse();
assertThat(mPreference.isEnabled()).isTrue();
assertThat(mPreference.isChecked()).isFalse();
-
- // Test flag rollback
- mController.setChecked(true);
- mController.updateState(mPreference);
- assertThat(mPreference.isChecked()).isTrue();
- assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isTrue();
- mSetFlagsRule.disableFlags(Flags.FLAG_FORCE_L3_ENABLED);
- mController.updateState(mPreference);
- assertThat(mPreference.isEnabled()).isFalse();
- assertThat(mPreference.isChecked()).isFalse();
- assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isFalse();
}
@Test
+ @DisableFlags(Flags.FLAG_FORCE_L3_ENABLED)
public void updateState_flagDisabled_checkPreference() {
- mSetFlagsRule.disableFlags(Flags.FLAG_FORCE_L3_ENABLED);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse();
}
@Test
+ @EnableFlags(Flags.FLAG_FORCE_L3_ENABLED)
public void updateState_checkWidevine() throws Exception {
try (MediaDrm drm = new MediaDrm(WIDEVINE_UUID)) {
assumeTrue(drm.getPropertyString("securityLevel").equals("L1"));
- mSetFlagsRule.enableFlags(Flags.FLAG_FORCE_L3_ENABLED);
mController.updateState(mPreference);
- assumeTrue(mPreference.isEnabled());
+ assertThat(mPreference.isEnabled()).isTrue();
} catch (UnsupportedSchemeException ex) {
assumeNoException(ex);
}
@@ -139,11 +130,11 @@
}
@Test
+ @EnableFlags(Flags.FLAG_FORCE_L3_ENABLED)
public void updateState_checkWhenWidevineReady() throws Exception {
try (MediaDrm drm = new MediaDrm(WIDEVINE_UUID)) {
if (drm.getPropertyString("securityLevel").equals("L1")) {
String version = drm.getPropertyString(MediaDrm.PROPERTY_VERSION);
- mSetFlagsRule.enableFlags(Flags.FLAG_FORCE_L3_ENABLED);
mController.updateState(mPreference);
if (Integer.parseInt(version.split("\\.", 2)[0]) >= 19) {
assertThat(mPreference.isEnabled()).isTrue();
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 76ae491..95f69da 100644
--- a/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
+++ b/tests/unit/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
@@ -26,6 +26,7 @@
import com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNKNOWN
import com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRICTED
import com.android.settings.fuelgauge.batteryusage.AppOptModeSharedPreferencesUtils.UNLIMITED_EXPIRE_TIME
+import com.android.settings.testutils.FakeFeatureFactory
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Before
@@ -51,9 +52,14 @@
@Spy
private var testBatteryOptimizeUtils = spy(BatteryOptimizeUtils(context, UID, PACKAGE_NAME))
+ private lateinit var featureFactory: FakeFeatureFactory
+
@Before
fun setup() {
AppOptModeSharedPreferencesUtils.clearAll(context)
+ featureFactory = FakeFeatureFactory.setupForTest()
+ whenever(featureFactory.powerUsageFeatureProvider.isForceExpireAppOptimizationModeEnabled)
+ .thenReturn(false)
}
@After
@@ -77,8 +83,17 @@
}
@Test
- fun updateAppOptModeExpirationInternal_withExpirationTime_verifyData() {
- insertAppOptModeEventForTest(expirationTime = 1000L)
+ fun updateAppOptModeExpirationInternal_withoutExpirationTime_verifyEmptyList() {
+ insertAppOptModeEventForTest(expirationTime = UNLIMITED_EXPIRE_TIME)
+
+ assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty()
+ }
+
+ @Test
+ fun updateAppOptModeExpirationInternal_setOptimizedModeWithFlagEnabled_verifyData() {
+ whenever(featureFactory.powerUsageFeatureProvider.isRestrictedModeOverwriteEnabled)
+ .thenReturn(true)
+ insertAppOptModeEventForTest(expirationTime = 1000L, mode = MODE_OPTIMIZED)
val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
@@ -93,8 +108,46 @@
}
@Test
- fun updateAppOptModeExpirationInternal_withoutExpirationTime_verifyEmptyList() {
- insertAppOptModeEventForTest(expirationTime = UNLIMITED_EXPIRE_TIME)
+ fun updateAppOptModeExpirationInternal_setOptimizedModeWithFlagDisabled_verifyData() {
+ whenever(featureFactory.powerUsageFeatureProvider.isRestrictedModeOverwriteEnabled)
+ .thenReturn(false)
+ insertAppOptModeEventForTest(expirationTime = 1000L, mode = MODE_OPTIMIZED)
+
+ val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
+
+ assertThat(events).hasSize(1)
+ assertAppOptimizationModeEventInfo(
+ events[0],
+ UID,
+ PACKAGE_NAME,
+ MODE_OPTIMIZED,
+ expirationTime = 1000L
+ )
+ }
+
+ @Test
+ fun updateAppOptModeExpirationInternal_setRestrictedModeWithFlagEnabled_verifyData() {
+ whenever(featureFactory.powerUsageFeatureProvider.isRestrictedModeOverwriteEnabled)
+ .thenReturn(true)
+ insertAppOptModeEventForTest(expirationTime = 1000L, mode = MODE_RESTRICTED)
+
+ val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
+
+ assertThat(events).hasSize(1)
+ assertAppOptimizationModeEventInfo(
+ events[0],
+ UID,
+ PACKAGE_NAME,
+ MODE_RESTRICTED,
+ expirationTime = 1000L
+ )
+ }
+
+ @Test
+ fun updateAppOptModeExpirationInternal_setRestrictedModeWithFlagDisabled_verifyEmptyList() {
+ whenever(featureFactory.powerUsageFeatureProvider.isRestrictedModeOverwriteEnabled)
+ .thenReturn(false)
+ insertAppOptModeEventForTest(expirationTime = 1000L, mode = MODE_RESTRICTED)
assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty()
}
@@ -127,6 +180,20 @@
}
@Test
+ fun resetExpiredAppOptModeBeforeTimestamp_forceExpiredData_verifyEmptyList() {
+ whenever(featureFactory.powerUsageFeatureProvider.isForceExpireAppOptimizationModeEnabled)
+ .thenReturn(true)
+ insertAppOptModeEventForTest(expirationTime = 1000L)
+
+ AppOptModeSharedPreferencesUtils.resetExpiredAppOptModeBeforeTimestamp(
+ context,
+ queryTimestampMs = 999L
+ )
+
+ assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty()
+ }
+
+ @Test
fun resetExpiredAppOptModeBeforeTimestamp_noExpiredData_verifyData() {
insertAppOptModeEventForTest(expirationTime = 1000L)
@@ -217,14 +284,14 @@
assertThat(currentOptMode).isEqualTo(MODE_RESTRICTED)
}
- private fun insertAppOptModeEventForTest(expirationTime: Long) {
+ private fun insertAppOptModeEventForTest(expirationTime: Long, mode: Int = MODE_OPTIMIZED) {
whenever(testBatteryOptimizeUtils?.isOptimizeModeMutable).thenReturn(true)
- whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(MODE_OPTIMIZED)
+ whenever(testBatteryOptimizeUtils?.getAppOptimizationMode(true)).thenReturn(mode)
AppOptModeSharedPreferencesUtils.updateAppOptModeExpirationInternal(
context,
mutableListOf(UID),
mutableListOf(PACKAGE_NAME),
- mutableListOf(MODE_OPTIMIZED),
+ mutableListOf(mode),
longArrayOf(expirationTime),
) { _: Int, _: String ->
testBatteryOptimizeUtils
diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
index 8a4acd2..1c482ef 100644
--- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
@@ -36,8 +36,6 @@
import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.Looper;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
@@ -78,15 +76,8 @@
private static final String NOT_CONNECTED = "Not connected";
private static final String SUB_ID_1 = "1";
private static final String SUB_ID_2 = "2";
- private static final String INVALID_SUB_ID = "-1";
private static final String DISPLAY_NAME_1 = "Sub 1";
private static final String DISPLAY_NAME_2 = "Sub 2";
- private static final String SUB_MCC_1 = "123";
- private static final String SUB_MNC_1 = "456";
- private static final String SUB_MCC_2 = "223";
- private static final String SUB_MNC_2 = "456";
- private static final String SUB_COUNTRY_ISO_1 = "Sub 1";
- private static final String SUB_COUNTRY_ISO_2 = "Sub 2";
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -178,14 +169,10 @@
}
private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, int slotId,
- int carrierId, String displayName, String mcc, String mnc, String countryIso,
- int cardId, boolean isVisible, boolean isValid, boolean isActive, boolean isAvailable,
+ String displayName, boolean isVisible, boolean isValid, boolean isActive,
boolean isActiveData) {
- return new SubscriptionInfoEntity(subId, slotId, carrierId,
- displayName, displayName, 0, mcc, mnc, countryIso, false, cardId,
- TelephonyManager.DEFAULT_PORT_INDEX, false, null,
- SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, isVisible,
- "1234567890", true, false, isValid, true, isActive, isAvailable, isActiveData);
+ return new SubscriptionInfoEntity(subId, slotId, false, false, displayName, isVisible,
+ false, isValid, isActive, isActiveData);
}
@Test
@@ -253,10 +240,10 @@
@Test
public void updateCellularSummary_getActiveSubscriptionInfo_cbrs() {
mController.setDefaultDataSubscriptionId(Integer.parseInt(SUB_ID_2));
- mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, false, true, true, true, true);
- mDefaultDataSubInfo = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
- SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, false, true, true, true, false);
+ mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1,
+ false, true, true, true);
+ mDefaultDataSubInfo = setupSubscriptionInfoEntity(SUB_ID_2, 1, DISPLAY_NAME_2,
+ false, true, true, false);
mSubscriptionInfoEntityList.add(mActiveSubInfo);
mSubscriptionInfoEntityList.add(mDefaultDataSubInfo);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -265,8 +252,8 @@
mController.updateCellularSummary();
assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_2);
- mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, true, true);
+ mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1,
+ true, true, true, true);
mSubscriptionInfoEntityList.add(mActiveSubInfo);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
mController.onAvailableSubInfoChanged(mSubscriptionInfoEntityList);
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java
index cc9e116..fa61820 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.os.Looper;
+import android.platform.test.annotations.DisableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.annotation.UiThreadTest;
@@ -54,11 +55,11 @@
if (Looper.myLooper() == null) {
Looper.prepare();
}
- mSetFlagsRule.disableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED);
}
@Test
@UiThreadTest
+ @DisableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED)
public void isPageSearchEnabled_shouldIncludeFragmentXml() {
mPreferenceKeyList =
NetworkProviderCallsSmsFragment.SEARCH_INDEX_DATA_PROVIDER
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
index a98f83b..2b78212 100644
--- a/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java
@@ -28,7 +28,6 @@
import android.content.Context;
import android.os.Looper;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import android.text.TextUtils;
import androidx.lifecycle.LifecycleOwner;
@@ -63,12 +62,6 @@
private static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";
private static final String DISPLAY_NAME_1 = "Sub 1";
private static final String DISPLAY_NAME_2 = "Sub 2";
- private static final String SUB_MCC_1 = "123";
- private static final String SUB_MNC_1 = "456";
- private static final String SUB_MCC_2 = "223";
- private static final String SUB_MNC_2 = "456";
- private static final String SUB_COUNTRY_ISO_1 = "Sub 1";
- private static final String SUB_COUNTRY_ISO_2 = "Sub 2";
@Mock
private SubscriptionInfoEntity mSubInfo1;
@@ -140,12 +133,9 @@
}
private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, int slotId,
- int carrierId, String displayName, String mcc, String mnc, String countryIso,
- int cardId, boolean isValid, boolean isActive, boolean isAvailable) {
- return new SubscriptionInfoEntity(subId, slotId, carrierId, displayName, displayName, 0,
- mcc, mnc, countryIso, false, cardId, TelephonyManager.DEFAULT_PORT_INDEX, false,
- null, SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,
- "1234567890", true, false, isValid, true, isActive, isAvailable, false);
+ String displayName, boolean isValid, boolean isActive) {
+ return new SubscriptionInfoEntity(subId, slotId, false, false, displayName, false,
+ false, isValid, isActive, false);
}
private String setSummaryResId(String resName, String value) {
@@ -159,8 +149,7 @@
@Test
@UiThreadTest
public void getSummary_tapToActivePSim() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, false, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, false);
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
displayPreferenceWithLifecycle();
@@ -172,8 +161,7 @@
@Test
@UiThreadTest
public void getSummary_inactivePSim() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, false, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, false);
doReturn(true).when(mSubscriptionManager).canDisablePhysicalSubscription();
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -187,8 +175,7 @@
@Test
@UiThreadTest
public void getSummary_defaultCalls() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -209,8 +196,7 @@
defaultConfig.append(setSummaryResId("default_active_sim_calls"))
.append(", ")
.append(setSummaryResId("default_active_sim_sms"));
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -228,10 +214,8 @@
@Test
@UiThreadTest
public void getAvailablePhysicalSubscription_withTwoPhysicalSims_returnTwo() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
- SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
- SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, DISPLAY_NAME_2, true, true);
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
diff --git a/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java b/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
index 5f54406..7f1c475 100644
--- a/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
+++ b/tests/unit/src/com/android/settings/network/ResetNetworkOperationBuilderTest.java
@@ -16,20 +16,16 @@
package com.android.settings.network;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
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 android.content.ContentProvider;
-import android.content.ContentResolver;
+import android.content.ContentProviderClient;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkPolicyManager;
@@ -67,7 +63,7 @@
@Mock
private NetworkPolicyManager mNetworkPolicyManager;
@Mock
- private ContentProvider mContentProvider;;
+ private ContentProviderClient mContentProviderClient;
private Context mContext;
@@ -77,9 +73,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
- doReturn(ContentResolver.wrap(mContentProvider)).when(mContext).getContentResolver();
-
mBuilder = spy(new ResetNetworkOperationBuilder(mContext));
+ doReturn(mContentProviderClient).when(mBuilder).getUnstableTelephonyContentProviderClient();
}
@Test
@@ -184,38 +179,38 @@
}
@Test
- public void restartPhoneProcess_withoutTelephonyContentProvider_shouldNotCrash() {
- doThrow(new IllegalArgumentException()).when(mContentProvider).call(
- anyString(), anyString(), anyString(), any());
+ public void restartPhoneProcess_withoutTelephonyContentProvider_shouldNotCrash()
+ throws Exception {
+ doReturn(null).when(mBuilder).getUnstableTelephonyContentProviderClient();
mBuilder.restartPhoneProcess().build().run();
}
@Test
- public void restartRild_withoutTelephonyContentProvider_shouldNotCrash() {
- doThrow(new IllegalArgumentException()).when(mContentProvider).call(
- anyString(), anyString(), anyString(), any());
+ public void restartRild_withoutTelephonyContentProvider_shouldNotCrash()
+ throws Exception {
+ doReturn(null).when(mBuilder).getUnstableTelephonyContentProviderClient();
mBuilder.restartRild().build().run();
}
@Test
- public void restartPhoneProcess_withTelephonyContentProvider_shouldCallRestartPhoneProcess() {
+ public void restartPhoneProcess_withTelephonyContentProvider_shouldCallRestartPhoneProcess()
+ throws Exception {
mBuilder.restartPhoneProcess().build().run();
- verify(mContentProvider).call(
- eq(mBuilder.getResetTelephonyContentProviderAuthority()),
+ verify(mContentProviderClient).call(
eq(ResetNetworkOperationBuilder.METHOD_RESTART_PHONE_PROCESS),
isNull(),
isNull());
}
@Test
- public void restartRild_withTelephonyContentProvider_shouldCallRestartRild() {
+ public void restartRild_withTelephonyContentProvider_shouldCallRestartRild()
+ throws Exception {
mBuilder.restartRild().build().run();
- verify(mContentProvider).call(
- eq(mBuilder.getResetTelephonyContentProviderAuthority()),
+ verify(mContentProviderClient).call(
eq(ResetNetworkOperationBuilder.METHOD_RESTART_RILD),
isNull(),
isNull());
diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
index 42e3a83..f5329fa 100644
--- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
@@ -30,7 +30,6 @@
import android.telecom.TelecomManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LifecycleRegistry;
@@ -70,15 +69,6 @@
private static final String DISPLAY_NAME_1 = "Sub 1";
private static final String DISPLAY_NAME_2 = "Sub 2";
private static final String DISPLAY_NAME_3 = "Sub 3";
- private static final String SUB_MCC_1 = "123";
- private static final String SUB_MNC_1 = "456";
- private static final String SUB_MCC_2 = "223";
- private static final String SUB_MNC_2 = "456";
- private static final String SUB_MCC_3 = "323";
- private static final String SUB_MNC_3 = "456";
- private static final String SUB_COUNTRY_ISO_1 = "Sub 1";
- private static final String SUB_COUNTRY_ISO_2 = "Sub 2";
- private static final String SUB_COUNTRY_ISO_3 = "Sub 3";
@Mock
private SubscriptionManager mSubMgr;
@@ -133,12 +123,9 @@
SubscriptionUtil.setActiveSubscriptionsForTesting(null);
}
- private SubscriptionInfoEntity setupSubscriptionInfoEntity(
- String subId, String displayName, String mcc, String mnc, String countryIso) {
- return new SubscriptionInfoEntity(subId, 1, 1, displayName, displayName, 0, mcc, mnc,
- countryIso, false, 1, TelephonyManager.DEFAULT_PORT_INDEX, false, null,
- SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false, "1234567890",
- true, false, true, true, true, true, false);
+ private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, String displayName) {
+ return new SubscriptionInfoEntity(subId, 1, false, false, displayName, false, false, true,
+ true, false);
}
@Test
@@ -151,8 +138,7 @@
@Test
public void getSummary_singleSub() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mController.displayPreference(mScreen);
@@ -164,10 +150,8 @@
@Test
public void getSummary_twoSubs() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -180,10 +164,8 @@
@Test
public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -197,10 +179,8 @@
@Test
public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -217,10 +197,8 @@
@Test
public void onPreferenceChange_prefBecomesAvailable_onPreferenceChangeCallbackNotNull() {
// Start with only one sub active, so the pref is not available
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -240,10 +218,8 @@
@Test
public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -261,10 +237,8 @@
@Test
public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -287,10 +261,8 @@
@Test
@UiThreadTest
public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList);
@@ -309,12 +281,9 @@
@Test
public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,
- SUB_COUNTRY_ISO_1);
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,
- SUB_COUNTRY_ISO_2);
- mSubInfo3 = setupSubscriptionInfoEntity(SUB_ID_3, DISPLAY_NAME_3, SUB_MCC_3, SUB_MNC_3,
- SUB_COUNTRY_ISO_3);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);
+ mSubInfo3 = setupSubscriptionInfoEntity(SUB_ID_3, DISPLAY_NAME_3);
mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index 152091a..6897c01 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -29,7 +29,6 @@
import android.content.Context;
import android.os.Looper;
import android.platform.test.flag.junit.SetFlagsRule;
-import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -75,8 +74,6 @@
@Mock
private SubscriptionManager mSubscriptionManager;
@Mock
- private SubscriptionInfo mSubscriptionInfo;
- @Mock
private FragmentTransaction mFragmentTransaction;
@Mock
private Lifecycle mLifecycle;
@@ -120,19 +117,15 @@
}
private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, String displayName,
- boolean isOpportunistic, boolean isValid, boolean isActive, boolean isAvailable) {
+ boolean isOpportunistic, boolean isValid, boolean isActive) {
int id = Integer.parseInt(subId);
- return new SubscriptionInfoEntity(subId, id, id,
- displayName, displayName, 0, "mcc", "mnc", "countryIso", false, id,
- TelephonyManager.DEFAULT_PORT_INDEX, isOpportunistic, null,
- SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,
- "1234567890", true, false, isValid, true, isActive, isAvailable, false);
+ return new SubscriptionInfoEntity(subId, id, false, isOpportunistic, displayName, false,
+ false, isValid, isActive, false);
}
private MobileNetworkInfoEntity setupMobileNetworkInfoEntity(String subId,
boolean isDatEnabled) {
- return new MobileNetworkInfoEntity(subId, false, false, isDatEnabled, false, false, false,
- false, false, false, false, false);
+ return new MobileNetworkInfoEntity(subId, isDatEnabled, false);
}
@Test
@@ -145,7 +138,7 @@
@Test
public void isDialogNeeded_disableSingleSim_returnFalse() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);
mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
doReturn(1).when(mTelephonyManager).getActiveModemCount();
@@ -154,12 +147,12 @@
@Test
public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);
mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), false);
doReturn(1).when(mTelephonyManager).getActiveModemCount();
// Ideally, it would be better if we could set the default data subscription to
// SUB_ID_OTHER, and set that as an active subscription id.
- mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, false, true, true, true);
+ mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, false, true, true);
mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
doReturn(2).when(mTelephonyManager).getActiveModemCount();
@@ -181,7 +174,7 @@
@Test
public void onPreferenceChange_singleSim_On_shouldEnableData() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);
mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
mController.setSubscriptionInfoEntity(mSubInfo1);
mController.setMobileNetworkInfoEntity(mNetworkInfo1);
@@ -195,7 +188,7 @@
@Test
public void onPreferenceChange_multiSim_On_shouldEnableData() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);
mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
mController.setSubscriptionInfoEntity(mSubInfo1);
mController.setMobileNetworkInfoEntity(mNetworkInfo1);
@@ -220,7 +213,7 @@
@Test
public void updateState_opportunistic_disabled() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);
mController.init(mFragmentManager, SUB_ID, mSubInfo1, mNetworkInfo1);
mController.updateState(mPreference);
@@ -232,7 +225,7 @@
@Test
public void updateState_notOpportunistic_enabled() {
- mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);
+ mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);
mController.init(mFragmentManager, SUB_ID, mSubInfo1, mNetworkInfo1);
mController.updateState(mPreference);
diff --git a/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
deleted file mode 100644
index d221280..0000000
--- a/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.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.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.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.Looper;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LifecycleRegistry;
-import androidx.test.annotation.UiThreadTest;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.RestrictedSwitchPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class RoamingPreferenceControllerTest {
- private static final int SUB_ID = 2;
-
- @Mock
- private FragmentManager mFragmentManager;
- @Mock
- private TelephonyManager mTelephonyManager;
- @Mock
- private TelephonyManager mInvalidTelephonyManager;
- @Mock
- private SubscriptionManager mSubscriptionManager;
- @Mock
- private FragmentTransaction mFragmentTransaction;
- @Mock
- private CarrierConfigManager mCarrierConfigManager;
- @Mock
- private Lifecycle mLifecycle;
- @Mock
- private LifecycleOwner mLifecycleOwner;
-
- private LifecycleRegistry mLifecycleRegistry;
- private RoamingPreferenceController mController;
- private RestrictedSwitchPreference mPreference;
- private Context mContext;
- private MobileNetworkInfoEntity mMobileNetworkInfoEntity;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
-
- if (Looper.myLooper() == null) {
- Looper.prepare();
- }
-
- mContext = spy(ApplicationProvider.getApplicationContext());
- doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
- doReturn(mSubscriptionManager).when(mContext).getSystemService(
- Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-
- doReturn(mCarrierConfigManager).when(mContext).getSystemService(
- Context.CARRIER_CONFIG_SERVICE);
- doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
- doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
- SubscriptionManager.INVALID_SUBSCRIPTION_ID);
- doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
-
- mPreference = spy(new RestrictedSwitchPreference(mContext));
- mController = spy(
- new RoamingPreferenceController(mContext, "roaming", mLifecycle, mLifecycleOwner,
- SUB_ID));
- mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
- when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
- mController.init(mFragmentManager, SUB_ID, mMobileNetworkInfoEntity);
- mPreference.setKey(mController.getPreferenceKey());
- }
-
- private MobileNetworkInfoEntity setupMobileNetworkInfoEntity(String subId,
- boolean isDataRoaming) {
- return new MobileNetworkInfoEntity(subId, false, false, true, false, false, false, false,
- false, false, false, isDataRoaming);
- }
-
- @Test
- public void getAvailabilityStatus_validSubId_returnAvailable() {
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- AVAILABLE);
- }
-
- @Test
- public void getAvailabilityStatus_invalidSubId_returnUnsearchable() {
- mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- mMobileNetworkInfoEntity);
-
- assertThat(mController.getAvailabilityStatus(
- SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(
- BasePreferenceController.AVAILABLE_UNSEARCHABLE);
- }
-
- @Test
- public void isDialogNeeded_roamingDisabledWithoutFlag_returnTrue() {
- final PersistableBundle bundle = new PersistableBundle();
- bundle.putBoolean(CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
- doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
- mMobileNetworkInfoEntity = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), false);
- mController.setMobileNetworkInfoEntity(mMobileNetworkInfoEntity);
-
- assertThat(mController.isDialogNeeded()).isTrue();
- }
-
- @Test
- public void isDialogNeeded_roamingEnabled_returnFalse() {
- mMobileNetworkInfoEntity = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
- mController.setMobileNetworkInfoEntity(mMobileNetworkInfoEntity);
-
- assertThat(mController.isDialogNeeded()).isFalse();
- }
-
- @Test
- @UiThreadTest
- public void setChecked_needDialog_showDialog() {
- mMobileNetworkInfoEntity = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), false);
- mController.setMobileNetworkInfoEntity(mMobileNetworkInfoEntity);
- doReturn(null).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
- mController.setChecked(true);
-
- verify(mFragmentManager).beginTransaction();
- }
-
- @Test
- public void updateState_invalidSubId_disabled() {
- mMobileNetworkInfoEntity = setupMobileNetworkInfoEntity(
- String.valueOf(SubscriptionManager.INVALID_SUBSCRIPTION_ID), false);
- mController.setMobileNetworkInfoEntity(mMobileNetworkInfoEntity);
- mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID,
- mMobileNetworkInfoEntity);
-
- mController.updateState(mPreference);
-
- assertThat(mPreference.isEnabled()).isFalse();
- }
-
- @Test
- public void updateState_validSubId_enabled() {
- mMobileNetworkInfoEntity = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);
- mController.setMobileNetworkInfoEntity(mMobileNetworkInfoEntity);
-
- mController.updateState(mPreference);
-
- assertThat(mPreference.isEnabled()).isTrue();
- assertThat(mPreference.isChecked()).isTrue();
- }
-
- @Test
- public void updateState_isNotDisabledByAdmin_shouldInvokeSetEnabled() {
- when(mPreference.isDisabledByAdmin()).thenReturn(false);
-
- mController.updateState(mPreference);
-
- verify(mPreference).setEnabled(anyBoolean());
- }
-
- @Test
- public void updateState_isDisabledByAdmin_shouldNotInvokeSetEnabled() {
- when(mPreference.isDisabledByAdmin()).thenReturn(true);
-
- mController.updateState(mPreference);
-
- verify(mPreference, never()).setEnabled(anyBoolean());
- }
-
- @Test
- public void getAvailabilityStatus_carrierConfigIsNull_shouldReturnAvailable() {
- doReturn(null).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
- }
-
- @Test
- public void getAvailabilityStatus_forceHomeNetworkIsFalse_shouldReturnAvailable() {
- final PersistableBundle bundle = new PersistableBundle();
- bundle.putBoolean(CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL, false);
- doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
- assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
- }
-
- @Test
- public void getAvailabilityStatus_forceHomeNetworkIsTrue_shouldReturnConditionallyAvailable() {
- final PersistableBundle bundle = new PersistableBundle();
- bundle.putBoolean(CarrierConfigManager.KEY_FORCE_HOME_NETWORK_BOOL, true);
- doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
- assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
- }
-}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index b8dd5ac..6a50ffc 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -25,7 +25,6 @@
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.biometrics.face.FaceFeatureProvider;
import com.android.settings.biometrics.fingerprint.FingerprintFeatureProvider;
-import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider;
import com.android.settings.bluetooth.BluetoothFeatureProvider;
import com.android.settings.connecteddevice.fastpair.FastPairFeatureProvider;
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider;
@@ -82,7 +81,6 @@
public final BluetoothFeatureProvider mBluetoothFeatureProvider;
public final FaceFeatureProvider mFaceFeatureProvider;
public final FingerprintFeatureProvider mFingerprintFeatureProvider;
- public final BiometricsRepositoryProvider mBiometricsRepositoryProvider;
public PanelFeatureProvider panelFeatureProvider;
public SlicesFeatureProvider slicesFeatureProvider;
@@ -140,7 +138,6 @@
mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
mFaceFeatureProvider = mock(FaceFeatureProvider.class);
mFingerprintFeatureProvider = mock(FingerprintFeatureProvider.class);
- mBiometricsRepositoryProvider = mock(BiometricsRepositoryProvider.class);
wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
securitySettingsFeatureProvider = mock(SecuritySettingsFeatureProvider.class);
mAccessibilitySearchFeatureProvider = mock(AccessibilitySearchFeatureProvider.class);
@@ -273,11 +270,6 @@
}
@Override
- public BiometricsRepositoryProvider getBiometricsRepositoryProvider() {
- return mBiometricsRepositoryProvider;
- }
-
- @Override
public WifiTrackerLibProvider getWifiTrackerLibProvider() {
return wifiTrackerLibProvider;
}
diff --git a/tests/unit/src/com/android/settings/wifi/WepLessSecureWarningControllerTest.kt b/tests/unit/src/com/android/settings/wifi/WepLessSecureWarningControllerTest.kt
new file mode 100644
index 0000000..008539d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WepLessSecureWarningControllerTest.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.wifi
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import com.android.settings.core.BasePreferenceController.AVAILABLE
+import com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE
+import com.android.wifitrackerlib.WifiEntry
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Spy
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+import org.mockito.Mockito.`when` as whenever
+
+class WepLessSecureWarningControllerTest {
+ @get:Rule
+ val mockito: MockitoRule = MockitoJUnit.rule()
+ @Spy
+ private val context: Context = ApplicationProvider.getApplicationContext()
+ @Mock
+ private lateinit var mockWifiEntry: WifiEntry
+
+ private val controller = WepLessSecureWarningController(context, TEST_KEY)
+
+ @Test
+ fun getAvailabilityStatus_default_conditionallyUnavailable() {
+ assertThat(controller.availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+ }
+
+ @Test
+ fun getAvailabilityStatus_noWepSecurityType_conditionallyUnavailable() {
+ whenever(mockWifiEntry.securityTypes).thenReturn(listOf(WifiEntry.SECURITY_PSK))
+
+ controller.setWifiEntry(mockWifiEntry)
+
+ assertThat(controller.availabilityStatus).isEqualTo(CONDITIONALLY_UNAVAILABLE)
+ }
+
+ @Test
+ fun getAvailabilityStatus_containsWepSecurityType_available() {
+ whenever(mockWifiEntry.securityTypes).thenReturn(listOf(WifiEntry.SECURITY_WEP))
+
+ controller.setWifiEntry(mockWifiEntry)
+
+ assertThat(controller.availabilityStatus).isEqualTo(AVAILABLE)
+ }
+
+ private companion object {
+ const val TEST_KEY = "test_key"
+ }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/AdbQrCodeTest.java b/tests/unit/src/com/android/settings/wifi/dpp/AdbQrCodeTest.java
new file mode 100644
index 0000000..44f6c56
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/dpp/AdbQrCodeTest.java
@@ -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.wifi.dpp;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AdbQrCodeTest {
+ @Test
+ public void testZxParsing_validCode() {
+ WifiNetworkConfig config = new AdbQrCode(
+ "WIFI:S:reallyLONGone;T:ADB;P:somepasswo#%^**123rd").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("reallyLONGone");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("somepasswo#%^**123rd");
+
+ config = new AdbQrCode("WIFI:S:anotherone;T:ADB;P:3#=3j9asicla").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("anotherone");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("3#=3j9asicla");
+
+ config = new AdbQrCode("WIFI:S:xx;T:ADB;P:a").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("xx");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("a");
+ }
+
+ @Test
+ public void testZxParsing_invalidCodeButShouldWork() {
+ WifiNetworkConfig config = new AdbQrCode(
+ "WIFI:S:reallyLONGone;T:ADB; P:somepassword").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("reallyLONGone");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("somepassword");
+
+ config = new AdbQrCode("WIFI: S:anotherone;T:ADB;P:abcdefghihklmn").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("anotherone");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("abcdefghihklmn");
+
+ config = new AdbQrCode("WIFI: S:xx; T:ADB; P:a").getWifiNetworkConfig();
+ assertThat(config.getSsid()).isEqualTo("xx");
+ assertThat(config.getSecurity()).isEqualTo("ADB");
+ assertThat(config.getPreSharedKey()).isEqualTo("a");
+ }
+}
+