| Index: ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| index adbf8afac277330364f11daeafffa525c5224d7e..c1965b4b77c707e4b45b922e4827567b404f5a9a 100644
|
| --- a/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| +++ b/ui/android/java/src/org/chromium/ui/base/ResourceBundle.java
|
| @@ -4,18 +4,11 @@
|
|
|
| package org.chromium.ui.base;
|
|
|
| -import android.content.Context;
|
| -import android.content.res.Resources;
|
| -import android.content.res.TypedArray;
|
| -
|
| -import org.chromium.base.ResourceExtractor;
|
| -import org.chromium.base.ThreadUtils;
|
| +import org.chromium.base.BuildConfig;
|
| import org.chromium.base.annotations.CalledByNative;
|
| import org.chromium.base.annotations.JNINamespace;
|
| -import org.chromium.base.annotations.SuppressFBWarnings;
|
|
|
| -import java.io.File;
|
| -import java.util.Locale;
|
| +import java.util.Arrays;
|
|
|
| /**
|
| * This class provides the resource bundle related methods for the native
|
| @@ -23,67 +16,10 @@ import java.util.Locale;
|
| */
|
| @JNINamespace("ui")
|
| public class ResourceBundle {
|
| - private static ResourceExtractor.ResourceEntry[] sActiveLocaleResources;
|
| -
|
| - /**
|
| - * Applies the reverse mapping done by locale_pak_resources.py.
|
| - */
|
| - private static String toChromeLocaleName(String srcFileName) {
|
| - srcFileName = srcFileName.replace(".lpak", ".pak");
|
| - String[] parts = srcFileName.split("_");
|
| - if (parts.length > 1) {
|
| - int dotIdx = parts[1].indexOf('.');
|
| - return parts[0] + "-" + parts[1].substring(0, dotIdx).toUpperCase(Locale.ENGLISH)
|
| - + parts[1].substring(dotIdx);
|
| - }
|
| - return srcFileName;
|
| - }
|
| -
|
| - /**
|
| - * Initializes the list of locale packs for the active locale that are
|
| - * present within the apk.
|
| - *
|
| - * @param context Any context
|
| - * @param localePaksResId Resource ID locale_paks (generated by
|
| - * locale_pak_resources.py)
|
| - */
|
| - @SuppressFBWarnings("LI_LAZY_INIT_UPDATE_STATIC") // Not thread-safe.
|
| - public static void initializeLocalePaks(Context context, int localePaksResId) {
|
| - ThreadUtils.assertOnUiThread();
|
| - assert sActiveLocaleResources == null;
|
| - Resources resources = context.getResources();
|
| - TypedArray resIds = resources.obtainTypedArray(localePaksResId);
|
| - try {
|
| - int len = resIds.length();
|
| - sActiveLocaleResources = new ResourceExtractor.ResourceEntry[len];
|
| - for (int i = 0; i < len; ++i) {
|
| - int resId = resIds.getResourceId(i, 0);
|
| - String resPath = resources.getString(resId);
|
| - String srcBaseName = new File(resPath).getName();
|
| - String dstBaseName = toChromeLocaleName(srcBaseName);
|
| - sActiveLocaleResources[i] = new ResourceExtractor.ResourceEntry(resId, resPath,
|
| - dstBaseName);
|
| - }
|
| - } finally {
|
| - resIds.recycle();
|
| - }
|
| - }
|
| -
|
| - @SuppressFBWarnings("MS_EXPOSE_REP") // Don't modify the array.
|
| - public static ResourceExtractor.ResourceEntry[] getActiveLocaleResources() {
|
| - return sActiveLocaleResources;
|
| - }
|
| -
|
| @CalledByNative
|
| private static String getLocalePakResourcePath(String locale) {
|
| - if (sActiveLocaleResources == null) {
|
| - return null;
|
| - }
|
| - String fileName = locale + ".pak";
|
| - for (ResourceExtractor.ResourceEntry entry : sActiveLocaleResources) {
|
| - if (fileName.equals(entry.extractedFileName)) {
|
| - return entry.pathWithinApk;
|
| - }
|
| + if (Arrays.binarySearch(BuildConfig.UNCOMPRESSED_LOCALES, locale) >= 0) {
|
| + return "assets/" + locale + ".pak";
|
| }
|
| return null;
|
| }
|
|
|