PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add content description to suggestion card close button."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-13 11:07:11 +00:00
committed by Android (Google) Code Review
parent b5e283f6c1 98a6b74291
commit 44935e8602
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/suggestion_tile.xml
View File

@@ -52,6 +52,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:contentDescription="@string/dlg_close"
android:src="@drawable/ic_suggestion_close_button"/> android:src="@drawable/ic_suggestion_close_button"/>
</RelativeLayout> </RelativeLayout>

1
res/layout/suggestion_tile_with_button.xml
View File

@@ -52,6 +52,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:contentDescription="@string/dlg_close"
android:src="@drawable/ic_suggestion_close_button"/> android:src="@drawable/ic_suggestion_close_button"/>
</RelativeLayout> </RelativeLayout>

13
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
View File

@@ -294,6 +294,19 @@ public class SuggestionAdapterTest {
verify(drawable).setTint(colorAccent); verify(drawable).setTint(colorAccent);
} }
@Test
public void onBindViewHolder_closeButtonShouldHaveContentDescription()
throws PendingIntent.CanceledException {
final List<Suggestion> suggestions = makeSuggestions("pkg1");
setupSuggestions(mActivity, suggestions);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
assertThat(
mSuggestionHolder.itemView.findViewById(R.id.close_button).getContentDescription())
.isNotNull();
}
@Test @Test
public void setCardLayout_oneCard_shouldSetCardWidthToMatchParent() { public void setCardLayout_oneCard_shouldSetCardWidthToMatchParent() {
final List<Suggestion> suggestions = makeSuggestions("pkg1"); final List<Suggestion> suggestions = makeSuggestions("pkg1");