commit 1e6f3f863613b6eeb7161444e77427443e9703a2
author Paul Sliwowski <psliwowski@google.com> Tue Jun 25 20:05:58 2013 -0700
committer Paul Sliwowski <psliwowski@google.com> Wed Jun 26 21:55:23 2013 +0000
tree 52e6206a4bfaaae3017a871aecc0bde01e34a1e5
parent 334894dfa40899042e20d35235624c37ffa10b45

Increase timezone text to 2 lines if needed.

Bug: 8908656
Change-Id: Icffc2b2cdcb3fb7ad6700f353b73ec193ceec7cf
(cherry picked from commit 419ff6b4f75989098230c5064151e8cc468c5fb2)

res/layout/time_zone_filter_item.xml

diff --git a/res/layout/time_zone_filter_item.xml b/res/layout/time_zone_filter_item.xml
index 0bda8fa..3d38a83 100644
--- a/res/layout/time_zone_filter_item.xml
+++ b/res/layout/time_zone_filter_item.xml
@@ -31,7 +31,7 @@
         android:ellipsize="marquee"
         android:gravity="center_vertical"
         android:minHeight="32dp"
-        android:singleLine="true"
+        android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
 </LinearLayout>
\ No newline at end of file

res/layout/time_zone_item.xml

diff --git a/res/layout/time_zone_item.xml b/res/layout/time_zone_item.xml
index fe27fc3..e4b92bf 100644
--- a/res/layout/time_zone_item.xml
+++ b/res/layout/time_zone_item.xml
@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
         android:paddingTop="8dp"
-        android:singleLine="true"
+        android:maxLines="2"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <TextView