From e2ef52d6f1016b4bb243eca1cbed355febd6c7c5 Mon Sep 17 00:00:00 2001 From: Lucas Silva Date: Fri, 29 Apr 2022 16:41:32 -0400 Subject: [PATCH] Update dream settings logic to keep the customize button unselected. Test: manually on device Bug: 227717835 Fixed: 227717835 Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036 --- src/com/android/settings/dream/DreamAdapter.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java index 590b282b25a..cfee12e0f42 100644 --- a/src/com/android/settings/dream/DreamAdapter.java +++ b/src/com/android/settings/dream/DreamAdapter.java @@ -105,11 +105,6 @@ public class DreamAdapter extends RecyclerView.Adapter 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 @@ public class DreamAdapter extends RecyclerView.Adapter 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); }