Reland try 2 "Pass all preferred locales to AssetManager" (ccf5cd71) · Commits · e / os / android_frameworks_base

core/java/android/app/LocaleConfig.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.Arrays;		import java.util.Arrays;
	import java.util.Collections;		import java.util.Collections;
	import java.util.HashSet;		import java.util.LinkedHashSet;
	import java.util.List;		import java.util.List;
	import java.util.Locale;		import java.util.Locale;
	import java.util.Set;		import java.util.Set;
	@@ -195,7 +195,8 @@ public class LocaleConfig implements Parcelable {
	XmlUtils.beginDocument(parser, TAG_LOCALE_CONFIG);		XmlUtils.beginDocument(parser, TAG_LOCALE_CONFIG);
	int outerDepth = parser.getDepth();		int outerDepth = parser.getDepth();
	AttributeSet attrs = Xml.asAttributeSet(parser);		AttributeSet attrs = Xml.asAttributeSet(parser);
	Set<String> localeNames = new HashSet<String>();		// LinkedHashSet to preserve insertion order
			Set<String> localeNames = new LinkedHashSet<>();
	while (XmlUtils.nextElementWithin(parser, outerDepth)) {		while (XmlUtils.nextElementWithin(parser, outerDepth)) {
	if (TAG_LOCALE.equals(parser.getName())) {		if (TAG_LOCALE.equals(parser.getName())) {
	final TypedArray attributes = res.obtainAttributes(		final TypedArray attributes = res.obtainAttributes(

core/java/android/content/pm/PackageParser.java

+6 −6

core/java/android/content/res/AssetManager.java

+31 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1480,15 +1480,38 @@ public final class AssetManager implements AutoCloseable {
	int screenWidth, int screenHeight, int smallestScreenWidthDp, int screenWidthDp,		int screenWidth, int screenHeight, int smallestScreenWidthDp, int screenWidthDp,
	int screenHeightDp, int screenLayout, int uiMode, int colorMode, int grammaticalGender,		int screenHeightDp, int screenLayout, int uiMode, int colorMode, int grammaticalGender,
	int majorVersion) {		int majorVersion) {
	synchronized (this) {		if (locale != null) {
	ensureValidLocked();		setConfiguration(mcc, mnc, null, new String[]{locale}, orientation, touchscreen,
	nativeSetConfiguration(mObject, mcc, mnc, locale, orientation, touchscreen, density,		density, keyboard, keyboardHidden, navigation, screenWidth, screenHeight,
			smallestScreenWidthDp, screenWidthDp, screenHeightDp, screenLayout, uiMode,
			colorMode, grammaticalGender, majorVersion);
			} else {
			setConfiguration(mcc, mnc, null, null, orientation, touchscreen, density,
	keyboard, keyboardHidden, navigation, screenWidth, screenHeight,		keyboard, keyboardHidden, navigation, screenWidth, screenHeight,
	smallestScreenWidthDp, screenWidthDp, screenHeightDp, screenLayout, uiMode,		smallestScreenWidthDp, screenWidthDp, screenHeightDp, screenLayout, uiMode,
	colorMode, grammaticalGender, majorVersion);		colorMode, grammaticalGender, majorVersion);
	}		}
	}		}

			/**
			* Change the configuration used when retrieving resources. Not for use by
			* applications.
			* @hide
			*/
			public void setConfiguration(int mcc, int mnc, String defaultLocale, String[] locales,
			int orientation, int touchscreen, int density, int keyboard, int keyboardHidden,
			int navigation, int screenWidth, int screenHeight, int smallestScreenWidthDp,
			int screenWidthDp, int screenHeightDp, int screenLayout, int uiMode, int colorMode,
			int grammaticalGender, int majorVersion) {
			synchronized (this) {
			ensureValidLocked();
			nativeSetConfiguration(mObject, mcc, mnc, defaultLocale, locales, orientation,
			touchscreen, density, keyboard, keyboardHidden, navigation, screenWidth,
			screenHeight, smallestScreenWidthDp, screenWidthDp, screenHeightDp,
			screenLayout, uiMode, colorMode, grammaticalGender, majorVersion);
			}
			}

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -1572,10 +1595,11 @@ public final class AssetManager implements AutoCloseable {
	private static native void nativeSetApkAssets(long ptr, @NonNull ApkAssets[] apkAssets,		private static native void nativeSetApkAssets(long ptr, @NonNull ApkAssets[] apkAssets,
	boolean invalidateCaches);		boolean invalidateCaches);
	private static native void nativeSetConfiguration(long ptr, int mcc, int mnc,		private static native void nativeSetConfiguration(long ptr, int mcc, int mnc,
	@Nullable String locale, int orientation, int touchscreen, int density, int keyboard,		@Nullable String defaultLocale, @NonNull String[] locales, int orientation,
	int keyboardHidden, int navigation, int screenWidth, int screenHeight,		int touchscreen, int density, int keyboard, int keyboardHidden, int navigation,
	int smallestScreenWidthDp, int screenWidthDp, int screenHeightDp, int screenLayout,		int screenWidth, int screenHeight, int smallestScreenWidthDp, int screenWidthDp,
	int uiMode, int colorMode, int grammaticalGender, int majorVersion);		int screenHeightDp, int screenLayout, int uiMode, int colorMode, int grammaticalGender,
			int majorVersion);
	private static native @NonNull SparseArray<String> nativeGetAssignedPackageIdentifiers(		private static native @NonNull SparseArray<String> nativeGetAssignedPackageIdentifiers(
	long ptr, boolean includeOverlays, boolean includeLoaders);		long ptr, boolean includeOverlays, boolean includeLoaders);

core/java/android/content/res/ResourcesImpl.java

+33 −12

Original line number	Original line	Diff line number	Diff line
	@@ -425,14 +425,12 @@ public class ResourcesImpl {
	mConfiguration.setLocales(locales);		mConfiguration.setLocales(locales);
	}		}

			String[] selectedLocales = null;
			String defaultLocale = null;
	if ((configChanges & ActivityInfo.CONFIG_LOCALE) != 0) {		if ((configChanges & ActivityInfo.CONFIG_LOCALE) != 0) {
	if (locales.size() > 1) {		if (locales.size() > 1) {
	String[] availableLocales;		String[] availableLocales;
			if (ResourcesManager.getInstance().getLocaleList().isEmpty()) {
	LocaleList localeList = ResourcesManager.getInstance().getLocaleList();
	if (!localeList.isEmpty()) {
	availableLocales = localeList.toLanguageTags().split(",");
	} else {
	// The LocaleList has changed. We must query the AssetManager's		// The LocaleList has changed. We must query the AssetManager's
	// available Locales and figure out the best matching Locale in the new		// available Locales and figure out the best matching Locale in the new
	// LocaleList.		// LocaleList.
	@@ -444,13 +442,35 @@ public class ResourcesImpl {
	availableLocales = null;		availableLocales = null;
	}		}
	}		}
	}
	if (availableLocales != null) {		if (availableLocales != null) {
	final Locale bestLocale = locales.getFirstMatchWithEnglishSupported(		final Locale bestLocale = locales.getFirstMatchWithEnglishSupported(
	availableLocales);		availableLocales);
	if (bestLocale != null && bestLocale != locales.get(0)) {		if (bestLocale != null) {
	mConfiguration.setLocales(new LocaleList(bestLocale, locales));		selectedLocales = new String[]{
			adjustLanguageTag(bestLocale.toLanguageTag())};
			if (!bestLocale.equals(locales.get(0))) {
			mConfiguration.setLocales(
			new LocaleList(bestLocale, locales));
			}
			}
	}		}
			} else {
			selectedLocales = locales.getIntersection(
			ResourcesManager.getInstance().getLocaleList());
			defaultLocale = ResourcesManager.getInstance()
			.getLocaleList().get(0).toLanguageTag();
			}
			}
			}
			if (selectedLocales == null) {
			if (ResourcesManager.getInstance().getLocaleList().isEmpty()) {
			selectedLocales = new String[]{
			adjustLanguageTag(locales.get(0).toLanguageTag())};
			} else {
			selectedLocales = new String[locales.size()];
			for (int i = 0; i < locales.size(); i++) {
			selectedLocales[i] = adjustLanguageTag(locales.get(i).toLanguageTag());
	}		}
	}		}
	}		}
	@@ -488,7 +508,8 @@ public class ResourcesImpl {
	}		}

	mAssets.setConfiguration(mConfiguration.mcc, mConfiguration.mnc,		mAssets.setConfiguration(mConfiguration.mcc, mConfiguration.mnc,
	adjustLanguageTag(mConfiguration.getLocales().get(0).toLanguageTag()),		defaultLocale,
			selectedLocales,
	mConfiguration.orientation,		mConfiguration.orientation,
	mConfiguration.touchscreen,		mConfiguration.touchscreen,
	mConfiguration.densityDpi, mConfiguration.keyboard,		mConfiguration.densityDpi, mConfiguration.keyboard,

core/java/android/os/LocaleList.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ import java.util.ArrayList;
	import java.util.Arrays;		import java.util.Arrays;
	import java.util.Collection;		import java.util.Collection;
	import java.util.HashSet;		import java.util.HashSet;
			import java.util.List;
	import java.util.Locale;		import java.util.Locale;

	/**		/**
	@@ -150,6 +151,25 @@ public final class LocaleList implements Parcelable {
	return mStringRepresentation;		return mStringRepresentation;
	}		}

			/**
			* Find the intersection between this LocaleList and another
			* @return a String array of the Locales in both LocaleLists
			* {@hide}
			*/
			@NonNull
			public String[] getIntersection(@NonNull LocaleList other) {
			List<String> intersection = new ArrayList<>();
			for (Locale l1 : mList) {
			for (Locale l2 : other.mList) {
			if (matchesLanguageAndScript(l2, l1)) {
			intersection.add(l1.toLanguageTag());
			break;
			}
			}
			}
			return intersection.toArray(new String[0]);
			}

	/**		/**
	* Creates a new {@link LocaleList}.		* Creates a new {@link LocaleList}.
	*		*

Original line number	Original line	Diff line number	Diff line
	@@ -1456,8 +1456,8 @@ public class PackageParser {

	private static AssetManager newConfiguredAssetManager() {		private static AssetManager newConfiguredAssetManager() {
	AssetManager assetManager = new AssetManager();		AssetManager assetManager = new AssetManager();
	assetManager.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,		assetManager.setConfiguration(0, 0, null, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	Build.VERSION.RESOURCES_SDK_INT);		0, 0, 0, Build.VERSION.RESOURCES_SDK_INT);
	return assetManager;		return assetManager;
	}		}

	@@ -9011,8 +9011,8 @@ public class PackageParser {
	}		}

	AssetManager assets = new AssetManager();		AssetManager assets = new AssetManager();
	assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,		assets.setConfiguration(0, 0, null, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	Build.VERSION.RESOURCES_SDK_INT);		0, 0, 0, Build.VERSION.RESOURCES_SDK_INT);
	assets.setApkAssets(apkAssets, false /invalidateCaches/);		assets.setApkAssets(apkAssets, false /invalidateCaches/);

	mCachedAssetManager = assets;		mCachedAssetManager = assets;
	@@ -9086,8 +9086,8 @@ public class PackageParser {

	private static AssetManager createAssetManagerWithAssets(ApkAssets[] apkAssets) {		private static AssetManager createAssetManagerWithAssets(ApkAssets[] apkAssets) {
	final AssetManager assets = new AssetManager();		final AssetManager assets = new AssetManager();
	assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,		assets.setConfiguration(0, 0, null, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	Build.VERSION.RESOURCES_SDK_INT);		0, 0, 0, Build.VERSION.RESOURCES_SDK_INT);
	assets.setApkAssets(apkAssets, false /invalidateCaches/);		assets.setApkAssets(apkAssets, false /invalidateCaches/);
	return assets;		return assets;
	}		}