Implement edge long swipe gesture to new back gesture affordance (1dd61d82) · Commits · e / os / android_frameworks_base

core/java/android/view/KeyEvent.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1314,6 +1314,12 @@ public class KeyEvent extends InputEvent implements Parcelable {
		*/
		public static final int FLAG_FALLBACK = 0x400;

		/**
		* Flag that indicates that event was sent from EdgeBackGestureHandler.
		* @hide
		*/
		public static final int FLAG_LONG_SWIPE = 0x800;

		/**
		* This flag indicates that this event was modified by or generated from an accessibility
		* service. Value = 0x800

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,11 @@ public interface BackAnimation {
		*/
		void setTriggerBack(boolean triggerBack);

		/**
		* Sets whether the back long swipe gesture is past the trigger threshold or not.
		*/
		void setTriggerLongSwipe(boolean triggerLongSwipe);

		/**
		* Sets the threshold values that define edge swipe behavior.<br>
		* <br>

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

+38 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		private boolean mShouldStartOnNextMoveEvent = false;
		/** @see #setTriggerBack(boolean) */
		private boolean mTriggerBack;
		/** @see #setTriggerLongSwipe(boolean) */
		private boolean mTriggerLongSwipe;
		private FlingAnimationUtils mFlingAnimationUtils;

		@Nullable
		@@ -300,6 +302,12 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mShellExecutor.execute(() -> BackAnimationController.this.setTriggerBack(triggerBack));
		}

		@Override
		public void setTriggerLongSwipe(boolean triggerLongSwipe) {
		mShellExecutor.execute(
		() -> BackAnimationController.this.setTriggerLongSwipe(triggerLongSwipe));
		}

		@Override
		public void setSwipeThresholds(
		float linearDistance,
		@@ -608,6 +616,17 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mTouchTracker.setTriggerBack(triggerBack);
		}

		/**
		* Sets to true when the back long swipe gesture has passed the triggering threshold,
		* false otherwise.
		*/
		public void setTriggerLongSwipe(boolean triggerLongSwipe) {
		if (mPostCommitAnimationInProgress) {
		return;
		}
		mTriggerLongSwipe = triggerLongSwipe;
		}

		private void setSwipeThresholds(
		float linearDistance,
		float maxDistance,
		@@ -669,6 +688,12 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		finishBackNavigation();
		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();
		final BackAnimationRunner runner = mAnimationDefinition.get(backType);
		@@ -690,6 +715,18 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		startPostCommitAnimation();
		}

		private boolean sendEvent(int action, int code, int flags) {
		long when = SystemClock.uptimeMillis();
		final KeyEvent ev = new KeyEvent(when, when, action, code, 0 /* repeat */,
		0 /* metaState /, KeyCharacterMap.VIRTUAL_KEYBOARD, 0 / scancode */,
		flags \| KeyEvent.FLAG_FROM_SYSTEM \| KeyEvent.FLAG_VIRTUAL_HARD_KEY,
		InputDevice.SOURCE_KEYBOARD);

		ev.setDisplayId(mContext.getDisplay().getDisplayId());
		return InputManager.getInstance().injectInputEvent(
		ev, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
		}

		/**
		* Start the phase 2 animation when gesture is released.
		* Callback to {@link #onBackAnimationFinished} when it is finished or timeout.
		@@ -748,6 +785,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mBackNavigationInfo = null;
		}
		mTriggerBack = false;
		mTriggerLongSwipe = false;
		}

		private BackAnimationRunner getAnimationRunnerAndInit() {

packages/SystemUI/plugin/src/com/android/systemui/plugins/NavigationEdgeBackPlugin.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,9 @@ public interface NavigationEdgeBackPlugin extends Plugin {
		/** Sets the callback that should be invoked when a Back gesture is detected. */
		void setBackCallback(BackCallback callback);

		/** Specifies if the long swipe should be enabled or not. */
		default void setLongSwipeEnabled(boolean enabled) {}

		/** Sets the base LayoutParams for the UI. */
		void setLayoutParams(WindowManager.LayoutParams layoutParams);

		@@ -57,7 +60,7 @@ public interface NavigationEdgeBackPlugin extends Plugin {
		/** Callback to let the system react to the detected back gestures. */
		interface BackCallback {
		/** Indicates that a Back gesture was recognized and the system should go back. */
		void triggerBack();
		void triggerBack(boolean isLongPress);

		/** Indicates that the gesture was cancelled and the system should not go back. */
		void cancelBack();
		@@ -68,5 +71,12 @@ public interface NavigationEdgeBackPlugin extends Plugin {
		* @param triggerBack if back will be triggered in current state.
		*/
		void setTriggerBack(boolean triggerBack);

		/**
		* Indicates if long swipe will be triggered if committed in current state.
		*
		* @param triggerLongSwipe if long swipe will be triggered in current state.
		*/
		void setTriggerLongSwipe(boolean triggerLongSwipe);
		}
		}

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanel.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@ class BackPanel(
		maximumValue = 1f
		)

		var triggerLongSwipe = false

		private val allAnimatedFloat = setOf(
		arrowLength,
		arrowHeight,
		@@ -293,6 +295,9 @@ class BackPanel(
		arrowPath.lineTo(0f, 0f)
		arrowPath.lineTo(dx, dy)
		arrowPath.moveTo(dx, -dy)
		if (triggerLongSwipe) {
		arrowPath.addPath(arrowPath, arrowPaint.strokeWidth * 2.0f * -1, 0.0f)
		}
		return arrowPath
		}

		@@ -502,6 +507,9 @@ class BackPanel(
		val arrowPath = calculateArrowPath(dx = dx, dy = dy)
		val arrowPaint = arrowPaint
		.apply { alpha = (255 * min(arrowAlpha.pos, backgroundAlpha.pos)).toInt() }
		if (isLeftPanel) {
		canvas.scale(-1f, 1f, dx / 2f, dy / 2f)
		}
		canvas.drawPath(arrowPath, arrowPaint)
		canvas.restore()