630a1c8032
Merge "ResearchLogging upload via service"
2012-08-08 09:27:03 -07:00
d2fe3d7074
am 2a731459: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '2a7314590842aacabddf9ad267bc42e21bc2f695':
2012-08-08 08:21:54 -07:00
2a73145908
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I6bd7aec42a5020c19fe6d99a4a84dff009fb9db6
2012-08-08 08:18:13 -07:00
dc0f8abf18
am da31bde5: am 60d4961f: Merge "Pass traverse session" into jb-mr1-dev
...
* commit 'da31bde599077608f5da595150626a32229b418f':
Pass traverse session
2012-08-08 07:53:42 -07:00
da31bde599
am 60d4961f: Merge "Pass traverse session" into jb-mr1-dev
...
* commit '60d4961f346dadf274f49e0f15c87dcffe8f5820':
Pass traverse session
2012-08-08 07:52:09 -07:00
60d4961f34
Merge "Pass traverse session" into jb-mr1-dev
2012-08-08 07:50:44 -07:00
f285abcc19
am 73205a3a: am bb005f78: Start using JNI\'s Get<Type>ArrayRegion()
...
* commit '73205a3a1f7ddf7bacce8c78894e245a6ab654ba':
Start using JNI's Get<Type>ArrayRegion()
2012-08-08 07:45:05 -07:00
5597df9838
am 8c5b13f4: am 181567f9: Merge "Add traverse session" into jb-mr1-dev
...
* commit '8c5b13f49e47ff25c73f01a7ff9c46a2b4619866':
Add traverse session
2012-08-08 07:45:04 -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
9c54338f88
am e917c52a: am 8d7e3a51: Merge "Rename dicttool to dicttool_aosp and split commands" into jb-mr1-dev
...
* commit 'e917c52a4318587df0f188f3301fdd9a15104c33':
Rename dicttool to dicttool_aosp and split commands
2012-08-08 02:19:37 -07: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
789e70e214
am 66bbf38a: am 9b392364: Cleanup headers.
...
* commit '66bbf38aab2376c3fd250bcb92b85bec01918c94':
Cleanup headers.
2012-08-08 01:42:21 -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
a81cba58ff
am debc7ffd: am 732f2798: Merge "Add toString() method to Keyboard" into jb-mr1-dev
...
* commit 'debc7ffd692884f22904bd519124f9657170ec7e':
Add toString() method to Keyboard
2012-08-08 00:12:03 -07:00
260250fb80
am 72cbfdcd: am 2bcd913e: Merge "Add SuggestInitializationListener to BinaryDictionary.resetMainDict()" into jb-mr1-dev
...
* commit '72cbfdcd80210dc412b8094df1060b0685b356df':
Add SuggestInitializationListener to BinaryDictionary.resetMainDict()
2012-08-08 00:12:01 -07: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
f18996a772
am 8d0d7415: am a890de42: Merge "Use ArrayList to implement PointerTrackerQueue" into jb-mr1-dev
...
* commit '8d0d7415f8d634f88ce4f391441f65960a1be0f4':
Use ArrayList to implement PointerTrackerQueue
2012-08-07 23:59:48 -07: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
cf504d5723
Merge "ResearchLogging log when preferences change"
2012-08-07 20:09:25 -07:00
7bc4bde41c
ResearchLogging upload via service
...
Upload using an intent service rather than just a thread. More robust in case the keyboard
is closed and the upload hasn't finished yet.
multi-project commit with Idf39453f6ccc70af63e7b2c912f61f2533339870
Bug: 6188932
Change-Id: Id5484f2b6349e316e828d5bdc0ed9ca92887d5b8
2012-08-07 20:04:55 -07:00
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
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
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
b690e79dcf
am 7bf5415b: Import translations. DO NOT MERGE
...
* commit '7bf5415bfe69e4485c8a80fb473ecbc98d9f85e3':
Import translations. DO NOT MERGE
2012-08-07 15:29:07 -07:00
a385c7ccf2
Merge "Import translations. DO NOT MERGE"
2012-08-07 15:23:30 -07:00
dd7fe09cde
Import translations. DO NOT MERGE
...
Change-Id: I6be8d9cf708867fae5935312b5cec928fe37919e
Auto-generated-cl: translation import
2012-08-07 15:10:57 -07:00
7bf5415bfe
Import translations. DO NOT MERGE
...
Change-Id: I48e2fcef3c0384fb745f6329b8877a8c1a1cd815
Auto-generated-cl: translation import
2012-08-07 15:05:45 -07:00
1ccadc41d2
am 0549e29b: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0549e29b1bd672a4d3cc73b367ad9a077d750b79':
2012-08-07 11:08:35 -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
a1ec8195d6
am 5db161d7: am 0cc425bd: Add PointerTrackerQueue unit tests
...
* commit '5db161d7732933469799ed683411be8f3dd02c70':
Add PointerTrackerQueue unit tests
2012-08-07 01:01:47 -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
Kurt Partridge
The Android Open Source Project
Satoshi Kataoka
Ken Wakasa
The Android Automerger
Jean Chalard
Tadashi G. Takaoka
Baligh Uddin