fixup! Implement edge long swipe gesture (f84ce9e1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -735,6 +735,13 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		"onGestureFinished called while no gesture is started");
		return;
		}
		if (mTriggerLongSwipe) {
		// Let key event handlers deal with back long swipe gesture
		sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK, KeyEvent.FLAG_LONG_SWIPE);
		sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, KeyEvent.FLAG_LONG_SWIPE);
		finishBackNavigation(false);
		return;
		}
		boolean triggerBack = activeTouchTracker.getTriggerBack();
		ProtoLog.d(WM_SHELL_BACK_PREVIEW, "onGestureFinished() mTriggerBack == %s", triggerBack);

		@@ -760,12 +767,6 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		finishBackNavigation(triggerBack);
		return;
		}
		if (mTriggerLongSwipe) {
		// Let key event handlers deal with back long swipe gesture
		sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK, KeyEvent.FLAG_LONG_SWIPE);
		sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, KeyEvent.FLAG_LONG_SWIPE);
		return;
		}

		final int backType = mBackNavigationInfo.getType();
		// Simply trigger and finish back navigation when no animator defined.