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

Merge "Avoid global transaction in magnifier"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-11 20:47:28 +00:00
committed by Android (Google) Code Review
parent 68655ec636 64660bedad
commit 50afc5eb41
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,6 +800,7 @@ public final class Magnifier {
// The surface we allocate for the magnifier content + shadow.
private final SurfaceSession mSurfaceSession;
private final SurfaceControl mSurfaceControl;
private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();
private final Surface mSurface;
// The renderer used for the allocated surface.
private final ThreadedRenderer.SimpleRenderer mRenderer;
@@ -1081,16 +1082,16 @@ public final class Magnifier {
return;
}
// Show or move the window at the content draw frame.
SurfaceControl.openTransaction();
mSurfaceControl.deferTransactionUntil(mSurface, frame);
mTransaction.deferTransactionUntilSurface(mSurfaceControl, mSurface, frame);
if (updateWindowPosition) {
mSurfaceControl.setPosition(pendingX, pendingY);
mTransaction.setPosition(mSurfaceControl, pendingX, pendingY);
}
if (firstDraw) {
mSurfaceControl.setLayer(SURFACE_Z);
mSurfaceControl.show();
mTransaction.setLayer(mSurfaceControl, SURFACE_Z)
.show(mSurfaceControl);
}
SurfaceControl.closeTransaction();
mTransaction.apply();
};
mRenderer.setLightCenter(mDisplay, pendingX, pendingY);
} else {