Merge "2/ Resolve gesture one handed conflicts swipe up recents" into sc-dev (54d69965) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -515,7 +515,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");
		@@ -544,8 +545,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);