Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clarify screenshot content descriptions" into sc-v2-dev am: dac49be329

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16124340

Change-Id: I110ddf7e80a5650de970485df964a6aceaac5a26
This commit is contained in:
Miranda Kephart
2021-11-08 16:14:06 +00:00
committed by Automerger Merge Worker
parent 225518adb6 dac49be329
commit bcb1ed87a1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/global_screenshot_static.xml
View File

@@ -94,7 +94,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:elevation="@dimen/screenshot_preview_elevation" android:elevation="@dimen/screenshot_preview_elevation"
android:contentDescription="@string/screenshot_edit_label" android:contentDescription="@string/screenshot_edit_description"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:background="@drawable/screenshot_preview_background" android:background="@drawable/screenshot_preview_background"
android:adjustViewBounds="true" android:adjustViewBounds="true"

2
packages/SystemUI/res/values/strings.xml
View File

@@ -241,6 +241,8 @@
<string name="screenshot_edit_label">Edit</string> <string name="screenshot_edit_label">Edit</string>
<!-- Content description indicating that tapping the element will allow editing the screenshot [CHAR LIMIT=NONE] --> <!-- Content description indicating that tapping the element will allow editing the screenshot [CHAR LIMIT=NONE] -->
<string name="screenshot_edit_description">Edit screenshot</string> <string name="screenshot_edit_description">Edit screenshot</string>
<!-- Content description indicating that tapping the element will allow sharing the screenshot [CHAR LIMIT=NONE] -->
<string name="screenshot_share_description">Share screenshot</string>
<!-- Label for UI element which allows the user to capture additional off-screen content in a screenshot. [CHAR LIMIT=30] --> <!-- Label for UI element which allows the user to capture additional off-screen content in a screenshot. [CHAR LIMIT=30] -->
<string name="screenshot_scroll_label">Capture more</string> <string name="screenshot_scroll_label">Capture more</string>
<!-- Content description indicating that tapping a button will dismiss the screenshots UI [CHAR LIMIT=NONE] --> <!-- Content description indicating that tapping a button will dismiss the screenshots UI [CHAR LIMIT=NONE] -->

4
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -621,7 +621,7 @@ public class ScreenshotView extends FrameLayout implements
ArrayList<ScreenshotActionChip> chips = new ArrayList<>(); ArrayList<ScreenshotActionChip> chips = new ArrayList<>();
mShareChip.setContentDescription(mContext.getString(com.android.internal.R.string.share)); mShareChip.setContentDescription(mContext.getString(R.string.screenshot_share_description));
mShareChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_share), true); mShareChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_share), true);
mShareChip.setOnClickListener(v -> { mShareChip.setOnClickListener(v -> {
mShareChip.setIsPending(true); mShareChip.setIsPending(true);
@@ -633,7 +633,7 @@ public class ScreenshotView extends FrameLayout implements
}); });
chips.add(mShareChip); chips.add(mShareChip);
mEditChip.setContentDescription(mContext.getString(R.string.screenshot_edit_label)); mEditChip.setContentDescription(mContext.getString(R.string.screenshot_edit_description));
mEditChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_edit), true); mEditChip.setIcon(Icon.createWithResource(mContext, R.drawable.ic_screenshot_edit), true);
mEditChip.setOnClickListener(v -> { mEditChip.setOnClickListener(v -> {
mEditChip.setIsPending(true); mEditChip.setIsPending(true);