PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allows user to skip fingerprint during setup"

Browse Source
This commit is contained in:
Udam Saini
2016-02-03 01:02:08 +00:00
committed by Android (Google) Code Review
parent 446b78cd52 861210c290
commit dbc5ce1eee
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -103,20 +103,25 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == RESULT_FINISHED) { final boolean isResultFinished = resultCode == RESULT_FINISHED;
if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) { if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
setResult(RESULT_OK); if (isResultFinished || resultCode == RESULT_SKIP) {
final int result = isResultFinished ? RESULT_OK : RESULT_SKIP;
setResult(result);
finish(); finish();
return;
}
} else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) { } else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
if (isResultFinished) {
updatePasswordQuality(); updatePasswordQuality();
byte[] token = data.getByteArrayExtra( byte[] token = data.getByteArrayExtra(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
launchFindSensor(token); launchFindSensor(token);
return;
}
} }
} else {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
} }
}
@Override @Override
public void onClick(View v) { public void onClick(View v) {