Replace SurfaceView background with boundless color layer. (18a82199) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceView.java

+56 −158

Original line number	Diff line number	Diff line
		@@ -120,10 +120,11 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		final Rect mScreenRect = new Rect();
		SurfaceSession mSurfaceSession;

		SurfaceControlWithBackground mSurfaceControl;
		SurfaceControl mSurfaceControl;
		// In the case of format changes we switch out the surface in-place
		// we need to preserve the old one until the new one has drawn.
		SurfaceControl mDeferredDestroySurfaceControl;
		SurfaceControl mBackgroundControl;
		final Rect mTmpRect = new Rect();
		final Configuration mConfiguration = new Configuration();

		@@ -487,6 +488,29 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		}
		}

		private void updateBackgroundVisibilityInTransaction() {
		if (mBackgroundControl == null) {
		return;
		}
		if ((mSurfaceFlags & PixelFormat.OPAQUE) == 0) {
		mBackgroundControl.show();
		mBackgroundControl.setLayer(Integer.MIN_VALUE);
		} else {
		mBackgroundControl.hide();
		}
		}

		private void releaseSurfaces() {
		if (mSurfaceControl != null) {
		mSurfaceControl.destroy();
		mSurfaceControl = null;
		}
		if (mBackgroundControl != null) {
		mBackgroundControl.destroy();
		mBackgroundControl = null;
		}
		}

		/** @hide */
		protected void updateSurface() {
		if (!mHaveFrame) {
		@@ -553,14 +577,21 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		updateOpaqueFlag();
		final String name = "SurfaceView - " + viewRoot.getTitle().toString();

		mSurfaceControl = new SurfaceControlWithBackground(
		name,
		(mSurfaceFlags & SurfaceControl.OPAQUE) != 0,
		new SurfaceControl.Builder(mSurfaceSession)
		mSurfaceControl = new SurfaceControl.Builder(mSurfaceSession)
		.setName(name)
		.setOpaque((mSurfaceFlags & SurfaceControl.OPAQUE) != 0)
		.setBufferSize(mSurfaceWidth, mSurfaceHeight)
		.setFormat(mFormat)
		.setParent(viewRoot.getSurfaceControl())
		.setFlags(mSurfaceFlags));
		.setFlags(mSurfaceFlags)
		.build();
		mBackgroundControl = new SurfaceControl.Builder(mSurfaceSession)
		.setName("Background for -" + name)
		.setOpaque(true)
		.setColorLayer(true)
		.setParent(mSurfaceControl)
		.build();

		} else if (mSurfaceControl == null) {
		return;
		}
		@@ -577,11 +608,13 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		SurfaceControl.openTransaction();
		try {
		mSurfaceControl.setLayer(mSubLayer);

		if (mViewVisibility) {
		mSurfaceControl.show();
		} else {
		mSurfaceControl.hide();
		}
		updateBackgroundVisibilityInTransaction();

		// While creating the surface, we will set it's initial
		// geometry. Outside of that though, we should generally
		@@ -724,8 +757,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		if (mSurfaceControl != null && !mSurfaceCreated) {
		mSurface.release();

		mSurfaceControl.destroy();
		mSurfaceControl = null;
		releaseSurfaces();
		}
		}
		} catch (Exception ex) {
		@@ -823,7 +855,6 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		final ViewRootImpl viewRoot = getViewRootImpl();

		applySurfaceTransforms(mSurfaceControl, position, frameNumber);
		applySurfaceTransforms(mSurfaceControl.mBackgroundControl, position, frameNumber);

		applyChildSurfaceTransaction_renderWorker(mRtTransaction, viewRoot.mSurface,
		frameNumber);
		@@ -950,7 +981,19 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		* @hide
		*/
		public void setResizeBackgroundColor(int bgColor) {
		mSurfaceControl.setBackgroundColor(bgColor);
		if (mBackgroundControl == null) {
		return;
		}

		final float[] colorComponents = new float[] { Color.red(bgColor) / 255.f,
		Color.green(bgColor) / 255.f, Color.blue(bgColor) / 255.f };

		SurfaceControl.openTransaction();
		try {
		mBackgroundControl.setColor(colorComponents);
		} finally {
		SurfaceControl.closeTransaction();
		}
		}

		@UnsupportedAppUsage
		@@ -1133,149 +1176,4 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
		public SurfaceControl getSurfaceControl() {
		return mSurfaceControl;
		}

		class SurfaceControlWithBackground extends SurfaceControl {
		SurfaceControl mBackgroundControl;
		private boolean mOpaque = true;
		public boolean mVisible = false;

		public SurfaceControlWithBackground(String name, boolean opaque, SurfaceControl.Builder b)
		throws Exception {
		super(b.setName(name).build());

		mBackgroundControl = b.setName("Background for -" + name)
		.setFormat(OPAQUE)
		// Unset the buffer size of the background color layer.
		.setBufferSize(0, 0)
		.setColorLayer(true)
		.build();
		mOpaque = opaque;
		}

		@Override
		public void setAlpha(float alpha) {
		super.setAlpha(alpha);
		mBackgroundControl.setAlpha(alpha);
		}

		@Override
		public void setLayer(int zorder) {
		super.setLayer(zorder);
		// -3 is below all other child layers as SurfaceView never goes below -2
		mBackgroundControl.setLayer(-3);
		}

		@Override
		public void setPosition(float x, float y) {
		super.setPosition(x, y);
		mBackgroundControl.setPosition(x, y);
		}

		@Override
		public void setBufferSize(int w, int h) {
		super.setBufferSize(w, h);
		// The background surface is a color layer so we do not set a size.
		}

		@Override
		public void setWindowCrop(Rect crop) {
		super.setWindowCrop(crop);
		mBackgroundControl.setWindowCrop(crop);
		}

		@Override
		public void setWindowCrop(int width, int height) {
		super.setWindowCrop(width, height);
		mBackgroundControl.setWindowCrop(width, height);
		}

		@Override
		public void setLayerStack(int layerStack) {
		super.setLayerStack(layerStack);
		mBackgroundControl.setLayerStack(layerStack);
		}

		@Override
		public void setOpaque(boolean isOpaque) {
		super.setOpaque(isOpaque);
		mOpaque = isOpaque;
		updateBackgroundVisibility();
		}

		@Override
		public void setSecure(boolean isSecure) {
		super.setSecure(isSecure);
		}

		@Override
		public void setMatrix(float dsdx, float dtdx, float dsdy, float dtdy) {
		super.setMatrix(dsdx, dtdx, dsdy, dtdy);
		mBackgroundControl.setMatrix(dsdx, dtdx, dsdy, dtdy);
		}

		@Override
		public void hide() {
		super.hide();
		mVisible = false;
		updateBackgroundVisibility();
		}

		@Override
		public void show() {
		super.show();
		mVisible = true;
		updateBackgroundVisibility();
		}

		@Override
		public void destroy() {
		super.destroy();
		mBackgroundControl.destroy();
		}

		@Override
		public void release() {
		super.release();
		mBackgroundControl.release();
		}

		@Override
		public void setTransparentRegionHint(Region region) {
		super.setTransparentRegionHint(region);
		mBackgroundControl.setTransparentRegionHint(region);
		}

		@Override
		public void deferTransactionUntil(IBinder handle, long frame) {
		super.deferTransactionUntil(handle, frame);
		mBackgroundControl.deferTransactionUntil(handle, frame);
		}

		@Override
		public void deferTransactionUntil(Surface barrier, long frame) {
		super.deferTransactionUntil(barrier, frame);
		mBackgroundControl.deferTransactionUntil(barrier, frame);
		}

		/** Set the color to fill the background with. */
		private void setBackgroundColor(int bgColor) {
		final float[] colorComponents = new float[] { Color.red(bgColor) / 255.f,
		Color.green(bgColor) / 255.f, Color.blue(bgColor) / 255.f };

		SurfaceControl.openTransaction();
		try {
		mBackgroundControl.setColor(colorComponents);
		} finally {
		SurfaceControl.closeTransaction();
		}
		}

		void updateBackgroundVisibility() {
		if (mOpaque && mVisible) {
		mBackgroundControl.show();
		} else {
		mBackgroundControl.hide();
		}
		}
		}
		}