Merge "Fixes long screenshot landscape and split window bugs" into sc-dev

This commit is contained in:
Mark Renouf
2021-06-22 19:25:15 +00:00
committed by Android (Google) Code Review

View File

@@ -198,12 +198,9 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa
private static final float LIGHT_RADIUS_DP = 800; private static final float LIGHT_RADIUS_DP = 800;
private static final String TAG = "ViewRenderer"; private static final String TAG = "ViewRenderer";
private HardwareRenderer mRenderer; private final HardwareRenderer mRenderer;
private RenderNode mCaptureRenderNode; private final RenderNode mCaptureRenderNode;
private final RectF mTempRectF = new RectF();
private final Rect mSourceRect = new Rect();
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();
private final Matrix mTempMatrix = new Matrix();
private final int[] mTempLocation = new int[2]; private final int[] mTempLocation = new int[2];
private long mLastRenderedSourceDrawingId = -1; private long mLastRenderedSourceDrawingId = -1;
private Surface mSurface; private Surface mSurface;
@@ -313,11 +310,9 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa
} }
private void transformToRoot(View local, Rect localRect, Rect outRect) { private void transformToRoot(View local, Rect localRect, Rect outRect) {
mTempMatrix.reset(); local.getLocationInWindow(mTempLocation);
local.transformMatrixToGlobal(mTempMatrix); outRect.set(localRect);
mTempRectF.set(localRect); outRect.offset(mTempLocation[0], mTempLocation[1]);
mTempMatrix.mapRect(mTempRectF);
mTempRectF.round(outRect);
} }
public void setColorMode(@ColorMode int colorMode) { public void setColorMode(@ColorMode int colorMode) {