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

Fix bug where taskbar is translated during hotseat handoff. am: ecb55ef471 am: 0400e2ba46 am: c88f04c83d

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

Change-Id: I31f2c1fa25578b5f9e3245b1cf44749659081c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jon Miranda
2023-04-11 00:07:33 +00:00
committed by Automerger Merge Worker
parent 9922479f74 c88f04c83d
commit e4813cd7dc
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java
+8 -2
View File
@@ -642,8 +642,14 @@ public class TaskbarLauncherStateController {
long resetDuration = mControllers.taskbarStashController.isInApp()
? duration
: duration / 2;
if (mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration)
&& (isAnimatingToLauncher() || mLauncherState == LauncherState.NORMAL)) {
boolean shouldReset =
mControllers.taskbarTranslationController.shouldResetBackToZero(resetDuration);
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
.createAnimToResetTranslation(resetDuration));
}