commit a8a44c68eee6f4b2958866f75d567bccd7b57abd
author Chet Haase <chet@google.com> Wed Aug 17 18:35:07 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 18:35:07 2011 -0700
tree 85e22d1e012ab1b473498f62b0e94fb020e79cc3
parent 1666dc60412c4a2506c08dbc19a992514fe7dffb
parent eeafd4296b7cf4c2ad9c985562f6d70e2a3ffc03

Merge "Fix NumberPicker text positioning."

core/java/android/widget/NumberPicker.java

diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index aa23ad0..2a299bd 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -1208,7 +1208,10 @@
         float textGapCount = selectorIndices.length - 1;
         int selectorTextGapHeight = (int) (totalTextGapHeight / textGapCount + 0.5f);
         mSelectorElementHeight = mTextSize + selectorTextGapHeight;
-        mInitialScrollOffset = mTextSize - 3 * (mSelectorElementHeight % 2);
+        // Ensure that the middle item is positioned the same as the text in mInputText
+        int editTextTextPosition = mInputText.getBaseline() + mInputText.getTop();
+        mInitialScrollOffset = editTextTextPosition -
+                (mSelectorElementHeight * SELECTOR_MIDDLE_ITEM_INDEX);
         mCurrentScrollOffset = mInitialScrollOffset;
         updateInputTextView();
     }