Fix caption settings picker layouts

BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
This commit is contained in:
Alan Viverette
2013-10-08 15:33:00 -07:00
parent a50f78515e
commit 954fd32047
3 changed files with 34 additions and 14 deletions

View File

@@ -16,9 +16,13 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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:layout_height="wrap_content"
android:orientation="vertical" > android:gravity="center"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="16dp" >
<ImageView <ImageView
android:id="@+id/color_swatch" android:id="@+id/color_swatch"
@@ -28,7 +32,7 @@
<TextView <TextView
android:id="@+id/summary" android:id="@+id/summary"
android:layout_width="match_parent" android:layout_width="96dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" /> android:gravity="center" />

View File

@@ -15,12 +15,24 @@
limitations under the License. limitations under the License.
--> -->
<GridView 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_height="match_parent" >
<GridView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="match_parent"
android:columnWidth="112dp" android:columnWidth="112dp"
android:numColumns="auto_fit" android:numColumns="auto_fit"
android:paddingTop="16dp" android:scrollbarStyle="insideOverlay"
android:stretchMode="spacingWidthUniform" android:stretchMode="spacingWidthUniform" />
android:verticalSpacing="16dp" />
<!-- 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>

View File

@@ -16,9 +16,13 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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:layout_height="wrap_content"
android:orientation="vertical" > android:gravity="center"
android:orientation="vertical"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="16dp" >
<FrameLayout <FrameLayout
android:layout_width="96dp" android:layout_width="96dp"
@@ -35,7 +39,7 @@
<TextView <TextView
android:id="@+id/summary" android:id="@+id/summary"
android:layout_width="match_parent" android:layout_width="96dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" /> android:gravity="center" />