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

Merge "Fix wallpaper glitch and moving window animation." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-05-09 18:05:08 -07:00
committed by Android (Google) Code Review
parent 78fd4a14dd 9aa695871c
commit b4ffa66d6e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -142,6 +142,8 @@ class WindowStateAnimator {
mContext = mService.mContext; mContext = mService.mContext;
mAttrFlags = win.mAttrs.flags; mAttrFlags = win.mAttrs.flags;
mAttrType = win.mAttrs.type; mAttrType = win.mAttrs.type;
mAnimDw = service.mAppDisplayWidth;
mAnimDh = service.mAppDisplayHeight;
} }
public void setAnimation(Animation anim) { public void setAnimation(Animation anim) {
@@ -231,6 +233,8 @@ class WindowStateAnimator {
" scale=" + mService.mWindowAnimationScale); " scale=" + mService.mWindowAnimationScale);
mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(),
mAnimDw, mAnimDh); mAnimDw, mAnimDh);
mAnimDw = mService.mAppDisplayWidth;
mAnimDh = mService.mAppDisplayHeight;
mAnimation.setStartTime(currentTime); mAnimation.setStartTime(currentTime);
mLocalAnimating = true; mLocalAnimating = true;
mAnimating = true; mAnimating = true;
@@ -377,7 +381,7 @@ class WindowStateAnimator {
mService.mPendingRemove.add(mWin); mService.mPendingRemove.add(mWin);
mWin.mRemoveOnExit = false; mWin.mRemoveOnExit = false;
} }
if (mService.mWallpaperTarget == mWin) { if (mService.mWallpaperTarget == mWin && mService.mLowerWallpaperTarget == null) {
mAnimator.hideWallpapersLocked(); mAnimator.hideWallpapersLocked();
} }
} }