Remove keyguard state from onAnimationCancelled
Reason for revert: b/276433230 Test: atest CtsWindowManagerDeviceTestCases:KeyguardTests Test: atest PowerKeyGestureTests Bug: 276433230 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:11e6fdd982ab7e6df951dcfe97948f81a8f36d75) Merged-In: I62d760206dfd13ba4de7a77d2906b0f90bd2c343 Change-Id: I62d760206dfd13ba4de7a77d2906b0f90bd2c343
This commit is contained in:
committed by
Cherrypicker Worker
parent
43327eb082
commit
7e5594928c
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -192,7 +192,7 @@ public class LauncherBackAnimationController {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAnimationCancelled(boolean isKeyguardOccluded) {}
|
||||
public void onAnimationCancelled() {}
|
||||
};
|
||||
|
||||
SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user