diff options
| author | John Pan <johnpan@google.com> | 2021-12-24 02:25:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-24 02:25:07 +0000 |
| commit | 2d8522dd0e5370eb69e149ae4c24542413fe29e0 (patch) | |
| tree | e18682451260754b4161333543a5e939ad3e8efe | |
| parent | 07c82bb2bc5e40b3efd297e4b8e1aa1c4ac7c531 (diff) | |
| parent | 7f1a37d33575364062809db3ddf8ee8ab30f9f55 (diff) | |
Merge "Fix Talkback announcing null when changing color option" into sc-v2-dev
| -rw-r--r-- | src/com/android/customization/picker/grid/GridFragment.java | 7 | ||||
| -rw-r--r-- | src/com/android/customization/widget/OptionSelectorController.java | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java index 9896edc8..cb04fc39 100644 --- a/src/com/android/customization/picker/grid/GridFragment.java +++ b/src/com/android/customization/picker/grid/GridFragment.java @@ -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); diff --git a/src/com/android/customization/widget/OptionSelectorController.java b/src/com/android/customization/widget/OptionSelectorController.java index 0f1b6a66..952bc555 100644 --- a/src/com/android/customization/widget/OptionSelectorController.java +++ b/src/com/android/customization/widget/OptionSelectorController.java @@ -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)) { |