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

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

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

Change-Id: I7b34a88cd94311db2193ac19453f21af57c60d66
This commit is contained in:
TreeHugger Robot
2021-07-02 10:23:26 +00:00
committed by Automerger Merge Worker
parent 440059f206 68f3726375
commit 82b4b46b4f
4 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/accounts_dashboard_settings.xml
View File

@@ -37,6 +37,7 @@
<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/autofill_app"
settings:keywords="@string/autofill_keywords"> settings:keywords="@string/autofill_keywords">
<extra <extra
android:name="for_work" android:name="for_work"

1
res/xml/accounts_personal_dashboard_settings.xml
View File

@@ -38,6 +38,7 @@
<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/autofill_app"
settings:keywords="@string/autofill_keywords"> settings:keywords="@string/autofill_keywords">
<extra <extra
android:name="for_work" android:name="for_work"

1
res/xml/accounts_work_dashboard_settings.xml
View File

@@ -39,6 +39,7 @@
<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/autofill_app"
settings:searchable="false"> settings:searchable="false">
<extra <extra
android:name="for_work" android:name="for_work"

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

@@ -89,7 +89,7 @@ public class DefaultAutofillPreferenceControllerTest {
final Preference pref = mock(Preference.class); final Preference pref = mock(Preference.class);
mController.updateState(pref); mController.updateState(pref);
verify(pref).setSummary(R.string.app_list_preference_none); verify(pref).setTitle(R.string.app_list_preference_none);
} }
@Test @Test