commit 19cd84351fdc87a76efa05300688a2db110543a8
author Adam Cohen <adamcohen@google.com> Wed Oct 02 06:58:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 06:58:17 2013 -0700
tree c300f8645dda259c79e7ac221584af9401a210ad
parent 1d51c21a2ea6e9bd5f318e8140b00e3f8a17a5a4
parent 625863ef3a3adf111456cc1e657a7a70a091f85a

am 625863ef: am 9cfd5863: Merge "Toning down overscroll overlay (issue 11023942)" into jb-ub-now-indigo-rose

* commit '625863ef3a3adf111456cc1e657a7a70a091f85a':
  Toning down overscroll overlay (issue 11023942)

src/com/android/launcher3/CellLayout.java

diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index a114ec3..81f9af2 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -95,6 +95,7 @@
     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 @@
             mOverScrollForegroundDrawable = mOverScrollRight;
         }
 
+        r *= FOREGROUND_ALPHA_DAMPER;
         mForegroundAlpha = (int) Math.round((r * 255));
         mOverScrollForegroundDrawable.setAlpha(mForegroundAlpha);
         invalidate();