diff options
| author | 2021-12-14 23:10:51 +0000 | |
|---|---|---|
| committer | 2021-12-14 23:10:51 +0000 | |
| commit | 49764b13db421f92f4f5449002a17c97cbbf159d (patch) | |
| tree | 4b93bc9f5fa2622bfe0d399431716bdc1932a279 | |
| parent | 5965aa4b9527a17dbcdb28e478fe9dc172f9d51f (diff) | |
| parent | e8d74abe939105b18729767e98c24617628dbac2 (diff) | |
Merge "Add config for call captioning"
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a33d0a2c0879..99d98078427c 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -359,6 +359,7 @@ 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/res/res/values/config.xml b/core/res/res/values/config.xml index ddec469f63ad..4feee41533be 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4019,6 +4019,11 @@ --> <string name="config_defaultSystemCaptionsManagerService" translatable="false"></string> + <!-- Indicates whether the system wide captions service should also support + call captioning. + --> + <bool name="config_systemCaptionsServiceCallsEnabled" translatable="false"></bool> + <!-- The package name for the incident report approver app. This app is usually PermissionController or an app that replaces it. When a bugreport or incident report with EXPLICT-level sharing flags is going to be diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 1aa3ac235a6a..b9c75649b6ff 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3308,6 +3308,8 @@ </staging-public-group> <staging-public-group type="bool" first-id="0x01cf0000"> + <!-- @hide @SystemApi --> + <public name="config_systemCaptionsServiceCallsEnabled" /> </staging-public-group> <staging-public-group type="fraction" first-id="0x01ce0000"> |