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

Commit 0caad2f3 authored by Qingxi Li's avatar Qingxi Li
Browse files

Add checkbox for erase esim under network reset screen 

This CL add a checkbox letting user decide when they reset the network
configurations under System > Reset options > Reset Wi-Fi, mobile &
Bluetooth, whether they want to reset eSIM together or not. If the user
choose to reset eSIM togather, EuiccManager#eraseSubscriptions will be
called and all the eSIM profiles will be removed.

Bug: 62961867
Test: E2E & make RunSettingsRoboTests
Change-Id: I533756b12c0474e8e58cc6fe60a38c119365cee2
parent 18a9d7ba

res/layout/master_clear.xml

+5 −5
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_vertical"

                        android:paddingEnd="8dp"

                        android:paddingEnd="@dimen/reset_checkbox_padding_end"

                        android:focusable="false"

                        android:clickable="false"

                        android:duplicateParentState="true" />
@@ -104,14 +104,14 @@ 
                    <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:paddingTop="12dp"

                        android:textSize="18sp"

                        android:paddingTop="@dimen/reset_checkbox_title_padding_top"

                        android:textSize="@dimen/reset_checkbox_title_text_size"

                        android:text="@string/erase_external_storage" />

                    <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:paddingTop="4sp"

                        android:textSize="14sp"

                        android:paddingTop="@dimen/reset_checkbox_summary_padding_top"

                        android:textSize="@dimen/reset_checkbox_summary_text_size"

                        android:text="@string/erase_external_storage_description" />

                </LinearLayout>

            </LinearLayout>

res/layout/reset_esim_checkbox.xml

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

<!-- Copyright (C) 2018 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.

-->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:focusable="true"

    android:clickable="true"

    android:visibility="gone">



    <CheckBox android:id="@+id/erase_esim"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:paddingEnd="@dimen/reset_checkbox_padding_end"

        android:focusable="false"

        android:clickable="false"

        android:duplicateParentState="true" />



    <LinearLayout android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:orientation="vertical">



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/reset_checkbox_title_padding_top"

            android:textSize="@dimen/reset_checkbox_title_text_size" />



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/reset_checkbox_summary_padding_top"

            android:textSize="@dimen/reset_checkbox_summary_text_size"

            android:text="@string/reset_esim_desc" />

    </LinearLayout>

</LinearLayout>

res/layout/reset_network.xml

+9 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >
@@ -27,7 +28,8 @@ 
        android:layout_marginTop="12dp"

        android:layout_weight="1">



        <LinearLayout android:layout_width="match_parent"

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">
@@ -38,6 +40,11 @@ 
                android:textDirection="locale"

                android:text="@string/reset_network_desc" />



            <include layout="@layout/reset_esim_checkbox"

                android:id="@+id/erase_esim_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />



        </LinearLayout>



    </ScrollView>

res/values/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -311,4 +311,11 @@ 
    <dimen name="suggestion_card_title_padding_bottom_one_card">6dp</dimen>

    <dimen name="suggestion_card_title_padding_bottom_multiple_cards">8dp</dimen>



    <!-- Padding for the reset screens -->

    <dimen name="reset_checkbox_padding_end">8dp</dimen>

    <dimen name="reset_checkbox_title_padding_top">12dp</dimen>

    <dimen name="reset_checkbox_summary_padding_top">4dp</dimen>

    <dimen name="reset_checkbox_title_text_size">18sp</dimen>

    <dimen name="reset_checkbox_summary_text_size">14sp</dimen>



</resources>

res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -3213,6 +3213,10 @@ 
    <string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>

    <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->

    <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>

    <!-- SD card & phone storage settings screen, title for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->

    <string name="reset_esim_title">Also reset eSIMs</string>

    <!-- SD card & phone storage settings screen, message for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->

    <string name="reset_esim_desc">Erase all eSIMs on the phone. You\u2019ll have to contract your carrier to redownload your eSIMs. This will not cancel your mobile service plan.</string>

    <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->

    <string name="reset_network_button_text">Reset settings</string>

    <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
@@ -3225,6 +3229,10 @@ 
    <string name="network_reset_not_available">Network reset is not available for this user</string>

    <!-- Reset settings complete toast text [CHAR LIMIT=75] -->

    <string name="reset_network_complete_toast">Network settings have been reset</string>

    <!-- Title of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->

    <string name="reset_esim_error_title">Cant\u2019t reset eSIMs</string>

    <!-- Message of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->

    <string name="reset_esim_error_msg">The eSIMs can\u2019tt be reset due to an error.</string>















    <!-- Master Clear -->















    <!-- Button title to factory data reset the entire device -->