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

Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev

Browse Source
This commit is contained in:
Selim Cinek
2015-09-12 00:28:09 +00:00
committed by Android (Google) Code Review
parent 5bd836aac3 2547ea5b58
commit cda53c5dc2
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.fingerprint; package com.android.settings.fingerprint;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle; import android.os.Bundle;
@@ -32,15 +31,19 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
private static final int CONFIRM_REQUEST = 1; private static final int CONFIRM_REQUEST = 1;
private static final int ENROLLING = 2; private static final int ENROLLING = 2;
public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
private FingerprintLocationAnimationView mAnimation; private FingerprintLocationAnimationView mAnimation;
private boolean mLaunchedConfirmLock;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_find_sensor); setContentView(R.layout.fingerprint_enroll_find_sensor);
setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title); setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
if (mToken == null) { mLaunchedConfirmLock = savedInstanceState != null && savedInstanceState.getBoolean(
EXTRA_KEY_LAUNCHED_CONFIRM);
if (mToken == null && !mLaunchedConfirmLock) {
launchConfirmLock(); launchConfirmLock();
} }
mAnimation = (FingerprintLocationAnimationView) findViewById( mAnimation = (FingerprintLocationAnimationView) findViewById(
@@ -59,6 +62,12 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
mAnimation.stopAnimation(); mAnimation.stopAnimation();
} }
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);
}
@Override @Override
protected void onNextButtonClick() { protected void onNextButtonClick() {
startActivityForResult(getEnrollingIntent(), ENROLLING); startActivityForResult(getEnrollingIntent(), ENROLLING);
@@ -107,6 +116,8 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
// This shouldn't happen, as we should only end up at this step if a lock thingy is // This shouldn't happen, as we should only end up at this step if a lock thingy is
// already set. // already set.
finish(); finish();
} else {
mLaunchedConfirmLock = true;
} }
} }