From 285fb047113b3af35f780941361c715b56efcdb0 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 21 Oct 2014 16:51:54 -0700
Subject: [PATCH] Adjust caption preset picker items dimens for Material

BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
---
 res/layout/grid_picker_dialog.xml | 11 ++++++++---
 res/layout/preset_picker_item.xml | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/res/layout/grid_picker_dialog.xml b/res/layout/grid_picker_dialog.xml
index a52f0791ea6..1e04188ff84 100644
--- a/res/layout/grid_picker_dialog.xml
+++ b/res/layout/grid_picker_dialog.xml
@@ -17,16 +17,21 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:paddingStart="24dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="24dp">
 
     <GridView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:columnWidth="112dp"
+        android:horizontalSpacing="16dp"
+        android:verticalSpacing="16dp"
         android:numColumns="auto_fit"
+        android:columnWidth="96dp"
         android:scrollbarStyle="insideOverlay"
-        android:stretchMode="spacingWidthUniform" />
+        android:stretchMode="columnWidth" />
 
     <!-- HACK: Setting minHeight has no effect within a dialog layout,
          so this view keeps the minimum height above 300dp. -->
diff --git a/res/layout/preset_picker_item.xml b/res/layout/preset_picker_item.xml
index 0cafd347b65..405b7357444 100644
--- a/res/layout/preset_picker_item.xml
+++ b/res/layout/preset_picker_item.xml
@@ -18,14 +18,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
-    android:paddingTop="16dp" >
+    android:minWidth="96dp"
+    android:orientation="vertical">
 
     <FrameLayout
-        android:layout_width="96dp"
+        android:layout_width="match_parent"
         android:layout_height="96dp"
         android:background="@drawable/transparency_tileable" >
 
@@ -37,10 +34,16 @@
             android:text="@string/captioning_preview_characters" />
     </FrameLayout>
 
+    <!-- HACK: GridView doesn't perform layout properly in this configuration,
+         so we need to manually set the height to roughly two scaled lines. -->
     <TextView
         android:id="@+id/summary"
-        android:layout_width="96dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center" />
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:minLines="2"
+        android:gravity="top|center_horizontal"
+        android:textAppearance="@android:style/TextAppearance.Material.Body1" />
 
 </LinearLayout>