Limiting helper/error view width so that counter view doesn't get pushed out.

Resolves: #689
PiperOrigin-RevId: 284594896

Author: leticiarossi

lib/java/com/google/android/material/textfield/IndicatorViewController.java

@@ -28,6 +28,7 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Typeface;
+import android.os.Build.VERSION;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
@@ -42,7 +43,6 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
-import android.widget.Space;
 import android.widget.TextView;
 import com.google.android.material.animation.AnimationUtils;
 import com.google.android.material.animation.AnimatorSetCompat;
@@ -53,7 +53,8 @@
 
 /**
  * Controller for indicator views underneath the text input line in {@link
- * com.google.android.material.textfield.TextInputLayout}. This class controls helper and error views.
+ * com.google.android.material.textfield.TextInputLayout}. This class controls helper and error
+ * views.
  */
 final class IndicatorViewController {
 
@@ -371,14 +372,9 @@ void addIndicator(TextView indicator, @IndicatorIndex int index) {
       textInputView.addView(indicatorArea, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
 
       captionArea = new FrameLayout(context);
-      indicatorArea.addView(
-          captionArea,
-          -1,
-          new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-
-      final Space spacer = new Space(context);
-      final LayoutParams spacerLp = new LinearLayout.LayoutParams(0, 0, 1f);
-      indicatorArea.addView(spacer, spacerLp);
+      LinearLayout.LayoutParams captionAreaLp =
+          new LinearLayout.LayoutParams(0, LayoutParams.WRAP_CONTENT, 1f);
+      indicatorArea.addView(captionArea, captionAreaLp);
 
       if (textInputView.getEditText() != null) {
         adjustIndicatorPadding();
@@ -390,7 +386,9 @@ void addIndicator(TextView indicator, @IndicatorIndex int index) {
       captionArea.addView(indicator);
       captionViewsAdded++;
     } else {
-      indicatorArea.addView(indicator, index);
+      LinearLayout.LayoutParams indicatorAreaLp =
+          new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+      indicatorArea.addView(indicator, indicatorAreaLp);
     }
     indicatorArea.setVisibility(VISIBLE);
     indicatorsAdded++;
@@ -430,6 +428,9 @@ void setErrorEnabled(boolean enabled) {
     if (enabled) {
       errorView = new AppCompatTextView(context);
       errorView.setId(R.id.textinput_error);
+      if (VERSION.SDK_INT >= 17) {
+        errorView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
+      }
       if (typeface != null) {
         errorView.setTypeface(typeface);
       }
@@ -469,6 +470,9 @@ void setHelperTextEnabled(boolean enabled) {
     if (enabled) {
       helperTextView = new AppCompatTextView(context);
       helperTextView.setId(R.id.textinput_helper_text);
+      if (VERSION.SDK_INT >= 17) {
+        helperTextView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
+      }
       if (typeface != null) {
         helperTextView.setTypeface(typeface);
       }

lib/java/com/google/android/material/textfield/TextInputLayout.java

@@ -1729,6 +1729,9 @@ public void setCounterEnabled(boolean enabled) {
         }
         counterView.setMaxLines(1);
         indicatorViewController.addIndicator(counterView, COUNTER_INDEX);
+        MarginLayoutParamsCompat.setMarginStart(
+            (MarginLayoutParams) counterView.getLayoutParams(),
+            getResources().getDimensionPixelOffset(R.dimen.mtrl_textinput_counter_margin_start));
         updateCounterTextAppearanceAndColor();
         updateCounter();
       } else {

lib/java/com/google/android/material/textfield/res/values/dimens.xml

@@ -18,6 +18,8 @@
 
   <dimen name="design_textinput_caption_translate_y">5dp</dimen>
 
+  <dimen name="mtrl_textinput_counter_margin_start">16dp</dimen>
+
   <dimen name="mtrl_textinput_outline_box_expanded_padding">16dp</dimen>
 
   <dimen name="mtrl_textinput_box_corner_radius_small">0dp</dimen>