diff options
| author | 2016-04-29 16:31:15 +0000 | |
|---|---|---|
| committer | 2016-04-29 16:31:16 +0000 | |
| commit | be58946330c918f7912ff318030f99acb25e6098 (patch) | |
| tree | 5c0f43a71520993c5b42d1b9eafec28eafbb8f25 | |
| parent | 017567ae1d7c67e44824ee32a812638b88b48779 (diff) | |
| parent | f7833c743422b37b0932f0c28328bc12d52eccf8 (diff) | |
Merge "Only change picker modes when used in dialog" into nyc-dev
| -rw-r--r-- | core/res/res/layout-sw600dp/date_picker_dialog.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout/date_picker_dialog.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout/time_picker_dialog.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/core/res/res/layout-sw600dp/date_picker_dialog.xml b/core/res/res/layout-sw600dp/date_picker_dialog.xml index f18485f756ee..5e3ca14dd96c 100644 --- a/core/res/res/layout-sw600dp/date_picker_dialog.xml +++ b/core/res/res/layout-sw600dp/date_picker_dialog.xml @@ -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" /> diff --git a/core/res/res/layout/date_picker_dialog.xml b/core/res/res/layout/date_picker_dialog.xml index 64ac1b954e3e..8f36e95a15c6 100644 --- a/core/res/res/layout/date_picker_dialog.xml +++ b/core/res/res/layout/date_picker_dialog.xml @@ -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" /> diff --git a/core/res/res/layout/time_picker_dialog.xml b/core/res/res/layout/time_picker_dialog.xml index 30fe91093c46..d1f3902bd2d2 100644 --- a/core/res/res/layout/time_picker_dialog.xml +++ b/core/res/res/layout/time_picker_dialog.xml @@ -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" /> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 8a33406eeaa7..6752e3c900b0 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -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. --> |