Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3987b8b8bc1941bba4fc9ffa29852bf5e42861fd
This commit is contained in:
Miranda Kephart
2020-08-17 15:13:58 +00:00
committed by Automerger Merge Worker
parent 5666ed9b0d 8ef899b9a7
commit fb36a25ceb
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/global_screenshot_action_chip.xml
View File

@@ -32,6 +32,7 @@
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:id="@+id/screenshot_action_chip_icon" 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_width="@dimen/screenshot_action_chip_icon_size"
android:layout_height="@dimen/screenshot_action_chip_icon_size" android:layout_height="@dimen/screenshot_action_chip_icon_size"
android:layout_marginStart="@dimen/screenshot_action_chip_padding_start" android:layout_marginStart="@dimen/screenshot_action_chip_padding_start"

6
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionChip.java
View File

@@ -65,10 +65,10 @@ public class ScreenshotActionChip extends FrameLayout {
} }
void setIcon(Icon icon, boolean tint) { void setIcon(Icon icon, boolean tint) {
if (tint) {
icon.setTint(mIconColor);
}
mIcon.setImageIcon(icon); mIcon.setImageIcon(icon);
if (!tint) {
mIcon.setImageTintList(null);
}
} }
void setText(CharSequence text) { void setText(CharSequence text) {