am 785cda30: am f8c146a2: am c37db9c0: Merge "Fix layout and invalidate in SubtitleView" into klp-dev

* commit '785cda30c35aefa90fd89adef0e71fa41fd3459c':
  Fix layout and invalidate in SubtitleView

1 files changed, 9 insertions, 3 deletions

diff --git a/core/java/com/android/internal/widget/SubtitleView.java b/core/java/com/android/internal/widget/SubtitleView.java
index 0bdf90defbca..063468d12a63 100644
--- a/core/java/com/android/internal/widget/SubtitleView.java
+++ b/core/java/com/android/internal/widget/SubtitleView.java
@@ -183,7 +183,9 @@ public class SubtitleView extends View {
             mInnerPaddingX = (int) (size * INNER_PADDING_RATIO + 0.5f);
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }
 
@@ -192,7 +194,9 @@ public class SubtitleView extends View {
             mTextPaint.setTypeface(typeface);
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }
 
@@ -201,7 +205,9 @@ public class SubtitleView extends View {
             mAlignment = textAlignment;
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }