summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-01 19:42:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-01 19:42:53 +0000
commit9cfd586305826bb1da725cfd6956cf201195e692 (patch)
treec300f8645dda259c79e7ac221584af9401a210ad
parent9643e2e5757b1ac1ec028a4df2a0cfd2592132d5 (diff)
parent02dcfccb754ecfe1f3c9df78824f11923d7c5c2a (diff)
downloadandroid_packages_apps_Trebuchet-9cfd586305826bb1da725cfd6956cf201195e692.tar.gz
android_packages_apps_Trebuchet-9cfd586305826bb1da725cfd6956cf201195e692.tar.bz2
android_packages_apps_Trebuchet-9cfd586305826bb1da725cfd6956cf201195e692.zip
Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose
-rw-r--r--src/com/android/launcher3/CellLayout.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a114ec383..81f9af2e1 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -95,6 +95,7 @@ public class CellLayout extends ViewGroup {
private ArrayList<FolderRingAnimator> mFolderOuterRings = new ArrayList<FolderRingAnimator>();
private int[] mFolderLeaveBehindCell = {-1, -1};
+ private float FOREGROUND_ALPHA_DAMPER = 0.65f;
private int mForegroundAlpha = 0;
private float mBackgroundAlpha;
private float mBackgroundAlphaMultiplier = 1.0f;
@@ -349,6 +350,7 @@ public class CellLayout extends ViewGroup {
mOverScrollForegroundDrawable = mOverScrollRight;
}
+ r *= FOREGROUND_ALPHA_DAMPER;
mForegroundAlpha = (int) Math.round((r * 255));
mOverScrollForegroundDrawable.setAlpha(mForegroundAlpha);
invalidate();