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

Commit a53d19dc authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Revamping of the NumberPicker widget for improved usablility."

parents 28bbc825 b80a3fca

core/java/android/widget/NumberPicker.java

+271 −130

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/number_picker.xml

+0 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        style="?android:attr/numberPickerUpButtonStyle"

        android:paddingTop="22dip"

        android:paddingBottom="22dip"

        android:contentDescription="@string/number_picker_increment_button" />



    <EditText android:id="@+id/numberpicker_input"
@@ -36,8 +34,6 @@ 
        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        style="?android:attr/numberPickerDownButtonStyle"

        android:paddingTop="22dip"

        android:paddingBottom="22dip"

        android:contentDescription="@string/number_picker_decrement_button" />



</merge>

core/res/res/values/styles.xml

+8 −4
Original line number Diff line number Diff line
@@ -524,10 +524,14 @@ please see styles_device_defaults.xml. 


    <style name="Widget.ImageButton.NumberPickerUpButton">

        <item name="android:background">@android:drawable/numberpicker_up_btn</item>

        <item name="android:paddingTop">22dip</item>

        <item name="android:paddingBottom">22dip</item>

    </style>



    <style name="Widget.ImageButton.NumberPickerDownButton">

        <item name="android:background">@android:drawable/numberpicker_down_btn</item>

        <item name="android:paddingTop">22dip</item>

        <item name="android:paddingBottom">22dip</item>

    </style>



    <style name="Widget.EditText.NumberPickerInputText">
@@ -1651,15 +1655,15 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Holo.ImageButton.NumberPickerUpButton">

        <item name="android:background">@null</item>

        <item name="android:src">@android:drawable/numberpicker_up_btn_holo_dark</item>

        <item name="android:paddingTop">26dip</item>

        <item name="android:paddingBottom">26dip</item>

        <item name="android:paddingTop">16dip</item>

        <item name="android:paddingBottom">36dip</item>

    </style>



    <style name="Widget.Holo.ImageButton.NumberPickerDownButton">

        <item name="android:background">@null</item>

        <item name="android:src">@android:drawable/numberpicker_down_btn_holo_dark</item>

        <item name="android:paddingTop">26dip</item>

        <item name="android:paddingBottom">26dip</item>

        <item name="android:paddingTop">36dip</item>

        <item name="android:paddingBottom">16dip</item>

    </style>



    <style name="Widget.Holo.EditText.NumberPickerInputText">