Jean Chalard
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
Tadashi G. Takaoka
a262144dcb
Add ViewCompatUtils.setElevation
...
Bug: 16210054
Change-Id: I632158951a60ab527246410caefd9fbe471dd859
2014-08-05 18:56:24 +09:00
Tadashi G. Takaoka
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
Jean Chalard
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
Jean Chalard
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
Geoff Mendal
d34354ee67
Merge "Import translations. DO NOT MERGE"
2014-08-05 00:29:22 +00:00
Geoff Mendal
086f9d54af
Import translations. DO NOT MERGE
...
Change-Id: I649fa8860a39804aff07aaf6c3c5cb09a282f7cf
Auto-generated-cl: translation import
2014-08-06 13:23:50 -07:00
Geoff Mendal
59121d519b
Merge "Import translations. DO NOT MERGE"
2014-08-06 17:19:40 +00:00
Geoff Mendal
c48a1a73e3
Import translations. DO NOT MERGE
...
Change-Id: I88c0d488ee62e184b44b81073a9fa5343ace2f77
Auto-generated-cl: translation import
2014-08-06 13:15:36 -07:00
Tadashi G. Takaoka
28b8f349df
am 94a568a8: am 868395c6: Merge "Mark hind_compact layout as completed" into lmp-dev
...
* commit '94a568a8635d6362398f059fdea662b9d9165267':
Mark hind_compact layout as completed
2014-08-06 17:40:11 +00:00
Jean Chalard
78d9b7c4a0
am bc043c31: am 1f3d89c2: Revert "[HS1] Save some data in startInputView"
...
* commit 'bc043c31ded2dd48008b185503475e440f302aa0':
Revert "[HS1] Save some data in startInputView"
2014-08-06 17:38:51 +00:00
Jean Chalard
bd38799e27
am fe807696: am 772a8019: Revert "[HS2] Move more stuff to onStartInput"
...
* commit 'fe807696566a5975b4d0932c72a05593a98f13d3':
Revert "[HS2] Move more stuff to onStartInput"
2014-08-06 17:38:50 +00:00
Tadashi G. Takaoka
c8b860e3e1
am 571320ad: am 5dee1fd6: Merge "Add dedicated background for custom action label key" into lmp-dev
...
* commit '571320ad90b2ac2bb9fa77cf6700feec3bc4030a':
Add dedicated background for custom action label key
2014-08-06 17:38:49 +00:00
Jean Chalard
94e3fb1b40
am fd777062: am 93daa04d: Deactivate tests for Myanmar
...
* commit 'fd777062b67d7c57b94924d1b7c8033244eb6eef':
Deactivate tests for Myanmar
2014-08-06 17:38:48 +00:00
Jean Chalard
09ae6b9119
am 922411a7: am ef74e737: Introduce onEvent() to improve testability
...
* commit '922411a70804921e69df0ef477f6b007e83d5692':
Introduce onEvent() to improve testability
2014-08-06 17:38:47 +00:00
Akifumi Yoshimoto
c01cc6b3b8
am adf2a2b9: am 2d8f1b65: Merge "Make dict log cleanup." into lmp-dev
...
* commit 'adf2a2b9f730454a19c3214abc6d02c13a8e83de':
Make dict log cleanup.
2014-08-06 17:38:46 +00:00
Jean Chalard
43cf1ae7bb
am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev
...
* commit 'f66b0e5f71be61e496bd8b77f04384ea14b75da7':
Fix an NPE when running with Keep.
2014-08-06 17:38:45 +00:00
Tadashi G. Takaoka
0bfcb89ac4
am e8668c2e: am aa3ff194: Merge "Use add icon for add custom input style menu" into lmp-dev
...
* commit 'e8668c2ee2dac5168e1af8484fb9ae2a0534b442':
Use add icon for add custom input style menu
2014-08-06 17:38:43 +00:00
Keisuke Kuroyanagi
16a3d6c430
am aa9ec4a4: am 4efa2c0c: Merge "Use IntArrayView to add/remove n-gram entry." into lmp-dev
...
* commit 'aa9ec4a41b5120b12cb94540eaf5243181b1ed64':
Use IntArrayView to add/remove n-gram entry.
2014-08-06 17:38:42 +00:00
Jean Chalard
d393cf065a
am 98e27483: am 9273f383: [HS3] Fix a bug on ICS
...
* commit '98e2748363355d2286215c798225d529f3a1cb34':
[HS3] Fix a bug on ICS
2014-08-06 17:38:34 +00:00
Jean Chalard
cf66902f69
am 0978aa71: am 50c12c83: Merge "[HS2] Move more stuff to onStartInput" into lmp-dev
...
* commit '0978aa71ea91583c0b8d7e2588549fbb56953e7e':
[HS2] Move more stuff to onStartInput
2014-08-06 17:38:11 +00:00
Keisuke Kuroyanagi
a04e1ee550
am 04bbc0ad: am da8cda05: Clean up IntArrayViewTest
...
* commit '04bbc0ad317995972c0ef1a896595bb41f75c6ec':
Clean up IntArrayViewTest
2014-08-06 17:37:22 +00:00
Keisuke Kuroyanagi
57c3c33c39
am a7be110d: am 4fd1ffdb: Merge "Add/Get n-gram probability entry in languageModelDictContent" into lmp-dev
...
* commit 'a7be110d12c2ff5f4a10a0bd3f177fd8a9cebec5':
Add/Get n-gram probability entry in languageModelDictContent
2014-08-06 17:36:21 +00:00
Tadashi G. Takaoka
a58d78ec89
am 9cca3c83: am a262144d: Add ViewCompatUtils.setElevation
...
* commit '9cca3c8359e30e15a50f60773fd19571659c3dc1':
Add ViewCompatUtils.setElevation
2014-08-05 13:26:01 +00:00
Tadashi G. Takaoka
c64769207d
am eceefd07: am 689064d0: Remove unnecessarily overridden defaultEnterKeyStyle
...
* commit 'eceefd0725c4f727f44e9c65a82970ead15e3566':
Remove unnecessarily overridden defaultEnterKeyStyle
2014-08-05 13:25:59 +00:00
Jean Chalard
6745f337c1
am d5c89d64: am 6474ef99: Merge "[HW16] Implement processing event chains." into lmp-dev
...
* commit 'd5c89d64901f1fe7085e6c217d0c2fc19853b032':
[HW16] Implement processing event chains.
2014-08-05 13:25:58 +00:00
Tadashi G. Takaoka
139e54a26d
am c34a3842: am 8cbb4eb9: Merge "Make popup hint letter theme-aware" into lmp-dev
...
* commit 'c34a3842120078d921e69ed839873e430d6a674b':
Make popup hint letter theme-aware
2014-08-05 13:25:56 +00:00
Jean Chalard
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
Keisuke Kuroyanagi
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
Keisuke Kuroyanagi
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
Jean Chalard
c36e679eb3
am b8c1075a: am 1b9f7c96: Merge "[HW14] Cleanup" into lmp-dev
...
* commit 'b8c1075a8f5ab62998056462b9c25ef848305019':
[HW14] Cleanup
2014-08-05 13:25:52 +00:00
Jean Chalard
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
Geoff Mendal
9c0b5b21eb
Merge "Import translations. DO NOT MERGE"
2014-08-05 00:29:22 +00:00
Geoff Mendal
f600192ea4
Import translations. DO NOT MERGE
...
Change-Id: Id120437f9e4d9a2e59dd07aba38bf6683a960142
Auto-generated-cl: translation import
2014-08-04 23:26:07 -07:00
Jean Chalard
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
Tadashi G. Takaoka
0df148fce0
Merge "Revert "Revert "Remove unused animation resources""" into lmp-dev
2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka
57914a138a
Revert "Revert "Remove unused animation resources""
...
This reverts commit c083255b50
.
Change-Id: I357bcafe7f28fe72b2b51b566dd59ac9c1c5b2fc
2014-08-07 14:27:57 +00:00
Ken Wakasa
c083255b50
Revert "Remove unused animation resources"
...
This reverts commit 9e7f0677bf
.
Due to unit test breakage.
Change-Id: I664c25c17fc4cc98264bdac772eac086c9fbc183
2014-08-07 11:39:22 +00:00
Tadashi G. Takaoka
9e7f0677bf
Remove unused animation resources
...
Change-Id: Idc0670588bb51e6a2b3eac9489cb643db293815a
2014-08-07 16:24:02 +09:00
Tadashi G. Takaoka
91f47b03fe
Merge "Remove unused animation resources" into lmp-dev
2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka
0c2dc41029
Merge "Clean up Keyboard and KeyboardView theme" into lmp-dev
2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka
ef231984ed
Clean up Keyboard and KeyboardView theme
...
Change-Id: I745ed21b88fbdb1f3a16a71ebf3461d909ae448e
2014-08-07 16:16:31 +09:00
Ken Wakasa
3316dcd453
Merge "Revert "Introduce onEvent() to improve testability"" into lmp-dev
2014-08-05 00:07:36 +00:00
Ken Wakasa
f5f5fb4b64
Revert "Introduce onEvent() to improve testability"
...
This reverts commit ef74e737f5
.
Apparently, this CL broke several unit tests.
Change-Id: I86cf5f1ffb0214707afe99ee97f92ba8c5157f3f
2014-08-06 23:57:03 +00:00
Tadashi G. Takaoka
5dee1fd67d
Merge "Add dedicated background for custom action label key" into lmp-dev
2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka
017e9f7e7f
Add dedicated background for custom action label key
...
Bug: 15526978
Change-Id: Ia73d825c7e00097018822704e61272d0e448f39a
2014-08-06 17:23:14 +09:00
Jean Chalard
c08c506487
Merge "Fix an NPE when running with Keep." into lmp-dev
2014-08-05 00:07:36 +00:00
Jean Chalard
411fa5909b
Fix an NPE when running with Keep.
...
Change-Id: Ie703e14bff42d34608f11d0c2d7758950b84c88c
2014-08-06 13:00:05 +09:00
Tadashi G. Takaoka
aa3ff194cd
Merge "Use add icon for add custom input style menu" into lmp-dev
2014-08-05 00:07:36 +00:00
Tadashi G. Takaoka
f7d1dc2b5e
Use add icon for add custom input style menu
...
Bug: 16805043
Change-Id: I9730a6aa5d761924457edaabcee25db930e20f02
2014-08-06 11:38:45 +09:00