[TextInputLayout] Fixed clear icon and placeholder text being display…

…ed when the text field is initialized with input text. Resolves #1379 PiperOrigin-RevId: 315317199
material-components · Jun 8, 2020 · 9b0a8d9 · 9b0a8d9
1 parent 3e3bc41
commit 9b0a8d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/textfield/ClearTextEndIconDelegate.java b/lib/java/com/google/android/material/textfield/ClearTextEndIconDelegate.java
@@ -72,7 +72,7 @@ public void onFocusChange(View v, boolean hasFocus) {
         @Override
         public void onEditTextAttached(@NonNull TextInputLayout textInputLayout) {
           EditText editText = textInputLayout.getEditText();
-          textInputLayout.setEndIconVisible(hasText(editText.getText()));
+          textInputLayout.setEndIconVisible(editText.hasFocus() && hasText(editText.getText()));
           // Make sure there's always only one clear text text watcher added
           textInputLayout.setEndIconCheckable(false);
           editText.setOnFocusChangeListener(onFocusChangeListener);

diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java
@@ -3809,7 +3809,7 @@ private void collapseHint(boolean animate) {
     if (cutoutEnabled()) {
       openCutout();
     }
-    showPlaceholderText();
+    updatePlaceholderText();
 
     updatePrefixTextVisibility();
     updateSuffixTextVisibility();