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

Commit 90ed85e8 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Fix screenshot preview accessibility label" into rvc-dev am: ddb33e9d 

Change-Id: I28f9363bf18b4b0c1b8af4a0185c5e8654049bb8
parents 46403d6d ddb33e9d

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

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

+3 −0
Original line number Diff line number Diff line
@@ -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);

        }