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

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

Merge "3a/ Improve logging around transitions" into main

parents 21431b98 1cbc2bdc

core/java/android/window/WindowContainerTransaction.java

+16 −10
Original line number Diff line number Diff line
@@ -1867,27 +1867,33 @@ public final class WindowContainerTransaction implements Parcelable { 
            switch (type) {

                case HIERARCHY_OP_TYPE_REPARENT: return "reparent";

                case HIERARCHY_OP_TYPE_REORDER: return "reorder";

                case HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT: return "ChildrenTasksReparent";

                case HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT: return "SetLaunchRoot";

                case HIERARCHY_OP_TYPE_SET_ADJACENT_ROOTS: return "SetAdjacentRoot";

                case HIERARCHY_OP_TYPE_LAUNCH_TASK: return "LaunchTask";

                case HIERARCHY_OP_TYPE_SET_LAUNCH_ADJACENT_FLAG_ROOT: return "SetAdjacentFlagRoot";

                case HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT: return "childrenTasksReparent";

                case HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT: return "setLaunchRoot";

                case HIERARCHY_OP_TYPE_SET_ADJACENT_ROOTS: return "setAdjacentRoot";

                case HIERARCHY_OP_TYPE_LAUNCH_TASK: return "launchTask";

                case HIERARCHY_OP_TYPE_SET_LAUNCH_ADJACENT_FLAG_ROOT: return "setAdjacentFlagRoot";

                case HIERARCHY_OP_TYPE_SET_DISABLE_LAUNCH_ADJACENT:

                    return "SetDisableLaunchAdjacent";

                case HIERARCHY_OP_TYPE_PENDING_INTENT: return "PendingIntent";

                case HIERARCHY_OP_TYPE_START_SHORTCUT: return "StartShortcut";

                    return "setDisableLaunchAdjacent";

                case HIERARCHY_OP_TYPE_PENDING_INTENT: return "pendingIntent";

                case HIERARCHY_OP_TYPE_START_SHORTCUT: return "startShortcut";

                case HIERARCHY_OP_TYPE_RESTORE_TRANSIENT_ORDER: return "restoreTransientOrder";

                case HIERARCHY_OP_TYPE_ADD_INSETS_FRAME_PROVIDER: return "addInsetsFrameProvider";

                case HIERARCHY_OP_TYPE_REMOVE_INSETS_FRAME_PROVIDER:

                    return "removeInsetsFrameProvider";

                case HIERARCHY_OP_TYPE_SET_ALWAYS_ON_TOP: return "setAlwaysOnTop";

                case HIERARCHY_OP_TYPE_REMOVE_TASK: return "RemoveTask";

                case HIERARCHY_OP_TYPE_REMOVE_TASK: return "removeTask";

                case HIERARCHY_OP_TYPE_FINISH_ACTIVITY: return "finishActivity";

                case HIERARCHY_OP_TYPE_CLEAR_ADJACENT_ROOTS: return "ClearAdjacentRoot";

                case HIERARCHY_OP_TYPE_CLEAR_ADJACENT_ROOTS: return "clearAdjacentRoot";

                case HIERARCHY_OP_TYPE_SET_REPARENT_LEAF_TASK_IF_RELAUNCH:

                    return "setReparentLeafTaskIfRelaunch";

                case HIERARCHY_OP_TYPE_ADD_TASK_FRAGMENT_OPERATION:

                    return "addTaskFragmentOperation";

                case HIERARCHY_OP_TYPE_MOVE_PIP_ACTIVITY_TO_PINNED_TASK:

                    return "movePipActivityToPinnedTask";

                case HIERARCHY_OP_TYPE_SET_IS_TRIMMABLE: return "setIsTrimmable";

                case HIERARCHY_OP_TYPE_RESTORE_BACK_NAVIGATION: return "restoreBackNav";

                case HIERARCHY_OP_TYPE_SET_EXCLUDE_INSETS_TYPES: return "setExcludeInsetsTypes";

                case HIERARCHY_OP_TYPE_SET_KEYGUARD_STATE: return "setKeyguardState";

                default: return "HOP(" + type + ")";

            }

        }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static android.view.WindowManager.TRANSIT_OPEN; 
import static android.view.WindowManager.TRANSIT_PIP;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;



import static com.android.wm.shell.pip.PipAnimationController.ANIM_TYPE_ALPHA;
@@ -45,6 +44,7 @@ import static com.android.wm.shell.transition.Transitions.TRANSIT_CLEANUP_PIP_EX 
import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP;

import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP_TO_SPLIT;

import static com.android.wm.shell.transition.Transitions.TRANSIT_REMOVE_PIP;

import static com.android.wm.shell.transition.Transitions.transitTypeToString;



import android.annotation.IntDef;

import android.app.ActivityManager;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipTransition.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.view.WindowManager.TRANSIT_CLOSE; 
import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_PIP;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.transitTypeToString;



import static com.android.wm.shell.common.pip.PipMenuController.ALPHA_NO_CHANGE;

import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_LEAVE_PIP;
@@ -35,6 +34,7 @@ import static com.android.wm.shell.pip.PipTransitionState.EXITING_PIP; 
import static com.android.wm.shell.pip.PipTransitionState.UNDEFINED;

import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP;

import static com.android.wm.shell.transition.Transitions.TRANSIT_REMOVE_PIP;

import static com.android.wm.shell.transition.Transitions.transitTypeToString;



import android.animation.AnimationHandler;

import android.animation.Animator;

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static android.view.WindowManager.TRANSIT_CLOSE; 
import static android.view.WindowManager.TRANSIT_KEYGUARD_OCCLUDE;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.WindowContainerTransaction.HierarchyOp.HIERARCHY_OP_TYPE_REORDER;
@@ -73,6 +72,7 @@ import static com.android.wm.shell.splitscreen.SplitScreenController.exitReasonT 
import static com.android.wm.shell.transition.MixedTransitionHelper.getPipReplacingChange;

import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE;

import static com.android.wm.shell.transition.Transitions.TRANSIT_SPLIT_SCREEN_PAIR_OPEN;

import static com.android.wm.shell.transition.Transitions.transitTypeToString;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.view.WindowManager.TRANSIT_OPEN; 
import static android.view.WindowManager.TRANSIT_PREPARE_BACK_NAVIGATION;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAGS_IS_NON_APP_WINDOW;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
@@ -34,6 +33,7 @@ import static com.android.internal.policy.TransitionAnimation.WALLPAPER_TRANSITI 
import static com.android.internal.policy.TransitionAnimation.WALLPAPER_TRANSITION_INTRA_CLOSE;

import static com.android.internal.policy.TransitionAnimation.WALLPAPER_TRANSITION_INTRA_OPEN;

import static com.android.internal.policy.TransitionAnimation.WALLPAPER_TRANSITION_OPEN;

import static com.android.wm.shell.transition.Transitions.transitTypeToString;



import android.annotation.ColorInt;

import android.annotation.NonNull;