Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5d34ad7 authored by Randy Pfohl's avatar Randy Pfohl Committed by Android (Google) Code Review
Browse files

Merge "Ensure square displays will be in transition-root" into main

parents 9ece5edf 5eb5652b

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+2 −1
Original line number Diff line number Diff line
@@ -666,7 +666,8 @@ public class Transitions implements RemoteCallable<Transitions>, 
                continue;

            }

            // Don't reparent display level if only changing order (since root will be inside it).

            if (change.hasFlags(FLAG_IS_DISPLAY) && TransitionUtil.isOrderOnly(change)) {

            if (change.hasFlags(FLAG_IS_DISPLAY) && TransitionUtil.isOrderOnly(change)

                    && change.getStartRotation() == change.getEndRotation()) {

                continue;

            }

services/core/java/com/android/server/wm/Transition.java

+2 −1
Original line number Diff line number Diff line
@@ -3358,7 +3358,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                continue;

            }

            // Skip order-only display-level changes since the display itself isn't changing.

            if (wc.asDisplayContent() != null && isOrderOnly(change)) {

            if (wc.asDisplayContent() != null && isOrderOnly(change)

                    && change.mRotation == wc.getWindowConfiguration().getRotation()) {

                continue;

            }

            // Re-initiate the last parent as the initial ancestor instead of the top target.