diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-03-02 15:33:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 15:33:33 -0800 |
| commit | 2e9e02fd3319a5952621d03c91e8c0efcd4883cd (patch) | |
| tree | 52cb59bc37b394bd8b67488a4ca980c880d25b63 /core/java/android | |
| parent | 72d403ce351e91551324f2c935ea70b487da223c (diff) | |
| parent | e8331bd2e7ad3d62140143cafba3ff69be028557 (diff) | |
Merge "Sync of the NumberPicker attributes with the public Java APIs"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/NumberPicker.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 6405ee940726..3335da0bd672 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -559,17 +559,17 @@ public class NumberPicker extends LinearLayout { getResources().getDisplayMetrics()); mSelectionDividerHeight = attributesArray.getDimensionPixelSize( R.styleable.NumberPicker_selectionDividerHeight, defSelectionDividerHeight); - mMinHeight = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_minHeight, - SIZE_UNSPECIFIED); - mMaxHeight = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_maxHeight, - SIZE_UNSPECIFIED); + mMinHeight = attributesArray.getDimensionPixelSize( + R.styleable.NumberPicker_internalMinHeight, SIZE_UNSPECIFIED); + mMaxHeight = attributesArray.getDimensionPixelSize( + R.styleable.NumberPicker_internalMaxHeight, SIZE_UNSPECIFIED); if (mMinHeight != SIZE_UNSPECIFIED && mMaxHeight != SIZE_UNSPECIFIED && mMinHeight > mMaxHeight) { throw new IllegalArgumentException("minHeight > maxHeight"); } - mMinWidth = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_minWidth, + mMinWidth = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_internalMinWidth, SIZE_UNSPECIFIED); - mMaxWidth = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_maxWidth, + mMaxWidth = attributesArray.getDimensionPixelSize(R.styleable.NumberPicker_internalMaxWidth, SIZE_UNSPECIFIED); if (mMinWidth != SIZE_UNSPECIFIED && mMaxWidth != SIZE_UNSPECIFIED && mMinWidth > mMaxWidth) { |