Keisuke Kuroyanagi
871ff82088
am 91d75382
: Merge "Add VERSION_4_DEV(402) in native code."
...
* commit '91d753822527649372a67c8f4e166670791a63f3':
Add VERSION_4_DEV(402) in native code.
2014-05-14 13:43:50 +00: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
6059f6c7b5
am 28b896fe
: Merge "Use nullptr instead of MmappedBufferPtr(nullptr)."
...
* commit '28b896fe35b0345d4e92e5044974f05f2ee443ec':
Use nullptr instead of MmappedBufferPtr(nullptr).
2014-05-14 13:29:33 +00: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
4d1eaa12c9
am ee599754
: Merge "Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()"
...
* commit 'ee59975420c975040c0b990812201d3ddb4aacc5':
Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()
2014-05-14 12:25:07 +00:00
Keisuke Kuroyanagi
ee59975420
Merge "Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries()"
2014-05-14 12:20:10 +00:00
Jean Chalard
05db21949f
am babde55b
: Merge "Fix a bug where changing languages kills the composition."
...
* commit 'babde55bf843c2262d84580c0139ed6b040bef7e':
Fix a bug where changing languages kills the composition.
2014-05-14 11:40:54 +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
0e40c0ce82
am 32bdf9f3
: Merge "Use JniDataUtils::putXxxToArray() to output a value."
...
* commit '32bdf9f3446d567f05bc49281a4ec43d4a19b2bf':
Use JniDataUtils::putXxxToArray() to output a value.
2014-05-14 11:15:14 +00:00
Keisuke Kuroyanagi
32bdf9f344
Merge "Use JniDataUtils::putXxxToArray() to output a value."
2014-05-14 11:12:09 +00:00
Keisuke Kuroyanagi
60497abd91
am 5c00bde9
: Merge "Filter out control characters and non-unicode code points."
...
* commit '5c00bde9bc67d757a33cbaeba7158852c08a39fb':
Filter out control characters and non-unicode code points.
2014-05-14 11:10:51 +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
98c3001c46
am 728141d5
: Merge "Generate dict code for version 401."
...
* commit '728141d55a0a785a4ed09586f7e22272cd49fc96':
Generate dict code for version 401.
2014-05-14 10:53:35 +00:00
Keisuke Kuroyanagi
728141d55a
Merge "Generate dict code for version 401."
2014-05-14 10:51:12 +00:00
Tadashi G. Takaoka
8aa3c06784
am 9f4d62cc
: Create com.android.inputmethod.keyboard.emoji package
...
* commit '9f4d62cc42ab66f72ecb23996ffc2f8b039c8c4a':
Create com.android.inputmethod.keyboard.emoji package
2014-05-14 10:41:49 +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
e9f992ff26
am 71f4c6b8
: Merge "Fix NPE that happens only in some unit tests"
...
* commit '71f4c6b8eacb210fceb719a0f293d14f359ba4f1':
Fix NPE that happens only in some unit tests
2014-05-14 10:05:41 +00: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
8e38607e5c
am 08476dc1
: Merge "Don\'t send empty composing texts."
...
* commit '08476dc1076cec7758786141bb86b3a5c46e4e35':
Don't send empty composing texts.
2014-05-14 09:53:28 +00:00
Jean Chalard
08476dc107
Merge "Don't send empty composing texts."
2014-05-14 09:50:25 +00:00
Tadashi G. Takaoka
5c39b00bb6
am 83da2642
: Merge "Rename LMP to LXX just in case"
...
* commit '83da26422c30d216eb1725ce1053b0ba3df10e92':
Rename LMP to LXX just in case
2014-05-14 09:46:48 +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
01391a9396
am d7c520bb
: Merge "Make Emoji palette more Quantum light compliant"
...
* commit 'd7c520bb74cc8214d2182b7950c84bdb576cea77':
Make Emoji palette more Quantum light compliant
2014-05-14 09:37:11 +00:00
Tadashi G. Takaoka
d7c520bb74
Merge "Make Emoji palette more Quantum light compliant"
2014-05-14 09:33:43 +00:00
Keisuke Kuroyanagi
5ad8931480
am 0a04f8be
: Merge "Output dictionary format version for dump."
...
* commit '0a04f8be93014fe133b88cd9ee4633f278dbff3d':
Output dictionary format version for dump.
2014-05-14 09:12:16 +00:00
Keisuke Kuroyanagi
4d3253326e
am 72d6061e
: Merge "Use JniDataUtils::outputCodePoints() to output code points"
...
* commit '72d6061efbc025fbf5774aace80376a07b44bb7e':
Use JniDataUtils::outputCodePoints() to output code points
2014-05-14 09:12:15 +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
2e661720dd
am ae1c53be
: Merge "Separate functional key background from normal one"
...
* commit 'ae1c53beadd5e739b49f16e6c45747ca3b469766':
Separate functional key background from normal one
2014-05-14 09:04:36 +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
Tadashi G. Takaoka
ae1c53bead
Merge "Separate functional key background from normal one"
2014-05-14 09:00:43 +00:00
Keisuke Kuroyanagi
161e588fb3
am dd6d96c2
: Merge "Restrict the permission of dict files created on device."
...
* commit 'dd6d96c227f5ca1e48e81b419dda744722b5b2d4':
Restrict the permission of dict files created on device.
2014-05-14 09:00:18 +00:00
Tadashi G. Takaoka
c1e6100bde
Separate functional key background from normal one
...
This CL also moves spacebarBackground attribute from MainKeyboardView
to KeyboardView.
This CL must be checked in together with I48c383ca97.
Bug: 14419121
Change-Id: Id356d0086a8fb21375fb5c66076873258fb3d63e
2014-05-14 17:57:51 +09:00
Keisuke Kuroyanagi
dd6d96c227
Merge "Restrict the permission of dict files created on device."
2014-05-14 08:55:43 +00:00
Keisuke Kuroyanagi
ed16af72e3
Restrict the permission of dict files created on device.
...
Bug: 13497304
Change-Id: I7bf67e2e81bc63a67bd91cbc0f753ecac88349f6
2014-05-14 17:48:28 +09:00
Keisuke Kuroyanagi
d2f7cd28ae
Use JniDataUtils::outputCodePoints() to output code points
...
Bug: 14119293
Bug: 13758761
Change-Id: I516d2f96e219e6e65246f502186ccb9bd5f0670f
2014-05-14 17:42:47 +09:00
Jean Chalard
309ab664a8
Don't send empty composing texts.
...
Bug: 13160467
Change-Id: I5e3204ac8aaa18fe9219cc6b564b832ab6cf94fc
2014-05-14 16:55:32 +09:00
Jean Chalard
b185aee6dc
am 4b6660f8
: Merge "Fix unit tests."
...
* commit '4b6660f8f9e5f30427a86659afa75189cca01610':
Fix unit tests.
2014-05-14 07:21:45 +00:00