Merge "Fix to prevent animated tuck repeating." into main (8383a33f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/accessibility/floatingmenu/MenuView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -226,15 +226,15 @@ class MenuView extends FrameLayout implements
		// onArrivalAtPosition() is called at the end of the animation.
		} else {
		mMenuAnimationController.moveToPosition(position);
		onArrivalAtPosition(); // no animation, so we call this immediately.
		onArrivalAtPosition(true); // no animation, so we call this immediately.
		}
		}

		void onArrivalAtPosition() {
		void onArrivalAtPosition(boolean moveToEdgeIfTucked) {
		final PointF position = getMenuPosition();
		onBoundsInParentChanged((int) position.x, (int) position.y);

		if (isMoveToTucked()) {
		if (isMoveToTucked() && moveToEdgeIfTucked) {
		mMenuAnimationController.moveToEdgeAndHide();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ class MenuViewLayer extends FrameLayout implements
		}
		}
		if (Flags.floatingMenuImeDisplacementAnimation()) {
		mMenuView.onArrivalAtPosition();
		mMenuView.onArrivalAtPosition(false);
		}
		}