Merge "Fixed spacing on Intro & Edu screens" into qt-dev

am: 806c65ca17 Change-Id: Iaa76703169d28f8ab6cfa1e8eee2b9c6efeadfb7
2019-05-10 19:46:59 -07:00
parent 0a29fb054e 806c65ca17
commit 87dbedb514
3 changed files with 17 additions and 19 deletions
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -164,9 +164,11 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
        final int errorMsg = checkMaxEnrolled();
        if (errorMsg == 0) {
            mErrorText.setText(null);
+            mErrorText.setVisibility(View.GONE);
            getNextButton().setVisibility(View.VISIBLE);
        } else {
            mErrorText.setText(errorMsg);
+            mErrorText.setVisibility(View.VISIBLE);
            getNextButton().setText(getResources().getString(R.string.done));
            getNextButton().setVisibility(View.VISIBLE);
        }