Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a9abd2 authored by Winson Chung's avatar Winson Chung
Browse files

Ensure previous background color is reapplied when showing a SurfaceView 

- This prevents a flash of black if we show the surfaceview again
  after it is hidden

Bug: 152134983
Test: Ensure no flash if previous background color was set and it is
      made visible again
Change-Id: I04d0222521c902da6d29e99ccdbd0aa8ad49917e
parent 7b1e562c

core/java/android/view/SurfaceView.java

+10 −4
Original line number Diff line number Diff line
@@ -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