Re-enable continue button for accessibility flow

Test: Removed userdata, went to education flow, enabled accessibility
and confirmed the next button was re-enabled
Fixes: 132463368

Change-Id: I7cd78d606fa4c191b44199a0d143b56b33be4fa4

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 9660f3b..3058516 100644 (file)
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -83,15 +83,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
         mHandler = new Handler();
 
         mFaceManager = Utils.getFaceManagerOrNull(this);
-        final Button accessibilityButton = findViewById(R.id.accessibility_button);
-        accessibilityButton.setOnClickListener(view -> {
-            mSwitchDiversity.setChecked(true);
-            accessibilityButton.setVisibility(View.GONE);
-            mSwitchDiversity.setVisibility(View.VISIBLE);
-        });
-
-        mSwitchDiversity = findViewById(R.id.toggle_diversity);
-        mSwitchDiversity.setListener(mSwitchDiversityListener);
 
         mIllustrationNormal = findViewById(R.id.illustration_normal);
         mIllustrationAccessibility = findViewById(R.id.illustration_accessibility);
@@ -125,6 +116,17 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
                 footerButton.setEnabled(true);
             }, FACE_ENROLL_EDUCATION_DELAY);
         }
+
+        final Button accessibilityButton = findViewById(R.id.accessibility_button);
+        accessibilityButton.setOnClickListener(view -> {
+            footerButton.setEnabled(true);
+            mSwitchDiversity.setChecked(true);
+            accessibilityButton.setVisibility(View.GONE);
+            mSwitchDiversity.setVisibility(View.VISIBLE);
+        });
+
+        mSwitchDiversity = findViewById(R.id.toggle_diversity);
+        mSwitchDiversity.setListener(mSwitchDiversityListener);
     }
 
     @Override