Adjust caption preset picker items dimens for Material

BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
This commit is contained in:
Alan Viverette
2014-10-21 16:51:54 -07:00
parent 2f90c4cd52
commit 285fb04711
2 changed files with 19 additions and 11 deletions

View File

@@ -17,16 +17,21 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" 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 <GridView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:columnWidth="112dp" android:horizontalSpacing="16dp"
android:verticalSpacing="16dp"
android:numColumns="auto_fit" android:numColumns="auto_fit"
android:columnWidth="96dp"
android:scrollbarStyle="insideOverlay" android:scrollbarStyle="insideOverlay"
android:stretchMode="spacingWidthUniform" /> android:stretchMode="columnWidth" />
<!-- HACK: Setting minHeight has no effect within a dialog layout, <!-- HACK: Setting minHeight has no effect within a dialog layout,
so this view keeps the minimum height above 300dp. --> so this view keeps the minimum height above 300dp. -->

View File

@@ -18,14 +18,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:minWidth="96dp"
android:orientation="vertical" android:orientation="vertical">
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="16dp" >
<FrameLayout <FrameLayout
android:layout_width="96dp" android:layout_width="match_parent"
android:layout_height="96dp" android:layout_height="96dp"
android:background="@drawable/transparency_tileable" > android:background="@drawable/transparency_tileable" >
@@ -37,10 +34,16 @@
android:text="@string/captioning_preview_characters" /> android:text="@string/captioning_preview_characters" />
</FrameLayout> </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 <TextView
android:id="@+id/summary" android:id="@+id/summary"
android:layout_width="96dp" android:layout_width="match_parent"
android:layout_height="wrap_content" 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> </LinearLayout>