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

Commit 515c3f19 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 275b9a60: am 3edbdd84: Merge "Use the correct parent size to initialize animations" into mnc-dev 

* commit '275b9a60':
  Use the correct parent size to initialize animations
parents 57349878 275b9a60

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -9973,6 +9973,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                            winAnimator.setAnimation(a);

                            winAnimator.mAnimDw = w.mLastFrame.left - left;

                            winAnimator.mAnimDh = w.mLastFrame.top - top;

                            winAnimator.mAnimateMove = true;

                        }



                        //TODO (multidisplay): Accessibility supported only for the default display.

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

+9 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ class WindowStateAnimator { 
    // used.

    int mAnimDw;

    int mAnimDh;

    boolean mAnimateMove = false;

    float mDsDx=1, mDtDx=0, mDsDy=0, mDtDy=1;

    float mLastDsDx=1, mLastDtDx=0, mLastDsDy=0, mLastDtDy=1;
@@ -290,9 +291,15 @@ class WindowStateAnimator { 
                        " wh=" + mWin.mFrame.height() +

                        " dw=" + mAnimDw + " dh=" + mAnimDh +

                        " scale=" + mService.getWindowAnimationScaleLocked());

                    final DisplayInfo displayInfo = displayContent.getDisplayInfo();

                    if (mAnimateMove) {

                        mAnimateMove = false;

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

                                mAnimDw, mAnimDh);

                    final DisplayInfo displayInfo = displayContent.getDisplayInfo();

                    } else {

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

                                displayInfo.appWidth, displayInfo.appHeight);

                    }

                    mAnimDw = displayInfo.appWidth;

                    mAnimDh = displayInfo.appHeight;

                    mAnimation.setStartTime(mAnimationStartTime != -1