From a853e39fe9119059ccbb8321f891172fa60ccc4b Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 24 Oct 2014 13:50:20 -0700 Subject: Tweaking close AllApps / Widgets on KK and below Bug: 17956862 Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd --- src/com/android/launcher3/Launcher.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f8891a091..e47242271 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4311,14 +4311,14 @@ public class Launcher extends Activity yDrift = isWidgetTray ? height / 2 : allAppsToPanelDelta[1]; xDrift = isWidgetTray ? 0 : allAppsToPanelDelta[0]; } else { - yDrift = 5 * height / 4; + yDrift = 2 * height / 3; xDrift = 0; } revealView.setLayerType(View.LAYER_TYPE_HARDWARE, null); TimeInterpolator decelerateInterpolator = material ? new LogDecelerateInterpolator(100, 0) : - new LogDecelerateInterpolator(30, 0); + new DecelerateInterpolator(1f); // The vertical motion of the apps panel should be delayed by one frame // from the conceal animation in order to give the right feel. We correpsondingly @@ -4342,9 +4342,9 @@ public class Launcher extends Activity revealView.setAlpha(1f); ObjectAnimator panelAlpha = LauncherAnimUtils.ofFloat(revealView, "alpha", 1f, finalAlpha); - panelAlpha.setDuration(revealDuration); - panelAlpha.setInterpolator(material ? decelerateInterpolator : - new AccelerateInterpolator(1.5f)); + panelAlpha.setDuration(material ? revealDuration : 150); + panelAlpha.setInterpolator(decelerateInterpolator); + panelAlpha.setStartDelay(material ? 0 : itemsAlphaStagger + SINGLE_FRAME_DELAY); mStateAnimation.play(panelAlpha); } -- cgit v1.2.3