The Android Automerger
acc1e3f4e7
merge in master-release history after reset to d94567d963
2014-05-15 05:51:22 -07:00
Keisuke Kuroyanagi
d94567d963
Merge "Introduce MAX_PREV_WORD_COUNT_FOR_N_GRAM."
2014-05-15 10:50:38 +00:00
Keisuke Kuroyanagi
ef0d83ca07
Merge "Refactoring: Move prev word information into PrevWordsInfo."
2014-05-15 10:36:44 +00:00
Keisuke Kuroyanagi
b94ec1437b
Introduce MAX_PREV_WORD_COUNT_FOR_N_GRAM.
...
Bug: 14425059
Change-Id: I587f90df026a14359d2ee452040bbfaf02c1ae51
2014-05-15 18:45:49 +09:00
Keisuke Kuroyanagi
b87fffb8be
Refactoring: Move prev word information into PrevWordsInfo.
...
Bug: 14119293
Bug: 14425059
Change-Id: I5a5f81c6b189e3ad1da093343a3121463f87c21c
2014-05-15 18:39:23 +09:00
Tadashi G. Takaoka
af66ff7610
Merge "Remove unused auto correction led for spacebar feature"
2014-05-15 09:21:14 +00:00
Tadashi G. Takaoka
2ddaf9543d
Remove unused auto correction led for spacebar feature
...
Change-Id: Ie1544bd0d28684d9b7887fddff37b224ed4f8201
2014-05-15 17:53:43 +09:00
Keisuke Kuroyanagi
d6fdd58cc0
Cleanup DicTraverseSession.
...
Change-Id: I953665e1958e7214e9365e2bc9d3f3843016dc81
2014-05-15 17:41:23 +09:00
Tadashi G. Takaoka
c007e8863c
Swap space and dot of number keyboard of phone
...
Bug: 14419121
Change-Id: I0968b46cfabd3d0a37a705451e38bd922b69e7ec
2014-05-15 16:31:09 +09:00
Tadashi G. Takaoka
591ec83e40
Merge "Use slightly dimmed text color for functional keys"
2014-05-15 07:09:53 +00:00
Tadashi G. Takaoka
28289ece59
Merge "Fix NPE in KeyboardSwitcher while orientation change"
2014-05-15 07:09:44 +00:00
Keisuke Kuroyanagi
e810a266fd
Merge "Quit use bigram probability diff for ver4 dict."
2014-05-15 07:07:25 +00:00
Tadashi G. Takaoka
afdcc15ca8
Fix NPE in KeyboardSwitcher while orientation change
...
This is a follow up of I8a737e2b73.
Bug: 14981300
Bug: 14419121
Change-Id: I87f910adbff248d9606d074c351aa951c9539163
2014-05-15 16:07:15 +09:00
Keisuke Kuroyanagi
64341927d2
Quit use bigram probability diff for ver4 dict.
...
Change-Id: I2cfcfbcf351877d1dff466a24974dbb05908f14e
2014-05-15 16:02:58 +09:00
Tadashi G. Takaoka
37ec0fe984
Use slightly dimmed text color for functional keys
...
This CL introduces two new key attributes to achieve this.
- KeyboardView.functionalTextColor
- followFunctionalTextColor flag for Key.keyLabelFlags
Bug: 14419121
Change-Id: I45ca433dcc9cc8c6cf891e21d5316ee4048b0cad
2014-05-15 15:39:59 +09:00
Yohei Yukawa
f0fc320b4e
Merge "Simplify StatsUtils"
2014-05-15 06:35:42 +00:00
Tadashi G. Takaoka
50c21b5e92
Merge "Update L icons"
2014-05-15 05:53:10 +00:00
Tadashi G. Takaoka
34e0fad723
Update L icons
...
This CL must be checked in together with I27755f45fd.
Bug: 14419121
Change-Id: Iaf032f638c9ed36f2d3b924fdd42f0502abf487e
2014-05-15 13:45:02 +09:00
Keisuke Kuroyanagi
a709bc7f93
Merge "Reduce the cost for handling intentional omission."
2014-05-15 03:31:39 +00:00
Keisuke Kuroyanagi
39e5a15af0
Merge "Always keep PtNodes that represent non-word info during GC."
2014-05-15 02:38:57 +00:00
Xiaojun Bi
3686bdfcc1
Fix off-device build
...
This CL fixed the breakage caused by DistracterFilter.
It should be checked in together with I8f53e9481c0f
Bug: 14911612
Bug: 13142176
Change-Id: I33c3526165cea58926d10404552f1fadc385c2e5
2014-05-14 17:39:02 -07:00
Xiaojun Bi
a2692d9bf2
Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()
...
Bug: 14904706
Change-Id: I3b52bb01b9c59cbba2eba0bd1d91dffb4419c019
2014-05-14 15:16:07 -07:00
Yohei Yukawa
9aa7f66a15
Simplify StatsUtils
...
With this CL, the implementation of StatsUtils no longer
needs to know how to read settings from the system.
Insted, the LatinIME class is now responsible for notifying
StatsUtils whenever the settings is changed.
BUG: 14324207
Change-Id: Ic3d26ec31c8d2c082d3e7487b578b323aad2f960
2014-05-15 00:11:13 +09:00
Keisuke Kuroyanagi
aa7329de15
Merge "Add VERSION4_DEV(402) in Java side and use it for tests."
2014-05-14 13:42:24 +00:00
Keisuke Kuroyanagi
91d7538225
Merge "Add VERSION_4_DEV(402) in native code."
2014-05-14 13:40:10 +00:00
Keisuke Kuroyanagi
04536f14b0
Add VERSION4_DEV(402) in Java side and use it for tests.
...
Bug: 13406708
Change-Id: I7c9c53bf34d12dced7331a359a83f6444490783a
2014-05-14 22:37:07 +09:00
Keisuke Kuroyanagi
7116ea98f4
Add VERSION_4_DEV(402) in native code.
...
Bug: 13406708
Change-Id: I96cfacf524d670a6a5637a96a63bcd47aaf09ca0
2014-05-14 22:37:05 +09:00
Keisuke Kuroyanagi
cf700695ea
Always keep PtNodes that represent non-word info during GC.
...
Bug: 14119293
Change-Id: Ie50b341a512be6a6efe3e05b60e1d09560b01d1f
2014-05-14 22:29:21 +09:00
Keisuke Kuroyanagi
28b896fe35
Merge "Use nullptr instead of MmappedBufferPtr(nullptr)."
2014-05-14 13:26:14 +00:00
Keisuke Kuroyanagi
2dc8e36f8e
Use nullptr instead of MmappedBufferPtr(nullptr).
...
Change-Id: I9bc35f723f1c105ef6155a49630b8cd492900bc8
2014-05-14 22:05:00 +09:00
The Android Automerger
15531c49f5
merge in master-release history after reset to babde55bf8
2014-05-14 05:51:33 -07:00
Keisuke Kuroyanagi
ee59975420
Merge "Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()"
2014-05-14 12:20:10 +00:00
Jean Chalard
babde55bf8
Merge "Fix a bug where changing languages kills the composition."
2014-05-14 11:36:43 +00:00
Jean Chalard
5ce39dfa78
Fix a bug where changing languages kills the composition.
...
Bug: 14926896
Change-Id: Id2a06c68a51f833db4d8bbc858a232c2696afb6e
2014-05-14 20:34:32 +09:00
Keisuke Kuroyanagi
32bdf9f344
Merge "Use JniDataUtils::putXxxToArray() to output a value."
2014-05-14 11:12:09 +00:00
Keisuke Kuroyanagi
5c00bde9bc
Merge "Filter out control characters and non-unicode code points."
2014-05-14 11:07:32 +00:00
Keisuke Kuroyanagi
304a71d171
Use JniDataUtils::putXxxToArray() to output a value.
...
Change-Id: Ifb7bed6623b01acb524566a0fe00dcbdf7273888
2014-05-14 20:05:15 +09:00
Keisuke Kuroyanagi
e9121a68a6
Filter out control characters and non-unicode code points.
...
Bug: 14119293
Bug: 13758761
Change-Id: I6b79cff0714152807f5e20b7a75060a0a772b28b
2014-05-14 20:05:10 +09:00
Keisuke Kuroyanagi
728141d55a
Merge "Generate dict code for version 401."
2014-05-14 10:51:12 +00:00
Tadashi G. Takaoka
9f4d62cc42
Create com.android.inputmethod.keyboard.emoji package
...
Change-Id: Idd12c2fa4f5add7bb50bd7349ff9a74fffe82cfd
2014-05-14 19:32:00 +09:00
Keisuke Kuroyanagi
6bf268132d
Generate dict code for version 401.
...
Bug: 13406708
Change-Id: I769ac84d54d997e7aefab0c9c16727455a132e0b
2014-05-14 19:09:01 +09:00
Tadashi G. Takaoka
71f4c6b8ea
Merge "Fix NPE that happens only in some unit tests"
2014-05-14 10:01:15 +00:00
Tadashi G. Takaoka
268bf2cdfe
Fix NPE that happens only in some unit tests
...
Bug: 14922410
Change-Id: Ica801e102d302e9faa7c24721b37634f1e812af3
2014-05-14 18:55:14 +09:00
Jean Chalard
08476dc107
Merge "Don't send empty composing texts."
2014-05-14 09:50:25 +00:00
Tadashi G. Takaoka
83da26422c
Merge "Rename LMP to LXX just in case"
2014-05-14 09:43:27 +00:00
Tadashi G. Takaoka
3610039723
Rename LMP to LXX just in case
...
This CL must be checked in together with I7e2ba67f31.
Change-Id: I51cb982f9cf0ace173d535a60293bb4be83bbb75
2014-05-14 18:39:39 +09:00
Tadashi G. Takaoka
d7c520bb74
Merge "Make Emoji palette more Quantum light compliant"
2014-05-14 09:33:43 +00:00
Keisuke Kuroyanagi
0a04f8be93
Merge "Output dictionary format version for dump."
2014-05-14 09:07:56 +00:00
Keisuke Kuroyanagi
72d6061efb
Merge "Use JniDataUtils::outputCodePoints() to output code points"
2014-05-14 09:07:45 +00:00
Tadashi G. Takaoka
c1094d6913
Make Emoji palette more Quantum light compliant
...
Bug: 14419121
Change-Id: I8a737e2b73a000ad66e7e30a695677fe0bcc66fb
2014-05-14 18:01:24 +09:00