PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev automerge: 6a4d223

Browse Source 
automerge: c734de2

* commit 'c734de2aadc7cad71945b9037978f8871eb3f8f6':
  Adjust caption preset picker items dimens for Material
This commit is contained in:
Alan Viverette
2014-10-22 05:52:36 +00:00
committed by android-build-merger
parent a160b96005 c734de2aad
commit bfa1932e89
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/grid_picker_dialog.xml
View File

@@ -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. -->

19
res/layout/preset_picker_item.xml
View File

@@ -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>