Merge "Update strings to match updated figma" into main
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 965daf6..caf3e7f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7318,7 +7318,7 @@
<!-- Title for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=40]-->
<string name="account_dashboard_title">Passwords & accounts</string>
<!-- Summary for setting tile leading to saved autofill passwords, autofill, and account settings [CHAR LIMIT=NONE]-->
- <string name="account_dashboard_default_summary">Saved passwords, autofill, synced accounts</string>
+ <string name="account_dashboard_default_summary">Suggestions for sign-in & autofill</string>
<!-- Title for setting tile leading to setting UI which allows user set default app to
handle actions such as open web page, making phone calls, default SMS apps [CHAR LIMIT=40]-->
<string name="app_default_dashboard_title">Default apps</string>
@@ -10785,8 +10785,8 @@
<string name="autofill_passwords">Passwords</string>
<!-- Preference category for showing autofill and credman services with saved credentials. [CHAR LIMIT=60] -->
<string name="credman_chosen_app_title">Preferred service</string>
- <!-- Preference category for showing additional credential providers. [CHAR LIMIT=60] -->
- <string name="credman_credentials">Additional providers</string>
+ <!-- Preference category for showing additional credential services. [CHAR LIMIT=60] -->
+ <string name="credman_credentials">Additional services</string>
<!-- Summary for passwords settings that shows how many passwords are saved for each autofill
service. [CHAR LIMIT=NONE] -->
<string name="autofill_passwords_count">{count, plural,
@@ -10831,7 +10831,7 @@
</string>
<!-- Title of the screen where the user picks a provider. [CHAR_LIMIT=NONE] -->
- <string name="credman_picker_title">Passwords, passkeys, and data services</string>
+ <string name="credman_picker_title">Preferred service for passwords, passkeys & autofill</string>
<!-- Title of the warning dialog for disabling the credential provider. [CHAR_LIMIT=NONE] -->
<string name="credman_confirmation_message_title">Turn off %1$s\?</string>
@@ -10848,6 +10848,9 @@
]]>
</string>
+ <!-- Title for setting tile leading to saved autofill passwords, passkeys, autofill, and account settings [CHAR LIMIT=40]-->
+ <string name="account_dashboard_title_with_passkeys">Passwords, passkeys & autofill</string>
+
<!-- Message of the warning dialog for disabling the credential provider (new strings for 24Q3). [CHAR_LIMIT=NONE] -->
<string name="credman_confirmation_message_new_ui">
<![CDATA[
diff --git a/res/xml/accounts_dashboard_settings_credman.xml b/res/xml/accounts_dashboard_settings_credman.xml
index 7266bda..08377c9 100644
--- a/res/xml/accounts_dashboard_settings_credman.xml
+++ b/res/xml/accounts_dashboard_settings_credman.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
- android:title="@string/account_dashboard_title"
+ android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
diff --git a/res/xml/accounts_personal_dashboard_settings_credman.xml b/res/xml/accounts_personal_dashboard_settings_credman.xml
index 9473e17..16ab31b 100644
--- a/res/xml/accounts_personal_dashboard_settings_credman.xml
+++ b/res/xml/accounts_personal_dashboard_settings_credman.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
- android:title="@string/account_dashboard_title"
+ android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
diff --git a/res/xml/accounts_private_dashboard_settings_credman.xml b/res/xml/accounts_private_dashboard_settings_credman.xml
index 54db839..c0b12b5 100644
--- a/res/xml/accounts_private_dashboard_settings_credman.xml
+++ b/res/xml/accounts_private_dashboard_settings_credman.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
- android:title="@string/account_dashboard_title"
+ android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
diff --git a/res/xml/accounts_work_dashboard_settings_credman.xml b/res/xml/accounts_work_dashboard_settings_credman.xml
index d649940..44bdb52 100644
--- a/res/xml/accounts_work_dashboard_settings_credman.xml
+++ b/res/xml/accounts_work_dashboard_settings_credman.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_and_account_settings_screen"
- android:title="@string/account_dashboard_title"
+ android:title="@string/account_dashboard_title_with_passkeys"
settings:keywords="@string/keywords_accounts">
<PreferenceCategory
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index d050a1f..31c6af3 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -180,7 +180,7 @@
android:icon="@drawable/ic_settings_accounts"
android:key="top_level_accounts"
android:order="-10"
- android:title="@string/account_dashboard_title"
+ android:title="@string/account_dashboard_title_with_passkeys"
android:summary="@string/summary_placeholder"
settings:highlightableMenuKey="@string/menu_key_accounts"
settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>