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

Send context object to FeatureFlagUtils.

Browse Source 
Bug: 36222960
Test: robotests
Change-Id: I9ca2d8c679474e545988f518eaf32acf459abd2c
This commit is contained in:
Fan Zhang
2017-11-13 17:37:53 -08:00
parent 4f74ed2d07
commit 06b0d5b564
19 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package com.android.settings.search;
import android.annotation.NonNull;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -167,18 +168,18 @@ public interface SearchFeatureProvider {
/**
* Initializes the search toolbar.
*/
default void initSearchToolbar(Context context, Toolbar toolbar) {
if (context == null || toolbar == null) {
default void initSearchToolbar(Activity activity, Toolbar toolbar) {
if (activity == null || toolbar == null) {
return;
}
toolbar.setOnClickListener(tb -> {
final Intent intent;
if (FeatureFlagUtils.isEnabled(FeatureFlags.SEARCH_V2)) {
if (FeatureFlagUtils.isEnabled(activity, FeatureFlags.SEARCH_V2)) {
intent = new Intent("com.android.settings.action.SETTINGS_SEARCH");
} else {
intent = new Intent(context, SearchActivity.class);
intent = new Intent(activity, SearchActivity.class);
}
context.startActivity(intent);
activity.startActivityForResult(intent, 0 /* requestCode */);
});
}
}