Refine the mobile data selection UI am: 964c7d5eaf am: d4b95990e9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063556

Change-Id: I00831568c5e8f24676fe640ec7f1756d30a41efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
index 716adff..2f71338 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 a388855..f69c952 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 244f0fd..4f3d407 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -441,4 +441,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 afa13a1..838d63b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -919,6 +919,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 629a087..b5bddb7 100644
--- a/src/com/android/settings/sim/SimListDialogFragment.java
+++ b/src/com/android/settings/sim/SimListDialogFragment.java
@@ -200,6 +200,16 @@
             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);