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

Commit 85dbce62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refactor Reset options Settings"

parents 3099c7d0 21f8cb3a

res/layout-land/crypt_keeper_progress.xml

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

            android:layout_height="wrap_content"

            android:layout_margin="32dip"

            android:text="@string/master_clear_button_text"

            android:text="@string/main_clear_button_text"

            android:visibility="gone"

        />

    </LinearLayout>

res/layout-sw600dp/crypt_keeper_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
            android:layout_alignParentBottom="true"

            android:layout_marginBottom="80dip"

            android:layout_marginEnd="16dip"

            android:text="@string/master_clear_button_text"

            android:text="@string/main_clear_button_text"

            android:visibility="gone"

        />

res/layout/crypt_keeper_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
        android:layout_height="wrap_content"

        android:layout_margin="32dip"

        android:layout_gravity="center"

        android:text="@string/master_clear_button_text"

        android:text="@string/main_clear_button_text"

        android:visibility="gone"

    />

res/layout/master_clear.xml→res/layout/main_clear.xml

+13 −13
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ 
    android:orientation="vertical"

    android:theme="@style/GlifV3Theme.Footer"

    android:icon="@drawable/ic_delete_accent"

    app:sucHeaderText="@string/master_clear_title">

    app:sucHeaderText="@string/main_clear_title">



    <ScrollView

        android:id="@+id/master_clear_scrollview"

        android:id="@+id/main_clear_scrollview"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginStart="@dimen/reset_master_clear_margin_start"

        android:layout_marginEnd="@dimen/reset_master_clear_margin_end">

        android:layout_marginStart="@dimen/reset_main_clear_margin_start"

        android:layout_marginEnd="@dimen/reset_main_clear_margin_end">



        <LinearLayout

            android:id="@+id/master_clear_container"

            android:id="@+id/main_clear_container"

            style="@style/SudContentFrame"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -44,35 +44,35 @@ 
                android:id="@+id/sud_layout_description"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

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

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

            <TextView

                android:id="@+id/also_erases_external"

                style="@style/TextAppearance.SudGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/also_erases_esim"

                style="@style/TextAppearance.SudGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/accounts_label"

                style="@style/TextAppearance.SudGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

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

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

            <LinearLayout

                android:id="@+id/accounts"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:visibility="gone">

                <!-- Do not add any children here as they will be removed in the MasterClear.java

                <!-- Do not add any children here as they will be removed in the MainClear.java

                    code. A list of accounts will be inserted programmatically. -->

            </LinearLayout>

            <TextView
@@ -81,20 +81,20 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/no_cancel_mobile_plan"

                style="@style/TextAppearance.SudGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/erase_external_option_text"

                style="@style/TextAppearance.SudGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

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

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

            <LinearLayout

                android:id="@+id/erase_external_container"

                android:layout_width="match_parent"