commit dc44eb1feb538de27f04f83c39ee7b4a4c89ba44
author Lucas Silva <lusilva@google.com> Mon May 02 14:19:22 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 14:19:22 2022 +0000
tree d4e2ec323d68de4f14ba5f467eb1741654432ea2
parent 8f463f5c88cc5fbc69891c0bd4d2173bb00c64cc
parent e2ef52d6f1016b4bb243eca1cbed355febd6c7c5

Merge "Update dream settings logic to keep the customize button unselected." into tm-dev

src/com/android/settings/dream/DreamAdapter.java

diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java
index 590b282..cfee12e 100644
--- a/src/com/android/settings/dream/DreamAdapter.java
+++ b/src/com/android/settings/dream/DreamAdapter.java
@@ -105,11 +105,6 @@
             icon.setBounds(0, 0, iconSize, iconSize);
             mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
 
-            mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
-            mCustomizeButton.setVisibility(
-                    item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
-            mCustomizeButton.setSelected(false);
-
             itemView.setOnClickListener(v -> {
                 item.onItemClicked();
                 if (mLastSelectedPos > -1 && mLastSelectedPos != position) {
@@ -127,6 +122,13 @@
                 itemView.setClickable(true);
             }
 
+            mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
+            mCustomizeButton.setVisibility(
+                    item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
+            // This must be called AFTER itemView.setSelected above, in order to keep the
+            // customize button in an unselected state.
+            mCustomizeButton.setSelected(false);
+
             setEnabledStateOnViews(itemView, mEnabled);
         }