diff options
| author | 2020-04-14 15:19:28 +0000 | |
|---|---|---|
| committer | 2020-04-14 15:19:28 +0000 | |
| commit | 90ed85e82c07d02719b1952ab1ef69b20e8fca2c (patch) | |
| tree | 8586df7246f4a32d7e597ed4703ec73876debc79 | |
| parent | 46403d6d8090353f3a6e2866dab9332cf5c111e3 (diff) | |
| parent | ddb33e9daf28c60aa275c73588fd9b334bc085e0 (diff) | |
Merge "Fix screenshot preview accessibility label" into rvc-dev am: ddb33e9daf
Change-Id: I28f9363bf18b4b0c1b8af4a0185c5e8654049bb8
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 7c0b6054dddb..d2654d6d7d9a 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -235,8 +235,8 @@ your organization</string> <!-- Content description indicating that tapping a button will dismiss the screenshots UI [CHAR LIMIT=NONE] --> <string name="screenshot_dismiss_ui_description">Dismiss screenshot</string> - <!-- Content description indicating that tapping will open an app to view/edit the screenshot. [CHAR LIMIT=NONE] --> - <string name="screenshot_preview_description">Open screenshot</string> + <!-- Content description indicating that the view is a preview of the screenshot that was just taken [CHAR LIMIT=NONE] --> + <string name="screenshot_preview_description">Screenshot preview</string> <!-- Notification title displayed for screen recording [CHAR LIMIT=50]--> <string name="screenrecord_name">Screen Recorder</string> diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index 1780fb1848e7..e1cc0b0c90c2 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -422,6 +422,8 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset mDismissButton.setVisibility(View.GONE); mScreenshotView.setVisibility(View.GONE); mScreenshotView.setLayerType(View.LAYER_TYPE_NONE, null); + mScreenshotView.setContentDescription( + mContext.getResources().getString(R.string.screenshot_preview_description)); } /** @@ -606,6 +608,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset Log.e(TAG, "Intent cancelled", e); } }); + mScreenshotView.setContentDescription(action.title); } mActionsView.addView(actionChip); } |