Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63d3de8c authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Clarify screenshot content descriptions 

The accessibility descriptions are unclear since they just say
"share" or "edit"; update to say "share screenshot"/"edit
screenshot".

Bug: 200960886
Fix: 200960886
Test: manual (with talkback on)

Change-Id: I544f5db062b717e637f215984532c8f81f0c7eb1
Merged-In: I544f5db062b717e637f215984532c8f81f0c7eb1
parent b9ee2b5e

packages/SystemUI/res/layout/global_screenshot_static.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:elevation="@dimen/screenshot_preview_elevation"

        android:contentDescription="@string/screenshot_edit_label"

        android:contentDescription="@string/screenshot_edit_description"

        android:scaleType="fitEnd"

        android:background="@drawable/screenshot_preview_background"

        android:adjustViewBounds="true"

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ 
    <string name="screenshot_edit_label">Edit</string>

    <!-- Content description indicating that tapping the element will allow editing the screenshot [CHAR LIMIT=NONE] -->

    <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] -->

    <string name="screenshot_scroll_label">Capture more</string>

    <!-- Content description indicating that tapping a button will dismiss the screenshots UI [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

+2 −2
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ public class ScreenshotView extends FrameLayout implements 


        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.setOnClickListener(v -> {

            mShareChip.setIsPending(true);
@@ -633,7 +633,7 @@ public class ScreenshotView extends FrameLayout implements 
        });

        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.setOnClickListener(v -> {

            mEditChip.setIsPending(true);