diff options
| author | Luca Zuccarini <acul@google.com> | 2022-05-18 14:21:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-18 14:21:27 +0000 |
| commit | 175fc66aa8f68d2cc4a925c9dc2e436714ab21de (patch) | |
| tree | 4e282f5a33f589182876fe5fa6b8788264a4ac20 /quickstep/src | |
| parent | df93cec769ae9f8e9a87f36c9663626de0538b5d (diff) | |
| parent | 1c89ee8cb1f93083a2a5826a7d95d74baff0ed86 (diff) | |
| download | Launcher3-175fc66aa8f68d2cc4a925c9dc2e436714ab21de.tar.gz | |
Merge "Additional polish for the NORMAL<->ALL_APPS transitions." into tm-dev
Diffstat (limited to 'quickstep/src')
| -rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index e874bf0904..e56c90c20c 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -80,13 +80,18 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr // Custom timing for NORMAL -> ALL_APPS on phones only. private static final float ALL_APPS_STATE_TRANSITION = 0.4f; + private static final float ALL_APPS_FULL_DEPTH_PROGRESS = 0.5f; // Custom interpolators for NORMAL -> ALL_APPS on phones only. private static final Interpolator LINEAR_EARLY = Interpolators.clampToProgress(LINEAR, 0f, ALL_APPS_STATE_TRANSITION); private static final Interpolator STEP_TRANSITION = Interpolators.clampToProgress(FINAL_FRAME, 0f, ALL_APPS_STATE_TRANSITION); - public static final Interpolator BLUR = LINEAR_EARLY; + // The blur to and from All Apps is set to be complete when the interpolator is at 0.5. + public static final Interpolator BLUR = + Interpolators.clampToProgress( + Interpolators.mapToProgress(LINEAR, 0f, ALL_APPS_FULL_DEPTH_PROGRESS), + 0f, ALL_APPS_STATE_TRANSITION); public static final Interpolator WORKSPACE_FADE = STEP_TRANSITION; public static final Interpolator WORKSPACE_SCALE = LINEAR_EARLY; public static final Interpolator HOTSEAT_FADE = STEP_TRANSITION; @@ -97,8 +102,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr Interpolators.clampToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1f); public static final Interpolator ALL_APPS_VERTICAL_PROGRESS = Interpolators.clampToProgress( - Interpolators.mapToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1.0f), - ALL_APPS_STATE_TRANSITION, 1.0f); + Interpolators.mapToProgress(LINEAR, ALL_APPS_STATE_TRANSITION, 1f), + ALL_APPS_STATE_TRANSITION, 1f); private final PortraitOverviewStateTouchHelper mOverviewPortraitStateTouchHelper; |