Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix screenshot motion spec anchor point"

Browse Source
This commit is contained in:
Miranda Kephart
2020-02-21 00:05:01 +00:00
committed by Android (Google) Code Review
parent cb40b9881d 4f150e0853
commit ec108a95c5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -497,9 +497,9 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
flashOutAnimator.addUpdateListener(animation ->
mScreenshotFlash.setAlpha((float) animation.getAnimatedValue()));
final PointF startPos = new PointF((float) bounds.left, (float) bounds.top);
final PointF finalPos = new PointF(mScreenshotOffsetXPx,
mDisplayMetrics.heightPixels - mScreenshotOffsetYPx - height * cornerScale);
final PointF startPos = new PointF(bounds.centerX(), bounds.centerY());
final PointF finalPos = new PointF(mScreenshotOffsetXPx + width * cornerScale / 2f,
mDisplayMetrics.heightPixels - mScreenshotOffsetYPx - height * cornerScale / 2f);
ValueAnimator toCorner = ValueAnimator.ofFloat(0, 1);
toCorner.setDuration(SCREENSHOT_TO_CORNER_Y_DURATION_MS);
@@ -517,11 +517,13 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
}
if (t < xPositionPct) {
mScreenshotView.setX(MathUtils.lerp(
startPos.x, finalPos.x, mFastOutSlowIn.getInterpolation(t / xPositionPct)));
float xCenter = MathUtils.lerp(startPos.x, finalPos.x,
mFastOutSlowIn.getInterpolation(t / xPositionPct));
mScreenshotView.setX(xCenter - width * mScreenshotView.getScaleX() / 2f);
}
mScreenshotView.setY(MathUtils.lerp(
startPos.y, finalPos.y, mFastOutSlowIn.getInterpolation(t)));
float yCenter = MathUtils.lerp(startPos.y, finalPos.y,
mFastOutSlowIn.getInterpolation(t));
mScreenshotView.setY(yCenter - height * mScreenshotView.getScaleY() / 2f);
});
toCorner.addListener(new AnimatorListenerAdapter() {