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

Commit dc6ad978 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Clarify screenshot content descriptions"

parents 01198df3 68cbaa47

packages/SystemUI/res/layout/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

+3 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ 
    <!-- Label for UI element which allows editing the screenshot [CHAR LIMIT=30] -->

    <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
@@ -622,7 +622,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);
@@ -634,7 +634,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);