60d4961f34
Merge "Pass traverse session" into jb-mr1-dev
2012-08-08 07:50:44 -07:00
73205a3a1f
am bb005f78: Start using JNI\'s Get<Type>ArrayRegion()
...
* commit 'bb005f787f4e00bd832e6a78797be10af2994061':
Start using JNI's Get<Type>ArrayRegion()
2012-08-08 07:43:40 -07:00
8c5b13f49e
am 181567f9: Merge "Add traverse session" into jb-mr1-dev
...
* commit '181567f9c76a0b03250211bf7b53a66473bf704e':
Add traverse session
2012-08-08 07:43:38 -07:00
9127811493
Pass traverse session
...
Change-Id: I84bfaaa406e3f51421c08a7ee8f9576ebdba54d4
2012-08-08 23:30:31 +09:00
8d29df73d7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-08 06:48:04 -07:00
bb005f787f
Start using JNI's Get<Type>ArrayRegion()
...
Change-Id: Iaa1014efe639dd79540835b0d5201093dbd8dab8
2012-08-08 21:06:52 +09:00
181567f9c7
Merge "Add traverse session" into jb-mr1-dev
2012-08-08 04:40:36 -07:00
c4e4dfe17d
Add traverse session
...
Bug: 6942265
Change-Id: I384cf701f5ee44c4b1037e5b8ddfa3d570286f55
2012-08-08 20:39:43 +09:00
e917c52a43
am 8d7e3a51: Merge "Rename dicttool to dicttool_aosp and split commands" into jb-mr1-dev
...
* commit '8d7e3a51f039dc0a2e46e33d688aac813b46a2ce':
Rename dicttool to dicttool_aosp and split commands
2012-08-08 02:16:51 -07:00
8d7e3a51f0
Merge "Rename dicttool to dicttool_aosp and split commands" into jb-mr1-dev
2012-08-08 02:15:20 -07:00
66bbf38aab
am 9b392364: Cleanup headers.
...
* commit '9b392364b7c59a143e66a8ef1d1149a47843d124':
Cleanup headers.
2012-08-08 01:40:01 -07:00
4c573f3c64
Rename dicttool to dicttool_aosp and split commands
...
Change-Id: I83d948be2db5cd0203e876f019697e1d5e038818
2012-08-08 17:15:58 +09:00
9b392364b7
Cleanup headers.
...
Change-Id: Ied1bedb8ba5fae590987ea23bed32f4db1a60d77
2012-08-08 17:12:09 +09:00
debc7ffd69
am 732f2798: Merge "Add toString() method to Keyboard" into jb-mr1-dev
...
* commit '732f27984e3e9c98748aee4726dc9eaed7a14776':
Add toString() method to Keyboard
2012-08-08 00:09:33 -07:00
72cbfdcd80
am 2bcd913e: Merge "Add SuggestInitializationListener to BinaryDictionary.resetMainDict()" into jb-mr1-dev
...
* commit '2bcd913e56ecbfd3f146b73ec3b1c77f83683c7e':
Add SuggestInitializationListener to BinaryDictionary.resetMainDict()
2012-08-08 00:09:32 -07:00
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
Satoshi Kataoka
Ken Wakasa
The Android Automerger
Jean Chalard
Tadashi G. Takaoka
Baligh Uddin
The Android Open Source Project