1b00d9a614
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ibed6cf3d3ec34ffdc109fa73e2e90eef1aa10b52
2012-08-21 16:07:18 -07:00
d0c41e0c68
ResearchLogger log RichInputConnection
...
Move many ResearchLogger data collection points to RichInputConnection.
By collecting data here, developers do not have to remember to keep the
ResearchLog consistent with calls to the RichInputConnection.
In addition, some unnecessary log points were removed, and the ResearchLogger
is now independent of LatinImeLogger.
multi-project change with Ifbabefc008d32d99f89e8289e504188e7232ebd4
Bug: 6188932
Change-Id: I4a42d963ba952e703d425acd3a9871d5fca1f03a
2012-08-21 15:16:34 -07:00
6460971522
am c8d7a685: Import translations. DO NOT MERGE
...
* commit 'c8d7a68503fb2122f17a90a4c364d07491917840':
Import translations. DO NOT MERGE
2012-08-21 12:49:20 -07:00
c8d7a68503
Import translations. DO NOT MERGE
...
Change-Id: Id2d245dd2623e5a23871d389aa600b367cbbfe77
Auto-generated-cl: translation import
2012-08-21 12:28:51 -07:00
98f9659581
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:35:15 -07:00
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
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
8b6b5592cb
Merge "Treat all caps for gesture input." into jb-mr1-dev
2012-08-21 04:39:04 -07:00
324cc1dbe6
Merge "Tell the shift mode to the word composer." into jb-mr1-dev
2012-08-21 04:38:27 -07:00
1eba97d92f
Treat all caps for gesture input.
...
Bug: 6950087
Change-Id: I9f2271780600572c9befa96c7ad98494c554dd2b
2012-08-21 20:29:53 +09:00
adbd9ae105
Tell the shift mode to the word composer.
...
Bug: 6950087
Change-Id: Ifab9d6d075af398c6468d081216488712f8a53fb
2012-08-21 20:27:42 +09:00
c03330c202
am ac78633b: Rename and consolidate some constants
...
* commit 'ac78633be28e8990fc3b3a8de192c80966e746e3':
Rename and consolidate some constants
2012-08-21 01:58:27 -07:00
ac78633be2
Rename and consolidate some constants
...
Change-Id: I7863936cca18b28bf0117afcbcf544a5fd7f185d
2012-08-21 17:54:53 +09:00
696eda3a75
am 18f69b02: Merge "Fix NPE" into jb-mr1-dev
...
* commit '18f69b02ef814bf0b7f3607d9e34096d104c2173':
Fix NPE
2012-08-21 01:39:22 -07:00
18f69b02ef
Merge "Fix NPE" into jb-mr1-dev
2012-08-21 01:37:19 -07:00
abe66a7e5b
am 6785b907: Remove touch coordinate from pickSuggestionManually
...
* commit '6785b9072762e15bb49657ce7b7d228dab76e44a':
Remove touch coordinate from pickSuggestionManually
2012-08-21 01:32:39 -07:00
6785b90727
Remove touch coordinate from pickSuggestionManually
...
Change-Id: I33b1b4bc6fdfd263c4b2bb7125c07b4bddcf3c9f
2012-08-21 17:13:45 +09:00
8d0cf41f49
Fix NPE
...
Bug: 7017430
Change-Id: Ie46f02a934763c3b6d65d0d62a8239d80eaefabd
2012-08-21 16:56:45 +09:00
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
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
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
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
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
48643b0e0d
Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
2012-08-20 10:18:40 -07:00
e15e6c2c27
Merge "Revert "ResearchLogger to track simple statistics"" into jb-mr1-dev
2012-08-20 10:18:30 -07:00
adb591e75b
Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev
2012-08-20 10:18:30 -07:00
7b0459e1a8
Merge "Revert "ResearchLogging log when preferences change"" into jb-mr1-dev
2012-08-20 10:18:20 -07:00
f1c3e53b23
Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev
2012-08-20 10:18:10 -07:00
35c11842a7
Revert "ResearchLogger log RichInputConnection"
...
This reverts commit 1964ffb3f4
2012-08-20 10:17:45 -07:00
77257a736e
Revert "ResearchLogger to track simple statistics"
...
This reverts commit 7cec911fde
2012-08-20 10:17:43 -07:00
3d35908749
Revert "ResearchLogging capture full n-gram data"
...
This reverts commit 221e756fd7
2012-08-20 10:17:40 -07:00
fc74a01abe
Revert "ResearchLogging log when preferences change"
...
This reverts commit c58f5d904b
2012-08-20 10:17:31 -07:00
96da633582
Revert "ResearchLogging upload via service"
...
This reverts commit baf1f0bd61
2012-08-20 10:17:29 -07:00
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
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
46dd5a5612
am 461f1942: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
...
* commit '461f1942f94b00a9c75d882cdf9d82c1a758b22b':
ResearchLogger log RichInputConnection
2012-08-20 08:48:33 -07:00
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
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
461f1942f9
Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
2012-08-20 08:47:33 -07:00
2163f09418
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:35:49 -07:00
64047d5872
am 5a49a8bb: Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev
...
* commit '5a49a8bb5f3f70619237604f91f7c1354fcb5fea':
Cleaup gesture preview drawing code a bit
2012-08-19 23:44:09 -07:00
5a49a8bb5f
Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev
2012-08-19 23:42:05 -07:00
978c0fc878
Cleaup gesture preview drawing code a bit
...
Change-Id: Ie75d497ba88805d945d6039ecad09ed0e8e5e4d3
2012-08-20 15:40:03 +09:00
291de5e1c4
am cb2362ce: Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev
...
* commit 'cb2362cee1a6700fb15730e12a62ae2004baae4f':
Make some usages of SparseArray thread-safe
2012-08-19 23:24:34 -07:00
cb2362cee1
Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev
2012-08-19 23:23:08 -07:00
8ce351a827
Make some usages of SparseArray thread-safe
...
This is a follow up of I39d9bf1a7c272eb16d6ed4698f52457579b40f10.
Change-Id: Ic3288e491175f9a85679a21064093f9db5a65466
2012-08-20 15:00:26 +09:00
b2145d0660
am 2cd248ee: Merge "Remove the whitelist resources" into jb-mr1-dev
...
* commit '2cd248ee05009385f1c67aafede6a776f937ec06':
Remove the whitelist resources
2012-08-19 22:43:48 -07:00
2cd248ee05
Merge "Remove the whitelist resources" into jb-mr1-dev
2012-08-19 22:42:14 -07:00
2a62a978f3
am 1aed102d: Merge "Fix capitalization, part 1" into jb-mr1-dev
...
* commit '1aed102d4cfa02befcf3d1377ab94bdb412c8862':
Fix capitalization, part 1
2012-08-19 22:32:04 -07:00
1aed102d4c
Merge "Fix capitalization, part 1" into jb-mr1-dev
2012-08-19 22:29:59 -07:00
The Android Open Source Project
Kurt Partridge
Baligh Uddin
The Android Automerger
Jean Chalard
Tadashi G. Takaoka