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

Commit fc4dd51f authored by Tom Marshall's avatar Tom Marshall Committed by Alberto97
Browse files

LatinIME: Only enable gesture mode if gesture lib is available 

 * Prevents keyboard FC when gapps is not loaded.

Change-Id: I0d48e1cd80534513205f61913c798b48573ea38c
parent 571816b9

java/src/com/android/inputmethod/latin/settings/Settings.java

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.inputmethod.latin.InputAttributes; 
import com.android.inputmethod.latin.R;

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

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

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

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

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

import com.android.inputmethod.latin.utils.StatsUtils;
@@ -230,6 +231,9 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang 
    }



    public static boolean readFromBuildConfigIfGestureInputEnabled(final Resources res) {

        if (!JniUtils.sHaveGestureLib) {

            return false;

        }

        return res.getBoolean(R.bool.config_gesture_input_enabled_by_build_config);

    }

java/src/com/android/inputmethod/latin/utils/JniUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ import com.android.inputmethod.latin.define.JniLibName; 
public final class JniUtils {

    private static final String TAG = JniUtils.class.getSimpleName();



    public static boolean sHaveGestureLib = false;

    static {

        try {

            System.loadLibrary(JniLibName.JNI_LIB_NAME2);

            sHaveGestureLib = true;

        } catch (UnsatisfiedLinkError ue) {

            Log.e(TAG, "Could not load native library " + JniLibName.JNI_LIB_NAME2, ue);

            try {