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

Commit 31c40b00 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... 

* changes:
  [MEP] disable enabled esim profile before set simSlotMapping
  [MEP] renew the sim confirm dialog UI
  [MEP] renew the default data selection UI
  switch SIM refactor to support MEP
  switch SIM refactor to support MEP
  Support RTL mode in Sim switch dialog
parents 7ba3e20a eaec0595

AndroidManifest.xml

+5 −5
Original line number Diff line number Diff line
@@ -690,12 +690,12 @@ 
        <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"

                  android:exported="false"

                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />

                  android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>



        <activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"

                  android:exported="false"

                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />

                  android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>



        <activity

            android:name="Settings$TetherSettingsActivity"
@@ -3370,7 +3370,7 @@ 


        <activity

            android:name=".sim.SimDialogActivity"

            android:theme="@style/Theme.AlertDialog"

            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"

            android:label="@string/sim_settings_title"

            android:launchMode="singleTop"

            android:exported="true"
@@ -4202,14 +4202,14 @@ 
            android:exported="false"

            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

            android:launchMode="singleInstance"

            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />

            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>



        <activity

            android:name=".sim.DsdsDialogActivity"

            android:exported="false"

            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

            android:launchMode="singleInstance"

            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight" />

            android:theme="@style/Theme.AlertDialog.SimConfirmDialog"/>



        <service android:name=".sim.SimNotificationService"

                 android:permission="android.permission.BIND_JOB_SERVICE" />

res/drawable/sim_confirm_dialog_btn_outline.xml

0 → 100644
+41 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<inset xmlns:android="http://schemas.android.com/apk/res/android"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:insetTop="16dp"

       android:insetBottom="24dp">

    <ripple android:color="?android:attr/colorControlHighlight">

        <item android:id="@android:id/mask">

            <shape android:shape="rectangle">

                <solid android:color="@android:color/white"/>

                <corners android:radius="24dp"/>

            </shape>

        </item>

        <item>

            <shape android:shape="rectangle">

                <corners android:radius="24dp"/>

                <solid android:color="@android:color/transparent"/>

                <stroke android:color="?androidprv:attr/colorAccentPrimaryVariant"

                        android:width="1dp" />

                <padding android:left="16dp"

                         android:top="8dp"

                         android:right="16dp"

                         android:bottom="8dp"/>

            </shape>

        </item>

    </ripple>

</inset>

res/drawable/sim_confirm_dialog_rounded_bg.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<inset xmlns:android="http://schemas.android.com/apk/res/android"

    android:insetLeft="24dp"

    android:insetRight="24dp">

    <shape xmlns:android="http://schemas.android.com/apk/res/android"

           android:shape="rectangle">

        <solid android:color="@color/settingslib_state_on_color"/>

        <corners

            android:bottomLeftRadius="8dp"

            android:topLeftRadius="8dp"

            android:bottomRightRadius="8dp"

            android:topRightRadius="8dp"

            />

    </shape>

</inset>

res/layout/select_account_list_item.xml

+19 −35
Original line number Diff line number Diff line
@@ -15,43 +15,27 @@ 
-->



<!-- Layout of a single item for displaying sim cards. -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground" >



    <ImageView android:id="@+id/icon"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center" />



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

        android:layout_marginStart="15dip"

        android:layout_marginEnd="6dip"

        android:layout_marginTop="6dip"

        android:layout_marginBottom="6dip"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

        android:layout_width="0dp"

        android:layout_weight="1" >

    android:minHeight="?attr/listPreferredItemHeightSmall"

    android:background="@drawable/sim_confirm_dialog_rounded_bg"

    android:gravity="center">

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

            android:textAppearance="?android:attr/textAppearanceLarge"

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

        android:gravity="start|center_vertical"

            android:layout_marginLeft="8dp"

            android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:fadingEdge="horizontal" />

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

            android:textAppearance="?android:attr/textAppearanceSmall"

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

        android:gravity="start|center_vertical"

            android:layout_marginLeft="8dp"

            android:layout_width="match_parent"

        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>
 
</LinearLayout>

res/layout/sim_confirm_dialog_item_multiple_enabled_profiles_supported.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/title"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/listPreferredItemHeightSmall"

    style="?attr/materialAlertDialogBodyTextStyle"

    android:gravity="center"

    android:paddingTop="?attr/listPreferredItemPaddingStart"

    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"

    />