Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev

Browse Source
This commit is contained in:
Victoria Lease
2012-06-08 17:27:28 -07:00
committed by Android (Google) Code Review
parent d9038fd556 b26fa0ce68
commit 2e6f9be563
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/text/style/StyleSpan.java
View File

@@ -98,6 +98,7 @@ public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan {
} }
int fake = want & ~tf.getStyle(); int fake = want & ~tf.getStyle();
fake |= tf.getStyle() & Typeface.BOLD;
if ((fake & Typeface.BOLD) != 0) { if ((fake & Typeface.BOLD) != 0) {
paint.setFakeBoldText(true); paint.setFakeBoldText(true);

1
core/java/android/text/style/TextAppearanceSpan.java
View File

@@ -235,6 +235,7 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl
} }
int fake = style & ~tf.getStyle(); int fake = style & ~tf.getStyle();
fake |= tf.getStyle() & Typeface.BOLD;
if ((fake & Typeface.BOLD) != 0) { if ((fake & Typeface.BOLD) != 0) {
ds.setFakeBoldText(true); ds.setFakeBoldText(true);

1
core/java/android/text/style/TypefaceSpan.java
View File

@@ -82,6 +82,7 @@ public class TypefaceSpan extends MetricAffectingSpan implements ParcelableSpan
Typeface tf = Typeface.create(family, oldStyle); Typeface tf = Typeface.create(family, oldStyle);
int fake = oldStyle & ~tf.getStyle(); int fake = oldStyle & ~tf.getStyle();
fake |= tf.getStyle() & Typeface.BOLD;
if ((fake & Typeface.BOLD) != 0) { if ((fake & Typeface.BOLD) != 0) {
paint.setFakeBoldText(true); paint.setFakeBoldText(true);

4
core/java/android/widget/Switch.java
View File

@@ -259,10 +259,12 @@ public class Switch extends CompoundButton {
// now compute what (if any) algorithmic styling is needed // now compute what (if any) algorithmic styling is needed
int typefaceStyle = tf != null ? tf.getStyle() : 0; int typefaceStyle = tf != null ? tf.getStyle() : 0;
int need = style & ~typefaceStyle; int need = style & ~typefaceStyle;
need |= typefaceStyle & Typeface.BOLD;
mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0);
mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0);
} else { } else {
mTextPaint.setFakeBoldText(false); int typefaceStyle = tf != null ? tf.getStyle() : 0;
mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0);
mTextPaint.setTextSkewX(0); mTextPaint.setTextSkewX(0);
setSwitchTypeface(tf); setSwitchTypeface(tf);
} }

4
core/java/android/widget/TextView.java
View File

@@ -1237,10 +1237,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// now compute what (if any) algorithmic styling is needed // now compute what (if any) algorithmic styling is needed
int typefaceStyle = tf != null ? tf.getStyle() : 0; int typefaceStyle = tf != null ? tf.getStyle() : 0;
int need = style & ~typefaceStyle; int need = style & ~typefaceStyle;
need |= typefaceStyle & Typeface.BOLD; // keep bold in
mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0); mTextPaint.setFakeBoldText((need & Typeface.BOLD) != 0);
mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0); mTextPaint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0);
} else { } else {
mTextPaint.setFakeBoldText(false); int typefaceStyle = tf != null ? tf.getStyle() : 0;
mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0);
mTextPaint.setTextSkewX(0); mTextPaint.setTextSkewX(0);
setTypeface(tf); setTypeface(tf);
} }