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

Change to use setupcompat and setupdesign for suw pages

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@@ -30,6 +30,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.preference_preference \ androidx.preference_preference \
androidx.recyclerview_recyclerview \ androidx.recyclerview_recyclerview \
com.google.android.material_material \ com.google.android.material_material \
setupcompat \
setupdesign
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
telephony-common \ telephony-common \
@@ -53,7 +55,6 @@ ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_JACK_FLAGS := --multi-dex native LOCAL_JACK_FLAGS := --multi-dex native
endif endif
include frameworks/opt/setupwizard/library/common-gingerbread.mk
include frameworks/base/packages/SettingsLib/common.mk include frameworks/base/packages/SettingsLib/common.mk
include frameworks/base/packages/SettingsLib/search/common.mk include frameworks/base/packages/SettingsLib/search/common.mk

8
res/layout-land/choose_lock_pattern.xml
View File

@@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -164,7 +164,7 @@
</LinearLayout> </LinearLayout>
<!-- right side: lock pattern --> <!-- right side: lock pattern -->
<com.android.setupwizardlib.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle" style="@style/LockPatternContainerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -177,8 +177,8 @@
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/lock_pattern_background" /> android:background="@color/lock_pattern_background" />
</com.android.setupwizardlib.view.FillContentLayout> </com.google.android.setupdesign.view.FillContentLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

8
res/layout-land/confirm_lock_pattern_normal.xml
View File

@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -89,7 +89,7 @@
</ScrollView> </ScrollView>
<com.android.setupwizardlib.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle" style="@style/LockPatternContainerStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -102,7 +102,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/lock_pattern_background" /> android:background="@color/lock_pattern_background" />
</com.android.setupwizardlib.view.FillContentLayout> </com.google.android.setupdesign.view.FillContentLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

8
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License ~ limitations under the License
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -108,7 +108,7 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<com.android.setupwizardlib.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginVertical="24dp" android:layout_marginVertical="24dp"
@@ -120,7 +120,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" /> android:layout_gravity="center" />
</com.android.setupwizardlib.view.FillContentLayout> </com.google.android.setupdesign.view.FillContentLayout>
<TextView <TextView
style="@style/TextAppearance.FingerprintErrorText" style="@style/TextAppearance.FingerprintErrorText"
@@ -139,4 +139,4 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

4
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License ~ limitations under the License
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -112,4 +112,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

12
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License ~ limitations under the License
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -75,7 +75,7 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<com.android.setupwizardlib.view.ButtonBarLayout <com.google.android.setupdesign.view.ButtonBarLayout
style="@style/SuwGlifButtonBar.Stackable" style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -103,11 +103,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_done" /> android:text="@string/security_settings_fingerprint_enroll_done" />
</com.android.setupwizardlib.view.ButtonBarLayout> </com.google.android.setupdesign.view.ButtonBarLayout>
</LinearLayout> </LinearLayout>
<com.android.setupwizardlib.view.FillContentLayout <com.google.android.setupdesign.view.FillContentLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent"> android:layout_height="match_parent">
@@ -120,8 +120,8 @@
android:contentDescription="@android:string/fingerprint_icon_content_description" android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fingerprint_enroll_finish" /> android:src="@drawable/fingerprint_enroll_finish" />
</com.android.setupwizardlib.view.FillContentLayout> </com.google.android.setupdesign.view.FillContentLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

6
res/layout/choose_lock_password.xml
View File

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

10
res/layout/choose_lock_pattern_common.xml
View File

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

4
res/layout/choose_lock_pattern_common_footer.xml
View File

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

4
res/layout/confirm_lock_password_normal.xml
View File

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

8
res/layout/confirm_lock_pattern_normal_base.xml
View File

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

6
res/layout/encryption_interstitial.xml
View File

@@ -15,13 +15,13 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:icon="@drawable/ic_lock" android:icon="@drawable/ic_lock"
app:suwFooter="@layout/encryption_interstitial_footer"> app:sucFooter="@layout/encryption_interstitial_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -39,4 +39,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

6
res/layout/face_enroll_enrolling.xml
View File

@@ -15,14 +15,14 @@
~ limitations under the License. ~ limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
style="?attr/face_layout_theme" style="?attr/face_layout_theme"
app:suwFooter="@layout/face_enroll_enrolling_footer"> app:sucFooter="@layout/face_enroll_enrolling_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -71,4 +71,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

10
res/layout/face_enroll_finish.xml
View File

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

4
res/layout/face_enroll_finish_footer.xml
View File

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

14
res/layout/face_enroll_introduction.xml
View File

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

4
res/layout/face_enroll_introduction_footer.xml
View File

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

10
res/layout/fingerprint_enroll_enrolling_base.xml
View File

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

6
res/layout/fingerprint_enroll_find_sensor_base.xml
View File

@@ -15,14 +15,14 @@
~ limitations under the License ~ limitations under the License
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
style="?attr/fingerprint_layout_theme" style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -59,4 +59,4 @@
android:layout_gravity="center_horizontal"/> android:layout_gravity="center_horizontal"/>
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

