From 3c38a1234737f1a1dd2e7cc5edfc59c80d27237c Mon Sep 17 00:00:00 2001
From: Josh Hou <joshhou@google.com>
Date: Tue, 26 Mar 2024 02:42:38 +0000
Subject: [PATCH] Aggregation checkbox and locale text

Refer to other settings with the checkbox to read the checkbox and corresponding text together, such as "Erase SIMs" or "Show password" in WiFi settings.

Bug: 288223637
Bug: 317927064
Test: Perform some accessibility test like TalkBack and Select to Speak
Change-Id: I571fe3f2f8d7b6b4f4c7b5804d0217a2a2b97757
---
 res/layout/locale_drag_cell.xml                        |  4 +++-
 .../localepicker/LocaleDragAndDropAdapter.java         | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/layout/locale_drag_cell.xml b/res/layout/locale_drag_cell.xml
index 98fc8dfeb9a..c3c46bc5bd3 100644
--- a/res/layout/locale_drag_cell.xml
+++ b/res/layout/locale_drag_cell.xml
@@ -38,7 +38,9 @@
             style="@style/LanguageCheckboxAndLabel"
             android:layout_marginRight="0dp"
             android:minWidth="24dp"
-            android:paddingEnd="-8dp"/>
+            android:paddingEnd="-8dp"
+            android:clickable="false"
+            android:focusable="false"/>
 
         <TextView
             android:id="@+id/miniLabel"
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index 24d992756ee..8d60ef2df3a 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -27,6 +27,7 @@ import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -189,6 +190,13 @@ class LocaleDragAndDropAdapter
                 setCheckBoxDescription(dragCell, checkbox, isChecked);
             }
         });
+
+        dragCell.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkbox.toggle();
+            }
+        });
     }
 
     @VisibleForTesting
@@ -200,8 +208,6 @@ class LocaleDragAndDropAdapter
         CharSequence checkedStatus = mContext.getText(
                 isChecked ? com.android.internal.R.string.checked
                         : com.android.internal.R.string.not_checked);
-        // Talkback
-        dragCell.setStateDescription(checkedStatus);
         // Select to Speak
         checkbox.setContentDescription(checkedStatus);
     }