From afd0af1075abd75dd6694cd93e6c18075032255a Mon Sep 17 00:00:00 2001 From: Kainalu Hagiwara Date: Fri, 14 Aug 2020 09:48:46 -0700 Subject: [PATCH] Clear button (#13842) Co-authored-by: Darren --- .../main/java/org/mozilla/fenix/utils/ClearableEditText.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt b/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt index aad4bf7ce..e2e7464bd 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt @@ -46,7 +46,9 @@ class ClearableEditText @JvmOverloads constructor( * Displays a clear icon if text has been entered. */ override fun onTextChanged(text: CharSequence?, start: Int, lengthBefore: Int, lengthAfter: Int) { - val drawable = if (shouldShowClearButton(lengthAfter)) { + // lengthAfter has inconsistent behaviour when there are spaces in the entered text, so we'll use text.length. + val textLength = text?.length ?: 0 + val drawable = if (shouldShowClearButton(textLength)) { AppCompatResources.getDrawable(context, R.drawable.ic_clear)?.apply { colorFilter = createBlendModeColorFilterCompat(context.getColorFromAttr(R.attr.primaryText), SRC_IN) }