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

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

Merge changes I32cbc333,I34926215 

* changes:
  Fixing long compare.
  Cancelling window transition when starting focus animation.
parents 8322ed39 16bc2a7f

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

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ public class TaskStack { 
            Collections.sort(tasks, new Comparator<Task>() {

                @Override

                public int compare(Task task, Task task2) {

                    return (int) (task.key.firstActiveTime - task2.key.firstActiveTime);

                    return Long.compare(task.key.firstActiveTime, task2.key.firstActiveTime);

                }

            });

            // Create groups when sequential packages are the same

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

+4 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal 
    }



    public final void onBusEvent(IterateRecentsEvent event) {

        if (!mEnterAnimationComplete) {

            // Cancel the previous task's window transition before animating the focused state

            EventBus.getDefault().send(new CancelEnterRecentsWindowAnimationEvent(null));

        }

        mLayoutAlgorithm.animateFocusState(mLayoutAlgorithm.getDefaultFocusState());

    }