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

Commit ef8bdd3e authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Rotate display layout if there is a delta present" into main

parents ffae07c2 090c20fd

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;

        }