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

Commit e2a19b4d authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 9b734011

Change-Id: Ia592c52798c7449616e06290d8c44708066f8af3
parents 0d62de0a 9b734011

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+2 −1
Original line number Diff line number Diff line
@@ -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

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

+5 −0
Original line number Diff line number Diff line
@@ -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