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

Merge "Rename prefix from suw to sud"

Browse Source
This commit is contained in:
Pasty Chang
2019-01-10 06:56:20 +00:00
committed by Android (Google) Code Review
parent b5f945994e 79614823cb
commit 43bb34e15c
67 changed files with 260 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/choose_lock_password.xml
View File

@@ -22,10 +22,10 @@
android:icon="@drawable/ic_lock"
android:importantForAutofill="noExcludeDescendants"
settings:sucFooter="@layout/choose_lock_password_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
settings:sucHeaderText="@string/lockpassword_choose_your_screen_lock_header">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
@@ -35,7 +35,7 @@
<TextView
android:id="@+id/message"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minLines="2"/>
@@ -71,7 +71,7 @@
<Button
android:id="@+id/screen_lock_options"
style="@style/SuwGlifButton.Tertiary"
style="@style/SudGlifButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"

8
res/layout/choose_lock_password_footer.xml
View File

@@ -17,13 +17,13 @@
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar"
style="@style/SudGlifButtonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- left : skip -->
<Button android:id="@+id/skip_button"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/skip_label"
@@ -32,7 +32,7 @@
<!-- left : clear -->
<Button android:id="@+id/clear_button"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
@@ -45,7 +45,7 @@
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SuwGlifButton.Primary"
style="@style/SudGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next_label" />

22
res/layout/choose_lock_pattern_common.xml
View File

@@ -24,7 +24,7 @@
android:icon="@drawable/ic_lock"
android:layout="@layout/sud_glif_blank_template"
settings:sucFooter="@layout/choose_lock_pattern_common_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
settings:sucHeaderText="@string/lockpassword_choose_your_screen_lock_header">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"
@@ -35,21 +35,21 @@
android:orientation="vertical">
<LinearLayout
style="@style/SuwGlifHeaderContainer"
style="@style/SudGlifHeaderContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/suw_layout_icon"
style="@style/SuwGlifIcon"
android:id="@+id/suc_layout_icon"
style="@style/SudGlifIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_lock" />
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
android:accessibilityLiveRegion="polite"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -58,7 +58,7 @@
<!-- takes up all space above button bar at bottom -->
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
@@ -71,10 +71,10 @@
<TextView
android:id="@+id/message"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="?attr/suwMarginSides"
android:layout_marginHorizontal="?attr/sudMarginSides"
android:minLines="2" />
<TextView android:id="@+id/headerText"
@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:minLines="2"
android:gravity="center"
android:paddingHorizontal="?attr/suwMarginSides"
android:paddingHorizontal="?attr/sudMarginSides"
android:textSize="12sp" />
<com.google.android.setupdesign.view.FillContentLayout
@@ -111,7 +111,7 @@
<Button
android:id="@+id/screen_lock_options"
style="@style/SuwGlifButton.Tertiary"
style="@style/SudGlifButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"

8
res/layout/choose_lock_pattern_common_footer.xml
View File

@@ -18,13 +18,13 @@
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
style="@style/SudGlifButtonBar.Stackable"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- left : skip -->
<Button android:id="@+id/skip_button"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/skip_label"
@@ -32,7 +32,7 @@
<!-- left : retry -->
<Button android:id="@+id/footerLeftButton"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_tutorial_cancel_label" />
@@ -44,7 +44,7 @@
<!-- right : confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SuwGlifButton.Primary"
style="@style/SudGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_tutorial_continue_label" />

12
res/layout/confirm_lock_password_normal.xml
View File

@@ -29,11 +29,11 @@
<TextView
android:id="@+id/detailsText"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides" />
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides" />
<Space
android:layout_width="match_parent"
@@ -72,11 +72,11 @@
<Button
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides"
android:layout_marginBottom="80dp"
android:layout_gravity="center_horizontal"
android:text="@string/cancel" />

