Change to use setupcompat and setupdesign for suw pages

1. remove the dependence of setupwizardlib.
2. add to use setupcompat and setupdesign.
3. modify new footer button in following up cl.

Bug: 120805516
Bug: 120872944
Test: RunSettingsRoboTests
Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6
This commit is contained in:
Pasty Chang
2018-12-11 02:22:55 +00:00
parent 0805dbb98c
commit c1f8600d9f
53 changed files with 171 additions and 151 deletions

View File

@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:importantForAutofill="noExcludeDescendants"
settings:suwFooter="@layout/choose_lock_password_footer"
settings:sucFooter="@layout/choose_lock_password_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
<LinearLayout
@@ -79,4 +79,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,14 +16,14 @@
-->
<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template"
settings:suwFooter="@layout/choose_lock_pattern_common_footer"
settings:sucFooter="@layout/choose_lock_pattern_common_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
@@ -85,7 +85,7 @@
android:paddingHorizontal="?attr/suwMarginSides"
android:textSize="12sp" />
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="wrap_content"
android:layout_height="0dp"
@@ -97,7 +97,7 @@
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
</LinearLayout>
@@ -119,4 +119,4 @@
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,7 +16,7 @@
-->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.android.setupwizardlib.view.ButtonBarLayout
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent"
@@ -49,4 +49,4 @@
android:layout_height="wrap_content"
android:text="@string/lockpattern_tutorial_continue_label" />
</com.android.setupwizardlib.view.ButtonBarLayout>
</com.google.android.setupdesign.view.ButtonBarLayout>

View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -82,4 +82,4 @@
android:text="@string/cancel" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
@@ -65,7 +65,7 @@
android:paddingLeft="0dp"
android:paddingRight="0dp">
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="wrap_content"
android:layout_height="0dp"
@@ -77,7 +77,7 @@
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
<TextView
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
@@ -104,4 +104,4 @@
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,13 +15,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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:icon="@drawable/ic_lock"
app:suwFooter="@layout/encryption_interstitial_footer">
app:sucFooter="@layout/encryption_interstitial_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -39,4 +39,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
style="?attr/face_layout_theme"
app:suwFooter="@layout/face_enroll_enrolling_footer">
app:sucFooter="@layout/face_enroll_enrolling_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -71,4 +71,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
style="?attr/face_layout_theme"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:suwFooter="@layout/face_enroll_finish_footer">
app:sucFooter="@layout/face_enroll_finish_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -39,7 +39,7 @@
android:gravity="center"
android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
@@ -51,10 +51,10 @@
android:contentDescription="@null"
android:src="@drawable/face_enroll_introduction" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
</LinearLayout>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,7 +16,7 @@
-->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.android.setupwizardlib.view.ButtonBarLayout
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent"
@@ -34,4 +34,4 @@
android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_done" />
</com.android.setupwizardlib.view.ButtonBarLayout>
</com.google.android.setupdesign.view.ButtonBarLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="?attr/face_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:suwFooter="@layout/face_enroll_introduction_footer">
app:sucFooter="@layout/face_enroll_introduction_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -32,20 +32,20 @@
android:clipToPadding="false"
android:orientation="vertical">
<com.android.setupwizardlib.view.RichTextView
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_message" />
<com.android.setupwizardlib.view.RichTextView
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
@@ -57,8 +57,8 @@
android:contentDescription="@null"
android:src="@drawable/face_enroll_introduction" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,7 +16,7 @@
-->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.android.setupwizardlib.view.ButtonBarLayout
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent"
@@ -41,4 +41,4 @@
android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" />
</com.android.setupwizardlib.view.ButtonBarLayout>
</com.google.android.setupdesign.view.ButtonBarLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
style="?attr/fingerprint_layout_theme"
app:suwFooter="@layout/fingerprint_enroll_enrolling_base_footer">
app:sucFooter="@layout/fingerprint_enroll_enrolling_base_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -64,7 +64,7 @@
android:gravity="center"
android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:paddingTop="0dp"
@@ -75,7 +75,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
<TextView
style="@style/TextAppearance.FingerprintErrorText"
@@ -91,4 +91,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
app:sucFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
<LinearLayout
android:layout_width="match_parent"
@@ -59,4 +59,4 @@
android:layout_gravity="center_horizontal"/>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,14 +15,14 @@
~ limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:suwFooter="@layout/fingerprint_enroll_finish_base_footer">
app:sucFooter="@layout/fingerprint_enroll_finish_base_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -48,7 +48,7 @@
android:gravity="center"
android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="@dimen/fingerprint_progress_bar_max_size"
android:layout_height="@dimen/fingerprint_progress_bar_max_size"
android:layout_marginVertical="24dp"
@@ -64,7 +64,7 @@
android:padding="7dp"
android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fingerprint_enroll_finish" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
<!-- Added to align elements with fingerprint_enroll_enrolling_base -->
<TextView
@@ -78,4 +78,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,7 +16,7 @@
-->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.android.setupwizardlib.view.ButtonBarLayout
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent"
@@ -41,4 +41,4 @@
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_done" />
</com.android.setupwizardlib.view.ButtonBarLayout>
</com.google.android.setupdesign.view.ButtonBarLayout>

View File

@@ -15,14 +15,14 @@
limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="?attr/fingerprint_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:suwFooter="@layout/fingerprint_enroll_introduction_footer">
app:sucFooter="@layout/fingerprint_enroll_introduction_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -32,20 +32,20 @@
android:clipToPadding="false"
android:orientation="vertical">
<com.android.setupwizardlib.view.RichTextView
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/description_text"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_introduction_message" />
<com.android.setupwizardlib.view.RichTextView
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.android.setupwizardlib.view.FillContentLayout
<com.google.android.setupdesign.view.FillContentLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
@@ -57,8 +57,8 @@
android:contentDescription="@null"
android:src="@drawable/fingerprint_enroll_introduction" />
</com.android.setupwizardlib.view.FillContentLayout>
</com.google.android.setupdesign.view.FillContentLayout>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -16,7 +16,7 @@
-->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<com.android.setupwizardlib.view.ButtonBarLayout
<com.google.android.setupdesign.view.ButtonBarLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent"
@@ -41,4 +41,4 @@
android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" />
</com.android.setupwizardlib.view.ButtonBarLayout>
</com.google.android.setupdesign.view.ButtonBarLayout>

View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
@@ -135,4 +135,4 @@
android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@@ -37,4 +37,4 @@
android:layout_height="wrap_content"
android:text="@string/master_clear_final_desc"/>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,14 +15,14 @@
limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_suggested_notifications"
settings:suwFooter="@layout/redaction_interstitial_footer"
settings:sucFooter="@layout/redaction_interstitial_footer"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
<LinearLayout
@@ -78,4 +78,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -15,7 +15,7 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifPreferenceLayout
<com.google.android.setupdesign.GlifPreferenceLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list_container"
android:layout_width="match_parent"

View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
app:suwFooter="@layout/storage_wizard_footer">
app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -44,4 +44,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
app:suwFooter="@layout/storage_wizard_footer">
app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -136,4 +136,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
app:suwFooter="@layout/storage_wizard_footer">
app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -59,4 +59,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -14,13 +14,13 @@
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
<com.google.android.setupdesign.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"
app:suwFooter="@layout/storage_wizard_footer">
app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout
style="@style/SuwContentFrame"
@@ -38,4 +38,4 @@
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>
</com.google.android.setupdesign.GlifLayout>