From c1f8600d9ffd399fbf6bc630ee35815a392727b9 Mon Sep 17 00:00:00 2001 From: Pasty Chang Date: Tue, 11 Dec 2018 02:22:55 +0000 Subject: [PATCH] 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 --- Android.mk | 3 ++- res/layout-land/choose_lock_pattern.xml | 8 ++++---- .../confirm_lock_pattern_normal.xml | 8 ++++---- .../fingerprint_enroll_enrolling.xml | 8 ++++---- .../fingerprint_enroll_find_sensor.xml | 4 ++-- res/layout-land/fingerprint_enroll_finish.xml | 12 +++++------ res/layout/choose_lock_password.xml | 6 +++--- res/layout/choose_lock_pattern_common.xml | 10 +++++----- .../choose_lock_pattern_common_footer.xml | 4 ++-- res/layout/confirm_lock_password_normal.xml | 4 ++-- .../confirm_lock_pattern_normal_base.xml | 8 ++++---- res/layout/encryption_interstitial.xml | 6 +++--- res/layout/face_enroll_enrolling.xml | 6 +++--- res/layout/face_enroll_finish.xml | 10 +++++----- res/layout/face_enroll_finish_footer.xml | 4 ++-- res/layout/face_enroll_introduction.xml | 14 ++++++------- .../face_enroll_introduction_footer.xml | 4 ++-- .../fingerprint_enroll_enrolling_base.xml | 10 +++++----- .../fingerprint_enroll_find_sensor_base.xml | 6 +++--- res/layout/fingerprint_enroll_finish_base.xml | 10 +++++----- .../fingerprint_enroll_finish_base_footer.xml | 4 ++-- .../fingerprint_enroll_introduction.xml | 14 ++++++------- ...fingerprint_enroll_introduction_footer.xml | 4 ++-- res/layout/master_clear.xml | 4 ++-- res/layout/master_clear_confirm.xml | 4 ++-- res/layout/redaction_interstitial.xml | 6 +++--- res/layout/setup_preference.xml | 2 +- res/layout/storage_wizard_generic.xml | 6 +++--- res/layout/storage_wizard_init.xml | 6 +++--- res/layout/storage_wizard_progress.xml | 6 +++--- res/layout/storage_wizard_ready.xml | 6 +++--- .../settings/EncryptionInterstitial.java | 3 ++- src/com/android/settings/MasterClear.java | 5 +++-- .../android/settings/MasterClearConfirm.java | 5 +++-- .../android/settings/SetupWizardUtils.java | 16 ++++++++------- .../biometrics/BiometricEnrollBase.java | 3 ++- .../BiometricEnrollIntroduction.java | 3 ++- .../face/FaceEnrollIntroduction.java | 3 ++- .../FingerprintEnrollIntroduction.java | 3 ++- .../deviceinfo/StorageWizardBase.java | 3 ++- .../settings/password/ChooseLockPassword.java | 3 ++- .../settings/password/ChooseLockPattern.java | 2 +- .../password/ChooseLockSettingsHelper.java | 3 ++- .../ChooseLockTypeDialogFragment.java | 3 ++- .../password/SetupChooseLockGeneric.java | 3 ++- .../utils/SettingsDividerItemDecoration.java | 2 +- .../settings/wifi/WifiDialogActivity.java | 3 ++- .../fingerprint_enroll_find_sensor.xml | 6 +++--- .../settings/SetupWizardUtilsTest.java | 12 ++++++----- .../password/ChooseLockPasswordTest.java | 3 ++- .../password/ChooseLockPatternTest.java | 3 ++- .../ChooseLockSettingsHelperTest.java | 8 +++++--- .../SettingsRobolectricTestRunner.java | 20 +++++++++---------- 53 files changed, 171 insertions(+), 151 deletions(-) diff --git a/Android.mk b/Android.mk index 04749bfa45f..7eb9b6ac071 100644 --- a/Android.mk +++ b/Android.mk @@ -30,6 +30,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ androidx.preference_preference \ androidx.recyclerview_recyclerview \ com.google.android.material_material \ + setupcompat \ + setupdesign LOCAL_JAVA_LIBRARIES := \ telephony-common \ @@ -53,7 +55,6 @@ ifneq ($(INCREMENTAL_BUILDS),) LOCAL_JACK_FLAGS := --multi-dex native endif -include frameworks/opt/setupwizard/library/common-gingerbread.mk include frameworks/base/packages/SettingsLib/common.mk include frameworks/base/packages/SettingsLib/search/common.mk diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml index 4d6f798c39c..25230cbc714 100644 --- a/res/layout-land/choose_lock_pattern.xml +++ b/res/layout-land/choose_lock_pattern.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - - + - + diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml index 158d3437faf..23e5d6618a1 100644 --- a/res/layout-land/confirm_lock_pattern_normal.xml +++ b/res/layout-land/confirm_lock_pattern_normal.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + - + diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml index 8b902f17f8b..eb326023f76 100644 --- a/res/layout-land/fingerprint_enroll_enrolling.xml +++ b/res/layout-land/fingerprint_enroll_enrolling.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> - - - + - + diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml index 8712ad70e34..e6a2e66feac 100644 --- a/res/layout-land/fingerprint_enroll_find_sensor.xml +++ b/res/layout-land/fingerprint_enroll_find_sensor.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> - - + diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml index 04ed5403f19..1187c208d39 100644 --- a/res/layout-land/fingerprint_enroll_finish.xml +++ b/res/layout-land/fingerprint_enroll_finish.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> - - - + - @@ -120,8 +120,8 @@ android:contentDescription="@android:string/fingerprint_icon_content_description" android:src="@drawable/fingerprint_enroll_finish" /> - + - + diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index cea3e128c90..1962ee0befe 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml index 77dd12d6dbc..df7fd8c48dd 100644 --- a/res/layout/choose_lock_pattern_common.xml +++ b/res/layout/choose_lock_pattern_common.xml @@ -16,14 +16,14 @@ --> - - - + @@ -119,4 +119,4 @@ - + diff --git a/res/layout/choose_lock_pattern_common_footer.xml b/res/layout/choose_lock_pattern_common_footer.xml index deea8f03d4b..b0397eaf95a 100644 --- a/res/layout/choose_lock_pattern_common_footer.xml +++ b/res/layout/choose_lock_pattern_common_footer.xml @@ -16,7 +16,7 @@ --> - - + diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml index 0b516cab031..4b92a4a257c 100644 --- a/res/layout/confirm_lock_password_normal.xml +++ b/res/layout/confirm_lock_password_normal.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml index bfabf996c01..14798dfbfd5 100644 --- a/res/layout/confirm_lock_pattern_normal_base.xml +++ b/res/layout/confirm_lock_pattern_normal_base.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + - + diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml index f827e37371c..ff56a7c5b9a 100644 --- a/res/layout/encryption_interstitial.xml +++ b/res/layout/encryption_interstitial.xml @@ -15,13 +15,13 @@ limitations under the License. --> - + app:sucFooter="@layout/encryption_interstitial_footer"> - + diff --git a/res/layout/face_enroll_enrolling.xml b/res/layout/face_enroll_enrolling.xml index 2208cc264d7..e596ff94e97 100644 --- a/res/layout/face_enroll_enrolling.xml +++ b/res/layout/face_enroll_enrolling.xml @@ -15,14 +15,14 @@ ~ limitations under the License. --> - + app:sucFooter="@layout/face_enroll_enrolling_footer"> - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/face_enroll_finish.xml b/res/layout/face_enroll_finish.xml index 9966497bcb4..6b3e6ab554a 100644 --- a/res/layout/face_enroll_finish.xml +++ b/res/layout/face_enroll_finish.xml @@ -15,14 +15,14 @@ ~ limitations under the License --> - + app:sucFooter="@layout/face_enroll_finish_footer"> - @@ -51,10 +51,10 @@ android:contentDescription="@null" android:src="@drawable/face_enroll_introduction" /> - + - + diff --git a/res/layout/face_enroll_finish_footer.xml b/res/layout/face_enroll_finish_footer.xml index 06d263906f2..b33cde79fd4 100644 --- a/res/layout/face_enroll_finish_footer.xml +++ b/res/layout/face_enroll_finish_footer.xml @@ -16,7 +16,7 @@ --> - - + diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml index a56bca595cf..7a5c172dac6 100644 --- a/res/layout/face_enroll_introduction.xml +++ b/res/layout/face_enroll_introduction.xml @@ -15,14 +15,14 @@ ~ limitations under the License --> - + app:sucFooter="@layout/face_enroll_introduction_footer"> - - - @@ -57,8 +57,8 @@ android:contentDescription="@null" android:src="@drawable/face_enroll_introduction" /> - + - + diff --git a/res/layout/face_enroll_introduction_footer.xml b/res/layout/face_enroll_introduction_footer.xml index 0fcc13b5819..d73a8edffe3 100644 --- a/res/layout/face_enroll_introduction_footer.xml +++ b/res/layout/face_enroll_introduction_footer.xml @@ -16,7 +16,7 @@ --> - - + diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml index 00a452ca8e8..5a2b60f5d90 100644 --- a/res/layout/fingerprint_enroll_enrolling_base.xml +++ b/res/layout/fingerprint_enroll_enrolling_base.xml @@ -15,14 +15,14 @@ ~ limitations under the License --> - + app:sucFooter="@layout/fingerprint_enroll_enrolling_base_footer"> - - + - + diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml index ea518a7c63c..18941a2a831 100644 --- a/res/layout/fingerprint_enroll_find_sensor_base.xml +++ b/res/layout/fingerprint_enroll_find_sensor_base.xml @@ -15,14 +15,14 @@ ~ limitations under the License --> - + app:sucFooter="@layout/fingerprint_enroll_find_sensor_base_footer"> - + diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml index 819bf4e5725..5224dabb9a1 100644 --- a/res/layout/fingerprint_enroll_finish_base.xml +++ b/res/layout/fingerprint_enroll_finish_base.xml @@ -15,14 +15,14 @@ ~ limitations under the License --> - + app:sucFooter="@layout/fingerprint_enroll_finish_base_footer"> - - + - + diff --git a/res/layout/fingerprint_enroll_finish_base_footer.xml b/res/layout/fingerprint_enroll_finish_base_footer.xml index 4c257fa489e..91164bdea66 100644 --- a/res/layout/fingerprint_enroll_finish_base_footer.xml +++ b/res/layout/fingerprint_enroll_finish_base_footer.xml @@ -16,7 +16,7 @@ --> - - + diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml index 4228f4205d4..701d94a6253 100644 --- a/res/layout/fingerprint_enroll_introduction.xml +++ b/res/layout/fingerprint_enroll_introduction.xml @@ -15,14 +15,14 @@ limitations under the License --> - + app:sucFooter="@layout/fingerprint_enroll_introduction_footer"> - - - @@ -57,8 +57,8 @@ android:contentDescription="@null" android:src="@drawable/fingerprint_enroll_introduction" /> - + - + diff --git a/res/layout/fingerprint_enroll_introduction_footer.xml b/res/layout/fingerprint_enroll_introduction_footer.xml index b2d697340cf..1298d829d38 100644 --- a/res/layout/fingerprint_enroll_introduction_footer.xml +++ b/res/layout/fingerprint_enroll_introduction_footer.xml @@ -16,7 +16,7 @@ --> - - + diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml index 8d4d6231a23..83b02ff2763 100644 --- a/res/layout/master_clear.xml +++ b/res/layout/master_clear.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - + diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml index d513dbb3135..2acdfcecf40 100644 --- a/res/layout/master_clear_confirm.xml +++ b/res/layout/master_clear_confirm.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml index 939ff92b9ac..929ac078b13 100644 --- a/res/layout/redaction_interstitial.xml +++ b/res/layout/redaction_interstitial.xml @@ -15,14 +15,14 @@ limitations under the License --> - - + diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index 298bc9a473b..314bb0ede33 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -15,7 +15,7 @@ limitations under the License. --> - - + app:sucFooter="@layout/storage_wizard_footer"> - + diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml index 4905de604f5..3b7a5de5346 100644 --- a/res/layout/storage_wizard_init.xml +++ b/res/layout/storage_wizard_init.xml @@ -14,13 +14,13 @@ limitations under the License. --> - + app:sucFooter="@layout/storage_wizard_footer"> - + diff --git a/res/layout/storage_wizard_progress.xml b/res/layout/storage_wizard_progress.xml index 0b38475eb81..e1d685bace3 100644 --- a/res/layout/storage_wizard_progress.xml +++ b/res/layout/storage_wizard_progress.xml @@ -14,13 +14,13 @@ limitations under the License. --> - + app:sucFooter="@layout/storage_wizard_footer"> - + diff --git a/res/layout/storage_wizard_ready.xml b/res/layout/storage_wizard_ready.xml index a9e4ddf9bb6..e947758e7e9 100644 --- a/res/layout/storage_wizard_ready.xml +++ b/res/layout/storage_wizard_ready.xml @@ -14,13 +14,13 @@ limitations under the License. --> - + app:sucFooter="@layout/storage_wizard_footer"> - + diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index caef9888a45..8cae26b831f 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -39,7 +39,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockSettingsHelper; -import com.android.setupwizardlib.GlifLayout; + +import com.google.android.setupdesign.GlifLayout; import java.util.List; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 307bbc1425a..8e745a3823f 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -64,8 +64,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; 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; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 8ebb71054b3..ffbb2aa1307 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -43,8 +43,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; 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" diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index 27cdb691d2b..0dbb2dcef9d 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -21,7 +21,9 @@ import android.os.SystemProperties; 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 { @@ -35,17 +37,17 @@ public class SetupWizardUtils { } if (theme != null) { switch (theme) { - case WizardManagerHelper.THEME_GLIF_V3_LIGHT: + case ThemeHelper.THEME_GLIF_V3_LIGHT: return R.style.GlifV3Theme_Light; - case WizardManagerHelper.THEME_GLIF_V3: + case ThemeHelper.THEME_GLIF_V3: return R.style.GlifV3Theme; - case WizardManagerHelper.THEME_GLIF_V2_LIGHT: + case ThemeHelper.THEME_GLIF_V2_LIGHT: return R.style.GlifV2Theme_Light; - case WizardManagerHelper.THEME_GLIF_V2: + case ThemeHelper.THEME_GLIF_V2: return R.style.GlifV2Theme; - case WizardManagerHelper.THEME_GLIF_LIGHT: + case ThemeHelper.THEME_GLIF_LIGHT: return R.style.GlifTheme_Light; - case WizardManagerHelper.THEME_GLIF: + case ThemeHelper.THEME_GLIF: return R.style.GlifTheme; } } diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index f5a1b5e6560..0aa8936241c 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -32,7 +32,8 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling; import com.android.settings.core.InstrumentedActivity; import com.android.settings.password.ChooseLockSettingsHelper; -import com.android.setupwizardlib.GlifLayout; + +import com.google.android.setupdesign.GlifLayout; /** * Base activity for all biometric enrollment steps. diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java index beefb39759d..2424eb10280 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java @@ -28,7 +28,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.password.ChooseLockGeneric; 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. diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index 748f874813b..c4a9c4f06bc 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -29,7 +29,8 @@ import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedLockUtilsInternal; -import com.android.setupwizardlib.span.LinkSpan; + +import com.google.android.setupdesign.span.LinkSpan; public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 241545dfb39..8821ce5c6c3 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -32,7 +32,8 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtilsInternal; -import com.android.setupwizardlib.span.LinkSpan; + +import com.google.android.setupdesign.span.LinkSpan; public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index ef0e46b745e..50c908acc8d 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -44,7 +44,8 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settingslib.Utils; -import com.android.setupwizardlib.GlifLayout; + +import com.google.android.setupdesign.GlifLayout; import java.text.NumberFormat; import java.util.List; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 1ef95da036a..32d4edf78dd 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -68,7 +68,8 @@ import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; import com.android.settings.widget.ImeAwareEditText; -import com.android.setupwizardlib.GlifLayout; + +import com.google.android.setupdesign.GlifLayout; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 0d06ed8292a..1c9e3ff5951 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -48,9 +48,9 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; -import com.android.setupwizardlib.GlifLayout; import com.google.android.collect.Lists; +import com.google.android.setupdesign.GlifLayout; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 938dec46f6c..1c9191a3f73 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java @@ -31,7 +31,8 @@ import androidx.fragment.app.Fragment; import com.android.internal.widget.LockPatternUtils; import com.android.settings.SettingsActivity; import com.android.settings.Utils; -import com.android.setupwizardlib.util.WizardManagerHelper; + +import com.google.android.setupcompat.util.WizardManagerHelper; public final class ChooseLockSettingsHelper { diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java index 10c73c575f5..191f82795a6 100644 --- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java +++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java @@ -39,7 +39,8 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; -import com.android.setupwizardlib.util.WizardManagerHelper; + +import com.google.android.setupcompat.util.WizardManagerHelper; import java.util.List; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 76001048ace..8cd40d5254d 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -38,7 +38,8 @@ import com.android.settings.SetupEncryptionInterstitial; import com.android.settings.SetupWizardUtils; import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor; 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 diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 85cd9617b98..3d9e9019747 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -21,7 +21,7 @@ import android.content.Context; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import com.android.setupwizardlib.DividerItemDecoration; +import com.google.android.setupdesign.DividerItemDecoration; public class SettingsDividerItemDecoration extends DividerItemDecoration { diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index e3a03ad55c9..9ef6a39a028 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -30,7 +30,8 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.SetupWizardUtils; 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, DialogInterface.OnDismissListener { diff --git a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml index cedf5b9eb62..50e2a379894 100644 --- a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml +++ b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml @@ -15,14 +15,14 @@ limitations under the License. --> - + app:sucFooter="@layout/fingerprint_enroll_find_sensor_base_footer"> - + diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index beabd15a4b6..6220ac18f62 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -22,7 +22,9 @@ import android.content.Intent; import android.os.SystemProperties; 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.runner.RunWith; @@ -47,9 +49,9 @@ public class SetupWizardUtilsTest { @Test public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() { SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, - WizardManagerHelper.THEME_GLIF); + ThemeHelper.THEME_GLIF); 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); } @@ -57,7 +59,7 @@ public class SetupWizardUtilsTest { @Test public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() { SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, - WizardManagerHelper.THEME_GLIF_V2_LIGHT); + ThemeHelper.THEME_GLIF_V2_LIGHT); Intent intent = new Intent(); assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light); @@ -66,7 +68,7 @@ public class SetupWizardUtilsTest { @Test public void testGetTheme_glifV3Light_shouldReturnThemeResource() { SystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME, - WizardManagerHelper.THEME_GLIF_V3_LIGHT); + ThemeHelper.THEME_GLIF_V3_LIGHT); Intent intent = new Intent(); assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light); diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index fd44e4f1a36..6e3e4294cd3 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -32,7 +32,8 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; 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.Before; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index ab7f7954cc5..352e2c43807 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -32,7 +32,8 @@ import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.testutils.DrawableTestHelper; -import com.android.setupwizardlib.GlifLayout; + +import com.google.android.setupdesign.GlifLayout; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index e3f3833ac33..12b0ebfd3bd 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -19,7 +19,9 @@ import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; 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.runner.RunWith; @@ -109,7 +111,7 @@ public class ChooseLockSettingsHelperTest { @Test public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() { 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(); ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity); helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */); @@ -118,7 +120,7 @@ public class ChooseLockSettingsHelperTest { IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult(); assertThat(startedActivity.requestCode).isEqualTo(123); assertThat(startedActivity.intent.getStringExtra(WizardManagerHelper.EXTRA_THEME)) - .isEqualTo(WizardManagerHelper.THEME_GLIF_V2); + .isEqualTo(ThemeHelper.THEME_GLIF_V2); } private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) { diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 74914f4eb44..6a177950c0d 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -72,9 +72,9 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { public static void addIncludedResourcePaths(List paths) { try { 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, - 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, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null)); paths.add(new ResourcePath(null, @@ -88,21 +88,19 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner { paths.add(new ResourcePath(null, Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SettingsLayoutPreference/res")), 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, - 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, 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, - 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, - 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, - 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, - 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)); + 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/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null)); paths.add(new ResourcePath(null,