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

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

Stop using modifiable Key array 

Change-Id: I0f3e96672da4261ae5628d2d5ea39d60e6287ac0
parent 121cbd77

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

+7 −5
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ import com.android.inputmethod.latin.Constants; 
import com.android.inputmethod.latin.utils.CollectionUtils;

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



import java.util.Collections;

import java.util.List;



/**

 * Loads an XML description of a keyboard and stores the attributes of the keys. A keyboard

 * consists of rows of keys.
@@ -76,8 +79,8 @@ public class Keyboard { 


    /** Array of keys and icons in this keyboard */

    private final Key[] mKeys;

    public final Key[] mShiftKeys;

    public final Key[] mAltCodeKeysWhileTyping;

    public final List<Key> mShiftKeys;

    public final List<Key> mAltCodeKeysWhileTyping;

    public final KeyboardIconsSet mIconsSet;



    private final SparseArray<Key> mKeyCache = CollectionUtils.newSparseArray();
@@ -101,9 +104,8 @@ public class Keyboard { 
        mVerticalGap = params.mVerticalGap;



        mKeys = params.mKeys.toArray(new Key[params.mKeys.size()]);

        mShiftKeys = params.mShiftKeys.toArray(new Key[params.mShiftKeys.size()]);

        mAltCodeKeysWhileTyping = params.mAltCodeKeysWhileTyping.toArray(

                new Key[params.mAltCodeKeysWhileTyping.size()]);

        mShiftKeys = Collections.unmodifiableList(params.mShiftKeys);

        mAltCodeKeysWhileTyping = Collections.unmodifiableList(params.mAltCodeKeysWhileTyping);

        mIconsSet = params.mIconsSet;



        mProximityInfo = new ProximityInfo(params.mId.mLocale.toString(),