summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-10-24 20:50:20 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-28 01:55:56 (GMT)
commita853e39fe9119059ccbb8321f891172fa60ccc4b (patch)
tree48cc4466cff2b8c268216d78ab9d843ed362013d
parent1517149c91e06b84c6cfaf727394c94af5b71284 (diff)
downloadandroid_packages_apps_Trebuchet-a853e39fe9119059ccbb8321f891172fa60ccc4b.zip
android_packages_apps_Trebuchet-a853e39fe9119059ccbb8321f891172fa60ccc4b.tar.gz
android_packages_apps_Trebuchet-a853e39fe9119059ccbb8321f891172fa60ccc4b.tar.bz2
Tweaking close AllApps / Widgets on KK and below
Bug: 17956862 Change-Id: I83b8973b7e98c1c3660221ac65dcb9ca8b4c84fd
-rw-r--r--src/com/android/launcher3/Launcher.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f8891a0..e472422 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);
}