diff options
Diffstat (limited to 'java')
| -rwxr-xr-x | java/Android.mk | 3 | ||||
| -rwxr-xr-x | java/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionary.java | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/java/Android.mk b/java/Android.mk index 1ecd596af..97c906f26 100755 --- a/java/Android.mk +++ b/java/Android.mk @@ -14,6 +14,9 @@ LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2 LOCAL_STATIC_JAVA_LIBRARIES := android-common #LOCAL_AAPT_FLAGS := -0 .dict +# The following flag is required because we use a different package name +# com.google.android.inputmethod.latin2 in the LatinIME sandbox. +LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin LOCAL_SDK_VERSION := current diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index df54323d1..d33016a94 100755 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -1,7 +1,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.inputmethod.latin2"> + package="com.google.android.inputmethod.latin2"> - <original-package android:name="com.android.inputmethod.latin" /> + <!-- Do not override the default LatinIME for now --> + <!-- original-package android:name="com.android.inputmethod.latin" / --> <uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.READ_USER_DICTIONARY" /> diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java index 87de94b76..6d0257b82 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java @@ -42,7 +42,7 @@ public class BinaryDictionary extends Dictionary { static { try { - System.loadLibrary("jni_latinime"); + System.loadLibrary("jni_latinime2"); } catch (UnsatisfiedLinkError ule) { Log.e("BinaryDictionary", "Could not load native library jni_latinime"); } |