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

Merge "a11y: Make images optional for single choice list view dialog" into main

Browse Source
This commit is contained in:
Yongshun Liu
2025-01-16 15:07:19 -08:00
committed by Android (Google) Code Review
parent c29bde48a7 09b11ff3d3
commit c0e9a84e85
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/accessibility/ItemInfoArrayAdapter.java
View File

@@ -60,12 +60,17 @@ public class ItemInfoArrayAdapter<T extends ItemInfoArrayAdapter.ItemInfo> exten
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 class ItemInfoArrayAdapter<T extends ItemInfoArrayAdapter.ItemInfo> exten
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;