Merge "a11y: Make images optional for single choice list view dialog" into main
diff --git a/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java b/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
index a7c4177..285a52b 100644
--- a/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
+++ b/src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
@@ -60,12 +60,17 @@
summary.setVisibility(View.GONE);
}
final ImageView image = root.findViewById(R.id.image);
- image.setImageResource(item.mDrawableId);
- if (getContext().getResources().getConfiguration().getLayoutDirection()
- == View.LAYOUT_DIRECTION_LTR) {
- image.setScaleType(ImageView.ScaleType.FIT_START);
+ if (item.mDrawableId == null) {
+ image.setVisibility(View.GONE);
} else {
- image.setScaleType(ImageView.ScaleType.FIT_END);
+ image.setVisibility(View.VISIBLE);
+ image.setImageResource(item.mDrawableId);
+ if (getContext().getResources().getConfiguration().getLayoutDirection()
+ == View.LAYOUT_DIRECTION_LTR) {
+ image.setScaleType(ImageView.ScaleType.FIT_START);
+ } else {
+ image.setScaleType(ImageView.ScaleType.FIT_END);
+ }
}
return root;
}
@@ -78,11 +83,12 @@
public final CharSequence mTitle;
@Nullable
public final CharSequence mSummary;
+ @Nullable
@DrawableRes
- public final int mDrawableId;
+ public final Integer mDrawableId;
public ItemInfo(@NonNull CharSequence title, @Nullable CharSequence summary,
- @DrawableRes int drawableId) {
+ @Nullable @DrawableRes Integer drawableId) {
mTitle = title;
mSummary = summary;
mDrawableId = drawableId;