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

Merge "Fix issue #3418265: Rotation animation on wallpaper is broken" into honeycomb

Browse Source
This commit is contained in:
Dianne Hackborn
2011-02-02 18:42:45 -08:00
committed by Android (Google) Code Review
parent 17f886563c 50660e2728
commit a58617430d
2 changed files with 98 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
services/java/com/android/server/ScreenRotationAnimation.java
View File

@@ -39,10 +39,48 @@ class ScreenRotationAnimation {
static final String TAG = "ScreenRotationAnimation";
static final boolean DEBUG = false;
static final int FREEZE_LAYER = WindowManagerService.TYPE_LAYER_MULTIPLIER * 200;
class BlackSurface {
final int left;
final int top;
final Surface surface;
BlackSurface(SurfaceSession session, int layer, int l, int t, int w, int h)
throws Surface.OutOfResourcesException {
left = l;
top = t;
surface = new Surface(session, 0, "BlackSurface",
-1, w, h, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM);
surface.setAlpha(1.0f);
surface.setLayer(FREEZE_LAYER);
}
void setMatrix(Matrix matrix) {
mTmpMatrix.setTranslate(left, top);
mTmpMatrix.postConcat(matrix);
mTmpMatrix.getValues(mTmpFloats);
surface.setPosition((int)mTmpFloats[Matrix.MTRANS_X],
(int)mTmpFloats[Matrix.MTRANS_Y]);
surface.setMatrix(
mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y],
mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]);
if (false) {
Slog.i(TAG, "Black Surface @ (" + left + "," + top + "): ("
+ mTmpFloats[Matrix.MTRANS_X] + ","
+ mTmpFloats[Matrix.MTRANS_Y] + ") matrix=["
+ mTmpFloats[Matrix.MSCALE_X] + ","
+ mTmpFloats[Matrix.MSCALE_Y] + "]["
+ mTmpFloats[Matrix.MSKEW_X] + ","
+ mTmpFloats[Matrix.MSKEW_Y] + "]");
}
}
}
final Context mContext;
final Display mDisplay;
Surface mSurface;
Surface mBlackSurface;
BlackSurface[] mBlackSurfaces;
int mWidth, mHeight;
int mSnapshotRotation;
@@ -60,6 +98,7 @@ class ScreenRotationAnimation {
final DisplayMetrics mDisplayMetrics = new DisplayMetrics();
final Matrix mSnapshotInitialMatrix = new Matrix();
final Matrix mSnapshotFinalMatrix = new Matrix();
final Matrix mTmpMatrix = new Matrix();
final float[] mTmpFloats = new float[9];
public ScreenRotationAnimation(Context context, Display display, SurfaceSession session,
@@ -97,23 +136,11 @@ class ScreenRotationAnimation {
try {
mSurface = new Surface(session, 0, "FreezeSurface",
-1, mWidth, mHeight, PixelFormat.OPAQUE, 0);
mSurface.setLayer(WindowManagerService.TYPE_LAYER_MULTIPLIER * 200);
mSurface.setLayer(FREEZE_LAYER + 1);
} catch (Surface.OutOfResourcesException e) {
Slog.w(TAG, "Unable to allocate freeze surface", e);
}
if (true) {
try {
int size = mOriginalWidth > mOriginalHeight ? mOriginalWidth : mOriginalHeight;
mBlackSurface = new Surface(session, 0, "BlackSurface",
-1, size, size, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM);
mBlackSurface.setAlpha(1.0f);
mBlackSurface.setLayer(0);
} catch (Surface.OutOfResourcesException e) {
Slog.w(TAG, "Unable to allocate black surface", e);
}
}
setRotation(display.getRotation());
if (mSurface != null) {
@@ -138,7 +165,7 @@ class ScreenRotationAnimation {
paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
c.drawBitmap(screenshot, 0, 0, paint);
} else {
c.drawColor(Color.GREEN, PorterDuff.Mode.SRC);
c.drawColor(Color.BLACK, PorterDuff.Mode.SRC);
}
mSurface.unlockCanvasAndPost(c);
@@ -221,7 +248,8 @@ class ScreenRotationAnimation {
/**
* Returns true if animating.
*/
public boolean dismiss(long maxAnimationDuration, float animationScale) {
public boolean dismiss(SurfaceSession session, long maxAnimationDuration,
float animationScale) {
// Figure out how the screen has moved from the original rotation.
int delta = deltaRotation(mCurRotation, mOriginalRotation);
if (false && delta == 0) {
@@ -277,6 +305,26 @@ class ScreenRotationAnimation {
mEnterAnimation.restrictDuration(maxAnimationDuration);
mEnterAnimation.scaleCurrentDuration(animationScale);
if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(WindowManagerService.TAG,
">>> OPEN TRANSACTION ScreenRotationAnimation.dismiss");
Surface.openTransaction();
mBlackSurfaces = new BlackSurface[4];
try {
final int w = mDisplayMetrics.widthPixels;
final int h = mDisplayMetrics.heightPixels;
mBlackSurfaces[0] = new BlackSurface(session, FREEZE_LAYER, -w, -h, w, h*2);
mBlackSurfaces[1] = new BlackSurface(session, FREEZE_LAYER, 0, -h, w*2, h);
mBlackSurfaces[2] = new BlackSurface(session, FREEZE_LAYER, w, 0, w, h*2);
mBlackSurfaces[3] = new BlackSurface(session, FREEZE_LAYER, -w, h, w*2, h);
} catch (Surface.OutOfResourcesException e) {
Slog.w(TAG, "Unable to allocate black surface", e);
} finally {
Surface.closeTransaction();
if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(WindowManagerService.TAG,
"<<< CLOSE TRANSACTION ScreenRotationAnimation.dismiss");
}
return true;
}
@@ -285,9 +333,13 @@ class ScreenRotationAnimation {
mSurface.destroy();
mSurface = null;
}
if (mBlackSurface != null) {
mBlackSurface.destroy();
mBlackSurface = null;
if (mBlackSurfaces != null) {
for (int i=0; i<mBlackSurfaces.length; i++) {
if (mBlackSurfaces[i] != null) {
mBlackSurfaces[i].surface.destroy();
}
}
mBlackSurfaces = null;
}
if (mExitAnimation != null) {
mExitAnimation.cancel();
@@ -325,12 +377,7 @@ class ScreenRotationAnimation {
mExitAnimation = null;
mExitTransformation.clear();
if (mSurface != null) {
mSurface.destroy();
mSurface = null;
}
if (mBlackSurface != null) {
mBlackSurface.destroy();
mBlackSurface = null;
mSurface.hide();
}
}
}
@@ -343,6 +390,21 @@ class ScreenRotationAnimation {
mEnterAnimation.cancel();
mEnterAnimation = null;
mEnterTransformation.clear();
if (mBlackSurfaces != null) {
for (int i=0; i<mBlackSurfaces.length; i++) {
if (mBlackSurfaces[i] != null) {
mBlackSurfaces[i].surface.hide();
}
}
}
} else {
if (mBlackSurfaces != null) {
for (int i=0; i<mBlackSurfaces.length; i++) {
if (mBlackSurfaces[i] != null) {
mBlackSurfaces[i].setMatrix(mEnterTransformation.getMatrix());
}
}
}
}
}

16
services/java/com/android/server/WindowManagerService.java
View File

@@ -7842,7 +7842,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (selfTransformation) {
tmpMatrix.postConcat(mTransformation.getMatrix());
}
tmpMatrix.postTranslate(frame.left, frame.top);
tmpMatrix.postTranslate(frame.left + mXOffset, frame.top + mYOffset);
if (attachedTransformation != null) {
tmpMatrix.postConcat(attachedTransformation.getMatrix());
}
@@ -7866,8 +7866,8 @@ public class WindowManagerService extends IWindowManager.Stub
mDtDx = tmpFloats[Matrix.MSKEW_Y];
mDsDy = tmpFloats[Matrix.MSKEW_X];
mDtDy = tmpFloats[Matrix.MSCALE_Y];
int x = (int)tmpFloats[Matrix.MTRANS_X] + mXOffset;
int y = (int)tmpFloats[Matrix.MTRANS_Y] + mYOffset;
int x = (int)tmpFloats[Matrix.MTRANS_X];
int y = (int)tmpFloats[Matrix.MTRANS_Y];
int w = frame.width();
int h = frame.height();
mShownFrame.set(x, y, x+w, y+h);
@@ -9783,6 +9783,7 @@ public class WindowManagerService extends IWindowManager.Stub
boolean animating = false;
boolean createWatermark = false;
boolean updateRotation = false;
boolean screenRotationFinished = false;
if (mFxSession == null) {
mFxSession = new SurfaceSession();
@@ -9879,7 +9880,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mScreenRotationAnimation.stepAnimation(currentTime)) {
animating = true;
} else {
mScreenRotationAnimation = null;
screenRotationFinished = true;
updateRotation = true;
}
}
@@ -11043,6 +11044,11 @@ public class WindowManagerService extends IWindowManager.Stub
mTurnOnScreen = false;
}
if (screenRotationFinished && mScreenRotationAnimation != null) {
mScreenRotationAnimation.kill();
mScreenRotationAnimation = null;
}
if (updateRotation) {
if (DEBUG_ORIENTATION) Slog.d(TAG, "Performing post-rotate rotation");
boolean changed = setRotationUncheckedLocked(
@@ -11382,7 +11388,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (CUSTOM_SCREEN_ROTATION) {
if (mScreenRotationAnimation != null) {
if (mScreenRotationAnimation.dismiss(MAX_ANIMATION_DURATION,
if (mScreenRotationAnimation.dismiss(mFxSession, MAX_ANIMATION_DURATION,
mTransitionAnimationScale)) {
requestAnimationLocked(0);
} else {