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

Merge "Fix screenshot preview accessibility label" into rvc-dev am: ddb33e9daf am: 90ed85e82c am: 1890a058c6

Browse Source 
Change-Id: I7019f50e2a53f09d460d55a4a0fcac53b23750dc
This commit is contained in:
Miranda Kephart
2020-04-14 15:57:35 +00:00
committed by Automerger Merge Worker
parent c33dac62a7 1890a058c6
commit eef5cb87c4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -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);
}