10
res/layout/fingerprint_enroll_finish_base.xml
View File

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

4
res/layout/fingerprint_enroll_finish_base_footer.xml
View File

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

14
res/layout/fingerprint_enroll_introduction.xml
View File

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

4
res/layout/fingerprint_enroll_introduction_footer.xml
View File

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

4
res/layout/master_clear.xml
View File

@@ -14,7 +14,7 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
@@ -135,4 +135,4 @@
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

4
res/layout/master_clear_confirm.xml
View File

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

6
res/layout/redaction_interstitial.xml
View File

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

2
res/layout/setup_preference.xml
View File

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

6
res/layout/storage_wizard_generic.xml
View File

@@ -14,13 +14,13 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:suwFooter="@layout/storage_wizard_footer"> app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -44,4 +44,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

6
res/layout/storage_wizard_init.xml
View File

@@ -14,13 +14,13 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:suwFooter="@layout/storage_wizard_footer"> app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -136,4 +136,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

6
res/layout/storage_wizard_progress.xml
View File

@@ -14,13 +14,13 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:suwFooter="@layout/storage_wizard_footer"> app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -59,4 +59,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

6
res/layout/storage_wizard_ready.xml
View File

@@ -14,13 +14,13 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:suwFooter="@layout/storage_wizard_footer"> app:sucFooter="@layout/storage_wizard_footer">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
@@ -38,4 +38,4 @@
</LinearLayout> </LinearLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

3
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -39,7 +39,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.util.List; import java.util.List;

5
src/com/android/settings/MasterClear.java
View File

@@ -64,8 +64,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern; import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.TemplateLayout;
import com.android.setupwizardlib.template.ButtonFooterMixin; import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import java.util.List; import java.util.List;

5
src/com/android/settings/MasterClearConfirm.java
View File

