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

Commit 4dee63bb authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Only change picker modes when used in dialog" into nyc-dev 

am: be589463

* commit 'be589463':
  Only change picker modes when used in dialog

Change-Id: I9348cc63b48b23b5e606739174ce5f8eeff023fe
parents 7d7f8f27 be589463

core/res/res/layout-sw600dp/date_picker_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:spinnersShown="true"

    android:calendarViewShown="true" />
 
    android:calendarViewShown="true"

    android:datePickerMode="@integer/date_picker_mode" />

core/res/res/layout/date_picker_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:spinnersShown="true"

    android:calendarViewShown="false" />
 
    android:calendarViewShown="false"

    android:datePickerMode="@integer/date_picker_mode" />

core/res/res/layout/time_picker_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    android:id="@+id/timePicker"

    android:layout_gravity="center_horizontal"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content" />
 
    android:layout_height="wrap_content"

    android:timePickerMode="@integer/time_picker_mode" />

core/res/res/values/styles_material.xml

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



    <style name="Widget.Material.TimePicker">

        <item name="timePickerMode">@integer/time_picker_mode</item>

        <item name="timePickerMode">clock</item>

        <item name="legacyLayout">@layout/time_picker_legacy_material</item>

        <!-- Attributes for new-style TimePicker. -->

        <item name="internalLayout">@layout/time_picker_material</item>
@@ -674,7 +674,7 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="Widget.Material.DatePicker">

        <item name="datePickerMode">@integer/date_picker_mode</item>

        <item name="datePickerMode">calendar</item>

        <item name="legacyLayout">@layout/date_picker_legacy_holo</item>

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

        <!-- Attributes for new-style DatePicker. -->