From ae12dae13a58695653e6918124ca68cd8dcbf54e Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 29 Sep 2014 14:21:26 -0700 Subject: Fixing regression with black task bar background. (Bug 17584337) Change-Id: Ieaa2defa4997ffc8851832c18dfe84e561ffedb5 --- core/java/android/app/ActivityManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 3d14c58c8f82..cd6088f8b0fe 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -579,7 +579,7 @@ public class ActivityManager { public TaskDescription(TaskDescription td) { mLabel = td.mLabel; mIcon = td.mIcon; - setPrimaryColor(td.mColorPrimary); + mColorPrimary = td.mColorPrimary; mIconFilename = td.mIconFilename; } @@ -600,7 +600,11 @@ public class ActivityManager { * @hide */ public void setPrimaryColor(int primaryColor) { - mColorPrimary = 0xFF000000 | primaryColor; + // Ensure that the given color is valid + if ((primaryColor != 0) && (Color.alpha(primaryColor) != 255)) { + throw new RuntimeException("A TaskDescription's primary color should be opaque"); + } + mColorPrimary = primaryColor; } /** -- cgit v1.2.3-59-g8ed1b