diff options
| author | Victoria Lease <violets@google.com> | 2012-06-12 13:00:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:00:37 -0700 |
| commit | 49ccb116e9f2f3cf1233738c931f3e620287afc4 (patch) | |
| tree | 489b2cf6f595abb121c9b0a2266fbddd063a1d17 /core/java/android/widget/Switch.java | |
| parent | ea99d9af2db8c9490be3de750987969a2b31cfd1 (diff) | |
| parent | 1b15102fc040f59c72c6453dee15b791f54c9f06 (diff) | |
| download | frameworks_base-49ccb116e9f2f3cf1233738c931f3e620287afc4.zip frameworks_base-49ccb116e9f2f3cf1233738c931f3e620287afc4.tar.gz frameworks_base-49ccb116e9f2f3cf1233738c931f3e620287afc4.tar.bz2 | |
am 1b15102f: am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
* commit '1b15102fc040f59c72c6453dee15b791f54c9f06':
Revert "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, 1 insertions, 3 deletions
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 9db0286..8f5dc2c 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -259,12 +259,10 @@ 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 { - int typefaceStyle = tf != null ? tf.getStyle() : 0; - mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0); + mTextPaint.setFakeBoldText(false); mTextPaint.setTextSkewX(0); setSwitchTypeface(tf); } |