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

Commit 53b948d3 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Sync of the TimePicker attributes with the public Java APIs. 

1. Renamed an attribute which is not mean to be public so
   its name is not the same as that of an already public one.

bug:6094713

Change-Id: I3f8b3f3840b88265069d3474be7db04056d219c1
parent 4b3cdbb2

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