Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b694623 authored Jan 19, 2024 by Yohei Yukawa Committed by Android (Google) Code Review Jan 19, 2024

Merge "Make LocaleUtils#getLanguageFromLocaleString() work again" into main

parents 1c9ab252 c482473c

services/core/java/com/android/server/inputmethod/LocaleUtils.java

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -212,10 +212,16 @@ final class LocaleUtils {

	/**		/**
	* Returns the language component of a given locale string.		* Returns the language component of a given locale string.
	* TODO: Use {@link Locale#toLanguageTag()} and {@link Locale#forLanguageTag(String)}		* TODO(b/321064051): Switch to {@link
			* com.android.internal.inputmethod.SubtypeLocaleUtils#constructLocaleFromString(String)}
	*/		*/
	static String getLanguageFromLocaleString(String locale) {		static String getLanguageFromLocaleString(String locale) {
	return Locale.forLanguageTag(locale).getLanguage();		final int idx = locale.indexOf('_');
			if (idx < 0) {
			return locale;
			} else {
			return locale.substring(0, idx);
			}
	}		}

	static Locale getSystemLocaleFromContext(Context context) {		static Locale getSystemLocaleFromContext(Context context) {

services/tests/servicestests/src/com/android/server/inputmethod/LocaleUtilsTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -392,6 +392,6 @@ public class LocaleUtilsTest {
	@Test		@Test
	public void testGetLanguageFromLocaleString() {		public void testGetLanguageFromLocaleString() {
	assertThat(LocaleUtils.getLanguageFromLocaleString("en")).isEqualTo("en");		assertThat(LocaleUtils.getLanguageFromLocaleString("en")).isEqualTo("en");
	assertThat(LocaleUtils.getLanguageFromLocaleString("en-US")).isEqualTo("en");		assertThat(LocaleUtils.getLanguageFromLocaleString("en_US")).isEqualTo("en");
	}		}
	}		}