diff options
| author | Johannes Gallmann <gallmann@google.com> | 2023-01-13 17:28:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-01-13 17:28:42 +0000 |
| commit | 4aa135f3c7f59d482af73780e02bebbd47d475ea (patch) | |
| tree | 0b59abbfb422be6e06ef798a2b9d20d50a27b665 /quickstep/src/com/android/quickstep/LauncherBackAnimationController.java | |
| parent | 60c7dfec29715171a21d7b1f43ad140a7ec2ec86 (diff) | |
| parent | 031fbcc5640f64143e798ee361e18bd3ff2fe371 (diff) | |
| download | Launcher3-4aa135f3c7f59d482af73780e02bebbd47d475ea.tar.gz | |
Merge "Prevent workspace enter animation for predictive back" into tm-qpr-dev
Diffstat (limited to 'quickstep/src/com/android/quickstep/LauncherBackAnimationController.java')
| -rw-r--r-- | quickstep/src/com/android/quickstep/LauncherBackAnimationController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java index 3edbbdf983..03042c95fb 100644 --- a/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java +++ b/quickstep/src/com/android/quickstep/LauncherBackAnimationController.java @@ -290,7 +290,8 @@ public class LauncherBackAnimationController { new RemoteAnimationTarget[0], false /* fromUnlock */, mCurrentRect, - cornerRadius); + cornerRadius, + mBackInProgress /* fromPredictiveBack */); startTransitionAnimations(pair.first, pair.second); mLauncher.clearForceInvisibleFlag(INVISIBLE_ALL); } |