commit cabfc8b12b95398340a3b9ddacdeabdef0d31b5a
author Priyank Singh <priyanksingh@google.com> Tue Apr 02 12:42:17 2019 -0700
committer Priyank Singh <priyanksingh@google.com> Tue Apr 02 12:43:48 2019 -0700
tree 72e53aae84f289b87819be2507a5571c80ef2d3e
parent 01c8df57bbe9f3b30cffc90e73bdd4c76476a7a8

Launch the correct fragment when REQUEST_SET_AUTOFILL_SERVICE intent is fired.

Bug: 121153709
Test: atest CtsAutoFillServiceTestCases:SettingsIntentTest
Change-Id: I1dce8605872f4471463bd1621d8d71217e36b68e

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fb4f146..d9e64fa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,6 +197,7 @@
             <intent-filter android:priority="100">
                 <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
             </intent-filter>
 
             <intent-filter android:priority="100">

src/com/android/car/settings/common/FragmentResolver.java

diff --git a/src/com/android/car/settings/common/FragmentResolver.java b/src/com/android/car/settings/common/FragmentResolver.java
index 4cedfe3..13a31af 100644
--- a/src/com/android/car/settings/common/FragmentResolver.java
+++ b/src/com/android/car/settings/common/FragmentResolver.java
@@ -30,6 +30,7 @@
 import com.android.car.settings.applications.ApplicationsSettingsFragment;
 import com.android.car.settings.applications.DefaultApplicationsSettingsFragment;
 import com.android.car.settings.applications.assist.ManageAssistFragment;
+import com.android.car.settings.applications.defaultapps.DefaultAutofillPickerFragment;
 import com.android.car.settings.bluetooth.BluetoothSettingsFragment;
 import com.android.car.settings.datausage.DataUsageFragment;
 import com.android.car.settings.datetime.DatetimeSettingsFragment;
@@ -37,7 +38,6 @@
 import com.android.car.settings.home.HomepageFragment;
 import com.android.car.settings.inputmethod.KeyboardFragment;
 import com.android.car.settings.language.LanguagePickerFragment;
-import com.android.car.settings.language.LanguagesAndInputFragment;
 import com.android.car.settings.location.LocationScanningFragment;
 import com.android.car.settings.location.LocationSettingsFragment;
 import com.android.car.settings.network.MobileNetworkFragment;
@@ -90,7 +90,7 @@
                 return new DataUsageFragment();
 
             case Settings.ACTION_REQUEST_SET_AUTOFILL_SERVICE:
-                return new LanguagesAndInputFragment();
+                return new DefaultAutofillPickerFragment();
 
             case Settings.ACTION_DATA_ROAMING_SETTINGS:
             case Settings.ACTION_NETWORK_OPERATOR_SETTINGS: