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

Merge "Fix SurfaceView Background" into pi-dev

Browse Source 
am: e3d2c41344

Change-Id: I95471b28f40446925c41a3a332f324168bbe0309
This commit is contained in:
Robert Carr
2018-03-24 01:12:02 +00:00
committed by android-build-merger
parent 4a27a1b678 e3d2c41344
commit beb2540414
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/view/SurfaceView.java
View File

@@ -787,18 +787,26 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
Surface viewRootSurface, long nextViewRootFrameNumber) {
}
private void setParentSpaceRectangle(Rect position, long frameNumber) {
ViewRootImpl viewRoot = getViewRootImpl();
private void applySurfaceTransforms(SurfaceControl surface, Rect position, long frameNumber) {
if (frameNumber > 0) {
mRtTransaction.deferTransactionUntilSurface(mSurfaceControl, viewRoot.mSurface,
final ViewRootImpl viewRoot = getViewRootImpl();
mRtTransaction.deferTransactionUntilSurface(surface, viewRoot.mSurface,
frameNumber);
}
mRtTransaction.setPosition(mSurfaceControl,position.left, position.top);
mRtTransaction.setMatrix(mSurfaceControl,
mRtTransaction.setPosition(surface, position.left, position.top);
mRtTransaction.setMatrix(surface,
position.width() / (float) mSurfaceWidth,
0.0f, 0.0f,
position.height() / (float) mSurfaceHeight);
}
private void setParentSpaceRectangle(Rect position, long frameNumber) {
final ViewRootImpl viewRoot = getViewRootImpl();
applySurfaceTransforms(mSurfaceControl, position, frameNumber);
applySurfaceTransforms(mSurfaceControl.mBackgroundControl, position, frameNumber);
applyChildSurfaceTransaction_renderWorker(mRtTransaction, viewRoot.mSurface,
frameNumber);
@@ -1100,7 +1108,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
};
class SurfaceControlWithBackground extends SurfaceControl {
private SurfaceControl mBackgroundControl;
SurfaceControl mBackgroundControl;
private boolean mOpaque = true;
public boolean mVisible = false;