24
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -33,31 +33,31 @@
android:orientation="vertical">
<ImageView
android:id="@+id/suw_layout_icon"
style="@style/SuwGlifIcon"
android:id="@+id/suc_layout_icon"
style="@style/SudGlifIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="?attr/suwGlifHeaderGravity"
android:layout_gravity="?attr/sudGlifHeaderGravity"
android:src="@drawable/ic_lock" />
<TextView
android:id="@+id/headerText"
style="@style/SuwGlifHeaderTitle"
style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:id="@+id/detailsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides" />
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides" />
</LinearLayout>
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -86,17 +86,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginHorizontal="?attr/suwMarginSides"
android:layout_marginHorizontal="?attr/sudMarginSides"
android:layout_marginTop="12dp"
android:gravity="center_vertical"/>
<Button
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginEnd="?attr/suwMarginSides"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides"
android:layout_marginBottom="80dp"
android:text="@string/cancel" />

4
res/layout/encryption_interstitial.xml
View File

@@ -23,7 +23,7 @@
android:icon="@drawable/ic_lock">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
@@ -32,7 +32,7 @@
<TextView
android:id="@+id/encryption_message"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

2
res/layout/face_enroll_enrolling.xml
View File

@@ -24,7 +24,7 @@
style="?attr/face_layout_theme">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"

4
res/layout/face_enroll_finish.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -44,7 +44,7 @@
android:layout_weight="1">
<ImageView
style="@style/SuwContentIllustration"
style="@style/SudContentIllustration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@null"

10
res/layout/face_enroll_introduction.xml
View File

@@ -25,7 +25,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
@@ -34,14 +34,14 @@
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_message" />
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -51,7 +51,7 @@
android:layout_weight="1">
<ImageView
style="@style/SuwContentIllustration"
style="@style/SudContentIllustration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@null"
@@ -65,7 +65,7 @@
android:layout_gravity="center">
<Button
android:id="@+id/accessibility_button"
style="@style/SuwGlifButton.Secondary"
style="@style/SudGlifButton.Secondary"
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
res/layout/fingerprint_enroll_enrolling_base.xml
View File

@@ -24,7 +24,7 @@
style="?attr/fingerprint_layout_theme">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -38,7 +38,7 @@
android:layout_height="wrap_content">
<TextView
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:id="@+id/start_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
android:text="@string/security_settings_fingerprint_enroll_start_message"/>
<TextView
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:id="@+id/repeat_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"

6
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -31,7 +31,7 @@
android:clipChildren="false">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -39,10 +39,10 @@
android:clipChildren="false">
<TextView
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"
android:layout_marginTop="@dimen/sud_description_glif_margin_top"
android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
</LinearLayout>

8
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -33,10 +33,10 @@
<TextView
android:id="@+id/message"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_glif_margin_top"
android:layout_marginTop="@dimen/sud_description_glif_margin_top"
android:minLines="3"
android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
@@ -57,7 +57,7 @@
<ImageView
android:id="@+id/fingerprint_in_app_indicator"
style="@style/SuwContentIllustration"
style="@style/SudContentIllustration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="7dp"

8
res/layout/fingerprint_enroll_introduction.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
@@ -33,14 +33,14 @@
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_introduction_message" />
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -50,7 +50,7 @@
android:layout_weight="1">
<ImageView
style="@style/SuwContentIllustration"
style="@style/SudContentIllustration"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@null"

26
res/layout/master_clear.xml
View File

@@ -21,9 +21,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/SuwThemeGlifV3.DayNight"
android:theme="@style/SudThemeGlifV3.DayNight"
android:icon="@drawable/ic_delete_accent"
app:suwHeaderText="@string/master_clear_title">
app:sucHeaderText="@string/master_clear_title">
<ScrollView
android:id="@+id/master_clear_scrollview"
@@ -34,33 +34,33 @@
<LinearLayout
android:id="@+id/master_clear_container"
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/master_clear_desc"/>
<TextView
android:id="@+id/also_erases_external"
style="@style/TextAppearance.SuwGlifItemSummary"
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"/>
<TextView
android:id="@+id/also_erases_esim"
style="@style/TextAppearance.SuwGlifItemSummary"
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"/>
<TextView
android:id="@+id/accounts_label"
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
@@ -76,21 +76,21 @@
</LinearLayout>
<TextView
android:id="@+id/other_users_present"
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/master_clear_other_users_present"/>
<TextView
android:id="@+id/no_cancel_mobile_plan"
style="@style/TextAppearance.SuwGlifItemSummary"
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"/>
<TextView
android:id="@+id/erase_external_option_text"
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/master_clear_desc_erase_external_storage"/>
@@ -103,7 +103,7 @@
android:clickable="true">
<CheckBox
android:id="@+id/erase_external"
style="@style/SuwCheckBox"
style="@style/SudCheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -116,12 +116,12 @@
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/TextAppearance.SuwGlifItemTitle"
style="@style/TextAppearance.SudGlifItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/erase_external_storage"/>
<TextView
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/erase_external_storage_description"/>

