Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b906d56 authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Refine the mobile data selection UI"

parents 1ee60270 43ebe680

res/layout/select_account_list_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

res/values-night/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -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">

src/com/android/settings/sim/SimListDialogFragment.java

+10 −0
Original line number Diff line number Diff line
@@ -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);