am f4d6f153: Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev (563c374f) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -158,17 +158,6 @@ public class SurfaceControl {
		*/
		public static final int FX_SURFACE_NORMAL = 0x00000000;

		/**
		* Surface creation flag: Creates a Blur surface.
		* Everything behind this surface is blurred by some amount.
		* The quality and refresh speed of the blur effect is not settable or guaranteed.
		* It is an error to lock a Blur surface, since it doesn't have a backing store.
		*
		* @deprecated
		*/
		@Deprecated
		public static final int FX_SURFACE_BLUR = 0x00010000;

		/**
		* Surface creation flag: Creates a Dim surface.
		* Everything behind this surface is dimmed by the amount specified
		@@ -178,11 +167,6 @@ public class SurfaceControl {
		*/
		public static final int FX_SURFACE_DIM = 0x00020000;

		/**
		*
		*/
		public static final int FX_SURFACE_SCREENSHOT = 0x00030000;

		/**
		* Mask used for FX values above.
		*

+10 −4

Original line number	Diff line number	Diff line
		@@ -216,14 +216,20 @@ class ScreenRotationAnimation {
		try {
		try {
		if (WindowManagerService.DEBUG_SURFACE_TRACE) {
		mSurfaceControl = new SurfaceTrace(session, "FreezeSurface",
		mSurfaceControl = new SurfaceTrace(session, "ScreenshotSurface",
		mWidth, mHeight,
		PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_SCREENSHOT \| SurfaceControl.HIDDEN);
		PixelFormat.OPAQUE, SurfaceControl.HIDDEN);
		} else {
		mSurfaceControl = new SurfaceControl(session, "FreezeSurface",
		mSurfaceControl = new SurfaceControl(session, "ScreenshotSurface",
		mWidth, mHeight,
		PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_SCREENSHOT \| SurfaceControl.HIDDEN);
		}
		PixelFormat.OPAQUE, SurfaceControl.HIDDEN);
		}
		// capture a screenshot into the surface we just created
		Surface sur = new Surface();
		sur.copyFrom(mSurfaceControl);
		// FIXME: we should use the proper display
		SurfaceControl.screenshot(SurfaceControl.getBuiltInDisplay(
		SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN), sur);
		mSurfaceControl.setLayerStack(mDisplay.getLayerStack());
		mSurfaceControl.setLayer(FREEZE_LAYER + 1);
		mSurfaceControl.setAlpha(0);