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

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

Merge "Sync of the TimePicker attributes with the public Java APIs."

parents 3ee7ce2b 53b948d3

core/java/android/widget/TimePicker.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class TimePicker extends FrameLayout { 
        TypedArray attributesArray = context.obtainStyledAttributes(

                attrs, R.styleable.TimePicker, defStyle, 0);

        int layoutResourceId = attributesArray.getResourceId(

                R.styleable.TimePicker_layout, R.layout.time_picker);

                R.styleable.TimePicker_internalLayout, R.layout.time_picker);

        attributesArray.recycle();



        LayoutInflater inflater = (LayoutInflater) context.getSystemService(

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -3392,7 +3392,7 @@ 
        <attr name="minDate" format="string" />

        <!-- The minimal date shown by this calendar view in mm/dd/yyyy format. -->

        <attr name="maxDate" format="string" />

        <!-- @hide The layout of the time picker. -->

        <!-- @hide The layout of the date picker. -->

        <attr name="internalLayout" format="reference"  />

    </declare-styleable>
@@ -3636,7 +3636,7 @@ 


    <declare-styleable name="TimePicker">

        <!-- @hide The layout of the time picker. -->

        <attr name="layout" />

        <attr name="internalLayout" />

    </declare-styleable>



    <!-- ========================= -->

core/res/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Widget.TimePicker">

        <item name="android:layout">@android:layout/time_picker</item>

        <item name="android:internalLayout">@android:layout/time_picker</item>

    </style>



    <style name="Widget.DatePicker">
@@ -1661,7 +1661,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Widget.Holo.TimePicker" parent="Widget.TimePicker">

        <item name="android:layout">@android:layout/time_picker_holo</item>

        <item name="android:internalLayout">@android:layout/time_picker_holo</item>

    </style>



    <style name="Widget.Holo.DatePicker" parent="Widget.DatePicker">