diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java index 9f9f2c8654..18fe30d81d 100644 --- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java +++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java @@ -120,7 +120,7 @@ public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat { */ @BinderThread @Override - public void onAnimationCancelled(boolean isKeyguardOccluded) { + public void onAnimationCancelled() { postAsyncCallback(mHandler, () -> { finishExistingAnimation(); getFactory().onAnimationCancelled(); @@ -235,16 +235,12 @@ public class LauncherAnimationRunner extends RemoteAnimationRunnerCompat { RemoteAnimationTarget[] nonAppTargets, LauncherAnimationRunner.AnimationResult result); - @Override - @UiThread - default void onAnimationCancelled(boolean isKeyguardOccluded) { - onAnimationCancelled(); - } - /** * Called when the animation is cancelled. This can happen with or without * the create being called. */ - default void onAnimationCancelled() { } + @Override + @UiThread + default void onAnimationCancelled() {} } } diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 7eecb291ba..45163cb0a8 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -1841,8 +1841,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener } @Override - public void onAnimationCancelled(boolean isKeyguardOccluded) { - mDelegate.onAnimationCancelled(isKeyguardOccluded); + public void onAnimationCancelled() { + mDelegate.onAnimationCancelled(); } } diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index 9f416b6844..c18ad5a626 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -192,7 +192,7 @@ public class LauncherBackAnimationController { } @Override - public void onAnimationCancelled(boolean isKeyguardOccluded) {} + public void onAnimationCancelled() {} }; SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner); diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index d44d7f637d..9757221a9c 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -517,7 +517,7 @@ public class SplitSelectStateController { } @Override - public void onAnimationCancelled(boolean isKeyguardOccluded) { + public void onAnimationCancelled() { postAsyncCallback(mHandler, () -> { if (mSuccessCallback != null) { // Launching legacy tasks while recents animation is running will always cause