PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia907f5cb329ce87b610fa8be8fbdfedc8b37e089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Becca Hughes
2023-04-25 23:36:19 +00:00
committed by Automerger Merge Worker
parent 383923a4df ccd03c9e70
commit 9cec4a5075
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -10248,8 +10248,10 @@
<string name="default_autofill_app">Default autofill service</string> <string name="default_autofill_app">Default autofill service</string>
<!-- Preference category for showing auto-fill services with saved passwords. [CHAR LIMIT=60] --> <!-- Preference category for showing auto-fill services with saved passwords. [CHAR LIMIT=60] -->
<string name="autofill_passwords">Passwords</string> <string name="autofill_passwords">Passwords</string>
<!-- Preference category for showing credman services with saved credentials. [CHAR LIMIT=60] --> <!-- Preference category for showing autofill and credman services with saved credentials. [CHAR LIMIT=60] -->
<string name="credman_credentials">Passwords, passkeys and data services</string> <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 <!-- Summary for passwords settings that shows how many passwords are saved for each autofill
service. [CHAR LIMIT=NONE] --> service. [CHAR LIMIT=NONE] -->
<string name="autofill_passwords_count">{count, plural, <string name="autofill_passwords_count">{count, plural,

4
res/xml/accounts_dashboard_settings_credman.xml
View File

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

4
res/xml/accounts_personal_dashboard_settings_credman.xml
View File

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

4
res/xml/accounts_work_dashboard_settings_credman.xml
View File

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