From df33f361b0ba0ac6ec09bb194c5aaf3b4bffb1a2 Mon Sep 17 00:00:00 2001 From: Luca Zuccarini Date: Wed, 21 Feb 2024 15:03:51 +0000 Subject: [PATCH] Move remote animation utils to the Animation lib. This is so that they can be used within the Animation lib itself, while remaining available to all current users, since the SysUI shared lib also depends on Animation lib. Bug: 323863002 Flag: NA Test: still builds, tests still pass, manually tested areas that depend on these utils. Change-Id: I10de17b51c05054efe957ed1073a1cbe6baf05c5 --- .../src/com/android/launcher3/LauncherAnimationRunner.java | 2 +- .../src/com/android/launcher3/QuickstepTransitionManager.java | 2 +- quickstep/src/com/android/quickstep/TaskViewUtils.java | 2 +- .../com/android/quickstep/util/SplitSelectStateController.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java index 842f0ef96e..15180efbcc 100644 --- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java +++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java @@ -35,7 +35,7 @@ import androidx.annotation.Nullable; import androidx.annotation.UiThread; import com.android.systemui.animation.RemoteAnimationDelegate; -import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; +import com.android.systemui.animation.RemoteAnimationRunnerCompat; import java.lang.ref.WeakReference; diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 851f2b3d73..7837da4b5c 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -161,10 +161,10 @@ import com.android.systemui.animation.ActivityTransitionAnimator; import com.android.systemui.animation.DelegateTransitionAnimatorController; import com.android.systemui.animation.LaunchableView; import com.android.systemui.animation.RemoteAnimationDelegate; +import com.android.systemui.animation.RemoteAnimationRunnerCompat; import com.android.systemui.shared.system.BlurUtils; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.QuickStepContract; -import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; import com.android.wm.shell.startingsurface.IStartingWindowListener; import java.io.PrintWriter; diff --git a/quickstep/src/com/android/quickstep/TaskViewUtils.java b/quickstep/src/com/android/quickstep/TaskViewUtils.java index dc8ba849cf..95b597ac7e 100644 --- a/quickstep/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/src/com/android/quickstep/TaskViewUtils.java @@ -82,9 +82,9 @@ import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.TaskThumbnailView; import com.android.quickstep.views.TaskView; +import com.android.systemui.animation.RemoteAnimationTargetCompat; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.InteractionJankMonitorWrapper; -import com.android.systemui.shared.system.RemoteAnimationTargetCompat; import java.util.ArrayList; import java.util.List; diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index 3c90e0cf51..a8db15720e 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -97,9 +97,9 @@ import com.android.quickstep.views.FloatingTaskView; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.SplitInstructionsView; +import com.android.systemui.animation.RemoteAnimationRunnerCompat; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.ActivityManagerWrapper; -import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; import com.android.wm.shell.splitscreen.ISplitSelectListener;