diff options
author | Winson Chung <winsonc@google.com> | 2010-09-15 20:37:09 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2010-09-15 20:51:01 -0700 |
commit | e8878e3c5ac2b426be931018493ce82bd9c90378 (patch) | |
tree | 1f6edfc56560ef44c6b1c8ff1c751a751f8a1ed5 /src/com/android/launcher2/HolographicOutlineHelper.java | |
parent | c2e0c08c997f0a69fec5304083db479d47b59098 (diff) | |
download | android_packages_apps_Trebuchet-e8878e3c5ac2b426be931018493ce82bd9c90378.tar.gz android_packages_apps_Trebuchet-e8878e3c5ac2b426be931018493ce82bd9c90378.tar.bz2 android_packages_apps_Trebuchet-e8878e3c5ac2b426be931018493ce82bd9c90378.zip |
Adding some wallpaper buttons on the customization tray.
Also tweaking the fading algorithm for side pages.
Change-Id: Ia7743c2b71741926ff9ae52e6965d7aefc86604e
Diffstat (limited to 'src/com/android/launcher2/HolographicOutlineHelper.java')
-rw-r--r-- | src/com/android/launcher2/HolographicOutlineHelper.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/android/launcher2/HolographicOutlineHelper.java index 621033748..d6c5484b8 100644 --- a/src/com/android/launcher2/HolographicOutlineHelper.java +++ b/src/com/android/launcher2/HolographicOutlineHelper.java @@ -59,21 +59,17 @@ public class HolographicOutlineHelper { * pages. */ public float highlightAlphaInterpolator(float r) { - final float pivot = 0.3f; - if (r < pivot) { - return Math.max(0.5f, 0.65f * cubic(r / pivot)); - } else { - return Math.min(1.0f, 0.65f * cubic(1 - (r - pivot) / (1 - pivot))); - } + float maxAlpha = 0.6f; + return (float) Math.pow(maxAlpha * (1.0f - r), 1.5f); } /** * Returns the interpolated view alpha for the effect we want when scrolling pages. */ public float viewAlphaInterpolator(float r) { - final float pivot = 0.6f; + final float pivot = 0.95f; if (r < pivot) { - return r / pivot; + return (float) Math.pow(r / pivot, 1.5f); } else { return 1.0f; } |