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

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

Merge "Fix zordering of recents input consumer" into sc-v2-dev

parents b6f65265 916745da

services/core/java/com/android/server/wm/InputMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ final class InputMonitor { 
                if (recentsAnimationController.updateInputConsumerForApp(

                        mRecentsAnimationInputConsumer.mWindowHandle)) {

                    mRecentsAnimationInputConsumer.show(mInputTransaction,

                            recentsAnimationController.getHighestLayerTask());

                            recentsAnimationController.getHighestLayerActivity());

                    mAddRecentsAnimationInputConsumerHandle = false;

                }

            }

services/core/java/com/android/server/wm/RecentsAnimationController.java

+3 −3
Original line number Diff line number Diff line
@@ -1103,9 +1103,9 @@ public class RecentsAnimationController implements DeathRecipient { 
    }



    /**

     * Returns the task with the highest layer, or null if none is found.

     * Returns the activity with the highest layer, or null if none is found.

     */

    public Task getHighestLayerTask() {

    public ActivityRecord getHighestLayerActivity() {

        int highestLayer = Integer.MIN_VALUE;

        Task highestLayerTask = null;

        for (int i = mPendingAnimations.size() - 1; i >= 0; i--) {
@@ -1116,7 +1116,7 @@ public class RecentsAnimationController implements DeathRecipient { 
                highestLayerTask = adapter.mTask;

            }

        }

        return highestLayerTask;

        return highestLayerTask.getTopMostActivity();

    }



    boolean isAnimatingTask(Task task) {