Merge "Remove Second consumer from AllAppsSearchBarController"

This commit is contained in:
Samuel Fufa
2021-01-13 18:57:07 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 13 deletions

View File

@@ -15,7 +15,6 @@
*/
package com.android.launcher3.allapps.search;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -36,7 +35,6 @@ import com.android.launcher3.util.PackageManagerHelper;
import com.android.systemui.plugins.AllAppsSearchPlugin;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
/**
@@ -62,7 +60,7 @@ public class AllAppsSearchBarController
*/
public final void initialize(
SearchAlgorithm searchAlgorithm, ExtendedEditText input,
BaseDraggingActivity launcher, Callbacks cb, Consumer<List<Bundle>> secondaryCb) {
BaseDraggingActivity launcher, Callbacks cb) {
mCb = cb;
mLauncher = launcher;

View File

@@ -24,7 +24,6 @@ import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTO
import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle;
import android.text.Selection;
import android.text.SpannableStringBuilder;
import android.text.method.TextKeyListener;
@@ -50,15 +49,13 @@ import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.config.FeatureFlags;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
/**
* Layout to contain the All-apps search UI.
*/
public class AppsSearchContainerLayout extends ExtendedEditText
implements SearchUiManager, AllAppsSearchBarController.Callbacks,
AllAppsStore.OnUpdateListener, Insettable, Consumer<List<Bundle>> {
AllAppsStore.OnUpdateListener, Insettable {
private final BaseDraggingActivity mLauncher;
private final AllAppsSearchBarController mSearchBarController;
@@ -141,7 +138,7 @@ public class AppsSearchContainerLayout extends ExtendedEditText
mAppsView = appsView;
mSearchBarController.initialize(
new DefaultAppSearchAlgorithm(mLauncher, LauncherAppState.getInstance(mLauncher)),
this, mLauncher, this, this);
this, mLauncher, this);
}
@Override
@@ -234,9 +231,4 @@ public class AppsSearchContainerLayout extends ExtendedEditText
public EditText getEditText() {
return this;
}
@Override
public void accept(List<Bundle> bundles) {
// TODO: Render the result on mAppsView object
}
}