diff options
| -rw-r--r-- | core/java/android/widget/NumberPicker.java | 12 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 4 |
3 files changed, 12 insertions, 14 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) { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 24349743676c..f31deef816f7 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3623,15 +3623,13 @@ <!-- @hide The height of the selection divider. --> <attr name="selectionDividerHeight" format="dimension" /> <!-- @hide The min height of the NumberPicker. --> - <attr name="minHeight" /> + <attr name="internalMinHeight" format="dimension" /> <!-- @hide The max height of the NumberPicker. --> - <attr name="maxHeight" /> + <attr name="internalMaxHeight" format="dimension" /> <!-- @hide The min width of the NumberPicker. --> - <attr name="minWidth" /> + <attr name="internalMinWidth" format="dimension" /> <!-- @hide The max width of the NumberPicker. --> - <attr name="maxWidth" /> - <!-- @hide The max width of the NumberPicker. --> - <attr name="maxWidth" /> + <attr name="internalMaxWidth" format="dimension" /> </declare-styleable> <declare-styleable name="TimePicker"> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index a9975cc60eb9..569be90d7891 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1656,8 +1656,8 @@ please see styles_device_defaults.xml. <item name="android:flingable">true</item> <item name="android:selectionDivider">@android:drawable/numberpicker_selection_divider</item> <item name="android:selectionDividerHeight">2dip</item> - <item name="android:minWidth">48dip</item> - <item name="android:maxHeight">200dip</item> + <item name="android:internalMinWidth">48dip</item> + <item name="android:internalMaxHeight">200dip</item> </style> <style name="Widget.Holo.TimePicker" parent="Widget.TimePicker"> |