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

Merge "Remove extra steps in fingerprint flow"

Browse Source
This commit is contained in:
Ajay Nadathur
2017-07-27 21:57:12 +00:00
committed by Android (Google) Code Review
parent 98b39af411 e24f1ab745
commit 70927d2bd7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.fingerprint_enroll_enrolling); setContentView(R.layout.fingerprint_enroll_enrolling);
setHeaderText(R.string.security_settings_fingerprint_enroll_start_title); setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
mStartMessage = (TextView) findViewById(R.id.start_message); mStartMessage = (TextView) findViewById(R.id.start_message);
mRepeatMessage = (TextView) findViewById(R.id.repeat_message); mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
mErrorText = (TextView) findViewById(R.id.error_text); mErrorText = (TextView) findViewById(R.id.error_text);
@@ -288,12 +288,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
private void updateDescription() { private void updateDescription() {
if (mSidecar.getEnrollmentSteps() == -1) { if (mSidecar.getEnrollmentSteps() == -1) {
setHeaderText(R.string.security_settings_fingerprint_enroll_start_title);
mStartMessage.setVisibility(View.VISIBLE); mStartMessage.setVisibility(View.VISIBLE);
mRepeatMessage.setVisibility(View.INVISIBLE); mRepeatMessage.setVisibility(View.INVISIBLE);
} else { } else {
setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title,
true /* force */);
mStartMessage.setVisibility(View.INVISIBLE); mStartMessage.setVisibility(View.INVISIBLE);
mRepeatMessage.setVisibility(View.VISIBLE); mRepeatMessage.setVisibility(View.VISIBLE);
} }