private IllustrationVideoView mIllustrationNormal;
private View mIllustrationAccessibility;
private Handler mHandler;
+ private Intent mResultIntent;
private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =
new CompoundButton.OnCheckedChangeListener() {
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);
}
@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();
+ }
}
}