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

Commit 1967deb6 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Add protolog to each branch of DefaultMixedHandler.startAnimation()." into main

parents 8ce93390 595a53a0

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java

+10 −4
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Animating a mixed transition for "

                + "entering PIP from an Activity Embedding window");

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for entering PIP from"

                + " an Activity Embedding window #%d", info.getDebugId());

        // Split into two transitions (wct)

        TransitionInfo.Change pipChange = null;

        final TransitionInfo everythingElse = subCopy(info, TRANSIT_TO_BACK, true /* changes */);
@@ -146,6 +146,8 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for opening an intent"

                + " with a remote transition and PIP #%d", info.getDebugId());

        boolean handledToPip = tryAnimateOpenIntentWithRemoteAndPip(

                info, startTransaction, finishTransaction, finishCallback);

        // Consume the transition on remote handler if the leftover handler already handle this
@@ -193,7 +195,8 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { 
            return false;

        }

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Splitting PIP into a separate"

                + " animation because remote-animation likely doesn't support it");

                + " animation because remote-animation likely doesn't support it #%d",

                info.getDebugId());

        // Split the transition into 2 parts: the pip part and the rest.

        mInFlightSubAnimations = 2;

        // make a new startTransaction because pip's startEnterAnimation "consumes" it so
@@ -218,6 +221,9 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for unfolding #%d",

                info.getDebugId());



        final Transitions.TransitionFinishCallback finishCB = (wct) -> {

            mInFlightSubAnimations--;

            if (mInFlightSubAnimations > 0) return;

libs/WindowManager/Shell/src/com/android/wm/shell/transition/RecentsMixedTransition.java

+11 −0
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ import android.view.SurfaceControl; 
import android.window.TransitionInfo;

import android.window.WindowContainerTransaction;



import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.keyguard.KeyguardTransitionHandler;

import com.android.wm.shell.pip.PipTransitionController;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

import com.android.wm.shell.recents.RecentsTransitionHandler;

import com.android.wm.shell.splitscreen.StageCoordinator;
@@ -77,6 +79,9 @@ class RecentsMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Transition for Recents during"

                + " Desktop #%d", info.getDebugId());



        if (mInfo == null) {

            mInfo = info;

            mFinishT = finishTransaction;
@@ -109,6 +114,9 @@ class RecentsMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for Recents during"

                + " Keyguard #%d", info.getDebugId());



        if (mInfo == null) {

            mInfo = info;

            mFinishT = finishTransaction;
@@ -122,6 +130,9 @@ class RecentsMixedTransition extends DefaultMixedHandler.MixedTransition { 
            @NonNull SurfaceControl.Transaction startTransaction,

            @NonNull SurfaceControl.Transaction finishTransaction,

            @NonNull Transitions.TransitionFinishCallback finishCallback) {

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "Mixed transition for Recents during"

                + " split screen #%d", info.getDebugId());



        for (int i = info.getChanges().size() - 1; i >= 0; --i) {

            final TransitionInfo.Change change = info.getChanges().get(i);

            // Pip auto-entering info might be appended to recent transition like pressing