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

am 084a8ea4: am b3a5b02a: am 27cf6cec: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev

Browse Source 
* commit '084a8ea4729c13f791015adb6c284bc3111f2796':
  Ensure we always have valid colors in CaptionStyle
This commit is contained in:
Alan Viverette
2014-09-17 14:13:49 +00:00
committed by Android Git Automerger
parent 03271af8e4 4399dcef00
commit 14ce2dded0
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/view/accessibility/CaptioningManager.java
View File

@@ -330,15 +330,30 @@ public class CaptioningManager {
*/
public final String mRawTypeface;
private final boolean mHasForegroundColor;
private final boolean mHasBackgroundColor;
private final boolean mHasEdgeType;
private final boolean mHasEdgeColor;
private final boolean mHasWindowColor;
/** Lazily-created typeface based on the raw typeface string. */
private Typeface mParsedTypeface;
private CaptionStyle(int foregroundColor, int backgroundColor, int edgeType, int edgeColor,
int windowColor, String rawTypeface) {
this.foregroundColor = foregroundColor;
this.backgroundColor = backgroundColor;
this.edgeType = edgeType;
this.edgeColor = edgeColor;
this.windowColor = windowColor;
mHasForegroundColor = foregroundColor != COLOR_UNSPECIFIED;
mHasBackgroundColor = backgroundColor != COLOR_UNSPECIFIED;
mHasEdgeType = edgeType != EDGE_TYPE_UNSPECIFIED;
mHasEdgeColor = edgeColor != COLOR_UNSPECIFIED;
mHasWindowColor = windowColor != COLOR_UNSPECIFIED;
// Always use valid colors, even when no override is specified, to
// ensure backwards compatibility with apps targeting KitKat MR2.
this.foregroundColor = mHasForegroundColor ? foregroundColor : Color.WHITE;
this.backgroundColor = mHasBackgroundColor ? backgroundColor : Color.BLACK;
this.edgeType = mHasEdgeType ? edgeType : EDGE_TYPE_NONE;
this.edgeColor = mHasEdgeColor ? edgeColor : Color.BLACK;
this.windowColor = mHasWindowColor ? windowColor : COLOR_NONE_OPAQUE;
mRawTypeface = rawTypeface;
}
@@ -375,7 +390,7 @@ public class CaptioningManager {
* otherwise
*/
public boolean hasBackgroundColor() {
return backgroundColor != COLOR_UNSPECIFIED;
return mHasBackgroundColor;
}
/**
@@ -384,7 +399,7 @@ public class CaptioningManager {
* otherwise
*/
public boolean hasForegroundColor() {
return foregroundColor != COLOR_UNSPECIFIED;
return mHasForegroundColor;
}
/**
@@ -393,7 +408,7 @@ public class CaptioningManager {
* otherwise
*/
public boolean hasEdgeType() {
return edgeType != EDGE_TYPE_UNSPECIFIED;
return mHasEdgeType;
}
/**
@@ -402,7 +417,7 @@ public class CaptioningManager {
* otherwise
*/
public boolean hasEdgeColor() {
return edgeColor != COLOR_UNSPECIFIED;
return mHasEdgeColor;
}
/**
@@ -411,7 +426,7 @@ public class CaptioningManager {
* otherwise
*/
public boolean hasWindowColor() {
return windowColor != COLOR_UNSPECIFIED;
return mHasWindowColor;
}
/**