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

Commit ed01fac2 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Avoid re-launch button show after split switching" into tm-qpr-dev am:... 

Merge "Avoid re-launch button show after split switching" into tm-qpr-dev am: 2b9d5ac7 am: 1b8383ca

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



Change-Id: I7f5622274195ea686c753e62a9d08a4d5f3fffb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bbb11b7 1b8383ca

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

+13 −1
Original line number Diff line number Diff line
@@ -487,13 +487,25 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    private DividerSnapAlgorithm getSnapAlgorithm(Context context, Rect rootBounds,

            @Nullable Rect stableInsets) {

        final boolean isLandscape = isLandscape(rootBounds);

        final Rect insets = stableInsets != null ? stableInsets : getDisplayInsets(context);



        // Make split axis insets value same as the larger one to avoid bounds1 and bounds2

        // have difference after split switching for solving issues on non-resizable app case.

        if (isLandscape) {

            final int largerInsets = Math.max(insets.left, insets.right);

            insets.set(largerInsets, insets.top, largerInsets, insets.bottom);

        } else {

            final int largerInsets = Math.max(insets.top, insets.bottom);

            insets.set(insets.left, largerInsets, insets.right, largerInsets);

        }



        return new DividerSnapAlgorithm(

                context.getResources(),

                rootBounds.width(),

                rootBounds.height(),

                mDividerSize,

                !isLandscape,

                stableInsets != null ? stableInsets : getDisplayInsets(context),

                insets,

                isLandscape ? DOCKED_LEFT : DOCKED_TOP /* dockSide */);

    }