732f27984e
Merge "Add toString() method to Keyboard" into jb-mr1-dev
2012-08-08 00:08:13 -07:00
2bcd913e56
Merge "Add SuggestInitializationListener to BinaryDictionary.resetMainDict()" into jb-mr1-dev
2012-08-08 00:07:57 -07:00
35336cf83a
Add toString() method to Keyboard
...
Change-Id: I74c8f006323ed78ec67414fd17849ab40966968e
2012-08-08 15:59:56 +09:00
8d0d7415f8
am a890de42: Merge "Use ArrayList to implement PointerTrackerQueue" into jb-mr1-dev
...
* commit 'a890de42155c85d8af5c6da10fea1bc0574480f9':
Use ArrayList to implement PointerTrackerQueue
2012-08-07 23:58:23 -07:00
a890de4215
Merge "Use ArrayList to implement PointerTrackerQueue" into jb-mr1-dev
2012-08-07 23:56:29 -07:00
79eefda0d3
Add SuggestInitializationListener to BinaryDictionary.resetMainDict()
...
Change-Id: I4c01f172ddb2ca60fa6e604384610c90b76e5457
2012-08-08 15:55:26 +09:00
7ae1fd02d4
Use ArrayList to implement PointerTrackerQueue
...
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
6b4cb15daf
am 4ed69eed: Merge "Move makedict to live under dicttool (A5)" into jb-mr1-dev
...
* commit '4ed69eed006c3e8a0b1ad8f3b0e23cd1cfb49679':
Move makedict to live under dicttool (A5)
2012-08-07 17:06:02 -07:00
4ed69eed00
Merge "Move makedict to live under dicttool (A5)" into jb-mr1-dev
2012-08-07 17:03:32 -07:00
b690e79dcf
am 7bf5415b: Import translations. DO NOT MERGE
...
* commit '7bf5415bfe69e4485c8a80fb473ecbc98d9f85e3':
Import translations. DO NOT MERGE
2012-08-07 15:29:07 -07:00
7bf5415bfe
Import translations. DO NOT MERGE
...
Change-Id: I48e2fcef3c0384fb745f6329b8877a8c1a1cd815
Auto-generated-cl: translation import
2012-08-07 15:05:45 -07:00
0549e29b1b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I551a4310a4c50f93a4d4a407810e598702b76777
2012-08-07 11:05:07 -07:00
45e8eebd6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:35:14 -07:00
5db161d773
am 0cc425bd: Add PointerTrackerQueue unit tests
...
* commit '0cc425bd9c476d3cb6708554282a3242019eb317':
Add PointerTrackerQueue unit tests
2012-08-07 01:00:35 -07:00
0cc425bd9c
Add PointerTrackerQueue unit tests
...
This is a groundwork to elminate LinkedList from PointerTrackerQueue.
Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
d9f9c1189d
am 27e48447: Lingering gesture floating preview text a bit
...
* commit '27e48447a449d2eb534dfa2dc07060727e1a8fb0':
Lingering gesture floating preview text a bit
2012-08-06 22:31:21 -07:00
27e48447a4
Lingering gesture floating preview text a bit
...
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
578c7684e9
am 2a0975be: Import translations. DO NOT MERGE
...
* commit '2a0975be66cc899a065b802f410877c659d84035':
Import translations. DO NOT MERGE
2012-08-06 17:09:57 -07:00
2a0975be66
Import translations. DO NOT MERGE
...
Change-Id: I8cb76298b75155a9d2d4726127759ad9542a93fc
Auto-generated-cl: translation import
2012-08-06 13:35:01 -07:00
334022e640
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I19e7e1476178dc94e3debb6bec3241b3d9070db0
2012-08-06 13:26:17 -07:00
2ed7d8ff67
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:29:23 -07:00
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
7a13975700
Cleanup unused import and dead code
...
Change-Id: Ife877620561d29a8f25602916420741186104617
2012-08-06 17:28:33 +09:00
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
dba77186f7
Fix duplicate getSuggestions() call for main dictionary
...
Change-Id: I092480063452505cdf03dbd83b9c64e535822931
2012-08-06 17:08:38 +09:00
6365b38b9c
am b2795974: Fix Utils.getStackTrace()
...
* commit 'b27959741a25b900641a6acbf927625dbc68ddd3':
Fix Utils.getStackTrace()
2012-08-06 00:53:09 -07:00
b27959741a
Fix Utils.getStackTrace()
...
Change-Id: Iaf160af32bb77b3ad5929cb5ee8eccd01165bdf6
2012-08-06 16:50:43 +09:00
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
44f12ed900
Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
2012-08-05 22:45:49 -07:00
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
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
e2a6badf60
Merge "Show results in the native code." into jb-mr1-dev
2012-08-05 19:34:23 -07:00
586b0ca1a2
Show results in the native code.
...
Change-Id: I712ba49cf4a89a36836fbf49cd72e7eef218e61f
2012-08-06 11:26:13 +09:00
2687b667a7
am 4e9e6cd1: Fix IllegalStateException of KeyDetector
...
* commit '4e9e6cd1544f59be2ae02536af62fe5301e0cebb':
Fix IllegalStateException of KeyDetector
2012-08-05 19:23:25 -07:00
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
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
0ef87868c2
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-03 14:35:17 -07:00
3d5a0b90f8
Import translations. DO NOT MERGE
...
Change-Id: I9510061c7ae1f4020cd5c5d24ed75348556ee085
Auto-generated-cl: translation import
2012-08-03 14:25:41 -07:00
04cccea295
Move makedict to live under dicttool (A5)
...
This removes the makedict directory and makes a new target
to replace it. The old command is still working the same
way it used to.
Change-Id: Ie73b12a7ef101dd2b282e0cb4206ac263af1093e
2012-08-04 02:14:13 +09:00
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
3213133c33
am 5284a1e3: Fix the build
...
* commit '5284a1e3d3472e7ec91802409eae5de3d2860919':
Fix the build
2012-08-03 09:56:34 -07:00
3598053d41
Move dicttool tests and make a script to run them (A4)
...
Change-Id: If582e81741c5edaf345dcb55517dcad0baa64c9e
2012-08-04 01:55:33 +09:00
5284a1e3d3
Fix the build
...
Change-Id: I0d6570332bcf569d8c43b3edd8b3ab52263ef179
2012-08-04 01:48:17 +09:00
2fb40ef301
am 15b28432: Merge "Cleanup unused code" into jb-mr1-dev
...
* commit '15b28432bab6b530d82ba01e0ef6a19cd1a4c698':
Cleanup unused code
2012-08-03 09:35:06 -07:00
15b28432ba
Merge "Cleanup unused code" into jb-mr1-dev
2012-08-03 09:32:27 -07:00
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
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
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
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
1644a3c732
Merge "Update French and Italian separators." into jb-mr1-dev
2012-08-03 08:07:58 -07:00
Tadashi G. Takaoka
Jean Chalard
Baligh Uddin
The Android Open Source Project
The Android Automerger
Ken Wakasa
Satoshi Kataoka
Ying Wang