Merge "Treat missing font in fallback chain" (244c6a65) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java

+80 −0

Original line number	Diff line number	Diff line
		@@ -505,4 +505,84 @@ public class TypefaceSystemFallbackTest {
		assertEquals(GLYPH_3EM_WIDTH, paint.measureText("b"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("c"), 0.0f);
		}

		@Test
		public void testBuildSystemFallback_ElegantFallback_customFallback_missingFile() {
		final String xml = "<?xml version='1.0' encoding='UTF-8'?>"
		+ "<familyset>"
		+ " <family name='sans-serif'>"
		+ " <font weight='400' style='normal'>no_coverage.ttf</font>"
		+ " </family>"
		+ " <family name='serif'>"
		+ " <font weight='400' style='normal'>no_coverage.ttf</font>"
		+ " </family>"
		+ " <family>"
		+ " <font weight='400' style='normal'>a3em.ttf</font>"
		+ " <font weight='400' style='normal' fallbackFor='serif'>NoSuchFont.ttf</font>"
		+ " </family>"
		+ " <family>"
		+ " <font weight='400' style='normal'>b3em.ttf</font>"
		+ " </family>"
		+ "</familyset>";
		final ArrayMap<String, Typeface> fontMap = new ArrayMap<>();
		final ArrayMap<String, FontFamily[]> fallbackMap = new ArrayMap<>();

		buildSystemFallback(xml, fontMap, fallbackMap);

		final Paint paint = new Paint();

		Typeface testTypeface = fontMap.get("serif");
		assertNotNull(testTypeface);
		paint.setTypeface(testTypeface);
		assertEquals(GLYPH_3EM_WIDTH, paint.measureText("a"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("b"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("c"), 0.0f);

		testTypeface = fontMap.get("sans-serif");
		assertNotNull(testTypeface);
		paint.setTypeface(testTypeface);
		assertEquals(GLYPH_3EM_WIDTH, paint.measureText("a"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("b"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("c"), 0.0f);
		}

		@Test
		public void testBuildSystemFallback_ElegantFallback_customFallback_missingFile2() {
		final String xml = "<?xml version='1.0' encoding='UTF-8'?>"
		+ "<familyset>"
		+ " <family name='sans-serif'>"
		+ " <font weight='400' style='normal'>no_coverage.ttf</font>"
		+ " </family>"
		+ " <family name='serif'>"
		+ " <font weight='400' style='normal'>no_coverage.ttf</font>"
		+ " </family>"
		+ " <family>"
		+ " <font weight='400' style='normal' fallbackFor='serif'>NoSuchFont.ttf</font>"
		+ " </family>"
		+ " <family>"
		+ " <font weight='400' style='normal'>a3em.ttf</font>"
		+ " </family>"
		+ "</familyset>";
		final ArrayMap<String, Typeface> fontMap = new ArrayMap<>();
		final ArrayMap<String, FontFamily[]> fallbackMap = new ArrayMap<>();

		buildSystemFallback(xml, fontMap, fallbackMap);

		final Paint paint = new Paint();

		Typeface testTypeface = fontMap.get("serif");
		assertNotNull(testTypeface);
		paint.setTypeface(testTypeface);
		assertEquals(GLYPH_3EM_WIDTH, paint.measureText("a"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("b"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("c"), 0.0f);

		testTypeface = fontMap.get("sans-serif");
		assertNotNull(testTypeface);
		paint.setTypeface(testTypeface);
		assertEquals(GLYPH_3EM_WIDTH, paint.measureText("a"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("b"), 0.0f);
		assertEquals(GLYPH_1EM_WIDTH, paint.measureText("c"), 0.0f);
		}

		}

graphics/java/android/graphics/Typeface.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1025,6 +1025,10 @@ public class Typeface {
		xmlFamily.getName(), fallback, languageTags, variant, cache, fontDir);
		if (family != null) {
		fallbackMap.valueAt(i).add(family);
		} else if (defaultFamily != null) {
		fallbackMap.valueAt(i).add(defaultFamily);
		} else {
		// There is no valid for for default fallback. Ignore.
		}
		}
		}