Merge "Check split screen properly." into nyc-mr2-dev

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

@@ -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

@@ -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;
     }