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

Commit d7b6a429 authored by Bill Lin's avatar Bill Lin
Browse files

Revert "2/ Resolve gesture one handed conflicts swipe up recents" 

This reverts commit 789aa866.

Reason for revert: for clarify b/186197537 

Change-Id: Ia921d073c2ad4e427c5436370313c2095f2adea8
parent 789aa866

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

+3 −3
Original line number Diff line number Diff line
@@ -506,8 +506,7 @@ public class TouchInteractionService extends Service implements PluginListener<O 
            }

            mRotationTouchHelper.setOrientationTransformIfNeeded(event);



            if (!mDeviceState.isOneHandedModeActive()

                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {

            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {

                if (TestProtocol.sDebugTracing) {

                    Log.d(TestProtocol.NO_SWIPE_TO_HOME,

                            "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -536,7 +535,8 @@ public class TouchInteractionService extends Service implements PluginListener<O 
                            InputConsumer.NO_OP, mInputMonitorCompat,

                            mDeviceState,

                            event);

                } else if (mDeviceState.canTriggerOneHandedAction(event)) {

                } else if (mDeviceState.canTriggerOneHandedAction(event)

                    && !mDeviceState.isOneHandedModeActive()) {

                    // Consume gesture event for triggering one handed feature.

                    mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,

                        InputConsumer.NO_OP, mInputMonitorCompat);