PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..."" into sc-dev

Browse Source
This commit is contained in:
Bill Lin
2021-04-28 03:14:30 +00:00
committed by Android (Google) Code Review
parent 45167d6030 bb1e047dd8
commit 0bcfe825fc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/TouchInteractionService.java
+3 -3
View File
@@ -517,7 +517,8 @@ public class TouchInteractionService extends Service implements PluginListener<O
} }
mRotationTouchHelper.setOrientationTransformIfNeeded(event); mRotationTouchHelper.setOrientationTransformIfNeeded(event);
if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) { if (!mDeviceState.isOneHandedModeActive()
&& mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
if (TestProtocol.sDebugTracing) { if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_SWIPE_TO_HOME, Log.d(TestProtocol.NO_SWIPE_TO_HOME,
"TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion"); "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -546,8 +547,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
InputConsumer.NO_OP, mInputMonitorCompat, InputConsumer.NO_OP, mInputMonitorCompat,
mDeviceState, mDeviceState,
event); event);
} else if (mDeviceState.canTriggerOneHandedAction(event) } else if (mDeviceState.canTriggerOneHandedAction(event)) {
&& !mDeviceState.isOneHandedModeActive()) {
// Consume gesture event for triggering one handed feature. // Consume gesture event for triggering one handed feature.
mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState, mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
InputConsumer.NO_OP, mInputMonitorCompat); InputConsumer.NO_OP, mInputMonitorCompat);