80a9ce76d8
Merge remote-tracking branch 'goog/master' into merge
...
Conflicts:
java/res/xml/method.xml
Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd
2011-06-24 18:38:41 +09:00
ce9e52a12a
Clean up in LatinIME native code
...
Change-Id: I0062200a0181a491690115ac0fab8d11358e2f14
2011-06-18 23:52:09 +09:00
a511e0b432
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/xml/method.xml
java/src/com/android/inputmethod/deprecated/VoiceProxy.java
java/src/com/android/inputmethod/keyboard/KeyboardId.java
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Settings.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
java/src/com/android/inputmethod/latin/Utils.java
Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5
2011-03-25 15:17:08 -07:00
de3070a71b
Add -Werror flag to catch more warnings and errors
...
Change-Id: I9c39ba24578931944aae8182918ed48a2e82eb39
2011-03-19 10:12:15 +09:00
8fbd552292
Add proximity info to native
...
Bug: 3311719
Change-Id: Ie596304070e321ad23fb67a13bf05e2b6af1b54b
2011-02-23 23:04:00 +09:00
e5585c1854
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: Ib2b4acc9dd570d5f37b6aa455e2f07b0a884944a
2011-01-14 13:45:21 +09:00
90d96615bc
Clean up: Update variable names to comply with spec of ApplicationInfo.
...
ApplicationInfo.sourceDir may or may not be apk file name. It can be a directory as well.
The spec just says it's "Full path to the location of this package".
Also, added error handling in loadDictionary().
Change-Id: I5e64d0aba4b1ec7634f4b3ac5537e7a774433ece
2011-01-09 16:53:33 +09:00
458249e703
Consolidate main dictionary files.
...
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager. Instead we'll probably use offset and size obtained from AssetFileDescriptor.
Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
2011-01-05 11:31:58 +09:00
2912c654b4
Manual merge from gingerbread-plus-aosp
...
Change-Id: If048354f9b80bcaa1e97df5c31c3df80231eb612
2010-12-29 14:55:20 -08:00
1dea9bdc1a
Don't use stale NDK libraries for IA
...
IA builds will break (due to the bionic _dso_handle bug) if stale libraries are
used. For now, just guard the defns against IA builds.
Change-Id: Ic9df6e0de78a0e221b95370ba6f01ce07714edde
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-27 12:26:16 -08:00
d12def6dc8
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/values-cs/strings.xml
java/res/values-da/strings.xml
java/res/values-de/strings.xml
java/res/values-el/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-es/strings.xml
java/res/values-fr/strings.xml
java/res/values-it/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt-rPT/strings.xml
java/res/values-pt/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-tr/strings.xml
java/res/values-xlarge/dimens.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/res/values/bools.xml
java/res/xml/kbd_qwerty_rows.xml
java/res/xml/method.xml
java/res/xml/prefs.xml
Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86
2010-12-27 20:13:16 +09:00
3008825948
Fix parameters of native functions and refactor Dictionary
...
- created bigram/unigram dictionary classes
Change-Id: I233a28ed8d611870db3f4cf8f25fc45b5d41529b
2010-12-02 01:16:44 +09:00
15dc33d9f6
Add an easy way to output native debug logs
...
Change-Id: Ieff2b8e60c5e7dedb7f86e17f7c37b349a912ab4
2010-12-01 15:56:17 +09:00
9b195dda60
Revert https://android-git.corp.google.com/g/#change,63791 as library loading issue seems to have been fixed now.
...
bug: 2963855
Change-Id: Iafdfda801083f85126c443508755e3cc711fbf52
2010-09-03 22:44:52 +09:00
ca4e42785f
Fix UnsatisfiedLinkError for Latin IME. Don't use old NDK version in a platform build.
...
Also added a clean step, since it's only a Makefile change.
Change-Id: Ide1684a5f34e99496e969edb8443dc4545b57306
2010-08-31 12:04:30 -07:00
6fd90f55f4
Cherry pick Change I04497fa0: Merge from the private sandbox to the froyo-ub-latinimegoogle
...
Change-Id: I6c0304c6befc1b105d5dca7f96bb7532812c30f6
2010-08-27 15:54:02 +09:00
979f869096
DO NOT MERGE. Backport LatinIME from master to Gingerbread
...
TODO: Cleanup will follow.
Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00
bf45d3619f
For issue #2651381 , allow library prelinking.
...
Change-Id: If7015f2fa5932f69807797ffcc496550d5cb1630
2010-05-05 09:38:52 -07:00
07b1603a3f
Don't let the native code target be included twice when unbundling.
...
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00
satok
Ken Wakasa
Jean-Baptiste Queru
Bruce Beare
Amith Yamasani
Dan Bornstein