Jean Chalard
e5847accc4
am 6b4cb15d: am 4ed69eed: Merge "Move makedict to live under dicttool (A5)" into jb-mr1-dev
...
* commit '6b4cb15daf59c7d7a21173817753666f451c84db':
Move makedict to live under dicttool (A5)
2012-08-07 17:07:46 -07:00
Jean Chalard
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
Jean Chalard
4ed69eed00
Merge "Move makedict to live under dicttool (A5)" into jb-mr1-dev
2012-08-07 17:03:32 -07:00
Baligh Uddin
cc55ee7915
am b690e79d: (-s ours) am 7bf5415b: Import translations. DO NOT MERGE
...
* commit 'b690e79dcf24244808f15866658f618c85e33072':
Import translations. DO NOT MERGE
2012-08-07 15:30:50 -07:00
Baligh Uddin
b690e79dcf
am 7bf5415b: Import translations. DO NOT MERGE
...
* commit '7bf5415bfe69e4485c8a80fb473ecbc98d9f85e3':
Import translations. DO NOT MERGE
2012-08-07 15:29:07 -07:00
Baligh Uddin
a385c7ccf2
Merge "Import translations. DO NOT MERGE"
2012-08-07 15:23:30 -07:00
Baligh Uddin
dd7fe09cde
Import translations. DO NOT MERGE
...
Change-Id: I6be8d9cf708867fae5935312b5cec928fe37919e
Auto-generated-cl: translation import
2012-08-07 15:10:57 -07:00
Baligh Uddin
7bf5415bfe
Import translations. DO NOT MERGE
...
Change-Id: I48e2fcef3c0384fb745f6329b8877a8c1a1cd815
Auto-generated-cl: translation import
2012-08-07 15:05:45 -07:00
The Android Open Source Project
1ccadc41d2
am 0549e29b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0549e29b1bd672a4d3cc73b367ad9a077d750b79':
2012-08-07 11:08:35 -07:00
The Android Open Source Project
0549e29b1b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I551a4310a4c50f93a4d4a407810e598702b76777
2012-08-07 11:05:07 -07:00
The Android Automerger
45e8eebd6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:35:14 -07:00
Tadashi G. Takaoka
a1ec8195d6
am 5db161d7: am 0cc425bd: Add PointerTrackerQueue unit tests
...
* commit '5db161d7732933469799ed683411be8f3dd02c70':
Add PointerTrackerQueue unit tests
2012-08-07 01:01:47 -07:00
Tadashi G. Takaoka
5db161d773
am 0cc425bd: Add PointerTrackerQueue unit tests
...
* commit '0cc425bd9c476d3cb6708554282a3242019eb317':
Add PointerTrackerQueue unit tests
2012-08-07 01:00:35 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
18cab3539f
am d9f9c118: am 27e48447: Lingering gesture floating preview text a bit
...
* commit 'd9f9c1189d3b1a4bbeed92be843ea13219a01365':
Lingering gesture floating preview text a bit
2012-08-06 22:33:22 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
27e48447a4
Lingering gesture floating preview text a bit
...
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
Kurt Partridge
bf2d169c1a
ResearchLogging log when preferences change
...
Bug: 6188932
Change-Id: I568b54248b541e6f5916b18e46d33dd447b783b7
2012-08-06 18:29:51 -07:00
Baligh Uddin
3435aaf77c
am 578c7684: (-s ours) am 2a0975be: Import translations. DO NOT MERGE
...
* commit '578c7684e990dd50fb78f4eb39189160c73ff0f4':
Import translations. DO NOT MERGE
2012-08-06 17:11:39 -07:00
Baligh Uddin
578c7684e9
am 2a0975be: Import translations. DO NOT MERGE
...
* commit '2a0975be66cc899a065b802f410877c659d84035':
Import translations. DO NOT MERGE
2012-08-06 17:09:57 -07:00
Baligh Uddin
d98e900f19
Merge "Import translations. DO NOT MERGE"
2012-08-06 17:02:31 -07:00
Baligh Uddin
f49024d15c
Import translations. DO NOT MERGE
...
Change-Id: Ia5ce1a63a56c2045a89b57fcd4ebe7f542d09f6a
Auto-generated-cl: translation import
2012-08-06 13:39:51 -07:00
Baligh Uddin
2a0975be66
Import translations. DO NOT MERGE
...
Change-Id: I8cb76298b75155a9d2d4726127759ad9542a93fc
Auto-generated-cl: translation import
2012-08-06 13:35:01 -07:00
The Android Open Source Project
274dc3bcd6
am 334022e6: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '334022e640f76d3f80f9e407a893a12f19195666':
2012-08-06 13:29:00 -07:00
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
8bc58790c5
am 2fbaed91: am 7a139757: Cleanup unused import and dead code
...
* commit '2fbaed919f4c2ac64c2be2b84b4a5d7e372813d5':
Cleanup unused import and dead code
2012-08-06 02:23:20 -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
e6938283f6
am 774e374f: am dba77186: Fix duplicate getSuggestions() call for main dictionary
...
* commit '774e374f5f58e21692df6113128c1707ae767fc0':
Fix duplicate getSuggestions() call for main dictionary
2012-08-06 01:18:28 -07: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
1aae6914ba
am 6365b38b: am b2795974: Fix Utils.getStackTrace()
...
* commit '6365b38b9c1a106c7de176e668f13b12c9ab4f1e':
Fix Utils.getStackTrace()
2012-08-06 00:55:16 -07: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
d299bde24b
am 76bfe7f7: am 44f12ed9: Merge "Separate updateSuggestionStrip from commitTyped" into jb-mr1-dev
...
* commit '76bfe7f7b0f6b231e0596e400620cd34265a044f':
Separate updateSuggestionStrip from commitTyped
2012-08-05 22:49:27 -07: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
56b6c269f2
am b808e970: am e2a6badf: Merge "Show results in the native code." into jb-mr1-dev
...
* commit 'b808e970f4c6d543ef896c25726e522601a49f83':
Show results in the native code.
2012-08-05 19:37:10 -07: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
6b4cada7b2
am 2687b667: am 4e9e6cd1: Fix IllegalStateException of KeyDetector
...
* commit '2687b667a7edb889fd2704380fee45f848da6626':
Fix IllegalStateException of KeyDetector
2012-08-05 19:25:20 -07: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
Kurt Partridge
838e6c1e5b
ResearchLogging capture full n-gram data
...
- Captures complete motion data for all words in an n-gram.
- Also filters n-grams properly; if any word in the n-gram is not
in the dictionary, it is not included.
- Simplify ResearchLog to not require explicit state
- Added LogBuffer class MainLogBuffer class to allow n-gram-level decisions
about privacy.
- Moved LogUnit out from ResearchLogger
multi-project change with Id997fb6572daa3ff55591afa1676953bb204f33a
Because of a strange Gerrit interaction, earlier patchsets were recorded
as the following separate changes (to soon be abandoned):
- I59d86ae28123890ddb7aabc7dc9a73a75eecbca4
- I9cc95266fa4500d019e09ec53ec00e5dea7ffd38
- Ie6f23a2035e160f231406df1388a43725380df1d
- Id87909e96fa7fa91174c86395a964404f3490fe1
- I57c5cbde0425c42538d589fa4d1802b3e5688f7c
- Ic1f9d7727e416da1b6c4f1a45b53750cd4088dcf
- I20a72ccc4ba1bc08ed3ee39bff71d2adb376588c
- I417f6f364144b90085f5fef4bd2de1a40b5dfa79
Bug: 6188932
Change-Id: I771e57e3b8c0eb6721c2022e775cb0b528bdff93
2012-08-05 00:55:58 -07:00
Ying Wang
5400f24bed
am 99403af5: (-s ours) am 0ef87868: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '99403af5bb2b9ae61e0feb0e4aaac0874c1362d1':
Import translations. DO NOT MERGE
2012-08-03 14:40:39 -07: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
6f577e16aa
Merge "Import translations. DO NOT MERGE"
2012-08-03 14:35:22 -07:00