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

Commit e72d1c82 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0 

This CL adds several unit tests for following CLs, both of which enabled
InputMethodUtils (and dependent IMF logic) to handle 3 letter language codes
and conversion from deprecated two-letter codes to new ones correctly.
- Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c
- I6571d464a46453934f0a8f5e79018a67a9a3c845

As described in tests, the input method framework has already been able to
recognize 3 letter language codes.  However, there remain inconsistencies
when we use deprecated 2-letter code to query subtype like "in" but the
subtype has new language codes like "id".  Subsequent CLs are supposed to
address remaining issues.

bug: 10090157
Change-Id: I7d932e60311b80c05be8f02c9e803f18da0e0054
parent 8f3b76cb

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

+4 −1
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ import android.view.inputmethod.InputMethodSubtype; 
import android.view.textservice.SpellCheckerInfo;

import android.view.textservice.TextServicesManager;



import com.android.internal.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;
@@ -518,7 +520,8 @@ public class InputMethodUtils { 
        return NOT_A_SUBTYPE_ID;

    }



    private static ArrayList<InputMethodSubtype> getImplicitlyApplicableSubtypesLocked(

    @VisibleForTesting

    public static ArrayList<InputMethodSubtype> getImplicitlyApplicableSubtypesLocked(

            Resources res, InputMethodInfo imi) {

        final List<InputMethodSubtype> subtypes = InputMethodUtils.getSubtypes(imi);

        final String systemLocale = res.getConfiguration().locale.toString();

core/tests/inputmethodtests/src/android/os/InputMethodTest.java

+488 −32

File changed.

Preview size limit exceeded, changes collapsed.