diff options
author | Adam Cohen <adamcohen@google.com> | 2014-10-24 23:49:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 23:49:36 +0000 |
commit | acb3d684036a72011805b097c333be5efaef8bc4 (patch) | |
tree | 95849f73d9bd5c3e5f0b20ddb293bcb71ec316ba | |
parent | 9220b912d80d1a3db8582e34c50e3f895387a156 (diff) | |
parent | 0fb5ce20d7ae49f63628f88a1a238d6e2247dfe9 (diff) | |
download | android_packages_apps_Trebuchet-acb3d684036a72011805b097c333be5efaef8bc4.tar.gz android_packages_apps_Trebuchet-acb3d684036a72011805b097c333be5efaef8bc4.tar.bz2 android_packages_apps_Trebuchet-acb3d684036a72011805b097c333be5efaef8bc4.zip |
am 0fb5ce20: Tweaking close AllApps / Widgets on KK and below
* commit '0fb5ce20d7ae49f63628f88a1a238d6e2247dfe9':
Tweaking close AllApps / Widgets on KK and below
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index da83aa0b6..b357e7a41 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3741,14 +3741,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 @@ -3772,9 +3772,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); } |