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

Commit 6f0e92af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Autofill settings: Fix search" into sc-dev am: 68f37263 

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

Change-Id: Ieafa01327758d78166693dc77e02448426c0e1fb
parents 1966d6c3 68f37263

res/xml/accounts_dashboard_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
        <com.android.settings.widget.GearPreference

            android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

            android:key="default_autofill_main"

            android:title="@string/autofill_app"

            settings:keywords="@string/autofill_keywords">

            <extra

                android:name="for_work"

res/xml/accounts_personal_dashboard_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <com.android.settings.widget.GearPreference

            android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

            android:key="default_autofill_main"

            android:title="@string/autofill_app"

            settings:keywords="@string/autofill_keywords">

            <extra

                android:name="for_work"

res/xml/accounts_work_dashboard_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
        <com.android.settings.widget.GearPreference

            android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"

            android:key="default_autofill_work"

            android:title="@string/autofill_app"

            settings:searchable="false">

            <extra

                android:name="for_work"

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class DefaultAutofillPreferenceControllerTest { 
        final Preference pref = mock(Preference.class);



        mController.updateState(pref);

        verify(pref).setSummary(R.string.app_list_preference_none);

        verify(pref).setTitle(R.string.app_list_preference_none);

    }



    @Test