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

Merge "Piping through task affiliation to Recents."

Browse Source
This commit is contained in:
Winson Chung
2014-07-12 02:15:56 +00:00
committed by Android (Google) Code Review
parent a0c4a06ba3 305addefcd
commit 5f1970cc4d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
View File

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

2
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewLayoutAlgorithm.java
View File

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