d2db0add5e
am 3c738d61: am 07d485d7: Merge "Fix a silly bug." into jb-mr1-dev
...
* commit '3c738d6151d0380d950c875dd94bfca312cd6285':
Fix a silly bug.
2012-08-21 20:20:02 -07:00
3c738d6151
am 07d485d7: Merge "Fix a silly bug." into jb-mr1-dev
...
* commit '07d485d7051a27e727163dc406cb0ef9a5eae2cc':
Fix a silly bug.
2012-08-21 20:18:23 -07:00
dc9d743fa3
am bf661bba: am eb59a87a: Merge "Add CollectionUtils class to create generic collection easily" into jb-mr1-dev
...
* commit 'bf661bbab05eb9ecbfa7b3b9a82a7d41e795ed4a':
Add CollectionUtils class to create generic collection easily
2012-08-21 20:17:25 -07:00
07d485d705
Merge "Fix a silly bug." into jb-mr1-dev
2012-08-21 20:16:28 -07:00
bf661bbab0
am eb59a87a: Merge "Add CollectionUtils class to create generic collection easily" into jb-mr1-dev
...
* commit 'eb59a87a074348d30191e57308221531ae613001':
Add CollectionUtils class to create generic collection easily
2012-08-21 20:15:43 -07:00
eb59a87a07
Merge "Add CollectionUtils class to create generic collection easily" into jb-mr1-dev
2012-08-21 20:13:24 -07:00
31def31e15
am 30904b2b: am 56a0fdb3: Merge "ResearchLogger to track simple statistics" into jb-mr1-dev
...
* commit '30904b2b4d45abbda8d19da3cc5f7228bfe2e4b5':
ResearchLogger to track simple statistics
2012-08-21 20:11:49 -07:00
30904b2b4d
am 56a0fdb3: Merge "ResearchLogger to track simple statistics" into jb-mr1-dev
...
* commit '56a0fdb346ce42a7cf3d7be3a7df5415e920345d':
ResearchLogger to track simple statistics
2012-08-21 20:10:02 -07:00
32f6503a27
Fix a silly bug.
...
This would prevent user history to work at all.
Bug: 7023638
Change-Id: I5d8867a07fb8859325d274e956ae667c094d0ac1
2012-08-22 12:09:24 +09:00
56a0fdb346
Merge "ResearchLogger to track simple statistics" into jb-mr1-dev
2012-08-21 20:08:13 -07:00
fd38625917
am 2bbfa8c6: am 06cb4057: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
...
* commit '2bbfa8c62488091b4848db0566c7744f396b4c8f':
ResearchLogger log RichInputConnection
2012-08-21 18:23:49 -07:00
5f282ea9e4
Add CollectionUtils class to create generic collection easily
...
Change-Id: I6b4de9187e122298e5e9cd8ddc9070d062df6a89
2012-08-22 10:21:38 +09:00
2bbfa8c624
am 06cb4057: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
...
* commit '06cb4057130d6c42b25862f6f555ce796badbfda':
ResearchLogger log RichInputConnection
2012-08-21 18:20:54 -07:00
06cb405713
Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
2012-08-21 18:18:52 -07:00
0a30688080
ResearchLogger to track simple statistics
...
Bug: 6188932
Change-Id: Ie1bb7322706c2d4a56f5e17044bc746e9df1cf18
2012-08-21 17:13:49 -07:00
94e7f4bef9
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 I05496cfd762e9a41c42c50099143f1efc0a3d8a2
Bug: 6188932
Change-Id: I424abb2e437901262a9620255493916b7c3ff74b
2012-08-21 17:13:36 -07:00
f54a5e67c9
am 1528eb0f: am 9535bec0: Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
...
* commit '1528eb0f14c9b24e7e60e6d35fe9427967450024':
Revert "ResearchLogger log RichInputConnection"
2012-08-21 17:10:59 -07:00
1528eb0f14
am 9535bec0: Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
...
* commit '9535bec08508c81fabc13cb58e0349b1758b2960':
Revert "ResearchLogger log RichInputConnection"
2012-08-21 17:09:42 -07:00
9535bec085
Merge "Revert "ResearchLogger log RichInputConnection"" into jb-mr1-dev
2012-08-21 17:07:16 -07:00
97d3dd5828
Revert "ResearchLogger log RichInputConnection"
...
This reverts commit d0c41e0c68
2012-08-21 17:06:57 -07:00
1aabbfb773
am bb4d37cb: am 4ae2cb36: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
...
* commit 'bb4d37cbcfb416a30d3334c81603caefda130a60':
ResearchLogger log RichInputConnection
2012-08-21 16:32:46 -07:00
bb4d37cbcf
am 4ae2cb36: Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
...
* commit '4ae2cb361a8d948b5be01898f2d1d9387d88b8ae':
ResearchLogger log RichInputConnection
2012-08-21 16:30:57 -07:00
4ae2cb361a
Merge "ResearchLogger log RichInputConnection" into jb-mr1-dev
2012-08-21 16:29:21 -07:00
768d0a6180
am 1b00d9a6: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1b00d9a614bc0e7a43b3cd942bb32fab63a41e1e':
2012-08-21 16:09:59 -07:00
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
437ede8a7e
am 64609715: (-s ours) am c8d7a685: Import translations. DO NOT MERGE
...
* commit '646097152274817b300e6ecf8299f75d894ea842':
Import translations. DO NOT MERGE
2012-08-21 12:50:56 -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
9eba00374a
Import translations. DO NOT MERGE
...
Change-Id: Ic12eab1847600954738d52636ed61a86697153ef
Auto-generated-cl: translation import
2012-08-21 12:33:58 -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
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
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
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
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
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
84d3b4bc9b
am 696eda3a: am 18f69b02: Merge "Fix NPE" into jb-mr1-dev
...
* commit '696eda3a7531f962a21a66553562d03667b7f6c2':
Fix NPE
2012-08-21 01:41:32 -07: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
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
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
b2b5458356
Make master LatinIME identical to JB MR1 LatinIME as of now.
...
Change-Id: Id79c70310dd774dd5e7ccda6d4b8c36b88c67744
2012-08-21 09:52:12 +09:00
Jean Chalard
Tadashi G. Takaoka
Kurt Partridge
The Android Open Source Project
Baligh Uddin
The Android Automerger
Ken Wakasa