[Magnifier-33] Add animation on line jump (88e4f71b) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+96 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.widget;

		import android.R;
		import android.animation.ValueAnimator;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -100,6 +101,7 @@ import android.view.ViewGroup.LayoutParams;
		import android.view.ViewTreeObserver;
		import android.view.WindowManager;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.view.animation.LinearInterpolator;
		import android.view.inputmethod.CorrectionInfo;
		import android.view.inputmethod.CursorAnchorInfo;
		import android.view.inputmethod.EditorInfo;
		@@ -201,11 +203,11 @@ public class Editor {

		private final boolean mHapticTextHandleEnabled;

		private final Magnifier mMagnifier;
		private final MagnifierMotionAnimator mMagnifierAnimator;
		private final Runnable mUpdateMagnifierRunnable = new Runnable() {
		@Override
		public void run() {
		mMagnifier.update();
		mMagnifierAnimator.update();
		}
		};
		// Update the magnifier contents whenever anything in the view hierarchy is updated.
		@@ -216,7 +218,7 @@ public class Editor {
		new ViewTreeObserver.OnDrawListener() {
		@Override
		public void onDraw() {
		if (mMagnifier != null) {
		if (mMagnifierAnimator != null) {
		// Posting the method will ensure that updating the magnifier contents will
		// happen right after the rendering of the current frame.
		mTextView.post(mUpdateMagnifierRunnable);
		@@ -372,7 +374,9 @@ public class Editor {
		mHapticTextHandleEnabled = mTextView.getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_enableHapticTextHandle);

		mMagnifier = FLAG_USE_MAGNIFIER ? new Magnifier(mTextView) : null;
		if (FLAG_USE_MAGNIFIER) {
		mMagnifierAnimator = new MagnifierMotionAnimator(new Magnifier(mTextView));
		}
		}

		ParcelableParcel saveInstanceState() {
		@@ -4310,6 +4314,88 @@ public class Editor {
		}
		}

		private static class MagnifierMotionAnimator {
		private static final long DURATION = 100 /* miliseconds */;

		// The magnifier being animated.
		private final Magnifier mMagnifier;
		// A value animator used to animate the magnifier.
		private final ValueAnimator mAnimator;

		// Whether the magnifier is currently visible.
		private boolean mMagnifierIsShowing;
		// The coordinates of the magnifier when the currently running animation started.
		private float mAnimationStartX;
		private float mAnimationStartY;
		// The coordinates of the magnifier in the latest animation frame.
		private float mAnimationCurrentX;
		private float mAnimationCurrentY;
		// The latest coordinates the motion animator was asked to #show() the magnifier at.
		private float mLastX;
		private float mLastY;

		private MagnifierMotionAnimator(final Magnifier magnifier) {
		mMagnifier = magnifier;
		// Prepare the animator used to run the motion animation.
		mAnimator = ValueAnimator.ofFloat(0, 1);
		mAnimator.setDuration(DURATION);
		mAnimator.setInterpolator(new LinearInterpolator());
		mAnimator.addUpdateListener((animation) -> {
		// Interpolate to find the current position of the magnifier.
		mAnimationCurrentX = mAnimationStartX
		+ (mLastX - mAnimationStartX) * animation.getAnimatedFraction();
		mAnimationCurrentY = mAnimationStartY
		+ (mLastY - mAnimationStartY) * animation.getAnimatedFraction();
		mMagnifier.show(mAnimationCurrentX, mAnimationCurrentY);
		});
		}

		/**
		* Shows the magnifier at a new position.
		* If the y coordinate is different from the previous y coordinate
		* (probably corresponding to a line jump in the text), a short
		* animation is added to the jump.
		*/
		private void show(final float x, final float y) {
		final boolean startNewAnimation = mMagnifierIsShowing && y != mLastY;

		if (startNewAnimation) {
		if (mAnimator.isRunning()) {
		mAnimator.cancel();
		mAnimationStartX = mAnimationCurrentX;
		mAnimationStartY = mAnimationCurrentY;
		} else {
		mAnimationStartX = mLastX;
		mAnimationStartY = mLastY;
		}
		mAnimator.start();
		} else {
		if (!mAnimator.isRunning()) {
		mMagnifier.show(x, y);
		}
		}
		mLastX = x;
		mLastY = y;
		mMagnifierIsShowing = true;
		}

		/**
		* Updates the content of the magnifier.
		*/
		private void update() {
		mMagnifier.update();
		}

		/**
		* Dismisses the magnifier, or does nothing if it is already dismissed.
		*/
		private void dismiss() {
		mMagnifier.dismiss();
		mAnimator.cancel();
		mMagnifierIsShowing = false;
		}
		}

		@VisibleForTesting
		public abstract class HandleView extends View implements TextViewPositionListener {
		protected Drawable mDrawable;
		@@ -4711,7 +4797,8 @@ public class Editor {
		} else {
		rightBound += mTextView.getLayout().getLineRight(lineNumber);
		}
		final float contentWidth = Math.round(mMagnifier.getWidth() / mMagnifier.getZoom());
		final float contentWidth = Math.round(mMagnifierAnimator.mMagnifier.getWidth()
		/ mMagnifierAnimator.mMagnifier.getZoom());
		if (touchXInView < leftBound - contentWidth / 2
		\|\| touchXInView > rightBound + contentWidth / 2) {
		// The touch is too far from the current line / selection, so hide the magnifier.
		@@ -4728,7 +4815,7 @@ public class Editor {
		}

		protected final void updateMagnifier(@NonNull final MotionEvent event) {
		if (mMagnifier == null) {
		if (mMagnifierAnimator == null) {
		return;
		}

		@@ -4739,15 +4826,15 @@ public class Editor {
		mRenderCursorRegardlessTiming = true;
		mTextView.invalidateCursorPath();
		suspendBlink();
		mMagnifier.show(showPosInView.x, showPosInView.y);
		mMagnifierAnimator.show(showPosInView.x, showPosInView.y);
		} else {
		dismissMagnifier();
		}
		}

		protected final void dismissMagnifier() {
		if (mMagnifier != null) {
		mMagnifier.dismiss();
		if (mMagnifierAnimator != null) {
		mMagnifierAnimator.dismiss();
		mRenderCursorRegardlessTiming = false;
		resumeBlink();
		}