mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 01:16:49 +00:00
Merge "Update transient taskbar transition duration to match spec (417ms)." into tm-qpr-dev am: 1b30bab1e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20469888 Change-Id: Ia7df964eabebe9816099b5ca0d1689dcc9cc7f3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -194,6 +194,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
public static final int SPLIT_DIVIDER_ANIM_DURATION = 100;
|
||||
|
||||
public static final int CONTENT_ALPHA_DURATION = 217;
|
||||
public static final int TRANSIENT_TASKBAR_TRANSITION_DURATION = 417;
|
||||
public static final int TASKBAR_TO_APP_DURATION = 600;
|
||||
// TODO(b/236145847): Tune TASKBAR_TO_HOME_DURATION to 383 after conflict with unlock animation
|
||||
// is solved.
|
||||
|
||||
@@ -17,6 +17,7 @@ package com.android.launcher3.taskbar;
|
||||
|
||||
import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;
|
||||
|
||||
import static com.android.launcher3.QuickstepTransitionManager.TRANSIENT_TASKBAR_TRANSITION_DURATION;
|
||||
import static com.android.launcher3.taskbar.TaskbarLauncherStateController.FLAG_RESUMED;
|
||||
import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
|
||||
|
||||
@@ -157,9 +158,11 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
|
||||
isResumed,
|
||||
fromInit,
|
||||
/* startAnimation= */ true,
|
||||
!isResumed
|
||||
? QuickstepTransitionManager.TASKBAR_TO_APP_DURATION
|
||||
: QuickstepTransitionManager.TASKBAR_TO_HOME_DURATION);
|
||||
DisplayController.isTransientTaskbar(mLauncher)
|
||||
? TRANSIENT_TASKBAR_TRANSITION_DURATION
|
||||
: (!isResumed
|
||||
? QuickstepTransitionManager.TASKBAR_TO_APP_DURATION
|
||||
: QuickstepTransitionManager.TASKBAR_TO_HOME_DURATION));
|
||||
}
|
||||
|
||||
@Nullable
|
||||
|
||||
Reference in New Issue
Block a user