Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev

Browse Source 
* commit 'd1c1201dfc07a6cce890b69610dc0e173a282791':
  Fixing regression with black task bar background. (Bug 17584337)
This commit is contained in:
Winson Chung
2014-10-01 17:00:40 +00:00
committed by Android Git Automerger
parent edc1997968 d1c1201dfc
commit 69a0645eb2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityManager.java
View File

@@ -579,7 +579,7 @@ public class ActivityManager {
public TaskDescription(TaskDescription td) { public TaskDescription(TaskDescription td) {
mLabel = td.mLabel; mLabel = td.mLabel;
mIcon = td.mIcon; mIcon = td.mIcon;
setPrimaryColor(td.mColorPrimary); mColorPrimary = td.mColorPrimary;
mIconFilename = td.mIconFilename; mIconFilename = td.mIconFilename;
} }
@@ -600,7 +600,11 @@ public class ActivityManager {
* @hide * @hide
*/ */
public void setPrimaryColor(int primaryColor) { 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;
} }
/** /**