diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 9c50fe9370..0194362084 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -55,7 +55,6 @@ import app.lawnchair.preferences.PreferenceManager import app.lawnchair.preferences2.PreferenceManager2 import app.lawnchair.root.RootHelperManager import app.lawnchair.root.RootNotAvailableException -import app.lawnchair.search.LawnchairSearchAdapterProvider import app.lawnchair.theme.ThemeProvider import app.lawnchair.ui.popup.LawnchairShortcut import app.lawnchair.util.getThemedIconPacksInstalled @@ -67,8 +66,6 @@ import com.android.launcher3.LauncherAppState import com.android.launcher3.LauncherState import com.android.launcher3.R import com.android.launcher3.Utilities -import com.android.launcher3.allapps.ActivityAllAppsContainerView -import com.android.launcher3.allapps.search.SearchAdapterProvider import com.android.launcher3.popup.SystemShortcut import com.android.launcher3.statemanager.StateManager import com.android.launcher3.uioverrides.QuickstepLauncher @@ -285,9 +282,6 @@ class LawnchairLauncher : override fun getSupportedShortcuts(): Stream> = Stream.concat(super.getSupportedShortcuts(), Stream.of(LawnchairShortcut.CUSTOMIZE)) - override fun createMainAdapterProvider(allapps: ActivityAllAppsContainerView<*>): SearchAdapterProvider<*> = - LawnchairSearchAdapterProvider(this, allapps) - override fun updateTheme() { if (themeProvider.colorScheme != colorScheme) { recreate() diff --git a/lawnchair/src/app/lawnchair/allapps/SearchContainerView.kt b/lawnchair/src/app/lawnchair/allapps/SearchContainerView.kt new file mode 100644 index 0000000000..3819fc09b0 --- /dev/null +++ b/lawnchair/src/app/lawnchair/allapps/SearchContainerView.kt @@ -0,0 +1,12 @@ +package app.lawnchair.allapps + +import android.content.Context +import android.util.AttributeSet +import app.lawnchair.search.LawnchairSearchUiDelegate +import com.android.launcher3.allapps.LauncherAllAppsContainerView + +class SearchContainerView(context: Context?, attrs: AttributeSet?) : + LauncherAllAppsContainerView(context, attrs) { + + override fun createSearchUiDelegate() = LawnchairSearchUiDelegate(this) +} diff --git a/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt b/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt index 3c0d2db761..14b21f33b9 100644 --- a/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt +++ b/lawnchair/src/app/lawnchair/search/LawnchairSearchAdapterProvider.kt @@ -5,7 +5,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.util.contains -import app.lawnchair.LawnchairLauncher import app.lawnchair.allapps.SearchItemDecorator import app.lawnchair.allapps.SearchResultView import app.lawnchair.allapps.SearchResultView.Companion.EXTRA_QUICK_LAUNCH @@ -16,9 +15,10 @@ import com.android.launcher3.allapps.ActivityAllAppsContainerView import com.android.launcher3.allapps.AllAppsGridAdapter import com.android.launcher3.allapps.BaseAllAppsAdapter import com.android.launcher3.allapps.search.DefaultSearchAdapterProvider +import com.android.launcher3.views.ActivityContext class LawnchairSearchAdapterProvider( - launcher: LawnchairLauncher, + launcher: ActivityContext, private val appsView: ActivityAllAppsContainerView<*>, ) : DefaultSearchAdapterProvider(launcher) { diff --git a/lawnchair/src/app/lawnchair/search/LawnchairSearchUiDelegate.kt b/lawnchair/src/app/lawnchair/search/LawnchairSearchUiDelegate.kt new file mode 100644 index 0000000000..61022a918e --- /dev/null +++ b/lawnchair/src/app/lawnchair/search/LawnchairSearchUiDelegate.kt @@ -0,0 +1,14 @@ +package app.lawnchair.search + +import com.android.launcher3.allapps.ActivityAllAppsContainerView +import com.android.launcher3.allapps.search.AllAppsSearchUiDelegate +import com.android.launcher3.allapps.search.SearchAdapterProvider +import com.android.launcher3.views.ActivityContext + +class LawnchairSearchUiDelegate(private val appsView: ActivityAllAppsContainerView<*>) : + AllAppsSearchUiDelegate(appsView) { + + override fun createMainAdapterProvider(): SearchAdapterProvider<*> { + return LawnchairSearchAdapterProvider(ActivityContext.lookupContext(appsView.context), appsView) + } +} diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 655c75d1b5..3a20cecd73 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -15,11 +15,11 @@ - \ No newline at end of file + android:saveEnabled="false" /> diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java index c2ac3bca21..7991d1e215 100644 --- a/src/com/android/launcher3/BaseDraggingActivity.java +++ b/src/com/android/launcher3/BaseDraggingActivity.java @@ -228,8 +228,4 @@ public abstract class BaseDraggingActivity extends BaseActivity public boolean isAppBlockedForSafeMode() { return mIsSafeModeEnabled; } - - public SearchAdapterProvider createMainAdapterProvider(ActivityAllAppsContainerView allAppsContainerView) { - return new DefaultSearchAdapterProvider(this); - } } diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index beab27b06a..b7bf4a3c6c 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -190,8 +190,6 @@ public class ActivityAllAppsContainerView private boolean mForceBottomSheetVisible; private int mTabsProtectionAlpha; - private Launcher mLauncher; - @Nullable private AllAppsTransitionController mAllAppsTransitionController; @@ -206,7 +204,6 @@ public class ActivityAllAppsContainerView public ActivityAllAppsContainerView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); mActivityContext = ActivityContext.lookupContext(context); - mLauncher = ActivityContext.lookupContext(context); mAllAppsStore = new AllAppsStore<>(mActivityContext); mScrimColor = Themes.getAttrColor(context, R.attr.allAppsScrimColor); @@ -258,8 +255,7 @@ public class ActivityAllAppsContainerView * onFinishInflate -> onPostCreate */ protected void initContent() { - mMainAdapterProvider = mLauncher.createMainAdapterProvider(this); - // mMainAdapterProvider = mSearchUiDelegate.createMainAdapterProvider(); + mMainAdapterProvider = mSearchUiDelegate.createMainAdapterProvider(); mAH.set(AdapterHolder.MAIN, new AdapterHolder(AdapterHolder.MAIN, new LawnchairAlphabeticalAppsList<>(mActivityContext, mAllAppsStore, null)));