From 305addefcdd0ababef9e532996e6a26491a282d1 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 11 Jul 2014 19:15:17 -0700 Subject: [PATCH] Piping through task affiliation to Recents. --- .../android/systemui/recents/model/RecentsTaskLoader.java | 6 +++--- .../recents/views/TaskStackViewLayoutAlgorithm.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java index 86e8981ff943b..66f5835ce6769 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java @@ -428,9 +428,9 @@ public class RecentsTaskLoader { boolean isForemostTask = (i == (taskCount - 1)); // Create a new task - Task task = new Task(t.persistentId, (t.id > -1), t.baseIntent, 0, activityLabel, - activityIcon, activityColor, t.userId, t.firstActiveTime, t.lastActiveTime, - (i == (taskCount - 1))); + Task task = new Task(t.persistentId, (t.id > -1), t.baseIntent, t.affiliatedTaskId, + activityLabel, activityIcon, activityColor, t.userId, t.firstActiveTime, + t.lastActiveTime, (i == (taskCount - 1))); // Preload the specified number of apps if (i >= (taskCount - preloadCount)) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java index e1e682b0a43a1..908e0636245d0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java @@ -135,7 +135,7 @@ public class TaskStackViewLayoutAlgorithm { // Set the y translation if (boundedT < 0f) { transformOut.translationY = (int) ((Math.max(-numPeekCards, boundedT) / - numPeekCards) * peekHeight - scaleYOffset); + numPeekCards) * peekHeight - scaleYOffset - scaleBarYOffset); } else { transformOut.translationY = (int) (boundedT * overlapHeight - scaleYOffset - scaleBarYOffset); }