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

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

Merge "[Live Tile] Tapping home in Overview does not take user back to app"...

Merge "[Live Tile] Tapping home in Overview does not take user back to app" into ub-launcher3-master
parents dc4545ec 66f3ffe3
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -659,17 +659,17 @@ public class TouchInteractionService extends Service implements PluginListener<O
                    runningComponent != null && runningComponent.equals(homeComponent);
        }

        if (gestureState.getRunningTask() == null) {
        if (ENABLE_QUICKSTEP_LIVE_TILE.get()
                && gestureState.getActivityInterface().isInLiveTileMode()) {
            return createOverviewInputConsumer(
                    previousGestureState, gestureState, event, forceOverviewInputConsumer);
        } else if (gestureState.getRunningTask() == null) {
            return mResetGestureInputConsumer;
        } else if (previousGestureState.isRunningAnimationToLauncher()
                || gestureState.getActivityInterface().isResumed()
                || forceOverviewInputConsumer) {
            return createOverviewInputConsumer(
                    previousGestureState, gestureState, event, forceOverviewInputConsumer);
        } else if (ENABLE_QUICKSTEP_LIVE_TILE.get()
                && gestureState.getActivityInterface().isInLiveTileMode()) {
            return createOverviewInputConsumer(
                    previousGestureState, gestureState, event, forceOverviewInputConsumer);
        } else if (mDeviceState.isGestureBlockedActivity(gestureState.getRunningTask())) {
            return mResetGestureInputConsumer;
        } else {