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

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

Sync of the DatePicker attributes with the public Java APIs. 

1. Deprecated two old attributes.

2. 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: I577a9e191cbd05cd18cb34105dcdbe53c0a5dd1e
parent ff37505c

core/java/android/widget/DatePicker.java

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class DatePicker extends FrameLayout { 
        int endYear = attributesArray.getInt(R.styleable.DatePicker_endYear, DEFAULT_END_YEAR);

        String minDate = attributesArray.getString(R.styleable.DatePicker_minDate);

        String maxDate = attributesArray.getString(R.styleable.DatePicker_maxDate);

        int layoutResourceId = attributesArray.getResourceId(R.styleable.DatePicker_layout,

        int layoutResourceId = attributesArray.getResourceId(R.styleable.DatePicker_internalLayout,

                R.layout.date_picker);

        attributesArray.recycle();

core/res/res/values/attrs.xml

+7 −3
Original line number Diff line number Diff line
@@ -3376,9 +3376,13 @@ 
    </declare-styleable>



    <declare-styleable name="DatePicker">

        <!-- The first year (inclusive), for example "1940". -->

        <!-- The first year (inclusive), for example "1940".

             {@deprecated Use minDate instead.}

         -->

        <attr name="startYear" format="integer" />

        <!-- The last year (inclusive), for example "2010". -->

        <!-- The last year (inclusive), for example "2010".

             {@deprecated Use maxDate instead.}

         -->

        <attr name="endYear" format="integer" />

        <!-- Whether the spinners are shown. -->

        <attr name="spinnersShown" format="boolean" />
@@ -3389,7 +3393,7 @@ 
        <!-- 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. -->

        <attr name="layout" />

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

    </declare-styleable>



    <declare-styleable name="TwoLineListItem">

core/res/res/values/styles.xml

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



    <style name="Widget.DatePicker">

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

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

        <item name="android:calendarViewShown">false</item>

    </style>
@@ -1665,7 +1665,7 @@ please see styles_device_defaults.xml. 
    </style>



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

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

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

        <item name="android:calendarViewShown">true</item>

    </style>