summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-09-09 20:31:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-09 20:31:14 +0000
commit013634cc44d62fe90cd3e80a7530cffdc79f9715 (patch)
treef4cef12f864d38443d29cac5009aedf66e233c34 /api/current.txt
parent93d71945d88f38b784de3c12d7ae781e97735582 (diff)
parentd43daf361e993457e64eeeddab6d1a0ebc828c99 (diff)
downloadframeworks_base-013634cc44d62fe90cd3e80a7530cffdc79f9715.zip
frameworks_base-013634cc44d62fe90cd3e80a7530cffdc79f9715.tar.gz
frameworks_base-013634cc44d62fe90cd3e80a7530cffdc79f9715.tar.bz2
Merge "Add WebVTT caption renderer" into klp-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 5ec1771..78abd53 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29053,12 +29053,12 @@ package android.view.accessibility {
}
public class CaptioningManager {
- method public void addCaptioningStateChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+ method public void addCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
method public final float getFontScale();
method public final java.util.Locale getLocale();
method public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle();
method public final boolean isEnabled();
- method public void removeCaptioningStateChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
+ method public void removeCaptioningChangeListener(android.view.accessibility.CaptioningManager.CaptioningChangeListener);
}
public static final class CaptioningManager.CaptionStyle {
@@ -29072,7 +29072,7 @@ package android.view.accessibility {
field public final int foregroundColor;
}
- public abstract class CaptioningManager.CaptioningChangeListener {
+ public static abstract class CaptioningManager.CaptioningChangeListener {
ctor public CaptioningManager.CaptioningChangeListener();
method public void onEnabledChanged(boolean);
method public void onFontScaleChanged(float);