Merge "2D recents: show all close buttons right away" into nyc-mr2-dev

2016-12-29 00:13:14 +00:00
parent 55a684ff65 8ff7854c4b
commit 3b430f7d0c
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1598,7 +1598,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal

        // If the doze trigger has already fired, then update the state for this task view
        if (mUIDozeTrigger.isAsleep() ||
-                Recents.getSystemServices().hasFreeformWorkspaceSupport()) {
+                Recents.getSystemServices().hasFreeformWorkspaceSupport() ||
+                useGridLayout()) {
            tv.setNoUserInteractionState();
        }