From 6b88c9c1b7858010cbf3d2cd32315466aed7f20b Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 18 Oct 2018 16:23:47 -0700
Subject: [PATCH] Use public API to launch search UI.

Test: manual
Change-Id: I5527dd6de5990aed365b6e78a9492ced00b99565
---
 src/com/android/settings/search/SearchFeatureProvider.java     | 3 ++-
 .../android/settings/search/SearchFeatureProviderImplTest.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 27e8349c162..b2eb8bbb3fc 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -23,6 +23,7 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.provider.Settings;
 import android.view.View;
 import android.widget.Toolbar;
 
@@ -35,7 +36,7 @@ import com.android.settingslib.search.SearchIndexableResources;
  */
 public interface SearchFeatureProvider {
 
-    Intent SEARCH_UI_INTENT = new Intent("com.android.settings.action.SETTINGS_SEARCH");
+    Intent SEARCH_UI_INTENT = new Intent(Settings.ACTION_APP_SEARCH_SETTINGS);
     int REQUEST_CODE = 0;
 
     /**
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index adb5e43b17f..ba29ea1a9e3 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.spy;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.provider.Settings;
 import android.widget.Toolbar;
 
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -63,7 +64,7 @@ public class SearchFeatureProviderImplTest {
         final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
 
         assertThat(launchIntent.getAction())
-                .isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
+                .isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS);
     }
 
     @Test(expected = IllegalArgumentException.class)