Merge "Aggregation checkbox and locale text" into main

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"

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);
     }