From 6e0b00d15ce47892f57bd5c1b9326b90c3450024 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Sun, 27 Dec 2020 15:56:09 -0600 Subject: [PATCH] Remove Second consumer from AllAppsSearchBarController Bug: 175125073 Test: Manual Change-Id: I34abf0b999e58e034705a1c0696e8fcd88020b28 --- .../allapps/search/AllAppsSearchBarController.java | 4 +--- .../allapps/search/AppsSearchContainerLayout.java | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java index bc5a5f2cf1..9886745417 100644 --- a/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java +++ b/src/com/android/launcher3/allapps/search/AllAppsSearchBarController.java @@ -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; @@ -37,7 +36,6 @@ import com.android.systemui.plugins.AllAppsSearchPlugin; import com.android.systemui.plugins.shared.SearchTarget; import java.util.ArrayList; -import java.util.List; import java.util.function.Consumer; /** @@ -63,7 +61,7 @@ public class AllAppsSearchBarController */ public final void initialize( SearchAlgorithm searchAlgorithm, ExtendedEditText input, - BaseDraggingActivity launcher, Callbacks cb, Consumer> secondaryCb) { + BaseDraggingActivity launcher, Callbacks cb) { mCb = cb; mLauncher = launcher; diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java index bd2f04d4ee..4f79fb8b6b 100644 --- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java +++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java @@ -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> { + 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 bundles) { - // TODO: Render the result on mAppsView object - } }