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

Author: Victoria Lease

core/java/android/text/style/StyleSpan.java

@@ -98,6 +98,7 @@ private static void apply(Paint paint, int style) {
         }
 
         int fake = want & ~tf.getStyle();
+        fake |= tf.getStyle() & Typeface.BOLD;
 
         if ((fake & Typeface.BOLD) != 0) {
             paint.setFakeBoldText(true);

core/java/android/text/style/TextAppearanceSpan.java

@@ -235,6 +235,7 @@ public void updateMeasureState(TextPaint ds) {
             }
 
             int fake = style & ~tf.getStyle();
+            fake |= tf.getStyle() & Typeface.BOLD;
 
             if ((fake & Typeface.BOLD) != 0) {
                 ds.setFakeBoldText(true);

core/java/android/text/style/TypefaceSpan.java

@@ -82,6 +82,7 @@ private static void apply(Paint paint, String family) {
 
         Typeface tf = Typeface.create(family, oldStyle);
         int fake = oldStyle & ~tf.getStyle();
+        fake |= tf.getStyle() & Typeface.BOLD;
 
         if ((fake & Typeface.BOLD) != 0) {
             paint.setFakeBoldText(true);

core/java/android/widget/Switch.java

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

core/java/android/widget/TextView.java

@@ -1237,10 +1237,12 @@ public void setTypeface(Typeface tf, int style) {
             // 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 {
-            mTextPaint.setFakeBoldText(false);
+            int typefaceStyle = tf != null ? tf.getStyle() : 0;
+            mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0);
             mTextPaint.setTextSkewX(0);
             setTypeface(tf);
         }