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

Commit 2d8522dd authored by John Pan's avatar John Pan Committed by Android (Google) Code Review
Browse files

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

parents 07c82bb2 7f1a37d3

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

+7 −0
Original line number Diff line number Diff line
@@ -212,6 +212,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)) {