Skip to content

Commit 249823e

Browse files
committed
[Button] Fix inset attributes working incorrectly in RTL
1 parent c2051db commit 249823e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

lib/java/com/google/android/material/button/MaterialButtonHelper.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ void loadFromAttributes(@NonNull TypedArray attributes) {
119119
attributes.getBoolean(R.styleable.MaterialButton_toggleCheckedStateOnClick, true);
120120

121121
// Store padding before setting background, since background overwrites padding values
122-
int paddingStart = materialButton.getPaddingStart();
122+
int paddingLeft = materialButton.getPaddingLeft();
123123
int paddingTop = materialButton.getPaddingTop();
124-
int paddingEnd = materialButton.getPaddingEnd();
124+
int paddingRight = materialButton.getPaddingRight();
125125
int paddingBottom = materialButton.getPaddingBottom();
126126

127127
// Update materialButton's background without triggering setBackgroundOverwritten()
@@ -131,10 +131,10 @@ void loadFromAttributes(@NonNull TypedArray attributes) {
131131
updateBackground();
132132
}
133133
// Set the stored padding values
134-
materialButton.setPaddingRelative(
135-
paddingStart + insetLeft,
134+
materialButton.setPadding(
135+
paddingLeft + insetLeft,
136136
paddingTop + insetTop,
137-
paddingEnd + insetRight,
137+
paddingRight + insetRight,
138138
paddingBottom + insetBottom);
139139
}
140140

@@ -381,13 +381,13 @@ private void updateButtonShape() {
381381
// changing an existing drawable shape. This is a fallback.
382382
if (VERSION.SDK_INT < VERSION_CODES.M && !backgroundOverwritten) {
383383
// Store padding before setting background, since background overwrites padding values
384-
int paddingStart = materialButton.getPaddingStart();
384+
int paddingLeft = materialButton.getPaddingLeft();
385385
int paddingTop = materialButton.getPaddingTop();
386-
int paddingEnd = materialButton.getPaddingEnd();
386+
int paddingRight = materialButton.getPaddingRight();
387387
int paddingBottom = materialButton.getPaddingBottom();
388388
updateBackground();
389389
// Set the stored padding values
390-
materialButton.setPaddingRelative(paddingStart, paddingTop, paddingEnd, paddingBottom);
390+
materialButton.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
391391
} else {
392392
MaterialShapeDrawable backgroundDrawable = getMaterialShapeDrawable();
393393
if (backgroundDrawable != null) {
@@ -474,9 +474,9 @@ public void setInsetTop(@Dimension int newInsetTop) {
474474

475475
private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newInsetBottom) {
476476
// Store padding before setting background, since background overwrites padding values
477-
int paddingStart = materialButton.getPaddingStart();
477+
int paddingLeft = materialButton.getPaddingLeft();
478478
int paddingTop = materialButton.getPaddingTop();
479-
int paddingEnd = materialButton.getPaddingEnd();
479+
int paddingRight = materialButton.getPaddingRight();
480480
int paddingBottom = materialButton.getPaddingBottom();
481481
int oldInsetTop = insetTop;
482482
int oldInsetBottom = insetBottom;
@@ -486,10 +486,10 @@ private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newIns
486486
updateBackground();
487487
}
488488
// Set the stored padding values
489-
materialButton.setPaddingRelative(
490-
paddingStart,
489+
materialButton.setPadding(
490+
paddingLeft,
491491
paddingTop + newInsetTop - oldInsetTop,
492-
paddingEnd,
492+
paddingRight,
493493
paddingBottom + newInsetBottom - oldInsetBottom);
494494
}
495495

0 commit comments

Comments
 (0)