PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak Factory reset page for Material Next style

Browse Source 
- Change Text appearences

Bug: 189389716
Test: Visual
Change-Id: I0bcc40c62892c12f9c3dcd74873906d96b392e86
This commit is contained in:
Edgar Wang
2021-06-28 11:46:39 +08:00
parent 29da5abcb1
commit 73305b4458
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout/main_clear.xml
View File

@@ -27,40 +27,39 @@
<ScrollView
android:id="@+id/main_clear_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/reset_main_clear_margin_start"
android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/main_clear_container"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="vertical">
<TextView
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:id="@+id/sud_layout_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/main_clear_desc"/>
<TextView
android:id="@+id/also_erases_external"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/main_clear_desc_also_erases_external"/>
<TextView
android:id="@+id/also_erases_esim"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/main_clear_desc_also_erases_esim"/>
<TextView
android:id="@+id/accounts_label"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
@@ -76,21 +75,21 @@
</LinearLayout>
<TextView
android:id="@+id/other_users_present"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/main_clear_other_users_present"/>
<TextView
android:id="@+id/no_cancel_mobile_plan"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/main_clear_desc_no_cancel_mobile_plan"/>
<TextView
android:id="@+id/erase_external_option_text"
style="@style/TextAppearance.SudGlifItemSummary"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/main_clear_desc_erase_external_storage"/>
@@ -116,12 +115,12 @@
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/TextAppearance.SudGlifItemTitle"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/erase_external_storage"/>
<TextView
style="@style/TextAppearance.SudGlifItemSummary"
style="?android:attr/textAppearanceListItemSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/erase_external_storage_description"/>

2
res/layout/main_clear_account.xml
View File

@@ -30,6 +30,6 @@
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.SudGlifItemSummary"/>
style="@style/TextAppearance.PreferenceTitle.SettingsLib"/>
</LinearLayout>

2
res/layout/main_clear_confirm.xml
View File

@@ -31,7 +31,7 @@
<TextView
android:id="@+id/sud_layout_description"
style="@style/SudItemTitle.GlifDescription"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/main_clear_final_desc"/>

2
res/values/dimens.xml
View File

@@ -327,8 +327,6 @@
<!-- Margin for the reset screens -->
<dimen name="reset_network_margin_start">72dp</dimen>
<dimen name="reset_network_margin_end">12dp</dimen>
<dimen name="reset_main_clear_margin_start">32dp</dimen>
<dimen name="reset_main_clear_margin_end">12dp</dimen>
<dimen name="reset_button_margin_end">20dp</dimen>
<!-- Padding for the reset screens -->

4
tests/robotests/res/layout/main_clear.xml
View File

@@ -28,9 +28,7 @@
<ScrollView
android:id="@+id/main_clear_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/reset_main_clear_margin_start"
android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/main_clear_container"