377825942e
am 5a91e4fa: am f69bb4c7: [HW15] Pass events instead of reading them from the transaction
...
* commit '5a91e4fa909633ee2e9eaf8055b56228a79380a5':
[HW15] Pass events instead of reading them from the transaction
2014-08-05 13:25:55 +00:00
9becc8f56b
am 583bbb16: am 203ba408: Merge "Remove ProbabilityDictContent and use LanguageModelDictContent" into lmp-dev
...
* commit '583bbb16dcb564bc00871587788cd119898e0650':
Remove ProbabilityDictContent and use LanguageModelDictContent
2014-08-05 13:25:54 +00:00
7e295ab8da
am baf915e4: am 6d181179: Merge "Add methods for unigrams to LanguageModelDictContent." into lmp-dev
...
* commit 'baf915e4c4b59f159db33086be75f8ab82f8e0db':
Add methods for unigrams to LanguageModelDictContent.
2014-08-05 13:25:53 +00:00
c36e679eb3
am b8c1075a: am 1b9f7c96: Merge "[HW14] Cleanup" into lmp-dev
...
* commit 'b8c1075a8f5ab62998056462b9c25ef848305019':
[HW14] Cleanup
2014-08-05 13:25:52 +00:00
28632211ef
am b5c862f8: am c710b34e: Merge "[HW13] Split up onCodeInput" into lmp-dev
...
* commit 'b5c862f8f942a3ae201cc6a657de9479340d1ad3':
[HW13] Split up onCodeInput
2014-08-05 13:25:51 +00:00
9cca3c8359
am a262144d: Add ViewCompatUtils.setElevation
...
* commit 'a262144dcb6a8e7d5bb42f1feb1f80902877baec':
Add ViewCompatUtils.setElevation
2014-08-05 13:19:39 +00:00
eceefd0725
am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
...
* commit '689064d0a26a7d551c49b53bf43d0eeab0f28379':
Remove unnecessarily overridden defaultEnterKeyStyle
2014-08-05 13:19:38 +00:00
d5c89d6490
am 6474ef99: Merge "[HW16] Implement processing event chains." into lmp-dev
...
* commit '6474ef9925e538d19aed24d53753ec1b0d5ae30c':
[HW16] Implement processing event chains.
2014-08-05 13:19:32 +00:00
c34a384212
am 8cbb4eb9: Merge "Make popup hint letter theme-aware" into lmp-dev
...
* commit '8cbb4eb984f327bb6f1990b0efb5ca3e080ca0a9':
Make popup hint letter theme-aware
2014-08-05 13:19:30 +00:00
5a91e4fa90
am f69bb4c7: [HW15] Pass events instead of reading them from the transaction
...
* commit 'f69bb4c7a31095012608f6608aa714588eb73b3d':
[HW15] Pass events instead of reading them from the transaction
2014-08-05 13:19:28 +00:00
583bbb16dc
am 203ba408: Merge "Remove ProbabilityDictContent and use LanguageModelDictContent" into lmp-dev
...
* commit '203ba408d7124598da49c0b146aba35b72f5f336':
Remove ProbabilityDictContent and use LanguageModelDictContent
2014-08-05 13:19:27 +00:00
baf915e4c4
am 6d181179: Merge "Add methods for unigrams to LanguageModelDictContent." into lmp-dev
...
* commit '6d1811793e0ec786aec77ac1fc6ddc04ae13cfed':
Add methods for unigrams to LanguageModelDictContent.
2014-08-05 13:19:26 +00:00
b8c1075a8f
am 1b9f7c96: Merge "[HW14] Cleanup" into lmp-dev
...
* commit '1b9f7c962c164e656d8a6ba94f50ffe7960c2636':
[HW14] Cleanup
2014-08-05 13:19:25 +00:00
b5c862f8f9
am c710b34e: Merge "[HW13] Split up onCodeInput" into lmp-dev
...
* commit 'c710b34e34ab4035846efea6b5109811befd956a':
[HW13] Split up onCodeInput
2014-08-05 13:19:24 +00:00
a262144dcb
Add ViewCompatUtils.setElevation
...
Bug: 16210054
Change-Id: I632158951a60ab527246410caefd9fbe471dd859
2014-08-05 18:56:24 +09:00
689064d0a2
Remove unnecessarily overridden defaultEnterKeyStyle
...
The overriding defaultEnterKeyStyle was needed because there were two
Key's attributes to control key's visual, keyLabel and
keyIcon. Because these were merged into one keySpec attribute, there
is no need to override defaultEnterKeyStyle.
Bug: 16787857
Change-Id: I78ca2c7c9349e4532c67e8d6468a5b98309adc05
2014-08-05 09:54:02 +00:00
c3fb12d0f5
am 9c0b5b21: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '9c0b5b21eb42e573cf7d80979c1cfdbed21598e2':
Import translations. DO NOT MERGE
2014-08-05 09:43:35 +00:00
f69bb4c7a3
[HW15] Pass events instead of reading them from the transaction
...
It's probably cleaner to just pass the events rather than read
them from a transaction, especially when a transaction may be
associated with several events in a chain.
Change-Id: I27830f0f3f3f32fe77ea8b9cad505b7ebee648af
2014-08-05 15:37:01 +09:00
e433fb599b
am 23cdb61a: am 82db6b45: am f1accd4f: [HS1] Save some data in startInputView
...
* commit '23cdb61a53c6ea69ff7075ac01fa8108f9d1cc12':
[HS1] Save some data in startInputView
2014-08-05 04:02:17 +00:00
23cdb61a53
am 82db6b45: am f1accd4f: [HS1] Save some data in startInputView
...
* commit '82db6b45435ab93255d6406039be88b1d6998c2c':
[HS1] Save some data in startInputView
2014-08-05 03:58:55 +00:00
82db6b4543
am f1accd4f: [HS1] Save some data in startInputView
...
* commit 'f1accd4f04b13f764e1ffa7c7964e4b7c41ddf4b':
[HS1] Save some data in startInputView
2014-08-05 03:55:03 +00:00
9c0b5b21eb
Merge "Import translations. DO NOT MERGE"
2014-08-05 00:29:22 +00:00
f600192ea4
Import translations. DO NOT MERGE
...
Change-Id: Id120437f9e4d9a2e59dd07aba38bf6683a960142
Auto-generated-cl: translation import
2014-08-04 23:26:07 -07:00
5dee1fd67d
Merge "Add dedicated background for custom action label key" into lmp-dev
2014-08-05 00:07:36 +00:00
017e9f7e7f
Add dedicated background for custom action label key
...
Bug: 15526978
Change-Id: Ia73d825c7e00097018822704e61272d0e448f39a
2014-08-06 17:23:14 +09:00
c08c506487
Merge "Fix an NPE when running with Keep." into lmp-dev
2014-08-05 00:07:36 +00:00
411fa5909b
Fix an NPE when running with Keep.
...
Change-Id: Ie703e14bff42d34608f11d0c2d7758950b84c88c
2014-08-06 13:00:05 +09:00
aa3ff194cd
Merge "Use add icon for add custom input style menu" into lmp-dev
2014-08-05 00:07:36 +00:00
f7d1dc2b5e
Use add icon for add custom input style menu
...
Bug: 16805043
Change-Id: I9730a6aa5d761924457edaabcee25db930e20f02
2014-08-06 11:38:45 +09:00
50c12c83b3
Merge "[HS2] Move more stuff to onStartInput" into lmp-dev
2014-08-05 00:07:36 +00:00
93b00a314e
[HS2] Move more stuff to onStartInput
...
Bug: 8152758
Change-Id: Ida05df7d151ceb582886e2ad06c5bdf0b59978ee
2014-08-06 11:14:47 +09:00
6474ef9925
Merge "[HW16] Implement processing event chains." into lmp-dev
2014-08-05 00:07:36 +00:00
0a2872cb44
[HW16] Implement processing event chains.
...
Change-Id: I4e1e4f101050ebda77c629a61c548d3c8efb330f
2014-08-05 15:37:01 +09:00
203ba408d7
Merge "Remove ProbabilityDictContent and use LanguageModelDictContent" into lmp-dev
2014-08-05 00:07:36 +00:00
851e0458fe
Remove ProbabilityDictContent and use LanguageModelDictContent
...
Bug: 14425059
Change-Id: I1bb9e78ecb24139b87c99be6722e37eec0a2285d
2014-08-05 14:13:07 +09:00
0889484266
Add methods for unigrams to LanguageModelDictContent.
...
Bug: 14425059
Change-Id: I0a6b480a3d4735787ffac68c47b4ffefc3f1b8a5
2014-08-05 12:38:55 +09:00
c710b34e34
Merge "[HW13] Split up onCodeInput" into lmp-dev
2014-08-05 00:03:09 +00:00
a88e95e07e
[HW13] Split up onCodeInput
...
Change-Id: I503c5403dcaea5db632eba85ae3fae9ba9a1f946
2014-08-05 12:59:36 +09:00
2d8f1b65da
Merge "Make dict log cleanup." into lmp-dev
2014-08-04 23:56:40 +00:00
c21619fe73
Make dict log cleanup.
...
Delete unneeded output when creating a dictionary
Change-Id: If7dc5dc74a53d0054967cb801e5ccfdd53ebe179
2014-08-06 15:32:18 +09:00
4efa2c0cdb
Merge "Use IntArrayView to add/remove n-gram entry." into lmp-dev
2014-08-04 23:56:40 +00:00
9069d30043
Use IntArrayView to add/remove n-gram entry.
...
Bug: 14425059
Change-Id: I734f12dfde5161abdfb019a6391677dba8984ff4
2014-08-06 12:52:01 +09:00
4fd1ffdb8e
Merge "Add/Get n-gram probability entry in languageModelDictContent" into lmp-dev
2014-08-04 23:56:40 +00:00
03dc44f543
Add/Get n-gram probability entry in languageModelDictContent
...
Bug: 14425059
Change-Id: I7926c3812f89b9a71fe1873a5bc32f793f91b640
2014-08-06 00:42:56 +00:00
8cbb4eb984
Merge "Make popup hint letter theme-aware" into lmp-dev
2014-08-04 23:56:40 +00:00
3410e16907
Make popup hint letter theme-aware
...
Bug: 16351091
Change-Id: I6af18ea210c00916157138b9cfbeb073aee6ca1b
2014-08-05 17:32:53 +09:00
6d1811793e
Merge "Add methods for unigrams to LanguageModelDictContent." into lmp-dev
2014-08-04 23:56:40 +00:00
1b9f7c962c
Merge "[HW14] Cleanup" into lmp-dev
2014-08-04 23:56:40 +00:00
dd31a2dedf
[HW14] Cleanup
...
Do away with the didAutoCorrect local variables which are
unnatural to return out of all these functions.
Change-Id: I22024004d2c489de018beff812c2c589bfd8ca32
2014-08-05 12:59:55 +09:00
f1accd4f04
[HS1] Save some data in startInputView
...
Bug: 8152758
Change-Id: Ic57d3918b08e775769d4ba5d73ba5c31231e0d6a
2014-08-04 22:40:21 +09:00
Jean Chalard
Keisuke Kuroyanagi
Tadashi G. Takaoka
Geoff Mendal
Akifumi Yoshimoto