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

Merge "Add available description for talkback" into sc-dev am: 268234b2b9

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

Change-Id: I1292a26715e49d791658b5528c997a13c98863d2
This commit is contained in:
Anna Zappone
2021-07-09 15:55:46 +00:00
committed by Automerger Merge Worker
parent 464385ad2a 268234b2b9
commit e8e93ee57e
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2956,6 +2956,8 @@
<string name="new_notification_image_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> sent an image</string>
<!-- Content description text on the Conversation widget when a person has a new status posted [CHAR LIMIT=150] -->
<string name="new_status_content_description"><xliff:g id="name" example="Anna">%1$s</xliff:g> has a status update: <xliff:g id="status" example="Listening to music">%2$s</xliff:g></string>
<!-- Content description text on the Conversation widget when a person is available, meaning online on an application [CHAR LIMIT=150] -->
<string name="person_available">Available</string>
<!-- Title to display in a notification when ACTION_BATTERY_CHANGED.EXTRA_PRESENT field is false
[CHAR LIMIT=NONE] -->

2
packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java
View File

@@ -501,6 +501,8 @@ public class PeopleTileViewHelper {
views.setViewVisibility(R.id.availability, View.VISIBLE);
startPadding = mContext.getResources().getDimensionPixelSize(
R.dimen.availability_dot_shown_padding);
views.setContentDescription(R.id.availability,
mContext.getString(R.string.person_available));
} else {
views.setViewVisibility(R.id.availability, View.GONE);
startPadding = mContext.getResources().getDimensionPixelSize(

4
packages/SystemUI/tests/src/com/android/systemui/people/PeopleTileViewHelperTest.java
View File

@@ -289,6 +289,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase {
assertEquals(View.GONE, result.findViewById(R.id.last_interaction).getVisibility());
// Has availability.
assertEquals(View.VISIBLE, result.findViewById(R.id.availability).getVisibility());
assertEquals(result.findViewById(R.id.availability).getContentDescription(),
mContext.getString(R.string.person_available));
// Has person icon.
assertEquals(View.VISIBLE, result.findViewById(R.id.person_icon).getVisibility());
// No status.
@@ -334,6 +336,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase {
assertEquals(View.GONE, largeResult.findViewById(R.id.last_interaction).getVisibility());
// Has availability.
assertEquals(View.VISIBLE, largeResult.findViewById(R.id.availability).getVisibility());
assertEquals(largeResult.findViewById(R.id.availability).getContentDescription(),
mContext.getString(R.string.person_available));
// Shows person icon.
assertEquals(View.VISIBLE, largeResult.findViewById(R.id.person_icon).getVisibility());
// No status.