Snap for 5174203 from b7b118546d to qt-release

Change-Id: I7b18326fc5c80b6533845e93f910fe1eb736a228
This commit is contained in:
android-build-team Robot
2018-12-11 04:15:29 +00:00
@@ -331,12 +331,13 @@ public class ClipAnimationHelper {
canvas.translate(mTargetRect.left, mTargetRect.top);
float insetProgress = (1 - progress);
float scale = currentRect.width() / mTargetRect.width();
ttv.drawOnCanvas(canvas,
-mSourceWindowClipInsets.left * insetProgress,
-mSourceWindowClipInsets.top * insetProgress,
ttv.getMeasuredWidth() + mSourceWindowClipInsets.right * insetProgress,
ttv.getMeasuredHeight() + mSourceWindowClipInsets.bottom * insetProgress,
Utilities.mapRange(progress, mWindowCornerRadius, ttv.getCornerRadius()));
Utilities.mapRange(progress, mWindowCornerRadius / scale, ttv.getCornerRadius()));
}
public RectF getTargetRect() {