From c0888dcbfc040688f6900d9af5d1d4eca51b55ee Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Fri, 5 Aug 2022 09:00:00 -0700 Subject: [PATCH] FreeformHandler should just intercept, not claim animations There are already animations for most of these operations (eg. in launcher), so instead of "claiming" the transition animation and doing nothing, this should just update state (window decor) and then let other handlers play the animations. Bug: 241486751 Test: launch app from launcher, go back. Change-Id: Ic5d01b76c04d6adab484d53d24d1a89b001a4c80 --- .../wm/shell/freeform/FreeformTaskTransitionHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java index 20d77259406a2..af205ed051d7f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java @@ -122,7 +122,6 @@ public class FreeformTaskTransitionHandler break; case WindowManager.TRANSIT_TO_BACK: case WindowManager.TRANSIT_TO_FRONT: - transitionHandled = true; break; } } @@ -147,7 +146,9 @@ public class FreeformTaskTransitionHandler return false; } mFreeformTaskListener.createWindowDecoration(change, startT, finishT); - return true; + + // Intercepted transition to manage the window decorations. Let other handlers animate. + return false; } private boolean startCloseTransition( @@ -164,7 +165,8 @@ public class FreeformTaskTransitionHandler windowDecors.add(windowDecor); } - return true; + // Intercepted transition to manage the window decorations. Let other handlers animate. + return false; } private boolean startChangeTransition(