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

Commit c3672a4e authored by Victoria Lease's avatar Victoria Lease Committed by Android Git Automerger
Browse files

am 2203fab2: am 2e6f9be5: Merge "Fix fake bold for fallback fonts in frameworks." into jb-dev 

* commit '2203fab2':
  Fix fake bold for fallback fonts in frameworks.
parents cfa5102d 2203fab2

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 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

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

        }

core/java/android/widget/TextView.java

+3 −1
Original line number Diff line number Diff line
@@ -1237,10 +1237,12 @@ 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 {

            mTextPaint.setFakeBoldText(false);

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

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

            mTextPaint.setTextSkewX(0);

            setTypeface(tf);

        }