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

Commit 3e9e489c authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... 

* changes:
  [MEP] sort the simSlotMapping by logcal slot id
  In E+E, the user can't enable the PSIM
  [MEP] psim's logical slot index is 0
  [MEP] The condition of "null point check" is wrong
  Fix the settings crash when SimDialogActivity is null
  [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId
  [MEP] the port id is wrong
  [MEP] Inserting a pSIM while user has 2 esims, showing the MEP dialog
  [MEP] Refactor SlotSidecar API for all of sim page.
  [MEP]The Esim's PhysicalSlotIndex is wrong
  Lost code for setting the list as visible
  The list does not follow the UX dialog design doc in alert dialog.
  The carrier name is wrong in the dialog
  Refine the mobile data selection UI
parents 3f830cc6 ef80331f

res/layout/select_account_list_item.xml

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/listPreferredItemHeightSmall"

    android:background="@drawable/sim_confirm_dialog_rounded_bg"

    android:gravity="center">

    <TextView android:id="@+id/title"

        android:textAppearance="@style/TextAppearance.SimConfirmDialogList"
@@ -36,6 +35,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/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,6 +25,5 @@ 
    android:paddingBottom="?attr/listPreferredItemPaddingEnd"

    android:paddingLeft="?attr/listPreferredItemPaddingLeft"

    android:paddingRight="?attr/listPreferredItemPaddingRight"

    android:background="@drawable/sim_confirm_dialog_rounded_bg"

    android:textAppearance="@style/TextAppearance.SimConfirmDialogList"

    />

res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml

+10 −5
Original line number Diff line number Diff line
@@ -26,15 +26,19 @@ 
            android:paddingEnd="24dp"

            android:paddingTop="16dp"

            android:paddingStart="24dp"

            android:paddingBottom="32dp"

            android:gravity="center"

            android:textAppearance="@style/TextAppearance.DialogMessage"/>

            android:textAppearance="@style/TextAppearance.DialogMessage"

            android:visibility="gone"/>

        <ListView

            android:id="@+id/carrier_list"

            android:layout_gravity="center"

            android:paddingTop="16dp"

            android:dividerHeight="1dp"

            android:divider="?android:attr/colorBackgroundFloating"

            android:dividerHeight="4dp"

            android:background="@drawable/sim_confirm_dialog_rounded_bg"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"

            android:visibility="gone"/>



        <LinearLayout

            android:id="@+id/info_outline_layout"
@@ -46,7 +50,8 @@ 
            android:paddingTop="16dp"

            android:paddingStart="24dp"

            android:layout_marginBottom="16dp"

            android:baselineAligned="true">

            android:baselineAligned="true"

            android:visibility="gone">

                <ImageView

                    android:src="@drawable/ic_info_outline_24dp"

                    android:layout_width="wrap_content"

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-night/themes.xml

+0 −6
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 
        <item name="android:colorBackground">@*android:color/surface_dark</item>

    </style>



    <style name="Theme.AlertDialog.Base.Material3" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">

        <item name="colorPrimary">@*android:color/primary_device_default_settings</item>

        <item name="colorAccent">@*android:color/accent_device_default_dark</item>

        <item name="android:colorBackground">@*android:color/surface_dark</item>

    </style>



    <!-- Material theme for the pages containing TabLayout and ViewPager -->

    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">

        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>