[TextInputLayout] Update text paddings in compound layouts uniformly

Author: pubiqq

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

@@ -306,6 +306,12 @@ private void initSuffixTextView(TintTypedArray a) {
     setSuffixText(a.getText(R.styleable.TextInputLayout_suffixText));
   }
 
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    updateSuffixTextViewPadding();
+  }
+
   void setErrorIconDrawable(@DrawableRes int resId) {
     setErrorIconDrawable(resId != 0 ? AppCompatResources.getDrawable(getContext(), resId) : null);
     refreshErrorIconDrawableState();
@@ -717,18 +723,19 @@ private void updateSuffixTextVisibility() {
   }
 
   void updateSuffixTextViewPadding() {
-    if (textInputLayout.editText == null) {
+    EditText editText = textInputLayout.editText;
+    if (editText == null) {
       return;
     }
     int endPadding =
-        (isEndIconVisible() || isErrorIconVisible()) ? 0 : textInputLayout.editText.getPaddingEnd();
+        (isEndIconVisible() || isErrorIconVisible()) ? 0 : editText.getPaddingEnd();
     suffixTextView.setPaddingRelative(
         getContext()
             .getResources()
             .getDimensionPixelSize(R.dimen.material_input_text_to_prefix_suffix_padding),
-        textInputLayout.editText.getPaddingTop(),
+        editText.getCompoundPaddingTop(),
         endPadding,
-        textInputLayout.editText.getPaddingBottom());
+        editText.getCompoundPaddingBottom());
   }
 
   int getSuffixTextEndOffset() {

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

@@ -201,7 +201,7 @@
  * developer guidance</a> and <a href="https://material.io/components/text-fields/overview">design
  * guidelines</a>.
  */
-public class TextInputLayout extends LinearLayout implements OnGlobalLayoutListener {
+public class TextInputLayout extends LinearLayout {
 
   private static final String TAG = "TextInputLayout";
 
@@ -461,8 +461,6 @@ public interface OnEndIconChangedListener {
 
   private boolean restoringSavedState;
 
-  private boolean globalLayoutListenerAdded = false;
-
   public TextInputLayout(@NonNull Context context) {
     this(context, null);
   }
@@ -729,17 +727,6 @@ public TextInputLayout(@NonNull Context context, @Nullable AttributeSet attrs, i
     setHelperText(helperText);
   }
 
-  @Override
-  public void onGlobalLayout() {
-    endLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-    globalLayoutListenerAdded = false;
-    boolean updatedHeight = updateEditTextHeightBasedOnIcon();
-    boolean updatedIcon = updateDummyDrawables();
-    if (updatedHeight || updatedIcon) {
-      editText.post(() -> editText.requestLayout());
-    }
-  }
-
   @Override
   public void addView(
       @NonNull View child, int index, @NonNull final ViewGroup.LayoutParams params) {
@@ -1605,7 +1592,6 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {}
     startLayout.bringToFront();
     endLayout.bringToFront();
     dispatchOnEditTextAttached();
-    endLayout.updateSuffixTextViewPadding();
 
     // Only call setEnabled on the edit text if the layout is disabled, to prevent reenabling an
     // already disabled edit text.
@@ -3308,12 +3294,13 @@ public void onRtlPropertiesChanged(int layoutDirection) {
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
-    if (!globalLayoutListenerAdded) {
-      endLayout.getViewTreeObserver().addOnGlobalLayoutListener(this);
-      globalLayoutListenerAdded = true;
+    boolean updatedHeight = updateEditTextHeightBasedOnIcon();
+    boolean updatedIcon = updateDummyDrawables();
+    if (updatedHeight || updatedIcon) {
+      editText.post(() -> editText.requestLayout());
     }
+
     updatePlaceholderMeasurementsBasedOnEditText();
-    endLayout.updateSuffixTextViewPadding();
 
     if (!isHintTextSingleLine()) {
       updateCollapsingTextDimens(