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

Commit 88794b24 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Remove the dependency to SpellCheckerProximityInfo from ProximityInfo. 

In conjunction with I596b2deb

Change-Id: I42f059158ae78e1c1c807ed4d3688edbcf18c006
parent d995452d

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

+3 −7
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.text.TextUtils; 


import com.android.inputmethod.keyboard.Keyboard.Params.TouchPositionCorrection;

import com.android.inputmethod.latin.JniUtils;

import com.android.inputmethod.latin.spellcheck.SpellCheckerProximityInfo;



import java.util.Arrays;

import java.util.HashMap;
@@ -75,15 +74,12 @@ public class ProximityInfo { 
        return new ProximityInfo("", 1, 1, 1, 1, 1, 1, EMPTY_KEY_ARRAY, null);

    }



    public static ProximityInfo createSpellCheckerProximityInfo(final int[] proximity) {

    public static ProximityInfo createSpellCheckerProximityInfo(final int[] proximity,

            int rowSize, int gridWidth, int gridHeight) {

        final ProximityInfo spellCheckerProximityInfo = createDummyProximityInfo();

        spellCheckerProximityInfo.mNativeProximityInfo =

                spellCheckerProximityInfo.setProximityInfoNative("",

                        SpellCheckerProximityInfo.ROW_SIZE,

                        SpellCheckerProximityInfo.PROXIMITY_GRID_WIDTH,

                        SpellCheckerProximityInfo.PROXIMITY_GRID_HEIGHT,

                        SpellCheckerProximityInfo.PROXIMITY_GRID_WIDTH,

                        SpellCheckerProximityInfo.PROXIMITY_GRID_HEIGHT,

                        rowSize, gridWidth, gridHeight, gridWidth, gridHeight,

                        1, proximity, 0, null, null, null, null, null, null, null, null);

        return spellCheckerProximityInfo;

    }

java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

+4 −1
Original line number Diff line number Diff line
@@ -392,7 +392,10 @@ public class AndroidSpellCheckerService extends SpellCheckerService 
    public DictAndProximity createDictAndProximity(final Locale locale) {

        final int script = getScriptFromLocale(locale);

        final ProximityInfo proximityInfo = ProximityInfo.createSpellCheckerProximityInfo(

                SpellCheckerProximityInfo.getProximityForScript(script));

                SpellCheckerProximityInfo.getProximityForScript(script),

                SpellCheckerProximityInfo.ROW_SIZE,

                SpellCheckerProximityInfo.PROXIMITY_GRID_WIDTH,

                SpellCheckerProximityInfo.PROXIMITY_GRID_HEIGHT);

        final DictionaryCollection dictionaryCollection =

                DictionaryFactory.createDictionaryFromManager(this, locale,

                        true /* useFullEditDistance */);