Loading packages/SettingsLib/res/values/arrays.xml +4 −2 Original line number Diff line number Diff line Loading @@ -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 --> Loading packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +1 −1 Original line number Diff line number Diff line Loading @@ -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( Loading Loading
packages/SettingsLib/res/values/arrays.xml +4 −2 Original line number Diff line number Diff line Loading @@ -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 --> Loading
packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java +1 −1 Original line number Diff line number Diff line Loading @@ -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( Loading