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

Commit 93ac02f6 authored by John Pan's avatar John Pan Committed by Automerger Merge Worker
Browse files

Merge "Fix Talkback announcing null when changing color option" into sc-v2-dev... 

Merge "Fix Talkback announcing null when changing color option" into sc-v2-dev am: 2d8522dd am: cdb496f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/16489046

Change-Id: Ibdf01a749db0a2a4df379626da29bc1ae3a71c01
parents 50dc17a2 cdb496f4

src/com/android/customization/picker/grid/GridFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -214,6 +214,13 @@ public class GridFragment extends AppbarFragment { 
                restoreBottomActionBarVisibility();



                mOptionsController.addListener(selectedOption -> {

                    String title = selectedOption.getTitle();

                    int stringId = R.string.option_previewed_description;

                    if (selectedOption.isActive(mGridManager)) {

                        stringId = R.string.option_applied_previewed_description;

                    }

                    CharSequence cd = getContext().getString(stringId, title);

                    mOptionsContainer.announceForAccessibility(cd);

                    onOptionSelected(selectedOption);

                    mBottomActionBar.show();

                    mGridOptionViewModel.setBottomActionBarVisible(true);

src/com/android/customization/widget/OptionSelectorController.java

+1 −10
Original line number Diff line number Diff line
@@ -194,16 +194,7 @@ public class OptionSelectorController<T extends CustomizationOption<T>> { 
                }

                holder.itemView.setActivated(option.equals(mSelectedOption));

                option.bindThumbnailTile(holder.tileView);

                holder.itemView.setOnClickListener(view -> {

                    setSelectedOption(option);

                    String title = option.getTitle();

                    int stringId = R.string.option_previewed_description;

                    if (mSelectedOption.equals(mAppliedOption)) {

                        stringId = R.string.option_applied_previewed_description;

                    }

                    CharSequence cd = holder.itemView.getContext().getString(stringId, title);

                    view.announceForAccessibility(cd);

                });

                holder.itemView.setOnClickListener(view -> setSelectedOption(option));



                Resources res = mContainer.getContext().getResources();

                if (mCheckmarkStyle == CheckmarkStyle.CORNER && option.equals(mAppliedOption)) {