diff options
| author | Alan Viverette <alanv@google.com> | 2013-07-24 18:16:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-24 18:16:16 +0000 |
| commit | 87c79a18fe03de3b141b95336199b7504ac95c6c (patch) | |
| tree | 19ba2f16230a518de279ecdf01367aa0eae37c78 /api | |
| parent | e8b68c45f84f07e6d04fca90782556a775105910 (diff) | |
| parent | ef79380d2f57f87c1f6859a6ec6ceb40bcb794ff (diff) | |
| download | frameworks_base-87c79a18fe03de3b141b95336199b7504ac95c6c.zip frameworks_base-87c79a18fe03de3b141b95336199b7504ac95c6c.tar.gz frameworks_base-87c79a18fe03de3b141b95336199b7504ac95c6c.tar.bz2 | |
Merge "Add secure settings for captions"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 9b5c376..b0d66fa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28255,6 +28255,22 @@ package android.view.accessibility { method public void setToIndex(int); } + public class CaptioningPreferences { + ctor public CaptioningPreferences(); + method public static final int getBackgroundColor(android.content.ContentResolver); + method public static final int getEdgeColor(android.content.ContentResolver); + method public static final int getEdgeType(android.content.ContentResolver); + method public static final float getFontSize(android.content.ContentResolver); + method public static final int getForegroundColor(android.content.ContentResolver); + method public static final java.util.Locale getLocale(android.content.ContentResolver); + method public static final android.graphics.Typeface getTypeface(android.content.ContentResolver); + method public static final boolean isEnabled(android.content.ContentResolver); + field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS"; + field public static final int EDGE_TYPE_DROP_SHADOWED = 2; // 0x2 + field public static final int EDGE_TYPE_NONE = 0; // 0x0 + field public static final int EDGE_TYPE_UNIFORM = 1; // 0x1 + } + } package android.view.animation { |