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

Commit 3701089a authored by Jerry Chang's avatar Jerry Chang Committed by Brian Egizi
Browse files

Fix wrong divider position after rotation 

Ratating from 270 -> 0 -> 90 keeps wrong "mNonDecorInsets" in the
DisplayLayout of split screen due to not updating insetsState when
insetsChanged. Updtaes to stop house keeping DisplayLayout separately in
split screen component by fetching it from DisplayController directly.

Cherry picked Ica32c817ef414f550931a50ec919e3114a075e2c to master due to b/286408867.

Code was merged via `-s ours` and is missing even though the sha exists on the target branch. Cherry pick is required to bring in the code.

Manually remove the "Merged in" directive to allow for downstream propagation.

Fix: 285854252
Test: atest WMShellUnitTests
Test: manual by issue steps:
  1) Launch apps to enter split-screen mode
  2) Rotate to 270
  3) Rotate to 0
  4) Rotate to 90
  5) Expect the position of split-tasks is right
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1ffdf22a145a13c79cc15612f6b0b9bd043d7b24)
Change-Id: I5e087d163c0ed793a3d9552d463e43300c7115cc
parent 0be7013a

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

+25 −18
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ import com.android.internal.policy.DockedDividerUtils; 
import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.animation.Interpolators;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.InteractionJankMonitorUtils;

import com.android.wm.shell.common.split.SplitScreenConstants.SplitPosition;
@@ -104,6 +106,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    private final Rect mWinBounds2 = new Rect();

    private final SplitLayoutHandler mSplitLayoutHandler;

    private final SplitWindowManager mSplitWindowManager;

    private final DisplayController mDisplayController;

    private final DisplayImeController mDisplayImeController;

    private final ImePositionProcessor mImePositionProcessor;

    private final ResizingEffectPolicy mSurfaceEffectPolicy;
@@ -128,13 +131,14 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    public SplitLayout(String windowName, Context context, Configuration configuration,

            SplitLayoutHandler splitLayoutHandler,

            SplitWindowManager.ParentContainerCallbacks parentContainerCallbacks,

            DisplayImeController displayImeController, ShellTaskOrganizer taskOrganizer,

            int parallaxType) {

            DisplayController displayController, DisplayImeController displayImeController,

            ShellTaskOrganizer taskOrganizer, int parallaxType) {

        mContext = context.createConfigurationContext(configuration);

        mOrientation = configuration.orientation;

        mRotation = configuration.windowConfiguration.getRotation();

        mDensity = configuration.densityDpi;

        mSplitLayoutHandler = splitLayoutHandler;

        mDisplayController = displayController;

        mDisplayImeController = displayImeController;

        mSplitWindowManager = new SplitWindowManager(windowName, mContext, configuration,

                parentContainerCallbacks);
@@ -145,7 +149,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        updateDividerConfig(mContext);



        mRootBounds.set(configuration.windowConfiguration.getBounds());

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds);

        resetDividerPosition();



        mDimNonImeSide = mContext.getResources().getBoolean(R.bool.config_dimNonImeAttachedSide);
@@ -314,7 +318,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        mRotation = rotation;

        mDensity = density;

        mUiMode = uiMode;

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, null);

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds);

        updateDividerConfig(mContext);

        initDividerPosition(mTempRect);

        updateInvisibleRect();
@@ -324,7 +328,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 


    /** Rotate the layout to specific rotation and calculate new bounds. The stable insets value

     *  should be calculated by display layout. */

    public void rotateTo(int newRotation, Rect stableInsets) {

    public void rotateTo(int newRotation) {

        final int rotationDelta = (newRotation - mRotation + 4) % 4;

        final boolean changeOrient = (rotationDelta % 2) != 0;
@@ -337,7 +341,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        // We only need new bounds here, other configuration should be update later.

        mTempRect.set(mRootBounds);

        mRootBounds.set(tmpRect);

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds, stableInsets);

        mDividerSnapAlgorithm = getSnapAlgorithm(mContext, mRootBounds);

        initDividerPosition(mTempRect);

    }
