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

Commit a6a0ec98 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge " [Live tile] Use OverviewInputConsumer in live tile mode" into ub-launcher3-master

parents 89008ef5 a7ddfc07

quickstep/src/com/android/quickstep/TouchInteractionService.java

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.MotionEvent.ACTION_CANCEL; 
import static android.view.MotionEvent.ACTION_DOWN;

import static android.view.MotionEvent.ACTION_UP;



import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.quickstep.GestureState.DEFAULT_STATE;
@@ -704,8 +705,10 @@ public class TouchInteractionService extends Service implements PluginListener<O 


        if (activity.getRootView().hasWindowFocus()

                || previousGestureState.isRunningAnimationToLauncher()

                || (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()

                    && forceOverviewInputConsumer)) {

                || (ASSISTANT_GIVES_LAUNCHER_FOCUS.get()

                    && forceOverviewInputConsumer)

                || (ENABLE_QUICKSTEP_LIVE_TILE.get())

                    && gestureState.getActivityInterface().isInLiveTileMode()) {

            return new OverviewInputConsumer(gestureState, activity, mInputMonitorCompat,

                    false /* startingInActivityBounds */);

        } else {