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

Commit eb59a87a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Add CollectionUtils class to create generic collection easily" into jb-mr1-dev

parents 56a0fdb3 5f282ea9

java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.inputmethod.EditorInfo; 
import com.android.inputmethod.keyboard.Key;

import com.android.inputmethod.keyboard.Keyboard;

import com.android.inputmethod.keyboard.KeyboardId;

import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.latin.R;



import java.util.HashMap;
@@ -38,7 +39,7 @@ public class KeyCodeDescriptionMapper { 
    private static KeyCodeDescriptionMapper sInstance = new KeyCodeDescriptionMapper();



    // Map of key labels to spoken description resource IDs

    private final HashMap<CharSequence, Integer> mKeyLabelMap;

    private final HashMap<CharSequence, Integer> mKeyLabelMap = CollectionUtils.newHashMap();



    // Sparse array of spoken description resource IDs indexed by key codes

    private final SparseIntArray mKeyCodeMap;
@@ -52,7 +53,6 @@ public class KeyCodeDescriptionMapper { 
    }



    private KeyCodeDescriptionMapper() {

        mKeyLabelMap = new HashMap<CharSequence, Integer>();

        mKeyCodeMap = new SparseIntArray();

    }

java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java

+6 −5
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 


package com.android.inputmethod.compat;



import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.SuggestedWords;

import com.android.inputmethod.latin.SuggestionSpanPickedNotificationReceiver;



import android.content.Context;

import android.text.Spannable;

import android.text.SpannableString;
@@ -27,6 +23,11 @@ import android.text.Spanned; 
import android.text.TextUtils;

import android.util.Log;



import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.SuggestedWords;

import com.android.inputmethod.latin.SuggestionSpanPickedNotificationReceiver;



import java.lang.reflect.Constructor;

import java.lang.reflect.Field;

import java.util.ArrayList;
@@ -119,7 +120,7 @@ public class SuggestionSpanUtils { 
        } else {

            spannable = new SpannableString(pickedWord);

        }

        final ArrayList<String> suggestionsList = new ArrayList<String>();

        final ArrayList<String> suggestionsList = CollectionUtils.newArrayList();

        for (int i = 0; i < suggestedWords.size(); ++i) {

            if (suggestionsList.size() >= OBJ_SUGGESTIONS_MAX_SIZE) {

                break;

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

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.inputmethod.keyboard.internal.KeyStyles; 
import com.android.inputmethod.keyboard.internal.KeyboardCodesSet;

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

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

import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.latin.LatinImeLogger;

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

import com.android.inputmethod.latin.R;
@@ -254,9 +255,9 @@ public class Keyboard { 
        public int GRID_WIDTH;

        public int GRID_HEIGHT;



        public final HashSet<Key> mKeys = new HashSet<Key>();

        public final ArrayList<Key> mShiftKeys = new ArrayList<Key>();

        public final ArrayList<Key> mAltCodeKeysWhileTyping = new ArrayList<Key>();

        public final HashSet<Key> mKeys = CollectionUtils.newHashSet();

        public final ArrayList<Key> mShiftKeys = CollectionUtils.newArrayList();

        public final ArrayList<Key> mAltCodeKeysWhileTyping = CollectionUtils.newArrayList();

        public final KeyboardIconsSet mIconsSet = new KeyboardIconsSet();

        public final KeyboardCodesSet mCodesSet = new KeyboardCodesSet();

        public final KeyboardTextsSet mTextsSet = new KeyboardTextsSet();

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

+3 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.view.inputmethod.InputMethodSubtype; 


import com.android.inputmethod.compat.EditorInfoCompatUtils;

import com.android.inputmethod.keyboard.KeyboardLayoutSet.Params.ElementParams;

import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.latin.InputAttributes;

import com.android.inputmethod.latin.InputTypeUtils;

import com.android.inputmethod.latin.LatinImeLogger;
@@ -71,7 +72,7 @@ public class KeyboardLayoutSet { 
    private final Params mParams;



    private static final HashMap<KeyboardId, SoftReference<Keyboard>> sKeyboardCache =

            new HashMap<KeyboardId, SoftReference<Keyboard>>();

            CollectionUtils.newHashMap();

    private static final KeysCache sKeysCache = new KeysCache();



    public static class KeyboardLayoutSetException extends RuntimeException {
@@ -84,11 +85,7 @@ public class KeyboardLayoutSet { 
    }



    public static class KeysCache {

        private final HashMap<Key, Key> mMap;



        public KeysCache() {

            mMap = new HashMap<Key, Key>();

        }

        private final HashMap<Key, Key> mMap = CollectionUtils.newHashMap();



        public void clear() {

            mMap.clear();

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

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.view.ViewGroup; 
import android.widget.TextView;



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

import com.android.inputmethod.latin.CollectionUtils;

import com.android.inputmethod.latin.Constants;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;
@@ -117,7 +118,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
    /** True if all keys should be drawn */

    private boolean mInvalidateAllKeys;

    /** The keys that should be drawn */

    private final HashSet<Key> mInvalidatedKeys = new HashSet<Key>();

    private final HashSet<Key> mInvalidatedKeys = CollectionUtils.newHashSet();

    /** The working rectangle variable */

    private final Rect mWorkingRect = new Rect();

    /** The keyboard bitmap buffer for faster updates */