Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908501e4 authored by pastychang's avatar pastychang
Browse files

Apply FooterButton builder

FotterButton constructor in setupcompat will be deprecated, change to
use builder.

Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Ic84b0c91205bf3c770bc658e8eaf2626e4d7bddd
parent 2fe6673d
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -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()
            );
        }

+6 −6
Original line number Diff line number Diff line
@@ -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();
    }
+6 −6
Original line number Diff line number Diff line
@@ -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()
        );
    }

+6 −6
Original line number Diff line number Diff line
@@ -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)) {
+6 −6
Original line number Diff line number Diff line
@@ -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()
        );
    }

Loading