Skip to content

Commit

Permalink
[TextInputLayout] Fixed padding for prefix/suffix and label in RTL be…
Browse files Browse the repository at this point in the history
…ing wrong.

PiperOrigin-RevId: 319873647
  • Loading branch information
leticiarossi authored and ymarian committed Jul 7, 2020
1 parent 3b39679 commit 7b5aea2
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions lib/java/com/google/android/material/textfield/TextInputLayout.java
Original file line number Diff line number Diff line change
Expand Up @@ -2251,11 +2251,13 @@ private void updatePrefixTextViewPadding() {
if (editText == null) {
return;
}
prefixTextView.setPadding(
isStartIconVisible() ? 0 : editText.getPaddingLeft(),
this.editText.getCompoundPaddingTop(),
prefixTextView.getCompoundPaddingRight(),
this.editText.getCompoundPaddingBottom());
int startPadding = isStartIconVisible() ? 0 : ViewCompat.getPaddingStart(editText);
ViewCompat.setPaddingRelative(
prefixTextView,
startPadding,
editText.getCompoundPaddingTop(),
0,
editText.getCompoundPaddingBottom());
}

/**
Expand Down Expand Up @@ -2338,11 +2340,10 @@ private void updateSuffixTextViewPadding() {
if (editText == null) {
return;
}
suffixTextView.setPadding(
suffixTextView.getPaddingLeft(),
editText.getPaddingTop(),
(isEndIconVisible() || isErrorIconVisible()) ? 0 : editText.getPaddingRight(),
editText.getPaddingBottom());
int endPadding =
(isEndIconVisible() || isErrorIconVisible()) ? 0 : ViewCompat.getPaddingEnd(editText);
ViewCompat.setPaddingRelative(
suffixTextView, 0, editText.getPaddingTop(), endPadding, editText.getPaddingBottom());
}

@Override
Expand Down Expand Up @@ -2482,7 +2483,7 @@ private int getLabelRightBoundAlignedWithSuffix(int rectRight, boolean isRtl) {
int right = rectRight - editText.getCompoundPaddingRight();
if (prefixText != null && isRtl) {
// Label should be vertically aligned with prefix if in RTL
right = right + prefixTextView.getMeasuredWidth() + prefixTextView.getPaddingRight();
right += prefixTextView.getMeasuredWidth() - prefixTextView.getPaddingRight();
}
return right;
}
Expand Down Expand Up @@ -2775,6 +2776,8 @@ public void run() {
});
}
updatePlaceholderMeasurementsBasedOnEditText();
updatePrefixTextViewPadding();
updateSuffixTextViewPadding();
}

private boolean updateEditTextHeightBasedOnIcon() {
Expand Down

0 comments on commit 7b5aea2

Please sign in to comment.