commit 669b23b4f7f8ccea07719d6556c745c38f955f78
author Chris Banes <chrisbanes@google.com> Fri Nov 13 14:56:40 2015 +0000
committer Chris Banes <chrisbanes@google.com> Sun Nov 15 16:13:18 2015 +0000
tree c75b0de53aa9c5c3ab3c898ed22753180ffc6b56
parent c01d6ec6e410ab0460164004ba5549ca76578f4c

Ensure that the indicator area is set to GONE

We're currently checking for 0 children, which
will never happen since we're using an internal
Space widget which is never removed. This means
the indicator view is still there, with its
associated padding.

BUG: 25680579
Change-Id: Ie41929ad9f67fdf84ed06a47437650611b08cbd1

design/src/android/support/design/widget/TextInputLayout.java

diff --git a/design/src/android/support/design/widget/TextInputLayout.java b/design/src/android/support/design/widget/TextInputLayout.java
index b583945..318ca6d 100644
--- a/design/src/android/support/design/widget/TextInputLayout.java
+++ b/design/src/android/support/design/widget/TextInputLayout.java
@@ -71,6 +71,7 @@
     private Paint mTmpPaint;
 
     private LinearLayout mIndicatorArea;
+    private int mIndicatorsAdded;
 
     private boolean mErrorEnabled;
     private TextView mErrorView;
@@ -421,6 +422,7 @@
         }
         mIndicatorArea.setVisibility(View.VISIBLE);
         mIndicatorArea.addView(indicator, index);
+        mIndicatorsAdded++;
     }
 
     private void adjustIndicatorPadding() {
@@ -432,7 +434,7 @@
     private void removeIndicator(TextView indicator) {
         if (mIndicatorArea != null) {
             mIndicatorArea.removeView(indicator);
-            if (mIndicatorArea.getChildCount() == 0) {
+            if (--mIndicatorsAdded == 0) {
                 mIndicatorArea.setVisibility(View.GONE);
             }
         }