Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6078f5fd authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Fix crash opening avatar picker in non-en-US locale." into udc-dev am: 0f3d66a9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23709963



Change-Id: I39e08d11de5980750d5c2f7e5e179de5b0a11a37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e458084 0f3d66a9

packages/SettingsLib/res/values/arrays.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -643,8 +643,10 @@ 
         array must also be populated with a content description for each image. -->

         array must also be populated with a content description for each image. -->

    <array name="avatar_images"/>

    <array name="avatar_images"/>





    <!-- Content descriptions for each of the images in the avatar_images array. -->

    <!-- Content descriptions for each of the images in the avatar_images array. When overlaid

    <string-array name="avatar_image_descriptions"/>

         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

    <!-- 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 -->

     frameworks/base/core/java/android/content/res/FontScaleConverterFactory.java -->

packages/SettingsLib/src/com/android/settingslib/users/AvatarPickerActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ public class AvatarPickerActivity extends Activity { 
                int index = indexFromPosition(position);

                int index = indexFromPosition(position);

                viewHolder.setSelected(position == mSelectedPosition);

                viewHolder.setSelected(position == mSelectedPosition);

                viewHolder.setDrawable(mImageDrawables.get(index));

                viewHolder.setDrawable(mImageDrawables.get(index));

                if (mImageDescriptions != null) {

                if (mImageDescriptions != null && index < mImageDescriptions.size()) {

                    viewHolder.setContentDescription(mImageDescriptions.get(index));

                    viewHolder.setContentDescription(mImageDescriptions.get(index));

                } else {

                } else {

                    viewHolder.setContentDescription(getString(

                    viewHolder.setContentDescription(getString(