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

Commit ce3f3380 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge changes I0f79243e,Ia27e19f9,Iec6b89f0,I276c7eb0 into nyc-dev 

* changes:
  Have unified setter/getter for Secure Settings.
  Remove redundant arguments.
  Use Context#getSystemService(Class<T>) in IMMS.
  Use Java7 diamond operator in InputMethodUtils.
parents d6b6e9c2 87523670

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

+42 −33
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.pm.PackageManager; 
import android.content.res.Resources;

import android.os.RemoteException;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.text.TextUtils;

import android.text.TextUtils.SimpleStringSplitter;

import android.util.ArrayMap;
@@ -769,7 +768,7 @@ public class InputMethodUtils { 
    public static ArrayMap<String, ArraySet<String>> parseInputMethodsAndSubtypesString(

            @Nullable final String inputMethodsAndSubtypesString) {



        final ArrayMap<String, ArraySet<String>> imeMap = new ArrayMap<String, ArraySet<String>>();

        final ArrayMap<String, ArraySet<String>> imeMap = new ArrayMap<>();

        if (TextUtils.isEmpty(inputMethodsAndSubtypesString)) {

            return imeMap;

        }
@@ -784,7 +783,7 @@ public class InputMethodUtils { 
                        typeSplitter,

                        subtypeSplitter);

        for (Pair<String, ArrayList<String>> ime : allImeSettings) {

            ArraySet<String> subtypes = new ArraySet<String>();

            ArraySet<String> subtypes = new ArraySet<>();

            if (ime.second != null) {

                subtypes.addAll(ime.second);

            }
@@ -899,6 +898,31 @@ public class InputMethodUtils { 
            mCurrentUserId = userId;

        }



        private void putString(final String key, final String str) {

            Settings.Secure.putStringForUser(mResolver, key, str, mCurrentUserId);

        }



        private String getString(final String key) {

            return Settings.Secure.getStringForUser(mResolver, key, mCurrentUserId);

        }



        private void putInt(final String key, final int value) {

            Settings.Secure.putIntForUser(mResolver, key, value, mCurrentUserId);

        }



        private int getInt(final String key, final int defaultValue) {

            return Settings.Secure.getIntForUser(mResolver, key, defaultValue, mCurrentUserId);

        }



        private void putBoolean(final String key, final boolean value) {

            Settings.Secure.putIntForUser(mResolver, key, value ? 1 : 0, mCurrentUserId);

        }



        private boolean getBoolean(final String key, final boolean defaultValue) {

            return Settings.Secure.getIntForUser(mResolver, key, defaultValue ? 1 : 0,

                    mCurrentUserId) == 1;

        }



        public void setCurrentProfileIds(int[] currentProfileIds) {

            synchronized (this) {

                mCurrentProfileIds = currentProfileIds;
@@ -1035,17 +1059,15 @@ public class InputMethodUtils { 
        }



        private void putEnabledInputMethodsStr(String str) {

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.ENABLED_INPUT_METHODS, str, mCurrentUserId);

            mEnabledInputMethodsStrCache = str;

            if (DEBUG) {

                Slog.d(TAG, "putEnabledInputMethodStr: " + str);

            }

            putString(Settings.Secure.ENABLED_INPUT_METHODS, str);

            mEnabledInputMethodsStrCache = str;

        }



        public String getEnabledInputMethodsStr() {

            mEnabledInputMethodsStrCache = Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.ENABLED_INPUT_METHODS, mCurrentUserId);

            mEnabledInputMethodsStrCache = getString(Settings.Secure.ENABLED_INPUT_METHODS);

            if (DEBUG) {

                Slog.d(TAG, "getEnabledInputMethodsStr: " + mEnabledInputMethodsStrCache

                        + ", " + mCurrentUserId);
@@ -1103,8 +1125,7 @@ public class InputMethodUtils { 
            if (DEBUG) {

                Slog.d(TAG, "putSubtypeHistoryStr: " + str);

            }

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, str, mCurrentUserId);

            putString(Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, str);

        }



        public Pair<String, String> getLastInputMethodAndSubtypeLocked() {
@@ -1222,12 +1243,11 @@ public class InputMethodUtils { 
        }



        private String getSubtypeHistoryStr() {

            final String history = getString(Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY);

            if (DEBUG) {

                Slog.d(TAG, "getSubtypeHistoryStr: " + Settings.Secure.getStringForUser(

                        mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, mCurrentUserId));

                Slog.d(TAG, "getSubtypeHistoryStr: " + history);

            }

            return Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.INPUT_METHODS_SUBTYPE_HISTORY, mCurrentUserId);

            return history;

        }



        public void putSelectedInputMethod(String imeId) {
@@ -1235,8 +1255,7 @@ public class InputMethodUtils { 
                Slog.d(TAG, "putSelectedInputMethodStr: " + imeId + ", "

                        + mCurrentUserId);

            }

            Settings.Secure.putStringForUser(

                    mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, imeId, mCurrentUserId);

            putString(Settings.Secure.DEFAULT_INPUT_METHOD, imeId);

        }



        public void putSelectedSubtype(int subtypeId) {
@@ -1244,18 +1263,15 @@ public class InputMethodUtils { 
                Slog.d(TAG, "putSelectedInputMethodSubtypeStr: " + subtypeId + ", "

                        + mCurrentUserId);

            }

            Settings.Secure.putIntForUser(mResolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE,

                    subtypeId, mCurrentUserId);

            putInt(Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, subtypeId);

        }



        public String getSelectedInputMethod() {

            final String imi = getString(Settings.Secure.DEFAULT_INPUT_METHOD);

            if (DEBUG) {

                Slog.d(TAG, "getSelectedInputMethodStr: " + Settings.Secure.getStringForUser(

                        mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, mCurrentUserId)

                        + ", " + mCurrentUserId);

                Slog.d(TAG, "getSelectedInputMethodStr: " + imi);

            }

            return Settings.Secure.getStringForUser(

                    mResolver, Settings.Secure.DEFAULT_INPUT_METHOD, mCurrentUserId);

            return imi;

        }



        public boolean isSubtypeSelected() {
@@ -1263,22 +1279,15 @@ public class InputMethodUtils { 
        }



        private int getSelectedInputMethodSubtypeHashCode() {

            try {

                return Settings.Secure.getIntForUser(

                        mResolver, Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, mCurrentUserId);

            } catch (SettingNotFoundException e) {

                return NOT_A_SUBTYPE_ID;

            }

            return getInt(Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE, NOT_A_SUBTYPE_ID);

        }



        public boolean isShowImeWithHardKeyboardEnabled() {

                return Settings.Secure.getIntForUser(mResolver,

                        Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mCurrentUserId) == 1;

            return getBoolean(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, false);

        }



        public void setShowImeWithHardKeyboard(boolean show) {

            Settings.Secure.putIntForUser(mResolver, Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,

                    show ? 1 : 0, mCurrentUserId);

            putBoolean(Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, show);

        }



        public int getCurrentUserId() {

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

+28 −28
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // Make sure that an automatic subtype (overridesImplicitlyEnabledSubtype:true) is

        // selected no matter what locale is specified.

        {

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

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

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoEnGB);

            subtypes.add(nonAutoJa);
@@ -244,7 +244,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // selected as long as there is no no automatic subtype

        // (overridesImplicitlyEnabledSubtype:true) in the given list.

        {

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

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

            subtypes.add(nonAutoEnUS);  // locale == "en_US"

            subtypes.add(nonAutoEnGB);

            subtypes.add(nonAutoJa);
@@ -267,7 +267,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // selected as long as there is no automatic subtype

        // (overridesImplicitlyEnabledSubtype:true) in the given list.

        {

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

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

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoEnGB); // locale == "en_GB"

            subtypes.add(nonAutoJa);
@@ -291,7 +291,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // try to find a subtype whose language is equal to the language part of the given locale.

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

        {

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

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

            subtypes.add(nonAutoFrCA);  // locale == "fr_CA"

            subtypes.add(nonAutoJa);

            subtypes.add(nonAutoFil);
@@ -311,7 +311,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        }

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

        {

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

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

            subtypes.add(nonAutoFr);  // locale == "fr"

            subtypes.add(nonAutoJa);

            subtypes.add(nonAutoFil);
@@ -333,7 +333,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // Make sure that subtypes which have "EnabledWhenDefaultIsNotAsciiCapable" in its

        // extra value is selected if and only if all other selected IMEs are not AsciiCapable.

        {

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

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

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoJa);    // not ASCII capable

            subtypes.add(nonAutoEnabledWhenDefaultIsNotAsciiCalableSubtype);
@@ -355,7 +355,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 


        // Make sure that 3-letter language code can be handled.

        {

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

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

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoFil);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -374,7 +374,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // Make sure that we never end up matching "fi" (finnish) with "fil" (filipino).

        // Also make sure that the first subtype will be used as the last-resort candidate.

        {

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

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

            subtypes.add(nonAutoJa);

            subtypes.add(nonAutoEnUS);

            subtypes.add(nonAutoFil);
@@ -393,7 +393,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 


        // Make sure that "in" and "id" conversion is taken into account.

        {

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

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

            subtypes.add(nonAutoIn);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -409,7 +409,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            verifyEquality(nonAutoIn, result.get(0));

        }

        {

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

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

            subtypes.add(nonAutoIn);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -425,7 +425,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            verifyEquality(nonAutoIn, result.get(0));

        }

        {

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

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

            subtypes.add(nonAutoId);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -441,7 +441,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
            verifyEquality(nonAutoId, result.get(0));

        }

        {

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

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

            subtypes.add(nonAutoId);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -482,7 +482,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        final boolean CHECK_COUNTRY = true;



        {

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

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

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(

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


        // Make sure that 3-letter language code ("fil") can be handled.

        {

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

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

            subtypes.add(nonAutoFil);

            final InputMethodInfo imi = createDummyInputMethodInfo(

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


        // Make sure that 3-letter language code ("fil_PH") can be handled.

        {

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

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

            subtypes.add(nonAutoFilPH);

            final InputMethodInfo imi = createDummyInputMethodInfo(

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


        // Make sure that a subtype whose locale is "in" can be queried with "id".

        {

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

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

            subtypes.add(nonAutoIn);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -587,7 +587,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 


        // Make sure that a subtype whose locale is "id" can be queried with "in".

        {

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

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

            subtypes.add(nonAutoId);

            subtypes.add(nonAutoEnUS);

            final InputMethodInfo imi = createDummyInputMethodInfo(
@@ -712,7 +712,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
    private static ArrayList<InputMethodInfo> getImesWithDefaultVoiceIme() {

        ArrayList<InputMethodInfo> preinstalledImes = new ArrayList<>();

        {

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

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

            subtypes.add(createDummyInputMethodSubtype("auto", SUBTYPE_MODE_VOICE, IS_AUX,

                    IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -729,7 +729,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
    private static ArrayList<InputMethodInfo> getImesWithoutDefaultVoiceIme() {

        ArrayList<InputMethodInfo> preinstalledImes = new ArrayList<>();

        {

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

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

            subtypes.add(createDummyInputMethodSubtype("auto", SUBTYPE_MODE_VOICE, IS_AUX,

                    IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -740,7 +740,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
                    "dummy.voice1", "DummyVoice1", IS_AUX, !IS_DEFAULT, subtypes));

        }

        {

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

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

            subtypes.add(createDummyInputMethodSubtype("auto", SUBTYPE_MODE_VOICE, IS_AUX,

                    IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -751,7 +751,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
                    "dummy.voice2", "DummyVoice2", IS_AUX, !IS_DEFAULT, subtypes));

        }

        {

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

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

            subtypes.add(createDummyInputMethodSubtype("en_US", SUBTYPE_MODE_VOICE, IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -759,7 +759,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
                    "dummy.voice3", "DummyVoice3", IS_AUX, !IS_DEFAULT, subtypes));

        }

        {

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

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

            subtypes.add(createDummyInputMethodSubtype("en_US", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -787,7 +787,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // a dummy Voice IME

        {

            final boolean isDefaultIme = false;

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

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

            subtypes.add(createDummyInputMethodSubtype("", SUBTYPE_MODE_VOICE, IS_AUX,

                    IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -798,7 +798,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // a dummy Hindi IME

        {

            final boolean isDefaultIme = contains(new String[]{ "hi", "en-rIN" }, localeString);

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

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

            // TODO: This subtype should be marked as IS_ASCII_CAPABLE

            subtypes.add(createDummyInputMethodSubtype("en_IN", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,
@@ -814,7 +814,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // a dummy Pinyin IME

        {

            final boolean isDefaultIme = contains(new String[]{ "zh-rCN" }, localeString);

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

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

            subtypes.add(createDummyInputMethodSubtype("zh_CN", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -826,7 +826,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // a dummy Korean IME

        {

            final boolean isDefaultIme = contains(new String[]{ "ko" }, localeString);

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

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

            subtypes.add(createDummyInputMethodSubtype("ko", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -839,7 +839,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        {

            final boolean isDefaultIme = contains(

                    new String[]{ "en-rUS", "en-rGB", "en-rIN", "en", "hi" }, localeString);

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

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

            subtypes.add(createDummyInputMethodSubtype("en_US", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));
@@ -860,7 +860,7 @@ public class InputMethodUtilsTest extends InstrumentationTestCase { 
        // a dummy Japanese IME

        {

            final boolean isDefaultIme = contains(new String[]{ "ja", "ja-rJP" }, localeString);

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

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

            subtypes.add(createDummyInputMethodSubtype("ja", SUBTYPE_MODE_KEYBOARD, !IS_AUX,

                    !IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE, !IS_ASCII_CAPABLE,

                    !IS_ENABLED_WHEN_DEFAULT_IS_NOT_ASCII_CAPABLE));

services/core/java/com/android/server/InputMethodManagerService.java

+19 −27

File changed.

Preview size limit exceeded, changes collapsed.