Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8331bd2 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Sync of the NumberPicker attributes with the public Java APIs 

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
parent 53b948d3

core/java/android/widget/NumberPicker.java

+6 −6
Original line number Diff line number Diff line
@@ -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) {

core/res/res/values/attrs.xml

+4 −6
Original line number Diff line number Diff line
@@ -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">

core/res/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -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">