Specify package name when launching search UI

Test: robotests
Change-Id: Ib8cc2aa1a6d4de82b32cbe3da8473bb61cf0c530

src/com/android/settings/search/SearchFeatureProvider.java

@@ -21,15 +21,12 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Pair;
 import android.widget.Toolbar;
 
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
 
-import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
 
 /**
  * FeatureProvider for Settings Search
@@ -69,11 +66,8 @@ public interface SearchFeatureProvider {
      */
     ExecutorService getExecutorService();
 
-    /**
+    default String getSettingsIntelligencePkgName() {
-     * Return a FutureTask to get a list of scores for search results.
+        return "com.android.settings.intelligence";
-     */
-    default FutureTask<List<Pair<String, Float>>> getRankerTask(Context context, String query) {
-        return null;
     }
 
     /**
@@ -85,6 +79,7 @@ public interface SearchFeatureProvider {
         }
         toolbar.setOnClickListener(tb -> {
             final Intent intent = SEARCH_UI_INTENT;
+            intent.setPackage(getSettingsIntelligencePkgName());
 
             FeatureFactory.getFactory(
                     activity.getApplicationContext()).getSlicesFeatureProvider()

src/com/android/settings/search/SearchFeatureProviderImpl.java

@@ -101,10 +101,6 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
         return false;
     }
 
-    protected String getSettingsIntelligencePkgName() {
-        return "com.android.settings.intelligence";
-    }
-
     /**
      * A generic method to make the query suitable for searching the database.
      *

src/com/android/settings/search/actionbar/SearchMenuController.java

@@ -18,12 +18,14 @@ package com.android.settings.search.actionbar;
 
 import android.annotation.NonNull;
 import android.app.Fragment;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.SearchFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
@@ -58,8 +60,11 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
         searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         searchItem.setOnMenuItemClickListener(target -> {
-            mHost.startActivityForResult(
+            final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT;
-                    SearchFeatureProvider.SEARCH_UI_INTENT, 0 /* requestCode */);
+            intent.setPackage(FeatureFactory.getFactory(mHost.getContext())
+                    .getSearchFeatureProvider().getSettingsIntelligencePkgName());
+
+            mHost.startActivityForResult(intent, 0 /* requestCode */);
             return true;
         });
     }