diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java index e80b6d37909..317e3bd6693 100644 --- a/src/com/android/settings/EncryptionInterstitial.java +++ b/src/com/android/settings/EncryptionInterstitial.java @@ -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) diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index f9e4317ecec..8dad57fc652 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -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) { diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index de7cd06924a..c25f2af5368 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -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) diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index 4b1c9bc4a3b..bca70d7acfa 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -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; } diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java index 79e699d9c88..e8cf8095c57 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java @@ -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; /** diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java index 8ec64e5340d..3456c23e39f 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java @@ -33,8 +33,8 @@ import com.android.settings.biometrics.BiometricEnrollSidecar; import com.android.settings.biometrics.BiometricErrorDialog; import com.android.settings.biometrics.BiometricsEnrollEnrolling; -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 java.util.ArrayList; @@ -91,8 +91,8 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator( this, android.R.interpolator.linear_out_slow_in); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_face_enroll_enrolling_skip) .setListener(this::onSkipButtonClick) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java index 4db9a4ef2cc..6e99cdb344a 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollFinish.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollFinish.java @@ -23,8 +23,8 @@ import android.view.View; import com.android.settings.R; import com.android.settings.biometrics.BiometricEnrollBase; -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; /** * Activity which concludes face enrollment. @@ -37,8 +37,8 @@ public class FaceEnrollFinish extends BiometricEnrollBase { setContentView(R.layout.face_enroll_finish); setHeaderText(R.string.security_settings_face_enroll_finish_title); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setPrimaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_face_enroll_done) .setListener(this::onNextButtonClick) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index fc4f6ced054..e920b170edb 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -34,8 +34,8 @@ import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedLockUtilsInternal; -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.span.LinkSpan; public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { @@ -60,8 +60,8 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { mSwitchVision = findViewById(R.id.toggle_vision); mSwitchDiversity = findViewById(R.id.toggle_diversity); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_face_enroll_introduction_cancel) .setListener(this::onCancelButtonClick) @@ -70,7 +70,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { .build() ); - mButtonFooterMixin.setPrimaryButton( + mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) .setText(R.string.wizard_next) .setListener(this::onNextButtonClick) @@ -108,16 +108,16 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected FooterButton getCancelButton() { - if (mButtonFooterMixin != null) { - return mButtonFooterMixin.getSecondaryButton(); + if (mFooterBarMixin != null) { + return mFooterBarMixin.getSecondaryButton(); } return null; } @Override protected FooterButton getNextButton() { - if (mButtonFooterMixin != null) { - return mButtonFooterMixin.getPrimaryButton(); + if (mFooterBarMixin != null) { + return mFooterBarMixin.getPrimaryButton(); } return null; } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 3292b8da00d..3d4ea16ed68 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -47,8 +47,8 @@ import com.android.settings.biometrics.BiometricErrorDialog; import com.android.settings.biometrics.BiometricsEnrollEnrolling; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -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; /** * Activity which handles the actual enrolling for fingerprint. @@ -137,8 +137,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar); mVibrator = getSystemService(Vibrator.class); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_enrolling_skip) .setListener(this::onSkipButtonClick) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index 7ed8d7d5403..558959206cf 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java @@ -30,8 +30,8 @@ import com.android.settings.biometrics.BiometricEnrollBase; import com.android.settings.biometrics.BiometricEnrollSidecar.Listener; 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; /** * Activity explaining the fingerprint sensor location for fingerprint enrollment. @@ -48,8 +48,8 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(getContentView()); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.skip_label) .setListener(this::onSkipButtonClick) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java index 61128a3efe0..3f02b6f08cc 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java @@ -26,8 +26,8 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollBase; -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; /** * Activity which concludes fingerprint enrollment. @@ -42,8 +42,8 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { setContentView(R.layout.fingerprint_enroll_finish); setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.fingerprint_enroll_button_add) .setButtonType(FooterButton.ButtonType.SKIP) @@ -51,7 +51,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { .build() ); - mButtonFooterMixin.setPrimaryButton( + mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_fingerprint_enroll_done) .setListener(this::onNextButtonClick) @@ -65,7 +65,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { protected void onResume() { super.onResume(); - FooterButton addButton = mButtonFooterMixin.getSecondaryButton(); + FooterButton addButton = mFooterBarMixin.getSecondaryButton(); final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this); boolean hideAddAnother = false; diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 2ad4ada74ef..d3618dbf37b 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -32,8 +32,8 @@ import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtilsInternal; -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.span.LinkSpan; public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @@ -47,8 +47,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { super.onCreate(savedInstanceState); mFingerprintManager = Utils.getFingerprintManagerOrNull(this); - mButtonFooterMixin = getLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.security_settings_face_enroll_introduction_cancel) .setListener(this::onCancelButtonClick) @@ -57,7 +57,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { .build() ); - mButtonFooterMixin.setPrimaryButton( + mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) .setText(R.string.wizard_next) .setListener(this::onNextButtonClick) @@ -95,16 +95,16 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected FooterButton getCancelButton() { - if (mButtonFooterMixin != null) { - return mButtonFooterMixin.getSecondaryButton(); + if (mFooterBarMixin != null) { + return mFooterBarMixin.getSecondaryButton(); } return null; } @Override protected FooterButton getNextButton() { - if (mButtonFooterMixin != null) { - return mButtonFooterMixin.getPrimaryButton(); + if (mFooterBarMixin != null) { + return mFooterBarMixin.getPrimaryButton(); } return null; } diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java index 704ed13be1d..307553d7f58 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java @@ -23,7 +23,7 @@ import android.hardware.fingerprint.FingerprintManager; import com.android.settings.R; import com.android.settings.Utils; -import com.google.android.setupcompat.item.FooterButton; +import com.google.android.setupcompat.template.FooterButton; public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction { diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java index 24a0069c327..971a41047b2 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java @@ -24,7 +24,7 @@ import com.android.settings.R; import com.android.settings.SetupWizardUtils; import com.android.settings.password.ChooseLockSettingsHelper; -import com.google.android.setupcompat.item.FooterButton; +import com.google.android.setupcompat.template.FooterButton; public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish { diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java index 6a92eba1c43..7ccb47ce207 100644 --- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java @@ -34,7 +34,7 @@ import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment import com.android.settings.password.SetupChooseLockGeneric; import com.android.settings.password.SetupSkipDialog; -import com.google.android.setupcompat.item.FooterButton; +import com.google.android.setupcompat.template.FooterButton; public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction { private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent"; diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index db0d0d02954..48cdeebcabd 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -44,8 +44,8 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.R; import com.android.settingslib.Utils; -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.text.NumberFormat; @@ -63,7 +63,7 @@ public abstract class StorageWizardBase extends FragmentActivity { protected VolumeInfo mVolume; protected DiskInfo mDisk; - private ButtonFooterMixin mButtonFooterMixin; + private FooterBarMixin mFooterBarMixin; private FooterButton mBack; private FooterButton mNext; @@ -94,8 +94,8 @@ public abstract class StorageWizardBase extends FragmentActivity { public void setContentView(@LayoutRes int layoutResID) { super.setContentView(layoutResID); - mButtonFooterMixin = getGlifLayout().getMixin(ButtonFooterMixin.class); - mButtonFooterMixin.setSecondaryButton( + mFooterBarMixin = getGlifLayout().getMixin(FooterBarMixin.class); + mFooterBarMixin.setSecondaryButton( new FooterButton.Builder(this) .setText(R.string.wizard_back) .setListener(this::onNavigateBack) @@ -103,7 +103,7 @@ public abstract class StorageWizardBase extends FragmentActivity { .setTheme(R.style.SudGlifButton_Secondary) .build() ); - mButtonFooterMixin.setPrimaryButton( + mFooterBarMixin.setPrimaryButton( new FooterButton.Builder(this) .setText(R.string.wizard_next) .setListener(this::onNavigateNext) @@ -111,8 +111,8 @@ public abstract class StorageWizardBase extends FragmentActivity { .setTheme(R.style.SudGlifButton_Primary) .build() ); - mBack = mButtonFooterMixin.getSecondaryButton(); - mNext = mButtonFooterMixin.getPrimaryButton(); + mBack = mFooterBarMixin.getSecondaryButton(); + mNext = mFooterBarMixin.getPrimaryButton(); setIcon(com.android.internal.R.drawable.ic_sd_card_48dp); } diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index cc26f8af04b..f765694e784 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -47,8 +47,8 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtilsInternal; -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; public class RedactionInterstitial extends SettingsActivity { @@ -133,8 +133,8 @@ public class RedactionInterstitial extends SettingsActivity { } final GlifLayout layout = view.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(getContext()) .setText(R.string.app_notifications_dialog_done) .setListener(this::onDoneButtonClicked) diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 0ae664cbf4b..88732a4a4ed 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -68,8 +68,8 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; import com.android.settings.widget.ImeAwareEditText; -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.ArrayList; @@ -407,7 +407,7 @@ public class ChooseLockPassword extends SettingsActivity { ViewGroup container = view.findViewById(R.id.password_container); container.setOpticalInsets(Insets.NONE); - final ButtonFooterMixin mixin = mLayout.getMixin(ButtonFooterMixin.class); + final FooterBarMixin mixin = mLayout.getMixin(FooterBarMixin.class); mixin.setSecondaryButton( new FooterButton.Builder(getActivity()) .setText(R.string.lockpassword_clear_label) diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index 1f0bb4eb836..584cc6162e3 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -50,8 +50,8 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.notification.RedactionInterstitial; import com.google.android.collect.Lists; -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.ArrayList; @@ -489,7 +489,7 @@ public class ChooseLockPattern extends SettingsActivity { } } - final ButtonFooterMixin mixin = layout.getMixin(ButtonFooterMixin.class); + final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class); mixin.setSecondaryButton( new FooterButton.Builder(getActivity()) .setText(R.string.lockpattern_tutorial_cancel_label) @@ -512,7 +512,6 @@ public class ChooseLockPattern extends SettingsActivity { return layout; } - @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 67c03d56b79..8be6b3084af 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -38,7 +38,7 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowUtils; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.After; import org.junit.Before; @@ -137,7 +137,7 @@ public class FingerprintEnrollFindSensorTest { @Test public void clickSkip_shouldReturnResultSkip() { PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick(); ShadowActivity shadowActivity = Shadows.shadowOf(mActivity); assertThat(shadowActivity.getResultCode()).named("result code") diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java index 82124f91d1c..9fa6099cbea 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java @@ -32,7 +32,7 @@ import com.android.settings.testutils.shadow.ShadowLockPatternUtils; import com.android.settings.testutils.shadow.ShadowUserManager; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.Before; import org.junit.Test; @@ -68,7 +68,7 @@ public class FingerprintSuggestionActivityTest { PartnerCustomizationLayout layout = mController.get().findViewById(R.id.setup_wizard_layout); final Button cancelButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(cancelButton.getText().toString()).isEqualTo("Cancel"); assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE); cancelButton.performClick(); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java index b112c8a5f13..a198d86a814 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java @@ -33,7 +33,7 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.After; import org.junit.Before; @@ -75,7 +75,7 @@ public class SetupFingerprintEnrollFindSensorTest { intent).setup().get(); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick(); final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog(); assertThat(alertDialog).isNotNull(); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 12bf1e2ca9a..c8177491745 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -38,7 +38,7 @@ import com.android.settings.testutils.shadow.ShadowStorageManager; import com.android.settings.testutils.shadow.ShadowUserManager; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.After; import org.junit.Before; @@ -89,7 +89,7 @@ public class SetupFingerprintEnrollIntroductionTest { PartnerCustomizationLayout layout = mController.get().findViewById(R.id.setup_wizard_layout); final Button skipButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE); skipButton.performClick(); @@ -108,7 +108,7 @@ public class SetupFingerprintEnrollIntroductionTest { PartnerCustomizationLayout layout = mController.get().findViewById(R.id.setup_wizard_layout); final Button skipButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE); skipButton.performClick(); @@ -152,7 +152,7 @@ public class SetupFingerprintEnrollIntroductionTest { SetupFingerprintEnrollIntroduction activity = mController.create().resume().get(); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); final Button skipButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); getShadowKeyguardManager().setIsKeyguardSecure(true); skipButton.performClick(); @@ -169,7 +169,7 @@ public class SetupFingerprintEnrollIntroductionTest { SetupFingerprintEnrollIntroduction activity = mController.create().resume().get(); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); final Button skipButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); skipButton.performClick(); ShadowActivity shadowActivity = Shadows.shadowOf(activity); @@ -213,7 +213,7 @@ public class SetupFingerprintEnrollIntroductionTest { SetupFingerprintEnrollIntroduction activity = mController.get(); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick(); ShadowActivity shadowActivity = Shadows.shadowOf(activity); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 946ab69b486..e0c6dedc83f 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -38,7 +38,7 @@ import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.ScrollToParentEditText; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.After; import org.junit.Before; @@ -142,7 +142,7 @@ public class SetupChooseLockPasswordTest { final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton).isNotNull(); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); @@ -165,7 +165,7 @@ public class SetupChooseLockPasswordTest { final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton.isEnabled()).isTrue(); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.GONE); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index e45869f17db..430c535428d 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -41,7 +41,7 @@ import com.android.settings.testutils.shadow.ShadowAlertDialogCompat; import com.android.settings.testutils.shadow.ShadowUtils; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.Before; import org.junit.Test; @@ -148,7 +148,7 @@ public class SetupChooseLockPatternTest { public void skipButton_shouldBeVisible_duringNonFingerprintFlow() { PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton).isNotNull(); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); @@ -163,7 +163,7 @@ public class SetupChooseLockPatternTest { PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); assertThat(skipOrClearButton.isEnabled()).isTrue(); @@ -177,7 +177,7 @@ public class SetupChooseLockPatternTest { PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton.isEnabled()).isTrue(); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); assertThat(skipOrClearButton.getText()) diff --git a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java index 3b4abfe64cb..503a78c6bb8 100644 --- a/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java +++ b/tests/unit/src/com/android/settings/EncryptionInterstitialTest.java @@ -36,7 +36,7 @@ import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.After; import org.junit.Before; @@ -70,7 +70,7 @@ public class EncryptionInterstitialTest { new Intent(mContext, EncryptionInterstitial.class) .putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent"))); final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick(); mActivityMonitor.waitForActivityWithTimeout(1000); assertEquals(1, mActivityMonitor.getHits()); @@ -85,7 +85,7 @@ public class EncryptionInterstitialTest { new Intent(mContext, EncryptionInterstitial.class) .putExtra("extra_unlock_method_intent", new Intent("test.unlock.intent"))); final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick(); mActivityMonitor.waitForActivityWithTimeout(1000); assertEquals(1, mActivityMonitor.getHits()); diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java index 0a46403e1c2..589680d1a13 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java @@ -37,7 +37,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.R; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.Rule; import org.junit.Test; @@ -62,7 +62,7 @@ public class FingerprintEnrollFinishTest { PartnerCustomizationLayout layout = mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick(); intended(hasComponent(enrollingComponent)); assertFalse(mActivityRule.getActivity().isFinishing()); @@ -79,7 +79,7 @@ public class FingerprintEnrollFinishTest { PartnerCustomizationLayout layout = mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout); - layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView().performClick(); + layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick(); intended(hasComponent(enrollingComponent)); assertTrue(mActivityRule.getActivity().isFinishing()); diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java index 5078cc2501f..454de3d3e6a 100644 --- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java +++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java @@ -33,7 +33,7 @@ import android.widget.TextView; import com.android.settings.R; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -84,7 +84,7 @@ public class FingerprintEnrollIntroductionTest assertNotNull(errorTextView.getText().toString()); PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout); - final Button nextButton = layout.getMixin(ButtonFooterMixin.class).getPrimaryButtonView(); + final Button nextButton = layout.getMixin(FooterBarMixin.class).getPrimaryButtonView(); assertEquals(View.GONE, nextButton.getVisibility()); } diff --git a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java index 269be26fac3..e12390cfbb3 100644 --- a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -43,7 +43,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.R; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.Before; import org.junit.Test; @@ -67,7 +67,7 @@ public class ChooseLockPasswordTest { .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); assertThat( - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getVisibility()) + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility()) .isEqualTo(View.GONE); } @@ -79,7 +79,7 @@ public class ChooseLockPasswordTest { onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234")) .perform(pressKey(KeyEvent.KEYCODE_ENTER)); assertThat( - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getVisibility()) + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility()) .isEqualTo(View.GONE); } @@ -92,10 +92,10 @@ public class ChooseLockPasswordTest { .perform(pressKey(KeyEvent.KEYCODE_ENTER)) .perform(ViewActions.typeText("1")); // clear should be present if text field contains content - assertThat(layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getText()) + assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText()) .isEqualTo(mContext.getString(R.string.lockpassword_clear_label)); assertThat( - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getVisibility()) + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility()) .isEqualTo(View.VISIBLE); } } diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java index 67c5ccee981..cc0253fda08 100644 --- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java +++ b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java @@ -45,7 +45,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.settings.R; import com.google.android.setupcompat.PartnerCustomizationLayout; -import com.google.android.setupcompat.template.ButtonFooterMixin; +import com.google.android.setupcompat.template.FooterBarMixin; import org.junit.Before; import org.junit.Rule; @@ -75,7 +75,7 @@ public class SetupChooseLockPasswordAppTest { SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); final Button skipOrClearButton = - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView(); + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView(); assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label)); assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE); @@ -87,7 +87,7 @@ public class SetupChooseLockPasswordAppTest { public void clearIsNotShown_when_activityLaunchedInitially() { SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null); PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout); - assertThat(layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getText()) + assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText()) .isEqualTo(mContext.getString(R.string.lockpassword_clear_label)); } @@ -98,7 +98,7 @@ public class SetupChooseLockPasswordAppTest { onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234")) .perform(pressKey(KeyEvent.KEYCODE_ENTER)); assertThat( - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getVisibility()) + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility()) .isEqualTo(View.GONE); } @@ -114,7 +114,7 @@ public class SetupChooseLockPasswordAppTest { .perform(ViewActions.typeText("1")); // clear should be present if text field contains content assertThat( - layout.getMixin(ButtonFooterMixin.class).getSecondaryButtonView().getVisibility()) + layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility()) .isEqualTo(View.VISIBLE); } }