Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 270b54d8 authored by Becca Hughes's avatar Becca Hughes Committed by Automerger Merge Worker
Browse files

Fork autofill default app selection am: ddf359d0 

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



Change-Id: I6c4ee907752158c5b0f0c027053a991ab913bb8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bee80de9 ddf359d0

res/values/strings.xml

+16 −0
Original line number Diff line number Diff line
@@ -10265,6 +10265,8 @@ 
    <string name="autofill_keywords">auto, fill, autofill, password</string>

    <!-- Keywords for the credman feature. [CHAR LIMIT=NONE] -->

    <string name="credman_keywords">data, passkey, password</string>

    <!-- Keywords for the credman feature. [CHAR LIMIT=NONE] -->

    <string name="credman_autofill_keywords">auto, fill, autofill, data, passkey, password</string>









    <!-- Message of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->









    <string name="autofill_confirmation_message">








@@ -10277,6 +10279,20 @@







        ]]>









    </string>

















    <!-- Message of the warning dialog for setting the auto-fill/credman app. [CHAR_LIMIT=NONE] -->









    <string name="credman_autofill_confirmation_message">









        <![CDATA[









        <b>Use <xliff:g id="app_name" example="Provider">%1$s</xliff:g>\?</b>









        <br/>









        <br/>









        <xliff:g id="app_name" example="Provider">%1$s</xliff:g> uses what\'s on









        your screen to determine what can be autofilled. New passwords, passkeys and other info will be saved here from now on.









        ]]>









    </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>

















    <!-- Title of the warning dialog for disabling the credential provider. [CHAR_LIMIT=NONE] -->









    <string name="credman_confirmation_message_title">Turn off %1$s\?</string>

































res/xml/accounts_dashboard_settings_credman.xml



+3
−3






























Original line number
Diff line number
Diff line







@@ -27,10 +27,10 @@







        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:fragment="com.android.settings.applications.credentials.DefaultCombinedPicker"









            android:key="default_credman_autofill_main"









            android:title="@string/credman_chosen_app_title"









            settings:keywords="@string/autofill_keywords">









            settings:keywords="@string/credman_autofill_keywords">









            <extra









                android:name="for_work"









                android:value="false" />
































res/xml/accounts_personal_dashboard_settings_credman.xml



+3
−3






























Original line number
Diff line number
Diff line







@@ -28,10 +28,10 @@







        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:fragment="com.android.settings.applications.credentials.DefaultCombinedPicker"









            android:key="default_credman_autofill_main"









            android:title="@string/credman_chosen_app_title"









            settings:keywords="@string/autofill_keywords">









            settings:keywords="@string/credman_autofill_keywords">









            <extra









                android:name="for_work"









                android:value="false" />
































res/xml/accounts_work_dashboard_settings_credman.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -28,8 +28,8 @@







        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:fragment="com.android.settings.applications.credentials.DefaultCombinedPicker"









            android:key="default_credman_autofill_main"









            android:title="@string/credman_chosen_app_title"









            settings:searchable="false">









            <extra
































res/xml/default_credman_picker.xml
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









<?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.









  -->



















<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    android:title="@string/credman_picker_title" />