From 73ab9651783d6d1cb574f75a4d451bdb440752e5 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 6 Jul 2016 10:24:11 -0400
Subject: [PATCH] Fix: DatePicker can't show long date string at landscape

maxLines="2" is not enough for some languages. Date string is
cut down at landscape. There is a room for additional 2 lines.
maxLines="4" is reasonable.

Bug: 29732198

Change-Id: I312d7ca7f8bf3f4c09dd76fa99274a7f7592bd22
---
 core/res/res/layout/date_picker_header_material.xml | 2 +-
 core/res/res/values-land/integers.xml               | 2 ++
 core/res/res/values/integers.xml                    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/date_picker_header_material.xml b/core/res/res/layout/date_picker_header_material.xml
index a0e2b1de60d47..755317ee28cef 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 020fd23cec815..a5789895c9700 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 8f8d59e957828..71ac2f49ff710 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>