Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ad5748 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix caption settings picker layouts" into klp-dev

parents 02099910 954fd320

res/layout/color_picker_item.xml

+7 −3
Original line number Diff line number Diff line
@@ -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" />

res/layout/grid_picker_dialog.xml

+20 −8
Original line number Diff line number Diff line
@@ -15,12 +15,24 @@ 
     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:layout_width="match_parent"

    android:layout_height="300dp"

        android:layout_height="match_parent"

        android:columnWidth="112dp"

        android:numColumns="auto_fit"

    android:paddingTop="16dp"

    android:stretchMode="spacingWidthUniform"

    android:verticalSpacing="16dp" />
 
        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>

res/layout/preset_picker_item.xml

+7 −3
Original line number Diff line number Diff line
@@ -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" />