OSDN Git Service

Fixed an issue in the contrast calculation
authorSelim Cinek <cinek@google.com>
Sat, 24 Jun 2017 00:22:38 +0000 (17:22 -0700)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Sat, 24 Jun 2017 00:54:47 +0000 (00:54 +0000)
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
(cherry picked from commit 4c80791919cd0da976ae5329dd7da9a0c4b3087c)

core/java/com/android/internal/util/NotificationColorUtil.java

index 1ba92bf..0c046a9 100644 (file)
@@ -534,7 +534,7 @@ public class NotificationColorUtil {
     }
 
     public static boolean satisfiesTextContrast(int backgroundColor, int foregroundColor) {
-        return NotificationColorUtil.calculateContrast(backgroundColor, foregroundColor) >= 4.5;
+        return NotificationColorUtil.calculateContrast(foregroundColor, backgroundColor) >= 4.5;
     }
 
     /**
@@ -613,7 +613,7 @@ public class NotificationColorUtil {
          */
         public static double calculateContrast(@ColorInt int foreground, @ColorInt int background) {
             if (Color.alpha(background) != 255) {
-                throw new IllegalArgumentException("background can not be translucent: #"
+                Log.wtf(TAG, "background can not be translucent: #"
                         + Integer.toHexString(background));
             }
             if (Color.alpha(foreground) < 255) {