4
res/layout/master_clear_account.xml
View File

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
style="@style/SuwDescription.Glif" >
style="@style/SudDescription.Glif" >
<ImageView
android:id="@android:id/icon"
android:layout_width="56dp"
@@ -30,6 +30,6 @@
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.SuwGlifItemSummary"/>
style="@style/TextAppearance.SudGlifItemSummary"/>
</LinearLayout>

8
res/layout/master_clear_confirm.xml
View File

@@ -19,20 +19,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/SuwThemeGlifV3.DayNight"
android:theme="@style/SudThemeGlifV3.DayNight"
android:id="@+id/setup_wizard_layout"
android:icon="@drawable/ic_delete_accent"
app:suwHeaderText="@string/master_clear_confirm_title">
app:sucHeaderText="@string/master_clear_confirm_title">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/master_clear_confirm"
style="@style/SuwItemTitle.GlifDescription"
style="@style/SudItemTitle.GlifDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/master_clear_final_desc"/>

2
res/layout/password_requirement_item.xml
View File

@@ -18,5 +18,5 @@
android:id="@+id/description_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="?attr/suwGlifHeaderGravity"
android:gravity="?attr/sudGlifHeaderGravity"
android:textSize="14sp"/>

12
res/layout/redaction_interstitial.xml
View File

@@ -22,10 +22,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_suggested_notifications"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
settings:sucHeaderText="@string/lock_screen_notifications_interstitial_title">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
@@ -34,7 +34,7 @@
<TextView
android:id="@+id/message"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_interstitial_message" />
@@ -48,7 +48,7 @@
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
style="@style/SuwRadioButton"
style="@style/SudRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
@@ -57,7 +57,7 @@
<com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive"
style="@style/SuwRadioButton"
style="@style/SudRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
@@ -66,7 +66,7 @@
<RadioButton
android:id="@+id/hide_all"
style="@style/SuwRadioButton"
style="@style/SudRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"

8
res/layout/reset_esim_checkbox.xml
View File

@@ -15,7 +15,7 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwDescription"
style="@style/SudDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -25,7 +25,7 @@
<CheckBox
android:id="@+id/erase_esim"
style="@style/SuwCheckBox"
style="@style/SudCheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -42,12 +42,12 @@
<TextView
android:id="@+id/erase_esim_title"
style="@style/TextAppearance.SuwGlifItemTitle"
style="@style/TextAppearance.SudGlifItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView
style="@style/TextAppearance.SuwGlifItemSummary"
style="@style/TextAppearance.SudGlifItemSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset_esim_desc"/>

6
res/layout/setup_choose_lock_generic_biometrics_header.xml
View File

@@ -16,11 +16,11 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingTop="@dimen/sud_description_glif_margin_top"
android:paddingBottom="@dimen/sud_description_glif_margin_bottom_lists"
android:text="@string/lock_settings_picker_biometrics_added_security_message" />

6
res/layout/setup_choose_lock_generic_header.xml
View File

@@ -16,11 +16,11 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwDescription.Glif"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingTop="@dimen/sud_description_glif_margin_top"
android:paddingBottom="@dimen/sud_description_glif_margin_bottom_lists"
android:text="@string/setup_lock_settings_picker_message" />

4
res/layout/setup_screen_lock_fingerprint_details.xml
View File

@@ -20,6 +20,6 @@
android:layout_height="wrap_content"
android:paddingTop="6dip"
android:paddingBottom="6dip"
android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides"
android:paddingStart="@dimen/sud_layout_margin_sides"
android:paddingEnd="@dimen/sud_layout_margin_sides"
android:text="@string/unlock_setup_wizard_fingerprint_details" />

10
res/layout/storage_internal_forget.xml
View File

