commit 2d47683ab969a1da30209e44712ce6513e324b89
author Winson <winsonc@google.com> Wed Feb 17 14:53:46 2016 -0800
committer Winson Chung <winsonc@google.com> Wed Feb 17 23:23:45 2016 +0000
tree 1a6c94609451652c4135df03d61ca0fb62748719
parent 7998e48ce3240d09f28cd365fb6ba58f8987470f

Only set the task description if the colors are opaque.

Bug: 27214638
Change-Id: I75e0b8871087f0b8e6acd16dc751bb6374c0f968

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index ea58e29..e3adbda 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -49,6 +49,7 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -3988,8 +3989,12 @@
             a.recycle();
             if (colorPrimary != 0) {
                 ActivityManager.TaskDescription td = new ActivityManager.TaskDescription();
-                td.setPrimaryColor(colorPrimary);
-                td.setBackgroundColor(colorBg);
+                if (Color.alpha(colorPrimary) == 0xFF) {
+                    td.setPrimaryColor(colorPrimary);
+                }
+                if (Color.alpha(colorBg) == 0xFF) {
+                    td.setBackgroundColor(colorBg);
+                }
                 setTaskDescription(td);
             }
         }