@@ -548,10 +552,9 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        return mDividerSnapAlgorithm.calculateSnapTarget(position, velocity, hardDismiss);

    }



    private DividerSnapAlgorithm getSnapAlgorithm(Context context, Rect rootBounds,

            @Nullable Rect stableInsets) {

    private DividerSnapAlgorithm getSnapAlgorithm(Context context, Rect rootBounds) {

        final boolean isLandscape = isLandscape(rootBounds);

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

        final Rect insets = getDisplayStableInsets(context);



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

        // have difference for avoiding size-compat mode when switching unresizable apps in
@@ -634,7 +637,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
    public void splitSwitching(SurfaceControl.Transaction t, SurfaceControl leash1,

            SurfaceControl leash2, Consumer<Rect> finishCallback) {

        final boolean isLandscape = isLandscape();

        final Rect insets = getDisplayInsets(mContext);

        final Rect insets = getDisplayStableInsets(mContext);

        insets.set(isLandscape ? insets.left : 0, isLandscape ? 0 : insets.top,

                isLandscape ? insets.right : 0, isLandscape ? 0 : insets.bottom);
@@ -705,8 +708,12 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 
        return animator;

    }



    private static Rect getDisplayInsets(Context context) {

        return context.getSystemService(WindowManager.class)

    private Rect getDisplayStableInsets(Context context) {

        final DisplayLayout displayLayout =

                mDisplayController.getDisplayLayout(context.getDisplayId());

        return displayLayout != null

                ? displayLayout.stableInsets()

                : context.getSystemService(WindowManager.class)

                        .getMaximumWindowMetrics()

                        .getWindowInsets()

                        .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars()
@@ -784,7 +791,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange 


    private int getSmallestWidthDp(Rect bounds) {

        mTempRect.set(bounds);

        mTempRect.inset(getDisplayInsets(mContext));

        mTempRect.inset(getDisplayStableInsets(mContext));

        final int minWidth = Math.min(mTempRect.width(), mTempRect.height());

        final float density = mContext.getResources().getDisplayMetrics().density;

        return (int) (minWidth / density);

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

+3 −10
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;

import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.LaunchAdjacentController;

import com.android.wm.shell.common.ScreenshotUtils;

import com.android.wm.shell.common.ShellExecutor;
@@ -173,7 +172,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private final StageListenerImpl mMainStageListener = new StageListenerImpl();

    private final SideStage mSideStage;

    private final StageListenerImpl mSideStageListener = new StageListenerImpl();

    private final DisplayLayout mDisplayLayout;

    @SplitPosition

    private int mSideStagePosition = SPLIT_POSITION_BOTTOM_OR_RIGHT;
@@ -321,7 +319,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions,

                this::onTransitionAnimationComplete, this);

        mDisplayController.addDisplayWindowListener(this);

        mDisplayLayout = new DisplayLayout(displayController.getDisplayLayout(displayId));

        transitions.addHandler(this);

        mSplitUnsupportedToast = Toast.makeText(mContext,

                R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT);
@@ -359,7 +356,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mLaunchAdjacentController = launchAdjacentController;

        mWindowDecorViewModel = windowDecorViewModel;

        mDisplayController.addDisplayWindowListener(this);

        mDisplayLayout = new DisplayLayout();

        transitions.addHandler(this);

        mSplitUnsupportedToast = Toast.makeText(mContext,

                R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT);
@@ -1717,7 +1713,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        if (mSplitLayout == null) {

            mSplitLayout = new SplitLayout(TAG + "SplitDivider", mContext,

                    mRootTaskInfo.configuration, this, mParentContainerCallbacks,

                    mDisplayImeController, mTaskOrganizer,

                    mDisplayController, mDisplayImeController, mTaskOrganizer,

                    PARALLAX_ALIGN_CENTER /* parallaxType */);

            mDisplayInsetsController.addInsetsChangedListener(mDisplayId, mSplitLayout);

        }
@@ -2179,8 +2175,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        if (displayId != DEFAULT_DISPLAY) {

            return;

        }

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



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

                && mMainStage.isActive()

                && mSplitLayout.updateConfiguration(newConfig)
@@ -2197,10 +2191,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


    private void onDisplayChange(int displayId, int fromRotation, int toRotation,

            @Nullable DisplayAreaInfo newDisplayAreaInfo, WindowContainerTransaction wct) {

        if (!mMainStage.isActive()) return;

        if (displayId != DEFAULT_DISPLAY || !mMainStage.isActive()) return;



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

        mSplitLayout.rotateTo(toRotation, mDisplayLayout.stableInsets());

        mSplitLayout.rotateTo(toRotation);

        if (newDisplayAreaInfo != null) {

            mSplitLayout.updateConfiguration(newDisplayAreaInfo.configuration);

        }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/DividerViewTest.java

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.test.filters.SmallTest; 


import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;



import org.junit.Before;
@@ -51,6 +52,7 @@ import org.mockito.MockitoAnnotations; 
public class DividerViewTest extends ShellTestCase {

    private @Mock SplitWindowManager.ParentContainerCallbacks mCallbacks;

    private @Mock SplitLayout.SplitLayoutHandler mSplitLayoutHandler;

    private @Mock DisplayController mDisplayController;

    private @Mock DisplayImeController mDisplayImeController;

    private @Mock ShellTaskOrganizer mTaskOrganizer;

    private SplitLayout mSplitLayout;
@@ -62,8 +64,8 @@ public class DividerViewTest extends ShellTestCase { 
        MockitoAnnotations.initMocks(this);

        Configuration configuration = getConfiguration();

        mSplitLayout = new SplitLayout("TestSplitLayout", mContext, configuration,

                mSplitLayoutHandler, mCallbacks, mDisplayImeController, mTaskOrganizer,

                SplitLayout.PARALLAX_NONE);

                mSplitLayoutHandler, mCallbacks, mDisplayController, mDisplayImeController,

                mTaskOrganizer, SplitLayout.PARALLAX_NONE);

        SplitWindowManager splitWindowManager = new SplitWindowManager("TestSplitWindowManager",

                mContext,

                configuration, mCallbacks);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java

+16 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.app.ActivityManager;
@@ -41,6 +42,7 @@ import com.android.internal.policy.DividerSnapAlgorithm; 
import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.TestRunningTaskInfoBuilder;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayImeController;



import org.junit.Before;
@@ -57,6 +59,7 @@ import org.mockito.MockitoAnnotations; 
public class SplitLayoutTests extends ShellTestCase {

    @Mock SplitLayout.SplitLayoutHandler mSplitLayoutHandler;

    @Mock SplitWindowManager.ParentContainerCallbacks mCallbacks;

    @Mock DisplayController mDisplayController;

    @Mock DisplayImeController mDisplayImeController;

    @Mock ShellTaskOrganizer mTaskOrganizer;

    @Mock WindowContainerTransaction mWct;
@@ -72,6 +75,7 @@ public class SplitLayoutTests extends ShellTestCase { 
                getConfiguration(),

                mSplitLayoutHandler,

                mCallbacks,

                mDisplayController,

                mDisplayImeController,

                mTaskOrganizer,

                SplitLayout.PARALLAX_NONE));
@@ -100,6 +104,10 @@ public class SplitLayoutTests extends ShellTestCase { 
        // Verify updateConfiguration returns true if the density changed.

        config.densityDpi = 123;

        assertThat(mSplitLayout.updateConfiguration(config)).isTrue();



        // Verify updateConfiguration checks the current DisplayLayout

        verify(mDisplayController, times(5)) // init * 1 + updateConfiguration * 4

                .getDisplayLayout(anyInt());

    }



    @Test
@@ -168,6 +176,14 @@ public class SplitLayoutTests extends ShellTestCase { 
        verify(mWct).setSmallestScreenWidthDp(eq(task2.token), anyInt());

    }



    @Test

    public void testRoateTo_checksDisplayLayout() {

        mSplitLayout.rotateTo(90);



        verify(mDisplayController, times(2)) // init * 1 + rotateTo * 1

                .getDisplayLayout(anyInt());

    }



    private void waitDividerFlingFinished() {

        verify(mSplitLayout).flingDividePosition(anyInt(), anyInt(), anyInt(),

                mRunnableCaptor.capture());