Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91eb94c authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Use public API to launch search UI."

parents c294ce43 6b88c9c1

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

+2 −1
Original line number Diff line number Diff line
@@ -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;



    /**

tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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)