From 239b58e60af13090d713dc811cc1227e1d6c7c86 Mon Sep 17 00:00:00 2001
From: Ahaan Ugale <augale@google.com>
Date: Thu, 1 Jul 2021 01:38:39 -0700
Subject: [PATCH] Autofill settings: Fix search

Ia012232ba2856e0757289982bc3045d948ff4aa8 replace the "Autofill service"
preference title with the earlier summary string. The change in title
causes search to not find the preference anymore. This change adds back
the title in xml, which makes search find it again. The Controller code
still overwrites the title with the application name.

Also fixes DefaultAutofillPreferenceControllerTest.

Bug: 192403526
Test: manual - clear Settings Services storage -> search "fill" -> click
 link
Test: make -j64 RunSettingsRoboTests \
 ROBOTEST_FILTER="com.android.settings.applications.defaultapps.DefaultAutofillPreferenceControllerTest"
Change-Id: I9714b3efd2a5a7d9ee7eef345415fa020ef0dc61
---
 res/xml/accounts_dashboard_settings.xml                         | 1 +
 res/xml/accounts_personal_dashboard_settings.xml                | 1 +
 res/xml/accounts_work_dashboard_settings.xml                    | 1 +
 .../defaultapps/DefaultAutofillPreferenceControllerTest.java    | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index 71bfc189609..c8627e7e9e7 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -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"
diff --git a/res/xml/accounts_personal_dashboard_settings.xml b/res/xml/accounts_personal_dashboard_settings.xml
index b01c2354325..e0ba71bbef3 100644
--- a/res/xml/accounts_personal_dashboard_settings.xml
+++ b/res/xml/accounts_personal_dashboard_settings.xml
@@ -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"
diff --git a/res/xml/accounts_work_dashboard_settings.xml b/res/xml/accounts_work_dashboard_settings.xml
index c24ea6f5403..1c4c6aa3f3d 100644
--- a/res/xml/accounts_work_dashboard_settings.xml
+++ b/res/xml/accounts_work_dashboard_settings.xml
@@ -38,6 +38,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"
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index 26ec1c62d03..4d81069fbab 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -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