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

Commit 59461ffd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[UI][Modifier key remapping] Use new color token." into udc-dev

parents 6853b5d7 077293b7

res/drawable/ic_modifier_keys_reset.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?androidprv:attr/materialColorPrimaryContainer">

        android:tint="?androidprv:attr/materialColorPrimary">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M18,4C13.58,0.69 7.31,1.58 4,6V4H2v6h6V8H5.09c1.44,-2.47 4.09,-3.98 6.94,-3.97c4.42,0.02 7.99,3.61 7.97,8.03s-3.61,7.99 -8.03,7.97C7.55,20.01 3.98,16.42 4,12H2c0,3.15 1.48,6.11 4,8c4.42,3.31 10.69,2.42 14,-2C23.31,13.58 22.42,7.31 18,4z"/>

res/drawable/modifier_key_bordered.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
                <solid android:color="@android:color/transparent"/>

                <stroke

                    android:width="1dp"

                    android:color="?androidprv:attr/materialColorPrimaryContainer"/>

                    android:color="?androidprv:attr/materialColorPrimary"/>

            </shape>

        </item>

    </ripple>

res/drawable/modifier_key_colored.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <item>

            <shape android:shape="rectangle">

                <corners android:radius="24dp"/>

                <solid android:color="?androidprv:attr/colorAccentPrimary"/>

                <solid android:color="?androidprv:attr/materialColorPrimary"/>

            </shape>

        </item>

    </ripple>

res/drawable/modifier_key_lisetview_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <item>

            <shape android:shape="rectangle">

                <corners android:radius="24dp"/>

                <solid android:color="?androidprv:attr/materialColorSurfaceContainerHigh"/>

                <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>

            </shape>

        </item>

    </ripple>

res/layout/modifier_key_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:ellipsize="marquee"

        android:fadingEdge="horizontal"

        android:src="@drawable/ic_check_24dp"

        android:tint="?androidprv:attr/materialColorPrimaryContainer"/>

        android:tint="?androidprv:attr/materialColorPrimary"/>



    <TextView

        android:id="@+id/modifier_key_text"