diff options
| author | 2016-07-06 19:33:19 +0000 | |
|---|---|---|
| committer | 2016-07-06 19:33:20 +0000 | |
| commit | c71fc2456a2c3b9ce0651cddfaceb900c022f2a1 (patch) | |
| tree | b543e7032c5b760572d8b073df613f13d895d7ac | |
| parent | 0f6c2bfe306aab91f4b499479bafef7c620540e3 (diff) | |
| parent | 73ab9651783d6d1cb574f75a4d451bdb440752e5 (diff) | |
Merge "Fix: DatePicker can't show long date string at landscape" into nyc-mr1-dev
| -rw-r--r-- | core/res/res/layout/date_picker_header_material.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-land/integers.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/integers.xml | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/layout/date_picker_header_material.xml b/core/res/res/layout/date_picker_header_material.xml index a0e2b1de60d4..755317ee28ce 100644 --- a/core/res/res/layout/date_picker_header_material.xml +++ b/core/res/res/layout/date_picker_header_material.xml @@ -54,7 +54,7 @@ android:textAppearance="@style/TextAppearance.Material.DatePicker.DateLabel" android:includeFontPadding="false" android:gravity="start" - android:maxLines="2" + android:maxLines="@integer/date_picker_header_max_lines_material" android:ellipsize="none" /> </LinearLayout> </LinearLayout> diff --git a/core/res/res/values-land/integers.xml b/core/res/res/values-land/integers.xml index 020fd23cec81..a5789895c970 100644 --- a/core/res/res/values-land/integers.xml +++ b/core/res/res/values-land/integers.xml @@ -23,4 +23,6 @@ <integer name="kg_widget_region_weight">45</integer> <integer name="kg_security_flipper_weight">55</integer> <integer name="kg_glowpad_rotation_offset">-90</integer> + + <integer name="date_picker_header_max_lines_material">4</integer> </resources> diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 8f8d59e95782..71ac2f49ff71 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -26,4 +26,5 @@ <integer name="date_picker_mode">1</integer> <integer name="time_picker_mode">1</integer> + <integer name="date_picker_header_max_lines_material">2</integer> </resources> |