From e9f6efa2b6630d07534551ae8cf38d8d9cec0578 Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Wed, 12 Apr 2023 13:19:31 +0000
Subject: [PATCH] [Settings] Fix the layout index

The index of language label's layout is 0 and index of num layout is 1, so the select tp speak will read the language label first.
The root cause of the incorrect index is, the language label's layout starts with the parent layout instead of the num layout in the hierarchy view. Adjust the language label's layout and add these views one by one in the parent view.

Also fix the layout's jumping when user switches the page to "Remove language"

Bug: 277173513
Test: local test
Change-Id: I0d5879a07183713fa50b38f6321a15dd32582518
---
 res/layout/locale_drag_cell.xml               | 43 +++++++++++--------
 res/values/styles.xml                         |  3 +-
 .../settings/localepicker/LocaleDragCell.java | 14 +++---
 .../LocaleLinearLayoutManager.java            |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/res/layout/locale_drag_cell.xml b/res/layout/locale_drag_cell.xml
index f5a280b82b9..98fc8dfeb9a 100644
--- a/res/layout/locale_drag_cell.xml
+++ b/res/layout/locale_drag_cell.xml
@@ -26,29 +26,35 @@
     android:layoutDirection="locale"
     android:textDirection="locale">
 
-    <CheckBox
-        android:id="@+id/checkbox"
-        style="@style/LanguageCheckboxAndLabel"
-        android:paddingStart="24dp"
-        android:layout_toStartOf="@+id/dragHandle"
-        android:layout_alignTop="@+id/miniLabel"
-        android:layout_alignBottom="@+id/miniLabel" />
-
-    <TextView
-        android:id="@+id/miniLabel"
-        style="@style/LanguageCheckboxAndLabel"
+    <LinearLayout
+        android:id="@+id/numberLayout"
         android:layout_width="wrap_content"
-        android:textColor="?android:attr/colorAccent"
-        android:minWidth="24sp"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
         android:gravity="center_vertical|center_horizontal"
-        android:layout_centerVertical="true"/>
+        android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+        <CheckBox
+            android:id="@+id/checkbox"
+            style="@style/LanguageCheckboxAndLabel"
+            android:layout_marginRight="0dp"
+            android:minWidth="24dp"
+            android:paddingEnd="-8dp"/>
+
+        <TextView
+            android:id="@+id/miniLabel"
+            style="@style/LanguageCheckboxAndLabel"
+            android:textColor="?android:attr/colorAccent"
+            android:minWidth="24dp"
+            android:gravity="center_vertical|center_horizontal"/>
+    </LinearLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="?android:listPreferredItemHeight"
-        android:paddingStart="56dp"
-        android:layout_toStartOf="@+id/dragHandle">
+        android:layout_toStartOf="@+id/dragHandle"
+        android:layout_toEndOf="@+id/numberLayout"
+        android:paddingStart="32dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -59,7 +65,7 @@
             app:layout_constraintBottom_toBottomOf="parent">
             <TextView
                 android:id="@+id/label"
-                style="@style/LanguageCheckboxAndLabel" />
+                style="@style/LanguageCheckboxAndLabel"/>
 
             <TextView
                 android:id="@+id/l10nWarn"
@@ -86,7 +92,6 @@
         android:layout_height="match_parent"
         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:layout_gravity="center_vertical"
         android:src="@drawable/drag_handle"
         android:importantForAccessibility="no"
         android:layout_alignParentEnd="true"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5663e40aaf8..5618ed185c5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -319,9 +319,8 @@
     </style>
 
     <style name="LanguageCheckboxAndLabel">
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">?android:attr/listPreferredItemPaddingStart</item>
         <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
         <item name="android:gravity">center_vertical</item>
     </style>
diff --git a/src/com/android/settings/localepicker/LocaleDragCell.java b/src/com/android/settings/localepicker/LocaleDragCell.java
index 2f4cfefefb1..d0b7cfb152e 100644
--- a/src/com/android/settings/localepicker/LocaleDragCell.java
+++ b/src/com/android/settings/localepicker/LocaleDragCell.java
@@ -63,13 +63,7 @@ class LocaleDragCell extends RelativeLayout {
 
     public void setShowCheckbox(boolean showCheckbox) {
         // "Opposite" visibility for label / checkbox
-        if (showCheckbox) {
-            mCheckbox.setVisibility(VISIBLE);
-            mLabel.setVisibility(INVISIBLE);
-        } else {
-            mCheckbox.setVisibility(INVISIBLE);
-            mLabel.setVisibility(VISIBLE);
-        }
+        mCheckbox.setVisibility(showCheckbox ? VISIBLE : GONE);
         invalidate();
         requestLayout();
     }
@@ -91,9 +85,7 @@ class LocaleDragCell extends RelativeLayout {
 
     public void setLabelAndDescription(String labelText, String description) {
         mLabel.setText(labelText);
-        mCheckbox.setText(labelText);
         mLabel.setContentDescription(description);
-        mCheckbox.setContentDescription(description);
         invalidate();
     }
 
@@ -114,6 +106,10 @@ class LocaleDragCell extends RelativeLayout {
         return mDragHandle;
     }
 
+    public TextView getLabelView() {
+        return mLabel;
+    }
+
     public CheckBox getCheckbox() {
         return mCheckbox;
     }
diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
index 5fb9440e014..8795bf97e70 100644
--- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
+++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
@@ -86,7 +86,7 @@ public class LocaleLinearLayoutManager extends LinearLayoutManager {
         // any language can handle it. And we want the position to be part of it.
         // So we use something like "2, French (France)"
         final String description =
-                (position + 1) + ", " + dragCell.getCheckbox().getContentDescription();
+                (position + 1) + ", " + dragCell.getLabelView().getContentDescription();
         info.setContentDescription(description);
 
         if (mAdapter.isRemoveMode()) { // We don't move things around in remove mode