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

Merge "Fix notification contrast with transparent bg" into oc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2017-06-23 19:11:11 +00:00
committed by Android (Google) Code Review
parent 2ffd98670f ddbaf84ac6
commit 9b73401191
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
View File

@@ -601,7 +601,8 @@ public class StatusBarIconView extends AnimatedImageView {
} }
private void updateContrastedStaticColor() { private void updateContrastedStaticColor() {
if (mCachedContrastBackgroundColor == NO_COLOR) { if (Color.alpha(mCachedContrastBackgroundColor) != 255) {
mContrastedDrawableColor = mDrawableColor;
return; return;
} }
// We'll modify the color if it doesn't pass GAR // We'll modify the color if it doesn't pass GAR

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
View File

@@ -116,5 +116,10 @@ public class StatusBarIconViewTest extends SysuiTestCase {
color = mIconView.getContrastedStaticDrawableColor(Color.WHITE); color = mIconView.getContrastedStaticDrawableColor(Color.WHITE);
assertTrue("Similar colors should be shifted to satisfy contrast", assertTrue("Similar colors should be shifted to satisfy contrast",
NotificationColorUtil.satisfiesTextContrast(Color.WHITE, color)); NotificationColorUtil.satisfiesTextContrast(Color.WHITE, color));
mIconView.setStaticDrawableColor(Color.GREEN);
color = mIconView.getContrastedStaticDrawableColor(0xcc000000);
assertEquals("Transparent backgrounds should fallback to drawable color",
color, mIconView.getStaticDrawableColor());
} }
} }