diff options
| author | Victoria Lease <violets@google.com> | 2012-06-11 15:21:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 15:21:39 -0700 |
| commit | 72b8fc7e6da2f335880750513401d680417dfd13 (patch) | |
| tree | c27b7be32fd4474c79251f4982622d06b7d5ed3b /core/java/android/widget/TextView.java | |
| parent | fbce66cb259cb63b43fda654db68152b8b4a2c2f (diff) | |
| parent | aa0980afab57a6aebb06e70f60e92511708fa5af (diff) | |
Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 464a527a6025..01617da73b9a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -1237,12 +1237,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener // now compute what (if any) algorithmic styling is needed int typefaceStyle = tf != null ? tf.getStyle() : 0; int need = style & ~typefaceStyle; - need |= typefaceStyle & Typeface.BOLD; // keep bold in mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); } else { - int typefaceStyle = tf != null ? tf.getStyle() : 0; - mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0); + mTextPaint.setFakeBoldText(false); mTextPaint.setTextSkewX(0); setTypeface(tf); } |