Merge "Make screenshot animation display over cutout area" into sc-dev

This commit is contained in:
Miranda Kephart
2021-06-21 12:10:32 +00:00
committed by Android (Google) Code Review

View File

@@ -479,6 +479,11 @@ public class ScreenshotView extends FrameLayout implements
final PointF finalPos = new PointF(targetPosition.exactCenterX(), final PointF finalPos = new PointF(targetPosition.exactCenterX(),
targetPosition.exactCenterY()); targetPosition.exactCenterY());
// Shift to screen coordinates so that the animation runs on top of the entire screen,
// including e.g. bars covering the display cutout.
int[] locInScreen = mScreenshotPreview.getLocationOnScreen();
startPos.offset(targetPosition.left - locInScreen[0], targetPosition.top - locInScreen[1]);
if (DEBUG_ANIM) { if (DEBUG_ANIM) {
Log.d(TAG, "toCorner: startPos=" + startPos); Log.d(TAG, "toCorner: startPos=" + startPos);
Log.d(TAG, "toCorner: finalPos=" + finalPos); Log.d(TAG, "toCorner: finalPos=" + finalPos);