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

This reverts commit 789aa86617.

Reason for revert: for clarify b/186197537 

Change-Id: Ia921d073c2ad4e427c5436370313c2095f2adea8
This commit is contained in:
Bill Lin
2021-04-26 13:00:00 +00:00
parent 789aa86617
commit d7b6a429cd
@@ -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);