Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: be58946330

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

Change-Id: I9900c12d284d353d491f3e4e3d299c2682761221
This commit is contained in:
Alan Viverette
2016-04-29 16:38:20 +00:00
committed by android-build-merger
parent c79c6b8b50 be58946330
commit e6eee3dd41
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/layout-sw600dp/date_picker_dialog.xml
View File

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

3
core/res/res/layout/date_picker_dialog.xml
View File

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

3
core/res/res/layout/time_picker_dialog.xml
View File

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

4
core/res/res/values/styles_material.xml
View File

@@ -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. -->