Remove keyguard state from onAnimationCancelled
Reason for revert: b/276433230
Test: atest CtsWindowManagerDeviceTestCases:KeyguardTests
Test: atest PowerKeyGestureTests
Bug: 276433230
Change-Id: I62d760206dfd13ba4de7a77d2906b0f90bd2c343
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 9f9f2c8..18fe30d 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -120,7 +120,7 @@
*/
@BinderThread
@Override
- public void onAnimationCancelled(boolean isKeyguardOccluded) {
+ public void onAnimationCancelled() {
postAsyncCallback(mHandler, () -> {
finishExistingAnimation();
getFactory().onAnimationCancelled();
@@ -235,16 +235,12 @@
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 8baa324..880cefa 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1841,8 +1841,8 @@
}
@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 9d6d68e..41ab831 100644
--- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
@@ -186,7 +186,7 @@
}
@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 00d6571..3ca2862 100644
--- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
@@ -501,7 +501,7 @@
}
@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
