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

Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

Browse Source
This commit is contained in:
Maurice Lam
2015-07-24 03:08:29 +00:00
committed by Android (Google) Code Review
parent 5376d54e8e 5f8d7dbe52
commit 36c7601409
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fingerprint/FingerprintEnrollBase.java
View File

@@ -48,6 +48,12 @@ public class FingerprintEnrollBase extends Activity implements View.OnClickListe
*/
protected static final int RESULT_FINISHED = RESULT_FIRST_USER;
/**
* Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which
* will be useful if the user accidentally entered this flow.
*/
protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;
protected byte[] mToken;
@Override

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

@@ -76,6 +76,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
if (resultCode == RESULT_FINISHED) {
setResult(RESULT_FINISHED);
finish();
} else if (resultCode == RESULT_SKIP) {
setResult(RESULT_SKIP);
finish();
} else {
FingerprintManager fpm = getSystemService(FingerprintManager.class);
int enrolled = fpm.getEnrolledFingerprints().size();

5
src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.fingerprint;
import android.content.Context;
import android.content.Intent;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
@@ -62,7 +63,9 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase {
@Override
public void onClick(View v) {
if (v.getId() == R.id.add_another_button) {
startActivity(getEnrollingIntent());
final Intent intent = getEnrollingIntent();
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(intent);
finish();
}
super.onClick(v);

6
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -52,8 +52,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
final NavigationBar navigationBar = getNavigationBar();
navigationBar.setNavigationBarListener(this);
// Enrolling screen auto-advances once the fingerprint is added
navigationBar.getNextButton().setEnabled(false);
navigationBar.getNextButton().setText(R.string.skip_label);
}
@Override
@@ -68,6 +67,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
@Override
public void onNavigateNext() {
onNextButtonClick();
setResult(RESULT_SKIP);
finish();
}
}