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

Merge "Refactor BiometricEnrollBase::onStop()"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-01 17:13:55 +00:00
committed by Android (Google) Code Review
parent 0dc8d58de5 6b6d8c0d6d
commit 71800b3f69
8 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/BiometricEnrollBase.java
View File

@@ -181,16 +181,6 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
getWindow().setStatusBarColor(getBackgroundColor());
}
@Override
protected void onStop() {
super.onStop();
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
}
protected boolean shouldFinishWhenBackgrounded() {
return !WizardManagerHelper.isAnySetupWizard(getIntent());
}

10
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -241,6 +241,16 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
}
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);

10
src/com/android/settings/biometrics/BiometricHandoffActivity.java
View File

@@ -49,6 +49,16 @@ public class BiometricHandoffActivity extends BiometricEnrollBase {
mFooterBarMixin.setPrimaryButton(getPrimaryFooterButton());
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@NonNull
protected FooterButton getPrimaryFooterButton() {
if (mPrimaryFooterButton == null) {

7
src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
View File

@@ -62,7 +62,11 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
@Override
protected void onStop() {
super.onStop();
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
if (mSidecar != null) {
mSidecar.setListener(null);
@@ -80,6 +84,7 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
}
finish();
}
super.onStop();
}
@Override

10
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -170,6 +170,16 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
}
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
protected boolean shouldFinishWhenBackgrounded() {
return super.shouldFinishWhenBackgrounded() && !mNextClicked;

11
src/com/android/settings/biometrics/face/FaceEnrollFinish.java
View File

@@ -22,6 +22,7 @@ import android.view.View;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
@@ -48,6 +49,16 @@ public class FaceEnrollFinish extends BiometricEnrollBase {
);
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
public int getMetricsCategory() {
return SettingsEnums.FACE_ENROLL_FINISHED;

7
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -249,10 +249,15 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
@Override
protected void onStop() {
super.onStop();
if (mAnimation != null) {
mAnimation.pauseAnimation();
}
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override

10
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
View File

@@ -108,6 +108,16 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
}
}
@Override
protected void onStop() {
if (!isChangingConfigurations() && shouldFinishWhenBackgrounded()
&& !BiometricUtils.isAnyMultiBiometricFlow(this)) {
setResult(RESULT_TIMEOUT);
finish();
}
super.onStop();
}
@Override
protected void onNextButtonClick(View view) {
updateFingerprintSuggestionEnableState();