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

am: ff5fb3f2d4

Change-Id: I3584d3626a3b99cd0c1a1df196f8da9b361e0a83
This commit is contained in:
Joshua Mccloskey
2019-05-13 15:25:48 -07:00
committed by android-build-merger

View File

@@ -84,15 +84,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);
@@ -126,6 +117,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