From 94ffc288bd19b82135fbfecb18e11352f06337fb Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 1 Jul 2021 14:08:39 -0400
Subject: [PATCH] Move selectability to switch from container

To better work with SwitchAcccess

Test: manual with Switch Access (with labels on) and Talkback
Fixes: 189074205
Change-Id: Iafbc4eca9bce8c979ec16a743509b46727cd9eb6
---
 .../applications/manageapplications/ApplicationViewHolder.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index 5dd1e43b77c..9ef66010070 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -159,6 +159,9 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
         if (mSwitch != null && mWidgetContainer != null) {
             mWidgetContainer.setOnClickListener(listener);
             mWidgetContainer.setFocusable(false);
+            mWidgetContainer.setClickable(false);
+            mSwitch.setFocusable(true);
+            mSwitch.setClickable(true);
             mSwitch.setChecked(checked);
             mSwitch.setEnabled(enabled);
         }