Merge "cleanup: clean up flag high_contrast_text_inner_text_color" into main (ecffcc41) · Commits · e / os / android_frameworks_base

libs/hwui/aconfig/hwui_flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -41,16 +41,6 @@ flag {
		is_exported: true
		}

		flag {
		name: "high_contrast_text_inner_text_color"
		namespace: "accessibility"
		description: "Render text color by modifying its brightness instead of defaulting to black and white"
		bug: "384793956"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "hdr_10bit_plus"
		namespace: "core_graphics"

+2 −9

Original line number	Diff line number	Diff line
		@@ -38,9 +38,6 @@ namespace flags {
		constexpr bool high_contrast_text_small_text_rect() {
		return false;
		}
		constexpr bool high_contrast_text_inner_text_color() {
		return false;
		}
		} // namespace flags
		#endif // __linux__

		@@ -162,12 +159,8 @@ public:
		// inner
		gDrawTextBlobMode = DrawTextBlobMode::HctInner;
		Paint innerPaint(paint);
		if (flags::high_contrast_text_inner_text_color()) {
		adjustHighContrastInnerTextColor(&lab);
		simplifyPaint(uirenderer::LabToSRGB(lab, 1.0f), &innerPaint);
		} else {
		simplifyPaint(darken ? SkColors::kBlack : SkColors::kWhite, &innerPaint);
		}
		innerPaint.setStyle(SkPaint::kFill_Style);
		canvas->drawGlyphs(glyphFunc, glyphCount, innerPaint, x, y, totalAdvance);
		gDrawTextBlobMode = DrawTextBlobMode::Normal;