commit a48f00a5e82ccc2729619fba9796775360fbafb7
author xunchang <xunchang@google.com> Mon Nov 26 15:40:28 2018 -0800
committer xunchang <xunchang@google.com> Thu Nov 29 12:13:02 2018 -0800
tree 6412545d08859530c4fa3e38e8ac8ea2e29b291f
parent 697003dbce12d26c32fecb39959e566bb0a69684

ImageGenerator: ignore the duplicate locales

Some language variants have the duplicated translations. Therefore,
we can compare the translated string for each locale to the default
text string for that language. And the duplicated ones will be skipped
to save some space.

Bug: 74397117
Test: generate and check the image
Change-Id: If51fa8fe700350c06f084f0e74d3698b82d6f177

tools/image_generator/ImageGenerator.java

diff --git a/tools/image_generator/ImageGenerator.java b/tools/image_generator/ImageGenerator.java
index 50a4984..fd8e542 100644
--- a/tools/image_generator/ImageGenerator.java
+++ b/tools/image_generator/ImageGenerator.java
@@ -41,6 +41,7 @@
 import java.text.AttributedString;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -605,11 +606,15 @@
         mDefaultFont = defaultFontMetrics.getFont();
         mAndroidStringWidth = defaultFontMetrics.stringWidth(ANDROID_STRING);
 
-        Map<String, Integer> languageCount = new TreeMap<>();
+        // The last country variant should be the fallback locale for a given language.
+        Map<String, Locale> fallbackLocaleMap = new HashMap<>();
         int textWidth = 0;
         for (Locale locale : localizedTextMap.keySet()) {
-            String language = locale.getLanguage();
-            languageCount.put(language, languageCount.getOrDefault(language, 0) + 1);
+            // Updates the fallback locale if we have a new language variant. Don't do it for en-XC
+            // as it's a pseudo-locale.
+            if (!locale.toLanguageTag().equals("en-XC")) {
+                fallbackLocaleMap.put(locale.getLanguage(), locale);
+            }
             textWidth = Math.max(textWidth, measureTextWidth(localizedTextMap.get(locale), locale));
         }
 
@@ -617,15 +622,16 @@
         resize(textWidth, mImageHeight);
 
         for (Locale locale : localizedTextMap.keySet()) {
-            Integer count = languageCount.get(locale.getLanguage());
             // Recovery expects en-US instead of en_US.
             String languageTag = locale.toLanguageTag();
-            if (count == 1) {
-                // Make the last country variant for a given language be the catch-all for that
+            Locale fallbackLocale = fallbackLocaleMap.get(locale.getLanguage());
+            if (locale.equals(fallbackLocale)) {
+                // Makes the last country variant for a given language be the catch-all for that
                 // language.
                 languageTag = locale.getLanguage();
-            } else {
-                languageCount.put(locale.getLanguage(), count - 1);
+            } else if (localizedTextMap.get(locale).equals(localizedTextMap.get(fallbackLocale))) {
+                LOGGER.info("Skip parsing text for duplicate locale " + locale);
+                continue;
             }
 
             drawText(localizedTextMap.get(locale), locale, languageTag);