commit 564c45b976b56bc33f18271e1c813a0bd91b2eb4
author Alan Viverette <alanv@google.com> Wed Sep 18 23:35:02 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 18 23:35:02 2013 +0000
tree fe948a565462cee75940d5da976766871b00cc85
parent c47a0bf3860d41879f94780460af402f4f8d2a46
parent fd63917ed31fbf425362d209eff72d5e64c5bb8a

Merge "Fix number picker vertical scroll computations" into klp-dev

core/java/android/widget/NumberPicker.java

diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index e4956dd..c0fde2e 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1099,13 +1099,18 @@
     }
 
     @Override
-    public int computeVerticalScrollOffset() {
+    protected int computeVerticalScrollOffset() {
         return mCurrentScrollOffset;
     }
 
     @Override
-    public int computeVerticalScrollRange() {
-        return mSelectorIndices.length * mSelectorElementHeight;
+    protected int computeVerticalScrollRange() {
+        return (mMaxValue - mMinValue + 1) * mSelectorElementHeight;
+    }
+
+    @Override
+    protected int computeVerticalScrollExtent() {
+        return getHeight();
     }
 
     @Override