@@ -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
@@ -392,13 +392,13 @@ private void updateButtonShape() {
392392 // changing an existing drawable shape. This is a fallback.
393393 if (VERSION .SDK_INT < VERSION_CODES .M && !backgroundOverwritten ) {
394394 // Store padding before setting background, since background overwrites padding values
395- int paddingStart = materialButton .getPaddingStart ();
395+ int paddingLeft = materialButton .getPaddingLeft ();
396396 int paddingTop = materialButton .getPaddingTop ();
397- int paddingEnd = materialButton .getPaddingEnd ();
397+ int paddingRight = materialButton .getPaddingRight ();
398398 int paddingBottom = materialButton .getPaddingBottom ();
399399 updateBackground ();
400400 // Set the stored padding values
401- materialButton .setPaddingRelative ( paddingStart , paddingTop , paddingEnd , paddingBottom );
401+ materialButton .setPadding ( paddingLeft , paddingTop , paddingRight , paddingBottom );
402402 } else {
403403 MaterialShapeDrawable backgroundDrawable = getMaterialShapeDrawable ();
404404 if (backgroundDrawable != null ) {
@@ -501,9 +501,9 @@ public void setInsetTop(@Dimension int newInsetTop) {
501501
502502 private void setVerticalInsets (@ Dimension int newInsetTop , @ Dimension int newInsetBottom ) {
503503 // Store padding before setting background, since background overwrites padding values
504- int paddingStart = materialButton .getPaddingStart ();
504+ int paddingLeft = materialButton .getPaddingLeft ();
505505 int paddingTop = materialButton .getPaddingTop ();
506- int paddingEnd = materialButton .getPaddingEnd ();
506+ int paddingRight = materialButton .getPaddingRight ();
507507 int paddingBottom = materialButton .getPaddingBottom ();
508508 int oldInsetTop = insetTop ;
509509 int oldInsetBottom = insetBottom ;
@@ -513,10 +513,10 @@ private void setVerticalInsets(@Dimension int newInsetTop, @Dimension int newIns
513513 updateBackground ();
514514 }
515515 // Set the stored padding values
516- materialButton .setPaddingRelative (
517- paddingStart ,
516+ materialButton .setPadding (
517+ paddingLeft ,
518518 paddingTop + newInsetTop - oldInsetTop ,
519- paddingEnd ,
519+ paddingRight ,
520520 paddingBottom + newInsetBottom - oldInsetBottom );
521521 }
522522
0 commit comments