Merge "Various LocaleList cleanups" (c9088c5d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -40070,7 +40070,6 @@ package android.util {
		method public static android.util.LocaleList getDefault();
		method public static android.util.LocaleList getEmptyLocaleList();
		method public java.util.Locale getFirstMatch(java.lang.String[]);
		method public java.util.Locale getPrimary();
		method public int indexOf(java.util.Locale);
		method public boolean isEmpty();
		method public static void setDefault(android.util.LocaleList);

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -42718,7 +42718,6 @@ package android.util {
		method public static android.util.LocaleList getDefault();
		method public static android.util.LocaleList getEmptyLocaleList();
		method public java.util.Locale getFirstMatch(java.lang.String[]);
		method public java.util.Locale getPrimary();
		method public int indexOf(java.util.Locale);
		method public boolean isEmpty();
		method public static void setDefault(android.util.LocaleList);

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -40087,7 +40087,6 @@ package android.util {
		method public static android.util.LocaleList getDefault();
		method public static android.util.LocaleList getEmptyLocaleList();
		method public java.util.Locale getFirstMatch(java.lang.String[]);
		method public java.util.Locale getPrimary();
		method public int indexOf(java.util.Locale);
		method public boolean isEmpty();
		method public static void setDefault(android.util.LocaleList);

core/java/android/content/res/Configuration.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -715,7 +715,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		* about setLocales() has changed locale directly. */
		private void fixUpLocaleList() {
		if ((locale == null && !mLocaleList.isEmpty()) \|\|
		(locale != null && !locale.equals(mLocaleList.getPrimary()))) {
		(locale != null && !locale.equals(mLocaleList.get(0)))) {
		mLocaleList = new LocaleList(locale);
		}
		}
		@@ -1269,7 +1269,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		localeArray[i] = Locale.forLanguageTag(source.readString());
		}
		mLocaleList = new LocaleList(localeArray);
		locale = mLocaleList.getPrimary();
		locale = mLocaleList.get(0);

		userSetLocale = (source.readInt()==1);
		touchscreen = source.readInt();
		@@ -1435,7 +1435,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		*/
		public void setLocales(@Nullable LocaleList locales) {
		mLocaleList = locales == null ? LocaleList.getEmptyLocaleList() : locales;
		locale = mLocaleList.getPrimary();
		locale = mLocaleList.get(0);
		setLayoutDirection(locale);
		}

		@@ -1900,7 +1900,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration

		final String localesStr = XmlUtils.readStringAttribute(parser, XML_ATTR_LOCALES);
		configOut.mLocaleList = LocaleList.forLanguageTags(localesStr);
		configOut.locale = configOut.mLocaleList.getPrimary();
		configOut.locale = configOut.mLocaleList.get(0);

		configOut.touchscreen = XmlUtils.readIntAttribute(parser, XML_ATTR_TOUCHSCREEN,
		TOUCHSCREEN_UNDEFINED);

core/java/android/content/res/Resources.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -381,7 +381,7 @@ public class Resources {
		private PluralRules getPluralRule() {
		synchronized (sSync) {
		if (mPluralRule == null) {
		mPluralRule = PluralRules.forLocale(mConfiguration.getLocales().getPrimary());
		mPluralRule = PluralRules.forLocale(mConfiguration.getLocales().get(0));
		}
		return mPluralRule;
		}
		@@ -444,7 +444,7 @@ public class Resources {
		@NonNull
		public String getString(@StringRes int id, Object... formatArgs) throws NotFoundException {
		final String raw = getString(id);
		return String.format(mConfiguration.getLocales().getPrimary(), raw, formatArgs);
		return String.format(mConfiguration.getLocales().get(0), raw, formatArgs);
		}

		/**
		@@ -475,7 +475,7 @@ public class Resources {
		public String getQuantityString(@PluralsRes int id, int quantity, Object... formatArgs)
		throws NotFoundException {
		String raw = getQuantityText(id, quantity).toString();
		return String.format(mConfiguration.getLocales().getPrimary(), raw, formatArgs);
		return String.format(mConfiguration.getLocales().get(0), raw, formatArgs);
		}

		/**
		@@ -1971,7 +1971,7 @@ public class Resources {
		}

		mAssets.setConfiguration(mConfiguration.mcc, mConfiguration.mnc,
		adjustLanguageTag(locales.getPrimary().toLanguageTag()),
		adjustLanguageTag(locales.get(0).toLanguageTag()),
		mConfiguration.orientation,
		mConfiguration.touchscreen,
		mConfiguration.densityDpi, mConfiguration.keyboard,
		@@ -1996,7 +1996,7 @@ public class Resources {
		}
		synchronized (sSync) {
		if (mPluralRule != null) {
		mPluralRule = PluralRules.forLocale(mConfiguration.getLocales().getPrimary());
		mPluralRule = PluralRules.forLocale(mConfiguration.getLocales().get(0));
		}
		}
		}