The Android Open Source Project
334022e640
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I19e7e1476178dc94e3debb6bec3241b3d9070db0
2012-08-06 13:26:17 -07:00
The Android Automerger
2ed7d8ff67
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:29:23 -07:00
Tadashi G. Takaoka
2fbaed919f
am 7a139757: Cleanup unused import and dead code
...
* commit '7a13975700574c42ff1e9cfff5934f00ffb3c802':
Cleanup unused import and dead code
2012-08-06 02:21:15 -07:00
Tadashi G. Takaoka
7a13975700
Cleanup unused import and dead code
...
Change-Id: Ife877620561d29a8f25602916420741186104617
2012-08-06 17:28:33 +09:00
Tadashi G. Takaoka
774e374f5f
am dba77186: Fix duplicate getSuggestions() call for main dictionary
...
* commit 'dba77186f78a9c8b449cc0def5153586ef3f81f9':
Fix duplicate getSuggestions() call for main dictionary
2012-08-06 01:17:20 -07:00
Tadashi G. Takaoka
dba77186f7
Fix duplicate getSuggestions() call for main dictionary
...
Change-Id: I092480063452505cdf03dbd83b9c64e535822931
2012-08-06 17:08:38 +09:00
Tadashi G. Takaoka
6365b38b9c
am b2795974: Fix Utils.getStackTrace()
...
* commit 'b27959741a25b900641a6acbf927625dbc68ddd3':
Fix Utils.getStackTrace()
2012-08-06 00:53:09 -07:00
Tadashi G. Takaoka
b27959741a
Fix Utils.getStackTrace()
...
Change-Id: Iaf160af32bb77b3ad5929cb5ee8eccd01165bdf6
2012-08-06 16:50:43 +09:00
Tadashi G. Takaoka
76bfe7f7b0
am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
...
* commit '44f12ed900f57af7318884347d9e1c434422a3ca':
Separate updateSuggestionStrip from commitTyped
2012-08-05 22:47:49 -07:00
Tadashi G. Takaoka
44f12ed900
Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
2012-08-05 22:45:49 -07:00
Tadashi G. Takaoka
0a524de3df
Separate updateSuggestionStrip from commitTyped
...
The commitTyped() called updateSuggestionStrip(), and that led to call
Suggest.getSuggestedWordsForTypingInput() even after a batch input was
started because WordComposer.commitWord() reset the batch input state.
Bug: 6932442
Change-Id: If645b1ef0343aa1e21ca71a9275b40c6c3be13df
2012-08-06 14:31:01 +09:00
Ken Wakasa
b808e970f4
am e2a6badf: Merge "Show results in the native code." into jb-mr1-dev
...
* commit 'e2a6badf601e7b637a709a11e430bd21bb46f6f9':
Show results in the native code.
2012-08-05 19:36:19 -07:00
Ken Wakasa
e2a6badf60
Merge "Show results in the native code." into jb-mr1-dev
2012-08-05 19:34:23 -07:00
Satoshi Kataoka
586b0ca1a2
Show results in the native code.
...
Change-Id: I712ba49cf4a89a36836fbf49cd72e7eef218e61f
2012-08-06 11:26:13 +09:00
Tadashi G. Takaoka
2687b667a7
am 4e9e6cd1: Fix IllegalStateException of KeyDetector
...
* commit '4e9e6cd1544f59be2ae02536af62fe5301e0cebb':
Fix IllegalStateException of KeyDetector
2012-08-05 19:23:25 -07:00
Tadashi G. Takaoka
4e9e6cd154
Fix IllegalStateException of KeyDetector
...
A KeyDetector without Keyboard may exist in some rare cases. This
change eliminates throwing IllegalStateException and checks explicitly
against null.
Bug: 6891020
Change-Id: I29ec3e9f10484f30288fac76f0c45b3707bc2259
2012-08-06 11:09:50 +09:00
Ying Wang
99403af5bb
am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0ef87868c2a1f0cb0249cfc0e53c357f04ea9366':
Import translations. DO NOT MERGE
2012-08-03 14:37:57 -07:00
Ying Wang
0ef87868c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-03 14:35:17 -07:00
Ying Wang
3d5a0b90f8
Import translations. DO NOT MERGE
...
Change-Id: I9510061c7ae1f4020cd5c5d24ed75348556ee085
Auto-generated-cl: translation import
2012-08-03 14:25:41 -07:00
Jean Chalard
ff05b2192f
am 3598053d: Move dicttool tests and make a script to run them (A4)
...
* commit '3598053d41d1becf7b6d6b5d35bc6a4ec95f9884':
Move dicttool tests and make a script to run them (A4)
2012-08-03 10:01:18 -07:00
Jean Chalard
3213133c33
am 5284a1e3: Fix the build
...
* commit '5284a1e3d3472e7ec91802409eae5de3d2860919':
Fix the build
2012-08-03 09:56:34 -07:00
Jean Chalard
3598053d41
Move dicttool tests and make a script to run them (A4)
...
Change-Id: If582e81741c5edaf345dcb55517dcad0baa64c9e
2012-08-04 01:55:33 +09:00
Jean Chalard
5284a1e3d3
Fix the build
...
Change-Id: I0d6570332bcf569d8c43b3edd8b3ab52263ef179
2012-08-04 01:48:17 +09:00
Jean Chalard
2fb40ef301
am 15b28432: Merge "Cleanup unused code" into jb-mr1-dev
...
* commit '15b28432bab6b530d82ba01e0ef6a19cd1a4c698':
Cleanup unused code
2012-08-03 09:35:06 -07:00
Jean Chalard
15b28432ba
Merge "Cleanup unused code" into jb-mr1-dev
2012-08-03 09:32:27 -07:00
Jean Chalard
900910c02b
am 54e84a00: Make a makedict command for dicttool (A3)
...
* commit '54e84a00fc032ba566cbda41feafa71de77e1c43':
Make a makedict command for dicttool (A3)
2012-08-03 09:28:42 -07:00
Jean Chalard
8ee4b35c70
Cleanup unused code
...
The Italian dictionary has been amended to contain words that
include apostrophes, and accordingly the apostrophe is now
excluded from word separators in Italian.
This code was only used for Italian, and in the general case
it does the wrong thing; it was only needed by limitations of
the old dictionary.
Bug: 6929108
Change-Id: I7ff4615e01899a1cebed2c4c51679cd0746740fe
2012-08-04 01:15:04 +09:00
Jean Chalard
54e84a00fc
Make a makedict command for dicttool (A3)
...
This behaves exactly as the old makedict command. Further
changes will redirect the calls to makedict to this, so as
to consolidate similar code.
Groundwork for
Bug: 6429606
Change-Id: Ibeadbf48bec70f988a15ca36ebf5d1ce3b5b54ea
2012-08-04 01:11:46 +09:00
Jean Chalard
9a0e1df25c
am 1644a3c7: Merge "Update French and Italian separators." into jb-mr1-dev
...
* commit '1644a3c7323ae33063774d32ce2e0f8698ff712d':
Update French and Italian separators.
2012-08-03 08:09:11 -07:00
Jean Chalard
1644a3c732
Merge "Update French and Italian separators." into jb-mr1-dev
2012-08-03 08:07:58 -07:00
Jean Chalard
beccb6e573
Update French and Italian separators.
...
French and Italian separators used to be decided this way
because of how the old dictionaries were made.
However, the new dictionaries actually do include the
composite words, and in both French and Italian, apostrophes
and dashes shouldn't be treated as separators any more.
Change-Id: If11c42625c819e223502a76749dbe797163d3c18
2012-08-04 00:04:13 +09:00
Jean Chalard
53f4acf86f
am 3f805418: Merge "Fix an OOB exception" into jb-mr1-dev
...
* commit '3f80541844672a7625eb298adc6141ecf14bb883':
Fix an OOB exception
2012-08-03 07:20:03 -07:00
Jean Chalard
288caf33cb
am a777a86f: Merge "Simplification (A2)" into jb-mr1-dev
...
* commit 'a777a86f4b311ccdf1443faf0d1759e445ef138e':
Simplification (A2)
2012-08-03 07:18:22 -07:00
Jean Chalard
3f80541844
Merge "Fix an OOB exception" into jb-mr1-dev
2012-08-03 07:17:37 -07:00
Jean Chalard
36fe324184
am 68966c7e: Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
...
* commit '68966c7e0ec89ccb0d2e1f285917163ea9e7b5ee':
Remove arity from dicttool commands (A1)
2012-08-03 07:16:41 -07:00
Jean Chalard
a777a86f4b
Merge "Simplification (A2)" into jb-mr1-dev
2012-08-03 07:15:47 -07:00
Jean Chalard
68966c7e0e
Merge "Remove arity from dicttool commands (A1)" into jb-mr1-dev
2012-08-03 07:14:23 -07:00
Jean Chalard
4c976aceee
Fix an OOB exception
...
Not sure exactly how this can happen, but at least this should
prevent us from crashing.
Bug: 6920884
Change-Id: I451864756b48c5cb5e98b06edee917d88766d77f
2012-08-03 23:10:47 +09:00
Jean Chalard
82cd20ee98
Simplification (A2)
...
A single command at a time and no arity gives opportunity to simplify
the argument parsing code.
Change-Id: Iff7bab78ede7448a662092f221c590a9eedae2a5
2012-08-03 23:02:39 +09:00
Jean Chalard
77c8c73837
Remove arity from dicttool commands (A1)
...
This unnecessarily complicates and limits commands.
It's simpler to just have one command by invocation.
Groundwork for
Bug: 6429606
Change-Id: I24cf267a9cbc937a5ba53942b29e28e7095d2fd2
2012-08-03 23:02:06 +09:00
Tadashi G. Takaoka
be7897a04a
am 6242564c: Merge "Using hardware accelerated drawing" into jb-mr1-dev
...
* commit '6242564c91d47885075bf2bd1e1bb0760de76c10':
Using hardware accelerated drawing
2012-08-03 04:55:54 -07:00
Tadashi G. Takaoka
6242564c91
Merge "Using hardware accelerated drawing" into jb-mr1-dev
2012-08-03 04:47:33 -07:00
Tadashi G. Takaoka
622d6a5b1b
Using hardware accelerated drawing
...
When Canvas has been hardware accelerated, don't use offscreen bitmap.
Bug: 6872994
Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
2012-08-03 20:46:10 +09:00
Ken Wakasa
b43a1713c5
am 1d8a246e: Header cleanup
...
* commit '1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c':
Header cleanup
2012-08-03 02:47:12 -07:00
Ken Wakasa
1d8a246e39
Header cleanup
...
Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
2012-08-03 18:37:58 +09:00
The Android Open Source Project
3666f42b45
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca
2012-08-02 11:27:30 -07:00
The Android Automerger
d4afbf9b98
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 08:18:20 -07:00
Ken Wakasa
6c465d9d26
am 77e8e81a: Header cleanup. Moved a couple of functions from .h to .cpp.
...
* commit '77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9':
Header cleanup. Moved a couple of functions from .h to .cpp.
2012-08-02 05:07:43 -07:00
Ken Wakasa
77e8e81ad9
Header cleanup. Moved a couple of functions from .h to .cpp.
...
Change-Id: Ifd12a7632f75395bd0ef5e394d5c2abd6cbe28c6
2012-08-02 20:19:39 +09:00
Tadashi G. Takaoka
2af1b1241b
am ffe36cdc: Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev
...
* commit 'ffe36cdc6d41d0ad1031e7d9f8acf6b6f1008970':
Small cleanup for keyboard drawing code
2012-08-02 01:13:52 -07:00