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

Commit fb36a25c authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Use theme color for screenshot UI icons" into rvc-qpr-dev am: 8ef899b9 

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

Change-Id: I3987b8b8bc1941bba4fc9ffa29852bf5e42861fd
parents 5666ed9b 8ef899b9

packages/SystemUI/res/layout/global_screenshot_action_chip.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
        android:gravity="center">

        <ImageView

            android:id="@+id/screenshot_action_chip_icon"

            android:tint="@*android:color/accent_device_default"

            android:layout_width="@dimen/screenshot_action_chip_icon_size"

            android:layout_height="@dimen/screenshot_action_chip_icon_size"

            android:layout_marginStart="@dimen/screenshot_action_chip_padding_start"

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java

+3 −3
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ public class ScreenshotActionChip extends FrameLayout { 
    }



    void setIcon(Icon icon, boolean tint) {

        if (tint) {

            icon.setTint(mIconColor);

        }

        mIcon.setImageIcon(icon);

        if (!tint) {

            mIcon.setImageTintList(null);

        }

    }



    void setText(CharSequence text) {