Bug 1324028 - IconGenerator: Do not add alpha channel to colors of generated icons. r?mcomella draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 08 Aug 2017 17:36:50 +0200
changeset 654310 0bf2de24f3adf63b2559ec724e37fb6ffc62c21f
parent 654301 927912911e16c6ac9b13ddf0926901a11c15332f
child 728534 44b98883ca7f87f83b4b14f9f6e69bbb2f009db5
push id76538
push users.kaspari@gmail.com
push dateMon, 28 Aug 2017 14:53:12 +0000
reviewersmcomella
bugs1324028
milestone57.0a1
Bug 1324028 - IconGenerator: Do not add alpha channel to colors of generated icons. r?mcomella MozReview-Commit-ID: H4qaSSOlMxT
mobile/android/base/java/org/mozilla/gecko/icons/loader/IconGenerator.java
mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestColorProcessor.java
--- a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconGenerator.java
+++ b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconGenerator.java
@@ -82,17 +82,17 @@ public class IconGenerator implements Ic
         paint.setTextSize(textSize);
         paint.setAntiAlias(true);
 
         canvas.drawText(character,
                 canvas.getWidth() / 2,
                 (int) ((canvas.getHeight() / 2) - ((paint.descent() + paint.ascent()) / 2)),
                 paint);
 
-        return IconResponse.createGenerated(favicon, color & 0x7FFFFFFF);
+        return IconResponse.createGenerated(favicon, color);
     }
 
     /**
      * Get a representative character for the given URL.
      *
      * For example this method will return "f" for "http://m.facebook.com/foobar".
      */
     @VisibleForTesting static String getRepresentativeCharacter(String url) {
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestColorProcessor.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/icons/processing/TestColorProcessor.java
@@ -28,17 +28,17 @@ public class TestColorProcessor {
 
         Assert.assertFalse(response.hasColor());
         Assert.assertEquals(0, response.getColor());
 
         final Processor processor = new ColorProcessor();
         processor.process(null, response);
 
         Assert.assertTrue(response.hasColor());
-        Assert.assertEquals(Color.RED & 0x7FFFFFFF, response.getColor());
+        Assert.assertEquals(Color.RED, response.getColor());
     }
 
     private Bitmap createRedBitmapMock() {
         final Bitmap bitmap = mock(Bitmap.class);
 
         doReturn(1).when(bitmap).getWidth();
         doReturn(1).when(bitmap).getHeight();