diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-21 16:51:54 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-10-21 16:51:54 -0700 |
| commit | 285fb047113b3af35f780941361c715b56efcdb0 (patch) | |
| tree | e39fcac01b54de50a66c959d273a9aa5a9d8a580 /res/layout | |
| parent | 2f90c4cd52326b712e4f886976f27d6610162a82 (diff) | |
| download | packages_apps_Settings-285fb047113b3af35f780941361c715b56efcdb0.zip packages_apps_Settings-285fb047113b3af35f780941361c715b56efcdb0.tar.gz packages_apps_Settings-285fb047113b3af35f780941361c715b56efcdb0.tar.bz2 | |
Adjust caption preset picker items dimens for Material
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/grid_picker_dialog.xml | 11 | ||||
| -rw-r--r-- | 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 a52f079..1e04188 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 0cafd34..405b735 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> |