@@ -43,8 +43,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.TemplateLayout;
import com.android.setupwizardlib.template.ButtonFooterMixin; import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
/** /**
* Confirm and execute a reset of the device to a clean "just out of the box" * Confirm and execute a reset of the device to a clean "just out of the box"

16
src/com/android/settings/SetupWizardUtils.java
View File

@@ -21,7 +21,9 @@ import android.os.SystemProperties;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.setupwizardlib.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
public class SetupWizardUtils { public class SetupWizardUtils {
@@ -35,17 +37,17 @@ public class SetupWizardUtils {
} }
if (theme != null) { if (theme != null) {
switch (theme) { switch (theme) {
case WizardManagerHelper.THEME_GLIF_V3_LIGHT: case ThemeHelper.THEME_GLIF_V3_LIGHT:
return R.style.GlifV3Theme_Light; return R.style.GlifV3Theme_Light;
case WizardManagerHelper.THEME_GLIF_V3: case ThemeHelper.THEME_GLIF_V3:
return R.style.GlifV3Theme; return R.style.GlifV3Theme;
case WizardManagerHelper.THEME_GLIF_V2_LIGHT: case ThemeHelper.THEME_GLIF_V2_LIGHT:
return R.style.GlifV2Theme_Light; return R.style.GlifV2Theme_Light;
case WizardManagerHelper.THEME_GLIF_V2: case ThemeHelper.THEME_GLIF_V2:
return R.style.GlifV2Theme; return R.style.GlifV2Theme;
case WizardManagerHelper.THEME_GLIF_LIGHT: case ThemeHelper.THEME_GLIF_LIGHT:
return R.style.GlifTheme_Light; return R.style.GlifTheme_Light;
case WizardManagerHelper.THEME_GLIF: case ThemeHelper.THEME_GLIF:
return R.style.GlifTheme; return R.style.GlifTheme;
} }
} }

3
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling; import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;
import com.android.settings.core.InstrumentedActivity; import com.android.settings.core.InstrumentedActivity;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
/** /**
* Base activity for all biometric enrollment steps. * Base activity for all biometric enrollment steps.

3
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -28,7 +28,8 @@ import android.widget.TextView;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.password.ChooseLockGeneric; import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
/** /**
* Abstract base class for the intro onboarding activity for biometric enrollment. * Abstract base class for the intro onboarding activity for biometric enrollment.

3
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -29,7 +29,8 @@ import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {

3
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils; import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
import com.google.android.setupdesign.span.LinkSpan;
public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {

3
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -44,7 +44,8 @@ import androidx.fragment.app.FragmentActivity;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.List; import java.util.List;

3
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -68,7 +68,8 @@ import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial; import com.android.settings.notification.RedactionInterstitial;
import com.android.settings.widget.ImeAwareEditText; import com.android.settings.widget.ImeAwareEditText;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -48,9 +48,9 @@ import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.notification.RedactionInterstitial; import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import com.google.android.setupdesign.GlifLayout;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

3
src/com/android/settings/password/ChooseLockSettingsHelper.java
View File

@@ -31,7 +31,8 @@ import androidx.fragment.app.Fragment;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
public final class ChooseLockSettingsHelper { public final class ChooseLockSettingsHelper {

3
src/com/android/settings/password/ChooseLockTypeDialogFragment.java
View File

@@ -39,7 +39,8 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import java.util.List; import java.util.List;

3
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -38,7 +38,8 @@ import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor; import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
import com.google.android.setupdesign.GlifPreferenceLayout;
/** /**
* Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure

2
src/com/android/settings/utils/SettingsDividerItemDecoration.java
View File

@@ -21,7 +21,7 @@ import android.content.Context;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.android.setupwizardlib.DividerItemDecoration; import com.google.android.setupdesign.DividerItemDecoration;
public class SettingsDividerItemDecoration extends DividerItemDecoration { public class SettingsDividerItemDecoration extends DividerItemDecoration {

3
src/com/android/settings/wifi/WifiDialogActivity.java
View File

@@ -30,7 +30,8 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPoint;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener, public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
DialogInterface.OnDismissListener { DialogInterface.OnDismissListener {

6
tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
View File

@@ -15,14 +15,14 @@
limitations under the License. limitations under the License.
--> -->
<com.android.setupwizardlib.GlifLayout <com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
style="?attr/fingerprint_layout_theme" style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -77,4 +77,4 @@
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
</com.android.setupwizardlib.GlifLayout> </com.google.android.setupdesign.GlifLayout>

12
tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
View File

@@ -22,7 +22,9 @@ import android.content.Intent;
import android.os.SystemProperties; import android.os.SystemProperties;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -47,9 +49,9 @@ public class SetupWizardUtilsTest {
@Test @Test
public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() { public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF); ThemeHelper.THEME_GLIF);
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2); intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme); assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
} }
@@ -57,7 +59,7 @@ public class SetupWizardUtilsTest {
@Test @Test
public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() { public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {
SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF_V2_LIGHT); ThemeHelper.THEME_GLIF_V2_LIGHT);
Intent intent = new Intent(); Intent intent = new Intent();
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light); assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
@@ -66,7 +68,7 @@ public class SetupWizardUtilsTest {
@Test @Test
public void testGetTheme_glifV3Light_shouldReturnThemeResource() { public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
WizardManagerHelper.THEME_GLIF_V3_LIGHT); ThemeHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent(); Intent intent = new Intent();
assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light); assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);

3
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

3
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -32,7 +32,8 @@ import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.testutils.DrawableTestHelper; import com.android.settingslib.testutils.DrawableTestHelper;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.setupdesign.GlifLayout;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

8
tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
View File

@@ -19,7 +19,9 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.setupwizardlib.util.WizardManagerHelper;
import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.util.ThemeHelper;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -109,7 +111,7 @@ public class ChooseLockSettingsHelperTest {
@Test @Test
public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() { public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() {
Intent intent = new Intent() Intent intent = new Intent()
.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2); .putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
Activity activity = Robolectric.buildActivity(Activity.class, intent).get(); Activity activity = Robolectric.buildActivity(Activity.class, intent).get();
ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity); ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */); helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);
@@ -118,7 +120,7 @@ public class ChooseLockSettingsHelperTest {
IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult(); IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
assertThat(startedActivity.requestCode).isEqualTo(123); assertThat(startedActivity.requestCode).isEqualTo(123);
assertThat(startedActivity.intent.getStringExtra(WizardManagerHelper.EXTRA_THEME)) assertThat(startedActivity.intent.getStringExtra(WizardManagerHelper.EXTRA_THEME))
.isEqualTo(WizardManagerHelper.THEME_GLIF_V2); .isEqualTo(ThemeHelper.THEME_GLIF_V2);
} }
private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) { private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {

20
tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
View File

@@ -72,9 +72,9 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
public static void addIncludedResourcePaths(List<ResourcePath> paths) { public static void addIncludedResourcePaths(List<ResourcePath> paths) {
try { try {
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:packages/apps/Settings/res")), null)); Fs.fromURL(new URL("file:packages/apps/Settings/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null)); Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null)); Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
@@ -88,21 +88,19 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null)); Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null)); Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/main/res")), null)); Fs.fromURL(new URL("file:external/setupcompat/main/res")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:external/setupdesign/main/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/target/common/obj/JAVA_LIBRARIES/robolectric_android-all-stub_intermediates/classes/raw-res/res")), null)); Fs.fromURL(new URL("file:out/target/common/obj/JAVA_LIBRARIES/robolectric_android-all-stub_intermediates/classes/raw-res/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/gingerbread/res")), null)); Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/recyclerview/res")), null)); Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/extras/material-design-x/com.google.android.material_material-nodeps/android_common/aar/res/")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null)); Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/extras/material-design-x/com.google.android.material_material-nodeps/android_common/aar/res/")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null)); Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null));
paths.add(new ResourcePath(null, paths.add(new ResourcePath(null,