Remove keyguard state from onAnimationCancelled

Reason for revert: b/276433230

Test: atest CtsWindowManagerDeviceTestCases:KeyguardTests
Test: atest PowerKeyGestureTests
Bug: 276433230
Change-Id: I62d760206dfd13ba4de7a77d2906b0f90bd2c343
This commit is contained in:
Robin Lee
2023-04-05 11:03:40 +02:00
parent bc8a497fb7
commit 11e6fdd982
4 changed files with 8 additions and 12 deletions
@@ -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() {}
}
}
@@ -1841,8 +1841,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
}
@Override
public void onAnimationCancelled(boolean isKeyguardOccluded) {
mDelegate.onAnimationCancelled(isKeyguardOccluded);
public void onAnimationCancelled() {
mDelegate.onAnimationCancelled();
}
}
@@ -186,7 +186,7 @@ public class LauncherBackAnimationController {
}
@Override
public void onAnimationCancelled(boolean isKeyguardOccluded) {}
public void onAnimationCancelled() {}
};
SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner);
@@ -501,7 +501,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