From 05e824e9e09a3087e65e2e4953994b9052269502 Mon Sep 17 00:00:00 2001
From: Victor Truong <truongvi@google.com>
Date: Thu, 14 Apr 2022 17:38:26 +0000
Subject: [PATCH] Set Active dream to not be clickable when active.

Setting Active dream to not be clickable to stop Talkback from prompting
user to "Double tap to activate".

Bug: 228573813
Test: Manually tested on device.
Change-Id: I5f646bcf82d8c4172127f0739b6c0d7af890dabb
---
 src/com/android/settings/dream/DreamAdapter.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java
index c595c099286..590b282b25a 100644
--- a/src/com/android/settings/dream/DreamAdapter.java
+++ b/src/com/android/settings/dream/DreamAdapter.java
@@ -105,13 +105,6 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             icon.setBounds(0, 0, iconSize, iconSize);
             mTitleView.setCompoundDrawablesRelative(icon, null, null, null);
 
-            if (item.isActive()) {
-                mLastSelectedPos = position;
-                itemView.setSelected(true);
-            } else {
-                itemView.setSelected(false);
-            }
-
             mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked());
             mCustomizeButton.setVisibility(
                     item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE);
@@ -125,6 +118,15 @@ public class DreamAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 notifyItemChanged(position);
             });
 
+            if (item.isActive()) {
+                mLastSelectedPos = position;
+                itemView.setSelected(true);
+                itemView.setClickable(false);
+            } else {
+                itemView.setSelected(false);
+                itemView.setClickable(true);
+            }
+
             setEnabledStateOnViews(itemView, mEnabled);
         }