From 96397a3d306a5d90fc2eb5f016616de6d5e8bc03 Mon Sep 17 00:00:00 2001 From: Will Osborn Date: Tue, 28 Jan 2025 13:53:48 +0000 Subject: [PATCH] Fix RecentsAnimationListener callback type to match Sys UI type Test: local run on Tangor & 'adb shell input keyevent KEYCODE_APP_SWITCH' Flag: EXEMPT bugfix Bug: 378657004 Change-Id: I0668f135222be48377ae5a05a6d27e084ef085f9 --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 +- quickstep/src/com/android/quickstep/OverviewCommandHelper.kt | 2 +- .../src/com/android/quickstep/RecentsAnimationCallbacks.java | 5 +++-- quickstep/src/com/android/quickstep/RemoteTargetGluer.java | 2 +- .../src/com/android/quickstep/TaskAnimationManager.java | 2 +- .../quickstep/fallback/window/RecentsWindowSwipeHandler.java | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 8b76ce9d6c..3935c5ede3 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -955,7 +955,7 @@ public abstract class AbsSwipeUpHandler< @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets, TransitionInfo transitionInfo) { + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { super.onRecentsAnimationStart(controller, targets, transitionInfo); if (targets.hasDesktopTasks(mContext)) { mRemoteTargetHandles = mTargetGluer.assignTargetsForDesktop(targets, transitionInfo); diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt index 6ad9a2c8e8..94d115bf54 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt @@ -375,7 +375,7 @@ constructor( override fun onRecentsAnimationStart( controller: RecentsAnimationController, targets: RecentsAnimationTargets, - transitionInfo: TransitionInfo, + transitionInfo: TransitionInfo?, ) { Log.d(TAG, "recents animation started: $command") if (recentsInWindowFlagSet) { diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index 87bf81c218..c6b858b828 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -22,6 +22,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; +import android.annotation.Nullable; import android.graphics.Rect; import android.os.Bundle; import android.util.ArraySet; @@ -103,7 +104,7 @@ public class RecentsAnimationCallbacks implements RemoteAnimationTarget[] appTargets, RemoteAnimationTarget[] wallpaperTargets, Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras, - TransitionInfo transitionInfo) { + @Nullable TransitionInfo transitionInfo) { long appCount = Arrays.stream(appTargets) .filter(app -> app.mode == MODE_CLOSING) .count(); @@ -207,7 +208,7 @@ public class RecentsAnimationCallbacks implements */ public interface RecentsAnimationListener { default void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets, TransitionInfo transitionInfo) {} + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) {} /** * Callback from the system when the recents animation is canceled. {@param thumbnailData} diff --git a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java index ef63b9b1dc..f96bbcb097 100644 --- a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java +++ b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java @@ -217,7 +217,7 @@ public class RemoteTargetGluer { * transform params per app in {@code targets.apps} list. */ public RemoteTargetHandle[] assignTargetsForDesktop( - RemoteAnimationTargets targets, TransitionInfo transitionInfo) { + RemoteAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { resizeRemoteTargetHandles(targets); for (int i = 0; i < mRemoteTargetHandles.length; i++) { diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 1fd7211b05..63b8aaf06e 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -156,7 +156,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, - RecentsAnimationTargets targets, TransitionInfo transitionInfo) { + RecentsAnimationTargets targets, @Nullable TransitionInfo transitionInfo) { if (enableHandleDelayedGestureCallbacks() && mRecentsAnimationStartPending) { ActiveGestureProtoLogProxy.logStartRecentsAnimationCallback( "onRecentsAnimationStart"); diff --git a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowSwipeHandler.java b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowSwipeHandler.java index 973fb2ff40..5adc96076e 100644 --- a/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/fallback/window/RecentsWindowSwipeHandler.java @@ -125,7 +125,7 @@ public class RecentsWindowSwipeHandler extends AbsSwipeUpHandler