PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add search menu to all pages

Browse Source 
Change-Id: I0910df3d26fe583deb70d7052bde28b64e7844a7
Fixes: 68814716
Test: robotests
This commit is contained in:
Fan Zhang
2017-11-29 16:57:19 -08:00
parent 4031bc78e4
commit 681a4cdd47
7 changed files with 179 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/search/SearchFeatureProvider.java
View File

@@ -38,6 +38,8 @@ import java.util.concurrent.FutureTask;
*/
public interface SearchFeatureProvider {
Intent SEARCH_UI_INTENT = new Intent("com.android.settings.action.SETTINGS_SEARCH");
/**
* Ensures the caller has necessary privilege to launch search result page.
*
@@ -165,6 +167,10 @@ public interface SearchFeatureProvider {
return null;
}
default boolean isSearchV2Enabled(Context context) {
return FeatureFlagUtils.isEnabled(context, FeatureFlags.SEARCH_V2);
}
/**
* Initializes the search toolbar.
*/
@@ -174,8 +180,8 @@ public interface SearchFeatureProvider {
}
toolbar.setOnClickListener(tb -> {
final Intent intent;
if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.SEARCH_V2)) {
intent = new Intent("com.android.settings.action.SETTINGS_SEARCH");
if (isSearchV2Enabled(activity)) {
intent = SEARCH_UI_INTENT;
} else {
intent = new Intent(activity, SearchActivity.class);
}