Merge changes I3ac6506a,I3fc80505

* 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
16 changed files with 191 additions and 159 deletions

View File

@@ -16,6 +16,8 @@
package com.android.settings.dashboard.suggestions;
import static com.android.settings.core.FeatureFlags.SUGGESTIONS_V2;
import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -62,8 +64,6 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
private static final int EXCLUSIVE_SUGGESTION_MAX_COUNT = 3;
private static final String SHARED_PREF_FILENAME = "suggestions";
@VisibleForTesting
static final String FEATURE_FLAG_SUGGESTIONS_V2 = "new_settings_suggestion";
private final SuggestionRanker mSuggestionRanker;
private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -92,7 +92,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
}
private static boolean isV2Enabled() {
return FeatureFlagUtils.isEnabled(FEATURE_FLAG_SUGGESTIONS_V2) || true;
return FeatureFlagUtils.isEnabled(SUGGESTIONS_V2) || true;
}
@Override