PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-7a77b5bffdb04bf38bcec9ec17d4d6ee" into tm-qpr-dev-plus-aosp am: 5523175f13 am: 8cf1e75ab8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22598537

Change-Id: I7dda291abb221afcc6eefcbb91f29a77d32f0c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2023-04-13 20:15:47 +00:00
committed by Automerger Merge Worker
parent 62464989fa 8cf1e75ab8
commit bebdcdb8d0
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+2 -8
View File
@@ -642,14 +642,8 @@ public class TaskbarLauncherStateController {
long resetDuration = mControllers.taskbarStashController.isInApp() long resetDuration = mControllers.taskbarStashController.isInApp()
? duration ? duration
: duration / 2; : duration / 2;
boolean shouldReset = if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration)
mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration); && (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) {
boolean goingToLauncher = isAnimatingToLauncher();
boolean isNormalState = mLauncherState == LauncherState.NORMAL;
// Taskbar should always reset when animating to launcher in normal state to ensure there
// is no jump during the handoff to the hotseat.
if ((goingToLauncher && isNormalState)
|| (shouldReset && (goingToLauncher || isNormalState))) {
animatorSet.play(mControllers.taskbarTranslationController animatorSet.play(mControllers.taskbarTranslationController
.createAnimToResetTranslation(resetDuration)); .createAnimToResetTranslation(resetDuration));
} }