[TextInputLayout] Added id for errorIconView

Resolves #1624 Resolves #1623 GIT_ORIGIN_REV_ID=acf854dc995d734383ed25689b8efd7606f75537 PiperOrigin-RevId: 327673226
material-components · Aug 20, 2020 · ee93fc1 · ee93fc1
1 parent a543032
commit ee93fc1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java
@@ -595,6 +595,7 @@ public TextInputLayout(@NonNull Context context, @Nullable AttributeSet attrs, i
         (CheckableImageButton)
             LayoutInflater.from(getContext())
                 .inflate(R.layout.design_text_input_end_icon, endLayout, false);
+    errorIconView.setId(R.id.text_input_error_icon);
     errorIconView.setVisibility(GONE);
     if (MaterialResources.isFontScaleAtLeast1_3(context)) {
       ViewGroup.MarginLayoutParams lp =

diff --git a/lib/java/com/google/android/material/textfield/res/values/ids.xml b/lib/java/com/google/android/material/textfield/res/values/ids.xml
@@ -22,5 +22,5 @@
   <item name="textinput_placeholder" type="id"/>
   <item name="textinput_prefix_text" type="id"/>
   <item name="textinput_suffix_text" type="id"/>
-
+  <item name="text_input_error_icon" type="id"/>
 </resources>
diff --git a/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java b/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java
@@ -468,7 +468,7 @@ public void testErrorIconOnClickListener() {
     // Click error icon
     onView(
             allOf(
-                withId(R.id.text_input_end_icon),
+                withId(R.id.text_input_error_icon),
                 withContentDescription(R.string.error_icon_content_description),
                 isDescendantOfA(withId(R.id.textinput_no_icon))))
         .perform(click());
@@ -591,7 +591,7 @@ public  void testErrorIconAppears() {
     // Check the icon is visible
     onView(
         allOf(
-            withId(R.id.text_input_end_icon),
+            withId(R.id.text_input_error_icon),
             withContentDescription(R.string.error_icon_content_description),
             isDescendantOfA(withId(R.id.textinput_no_icon))))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)));
@@ -643,7 +643,7 @@ public void testErrorIconMaintainsEndIcon() {
     // Check icon showing is error icon only
     onView(
         allOf(
-            withId(R.id.text_input_end_icon),
+            withId(R.id.text_input_error_icon),
             withContentDescription(R.string.error_icon_content_description),
             isDescendantOfA(withId(R.id.textinput_password))))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)));
@@ -660,7 +660,7 @@ public void testErrorIconMaintainsEndIcon() {
     // Check end icon is back
     onView(
         allOf(
-            withId(R.id.text_input_end_icon),
+            withId(R.id.text_input_error_icon),
             withContentDescription(R.string.error_icon_content_description),
             isDescendantOfA(withId(R.id.textinput_password))))
         .check(matches(withEffectiveVisibility(Visibility.GONE)));