The Android Automerger
|
98f9659581
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-08-21 06:35:15 -07:00 |
|
Jean Chalard
|
9e928aa581
|
am 3518818e: am 8b6b5592: Merge "Treat all caps for gesture input." into jb-mr1-dev
* commit '3518818eaff64e0fd1c2e8483202deabd4dc9975':
Treat all caps for gesture input.
|
2012-08-21 05:18:20 -07:00 |
|
Jean Chalard
|
2392bad916
|
am 4034699a: am 324cc1db: Merge "Tell the shift mode to the word composer." into jb-mr1-dev
* commit '4034699a0b9f5730081842fe6eb68d718e7a8c10':
Tell the shift mode to the word composer.
|
2012-08-21 05:18:19 -07:00 |
|
Jean Chalard
|
3518818eaf
|
am 8b6b5592: Merge "Treat all caps for gesture input." into jb-mr1-dev
* commit '8b6b5592cb2f3789fade5a6e04a328788e61a292':
Treat all caps for gesture input.
|
2012-08-21 05:06:24 -07:00 |
|
Jean Chalard
|
4034699a0b
|
am 324cc1db: Merge "Tell the shift mode to the word composer." into jb-mr1-dev
* commit '324cc1dbe60a39b65989356067a03f2ff9fb1a86':
Tell the shift mode to the word composer.
|
2012-08-21 05:06:23 -07:00 |
|
Jean Chalard
|
8b6b5592cb
|
Merge "Treat all caps for gesture input." into jb-mr1-dev
|
2012-08-21 04:39:04 -07:00 |
|
Jean Chalard
|
324cc1dbe6
|
Merge "Tell the shift mode to the word composer." into jb-mr1-dev
|
2012-08-21 04:38:27 -07:00 |
|
Jean Chalard
|
1eba97d92f
|
Treat all caps for gesture input.
Bug: 6950087
Change-Id: I9f2271780600572c9befa96c7ad98494c554dd2b
|
2012-08-21 20:29:53 +09:00 |
|
Jean Chalard
|
adbd9ae105
|
Tell the shift mode to the word composer.
Bug: 6950087
Change-Id: Ifab9d6d075af398c6468d081216488712f8a53fb
|
2012-08-21 20:27:42 +09:00 |
|
Tadashi G. Takaoka
|
12ae8e2899
|
am c03330c2: am ac78633b: Rename and consolidate some constants
* commit 'c03330c202ec0af8126e15bbe2664f88f9696e1f':
Rename and consolidate some constants
|
2012-08-21 01:59:39 -07:00 |
|
Tadashi G. Takaoka
|
c03330c202
|
am ac78633b: Rename and consolidate some constants
* commit 'ac78633be28e8990fc3b3a8de192c80966e746e3':
Rename and consolidate some constants
|
2012-08-21 01:58:27 -07:00 |
|
Tadashi G. Takaoka
|
ac78633be2
|
Rename and consolidate some constants
Change-Id: I7863936cca18b28bf0117afcbcf544a5fd7f185d
|
2012-08-21 17:54:53 +09:00 |
|
Tadashi G. Takaoka
|
84d3b4bc9b
|
am 696eda3a: am 18f69b02: Merge "Fix NPE" into jb-mr1-dev
* commit '696eda3a7531f962a21a66553562d03667b7f6c2':
Fix NPE
|
2012-08-21 01:41:32 -07:00 |
|
Tadashi G. Takaoka
|
696eda3a75
|
am 18f69b02: Merge "Fix NPE" into jb-mr1-dev
* commit '18f69b02ef814bf0b7f3607d9e34096d104c2173':
Fix NPE
|
2012-08-21 01:39:22 -07:00 |
|
Tadashi G. Takaoka
|
18f69b02ef
|
Merge "Fix NPE" into jb-mr1-dev
|
2012-08-21 01:37:19 -07:00 |
|
Tadashi G. Takaoka
|
8e479140bf
|
am abe66a7e: am 6785b907: Remove touch coordinate from pickSuggestionManually
* commit 'abe66a7e5bcbd324dca57d597fa37772100a396f':
Remove touch coordinate from pickSuggestionManually
|
2012-08-21 01:33:49 -07:00 |
|
Tadashi G. Takaoka
|
abe66a7e5b
|
am 6785b907: Remove touch coordinate from pickSuggestionManually
* commit '6785b9072762e15bb49657ce7b7d228dab76e44a':
Remove touch coordinate from pickSuggestionManually
|
2012-08-21 01:32:39 -07:00 |
|
Tadashi G. Takaoka
|
6785b90727
|
Remove touch coordinate from pickSuggestionManually
Change-Id: I33b1b4bc6fdfd263c4b2bb7125c07b4bddcf3c9f
|
2012-08-21 17:13:45 +09:00 |
|
Tadashi G. Takaoka
|
8d0cf41f49
|
Fix NPE
Bug: 7017430
Change-Id: Ie46f02a934763c3b6d65d0d62a8239d80eaefabd
|
2012-08-21 16:56:45 +09:00 |
|
Ken Wakasa
|
b2b5458356
|
Make master LatinIME identical to JB MR1 LatinIME as of now.
Change-Id: Id79c70310dd774dd5e7ccda6d4b8c36b88c67744
|
2012-08-21 09:52:12 +09:00 |
|
Kurt Partridge
|
585d7e1238
|
am 7fe4eeb8: (-s ours) am 48643b0e: Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
* commit '7fe4eeb800df5a55f0a17cc21c7cf7c5c2ae09b0':
Revert "ResearchLogger log RichInputConnection"
|
2012-08-20 10:25:20 -07:00 |
|
Kurt Partridge
|
4e0201d74a
|
am 38b5623f: am e15e6c2c: Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev
* commit '38b5623fcf887b57de9aef7e3ecd341605dfaec7':
Revert "ResearchLogger to track simple statistics"
|
2012-08-20 10:22:47 -07:00 |
|
Kurt Partridge
|
71f6d6c516
|
am 8ec526e4: am adb591e7: Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev
* commit '8ec526e43d74b5b0603c18b0b3430bf91942d20c':
Revert "ResearchLogging capture full n-gram data"
|
2012-08-20 10:22:46 -07:00 |
|
Kurt Partridge
|
e49cc9ea04
|
am 4a946c9d: am 7b0459e1: Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
* commit '4a946c9dd16825ddbdf220a1fbb0523892c8412b':
Revert "ResearchLogging log when preferences change"
|
2012-08-20 10:22:45 -07:00 |
|
Kurt Partridge
|
bd3278536d
|
am 7bcbdcb0: am f1c3e53b: Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
* commit '7bcbdcb074c47c9632ee2af2d243103f41b5867a':
Revert "ResearchLogging upload via service"
|
2012-08-20 10:22:43 -07:00 |
|
Kurt Partridge
|
7fe4eeb800
|
am 48643b0e: Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
* commit '48643b0e0d73703f4b3357add9f793d521eedf96':
Revert "ResearchLogger log RichInputConnection"
|
2012-08-20 10:20:44 -07:00 |
|
Kurt Partridge
|
38b5623fcf
|
am e15e6c2c: Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev
* commit 'e15e6c2c2769abcd35c5c099b2cc5073c98371f0':
Revert "ResearchLogger to track simple statistics"
|
2012-08-20 10:20:43 -07:00 |
|
Kurt Partridge
|
8ec526e43d
|
am adb591e7: Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev
* commit 'adb591e75b9a28b0a9af1a35a366ecaa33f56abb':
Revert "ResearchLogging capture full n-gram data"
|
2012-08-20 10:20:41 -07:00 |
|
Kurt Partridge
|
4a946c9dd1
|
am 7b0459e1: Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
* commit '7b0459e1a86a299880681ca6bc6522402930a101':
Revert "ResearchLogging log when preferences change"
|
2012-08-20 10:20:40 -07:00 |
|
Kurt Partridge
|
7bcbdcb074
|
am f1c3e53b: Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
* commit 'f1c3e53b2336b9c5c9e357fad5f3cb1d85f6b1ac':
Revert "ResearchLogging upload via service"
|
2012-08-20 10:20:39 -07:00 |
|
Kurt Partridge
|
48643b0e0d
|
Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
|
2012-08-20 10:18:40 -07:00 |
|
Kurt Partridge
|
e15e6c2c27
|
Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev
|
2012-08-20 10:18:30 -07:00 |
|
Kurt Partridge
|
adb591e75b
|
Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev
|
2012-08-20 10:18:30 -07:00 |
|
Kurt Partridge
|
7b0459e1a8
|
Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
|
2012-08-20 10:18:20 -07:00 |
|
Kurt Partridge
|
f1c3e53b23
|
Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
|
2012-08-20 10:18:10 -07:00 |
|
Kurt Partridge
|
35c11842a7
|
Revert "ResearchLogger log RichInputConnection"
This reverts commit 1964ffb3f4
Change-Id: Ie43e7ac828faa91e1824a255bb3ecf6c8222d4e8
|
2012-08-20 10:17:45 -07:00 |
|
Kurt Partridge
|
77257a736e
|
Revert "ResearchLogger to track simple statistics"
This reverts commit 7cec911fde
Change-Id: I3eb055e03a9cf463356ebaefc7827ab65a963072
|
2012-08-20 10:17:43 -07:00 |
|
Kurt Partridge
|
3d35908749
|
Revert "ResearchLogging capture full n-gram data"
This reverts commit 221e756fd7
Change-Id: Iefc4e4e27ddc925d4a4634627b0467bd4ee2a66e
|
2012-08-20 10:17:40 -07:00 |
|
Kurt Partridge
|
fc74a01abe
|
Revert "ResearchLogging log when preferences change"
This reverts commit c58f5d904b
Change-Id: Ifab54ecc8b7898fe0af6446d397efd6cdb28f670
|
2012-08-20 10:17:31 -07:00 |
|
Kurt Partridge
|
96da633582
|
Revert "ResearchLogging upload via service"
This reverts commit baf1f0bd61
Change-Id: I7d959b9b626c8fb69a57788e243752952258fa80
|
2012-08-20 10:17:29 -07:00 |
|
Kurt Partridge
|
568c714e99
|
am fdf92658: am 8beeef5d: Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* commit 'fdf926580876a313ddfb07b7625914a8d77852e1':
ResearchLogging upload via service
ResearchLogging log when preferences change
|
2012-08-20 09:44:53 -07:00 |
|
Kurt Partridge
|
6eeb2d0c9e
|
am 45e513fa: (-s ours) am 752c5376: Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* commit '45e513fadf614ff1fff17e431aef64d54ba969ff':
ResearchLogging capture full n-gram data
ResearchLogger to track simple statistics
|
2012-08-20 09:44:52 -07:00 |
|
Kurt Partridge
|
98bc26cccd
|
am 46dd5a56: (-s ours) am 461f1942: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
* commit '46dd5a56125ec4218e65bc532e022965bf5b8d90':
ResearchLogger log RichInputConnection
|
2012-08-20 09:42:11 -07:00 |
|
Kurt Partridge
|
fdf9265808
|
am 8beeef5d: Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* commit '8beeef5d3f5006a0386e47561a2bdb19e18801a9':
ResearchLogging upload via service
ResearchLogging log when preferences change
|
2012-08-20 08:50:12 -07:00 |
|
Kurt Partridge
|
45e513fadf
|
am 752c5376: Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* commit '752c53760cd963c2bd88f327d032b6b92e1bd793':
ResearchLogging capture full n-gram data
ResearchLogger to track simple statistics
|
2012-08-20 08:48:35 -07:00 |
|
Kurt Partridge
|
46dd5a5612
|
am 461f1942: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
* commit '461f1942f94b00a9c75d882cdf9d82c1a758b22b':
ResearchLogger log RichInputConnection
|
2012-08-20 08:48:33 -07:00 |
|
Kurt Partridge
|
8beeef5d3f
|
Merge changes Ie980d38a,Ia7ee65e7 into jb-mr1-dev
* changes:
ResearchLogging upload via service
ResearchLogging log when preferences change
|
2012-08-20 08:48:12 -07:00 |
|
Kurt Partridge
|
752c53760c
|
Merge changes I568c90d4,I4667f8f6 into jb-mr1-dev
* changes:
ResearchLogging capture full n-gram data
ResearchLogger to track simple statistics
|
2012-08-20 08:47:45 -07:00 |
|
Kurt Partridge
|
461f1942f9
|
Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
|
2012-08-20 08:47:33 -07:00 |
|
The Android Automerger
|
2163f09418
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-08-20 06:35:49 -07:00 |
|