diff options
| author | Tom Marshall <tdm@cyngn.com> | 2014-11-18 14:25:32 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-10-29 23:55:18 +0000 |
| commit | dd77d5e887e2148b96a942881cbd5b8256a643aa (patch) | |
| tree | 4bb189e56299a6e51778ed8f47053cf7f13b9cfe /java/src/com | |
| parent | 93c10bd3665ba012243b78080a54552d8440493c (diff) | |
| download | android_packages_inputmethods_LatinIME-dd77d5e887e2148b96a942881cbd5b8256a643aa.tar.gz android_packages_inputmethods_LatinIME-dd77d5e887e2148b96a942881cbd5b8256a643aa.tar.bz2 android_packages_inputmethods_LatinIME-dd77d5e887e2148b96a942881cbd5b8256a643aa.zip | |
LatinIME: Only enable gesture mode if gesture lib is available
* Prevents keyboard FC when gapps is not loaded.
Change-Id: I0d48e1cd80534513205f61913c798b48573ea38c
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/settings/Settings.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/JniUtils.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java index 940f1bdfc..5c1b56883 100644 --- a/java/src/com/android/inputmethod/latin/settings/Settings.java +++ b/java/src/com/android/inputmethod/latin/settings/Settings.java @@ -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.mHaveGestureLib) { + return false; + } return res.getBoolean(R.bool.config_gesture_input_enabled_by_build_config); } diff --git a/java/src/com/android/inputmethod/latin/utils/JniUtils.java b/java/src/com/android/inputmethod/latin/utils/JniUtils.java index 0e4f582cb..448a24990 100644 --- a/java/src/com/android/inputmethod/latin/utils/JniUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/JniUtils.java @@ -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 mHaveGestureLib = false; static { try { System.loadLibrary(JniLibName.JNI_LIB_NAME2); + mHaveGestureLib = true; } catch (UnsatisfiedLinkError ue) { try { System.loadLibrary(JniLibName.JNI_LIB_NAME); |