Merge "Add available description for talkback" into sc-dev
This commit is contained in:
@@ -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>
|
<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] -->
|
<!-- 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>
|
<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
|
<!-- Title to display in a notification when ACTION_BATTERY_CHANGED.EXTRA_PRESENT field is false
|
||||||
[CHAR LIMIT=NONE] -->
|
[CHAR LIMIT=NONE] -->
|
||||||
|
|||||||
@@ -501,6 +501,8 @@ public class PeopleTileViewHelper {
|
|||||||
views.setViewVisibility(R.id.availability, View.VISIBLE);
|
views.setViewVisibility(R.id.availability, View.VISIBLE);
|
||||||
startPadding = mContext.getResources().getDimensionPixelSize(
|
startPadding = mContext.getResources().getDimensionPixelSize(
|
||||||
R.dimen.availability_dot_shown_padding);
|
R.dimen.availability_dot_shown_padding);
|
||||||
|
views.setContentDescription(R.id.availability,
|
||||||
|
mContext.getString(R.string.person_available));
|
||||||
} else {
|
} else {
|
||||||
views.setViewVisibility(R.id.availability, View.GONE);
|
views.setViewVisibility(R.id.availability, View.GONE);
|
||||||
startPadding = mContext.getResources().getDimensionPixelSize(
|
startPadding = mContext.getResources().getDimensionPixelSize(
|
||||||
|
|||||||
@@ -289,6 +289,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase {
|
|||||||
assertEquals(View.GONE, result.findViewById(R.id.last_interaction).getVisibility());
|
assertEquals(View.GONE, result.findViewById(R.id.last_interaction).getVisibility());
|
||||||
// Has availability.
|
// Has availability.
|
||||||
assertEquals(View.VISIBLE, result.findViewById(R.id.availability).getVisibility());
|
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.
|
// Has person icon.
|
||||||
assertEquals(View.VISIBLE, result.findViewById(R.id.person_icon).getVisibility());
|
assertEquals(View.VISIBLE, result.findViewById(R.id.person_icon).getVisibility());
|
||||||
// No status.
|
// No status.
|
||||||
@@ -334,6 +336,8 @@ public class PeopleTileViewHelperTest extends SysuiTestCase {
|
|||||||
assertEquals(View.GONE, largeResult.findViewById(R.id.last_interaction).getVisibility());
|
assertEquals(View.GONE, largeResult.findViewById(R.id.last_interaction).getVisibility());
|
||||||
// Has availability.
|
// Has availability.
|
||||||
assertEquals(View.VISIBLE, largeResult.findViewById(R.id.availability).getVisibility());
|
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.
|
// Shows person icon.
|
||||||
assertEquals(View.VISIBLE, largeResult.findViewById(R.id.person_icon).getVisibility());
|
assertEquals(View.VISIBLE, largeResult.findViewById(R.id.person_icon).getVisibility());
|
||||||
// No status.
|
// No status.
|
||||||
|
|||||||
Reference in New Issue
Block a user