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

Commit 090c20fd authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Rotate display layout if there is a delta present 

We should be careful rotating a DisplayLayout in place
through requestStartTransition trigger path as
the DisplayChange in TransitionRequestInfo uses
ROTATION_UNDEFINED as default start and end rotation
values, while DisplayLayout only supports 0, 90, 180, 270.

This can cause issues since display layouts use their
internally cached mRotation as the startRotation instead
of the one provided by transitions leading to
non-zero delta degree calculations.

We should also avoid assuming in OnDisplayChangingListener
implementations that a rotation caused the display change.
So short-circuiting if so in pip1.PipController

It is still unclear how to exactly repro this case, since
at least generrally, we populate the rotation fields with
a non undefined value - even if the rotation is unchanged,
but this change should guard against the unlikely usage of
ROTATION_UNDEFINED.

Bug: 360907644
Bug: 360908318
Flag: EXEMPT bugfix
Test: N/A
Change-Id: If7ac78d4497b0774268b937d0f5aad0d4972ea53
parent a50a0106

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java

+3 −1
Original line number Diff line number Diff line
@@ -211,8 +211,10 @@ public class DisplayController { 
                    dr.mDisplayLayout.resizeTo(dr.mContext.getResources(),

                            new Size(endAbsBounds.width(), endAbsBounds.height()));

                }

                if (fromRotation != toRotation) {

                    dr.mDisplayLayout.rotateTo(dr.mContext.getResources(), toRotation);

                }

            }



            mChangeController.dispatchOnDisplayChange(

                    wct, displayId, fromRotation, toRotation, null /* newDisplayAreaInfo */);

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
     */

    private final DisplayChangeController.OnDisplayChangingListener mRotationController = (

            displayId, fromRotation, toRotation, newDisplayAreaInfo, t) -> {

        if (fromRotation == toRotation) {

            // OnDisplayChangingListener also gets triggered upon Display size changes;

            // in PiP1, those are handled separately by OnDisplaysChangedListener callbacks.

            return;

        }



        if (mPipTransitionController.handleRotateDisplay(fromRotation, toRotation, t)) {

            return;

        }