commit b7be65141706bccf5603806dff0ef35225895112
author Santiago Etchebehere <santie@google.com> Wed May 08 17:23:55 2019 -0700
committer Santiago Etchebehere <santie@google.com> Wed May 08 17:24:16 2019 -0700
tree fdce0ed88c56d1b23a798fe78155e5b55ee4c39b
parent 58a79f2a0c5712351a37922d122090f1f7fe8534

Fix crash when clicking color options

If there's no label for an option, don't try and set its
content description

Fixes: 132291556
Change-Id: Ib194ab84e6f0cba0d643af070c330178b81f6fe8

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

diff --git a/src/com/android/customization/widget/OptionSelectorController.java b/src/com/android/customization/widget/OptionSelectorController.java
index 9725995..06b1e0c 100644
--- a/src/com/android/customization/widget/OptionSelectorController.java
+++ b/src/com/android/customization/widget/OptionSelectorController.java
@@ -125,23 +125,26 @@
 
             if (holder instanceof TileViewHolder) {
                 TileViewHolder tileHolder = (TileViewHolder) holder;
-                if (isActivated) {
-                    if (option == mAppliedOption) {
+                if (tileHolder.labelView != null) {
+                    if (isActivated) {
+                        if (option == mAppliedOption) {
+                            CharSequence cd = mContainer.getContext().getString(
+                                    R.string.option_applied_previewed_description,
+                                    option.getTitle());
+                            tileHolder.labelView.setContentDescription(cd);
+                        } else {
+                            CharSequence cd = mContainer.getContext().getString(
+                                    R.string.option_previewed_description, option.getTitle());
+                            tileHolder.labelView.setContentDescription(cd);
+                        }
+                    } else if (option == mAppliedOption) {
                         CharSequence cd = mContainer.getContext().getString(
-                                R.string.option_applied_previewed_description, option.getTitle());
+                                R.string.option_applied_description, option.getTitle());
                         tileHolder.labelView.setContentDescription(cd);
                     } else {
-                        CharSequence cd = mContainer.getContext().getString(
-                                R.string.option_previewed_description, option.getTitle());
-                        tileHolder.labelView.setContentDescription(cd);
+                        // Remove content description
+                        tileHolder.labelView.setContentDescription(null);
                     }
-                } else if (option == mAppliedOption) {
-                    CharSequence cd = mContainer.getContext().getString(
-                            R.string.option_applied_description, option.getTitle());
-                    tileHolder.labelView.setContentDescription(cd);
-                } else {
-                    // Remove content description
-                    tileHolder.labelView.setContentDescription(null);
                 }
             }
         }