commit 2e6f9be5633cf37223425b9b93c0b1512db091af
author Victoria Lease <violets@google.com> Fri Jun 08 17:27:28 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 08 17:27:28 2012 -0700
tree f1a095485ce99dea91626b45f90cec1ff89b020e
parent d9038fd5568522abea033f2b826823f197c2a970
parent b26fa0ce68d3311b2fdffb930b27d897e481dd5a

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

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

diff --git a/core/java/android/text/style/StyleSpan.java b/core/java/android/text/style/StyleSpan.java
index 8e6147c..deed737 100644
--- a/core/java/android/text/style/StyleSpan.java
+++ b/core/java/android/text/style/StyleSpan.java
@@ -98,6 +98,7 @@
         }
 
         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

diff --git a/core/java/android/text/style/TextAppearanceSpan.java b/core/java/android/text/style/TextAppearanceSpan.java
index ecbf4bc..abd02cf 100644
--- a/core/java/android/text/style/TextAppearanceSpan.java
+++ b/core/java/android/text/style/TextAppearanceSpan.java
@@ -235,6 +235,7 @@
             }
 
             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

diff --git a/core/java/android/text/style/TypefaceSpan.java b/core/java/android/text/style/TypefaceSpan.java
index f194060..3d74ed0 100644
--- a/core/java/android/text/style/TypefaceSpan.java
+++ b/core/java/android/text/style/TypefaceSpan.java
@@ -82,6 +82,7 @@
 
         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

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 471f259..39bc7c2 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -259,10 +259,12 @@
             // 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

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 01617da..464a527 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -1237,10 +1237,12 @@
             // 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);
         }