Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6499097 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit 'b4ffa66d':
  Fix wallpaper glitch and moving window animation.
parents e6f6cd69 b4ffa66d

services/java/com/android/server/wm/WindowStateAnimator.java

+5 −1
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ class WindowStateAnimator { 
        mContext = mService.mContext;

        mAttrFlags = win.mAttrs.flags;

        mAttrType = win.mAttrs.type;

        mAnimDw = service.mAppDisplayWidth;

        mAnimDh = service.mAppDisplayHeight;

    }



    public void setAnimation(Animation anim) {
@@ -231,6 +233,8 @@ class WindowStateAnimator { 
                        " scale=" + mService.mWindowAnimationScale);

                    mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(),

                            mAnimDw, mAnimDh);

                    mAnimDw = mService.mAppDisplayWidth;

                    mAnimDh = mService.mAppDisplayHeight;

                    mAnimation.setStartTime(currentTime);

                    mLocalAnimating = true;

                    mAnimating = true;
@@ -377,7 +381,7 @@ class WindowStateAnimator { 
            mService.mPendingRemove.add(mWin);

            mWin.mRemoveOnExit = false;

        }

        if (mService.mWallpaperTarget == mWin) {

        if (mService.mWallpaperTarget == mWin && mService.mLowerWallpaperTarget == null) {

            mAnimator.hideWallpapersLocked();

        }

    }