Merge "Fix bold text bug in NumberPicker" into main (e408857e) · Commits · e / os / android_frameworks_base

core/java/android/widget/NumberPicker.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import android.view.accessibility.AccessibilityNodeProvider;
		import android.view.animation.DecelerateInterpolator;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputMethodManager;
		import android.widget.flags.Flags;

		import com.android.internal.R;

		@@ -790,7 +791,11 @@ public class NumberPicker extends LinearLayout {
		paint.setAntiAlias(true);
		paint.setTextAlign(Align.CENTER);
		paint.setTextSize(mTextSize);
		if (Flags.fixUnboldedTypefaceForNumberpicker()) {
		paint.setTypeface(mInputText.getPaint().getTypeface());
		} else {
		paint.setTypeface(mInputText.getTypeface());
		}
		ColorStateList colors = mInputText.getTextColors();
		int color = colors.getColorForState(ENABLED_STATE_SET, Color.WHITE);
		paint.setColor(color);

+10 −0

Original line number	Diff line number	Diff line
		@@ -17,3 +17,13 @@ flag {
		is_exported: true
		bug: "369480667"
		}

		flag {
		name: "fix_unbolded_typeface_for_numberpicker"
		namespace: "text"
		description: "Use the correct bolded typeface when drawing the selector numbers"
		bug: "318304896"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}