Merge "Re-enable continue button for accessibility flow" into qt-dev

diff --combined src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 6e162dc,3058516..1a4ffaf
--- 1/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
--- 2/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@@ -57,7 -57,6 +57,7 @@@ public class FaceEnrollEducation extend
      private IllustrationVideoView mIllustrationNormal;
      private View mIllustrationAccessibility;
      private Handler mHandler;
 +    private Intent mResultIntent;
  
      private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =
              new CompoundButton.OnCheckedChangeListener() {
@@@ -84,15 -83,6 +84,6 @@@
          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);
@@@ -126,6 -116,17 +117,17 @@@
                  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
@@@ -152,9 -153,6 +154,9 @@@
              intent.setClass(this, FaceEnrollEnrolling.class);
          }
          intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
 +        if (mResultIntent != null) {
 +            intent.putExtras(mResultIntent);
 +        }
          WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
          startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
      }
@@@ -166,13 -164,9 +168,13 @@@
  
      @Override
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 +        mResultIntent = data;
          if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {
 -            setResult(resultCode);
 -            finish();
 +            // If the user finished or skipped enrollment, finish this activity
 +            if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
 +                setResult(resultCode);
 +                finish();
 +            }
          }
      }