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

Merge "Revert SurfaceView back to Q's version" into qt-r1-dev am: 2f8cae24b9

Browse Source 
am: 2562753783

Change-Id: I3c95c3c080b76b9f9f33ddb9e27d84a167cdfcb6
This commit is contained in:
John Reck
2019-06-19 19:33:20 -07:00
committed by android-build-merger
parent 2fd846c39f 2562753783
commit 14ff220613
1 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import android.content.res.Configuration;
import android.graphics.BlendMode;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.HardwareRenderer;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
@@ -203,29 +202,6 @@ public class SurfaceView extends View
private SurfaceControl.Transaction mRtTransaction = new SurfaceControl.Transaction();
/**
* A callback which reflects an alpha value of this view onto the underlying surfaces.
*
* <p class="note"><strong>Note:</strong> This doesn't have to be defined as a member variable,
* but can be defined as an inline lambda when calling ViewRootImpl#registerRtFrameCallback().
* However when we do so, the callback is triggered only for a few times and stops working for
* some reason. It's suspected that there is a problem around garbage collection, and until
* the cause is fixed, we will keep this callback in a member variable.</p>
*/
private HardwareRenderer.FrameDrawingCallback mSetSurfaceAlphaCallback = frame -> {
final ViewRootImpl viewRoot = getViewRootImpl();
if (viewRoot == null || viewRoot.mSurface == null || !viewRoot.mSurface.isValid()) {
// In this case, the alpha value is reflected on the screen in #updateSurface() later.
return;
}
final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
t.setAlpha(mSurfaceControl, getAlpha());
t.deferTransactionUntilSurface(mSurfaceControl, viewRoot.mSurface, frame);
t.setEarlyWakeup();
t.apply();
};
public SurfaceView(Context context) {
this(context, null);
}
@@ -324,17 +300,6 @@ public class SurfaceView extends View
updateSurface();
}
@Override
public void setAlpha(float alpha) {
super.setAlpha(alpha);
final ViewRootImpl viewRoot = getViewRootImpl();
if (viewRoot == null) {
return;
}
viewRoot.registerRtFrameCallback(mSetSurfaceAlphaCallback);
invalidate();
}
private void performDrawFinished() {
if (mPendingReportDraws > 0) {
mDrawFinished = true;
@@ -709,13 +674,6 @@ public class SurfaceView extends View
}
updateBackgroundVisibilityInTransaction(viewRoot.getSurfaceControl());
// Alpha value change is handled in setAlpha() directly using a local
// transaction. However it can happen that setAlpha() is called while
// local transactions cannot be applied, so the value is stored in a View
// but not yet reflected on the Surface.
mSurfaceControl.setAlpha(getAlpha());
mBackgroundControl.setAlpha(getAlpha());
// While creating the surface, we will set it's initial
// geometry. Outside of that though, we should generally
// leave it to the RenderThread.