[Button] Fix inset attributes working incorrectly in RTL

material-components · Aug 13, 2024 · eb718a7 · eb718a7
1 parent cfef899
commit eb718a7
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/lib/java/com/google/android/material/button/MaterialButtonHelper.java b/lib/java/com/google/android/material/button/MaterialButtonHelper.java
@@ -125,9 +125,9 @@ void loadFromAttributes(@NonNull TypedArray attributes) {
         attributes.getBoolean(R.styleable.MaterialButton_toggleCheckedStateOnClick, true);
 
     // Store padding before setting background, since background overwrites padding values
-    int paddingStart = materialButton.getPaddingStart();
+    int paddingLeft = materialButton.getPaddingLeft();
     int paddingTop = materialButton.getPaddingTop();
-    int paddingEnd = materialButton.getPaddingEnd();
+    int paddingRight = materialButton.getPaddingRight();
     int paddingBottom = materialButton.getPaddingBottom();
 
     // Update materialButton's background without triggering setBackgroundOverwritten()
@@ -137,10 +137,10 @@ void loadFromAttributes(@NonNull TypedArray attributes) {
       updateBackground();
     }
     // Set the stored padding values
-    materialButton.setPaddingRelative(
-        paddingStart + insetLeft,
+    materialButton.setPadding(
+        paddingLeft + insetLeft,
         paddingTop + insetTop,
-        paddingEnd + insetRight,
+        paddingRight + insetRight,
         paddingBottom + insetBottom);
   }
 
@@ -412,13 +412,13 @@ private void updateButtonShape() {
     // changing an existing drawable shape. This is a fallback.
     if (IS_LOLLIPOP && !backgroundOverwritten) {
       // Store padding before setting background, since background overwrites padding values
-      int paddingStart = materialButton.getPaddingStart();
+      int paddingLeft = materialButton.getPaddingLeft();
       int paddingTop = materialButton.getPaddingTop();
-      int paddingEnd = materialButton.getPaddingEnd();
+      int paddingRight = materialButton.getPaddingRight();
       int paddingBottom = materialButton.getPaddingBottom();
       updateBackground();
       // Set the stored padding values
-      materialButton.setPaddingRelative(paddingStart, paddingTop, paddingEnd, paddingBottom);
+      materialButton.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
     } else {
       MaterialShapeDrawable backgroundDrawable = getMaterialShapeDrawable();
       if (backgroundDrawable != null) {
@@ -521,9 +521,9 @@ public void setInsetTop(@Dimension int newInsetTop) {
 
   private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newInsetBottom) {
     // Store padding before setting background, since background overwrites padding values
-    int paddingStart = materialButton.getPaddingStart();
+    int paddingLeft = materialButton.getPaddingLeft();
     int paddingTop = materialButton.getPaddingTop();
-    int paddingEnd = materialButton.getPaddingEnd();
+    int paddingRight = materialButton.getPaddingRight();
     int paddingBottom = materialButton.getPaddingBottom();
     int oldInsetTop = insetTop;
     int oldInsetBottom = insetBottom;
@@ -533,10 +533,10 @@ private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newIns
       updateBackground();
     }
     // Set the stored padding values
-    materialButton.setPaddingRelative(
-        paddingStart,
+    materialButton.setPadding(
+        paddingLeft,
         paddingTop + newInsetTop - oldInsetTop,
-        paddingEnd,
+        paddingRight,
         paddingBottom + newInsetBottom - oldInsetBottom);
   }