summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2013-08-29 12:23:48 -0700
committerAlan Viverette <alanv@google.com>2013-08-29 12:23:48 -0700
commit69ce69b0e1500bcf0bfa87eaf0b89ae47f552f5c (patch)
tree4293e3e6fab2022ae017ef5ddb9166dde0902a12 /core/java/android/app
parent107e2d418b335263da01aaa9bafb69475e79d7f7 (diff)
downloadframeworks_base-69ce69b0e1500bcf0bfa87eaf0b89ae47f552f5c.zip
frameworks_base-69ce69b0e1500bcf0bfa87eaf0b89ae47f552f5c.tar.gz
frameworks_base-69ce69b0e1500bcf0bfa87eaf0b89ae47f552f5c.tar.bz2
Update captioning APIs
CaptioningManager is now a first-class service in Context and can have listeners added to it to monitor changes. BUG: 10260603, 10461210 Change-Id: I2df5b2997537bb343d902b7ace3343ad483f3717
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ContextImpl.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index cdec399..f10290d 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -105,6 +105,7 @@ import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.WindowManagerImpl;
import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.CaptioningManager;
import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager;
import android.accounts.AccountManager;
@@ -307,6 +308,11 @@ class ContextImpl extends Context {
return AccessibilityManager.getInstance(ctx);
}});
+ registerService(CAPTIONING_SERVICE, new ServiceFetcher() {
+ public Object getService(ContextImpl ctx) {
+ return new CaptioningManager(ctx);
+ }});
+
registerService(ACCOUNT_SERVICE, new ServiceFetcher() {
public Object createService(ContextImpl ctx) {
IBinder b = ServiceManager.getService(ACCOUNT_SERVICE);