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

Merge "Fix window transformation related issue" am: 8760e60da5

Browse Source 
am: 1200cfb48d

Change-Id: I6a105898193544119e3ca7a911faed67e46e539d
This commit is contained in:
Jorim Jaggi
2016-12-27 16:32:24 +00:00
committed by android-build-merger
parent 715acea102 1200cfb48d
commit a4a4cfc8f5
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1013,15 +1013,10 @@ class WindowStateAnimator {
if (attachedTransformation != null) { if (attachedTransformation != null) {
tmpMatrix.postConcat(attachedTransformation.getMatrix()); tmpMatrix.postConcat(attachedTransformation.getMatrix());
} }
tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset);
if (appTransformation != null) { if (appTransformation != null) {
tmpMatrix.postConcat(appTransformation.getMatrix()); tmpMatrix.postConcat(appTransformation.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. But it needs to be set before the screen rotation animation
// so the pivot point is at the center of the screen for all windows.
tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset);
if (screenAnimation) { if (screenAnimation) {
tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix()); tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix());
} }