Merge "More fixes about padding"

2 files changed, 20 insertions, 0 deletions

diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index 603cea1cdef9..19fb7b17794c 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -161,6 +161,12 @@ public class CheckedTextView extends TextView implements Checkable {
     }
 
     @Override
+    public void setPaddingRelative(int start, int top, int end, int bottom) {
+        super.setPaddingRelative(start, top, end, bottom);
+        mBasePadding = getPaddingEnd();
+    }
+
+    @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 47e10cca358c..5ee739290c0d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -2079,6 +2079,20 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         invalidate();
     }
 
+    @Override
+    public void setPaddingRelative(int start, int top, int end, int bottom) {
+        if (start != getPaddingStart() ||
+            end != getPaddingEnd() ||
+            top != mPaddingTop ||
+            bottom != mPaddingBottom) {
+            nullLayouts();
+        }
+
+        // the super call will requestLayout()
+        super.setPaddingRelative(start, top, end, bottom);
+        invalidate();
+    }
+
     /**
      * Gets the autolink mask of the text.  See {@link
      * android.text.util.Linkify#ALL Linkify.ALL} and peers for