From 43ebe6806323902ef61ee513468bbca507e0d20e Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Tue, 28 Dec 2021 21:52:24 +0800
Subject: [PATCH] Refine the mobile data selection UI

-Adding the margin for bottom at dialog
-Modify the text color of summay in the list at dialog when device is
dark mode.

Bug: 212396431
Test: build pass and check the dialog UI.
Change-Id: I1ec587fd9d64ad67bbf3479c7931c0a901f572cf
---
 res/layout/select_account_list_item.xml                |  1 -
 res/values-night/styles.xml                            |  2 +-
 res/values/dimens.xml                                  |  4 ++++
 res/values/styles.xml                                  |  1 +
 .../android/settings/sim/SimListDialogFragment.java    | 10 ++++++++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index 716adff824d..2f71338448d 100644
--- a/res/layout/select_account_list_item.xml
+++ b/res/layout/select_account_list_item.xml
@@ -36,6 +36,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/title"
-        android:textColor="?android:attr/textColorSecondary"
         android:layout_alignStart="@id/title" />
 </LinearLayout>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index a388855e8d7..f69c952e5d3 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -28,6 +28,6 @@
     <style name="TextAppearance.SimConfirmDialogList.Summary">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
-        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2468db62bd1..59d59804641 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -456,4 +456,8 @@
     <dimen name="chartview_trapezoid_radius">5dp</dimen>
     <dimen name="chartview_trapezoid_margin_start">1dp</dimen>
     <dimen name="chartview_trapezoid_margin_bottom">2dp</dimen>
+
+    <!-- Sims/Data mobile/Calls/SMS select dialog-->
+    <dimen name="sims_select_margin_bottom">24dp</dimen>
+    <dimen name="sims_select_margin_top">8dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 395a3bc5700..21581cb3a3b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -931,6 +931,7 @@
 
     <style name="TextAppearance.SimConfirmDialogList.Summary">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="SimConfirmDialog.OutlineButton" parent="@android:style/Widget.Material.Button">
diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java
index 629a087b0eb..b5bddb7f92f 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -200,6 +200,16 @@ public class SimListDialogFragment extends SimDialogFragment implements
             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);