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

Merge "Ensure previous background color is reapplied when showing a SurfaceView" into rvc-dev am: 7da77f4141

Browse Source 
Change-Id: I5757053aa641a6b0a8512980e268390deb08a2fd
This commit is contained in:
Winson Chung
2020-03-25 16:24:05 +00:00
committed by Automerger Merge Worker
parent 8ab1a41a5f 7da77f4141
commit b18c003146
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
boolean mUseAlpha = false;
float mSurfaceAlpha = 1f;
boolean mClipSurfaceToBounds;
int mBackgroundColor = Color.BLACK;
@UnsupportedAppUsage
boolean mHaveFrame = false;
@@ -828,6 +829,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
}
}
private Transaction updateBackgroundColor(Transaction t) {
final float[] colorComponents = new float[] { Color.red(mBackgroundColor) / 255.f,
Color.green(mBackgroundColor) / 255.f, Color.blue(mBackgroundColor) / 255.f };
t.setColor(mBackgroundControl, colorComponents);
return t;
}
private void releaseSurfaces() {
mSurfaceAlpha = 1f;
@@ -1000,6 +1007,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
}
updateBackgroundVisibility(mTmpTransaction);
updateBackgroundColor(mTmpTransaction);
if (mUseAlpha) {
mTmpTransaction.setAlpha(mSurfaceControl, alpha);
mSurfaceAlpha = alpha;
@@ -1399,10 +1407,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
return;
}
final float[] colorComponents = new float[] { Color.red(bgColor) / 255.f,
Color.green(bgColor) / 255.f, Color.blue(bgColor) / 255.f };
mTmpTransaction.setColor(mBackgroundControl, colorComponents).apply();
mBackgroundColor = bgColor;
updateBackgroundColor(mTmpTransaction).apply();
}
@UnsupportedAppUsage