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

* commit 'f8c146a2a2e47da9326ac2ea39b7ae47b97df184':
  Fix layout and invalidate in SubtitleView

core/java/com/android/internal/widget/SubtitleView.java

@@ -180,7 +180,9 @@ public class SubtitleView extends View {
             mInnerPaddingX = (int) (size * INNER_PADDING_RATIO + 0.5f);
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }
 
@@ -189,7 +191,9 @@ public class SubtitleView extends View {
             mTextPaint.setTypeface(typeface);
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }
 
@@ -198,7 +202,9 @@ public class SubtitleView extends View {
             mAlignment = textAlignment;
 
             mHasMeasurements = false;
-            forceLayout();
+
+            requestLayout();
+            invalidate();
         }
     }