Merge "Animate bottom crop boundary to 50% at start." into sc-dev (7f2d4b02) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screenshot/CropView.java

+50 −4

Original line number	Diff line number	Diff line
		@@ -16,17 +16,22 @@

		package com.android.systemui.screenshot;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.content.Context;
		import android.content.res.TypedArray;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.graphics.Paint;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.MathUtils;
		import android.view.MotionEvent;
		import android.view.View;

		import androidx.annotation.Nullable;
		import androidx.interpolator.view.animation.FastOutSlowInInterpolator;

		import com.android.systemui.R;

		@@ -35,6 +40,7 @@ import com.android.systemui.R;
		* cropped out.
		*/
		public class CropView extends View {
		private static final String TAG = "CropView";
		public enum CropBoundary {
		NONE, TOP, BOTTOM
		}
		@@ -118,16 +124,49 @@ public class CropView extends View {
		case MotionEvent.ACTION_UP:
		if (mCurrentDraggingBoundary != CropBoundary.NONE) {
		// Commit the delta to the stored crop values.
		mTopCrop += mTopDelta;
		mBottomCrop += mBottomDelta;
		mTopDelta = 0;
		mBottomDelta = 0;
		commitDeltas();
		updateListener(event);
		}
		}
		return super.onTouchEvent(event);
		}

		/**
		* Animate the given boundary to the given value.
		*/
		public void animateBoundaryTo(CropBoundary boundary, float value) {
		if (boundary == CropBoundary.NONE) {
		Log.w(TAG, "No boundary selected for animation");
		return;
		}
		float totalDelta = (boundary == CropBoundary.TOP) ? (value - mTopCrop)
		: (value - mBottomCrop);
		ValueAnimator animator = new ValueAnimator();
		animator.addUpdateListener(animation -> {
		if (boundary == CropBoundary.TOP) {
		mTopDelta = animation.getAnimatedFraction() * totalDelta;
		} else {
		mBottomDelta = animation.getAnimatedFraction() * totalDelta;
		}
		invalidate();
		});
		animator.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		commitDeltas();
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		commitDeltas();
		}
		});
		animator.setFloatValues(0f, 1f);
		animator.setDuration(750);
		animator.setInterpolator(new FastOutSlowInInterpolator());
		animator.start();
		}

		/**
		* @return value [0,1] representing the position of the top crop boundary. Does not reflect
		* changes from any in-progress touch input.
		@@ -148,6 +187,13 @@ public class CropView extends View {
		mCropInteractionListener = listener;
		}

		private void commitDeltas() {
		mTopCrop += mTopDelta;
		mBottomCrop += mBottomDelta;
		mTopDelta = 0;
		mBottomDelta = 0;
		}

		private void updateListener(MotionEvent event) {
		if (mCropInteractionListener != null) {
		float boundaryPosition = (mCurrentDraggingBoundary == CropBoundary.TOP)

packages/SystemUI/src/com/android/systemui/screenshot/ScrollCaptureController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,7 @@ public class ScrollCaptureController implements OnComputeInternalInsetsListener
		} else {
		mPreview.setImageDrawable(mImageTileSet.getDrawable());
		mMagnifierView.setImageTileset(mImageTileSet);
		mCropView.animateBoundaryTo(CropView.CropBoundary.BOTTOM, 0.5f);
		}
		}
		}