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

Commit 9cb49d62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update colors on action row." into rvc-dev am: 8ebd6996 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11958692

Change-Id: Ic4a3a412c45611f20cda8037e76889e511465fc3
parents b9da3c32 8ebd6996

core/res/res/drawable/chooser_action_button_bg.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
            <shape android:shape="rectangle">

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

                <stroke android:width="1dp"

                        android:color="?attr/textColorSecondary" />

                <solid android:color="?attr/colorBackground" />

                        android:color="?attr/opacityListDivider" />

                <solid android:color="?attr/colorBackgroundFloating" />

            </shape>

        </inset>

    </item>

core/res/res/layout/chooser_action_button.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 
    android:paddingStart="12dp"

    android:paddingEnd="12dp"

    android:drawablePadding="8dp"

    android:textColor="?android:textColorSecondary"

    android:textColor="?android:textColorPrimary"

    android:textSize="12sp"

    android:maxWidth="192dp"

    android:singleLine="true"

    android:clickable="true"

    android:background="@drawable/chooser_action_button_bg"

    android:drawableTint="?android:attr/colorControlNormal"

    android:drawableTint="@color/chooser_chip_icon"

    android:drawableTintMode="src_in"

    />

core/res/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ 
    <color name="resolver_text_color_secondary_dark">#ffC4C6C6</color>

    <color name="resolver_empty_state_text">#FF202124</color>

    <color name="resolver_empty_state_icon">#FF5F6368</color>

    <color name="chooser_chip_icon">#FF1A73E8</color> <!-- Blue 600 -->



    <!-- Color for personal app suspension notification button text and icon tint. -->

    <color name="personal_apps_suspension_notification_color">#1A73E8</color>