commit 7b914baa5d174a901628585c65af3d982bcc64ea
author Winson Chung <winsonc@google.com> Sat Jun 13 01:20:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 01:20:51 2015 +0000
tree eb74024b914493902033b77801944a4a658cdd8d
parent 210252705e63e3b4f16670d984c081d032891bb0
parent 931a2ce85aec5011298cf7f305f5823c13c0f578

am 931a2ce8: Merge "Fixing regression in fast scroller animation." into ub-launcher3-burnaby

* commit '931a2ce85aec5011298cf7f305f5823c13c0f578':
  Fixing regression in fast scroller animation.

src/com/android/launcher3/BaseRecyclerView.java

diff --git a/src/com/android/launcher3/BaseRecyclerView.java b/src/com/android/launcher3/BaseRecyclerView.java
index a207d9a..3a741f2 100644
--- a/src/com/android/launcher3/BaseRecyclerView.java
+++ b/src/com/android/launcher3/BaseRecyclerView.java
@@ -290,6 +290,13 @@
     }
 
     /**
+     * Returns the fast scroller alpha.
+     */
+    public float getFastScrollerAlpha() {
+        return mFastScrollAlpha;
+    }
+
+    /**
      * Maps the touch (from 0..1) to the adapter position that should be visible.
      * <p>Override in each subclass of this base class.
      */