@@ -28,11 +28,11 @@
android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/suw_description_margin_top"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:paddingTop="@dimen/sud_description_margin_top"
android:paddingBottom="@dimen/sud_description_margin_bottom"
android:paddingStart="@dimen/sud_layout_margin_sides"
android:paddingEnd="@dimen/sud_layout_margin_sides"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" />
</ScrollView>

10
res/layout/storage_internal_format.xml
View File

@@ -28,11 +28,11 @@
android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/suw_description_margin_top"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:paddingTop="@dimen/sud_description_margin_top"
android:paddingBottom="@dimen/sud_description_margin_bottom"
android:paddingStart="@dimen/sud_layout_margin_sides"
android:paddingEnd="@dimen/sud_layout_margin_sides"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" />
</ScrollView>

10
res/layout/storage_internal_unmount.xml
View File

@@ -28,11 +28,11 @@
android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/suw_description_margin_top"
android:paddingBottom="@dimen/suw_description_margin_bottom"
android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:paddingTop="@dimen/sud_description_margin_top"
android:paddingBottom="@dimen/sud_description_margin_bottom"
android:paddingStart="@dimen/sud_layout_margin_sides"
android:paddingEnd="@dimen/sud_layout_margin_sides"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" />
</ScrollView>

16
res/layout/storage_wizard_checklist.xml
View File

@@ -22,36 +22,36 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/storage_wizard_migrate_v2_checklist" />
<TextView
android:id="@+id/storage_wizard_migrate_v2_checklist_media"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/storage_wizard_migrate_v2_checklist_media"
android:drawableStart="@drawable/ic_sd_card"
android:drawableTint="?android:attr/textColorSecondary"
android:drawablePadding="@dimen/suw_description_margin_bottom" />
android:drawablePadding="@dimen/sud_description_margin_bottom" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/storage_wizard_migrate_v2_checklist_apps"
android:drawableStart="@drawable/ic_apps_alt"
android:drawableTint="?android:attr/textColorSecondary"
android:drawablePadding="@dimen/suw_description_margin_bottom" />
android:drawablePadding="@dimen/sud_description_margin_bottom" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textColor="?android:attr/textColorPrimary"
android:text="@string/storage_wizard_migrate_v2_checklist_battery"
android:drawableStart="@drawable/ic_battery_charging_full"
android:drawableTint="?android:attr/textColorSecondary"
android:drawablePadding="@dimen/suw_description_margin_bottom" />
android:drawablePadding="@dimen/sud_description_margin_bottom" />
</LinearLayout>

6
res/layout/storage_wizard_generic.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -31,8 +31,8 @@
android:id="@+id/storage_wizard_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textColor="?android:attr/textColorPrimary" />
<FrameLayout

24
res/layout/storage_wizard_init.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -30,7 +30,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
@@ -42,23 +42,23 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="@dimen/suw_glif_margin_sides"
android:layout_marginStart="@dimen/sud_glif_margin_sides"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:text="@string/storage_wizard_init_v2_internal_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/storage_wizard_init_v2_internal_summary" />
<Button
android:id="@+id/storage_wizard_init_internal"
style="@style/SuwGlifButton.Primary"
style="@style/SudGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/storage_wizard_init_v2_internal_action"
@@ -69,7 +69,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:orientation="horizontal"
android:gravity="center_vertical">
<View
@@ -97,7 +97,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
@@ -109,23 +109,23 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="@dimen/suw_glif_margin_sides"
android:layout_marginStart="@dimen/sud_glif_margin_sides"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:text="@string/storage_wizard_init_v2_external_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:layout_marginBottom="@dimen/sud_description_margin_bottom"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/storage_wizard_init_v2_external_summary" />
<Button
android:id="@+id/storage_wizard_init_external"
style="@style/SuwGlifButton.Primary"
style="@style/SudGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/storage_wizard_init_v2_external_action"

10
res/layout/storage_wizard_progress.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -31,22 +31,22 @@
android:id="@+id/storage_wizard_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:indeterminate="false"
style="?android:attr/progressBarStyleHorizontal" />
<TextView
android:id="@+id/storage_wizard_progress_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/storage_wizard_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/suw_description_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:layout_marginTop="@dimen/sud_description_margin_top"
android:lineSpacingExtra="@dimen/sud_description_line_spacing_extra"
android:textColor="?android:attr/textColorPrimary"
android:visibility="gone" />