diff options
| author | 2023-06-20 17:28:40 +0000 | |
|---|---|---|
| committer | 2023-06-20 17:28:40 +0000 | |
| commit | 2115c8adb27e4c438385a1eb42f11a679abf9174 (patch) | |
| tree | 2faac616024502589120e9409c7228407d028cce | |
| parent | 466a35984df6b2d1733a2ed59c4e2412e6285a44 (diff) | |
| parent | 606a92ef3248b4bd508da2e2ec68c20922e0a9e6 (diff) | |
Merge "Fix crash opening avatar picker in non-en-US locale." into udc-dev am: 0f3d66a93a am: 606a92ef32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23709963
Change-Id: If0ab7afd9c966508be9485328b48e56dbe7940a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsLib/res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 3e2b800d5a2c..3adb882bc1b1 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -643,8 +643,10 @@ array must also be populated with a content description for each image. --> <array name="avatar_images"/> - <!-- Content descriptions for each of the images in the avatar_images array. --> - <string-array name="avatar_image_descriptions"/> + <!-- Content descriptions for each of the images in the avatar_images array. When overlaid + these values should be translated, but this empty array must not be translated or it may + replace the real descriptions with an empty array. --> + <string-array name="avatar_image_descriptions" translatable="false"/> <!-- NOTE: if you change this, you must also add the corresponding scale key and lookup table to frameworks/base/core/java/android/content/res/FontScaleConverterFactory.java --> diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java index bcbd1caa45d3..848b177c821f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java @@ -243,7 +243,7 @@ public class AvatarPickerActivity extends Activity { int index = indexFromPosition(position); viewHolder.setSelected(position == mSelectedPosition); viewHolder.setDrawable(mImageDrawables.get(index)); - if (mImageDescriptions != null) { + if (mImageDescriptions != null && index < mImageDescriptions.size()) { viewHolder.setContentDescription(mImageDescriptions.get(index)); } else { viewHolder.setContentDescription(getString( |