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 am: 0bcfe825fc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14319875

Change-Id: I82086290b99b9b7db6ff57ed8aca538717ef3fe2
This commit is contained in:
Bill Lin
2021-04-28 03:16:34 +00:00
committed by Automerger Merge Worker
parent b3d620eaf4 0bcfe825fc
commit a298a11025
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);
if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
if (!mDeviceState.isOneHandedModeActive()
&& mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {
if (TestProtocol.sDebugTracing) {
Log.d(TestProtocol.NO_SWIPE_TO_HOME,
"TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -546,8 +547,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
InputConsumer.NO_OP, mInputMonitorCompat,
mDeviceState,
event);
} else if (mDeviceState.canTriggerOneHandedAction(event)
&& !mDeviceState.isOneHandedModeActive()) {
} else if (mDeviceState.canTriggerOneHandedAction(event)) {
// Consume gesture event for triggering one handed feature.
mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,
InputConsumer.NO_OP, mInputMonitorCompat);