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

Commit 9de5a049 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Move readytrack flag check to be per-condition" into main

parents f889e0ed a832ca15

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

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        }



        final Transition.ReadyCondition displayConfig = mTransitionController.isCollecting()

                ? new Transition.ReadyCondition("displayConfig", this) : null;

                ? new Transition.ReadyCondition("displayConfig", this, true /* newTrockerOnly */)

                : null;

        if (displayConfig != null) {

            mTransitionController.waitFor(displayConfig);

        } else if (mTransitionController.isShellTransitionsEnabled() && mLastHasContent) {

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

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ class KeyguardController { 
        if (waiting && isAodShowing(DEFAULT_DISPLAY)) {

            mWaitingForWakeTransition = true;

            mWindowManager.mAtmService.getTransitionController().deferTransitionReady();

            mWaitAodHide = new Transition.ReadyCondition("AOD hidden");

            mWaitAodHide = new Transition.ReadyCondition("AOD hidden", true /* newTrackerOnly */);

            mWindowManager.mAtmService.getTransitionController().waitFor(mWaitAodHide);

            mWindowManager.mH.postDelayed(mResetWaitTransition, DEFER_WAKE_TRANSITION_TIMEOUT_MS);

        } else if (!waiting) {

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

+2 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        final TransitionController transitionController = task.mTransitionController;



        transitionController.deferTransitionReady();

        Transition.ReadyCondition pipChangesApplied = new Transition.ReadyCondition("movedToPip");

        final Transition.ReadyCondition pipChangesApplied =

                new Transition.ReadyCondition("movedToPip", true /* newTrackerOnly */);

        transitionController.waitFor(pipChangesApplied);

        mService.deferWindowLayout();

        boolean localVisibilityDeferred = false;

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

+1 −1
Original line number Diff line number Diff line
@@ -5998,7 +5998,7 @@ class Task extends TaskFragment { 


    private void moveTaskToBackInner(@NonNull Task task, @Nullable Transition transition) {

        final Transition.ReadyCondition movedToBack =

                new Transition.ReadyCondition("moved-to-back", task);

                new Transition.ReadyCondition("moved-to-back", task, true /* newTrackerOnly */);

        if (transition != null) {

            // Preventing from update surface position for WindowState if configuration changed,

            // because the position is depends on WindowFrame, so update the position before

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

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ public class TaskFragmentOrganizerController extends ITaskFragmentOrganizerContr 
            mDeferredTransitions.put(transaction.getTransactionToken(), transitionId);

            mWindowOrganizerController.getTransitionController().deferTransitionReady();

            final Transition.ReadyCondition transactionApplied = new Transition.ReadyCondition(

                    "task-fragment transaction", transaction);

                    "task-fragment transaction", transaction, true /* newTrackerOnly */);

            mWindowOrganizerController.getTransitionController().waitFor(transactionApplied);

            mInFlightTransactions.put(transaction.getTransactionToken(), transactionApplied);

        }