commit a4596f3e36192d769dd7b3ad93c1d9d51b319d7d
author Kevin Chyn <kchyn@google.com> Thu Apr 05 11:33:12 2018 -0700
committer Kevin Chyn <kchyn@google.com> Thu Apr 05 16:35:56 2018 -0700
tree 41f51dee34bd05d2c72a382c48880d3ace1364fa
parent 9cb6759072eefacb114782ebdfc3b779693535de

FingerprintDialogView sets visibility incorrectly

Fixes: 77640780

Test: manual test with FingerprintDialog apk, with varying descriptions
      and subtitles

Change-Id: I981f7334355d4e2d6dde3861349ec61d70ebb4a1

packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java

diff --git a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
index 6921836..d1d6609 100644
--- a/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
+++ b/packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -165,7 +166,7 @@
         title.setSelected(true);
 
         final CharSequence subtitleText = mBundle.getCharSequence(BiometricPrompt.KEY_SUBTITLE);
-        if (subtitleText == null) {
+        if (TextUtils.isEmpty(subtitleText)) {
             subtitle.setVisibility(View.GONE);
         } else {
             subtitle.setVisibility(View.VISIBLE);
@@ -173,11 +174,11 @@
         }
 
         final CharSequence descriptionText = mBundle.getCharSequence(BiometricPrompt.KEY_DESCRIPTION);
-        if (descriptionText == null) {
-            subtitle.setVisibility(View.VISIBLE);
+        if (TextUtils.isEmpty(descriptionText)) {
             description.setVisibility(View.GONE);
         } else {
-            description.setText(mBundle.getCharSequence(BiometricPrompt.KEY_DESCRIPTION));
+            description.setVisibility(View.VISIBLE);
+            description.setText(descriptionText);
         }
 
         negative.setText(mBundle.getCharSequence(BiometricPrompt.KEY_NEGATIVE_TEXT));