Merge "Use the correct parent size to initialize animations" (354be7cd) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -9907,6 +9907,7 @@ public class WindowManagerService extends IWindowManager.Stub
		winAnimator.setAnimation(a);
		winAnimator.mAnimDw = w.mLastFrame.left - w.mFrame.left;
		winAnimator.mAnimDh = w.mLastFrame.top - w.mFrame.top;
		winAnimator.mAnimateMove = true;

		//TODO (multidisplay): Accessibility supported only for the default display.
		if (mAccessibilityController != null

+9 −2

Original line number	Diff line number	Diff line
		@@ -131,6 +131,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;

		@@ -304,9 +305,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