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

Commit 3d3b07e4 authored by Catherine Liang's avatar Catherine Liang Committed by Android (Google) Code Review
Browse files

Merge "Color Picker Fragment Additional UX Polish" into udc-dev

parents fad7732a 5d41cd8d

res/layout/color_option_2.xml

+18 −18
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
    android:clipChildren="false">

    <FrameLayout

        android:id="@+id/icon_container"

        android:layout_width="@dimen/option_tile_width"

        android:layout_height="@dimen/option_tile_width"

        android:layout_width="@dimen/option_item_size"

        android:layout_height="@dimen/option_item_size"

        android:clipChildren="false">



        <ImageView
@@ -47,41 +47,41 @@ 
            android:layout_height="match_parent">

            <ImageView

                android:id="@+id/color_preview_0"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginRight="@dimen/color_seed_chip_margin"

                android:layout_marginBottom="@dimen/color_seed_chip_margin"

                android:layout_marginRight="@dimen/color_seed_chip_margin2"

                android:layout_marginBottom="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled0"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_1"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginLeft="@dimen/color_seed_chip_margin"

                android:layout_marginBottom="@dimen/color_seed_chip_margin"

                android:layout_marginLeft="@dimen/color_seed_chip_margin2"

                android:layout_marginBottom="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled2"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_2"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginRight="@dimen/color_seed_chip_margin"

                android:layout_marginTop="@dimen/color_seed_chip_margin"

                android:layout_marginRight="@dimen/color_seed_chip_margin2"

                android:layout_marginTop="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled1"

                android:importantForAccessibility="no"/>



            <ImageView

                android:id="@+id/color_preview_3"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="@dimen/component_color_chip_small_radius_default2"

                android:layout_height="@dimen/component_color_chip_small_radius_default2"

                android:layout_gravity="center"

                android:layout_marginLeft="@dimen/color_seed_chip_margin"

                android:layout_marginTop="@dimen/color_seed_chip_margin"

                android:layout_marginLeft="@dimen/color_seed_chip_margin2"

                android:layout_marginTop="@dimen/color_seed_chip_margin2"

                android:src="@drawable/color_chip_seed_filled3"

                android:importantForAccessibility="no" />

        </FrameLayout>