Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync of the NumberPicker attributes with the public Java APIs

Browse Source 
1. Renamed some attributes to not overlap with already public
   ones since they are not dedicated for external use.

bug:6094713
bug:6104108

Change-Id: Iab8a906680ebcaa91f020ffbf55cf603a1071437
This commit is contained in:
Svetoslav Ganov
2012-03-02 15:15:35 -08:00
parent 53b948d3ae
commit e8331bd2e7
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/NumberPicker.java
View File

@@ -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) {

10
core/res/res/values/attrs.xml
View File

@@ -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">

4
core/res/res/values/styles.xml
View File

@@ -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">