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

Commit 2eb57839 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

[MEP] renew the sim confirm dialog UI am: ba9d2669 am: 04424bbf 

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



Change-Id: I3b3b17af236799939a4919c67f123005740e1aa7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 696f538f 04424bbf

AndroidManifest.xml

+4 −4
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="@style/Theme.AlertDialog"/>

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



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

                  android:exported="false"

                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

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

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



        <activity

            android:name="Settings$TetherSettingsActivity"
@@ -4202,14 +4202,14 @@ 
            android:exported="false"

            android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"

            android:launchMode="singleInstance"

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

            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="@style/Theme.AlertDialog"/>

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

    />

res/layout/sim_confirm_dialog_multiple_enabled_profiles_supported.xml

+19 −12
Original line number Diff line number Diff line
@@ -16,42 +16,49 @@ 


<LinearLayout

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

    android:layout_width="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    style="@style/Theme.Material3.DayNight.Dialog.Alert">

    android:orientation="vertical">

        <TextView

            android:id="@+id/msg"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"

            android:paddingEnd="24dp"

            android:paddingTop="16dp"

            android:paddingStart="24dp"

            android:gravity="center"

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

        <ListView

            android:id="@+id/carrier_list"

            android:layout_width="wrap_content"

            android:layout_gravity="center"

            android:paddingTop="16dp"

            android:dividerHeight="1dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <LinearLayout

            android:id="@+id/info_outline_layout"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="56dp"

            android:gravity="start|top"

            android:orientation="horizontal"

            android:paddingEnd="12dp"

            android:paddingEnd="24dp"

            android:paddingTop="16dp"

            android:paddingBottom="4dp"

            android:paddingStart="24dp"

            android:layout_marginBottom="16dp"

            android:baselineAligned="true">

                <ImageView

                    android:src="@drawable/ic_info_outline_24dp"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:tint="?android:attr/textColorTertiary"/>



                <TextView

                    android:id="@+id/info_outline"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:paddingTop="16dp"

                    android:paddingBottom="8dp"

                    android:paddingLeft="16dp"

                    android:text="@string/sim_action_switch_sub_dialog_info_outline_for_turning_off"

                    android:textColor="?android:attr/textColorSecondary" />

                    android:textColor="?android:attr/textColorSecondary"

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

        </LinearLayout>

</LinearLayout>
 
 No newline at end of file