commit 8c8e942b50de7e3a765e339b30adbe2d43443874
author Raph Levien <raph@google.com> Fri Mar 11 01:33:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 11 01:33:14 2016 +0000
tree 1915db52f10f4d72a553e56a9b15690dd3299751
parent dfd8ef3a63c1f1f24ac5c6c54822b61544f7a0af
parent a4750fd71d2a87e02b666590537a0ba026b331ec

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

* commit 'a4750fd71d2a87e02b666590537a0ba026b331ec':
  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();
+            }
+        }
     }
 
     /**