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

Commit feb27137 authored by Pasty Chang's avatar Pasty Chang Committed by Android (Google) Code Review
Browse files

Merge "Apply FooterButton builder"

parents 1e971fe9 908501e4

src/com/android/settings/EncryptionInterstitial.java

+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()

            );

        }

src/com/android/settings/MasterClear.java

+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();

    }

src/com/android/settings/MasterClearConfirm.java

+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()

        );

    }

src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java

+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)) {

src/com/android/settings/biometrics/face/FaceEnrollFinish.java

+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()

        );

    }