diff --git a/core/api/current.txt b/core/api/current.txt index d66f4a45bfb5b..bdf497f8ca648 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -52368,6 +52368,7 @@ package android.view.accessibility { method public final float getFontScale(); method @Nullable public final java.util.Locale getLocale(); method @NonNull public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle(); + method public boolean isCallCaptioningEnabled(); method public final boolean isEnabled(); method public void removeCaptioningChangeListener(@NonNull android.view.accessibility.CaptioningManager.CaptioningChangeListener); } diff --git a/core/api/system-current.txt b/core/api/system-current.txt index b869116fc10b4..17ea0858b7c06 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -367,7 +367,6 @@ package android { field public static final int config_showDefaultAssistant = 17891329; // 0x1110001 field public static final int config_showDefaultEmergency = 17891330; // 0x1110002 field public static final int config_showDefaultHome = 17891331; // 0x1110003 - field public static final int config_systemCaptionsServiceCallsEnabled; } public static final class R.color { diff --git a/core/java/android/view/accessibility/CaptioningManager.java b/core/java/android/view/accessibility/CaptioningManager.java index 3d68692a3b5cc..3f6a87196d70a 100644 --- a/core/java/android/view/accessibility/CaptioningManager.java +++ b/core/java/android/view/accessibility/CaptioningManager.java @@ -22,6 +22,7 @@ import android.annotation.SystemService; import android.compat.annotation.UnsupportedAppUsage; import android.content.ContentResolver; import android.content.Context; +import android.content.res.Resources; import android.database.ContentObserver; import android.graphics.Color; import android.graphics.Typeface; @@ -30,6 +31,8 @@ import android.os.Handler; import android.provider.Settings.Secure; import android.text.TextUtils; +import com.android.internal.R; + import java.util.ArrayList; import java.util.Locale; @@ -51,6 +54,7 @@ public class CaptioningManager { private final ArrayList mListeners = new ArrayList<>(); private final ContentResolver mContentResolver; private final ContentObserver mContentObserver; + private final Resources mResources; /** * Creates a new captioning manager for the specified context. @@ -62,6 +66,7 @@ public class CaptioningManager { final Handler handler = new Handler(context.getMainLooper()); mContentObserver = new MyContentObserver(handler); + mResources = context.getResources(); } /** @@ -181,6 +186,13 @@ public class CaptioningManager { } } + /** + * Returns true if system wide call captioning is enabled for this device. + */ + public boolean isCallCaptioningEnabled() { + return mResources.getBoolean(R.bool.config_systemCaptionsServiceCallsEnabled); + } + private void notifyEnabledChanged() { final boolean enabled = isEnabled(); synchronized (mListeners) { diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 5fa7409150ab8..574c2f7084b09 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3317,8 +3317,6 @@ - - diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0acd4bf5627bc..4e77563602ee2 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3654,6 +3654,8 @@ + +