commit 9593c1334e7dc6ab4efc1c4454d1504b536388e5
author Raph Levien <raph@google.com> Fri Mar 11 01:37:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 11 01:37:35 2016 +0000
tree 61ada61c511ea8f9dc92f2f86a3c2e4ce3c17643
parent eb77f7da8b65145e2b2006e25f28343c0f7d3ae4
parent 8c8e942b50de7e3a765e339b30adbe2d43443874

Merge "Invalidate TextView on change of elegantTextHeight" into nyc-dev am: a4750fd71d
am: 8c8e942b50

* commit '8c8e942b50de7e3a765e339b30adbe2d43443874':
  Invalidate TextView on change of elegantTextHeight

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ac3eaf7..4c461ad 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3071,7 +3071,14 @@
      * @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();
+            }
+        }
     }
 
     /**