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

Commit 2ae01adf authored by Andy Wickham's avatar Andy Wickham
Browse files

Make ContextualSearchInvoker not a ResourceBasedOverride. 

This was previously only used to honor the INVOKE_OMNI_LPH flag
which has been enabled for a long time. So this is part of that
cleanup.

Bug: 297561673
Test: Manual
Flag: EXEMPT deleting legacy flag
Change-Id: Ife9f14faa2099f579f631da2aadaa6a56cbba51d
parent 03a96eb8

quickstep/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
    <string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>

    <string name="taskbar_edu_tooltip_controller_class" translatable="false">com.android.launcher3.taskbar.TaskbarEduTooltipController</string>

    <string name="nav_handle_long_press_handler_class" translatable="false"></string>

    <string name="contextual_search_invoker_class" translatable="false"></string>

    <string name="contextual_search_state_manager_class" translatable="false"></string>



    <!-- The number of thumbnails and icons to keep in the cache. The thumbnail cache size also

quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ open class TaskbarEduTooltipController(context: Context) : 
    protected val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context)

    open val shouldShowSearchEdu: Boolean

        get() =

            ContextualSearchInvoker.newInstance(activityContext)

            ContextualSearchInvoker(activityContext)

                .runContextualSearchInvocationChecksAndLogFailures()



    private val isTooltipEnabled: Boolean

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ public class TaskbarManager { 
                SystemUiProxy.INSTANCE.get(mContext),

                ContextualEduStatsManager.INSTANCE.get(mContext),

                new Handler(),

                ContextualSearchInvoker.newInstance(mContext));

                new ContextualSearchInvoker(mContext));

        mDefaultComponentCallbacks = new ComponentCallbacks() {

            private Configuration mOldConfig = mContext.getResources().getConfiguration();

quickstep/src/com/android/launcher3/taskbar/TaskbarViewCallbacksFactory.kt

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ open class TaskbarViewCallbacksFactory : ResourceBasedOverride { 
                super.triggerAllAppsButtonLongClick()



                val contextualSearchInvoked =

                    ContextualSearchInvoker.newInstance(activity).show(ENTRYPOINT_LONG_PRESS_META)

                    ContextualSearchInvoker(activity).show(ENTRYPOINT_LONG_PRESS_META)

                if (contextualSearchInvoked) {

                    val runningPackage =

                        TopTaskTracker.INSTANCE[activity].getCachedTopTask(
@@ -59,8 +59,7 @@ open class TaskbarViewCallbacksFactory : ResourceBasedOverride { 
    }



    open fun longPressAllAppsToStartContextualSearch(context: Context): Boolean =

        ContextualSearchInvoker.newInstance(context)

            .runContextualSearchInvocationChecksAndLogFailures()

        ContextualSearchInvoker(context).runContextualSearchInvocationChecksAndLogFailures()



    companion object {

        @JvmStatic

quickstep/src/com/android/quickstep/SystemUiProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle { 
        setBackToLauncherCallback(mBackToLauncherCallback, mBackToLauncherRunner);

        setUnfoldAnimationListener(mUnfoldAnimationListener);

        setDesktopTaskListener(mDesktopTaskListener);

        setAssistantOverridesRequested(ContextualSearchInvoker.newInstance(mContext)

        setAssistantOverridesRequested(new ContextualSearchInvoker(mContext)

                .getSysUiAssistOverrideInvocationTypes());

        mStateChangeCallbacks.forEach(Runnable::run);