Merge remote branch 'goog/master'
Conflicts: java/res/xml/prefs.xml java/src/com/android/inputmethod/latin/BinaryDictionary.java java/src/com/android/inputmethod/latin/Dictionary.java java/src/com/android/inputmethod/latin/ExpandableDictionary.java java/src/com/android/inputmethod/latin/LatinIME.java java/src/com/android/inputmethod/latin/Suggest.java tests/src/com/android/inputmethod/latin/tests/SuggestTests.java
No related branches found
No related tags found
Showing
- java/Android.mk 1 addition, 1 deletionjava/Android.mk
- java/res/values/strings.xml 5 additions, 0 deletionsjava/res/values/strings.xml
- java/res/xml/prefs.xml 11 additions, 3 deletionsjava/res/xml/prefs.xml
- java/src/com/android/inputmethod/latin/BinaryDictionary.java 31 additions, 3 deletionsjava/src/com/android/inputmethod/latin/BinaryDictionary.java
- java/src/com/android/inputmethod/latin/Dictionary.java 26 additions, 3 deletionsjava/src/com/android/inputmethod/latin/Dictionary.java
- java/src/com/android/inputmethod/latin/EditingUtil.java 16 additions, 0 deletionsjava/src/com/android/inputmethod/latin/EditingUtil.java
- java/src/com/android/inputmethod/latin/ExpandableDictionary.java 4 additions, 2 deletions...c/com/android/inputmethod/latin/ExpandableDictionary.java
- java/src/com/android/inputmethod/latin/LatinIME.java 35 additions, 22 deletionsjava/src/com/android/inputmethod/latin/LatinIME.java
- java/src/com/android/inputmethod/latin/Suggest.java 135 additions, 31 deletionsjava/src/com/android/inputmethod/latin/Suggest.java
- java/src/com/android/inputmethod/latin/WordComposer.java 2 additions, 0 deletionsjava/src/com/android/inputmethod/latin/WordComposer.java
- native/Android.mk 2 additions, 2 deletionsnative/Android.mk
- native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp 25 additions, 3 deletions...ve/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
- native/src/dictionary.cpp 271 additions, 8 deletionsnative/src/dictionary.cpp
- native/src/dictionary.h 23 additions, 2 deletionsnative/src/dictionary.h
- tests/data/bigramlist.xml 36 additions, 0 deletionstests/data/bigramlist.xml
- tests/data/wordlist.xml 1 addition, 0 deletionstests/data/wordlist.xml
- tests/res/raw/test.dict 0 additions, 0 deletionstests/res/raw/test.dict
- tests/src/com/android/inputmethod/latin/tests/SuggestTests.java 63 additions, 4 deletions...src/com/android/inputmethod/latin/tests/SuggestTests.java
Loading
Please register or sign in to comment