Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "FingerprintDialogView sets visibility incorrectly" into pi-dev

Browse Source 
am: d5a3d88167

Change-Id: I184b3b69b359b2f6806d00d1ee215bb5d969fe9c
This commit is contained in:
Kevin Chyn
2018-04-05 17:55:47 -07:00
committed by android-build-merger
parent c96c65c6ca d5a3d88167
commit 04304c8e57
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/fingerprint/FingerprintDialogView.java
View File

@@ -27,6 +27,7 @@ import android.os.Binder;
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 @@ public class FingerprintDialogView extends LinearLayout {
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 @@ public class FingerprintDialogView extends LinearLayout {
}
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));