OSDN Git Service

Added different button for non SUW enrollment
authorjoshmccloskey <joshmccloskey@google.com>
Thu, 23 May 2019 20:19:00 +0000 (13:19 -0700)
committerjoshmccloskey <joshmccloskey@google.com>
Thu, 23 May 2019 20:19:00 +0000 (13:19 -0700)
Bug: 133416320
Test: Manual.
Change-Id: I7087d5d4aa8f41e8d357f6fb41774d1bc62c17d9

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

index 956ba49..8d38411 100644 (file)
@@ -101,14 +101,26 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
         mDescriptionText = findViewById(R.id.sud_layout_description);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
-        mFooterBarMixin.setSecondaryButton(
-                new FooterButton.Builder(this)
-                        .setText(R.string.security_settings_face_enroll_enrolling_skip)
-                        .setListener(this::onSkipButtonClick)
-                        .setButtonType(FooterButton.ButtonType.SKIP)
-                        .setTheme(R.style.SudGlifButton_Secondary)
-                        .build()
-        );
+
+        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
+            mFooterBarMixin.setSecondaryButton(
+                    new FooterButton.Builder(this)
+                            .setText(R.string.skip_label)
+                            .setListener(this::onSkipButtonClick)
+                            .setButtonType(FooterButton.ButtonType.SKIP)
+                            .setTheme(R.style.SudGlifButton_Secondary)
+                            .build()
+            );
+        } else {
+            mFooterBarMixin.setSecondaryButton(
+                    new FooterButton.Builder(this)
+                            .setText(R.string.security_settings_face_enroll_introduction_cancel)
+                            .setListener(this::onSkipButtonClick)
+                            .setButtonType(FooterButton.ButtonType.CANCEL)
+                            .setTheme(R.style.SudGlifButton_Secondary)
+                            .build()
+            );
+        }
 
         final FooterButton footerButton = new FooterButton.Builder(this)
                 .setText(R.string.security_settings_face_enroll_education_start)