From 908501e40ff873f11665241ff49e48e87105f28f Mon Sep 17 00:00:00 2001 From: pastychang Date: Wed, 26 Dec 2018 10:46:40 +0800 Subject: [PATCH] Apply FooterButton builder FotterButton constructor in setupcompat will be deprecated, change to use builder. Bug: 120805516 Test: RunSettingsRoboTests Change-Id: Ic84b0c91205bf3c770bc658e8eaf2626e4d7bddd --- .../settings/EncryptionInterstitial.java | 24 +++++++++---------- src/com/android/settings/MasterClear.java | 12 +++++----- .../android/settings/MasterClearConfirm.java | 12 +++++----- .../biometrics/face/FaceEnrollEnrolling.java | 12 +++++----- .../biometrics/face/FaceEnrollFinish.java | 12 +++++----- .../face/FaceEnrollIntroduction.java | 24 +++++++++---------- .../FingerprintEnrollEnrolling.java | 12 +++++----- .../FingerprintEnrollFindSensor.java | 12 +++++----- .../fingerprint/FingerprintEnrollFinish.java | 23 +++++++++--------- .../FingerprintEnrollIntroduction.java | 24 +++++++++---------- .../deviceinfo/StorageWizardBase.java | 24 +++++++++---------- .../notification/RedactionInterstitial.java | 12 +++++----- 12 files changed, 101 insertions(+), 102 deletions(-) diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index a524a66f3e0..656b18c3919 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -152,21 +152,21 @@ public class EncryptionInterstitial extends SettingsActivity { final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class); buttonFooterMixin.setSecondaryButton( - new FooterButton( - getContext(), - R.string.encryption_interstitial_no, - this::onNoButtonClicked, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(getContext()) + .setText(R.string.encryption_interstitial_no) + .setListener(this::onNoButtonClicked) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); buttonFooterMixin.setPrimaryButton( - new FooterButton( - getContext(), - R.string.encryption_interstitial_yes, - this::onYesButtonClicked, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(getContext()) + .setText(R.string.encryption_interstitial_yes) + .setListener(this::onYesButtonClicked) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index 61a247dd38a..e4ce644304b 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -419,12 +419,12 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout); final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class); buttonFooterMixin.setPrimaryButton( - new FooterButton( - getActivity(), - R.string.master_clear_button_text, - mInitiateListener, - ButtonType.OTHER, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(getActivity()) + .setText(R.string.master_clear_button_text) + .setListener(mInitiateListener) + .setButtonType(ButtonType.OTHER) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); mInitiateButton = buttonFooterMixin.getPrimaryButton(); } diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index b2bf838cfbf..0750cb14b98 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -156,12 +156,12 @@ public class MasterClearConfirm extends InstrumentedFragment { final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class); buttonFooterMixin.setPrimaryButton( - new FooterButton( - getActivity(), - R.string.master_clear_button_text, - mFinalClickListener, - ButtonType.OTHER, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(getActivity()) + .setText(R.string.master_clear_button_text) + .setListener(mFinalClickListener) + .setButtonType(ButtonType.OTHER) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java index 8cc71336fa0..ec75266bcc6 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java @@ -93,12 +93,12 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.security_settings_face_enroll_enrolling_skip, - this::onSkipButtonClick, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_enrolling_skip) + .setListener(this::onSkipButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_DIVERSITY, true)) { diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java index f0ff5234ebe..afd6f55f1ad 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java @@ -39,12 +39,12 @@ public class FaceEnrollFinish extends BiometricEnrollBase { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setPrimaryButton( - new FooterButton( - this, - R.string.security_settings_face_enroll_done, - this::onNextButtonClick, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_done) + .setListener(this::onNextButtonClick) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index a90cf5d9249..93118100c26 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -62,21 +62,21 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.security_settings_face_enroll_introduction_cancel, - this::onCancelButtonClick, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_introduction_cancel) + .setListener(this::onCancelButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); mButtonFooterMixin.setPrimaryButton( - new FooterButton( - this, - R.string.wizard_next, - this::onNextButtonClick, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(this) + .setText(R.string.wizard_next) + .setListener(this::onNextButtonClick) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 5953c10e500..88e1c6a137f 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -139,12 +139,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.security_settings_fingerprint_enroll_enrolling_skip, - this::onSkipButtonClick, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) + .setListener(this::onSkipButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); final LayerDrawable fingerprintDrawable = (LayerDrawable) mProgressBar.getBackground(); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index b8a0f40834e..1b97d19e5dd 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -49,12 +49,12 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { setContentView(getContentView()); mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.skip_label, - this::onSkipButtonClick, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.skip_label) + .setListener(this::onSkipButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index 76f1d1fa033..db7d92ea679 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -44,21 +44,20 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.fingerprint_enroll_button_add, - null, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.fingerprint_enroll_button_add) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); mButtonFooterMixin.setPrimaryButton( - new FooterButton( - this, - R.string.security_settings_fingerprint_enroll_done, - this::onNextButtonClick, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_fingerprint_enroll_done) + .setListener(this::onNextButtonClick) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 4eca87d4bf9..1ad11e30a73 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -49,21 +49,21 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.security_settings_face_enroll_introduction_cancel, - this::onCancelButtonClick, - FooterButton.ButtonType.SKIP, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.security_settings_face_enroll_introduction_cancel) + .setListener(this::onCancelButtonClick) + .setButtonType(FooterButton.ButtonType.SKIP) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); mButtonFooterMixin.setPrimaryButton( - new FooterButton( - this, - R.string.wizard_next, - this::onNextButtonClick, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(this) + .setText(R.string.wizard_next) + .setListener(this::onNextButtonClick) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); } diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index 9950d3ffaa0..4d6ded15b6c 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -96,20 +96,20 @@ public abstract class StorageWizardBase extends FragmentActivity { mButtonFooterMixin = getGlifLayout().getMixin(ButtonFooterMixin.class); mButtonFooterMixin.setSecondaryButton( - new FooterButton( - this, - R.string.wizard_back, - this::onNavigateBack, - FooterButton.ButtonType.OTHER, - R.style.SuwGlifButton_Secondary) + new FooterButton.Builder(this) + .setText(R.string.wizard_back) + .setListener(this::onNavigateBack) + .setButtonType(FooterButton.ButtonType.OTHER) + .setTheme(R.style.SuwGlifButton_Secondary) + .build() ); mButtonFooterMixin.setPrimaryButton( - new FooterButton( - this, - R.string.wizard_next, - this::onNavigateNext, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(this) + .setText(R.string.wizard_next) + .setListener(this::onNavigateNext) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); mBack = mButtonFooterMixin.getSecondaryButton(); mNext = mButtonFooterMixin.getPrimaryButton(); diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index a45dba187c9..b2f2d25f2b4 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -135,12 +135,12 @@ public class RedactionInterstitial extends SettingsActivity { final GlifLayout layout = view.findViewById(R.id.setup_wizard_layout); final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class); buttonFooterMixin.setPrimaryButton( - new FooterButton( - getContext(), - R.string.app_notifications_dialog_done, - this::onDoneButtonClicked, - FooterButton.ButtonType.NEXT, - R.style.SuwGlifButton_Primary) + new FooterButton.Builder(getContext()) + .setText(R.string.app_notifications_dialog_done) + .setListener(this::onDoneButtonClicked) + .setButtonType(FooterButton.ButtonType.NEXT) + .setTheme(R.style.SuwGlifButton_Primary) + .build() ); }