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

Merge "Set correct screenBounds for RemoteAnimation" into rvc-dev

Browse Source
This commit is contained in:
Ming-Shin Lu
2020-05-20 01:55:56 +00:00
committed by Android (Google) Code Review
parent f2a05b6210 e54dbef9af
commit 3d9abd8bb3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -2184,7 +2184,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
final int appStackClipMode = getDisplayContent().mAppTransition.getAppStackClipMode(); final int appStackClipMode = getDisplayContent().mAppTransition.getAppStackClipMode();
// Separate position and size for use in animators. // Separate position and size for use in animators.
mTmpRect.set(getAnimationBounds(appStackClipMode)); final Rect screenBounds = getAnimationBounds(appStackClipMode);
mTmpRect.set(screenBounds);
getAnimationPosition(mTmpPoint); getAnimationPosition(mTmpPoint);
if (!sHierarchicalAnimations) { if (!sHierarchicalAnimations) {
// Non-hierarchical animation uses position in global coordinates. // Non-hierarchical animation uses position in global coordinates.
@@ -2203,7 +2204,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
localBounds.offsetTo(mTmpPoint.x, mTmpPoint.y); localBounds.offsetTo(mTmpPoint.x, mTmpPoint.y);
final RemoteAnimationController.RemoteAnimationRecord adapters = final RemoteAnimationController.RemoteAnimationRecord adapters =
controller.createRemoteAnimationRecord(this, mTmpPoint, localBounds, controller.createRemoteAnimationRecord(this, mTmpPoint, localBounds,
mTmpRect, (isChanging ? mSurfaceFreezer.mFreezeBounds : null)); screenBounds, (isChanging ? mSurfaceFreezer.mFreezeBounds : null));
resultAdapters = new Pair<>(adapters.mAdapter, adapters.mThumbnailAdapter); resultAdapters = new Pair<>(adapters.mAdapter, adapters.mThumbnailAdapter);
} else if (isChanging) { } else if (isChanging) {
final float durationScale = mWmService.getTransitionAnimationScaleLocked(); final float durationScale = mWmService.getTransitionAnimationScaleLocked();