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

Commit 7110ff3b authored by Helen Cheuk's avatar Helen Cheuk Committed by Android (Google) Code Review
Browse files

Merge "Add flag guard to hover actions in TouchInteractionService." into udc-qpr-dev

parents ef1ac08f aac08cfb

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

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.view.MotionEvent.ACTION_UP; 
import static com.android.launcher3.Launcher.INTENT_ACTION_ALL_APPS_TOGGLE;

import static com.android.launcher3.MotionEventsUtils.isTrackpadMotionEvent;

import static com.android.launcher3.MotionEventsUtils.isTrackpadMultiFingerSwipe;

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

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

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

import static com.android.launcher3.util.window.WindowManagerProxy.MIN_TABLET_WIDTH;
@@ -689,8 +690,8 @@ public class TouchInteractionService extends Service { 
        final int action = event.getActionMasked();

        // Note this will create a new consumer every mouse click, as after ACTION_UP from the click

        // an ACTION_HOVER_ENTER will fire as well.

        boolean isHoverActionWithoutConsumer =

                event.isHoverEvent() && (mUncheckedConsumer.getType() & TYPE_CURSOR_HOVER) == 0;

        boolean isHoverActionWithoutConsumer = ENABLE_CURSOR_HOVER_STATES.get()

                && event.isHoverEvent() && (mUncheckedConsumer.getType() & TYPE_CURSOR_HOVER) == 0;

        if (action == ACTION_DOWN || isHoverActionWithoutConsumer) {

            mRotationTouchHelper.setOrientationTransformIfNeeded(event);