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

Commit a6cec473 authored by felkachang's avatar felkachang Committed by Fan Zhang
Browse files

Change reset page to be SUW style 

The factory reset page and the reset confirmation page is too old to
follow the style of Setup Wizard design. To change the layout and apply
the style for textviews and header.

Bug: 73738836
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I1ee3d09e1ef9cac8e25c60a566363d4f7d537eeb
parent 3600c033

res/drawable/ic_delete_accent.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  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.

  -->

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

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,8h2v9h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v9h-2z"/>

</vector>

res/layout/master_clear.xml

+78 −75
Original line number Diff line number Diff line
@@ -14,51 +14,59 @@ 
     limitations under the License.

-->



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

<com.android.setupwizardlib.GlifLayout

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

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical"

    android:theme="@style/SuwThemeGlifV3.Light"

    android:icon="@drawable/ic_delete_accent"

    app:suwHeaderText="@string/master_clear_title">



    <ScrollView

        android:id="@+id/master_clear_scrollview"

        android:layout_width="match_parent"

            android:layout_height="0dip"

        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_marginTop="12dp"

            android:layout_weight="1">

        android:layout_marginEnd="@dimen/reset_master_clear_margin_end">



        <LinearLayout

            android:id="@+id/master_clear_container"

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">



            <TextView

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/master_clear_item_label"

                android:includeFontPadding="false"

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

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

            <TextView

                android:id="@+id/also_erases_external"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/master_clear_item_label"

                android:includeFontPadding="false"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/also_erases_esim"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/master_clear_item_label"

                android:includeFontPadding="false"

                android:visibility="gone"

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

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

            <TextView

                android:id="@+id/accounts_label"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/master_clear_item_label"

                android:visibility="gone"

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

            <LinearLayout android:id="@+id/accounts"

            <LinearLayout

                android:id="@+id/accounts"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="vertical"
@@ -66,70 +74,65 @@ 
                <!-- Do not add any children here as they will be removed in the MasterClear.java

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

            </LinearLayout>

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

            <TextView

                android:id="@+id/other_users_present"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:textSize="18sp"

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

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

            <TextView

                android:id="@+id/no_cancel_mobile_plan"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"

                android:textSize="18sp"

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

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

            <TextView

                android:id="@+id/erase_external_option_text"

                style="@style/TextAppearance.SuwGlifItemSummary"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:textSize="18sp"

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

            <LinearLayout android:id="@+id/erase_external_container"

            <LinearLayout

                android:id="@+id/erase_external_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:focusable="true"

                android:clickable="true">

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

                <CheckBox

                    android:id="@+id/erase_external"

                    style="@style/SuwCheckBox"

                    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"

                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:orientation="vertical">

                    <TextView

                        style="@style/TextAppearance.SuwGlifItemTitle"

                        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"

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

                    <TextView

                        style="@style/TextAppearance.SuwGlifItemSummary"

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

                </LinearLayout>

            </LinearLayout>

            <include layout="@layout/reset_esim_checkbox"

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

        </LinearLayout>

    </ScrollView>

    <Button

            android:id="@+id/initiate_master_clear"

            android:layout_gravity="center_horizontal"

            android:layout_marginTop="20dip"

            android:layout_marginBottom="12dip"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/master_clear_button_text"

            android:gravity="center" />



</LinearLayout>
 
</com.android.setupwizardlib.GlifLayout>

res/layout/master_clear_account.xml

+2 −3
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
    android:layout_height="wrap_content"

    android:gravity="center_vertical"

    android:orientation="horizontal"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">

    style="@style/SuwDescription.Glif" >

    <ImageView

        android:id="@android:id/icon"

        android:layout_width="56dp"
@@ -31,6 +30,6 @@ 
        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="18sp"/>

        style="@style/TextAppearance.SuwGlifItemSummary"/>

</LinearLayout>

res/layout/master_clear_confirm.xml

+21 −21
Original line number Diff line number Diff line
@@ -13,28 +13,28 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

<com.android.setupwizardlib.GlifLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    >

    android:theme="@style/SuwThemeGlifV3.Light"

    android:id="@+id/setup_wizard_layout"

    android:icon="@drawable/ic_delete_accent"

    app:suwHeaderText="@string/master_clear_confirm_title">



    <LinearLayout

        style="@style/SuwContentFrame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">



        <TextView

            android:id="@+id/master_clear_confirm"

            style="@style/SuwItemTitle.GlifDescription"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="12dp"

        android:layout_marginTop="12dp"

        android:textSize="20sp"

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



    <Button android:id="@+id/execute_master_clear"

        android:layout_gravity="center_horizontal"

        android:layout_marginTop="40dip"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/master_clear_final_button_text"

        android:gravity="center" />

        

    </LinearLayout>

</com.android.setupwizardlib.GlifLayout>

res/layout/reset_esim_checkbox.xml

+7 −8
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<LinearLayout

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

    style="@style/SuwDescription"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="horizontal"
@@ -24,10 +25,10 @@ 


    <CheckBox

        android:id="@+id/erase_esim"

        style="@style/SuwCheckBox"

        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:checked="true"
@@ -41,16 +42,14 @@ 


        <TextView

            android:id="@+id/erase_esim_title"

            style="@style/TextAppearance.SuwGlifItemTitle"

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

            android:layout_height="wrap_content"/>



        <TextView

            style="@style/TextAppearance.SuwGlifItemSummary"

            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>