Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f1970cc authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Piping through task affiliation to Recents."

parents a0c4a06b 305addef

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

+3 −3
Original line number Diff line number Diff line
@@ -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)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }