diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-08 15:33:00 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2013-10-08 15:33:00 -0700 |
| commit | 954fd320472ff0f1d3eb31bcc69e39e60af95f66 (patch) | |
| tree | eb67c855e3453fd4cf5eb9cdfcdcf0fc83624a9a | |
| parent | a50f78515e2718fa5e47f283e25705806bd163aa (diff) | |
| download | packages_apps_Settings-954fd320472ff0f1d3eb31bcc69e39e60af95f66.zip packages_apps_Settings-954fd320472ff0f1d3eb31bcc69e39e60af95f66.tar.gz packages_apps_Settings-954fd320472ff0f1d3eb31bcc69e39e60af95f66.tar.bz2 | |
Fix caption settings picker layouts
BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
| -rw-r--r-- | res/layout/color_picker_item.xml | 10 | ||||
| -rw-r--r-- | res/layout/grid_picker_dialog.xml | 28 | ||||
| -rw-r--r-- | res/layout/preset_picker_item.xml | 10 |
3 files changed, 34 insertions, 14 deletions
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" /> |