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

Commit e8e86e63 authored by Hunter Knepshield's avatar Hunter Knepshield
Browse files

[Strings + layout] Minor changes for eSIM erase. 

1. String changes (uniform on both screens now)
2. Minor non-functional layout changes (margin is uniform now)

Reset everything: https://screenshot.googleplex.com/OZsvOt36CZf
Reset networks: https://screenshot.googleplex.com/in0vdOAeF7u

Change-Id: I92d068c3731f6915c8d393d94ac8c25a3c8ed773
Fix: 119120504
Test: on device
parent 60d64cec

res/layout/master_clear.xml

+3 −6
Original line number Diff line number Diff line
@@ -127,12 +127,9 @@ 
                        android:text="@string/erase_external_storage_description"/>

                </LinearLayout>

            </LinearLayout>

            <include

                layout="@layout/reset_esim_checkbox"

                android:layout_marginTop="40dp"

                android:id="@+id/erase_esim_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>



            <include layout="@layout/reset_esim_checkbox"/>



        </LinearLayout>

    </ScrollView>

</com.google.android.setupdesign.GlifLayout>

res/layout/reset_esim_checkbox.xml

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
-->

<LinearLayout

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

    android:id="@+id/erase_esim_container"

    style="@style/SudDescription"

    android:layout_marginTop="40dp"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"
@@ -41,10 +43,10 @@ 
        android:orientation="vertical">



        <TextView

            android:id="@+id/erase_esim_title"

            style="@style/TextAppearance.SudGlifItemTitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"

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



        <TextView

            style="@style/TextAppearance.SudGlifItemSummary"

res/layout/reset_network.xml

+1 −4
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ 
                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" />

            <include layout="@layout/reset_esim_checkbox"/>



        </LinearLayout>

res/values/strings.xml

+3 −9
Original line number Diff line number Diff line
@@ -3581,10 +3581,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 eSIM</string>

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

    <string name="reset_esim_title">Erase 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 contact your carrier to redownload your eSIMs. This will not cancel your mobile service plan.</string>

    <string name="reset_esim_desc">You\u2019ll have to contact your carrier to download replacement eSIMs. This won\u2019t cancel any mobile service plans.</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 -->
@@ -3633,12 +3633,6 @@ 
    <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the internal USB storage, such as music or photos</string>

    <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->

    <string name="erase_external_storage_description" product="default">Erase all the data on the SD card, such as music or photos</string>

    <!-- SD card & phone storage settings screen, label for check box to erase all the carriers information on the embedded SIM card [CHAR LIMIT=30] -->

    <string name="erase_esim_storage">Erase eSIM</string>

    <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for default devices [CHAR LIMIT=NONE] -->

    <string name="erase_esim_storage_description" product="default">Erase all eSIMs on the phone. This will not cancel your mobile service plan.</string>

    <!-- SD card & phone storage settings screen, description for check box to erase eSIMs for tablets [CHAR LIMIT=NONE] -->

    <string name="erase_esim_storage_description" product="tablet">Erase all eSIMs on the tablet. This will not cancel your mobile service plan.</string>

    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->

    <string name="master_clear_button_text" product="tablet">Erase all data</string>

    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->

src/com/android/settings/MasterClear.java

+0 −2
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 


        if (showWipeEuicc()) {

            if (showWipeEuiccCheckbox()) {

                TextView title = mContentView.findViewById(R.id.erase_esim_title);

                title.setText(R.string.erase_esim_storage);

                mEsimStorageContainer.setVisibility(View.VISIBLE);

                mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {

                    @Override