Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af83e714 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Remove Second consumer from AllAppsSearchBarController"

parents a5f289a6 6e0b00d1
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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;

+2 −10
Original line number Diff line number Diff line
@@ -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
    }
}