Commit 57c222c5 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

[Google Sans] Fix regular full font name key

The ICU case folded full font name for the regular weight Google Sans
font is "google sans regular".

Bug: 1130057
Change-Id: I4e0f8eccaf1dfd66ebb2d55cdae8557dda232ee7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419147Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Auto-Submit: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809041}
parent 4be5a8c2
...@@ -239,16 +239,17 @@ public class AndroidFontLookupImpl implements AndroidFontLookup { ...@@ -239,16 +239,17 @@ public class AndroidFontLookupImpl implements AndroidFontLookup {
* for a selected subset of Android Downloadable fonts. * for a selected subset of Android Downloadable fonts.
* *
* Note: Because the CaseMap.Fold Java API is only available in Android API 29+, these keys have * Note: Because the CaseMap.Fold Java API is only available in Android API 29+, these keys have
* been manually converted from full font name (i.e. "Google Sans") to ICU case folded full font * been manually converted from full font name to ICU case folded full font name (i.e. "Google
* name using `third_party/blink/common/font_unique_name_lookup/icu_fold_case_util.cc`. When * Sans Regular" to "google sans regular") using
* further map entries are added in future, consider importing ICU4J as a third_party library to * `third_party/blink/common/font_unique_name_lookup/icu_fold_case_util.cc`. When further map
* do this case folding explicitly in Java code instead, or using the native utility via JNI. * entries are added in future, consider importing ICU4J as a third_party library to do this
* case folding explicitly in Java code instead, or using the native utility via JNI.
* *
* @return The created map from font names to queries. * @return The created map from font names to queries.
*/ */
private static Map<String, String> createFullFontNameToQueryMap() { private static Map<String, String> createFullFontNameToQueryMap() {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("google sans", "name=Google Sans&weight=400"); map.put("google sans regular", "name=Google Sans&weight=400");
map.put("google sans medium", "name=Google Sans&weight=500"); map.put("google sans medium", "name=Google Sans&weight=500");
return map; return map;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment