From 25ff8a53a3a52497d81493a6d0954fedc7fd5bc7 Mon Sep 17 00:00:00 2001
From: Raph Levien <raph@google.com>
Date: Wed, 9 Mar 2016 13:30:55 -0800
Subject: [PATCH] Invalidate TextView on change of elegantTextHeight

Previously we were setting the paint but not invalidating, so it
could show stale content.

Bug: 27572149
Change-Id: I668667ec5b95a96e31a58cff0f8bbbb9958e470c
---
 core/java/android/widget/TextView.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ac3eaf7df334f..4c461adc82e91 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3071,7 +3071,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
      * @attr ref android.R.styleable#TextView_elegantTextHeight
      */
     public void setElegantTextHeight(boolean elegant) {
-        mTextPaint.setElegantTextHeight(elegant);
+        if (elegant != mTextPaint.isElegantTextHeight()) {
+            mTextPaint.setElegantTextHeight(elegant);
+            if (mLayout != null) {
+                nullLayouts();
+                requestLayout();
+                invalidate();
+            }
+        }
     }
 
     /**