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

Merge "Use title area for enrollment error messages" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-11 06:16:42 +00:00
committed by Android (Google) Code Review
parent 5c11109ffc a01f882e61
commit 53d7495162
2 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,10 +183,18 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
setHeaderText(resId, false /* force */); setHeaderText(resId, false /* force */);
} }
protected void setHeaderText(CharSequence title) {
getLayout().setHeaderText(title);
}
protected void setDescriptionText(int resId) { protected void setDescriptionText(int resId) {
getLayout().setDescriptionText(resId); getLayout().setDescriptionText(resId);
} }
protected void setDescriptionText(CharSequence descriptionText) {
getLayout().setDescriptionText(descriptionText);
}
protected FooterButton getNextButton() { protected FooterButton getNextButton() {
if (mFooterBarMixin != null) { if (mFooterBarMixin != null) {
return mFooterBarMixin.getPrimaryButton(); return mFooterBarMixin.getPrimaryButton();

14
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -324,7 +324,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
@Override @Override
public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) { public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (!TextUtils.isEmpty(helpString)) { if (!TextUtils.isEmpty(helpString)) {
if (!mCanAssumeUdfps) {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);
}
showError(helpString); showError(helpString);
} }
} }
@@ -345,8 +347,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
} }
showErrorDialog(getText(msgId), errMsgId); showErrorDialog(getText(msgId), errMsgId);
stopIconAnimation(); stopIconAnimation();
if (!mCanAssumeUdfps) {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);
} }
}
@Override @Override
public void onEnrollmentProgressChange(int steps, int remaining) { public void onEnrollmentProgressChange(int steps, int remaining) {
@@ -354,9 +358,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
updateTitleAndDescription(); updateTitleAndDescription();
clearError(); clearError();
animateFlash(); animateFlash();
if (!mCanAssumeUdfps) {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);
mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION); mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
} }
}
private void updateProgress(boolean animate) { private void updateProgress(boolean animate) {
if (mSidecar == null || !mSidecar.isEnrolling()) { if (mSidecar == null || !mSidecar.isEnrolling()) {
@@ -397,6 +403,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
} }
private void showError(CharSequence error) { private void showError(CharSequence error) {
if (mCanAssumeUdfps) {
setHeaderText(error);
// Show nothing for subtitle when getting an error message.
setDescriptionText("");
} else {
mErrorText.setText(error); mErrorText.setText(error);
if (mErrorText.getVisibility() == View.INVISIBLE) { if (mErrorText.getVisibility() == View.INVISIBLE) {
mErrorText.setVisibility(View.VISIBLE); mErrorText.setVisibility(View.VISIBLE);
@@ -414,13 +425,14 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
mErrorText.setAlpha(1f); mErrorText.setAlpha(1f);
mErrorText.setTranslationY(0f); mErrorText.setTranslationY(0f);
} }
}
if (isResumed()) { if (isResumed()) {
mVibrator.vibrate(VIBRATE_EFFECT_ERROR, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES); mVibrator.vibrate(VIBRATE_EFFECT_ERROR, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
} }
} }
private void clearError() { private void clearError() {
if (mErrorText.getVisibility() == View.VISIBLE) { if (!mCanAssumeUdfps && mErrorText.getVisibility() == View.VISIBLE) {
mErrorText.animate() mErrorText.animate()
.alpha(0f) .alpha(0f)
.translationY(getResources().getDimensionPixelSize( .translationY(getResources().getDimensionPixelSize(