Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b8fc7e authored by Victoria Lease's avatar Victoria Lease Committed by Android (Google) Code Review
Browse files

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

parents fbce66cb aa0980af

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

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan { 
        }



        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

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl 
            }



            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

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ public class TypefaceSpan extends MetricAffectingSpan implements ParcelableSpan 


        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

+1 −3
Original line number Diff line number Diff line
@@ -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);

        }

core/java/android/widget/TextView.java

+1 −3
Original line number Diff line number Diff line
@@ -1237,12 +1237,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            // 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 {

            int typefaceStyle = tf != null ? tf.getStyle() : 0;

            mTextPaint.setFakeBoldText((typefaceStyle & Typeface.BOLD) != 0);

            mTextPaint.setFakeBoldText(false);

            mTextPaint.setTextSkewX(0);

            setTypeface(tf);

        }