diff options
| author | Lucas Dupin <dupin@google.com> | 2017-06-23 19:11:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-23 19:11:16 +0000 |
| commit | 9b734011910cdddb6455bd35bab1f099ecfab417 (patch) | |
| tree | ae8361b9f0f7a96fc472ecf9837d65fda46ddb6e | |
| parent | 2ffd98670f71fd1304eea2743fbf84dbe42a47e0 (diff) | |
| parent | ddbaf84ac6eb4757a9e355dffd07c934bf102d6f (diff) | |
| download | base-9b734011910cdddb6455bd35bab1f099ecfab417.tar.gz | |
Merge "Fix notification contrast with transparent bg" into oc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 1a47e4428e49..89694b33e035 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -601,7 +601,8 @@ public class StatusBarIconView extends AnimatedImageView { } private void updateContrastedStaticColor() { - if (mCachedContrastBackgroundColor == NO_COLOR) { + if (Color.alpha(mCachedContrastBackgroundColor) != 255) { + mContrastedDrawableColor = mDrawableColor; return; } // We'll modify the color if it doesn't pass GAR diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java index 8e7ffdfd4b47..7b2071ca14fd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java @@ -116,5 +116,10 @@ public class StatusBarIconViewTest extends SysuiTestCase { color = mIconView.getContrastedStaticDrawableColor(Color.WHITE); assertTrue("Similar colors should be shifted to satisfy contrast", NotificationColorUtil.satisfiesTextContrast(Color.WHITE, color)); + + mIconView.setStaticDrawableColor(Color.GREEN); + color = mIconView.getContrastedStaticDrawableColor(0xcc000000); + assertEquals("Transparent backgrounds should fallback to drawable color", + color, mIconView.getStaticDrawableColor()); } }
\ No newline at end of file |