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

Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev

Browse Source 
am: 14372aaabc

Change-Id: I809c725f2bc11929047a7047b4b24a7edbc1260b
This commit is contained in:
Mihai Popa
2018-03-23 18:44:38 +00:00
committed by android-build-merger
parent ff58551523 14372aaabc
commit 3c0ad631d5
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/widget/Magnifier.java
View File

@@ -215,6 +215,10 @@ public final class Magnifier {
mWindow.destroy();
mWindow = null;
}
mPrevPosInView.x = NONEXISTENT_PREVIOUS_CONFIG_VALUE;
mPrevPosInView.y = NONEXISTENT_PREVIOUS_CONFIG_VALUE;
mPrevStartCoordsInSurface.x = NONEXISTENT_PREVIOUS_CONFIG_VALUE;
mPrevStartCoordsInSurface.y = NONEXISTENT_PREVIOUS_CONFIG_VALUE;
}
}
@@ -321,19 +325,24 @@ public final class Magnifier {
// Clamp copy coordinates inside the surface to avoid displaying distorted content.
final int clampedStartXInSurface = Math.max(0,
Math.min(startXInSurface, surfaceWidth - mWindowWidth));
Math.min(startXInSurface, surfaceWidth - mBitmapWidth));
final int clampedStartYInSurface = Math.max(0,
Math.min(startYInSurface, surfaceHeight - mWindowHeight));
Math.min(startYInSurface, surfaceHeight - mBitmapHeight));
// Clamp window coordinates inside the parent surface, to avoid displaying
// the magnifier out of screen or overlapping with system insets.
final Rect insets = mView.getRootWindowInsets().getSystemWindowInsets();
final int windowCoordsX = Math.max(insets.left,
Math.min(surfaceWidth - mWindowWidth - insets.right, mWindowCoords.x));
final int windowCoordsY = Math.max(insets.top,
Math.min(surfaceHeight - mWindowHeight - insets.bottom, mWindowCoords.y));
// Perform the pixel copy.
mPixelCopyRequestRect.set(clampedStartXInSurface,
clampedStartYInSurface,
clampedStartXInSurface + mBitmapWidth,
clampedStartYInSurface + mBitmapHeight);
final int windowCoordsX = mWindowCoords.x;
final int windowCoordsY = mWindowCoords.y;
final InternalPopupWindow currentWindowInstance = mWindow;
final Bitmap bitmap =
Bitmap.createBitmap(mBitmapWidth, mBitmapHeight, Bitmap.Config.ARGB_8888);
PixelCopy.request(surface, mPixelCopyRequestRect, bitmap,