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

Merge changes I3ac6506a,I3fc80505

Browse Source 
* changes:
  Add intent-filter to SearchResultTrampoline
  Create a feature flag for Search v2.
This commit is contained in:
TreeHugger Robot
2017-11-10 02:31:35 +00:00
committed by Android (Google) Code Review
parent e8338dc33d 8068fda059
commit 29b14a70d5
16 changed files with 191 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/search/DatabaseIndexingUtils.java
View File

@@ -60,8 +60,9 @@ public class DatabaseIndexingUtils {
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
final Intent searchDestination = Utils.onBuildStartFragmentIntent(context,
className, args, null, 0, screenTitle, false, sourceMetricsCategory);
searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
searchDestination.setClass(context, SearchResultTrampoline.class);
searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)
.setAction("com.android.settings.SEARCH_RESULT_TRAMPOLINE")
.setComponent(null);
return searchDestination;
}

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

@@ -19,9 +19,13 @@ package com.android.settings.search;
import android.annotation.NonNull;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.util.FeatureFlagUtils;
import android.util.Pair;
import android.view.View;
import android.widget.Toolbar;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.SiteMapManager;
import java.util.List;
@@ -164,4 +168,22 @@ public interface SearchFeatureProvider {
default FutureTask<List<Pair<String, Float>>> getRankerTask(Context context, String query) {
return null;
}
/**
* Initializes the search toolbar.
*/
default void initSearchToolbar(Context context, Toolbar toolbar) {
if (context == null || toolbar == null) {
return;
}
toolbar.setOnClickListener(tb -> {
final Intent intent;
if (FeatureFlagUtils.isEnabled(FeatureFlags.SEARCH_V2)) {
intent = new Intent("com.android.settings.action.SETTINGS_SEARCH");
} else {
intent = new Intent(context, SearchActivity.class);
}
context.startActivity(intent);
});
}
}