The Android Automerger
2163f09418
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:35:49 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
5a49a8bb5f
Merge "Cleaup gesture preview drawing code a bit" into jb-mr1-dev
2012-08-19 23:42:05 -07:00
Tadashi G. Takaoka
978c0fc878
Cleaup gesture preview drawing code a bit
...
Change-Id: Ie75d497ba88805d945d6039ecad09ed0e8e5e4d3
2012-08-20 15:40:03 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
cb2362cee1
Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev
2012-08-19 23:23:08 -07:00
Tadashi G. Takaoka
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
Jean Chalard
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
Jean Chalard
2cd248ee05
Merge "Remove the whitelist resources" into jb-mr1-dev
2012-08-19 22:42:14 -07:00
Jean Chalard
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
Jean Chalard
1aed102d4c
Merge "Fix capitalization, part 1" into jb-mr1-dev
2012-08-19 22:29:59 -07:00
Jean Chalard
5d9e573fbf
Remove the whitelist resources
...
Bug: 6906525
Change-Id: I1524b9e4c56d28a701d444aa2afbfdcecf0da571
2012-08-20 14:25:14 +09:00
Jean Chalard
e5ee97f709
am 4c6db059: Merge "Remove the whitelist dictionary." into jb-mr1-dev
...
* commit '4c6db0592ec121793389c6b90c3094be8dfb58a7':
Remove the whitelist dictionary.
2012-08-19 22:15:07 -07:00
Jean Chalard
6ce0c23e40
am 04d6649d: Merge "Remove access to the whitelist class." into jb-mr1-dev
...
* commit '04d6649d295c59a0bbbad3f123606cf28d9f3b61':
Remove access to the whitelist class.
2012-08-19 22:15:06 -07:00
Jean Chalard
7bf71ca809
am 753f7b12: Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
...
* commit '753f7b123e721cdb7519f6c4e21b6bb5e6d735b3':
Hack to skip reading an outdated binary file.
2012-08-19 22:13:37 -07:00
Jean Chalard
4c6db0592e
Merge "Remove the whitelist dictionary." into jb-mr1-dev
2012-08-19 22:13:15 -07:00
Jean Chalard
04d6649d29
Merge "Remove access to the whitelist class." into jb-mr1-dev
2012-08-19 22:12:36 -07:00
Jean Chalard
753f7b123e
Merge "Hack to skip reading an outdated binary file." into jb-mr1-dev
2012-08-19 22:11:44 -07:00
Jean Chalard
13822d2b05
Hack to skip reading an outdated binary file.
...
Bug: 7005813
Change-Id: Ie0d8d4b2d5eb147838ca23bdd5ec1cecd4f01151
2012-08-20 13:56:52 +09:00
Jean Chalard
fb087a95f9
Fix capitalization, part 1
...
The case this fixes is typing "Ah.\n" in gmail for example
Bug: 6950087
Change-Id: Ia4bf3a57dde49b9c9d47d315e9f85b7ffc7ee6e3
2012-08-20 13:51:27 +09:00
Tadashi G. Takaoka
8c0cab8ef6
am 6c63f712: Add standard view constructors of PrevewPlacerView
...
* commit '6c63f712655efe7e2d72cb2a0af9a0d8fdf0c730':
Add standard view constructors of PrevewPlacerView
2012-08-19 20:57:54 -07:00
Tadashi G. Takaoka
6c63f71265
Add standard view constructors of PrevewPlacerView
...
Change-Id: I00d7ae4d2330804c342a5e51cf8c0df6ed8a85d6
2012-08-20 11:56:28 +09:00
Ken Wakasa
13cc1dbaa3
am 522e1266: Cosmetic fixes
...
* commit '522e12660a8541a5e98b4737d55e40bd6c49ee00':
Cosmetic fixes
2012-08-18 09:33:50 -07:00
Ken Wakasa
522e12660a
Cosmetic fixes
...
Change-Id: I5460252af534d4455ba22273a06ac956bc904831
2012-08-19 01:26:05 +09:00
Kurt Partridge
c58f5d904b
ResearchLogging log when preferences change
...
DO NOT MERGE
Bug: 6188932
Change-Id: Ia7ee65e7f3be10d031a065aaa6c3d18610c7dff0
2012-08-17 21:44:08 -07:00
Kurt Partridge
baf1f0bd61
ResearchLogging upload via service
...
DO NOT MERGE
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 I40db74fb780e01364609339764e150f0291d3f9b
Bug: 6188932
Change-Id: Ie980d38a713d15c01083d41bd73f0602ec75dd16
2012-08-17 21:44:08 -07:00
Kurt Partridge
7cec911fde
ResearchLogger to track simple statistics
...
DO NOT MERGE
Bug: 6188932
Change-Id: I4667f8f60aa356c73f925c298318520f71e144c5
2012-08-17 21:44:07 -07:00
Kurt Partridge
221e756fd7
ResearchLogging capture full n-gram data
...
DO NOT MERGE
- 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 Ie2bc79fd7fe6b951b24771e94b8d4ca21989af65
Bug: 6188932
Change-Id: I568c90d4af07e7c759c1e7fc64b716bd8c7b4ae5
2012-08-17 21:44:07 -07:00
Kurt Partridge
1964ffb3f4
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 Ib71f841044ec1072610ab5638a5edfce29b7c05b
DO NOT MERGE
Bug: 6188932
Change-Id: I9ec7500a5b18bfe1a5a5bb1e5bf21c43351fc59e
2012-08-17 21:44:06 -07:00
Ken Wakasa
1f6e2faa33
am e46d1292: Fix NPE in LatinIME.addToUserHistoryDictionary()
...
* commit 'e46d12927ee2717788248b05f00b751beaf2a02a':
Fix NPE in LatinIME.addToUserHistoryDictionary()
2012-08-17 08:12:40 -07:00
Ken Wakasa
e46d12927e
Fix NPE in LatinIME.addToUserHistoryDictionary()
...
bug: 7007063
Change-Id: Ie3e2f77dcbc597dda0c0df9a970336e5aac0edba
2012-08-18 00:04:33 +09:00
Ken Wakasa
33371e8864
am 4af10075: (DO NOT MERGE) Remove useless module tags from makefiles
...
* commit '4af100759b462e59b04008be4376e23226703efd':
(DO NOT MERGE) Remove useless module tags from makefiles
2012-08-17 05:07:02 -07:00
Ken Wakasa
4af100759b
(DO NOT MERGE) Remove useless module tags from makefiles
...
Change-Id: If77482da66e80b762cf205369f7d53d069cd8072
2012-08-17 20:12:49 +09:00
Ken Wakasa
a7a11e68a7
am 72c0f4de: Merge "add reconstructBigramFrequency" into jb-mr1-dev
...
* commit '72c0f4de1dfaaa1e404f46da48d7c91f28b76f74':
add reconstructBigramFrequency
2012-08-17 03:21:06 -07:00
Ken Wakasa
72c0f4de1d
Merge "add reconstructBigramFrequency" into jb-mr1-dev
2012-08-17 03:19:12 -07:00
Yuichiro Hanada
c0a75c8ecb
add reconstructBigramFrequency
...
Change-Id: Iff20dcb9ca0d6064bb118247887fe24b812c0c61
2012-08-17 19:05:16 +09:00
Jean Chalard
1b4dfd4ccb
am 1edd557c: Merge "Reword a confusing comment" into jb-mr1-dev
...
* commit '1edd557cf2b7d480275b1747d1915d919c788990':
Reword a confusing comment
2012-08-17 01:40:58 -07:00
Jean Chalard
1edd557cf2
Merge "Reword a confusing comment" into jb-mr1-dev
2012-08-17 01:39:13 -07:00
Jean Chalard
aa27635a8a
Reword a confusing comment
...
Bug: 7005645
Change-Id: Ifd942b3ce242aeeec512e132e1cee31329e994b1
2012-08-17 17:22:28 +09:00
Joe Onorato
07344df292
am 86850305: am 33afbf9a: am 38be4ee0: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '86850305625ded4ca4f1508fdf343cc4b7b37990':
Unnessary LOCAL_MODULE_TAGS
2012-08-17 00:19:06 -07:00
Joe Onorato
8685030562
am 33afbf9a: am 38be4ee0: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '33afbf9a3438df786782283b57a399599809dba6':
Unnessary LOCAL_MODULE_TAGS
2012-08-17 00:16:42 -07:00
Joe Onorato
33afbf9a34
am 38be4ee0: Merge "Unnessary LOCAL_MODULE_TAGS"
...
* commit '38be4ee0fae07ed4abf6aab573fdc9b5955e7895':
Unnessary LOCAL_MODULE_TAGS
2012-08-16 23:58:09 -07:00
Joe Onorato
38be4ee0fa
Merge "Unnessary LOCAL_MODULE_TAGS"
2012-08-16 23:38:19 -07:00
Jean Chalard
46fc768e54
Remove the whitelist dictionary.
...
The functionality now lives in the binary dictionary.
This finalizes work on
Bug: 6906525
Change-Id: Id106d871e8afdf9afa886d2a30bea87ff89f2d24
2012-08-17 15:13:10 +09:00
Ken Wakasa
99927f865f
am de8a9a82: Small cleanups
...
* commit 'de8a9a8227a7a558720edba9d57fa7a056417eb4':
Small cleanups
2012-08-16 21:17:37 -07:00
Ken Wakasa
de8a9a8227
Small cleanups
...
Change-Id: Ib66507b8934bc8019a762d24d5311411e044ec84
2012-08-17 13:06:28 +09:00
Jean Chalard
3e43e6998e
Remove access to the whitelist class.
...
...which becomes useless. It will be entirely removed in an
upcoming change.
Change-Id: I2f1d27f1eceda79454b01f21e057b98f2953131a
2012-08-17 13:01:25 +09:00
Jean Chalard
77a34f2e49
am e2ac3932: Merge "Allow one-character suggestions." into jb-mr1-dev
...
* commit 'e2ac3932e390590fca7a3814556331db6a08362c':
Allow one-character suggestions.
2012-08-16 19:25:48 -07:00
Jean Chalard
e2ac3932e3
Merge "Allow one-character suggestions." into jb-mr1-dev
2012-08-16 19:23:32 -07:00
The Android Open Source Project
9765273127
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I12ca58a05a6640c7db80f88ce271131f164fed10
2012-08-16 19:11:24 -07:00