commit 4a40485725d09754b7c07e3e6b82783ee460bc03
author Yigit Boyar <yboyar@google.com> Fri Sep 19 03:52:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 19 03:52:57 2014 +0000
tree bc3d2eebddd49780b396d2ffcd3f1ad65e1ccbf4
parent 530fc3c2ce0383980e9557be1d945863d8a04012
parent 22f0f4a956dab0caf01dce9535bbd9408bb98691

am de86d9c2: am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev

* commit 'de86d9c24f89642289012d865cdd604bbe056bda':
  Fix scroll position calculation when clipToPadding is false

core/java/android/widget/FastScroller.java

diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index 06b7a93..0687905 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -1205,7 +1205,6 @@
         if (!hasSections || !mMatchDragPosition) {
             return (float) firstVisibleItem / (totalItemCount - visibleItemCount);
         }
-
         // Ignore headers.
         firstVisibleItem -= mHeaderCount;
         if (firstVisibleItem < 0) {
@@ -1255,9 +1254,19 @@
         // across the last item account for whatever space is remaining.
         if (firstVisibleItem > 0 && firstVisibleItem + visibleItemCount == totalItemCount) {
             final View lastChild = mList.getChildAt(visibleItemCount - 1);
-            final float lastItemVisible = (float) (mList.getHeight() - mList.getPaddingBottom()
-                    - lastChild.getTop()) / lastChild.getHeight();
-            result += (1 - result) * lastItemVisible;
+            final int bottomPadding = mList.getPaddingBottom();
+            final int maxSize;
+            final int currentVisibleSize;
+            if (mList.getClipToPadding()) {
+                maxSize = lastChild.getHeight();
+                currentVisibleSize = mList.getHeight() - bottomPadding - lastChild.getTop();
+            } else {
+                maxSize = lastChild.getHeight() + bottomPadding;
+                currentVisibleSize = mList.getHeight() - lastChild.getTop();
+            }
+            if (currentVisibleSize > 0 && maxSize > 0) {
+                result += (1 - result) * ((float) currentVisibleSize / maxSize );
+            }
         }
 
         return result;