diff options
author | Mark Renouf <mrenouf@google.com> | 2021-06-22 19:33:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 19:33:29 +0000 |
commit | caa9e3d08645b0a5575aee7205555ee738e067ad (patch) | |
tree | 17fcd93b135512e4fe7e9324f726f2e52b43d380 | |
parent | 266ff817e85cc4d1fad145878c5dca683f54c623 (diff) | |
parent | db27afd2b360d8fed504cfce429c3c4a1de12768 (diff) | |
download | base-caa9e3d08645b0a5575aee7205555ee738e067ad.tar.gz |
Merge "Fixes long screenshot landscape and split window bugs" into sc-dev am: db27afd2b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15066724
Change-Id: Ia5a1b67295fde1a7c446fc60749e69a9979217e8
-rw-r--r-- | core/java/com/android/internal/view/ScrollCaptureViewSupport.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/core/java/com/android/internal/view/ScrollCaptureViewSupport.java b/core/java/com/android/internal/view/ScrollCaptureViewSupport.java index 8aa2d57e8ea6..9e09006f608d 100644 --- a/core/java/com/android/internal/view/ScrollCaptureViewSupport.java +++ b/core/java/com/android/internal/view/ScrollCaptureViewSupport.java @@ -198,12 +198,9 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa private static final float LIGHT_RADIUS_DP = 800; private static final String TAG = "ViewRenderer"; - private HardwareRenderer mRenderer; - private RenderNode mCaptureRenderNode; - private final RectF mTempRectF = new RectF(); - private final Rect mSourceRect = new Rect(); + private final HardwareRenderer mRenderer; + private final RenderNode mCaptureRenderNode; private final Rect mTempRect = new Rect(); - private final Matrix mTempMatrix = new Matrix(); private final int[] mTempLocation = new int[2]; private long mLastRenderedSourceDrawingId = -1; private Surface mSurface; @@ -313,11 +310,9 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa } private void transformToRoot(View local, Rect localRect, Rect outRect) { - mTempMatrix.reset(); - local.transformMatrixToGlobal(mTempMatrix); - mTempRectF.set(localRect); - mTempMatrix.mapRect(mTempRectF); - mTempRectF.round(outRect); + local.getLocationInWindow(mTempLocation); + outRect.set(localRect); + outRect.offset(mTempLocation[0], mTempLocation[1]); } public void setColorMode(@ColorMode int colorMode) { |