aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 19:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove keyguard state from onAnimationCancelled" into udc-dev

Browse Source
This commit is contained in:
Robin Lee
2023-04-25 17:35:59 +00:00
committed by Android (Google) Code Review
parent 4f823ca92c 7e5594928c
commit 52b4c77770
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
View File

@@ -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() {}
}
}

4
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@@ -1841,8 +1841,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
}
@Override
public void onAnimationCancelled(boolean isKeyguardOccluded) {
mDelegate.onAnimationCancelled(isKeyguardOccluded);
public void onAnimationCancelled() {
mDelegate.onAnimationCancelled();
}
}

2
quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
View File

@@ -192,7 +192,7 @@ public class LauncherBackAnimationController {
}
@Override
public void onAnimationCancelled(boolean isKeyguardOccluded) {}
public void onAnimationCancelled() {}
};
SystemUiProxy.INSTANCE.get(mLauncher).setBackToLauncherCallback(mBackCallback, runner);

2
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
View File

@@ -556,7 +556,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