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

Merge "Match default color packing for captioning settings" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-22 20:55:10 +00:00
committed by Android (Google) Code Review
parent 3bd8c3618a 7e4019b741
commit 696d214946
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,11 +266,19 @@ public class CaptioningManager {
* background colors, edge properties, and typeface. * background colors, edge properties, and typeface.
*/ */
public static final class CaptionStyle { public static final class CaptionStyle {
/** Packed value for a color of 'none' and a cached opacity of 100%. */ /**
* Packed value for a color of 'none' and a cached opacity of 100%.
*
* @hide
*/
private static final int COLOR_NONE_OPAQUE = 0x000000FF; private static final int COLOR_NONE_OPAQUE = 0x000000FF;
/** Packed value for an unspecified color and opacity. */ /**
private static final int COLOR_UNSPECIFIED = 0x000001FF; * Packed value for a color of 'default' and opacity of 100%.
*
* @hide
*/
public static final int COLOR_UNSPECIFIED = 0x00FFFFFF;
private static final CaptionStyle WHITE_ON_BLACK; private static final CaptionStyle WHITE_ON_BLACK;
private static final CaptionStyle BLACK_ON_WHITE; private static final CaptionStyle BLACK_ON_WHITE;
@@ -350,11 +358,11 @@ public class CaptioningManager {
private CaptionStyle(int foregroundColor, int backgroundColor, int edgeType, int edgeColor, private CaptionStyle(int foregroundColor, int backgroundColor, int edgeType, int edgeColor,
int windowColor, String rawTypeface) { int windowColor, String rawTypeface) {
mHasForegroundColor = foregroundColor != COLOR_UNSPECIFIED; mHasForegroundColor = hasColor(foregroundColor);
mHasBackgroundColor = backgroundColor != COLOR_UNSPECIFIED; mHasBackgroundColor = hasColor(backgroundColor);
mHasEdgeType = edgeType != EDGE_TYPE_UNSPECIFIED; mHasEdgeType = edgeType != EDGE_TYPE_UNSPECIFIED;
mHasEdgeColor = edgeColor != COLOR_UNSPECIFIED; mHasEdgeColor = hasColor(edgeColor);
mHasWindowColor = windowColor != COLOR_UNSPECIFIED; mHasWindowColor = hasColor(windowColor);
// Always use valid colors, even when no override is specified, to // Always use valid colors, even when no override is specified, to
// ensure backwards compatibility with apps targeting KitKat MR2. // ensure backwards compatibility with apps targeting KitKat MR2.
@@ -367,6 +375,20 @@ public class CaptioningManager {
mRawTypeface = rawTypeface; mRawTypeface = rawTypeface;
} }
/**
* Returns whether a packed color indicates a non-default value.
*
* @param packedColor the packed color value
* @return {@code true} if a non-default value is specified
* @hide
*/
public static boolean hasColor(int packedColor) {
// Matches the color packing code from Settings. "Default" packed
// colors are indicated by zero alpha and non-zero red/blue. The
// cached alpha value used by Settings is stored in green.
return (packedColor >>> 24) != 0 || (packedColor & 0xFFFF00) == 0;
}
/** /**
* Applies a caption style, overriding any properties that are specified * Applies a caption style, overriding any properties that are specified
* in the overlay caption. * in the overlay caption.