diff options
| author | Victoria Lease <violets@google.com> | 2012-06-08 17:33:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-08 17:33:35 -0700 |
| commit | c3672a4e19d3a0063c6d467453e9d7e03b2c1d2f (patch) | |
| tree | 33d5b5d45f8835b037b0f0cc7b2d3cc63067a2c0 /core/java/android/widget/Switch.java | |
| parent | cfa5102dd74cb64d89c51ccfb831e98c09b13327 (diff) | |
| parent | 2203fab24966c80af5c37f0a58263218dbbcd610 (diff) | |
am 2203fab2: am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev
* commit '2203fab24966c80af5c37f0a58263218dbbcd610':
Fix fake bold for fallback fonts in frameworks.
Diffstat (limited to 'core/java/android/widget/Switch.java')
| -rw-r--r-- | core/java/android/widget/Switch.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 8f5dc2ce2be5..9db02865c6f6 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -259,10 +259,12 @@ public class Switch extends CompoundButton { // 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); } |