diff options
| author | 2024-06-07 15:02:37 +0000 | |
|---|---|---|
| committer | 2024-06-07 15:02:37 +0000 | |
| commit | 99bc70c00a70ef3bbfa9fb1a41abfc2fd1423e6f (patch) | |
| tree | d95bfdadc321e788ea5333aff9c8d6abee6ccd31 | |
| parent | 461a2bd5516fbb8f15cb1b97af6d82b5ecf5e61f (diff) | |
| parent | b82c54b7ae4ceb0f6e026c0b987305be83065750 (diff) | |
Merge "[Bold text] Use a default bold font for null typefaces" into main
| -rw-r--r-- | core/java/android/text/flags/flags.aconfig | 10 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/text/flags/flags.aconfig b/core/java/android/text/flags/flags.aconfig index 785b1b2c49e4..7023ef7afd2f 100644 --- a/core/java/android/text/flags/flags.aconfig +++ b/core/java/android/text/flags/flags.aconfig @@ -201,3 +201,13 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "fix_null_typeface_bolding" + namespace: "text" + description: "Use a bold typeface when bolding is enabled and the original typeface is null" + bug: "314811487" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 78dd3b18c2a6..fd3837f3fe12 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4817,7 +4817,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mFontWeightAdjustment != 0 && mFontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED) { if (tf == null) { - tf = Typeface.DEFAULT; + if (Flags.fixNullTypefaceBolding()) { + tf = Typeface.DEFAULT_BOLD; + } else { + tf = Typeface.DEFAULT; + } } else { int newWeight = Math.min( Math.max(tf.getWeight() + mFontWeightAdjustment, FontStyle.FONT_WEIGHT_MIN), |