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

Commit 8eefd16c authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Update the split layout while density changed" into udc-dev am: c3662a31 am: 415ca03d 

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



Change-Id: I2db7c929f64d4a8649c960b1d9833d4039c98b2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8932196c 415ca03d

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

+4 −0
Original line number Diff line number Diff line
@@ -717,6 +717,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        return bounds.width() > bounds.height();

    }



    public boolean isDensityChanged(int densityDpi) {

        return mDensity != densityDpi;

    }



    /**

     * Return if this layout is landscape.

     */

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+8 −0
Original line number Diff line number Diff line
@@ -2175,6 +2175,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            return;

        }

        mDisplayLayout.set(mDisplayController.getDisplayLayout(displayId));



        if (mSplitLayout != null && mSplitLayout.isDensityChanged(newConfig.densityDpi)

                && mMainStage.isActive()

                && mSplitLayout.updateConfiguration(newConfig)

                && ENABLE_SHELL_TRANSITIONS) {

            mSplitLayout.update(null /* t */);

            onLayoutSizeChanged(mSplitLayout);

        }

    }



    void updateSurfaces(SurfaceControl.Transaction transaction) {