drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f4d6f153: Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev

Browse Source 
* commit 'f4d6f153e66eb54f7da5f9bd8f5b6fcc25dfd919':
  remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT
This commit is contained in:
Mathias Agopian
2013-03-06 16:47:55 +00:00
committed by Android Git Automerger
parent de6ce9c1fc f4d6f153e6
commit 563c374faf
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/SurfaceControl.java
View File

@ -158,17 +158,6 @@ public class SurfaceControl {
*/ */
public static final int FX_SURFACE_NORMAL = 0x00000000; 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. * Surface creation flag: Creates a Dim surface.
* Everything behind this surface is dimmed by the amount specified * 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_DIM = 0x00020000;
/**
*
*/
public static final int FX_SURFACE_SCREENSHOT = 0x00030000;
/** /**
* Mask used for FX values above. * Mask used for FX values above.
* *

14
services/java/com/android/server/wm/ScreenRotationAnimation.java
View File

@ -216,14 +216,20 @@ class ScreenRotationAnimation {
try { try {
try { try {
if (WindowManagerService.DEBUG_SURFACE_TRACE) { if (WindowManagerService.DEBUG_SURFACE_TRACE) {
mSurfaceControl = new SurfaceTrace(session, "FreezeSurface", mSurfaceControl = new SurfaceTrace(session, "ScreenshotSurface",
mWidth, mHeight, mWidth, mHeight,
PixelFormat.OPAQUE, SurfaceControl.FX_SURFACE_SCREENSHOT | SurfaceControl.HIDDEN); PixelFormat.OPAQUE, SurfaceControl.HIDDEN);
} else { } else {
mSurfaceControl = new SurfaceControl(session, "FreezeSurface", mSurfaceControl = new SurfaceControl(session, "ScreenshotSurface",
mWidth, mHeight, 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.setLayerStack(mDisplay.getLayerStack());
mSurfaceControl.setLayer(FREEZE_LAYER + 1); mSurfaceControl.setLayer(FREEZE_LAYER + 1);
mSurfaceControl.setAlpha(0); mSurfaceControl.setAlpha(0);