Merge "Do not set TaskFragment surface position if in change transition" into sc-v2-dev am: 1dd66dc2a3 am: 812b76a8a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853770

Change-Id: I3fbeb2f5cb16a13ad4ba69c57ee231c1035bd636
This commit is contained in:
Chris Li
2021-09-22 00:40:42 +00:00
committed by Automerger Merge Worker

View File

@@ -2046,9 +2046,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
if (shouldStartChangeTransition(mTmpPrevBounds)) {
initializeChangeTransition(mTmpPrevBounds);
}
if (mTaskFragmentOrganizer != null) {
} else if (mTaskFragmentOrganizer != null) {
// Update the surface position here instead of in the organizer so that we can make sure
// it can be synced with the surface freezer.
updateSurfacePosition(getSyncTransaction());