From 9ca40b7a0ff79cc29d9875d313d1dc2731ccea5c Mon Sep 17 00:00:00 2001 From: Filip Gruszczynski Date: Thu, 13 Aug 2015 13:35:25 -0700 Subject: [PATCH] Apply window position translation after app transforms. If this translation is applied prematurely and the app transform includes scaling, this translation will be affected and as a result it will move the window. Change-Id: Iaf7d104708f0775384495e42dbd82cb9ae03b8f7 --- .../core/java/com/android/server/wm/WindowStateAnimator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 48f2a9d767ee2..5d33cbd23e3d8 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1090,7 +1090,6 @@ class WindowStateAnimator { if (selfTransformation) { tmpMatrix.postConcat(mTransformation.getMatrix()); } - tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset); if (attachedTransformation != null) { tmpMatrix.postConcat(attachedTransformation.getMatrix()); } @@ -1100,6 +1099,10 @@ class WindowStateAnimator { if (screenAnimation) { tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix()); } + // The translation that applies the position of the window needs to be applied at the + // end in case that other translations include scaling. Otherwise the scaling will + // affect this translation. + tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset); //TODO (multidisplay): Magnification is supported only for the default display. if (mService.mAccessibilityController != null && displayId == Display.DEFAULT_DISPLAY) {