From 8ac22b0ada459d8f97787d4f12973894778f03e1 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 12 Dec 2013 18:35:40 -0800
Subject: [PATCH] Peek the fast scroll thumb when it transitions to enabled
 state

Change-Id: I0b472c898c5975a74da3af2c8da6e55c3678b850
---
 core/java/android/widget/FastScroller.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index 2d42fa1e7196..d263b715dc8a 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -382,7 +382,7 @@ class FastScroller {
         if (mEnabled != enabled) {
             mEnabled = enabled;
 
-            onStateDependencyChanged();
+            onStateDependencyChanged(true);
         }
     }
 
@@ -400,7 +400,7 @@ class FastScroller {
         if (mAlwaysShow != alwaysShow) {
             mAlwaysShow = alwaysShow;
 
-            onStateDependencyChanged();
+            onStateDependencyChanged(false);
         }
     }
 
@@ -414,13 +414,18 @@ class FastScroller {
 
     /**
      * Called when one of the variables affecting enabled state changes.
+     *
+     * @param peekIfEnabled whether the thumb should peek, if enabled
      */
-    private void onStateDependencyChanged() {
+    private void onStateDependencyChanged(boolean peekIfEnabled) {
         if (isEnabled()) {
             if (isAlwaysShowEnabled()) {
                 setState(STATE_VISIBLE);
             } else if (mState == STATE_VISIBLE) {
                 postAutoHide();
+            } else if (peekIfEnabled) {
+                setState(STATE_VISIBLE);
+                postAutoHide();
             }
         } else {
             stop();
@@ -496,7 +501,7 @@ class FastScroller {
         if (mLongList != longList) {
             mLongList = longList;
 
-            onStateDependencyChanged();
+            onStateDependencyChanged(false);
         }
     }
 
-- 
2.11.0