Merge "Update string based on new mocks" into udc-dev am: ccd03c9e70 am: 63f71a54e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22748979

Change-Id: Ib9e4e29c38685b05ac61c34b9bfc0619c0dd87ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Becca Hughes
2023-04-26 00:01:18 +00:00
committed by Automerger Merge Worker
4 changed files with 10 additions and 8 deletions

View File

@@ -10248,8 +10248,10 @@
<string name="default_autofill_app">Default autofill service</string>
<!-- Preference category for showing auto-fill services with saved passwords. [CHAR LIMIT=60] -->
<string name="autofill_passwords">Passwords</string>
<!-- Preference category for showing credman services with saved credentials. [CHAR LIMIT=60] -->
<string name="credman_credentials">Passwords, passkeys and data services</string>
<!-- Preference category for showing autofill and credman services with saved credentials. [CHAR LIMIT=60] -->
<string name="credman_chosen_app_title">Passwords, passkeys and data services</string>
<!-- Preference category for showing additional credential providers. [CHAR LIMIT=60] -->
<string name="credman_credentials">Additional providers</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,

View File

@@ -24,12 +24,12 @@
<PreferenceCategory
android:key="default_service_category"
android:order="10"
android:title="@string/default_autofill_app">
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
android:key="default_autofill_main"
android:title="@string/default_autofill_app"
android:title="@string/credman_chosen_app_title"
settings:keywords="@string/autofill_keywords">
<extra
android:name="for_work"

View File

@@ -25,12 +25,12 @@
<PreferenceCategory
android:key="default_service_category"
android:order="10"
android:title="@string/default_autofill_app">
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
android:key="default_autofill_main"
android:title="@string/default_autofill_app"
android:title="@string/credman_chosen_app_title"
settings:keywords="@string/autofill_keywords">
<extra
android:name="for_work"

View File

@@ -25,12 +25,12 @@
<PreferenceCategory
android:key="default_service_category"
android:order="10"
android:title="@string/default_autofill_app">
android:title="@string/credman_chosen_app_title">
<com.android.settings.widget.GearPreference
android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
android:key="default_autofill_work"
android:title="@string/default_autofill_app"
android:title="@string/credman_chosen_app_title"
settings:searchable="false">
<extra
android:name="for_work"