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

Commit 3dda7ab7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sync overview scroll so that it ends before/at same time as taskbar... 

Merge "Sync overview scroll so that it ends before/at same time as taskbar animation" into tm-qpr-dev am: a176ad06

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



Change-Id: I1d7772bfe999a4b9967b1656b99023c94eecdb17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a81b79a a176ad06

quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+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);