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

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

Merge "Rename ButtonFooterMixin to FooterBarMixin"

parents a4118f8e 9bdb59a7

src/com/android/settings/EncryptionInterstitial.java

+5 −5
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ import com.android.settings.core.InstrumentedFragment; 
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.item.FooterButton;

import com.google.android.setupcompat.template.ButtonFooterMixin;

import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifLayout;



import java.util.List;
@@ -150,8 +150,8 @@ public class EncryptionInterstitial extends SettingsActivity { 
            GlifLayout layout = (GlifLayout) view;

            layout.setHeaderText(getActivity().getTitle());



            final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);

            buttonFooterMixin.setSecondaryButton(

            final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

            mixin.setSecondaryButton(

                    new FooterButton.Builder(getContext())

                            .setText(R.string.encryption_interstitial_no)

                            .setListener(this::onNoButtonClicked)
@@ -160,7 +160,7 @@ public class EncryptionInterstitial extends SettingsActivity { 
                            .build()

            );



            buttonFooterMixin.setPrimaryButton(

            mixin.setPrimaryButton(

                    new FooterButton.Builder(getContext())

                            .setText(R.string.encryption_interstitial_yes)

                            .setListener(this::onYesButtonClicked)

src/com/android/settings/MasterClear.java

+6 −6
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ import com.android.settings.password.ConfirmLockPattern; 
import com.android.settingslib.RestrictedLockUtilsInternal;



import com.google.android.setupcompat.TemplateLayout;

import com.google.android.setupcompat.item.FooterButton;

import com.google.android.setupcompat.item.FooterButton.ButtonType;

import com.google.android.setupcompat.template.ButtonFooterMixin;

import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.template.FooterButton.ButtonType;



import java.util.List;
@@ -417,8 +417,8 @@ 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(

        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

        mixin.setPrimaryButton(

                new FooterButton.Builder(getActivity())

                        .setText(R.string.master_clear_button_text)

                        .setListener(mInitiateListener)
@@ -426,7 +426,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
                        .setTheme(R.style.SudGlifButton_Primary)

                        .build()

        );

        mInitiateButton = buttonFooterMixin.getPrimaryButton();

        mInitiateButton = mixin.getPrimaryButton();

    }



    private void getContentDescription(View v, StringBuffer description) {

src/com/android/settings/MasterClearConfirm.java

+5 −5
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; 
import com.android.settingslib.RestrictedLockUtilsInternal;



import com.google.android.setupcompat.TemplateLayout;

import com.google.android.setupcompat.item.FooterButton;

import com.google.android.setupcompat.item.FooterButton.ButtonType;

import com.google.android.setupcompat.template.ButtonFooterMixin;

import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.template.FooterButton.ButtonType;



/**

 * Confirm and execute a reset of the device to a clean "just out of the box"
@@ -154,8 +154,8 @@ public class MasterClearConfirm extends InstrumentedFragment { 
    private void establishFinalConfirmationState() {

        final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);



        final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);

        buttonFooterMixin.setPrimaryButton(

        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);

        mixin.setPrimaryButton(

                new FooterButton.Builder(getActivity())

                        .setText(R.string.master_clear_button_text)

                        .setListener(mFinalClickListener)

src/com/android/settings/biometrics/BiometricEnrollBase.java

+5 −5
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling; 
import com.android.settings.core.InstrumentedActivity;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.item.FooterButton;

import com.google.android.setupcompat.template.ButtonFooterMixin;

import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.GlifLayout;



/**
@@ -78,7 +78,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
    protected boolean mLaunchedConfirmLock;

    protected byte[] mToken;

    protected int mUserId;

    protected ButtonFooterMixin mButtonFooterMixin;

    protected FooterBarMixin mFooterBarMixin;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -137,8 +137,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
    }



    protected FooterButton getNextButton() {

        if (mButtonFooterMixin != null) {

            return mButtonFooterMixin.getPrimaryButton();

        if (mFooterBarMixin != null) {

            return mFooterBarMixin.getPrimaryButton();

        }

        return null;

    }

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.settings.R; 
import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.item.FooterButton;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupdesign.span.LinkSpan;



/**