From 14cdcfdee91c322c1191f8b202cbd1e4f5e2fe56 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 7 Apr 2021 14:35:39 -0400
Subject: [PATCH] Mark non actionable preferences as non-selectable

Test: navigate the conversations page with switch access enabled
Fixes: 178765656
Change-Id: If5d5dd301e2d95b4aa7512f58a6e1adf01f3dbf0
---
 res/xml/conversation_list_settings.xml                           | 1 +
 .../notification/app/AllConversationsPreferenceController.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/res/xml/conversation_list_settings.xml b/res/xml/conversation_list_settings.xml
index 86b4f8164a7..040a9687f7c 100644
--- a/res/xml/conversation_list_settings.xml
+++ b/res/xml/conversation_list_settings.xml
@@ -34,6 +34,7 @@
         settings:allowDividerBelow="true" >
         <Preference
             android:key="behavior"
+            android:selectable="false"
             android:summary="@string/important_conversation_behavior_summary"/>
         <!-- Important conversations added here -->
         <PreferenceCategory
diff --git a/src/com/android/settings/notification/app/AllConversationsPreferenceController.java b/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
index 4b28b111024..03e321bbae1 100644
--- a/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/AllConversationsPreferenceController.java
@@ -55,6 +55,7 @@ public class AllConversationsPreferenceController extends ConversationListPrefer
         Preference pref = new Preference(mContext);
         pref.setOrder(1);
         pref.setSummary(R.string.other_conversations_summary);
+        pref.setSelectable(false);
         return pref;
     }