diff options
| author | 2019-11-18 20:34:59 +0000 | |
|---|---|---|
| committer | 2019-11-18 20:34:59 +0000 | |
| commit | bc66f23f1a3f550c09bf222276fc3e44ecb54ac2 (patch) | |
| tree | 871f5d77f6b817bd363efb8c021b8ecbfa18a920 | |
| parent | 09fa839521b0126ce648f1e625a35758c176993e (diff) | |
| parent | 1e83f128f0b31e91eff62e065ebb5e20c79f3ae0 (diff) | |
Merge "Support talkback for functions on the caption view."
| -rw-r--r-- | core/java/com/android/internal/widget/DecorCaptionView.java | 2 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/DecorCaptionView.java b/core/java/com/android/internal/widget/DecorCaptionView.java index 4014c454f6a8..b5d787c24fbd 100644 --- a/core/java/com/android/internal/widget/DecorCaptionView.java +++ b/core/java/com/android/internal/widget/DecorCaptionView.java @@ -123,6 +123,8 @@ public class DecorCaptionView extends ViewGroup implements View.OnTouchListener, private void init(Context context) { mDragSlop = ViewConfiguration.get(context).getScaledTouchSlop(); mGestureDetector = new GestureDetector(context, this); + setContentDescription(context.getString(R.string.accessibility_freeform_caption, + context.getPackageManager().getApplicationLabel(context.getApplicationInfo()))); } @Override diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 22b5707143c0..8c0b50eaffa3 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -5320,4 +5320,7 @@ <string name="accessibility_system_action_lock_screen_label">Lock Screen</string> <!-- Label for taking screenshot action [CHAR LIMIT=NONE] --> <string name="accessibility_system_action_screenshot_label">Screenshot</string> + + <!-- Accessibility description of caption view --> + <string name="accessibility_freeform_caption"><xliff:g id="app_name">%1$s</xliff:g> app in Pop-up window.</string> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e56bbf6fa08f..23402c143fa0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3763,4 +3763,6 @@ <java-symbol type="string" name="accessibility_system_action_recents_label" /> <java-symbol type="string" name="accessibility_system_action_screenshot_label" /> <java-symbol type="string" name="accessibility_system_action_toggle_split_screen_label" /> + + <java-symbol type="string" name="accessibility_freeform_caption" /> </resources> |