Merge "Desktop Mode Taskbar Recreate Animation" into main

This commit is contained in:
Jagrut Desai
2025-02-24 16:00:48 -08:00
committed by Android (Google) Code Review
19 changed files with 458 additions and 86 deletions

View File

@@ -1784,8 +1784,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
}
/** Get animation duration for taskbar for going to home. */
public static int getTaskbarToHomeDuration(boolean isPinnedTaskbar) {
return getTaskbarToHomeDuration(false, isPinnedTaskbar);
public static int getTaskbarToHomeDuration(boolean isPinnedTaskbarAndNotInDesktopMode) {
return getTaskbarToHomeDuration(false, isPinnedTaskbarAndNotInDesktopMode);
}
/**
@@ -1794,8 +1794,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
* @param shouldOverrideToFastAnimation should overwrite scaling reveal home animation duration
*/
public static int getTaskbarToHomeDuration(boolean shouldOverrideToFastAnimation,
boolean isPinnedTaskbar) {
if (isPinnedTaskbar) {
boolean isPinnedTaskbarAndNotInDesktopMode) {
if (isPinnedTaskbarAndNotInDesktopMode) {
return PINNED_TASKBAR_TRANSITION_DURATION;
} else if (enableScalingRevealHomeAnimation() && !shouldOverrideToFastAnimation) {
return TASKBAR_TO_HOME_DURATION_SLOW;