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

Commit a410cb48 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Move subtype related utility class to utils package 

Change-Id: I3564796531ea85f2ebafde40cd822b806b8741df
parent 9d802202

java/src/com/android/inputmethod/keyboard/KeyboardId.java

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import android.view.inputmethod.EditorInfo; 
import android.view.inputmethod.InputMethodSubtype;



import com.android.inputmethod.compat.EditorInfoCompatUtils;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.utils.InputTypeUtils;

import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;



import java.util.Arrays;

import java.util.Locale;
@@ -76,7 +76,7 @@ public final class KeyboardId { 


    public KeyboardId(final int elementId, final KeyboardLayoutSet.Params params) {

        mSubtype = params.mSubtype;

        mLocale = SubtypeLocale.getSubtypeLocale(mSubtype);

        mLocale = SubtypeLocaleUtils.getSubtypeLocale(mSubtype);

        mOrientation = params.mOrientation;

        mWidth = params.mKeyboardWidth;

        mHeight = params.mKeyboardHeight;

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

+4 −4
Original line number Diff line number Diff line
@@ -41,15 +41,15 @@ import com.android.inputmethod.compat.EditorInfoCompatUtils; 
import com.android.inputmethod.keyboard.internal.KeyboardBuilder;

import com.android.inputmethod.keyboard.internal.KeyboardParams;

import com.android.inputmethod.keyboard.internal.KeysCache;

import com.android.inputmethod.latin.AdditionalSubtype;

import com.android.inputmethod.latin.InputAttributes;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.SubtypeSwitcher;

import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.InputTypeUtils;

import com.android.inputmethod.latin.utils.ResourceUtils;

import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;

import com.android.inputmethod.latin.utils.XmlParseUtils;



import org.xmlpull.v1.XmlPullParser;
@@ -288,7 +288,7 @@ public final class KeyboardLayoutSet { 
                    : subtype;

            mParams.mSubtype = keyboardSubtype;

            mParams.mKeyboardLayoutSetName = KEYBOARD_LAYOUT_SET_RESOURCE_PREFIX

                    + SubtypeLocale.getKeyboardLayoutSetName(keyboardSubtype);

                    + SubtypeLocaleUtils.getKeyboardLayoutSetName(keyboardSubtype);

            return this;

        }
@@ -445,7 +445,7 @@ public final class KeyboardLayoutSet { 
    public static KeyboardLayoutSet createKeyboardSetForSpellChecker(final Context context,

            final String locale, final String layout) {

        final InputMethodSubtype subtype =

                AdditionalSubtype.createAdditionalSubtype(locale, layout, null);

                AdditionalSubtypeUtils.createAdditionalSubtype(locale, layout, null);

        return createKeyboardSet(context, subtype, SPELLCHECKER_DUMMY_KEYBOARD_WIDTH,

                SPELLCHECKER_DUMMY_KEYBOARD_HEIGHT, false /* testCasesHaveTouchCoordinates */,

                true /* isSpellChecker */);

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import com.android.inputmethod.keyboard.internal.TouchScreenRegulator; 
import com.android.inputmethod.latin.Constants;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.SuggestedWords;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.settings.DebugSettings;
@@ -67,6 +66,7 @@ import com.android.inputmethod.latin.settings.Settings; 
import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.StaticInnerHandlerWrapper;

import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;

import com.android.inputmethod.latin.utils.TypefaceUtils;

import com.android.inputmethod.latin.utils.UsabilityStudyLogUtils;

import com.android.inputmethod.latin.utils.ViewLayoutUtils;
@@ -1342,17 +1342,17 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack 
    private static String layoutLanguageOnSpacebar(final Paint paint,

            final InputMethodSubtype subtype, final int width) {

        // Choose appropriate language name to fit into the width.

        final String fullText = SubtypeLocale.getFullDisplayName(subtype);

        final String fullText = SubtypeLocaleUtils.getFullDisplayName(subtype);

        if (fitsTextIntoWidth(width, fullText, paint)) {

            return fullText;

        }



        final String middleText = SubtypeLocale.getMiddleDisplayName(subtype);

        final String middleText = SubtypeLocaleUtils.getMiddleDisplayName(subtype);

        if (fitsTextIntoWidth(width, middleText, paint)) {

            return middleText;

        }



        final String shortText = SubtypeLocale.getShortDisplayName(subtype);

        final String shortText = SubtypeLocaleUtils.getShortDisplayName(subtype);

        if (fitsTextIntoWidth(width, shortText, paint)) {

            return shortText;

        }

java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java

+2 −2
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import com.android.inputmethod.keyboard.Key; 
import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.KeyboardId;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.utils.LocaleUtils.RunInLocale;

import com.android.inputmethod.latin.utils.ResourceUtils;

import com.android.inputmethod.latin.utils.StringUtils;

import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;

import com.android.inputmethod.latin.utils.XmlParseUtils;



import org.xmlpull.v1.XmlPullParser;
@@ -285,7 +285,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> { 
                }

            };

            // Null means the current system locale.

            final Locale locale = SubtypeLocale.isNoLanguage(params.mId.mSubtype)

            final Locale locale = SubtypeLocaleUtils.isNoLanguage(params.mId.mSubtype)

                    ? null : params.mId.mLocale;

            job.runInLocale(mResources, locale);

java/src/com/android/inputmethod/latin/RichInputMethodManager.java

+6 −4
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ import android.view.inputmethod.InputMethodSubtype; 


import com.android.inputmethod.compat.InputMethodManagerCompatWrapper;

import com.android.inputmethod.latin.settings.Settings;

import com.android.inputmethod.latin.utils.AdditionalSubtypeUtils;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.SubtypeLocaleUtils;



import java.util.Collections;

import java.util.HashMap;
@@ -84,11 +86,11 @@ public final class RichInputMethodManager { 
        mInputMethodInfoOfThisIme = getInputMethodInfoOfThisIme(context);



        // Initialize additional subtypes.

        SubtypeLocale.init(context);

        SubtypeLocaleUtils.init(context);

        final String prefAdditionalSubtypes = Settings.readPrefAdditionalSubtypes(

                prefs, context.getResources());

        final InputMethodSubtype[] additionalSubtypes =

                AdditionalSubtype.createAdditionalSubtypesArray(prefAdditionalSubtypes);

                AdditionalSubtypeUtils.createAdditionalSubtypesArray(prefAdditionalSubtypes);

        setAdditionalInputMethodSubtypes(additionalSubtypes);

    }
@@ -134,7 +136,7 @@ public final class RichInputMethodManager { 
        final int currentIndex = getSubtypeIndexInList(currentSubtype, enabledSubtypes);

        if (currentIndex == INDEX_NOT_FOUND) {

            Log.w(TAG, "Can't find current subtype in enabled subtypes: subtype="

                    + SubtypeLocale.getSubtypeNameForLogging(currentSubtype));

                    + SubtypeLocaleUtils.getSubtypeNameForLogging(currentSubtype));

            return false;

        }

        final int nextIndex = (currentIndex + 1) % enabledSubtypes.size();
@@ -342,7 +344,7 @@ public final class RichInputMethodManager { 
        final int count = myImi.getSubtypeCount();

        for (int i = 0; i < count; i++) {

            final InputMethodSubtype subtype = myImi.getSubtypeAt(i);

            final String layoutName = SubtypeLocale.getKeyboardLayoutSetName(subtype);

            final String layoutName = SubtypeLocaleUtils.getKeyboardLayoutSetName(subtype);

            if (localeString.equals(subtype.getLocale())

                    && keyboardLayoutSetName.equals(layoutName)) {

                return subtype;