From cc5e0d2b629e6fafadf6ff2c911a4b26be1bca9b Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 5 Aug 2022 18:47:28 +0000 Subject: [PATCH] Ensure default and remote transition handlers are first - When Transitions migrated to ShellInit, the default/remote handlers got added after PipTransitionController (which should really also use ShellInit (to be fixed in a follow up CL)). For now, we can be explicit about where they should be added in the list. Bug: 241515409 Bug: 241484248 Test: atest PinnedStackTests Test: atest WMShellFlickerTests:com.android.wm.shell.flicker.pip.AutoEnterPipOnGoToHomeTest Change-Id: I696327004e06e7ddd402a509fa18c86c60b244d4 --- .../src/com/android/wm/shell/transition/Transitions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index cd29741b50641..0f997f906b8fd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -158,9 +158,9 @@ public class Transitions implements RemoteCallable { private void onInit() { // The very last handler (0 in the list) should be the default one. - mHandlers.add(mDefaultTransitionHandler); + mHandlers.add(0, mDefaultTransitionHandler); // Next lowest priority is remote transitions. - mHandlers.add(mRemoteTransitionHandler); + mHandlers.add(1, mRemoteTransitionHandler); ContentResolver resolver = mContext.getContentResolver(); mTransitionAnimationScaleSetting = Settings.Global.getFloat(resolver,