Fix caption settings picker layouts
BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
diff --git a/res/layout/color_picker_item.xml b/res/layout/color_picker_item.xml
index 80a18f3..5599eb4 100644
--- a/res/layout/color_picker_item.xml
+++ b/res/layout/color_picker_item.xml
@@ -16,9 +16,13 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="96dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:gravity="center"
+ android:orientation="vertical"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="16dp" >
<ImageView
android:id="@+id/color_swatch"
@@ -28,7 +32,7 @@
<TextView
android:id="@+id/summary"
- android:layout_width="match_parent"
+ android:layout_width="96dp"
android:layout_height="wrap_content"
android:gravity="center" />
diff --git a/res/layout/grid_picker_dialog.xml b/res/layout/grid_picker_dialog.xml
index 023f12e..a52f079 100644
--- a/res/layout/grid_picker_dialog.xml
+++ b/res/layout/grid_picker_dialog.xml
@@ -15,12 +15,24 @@
limitations under the License.
-->
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/list"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="300dp"
- android:columnWidth="112dp"
- android:numColumns="auto_fit"
- android:paddingTop="16dp"
- android:stretchMode="spacingWidthUniform"
- android:verticalSpacing="16dp" />
+ android:layout_height="match_parent" >
+
+ <GridView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:columnWidth="112dp"
+ android:numColumns="auto_fit"
+ android:scrollbarStyle="insideOverlay"
+ android:stretchMode="spacingWidthUniform" />
+
+ <!-- HACK: Setting minHeight has no effect within a dialog layout,
+ so this view keeps the minimum height above 300dp. -->
+ <View
+ android:layout_width="0dp"
+ android:layout_height="300dp"
+ android:visibility="invisible" />
+
+</FrameLayout>
diff --git a/res/layout/preset_picker_item.xml b/res/layout/preset_picker_item.xml
index 9d799ef..0cafd34 100644
--- a/res/layout/preset_picker_item.xml
+++ b/res/layout/preset_picker_item.xml
@@ -16,9 +16,13 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="96dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:gravity="center"
+ android:orientation="vertical"
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp"
+ android:paddingTop="16dp" >
<FrameLayout
android:layout_width="96dp"
@@ -35,7 +39,7 @@
<TextView
android:id="@+id/summary"
- android:layout_width="match_parent"
+ android:layout_width="96dp"
android:layout_height="wrap_content"
android:gravity="center" />