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

Commit 80861ff1 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Make sure to compare subtype language with system language. 

This CL addresses a regression introduced by a recent CL [1] that
non-keyboard subtypes are no longer implicitly enabled based on the
system language (a.k.a. "use system language" in the subtype enabler)
due to a type mismatch in comparison.

Here is the original logic:
 if (language.equals(systemLanguage) && systemLocale.startsWith(locale))

And here is the logic replaced by [1]:
 if (locale != null && locale.equals(systemLanguage)) {

The new logic is simply broken, because locale is a Locale object while
systemLanguage is a String object.  It never matches.

With this CL we will compare the system language with the locale
language again, with several test cases that should have been included
in [1], as a temporary solution until we start relying on
LocaleUtils#filterByLanguage() for non-keyboard subtypes.

  [1]: Iaf179d60c12b9a98b4f097e2449471c4184e049b
       e985c240

Bug: 27560993
Change-Id: If2d1710174853180465832e6ecbbb91235b76210
parent a871c310

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -529,8 +529,8 @@ public class InputMethodUtils { 
            } else {

                final Locale locale = subtype.getLocaleObject();

                final String mode = subtype.getMode();

                // TODO: Take secondary system locales into consideration.

                if (locale != null && locale.equals(systemLanguage)) {

                // TODO: Use LocaleUtils#filterByLanguage() instead.

                if (locale != null && TextUtils.equals(locale.getLanguage(), systemLanguage)) {

                    final InputMethodSubtype applicableSubtype =

                            applicableModeAndSubtypesMap.get(mode);

                    // If more applicable subtypes are contained, skip.

core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java

+26 −3
Original line number Diff line number Diff line
@@ -222,6 +222,9 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        final InputMethodSubtype nonAutoHandwritingEn = createDummyInputMethodSubtype("en",

                SUBTYPE_MODE_HANDWRITING, !IS_AUX, !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE,

                !IS_ASCII_CAPABLE, !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE);

        final InputMethodSubtype nonAutoHandwritingFr = createDummyInputMethodSubtype("fr",

                SUBTYPE_MODE_HANDWRITING, !IS_AUX, !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE,

                !IS_ASCII_CAPABLE, !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE);

        final InputMethodSubtype nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype =

                createDummyInputMethodSubtype("zz", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                        !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,
@@ -242,6 +245,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(autoSubtype);  // overridesImplicitlyEnabledSubtype == true

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype2);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -264,6 +269,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoFil);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype2);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -271,7 +278,9 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            final ArrayList<InputMethodSubtype> result =

                    InputMethodUtils.getImplicitlyApplicableSubtypesLocked(

                            getResourcesForLocales(LOCALE_EN_US), imi);

            assertEquals(2, result.size());

            verifyEquality(nonAutoEnUS, result.get(0));

            verifyEquality(nonAutoHandwritingEn, result.get(1));

        }



        // Make sure that a subtype whose locale is exactly equal to the specified locale is
@@ -284,6 +293,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoJa);

            subtypes.add(nonAutoFil);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -291,8 +302,9 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            final ArrayList<InputMethodSubtype> result =

                    InputMethodUtils.getImplicitlyApplicableSubtypesLocked(

                            getResourcesForLocales(LOCALE_EN_GB), imi);

            assertEquals(1, result.size());

            assertEquals(2, result.size());

            verifyEquality(nonAutoEnGB, result.get(0));

            verifyEquality(nonAutoHandwritingEn, result.get(1));

        }



        // If there is no automatic subtype (overridesImplicitlyEnabledSubtype:true) and
@@ -306,6 +318,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoFil);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype2);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -313,8 +327,9 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            final ArrayList<InputMethodSubtype> result =

                    InputMethodUtils.getImplicitlyApplicableSubtypesLocked(

                            getResourcesForLocales(LOCALE_FR), imi);

            assertEquals(1, result.size());

            assertEquals(2, result.size());

            verifyEquality(nonAutoFrCA, result.get(0));

            verifyEquality(nonAutoHandwritingFr, result.get(1));

        }

        // Then make sure that a subtype (locale: "fr") can be found with locale: "fr_CA".

        {
@@ -324,6 +339,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoFil);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype2);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -331,8 +348,9 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            final ArrayList<InputMethodSubtype> result =

                    InputMethodUtils.getImplicitlyApplicableSubtypesLocked(

                            getResourcesForLocales(LOCALE_FR_CA), imi);

            assertEquals(1, result.size());

            assertEquals(2, result.size());

            verifyEquality(nonAutoFrCA, result.get(0));

            verifyEquality(nonAutoHandwritingFr, result.get(1));

        }



        // Make sure that subtypes which have "EnabledWhenDefaultIsNotAsciiCapable" in its
@@ -343,6 +361,8 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoJa);    // not ASCII capable

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype2);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",

                    "com.android.apps.inputmethod.latin", "DummyLatinIme", !IS_AUX, IS_DEFAULT,
@@ -363,6 +383,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoHi);

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",
@@ -379,6 +400,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoHi);

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);

            final InputMethodInfo imi = createDummyInputMethodInfo(

                    "com.android.apps.inputmethod.latin",
@@ -393,6 +415,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        {

            final ArrayList<InputMethodSubtype> subtypes = new ArrayList<>();

            subtypes.add(nonAutoHandwritingEn);

            subtypes.add(nonAutoHandwritingFr);

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoHi);

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);