Merge "Avoid collect window token which should be rotate independently" into tm-qpr-dev am: 24737bd8d1

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

Change-Id: Id7ad71573e003c117099b2aa33ea0655f47845cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-08-02 11:57:54 +00:00
committed by Automerger Merge Worker

View File

@@ -479,9 +479,10 @@ class TransitionController {
// Collect all visible non-app windows which need to be drawn before the animation starts. // Collect all visible non-app windows which need to be drawn before the animation starts.
final DisplayContent dc = wc.asDisplayContent(); final DisplayContent dc = wc.asDisplayContent();
if (dc != null) { if (dc != null) {
final boolean noAsyncRotation = dc.getAsyncRotationController() == null;
wc.forAllWindows(w -> { wc.forAllWindows(w -> {
if (w.mActivityRecord == null && w.isVisible() && !isCollecting(w.mToken) if (w.mActivityRecord == null && w.isVisible() && !isCollecting(w.mToken)
&& dc.shouldSyncRotationChange(w)) { && (noAsyncRotation || !AsyncRotationController.canBeAsync(w.mToken))) {
transition.collect(w.mToken); transition.collect(w.mToken);
} }
}, true /* traverseTopToBottom */); }, true /* traverseTopToBottom */);