Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check split screen properly.

Browse Source 
am: 5fac212e8b

Change-Id: Ica99e37798a2447acdbddb7b29b6e67655870b1d
This commit is contained in:
Jiaquan He
2016-12-28 19:20:00 +00:00
committed by android-build-merger
parent 3b03622406 5fac212e8b
commit e3ecb097b0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
View File

@@ -765,9 +765,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
// Get the transform for the running task // Get the transform for the running task
stackView.updateLayoutAlgorithm(true /* boundScroll */); stackView.updateLayoutAlgorithm(true /* boundScroll */);
stackView.updateToInitialState(); stackView.updateToInitialState();
boolean isInSplitScreen = Recents.getSystemServices().hasDockedTask();
stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask, stackView.getStackAlgorithm().getStackTransformScreenCoordinates(launchTask,
stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect, stackView.getScroller().getStackScroll(), mTmpTransform, null, windowOverrideRect,
Recents.getConfiguration().isGridEnabled); Recents.getConfiguration().isGridEnabled && !isInSplitScreen);
return mTmpTransform; return mTmpTransform;
} }

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

@@ -2133,13 +2133,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
* Check whether we should use the grid layout. * Check whether we should use the grid layout.
* We use the grid layout for Recents iff all the following is true: * We use the grid layout for Recents iff all the following is true:
* 1. Grid-mode is enabled. * 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. * 3. The user is not dragging a task view over the dock state.
* @return True if we should use the grid layout. * @return True if we should use the grid layout.
*/ */
public boolean useGridLayout() { public boolean useGridLayout() {
return Recents.getConfiguration().isGridEnabled return Recents.getConfiguration().isGridEnabled
&& !((RecentsActivity) mContext).isInMultiWindowMode() && !Recents.getSystemServices().hasDockedTask()
&& !mDraggingOverDockState; && !mDraggingOverDockState;
} }