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

Commit 1060c9dc authored by Jiaquan He's avatar Jiaquan He Committed by android-build-merger
Browse files

Check split screen properly. am: 5fac212e 

am: e3ecb097

Change-Id: Ic534ab1ef2c6c0067e1d43f31b662ea23e221e8d
parents 21635d67 e3ecb097

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -770,9 +770,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener 
        // Get the transform for the running task

        stackView.updateLayoutAlgorithm(true /* boundScroll */);

        stackView.updateToInitialState();

        boolean isInSplitScreen = Recents.getSystemServices().hasDockedTask();

        stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask,

                stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect,

                Recents.getConfiguration().isGridEnabled);

                Recents.getConfiguration().isGridEnabled && !isInSplitScreen);

        return mTmpTransform;

    }

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+2 −2
Original line number Diff line number Diff line
@@ -2133,13 +2133,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
     * Check whether we should use the grid layout.

     * We use the grid layout for Recents iff all the following is true:

     *  1. Grid-mode is enabled.

     *  2. The activity is not in multi-window mode.

     *  2. The activity is not in split screen mode (there's no docked task).

     *  3. The user is not dragging a task view over the dock state.

     * @return True if we should use the grid layout.

     */

    public boolean useGridLayout() {

        return Recents.getConfiguration().isGridEnabled

            && !((RecentsActivity) mContext).isInMultiWindowMode()

            && !Recents.getSystemServices().hasDockedTask()

            && !mDraggingOverDockState;

    }