Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f2b50fd authored by Jon Miranda's avatar Jon Miranda
Browse files

Sync overview scroll so that it ends before/at same time as taskbar animation

Fixes: 267355260
Test: open overview, scroll to 'Clear all button', tap on blank space
Change-Id: Ia58683f7b167ff42443dda3d39368bf6aaa366e0
parent b94d3e7d
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.launcher3.LauncherState.HINT_STATE_TWO_BUTTON;
import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.LauncherState.OVERVIEW;
import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT;
import static com.android.launcher3.QuickstepTransitionManager.TASKBAR_TO_HOME_DURATION;
import static com.android.launcher3.WorkspaceStateTransitionAnimation.getWorkspaceSpringScaleAnimator;
import static com.android.launcher3.anim.Interpolators.ACCEL;
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
@@ -119,6 +120,12 @@ public class QuickstepAtomicAnimationFactory extends
                long scrollDuration = Math.min(MAX_PAGE_SCROLL_DURATION,
                        numPagesToScroll * PER_PAGE_SCROLL_DURATION);
                config.duration = Math.max(config.duration, scrollDuration);

                // Sync scroll so that it ends before or at the same time as the taskbar animation.
                if (DisplayController.isTransientTaskbar(mActivity)
                        && mActivity.getDeviceProfile().isTaskbarPresent) {
                    config.duration = Math.min(config.duration, TASKBAR_TO_HOME_DURATION);
                }
                overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration));
            } else {
                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);