From 91fd88a51939ab3e82bcc0b00e0b4ba88a56bb5f Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Sun, 1 May 2022 09:26:27 +0800
Subject: [PATCH] Fix first item not a11y focusable in SimListDialog

The root cause is there is a logic to get LayoutParams from parent, but
set to child, which cause some chaos.

This dialog can be started with
`adb shell am start -n com.android.settings/.sim.SimDialogActivity --ei
dialog_type 0`

Bug: 227418839
Test: manual test when Talkback enabled
Change-Id: Ia1014dea49cb5cf372afe5bb50972277309c7f63
---
 ...firm_dialog_multiple_enabled_profiles_supported.xml |  2 ++
 .../android/settings/sim/SimListDialogFragment.java    | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml b/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml
index 081efb31c0a..74c8226122b 100644
--- a/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml
+++ b/res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml
@@ -38,6 +38,8 @@
             android:background="@drawable/sim_confirm_dialog_rounded_bg"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/sims_select_margin_top"
+            android:layout_marginBottom="@dimen/sims_select_margin_bottom"
             android:visibility="gone"/>
 
         <LinearLayout
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 166d00a10fe..06b116c77cb 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -216,16 +216,6 @@ public class SimListDialogFragment extends SimDialogFragment {
             final TextView title = convertView.findViewById(R.id.title);
             final TextView summary = convertView.findViewById(R.id.summary);
 
-            ViewGroup.MarginLayoutParams lp =
-                    (ViewGroup.MarginLayoutParams) parent.getLayoutParams();
-            if (lp != null) {
-                lp.setMargins(0, mContext.getResources().getDimensionPixelSize(
-                        R.dimen.sims_select_margin_top), 0,
-                        mContext.getResources().getDimensionPixelSize(
-                                R.dimen.sims_select_margin_bottom));
-                convertView.setLayoutParams(lp);
-            }
-
             if (sub == null) {
                 if (position == 0) {
                     title.setText(R.string.sim_calls_ask_first_prefs_title);