Merge "Rename prefix from suw to sud"

This commit is contained in:
Pasty Chang
2019-01-10 06:56:20 +00:00
committed by Android (Google) Code Review
67 changed files with 260 additions and 260 deletions

View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/sud_glif_blank_template"
settings:suwHeaderText="@string/lock_settings_picker_title">
settings:sucHeaderText="@string/lock_settings_picker_title">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"
@@ -37,18 +37,18 @@
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
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:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_lock"/>
@@ -65,8 +65,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
@@ -74,7 +74,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" />
@@ -85,16 +85,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="?attr/suwGlifHeaderGravity"
android:gravity="?attr/sudGlifHeaderGravity"
android:textSize="18sp"/>
<Button
android:id="@+id/screen_lock_options"
style="@style/SuwGlifButton.Tertiary"
style="@style/SudGlifButton.Tertiary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="?attr/suwGlifHeaderGravity"
android:gravity="?attr/sudGlifHeaderGravity"
android:text="@string/setup_lock_settings_options_button_label"
android:visibility="gone" />
@@ -122,7 +122,7 @@
<!-- 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"

View File

@@ -40,34 +40,34 @@
android:paddingBottom="24dp">
<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" />
<Button
android:id="@+id/cancelButton"
style="@style/SetupWizardButton.Negative"
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:text="@string/cancel" />
<Space
@@ -81,8 +81,8 @@
android:id="@+id/errorText"
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="24dp"
android:gravity="center_vertical"/>
</LinearLayout>

View File

@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
@@ -42,25 +42,25 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
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:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_fingerprint_header" />
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
@@ -71,14 +71,14 @@
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"
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"
@@ -94,7 +94,7 @@
<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/security_settings_fingerprint_enroll_enrolling_skip" />

View File

@@ -34,8 +34,8 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginStart="?attr/suwMarginSides"
android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
@@ -55,25 +55,25 @@
android:clipToPadding="false">
<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:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:src="@drawable/ic_fingerprint_header" />
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp" />
<TextView
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_find_sensor_message"/>

View File

@@ -29,7 +29,7 @@
android:fillViewport="true">
<LinearLayout
style="@style/SuwContentFrame"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
@@ -45,19 +45,19 @@
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:layout_marginLeft="0dp"
android:layout_marginRight="0dp"
android:contentDescription="@null"
android:src="@drawable/ic_fingerprint_header"/>
<TextView
android:id="@+id/suw_layout_title"
style="@style/SuwGlifHeaderTitle"
android:id="@+id/suc_layout_title"
style="@style/SudGlifHeaderTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="0dp"
@@ -65,7 +65,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/security_settings_fingerprint_enroll_finish_message"/>
@@ -79,7 +79,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:contentDescription="@android:string/fingerprint_icon_content_description"