summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-10-19 18:45:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-19 18:45:26 +0000
commit5f4169b5ea38649a015f7b55da93f4e705173053 (patch)
tree5b0cf51fd8bf906cf46486c4b4c6846092d22d17
parent6e4f6ecbab9718b0d19cd5c1ecf9357bed061385 (diff)
parent448c0adb7835076fd3ff8e9900896cae0ce3c19b (diff)
downloadbase-5f4169b5ea38649a015f7b55da93f4e705173053.tar.gz
Merge "Skip getting transforms for ignored tasks." into nyc-mr1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 2715971db9c3..fc580a5ecc19 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -679,13 +679,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
for (int i = 0; i < taskViewCount; i++) {
TaskView tv = taskViews.get(i);
Task task = tv.getTask();
- int taskIndex = mStack.indexOfStackTask(task);
- TaskViewTransform transform = mCurrentTaskTransforms.get(taskIndex);
if (mIgnoreTasks.contains(task.key)) {
continue;
}
+ int taskIndex = mStack.indexOfStackTask(task);
+ TaskViewTransform transform = mCurrentTaskTransforms.get(taskIndex);
if (animationOverrides != null && animationOverrides.containsKey(task)) {
animation = animationOverrides.get(task);
}