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

Commit 5fac212e authored Dec 22, 2016 by Jiaquan He

Check split screen properly.

This commit detacts split screen by checking whether there's
a docked task instead of multi window mode.

Bug: 33847223
Bug: 32101881
Change-Id: I23ee11e57ded7c5e81d51cfbfea05500a879945c

parent f77ca5fa

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -765,9 +765,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;
		}