5fdea4775e
Merge "Always record word boundaries"
2013-05-22 03:04:35 +00:00
d9a87eb857
Merge "Fix drawing debug points of gesture trails"
2013-05-22 00:39:22 +00:00
44f679bbd2
Merge "Fix running on device regression test and profile."
2013-05-22 00:18:14 +00:00
9764397274
Fix drawing debug points of gesture trails
...
Bug: 7167303
Change-Id: I9a75b1b9b9127c5364da49b2a04b22c16a7ad535
2013-05-21 16:09:10 -07:00
450d78b030
Always record word boundaries
...
Word boundaries are currently logged, but only if all the
details of a word pass the privacy filter and are logged.
This change records when a word is committed in all cases,
but does not disclose the word contents or any data used in
its construction.
Addresses b/9070768
Change-Id: I573679d0685c088aca65af99e46337a2f429f816
2013-05-21 16:08:54 -07:00
8a6a15e052
Merge "Clean up IntentCompatUtils a bit"
2013-05-21 22:17:24 +00:00
db7d4da3e5
Clean up IntentCompatUtils a bit
...
Change-Id: I803aa6c2160bfa1ffe992b28e7eb6e8a320c9762
2013-05-21 15:13:23 -07:00
ff80ee20b4
Merge "Modify isAllowedToLog"
2013-05-21 21:22:23 +00:00
74a6196c6b
Modify isAllowedToLog
...
Currently isAllowedToLog only checks the state of the
ResearchLogger, and does not consider which log the data is
going to. This causes problems with the logs for Feedback.
The Feedback log should inhibit normal logging procedures,
but the system needs to be able to write specific data
directly to it.
This change renames to isAllowedToLogTo and adds the
destination ResearchLog as a parameter. A FeedbackLog is also
added as a new class so it can be distinguished from other
ResearchLogs.
Change-Id: I5a1eea05bb040c26bf816b89179f44b3024fa2ad
2013-05-21 14:09:04 -07:00
ea88e2ffe8
am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '150da22528fcb9cd8c275428bd11e1e3f543f46f':
2013-05-21 09:02:34 -07:00
150da22528
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia5c29124c5251cfba762c1a19190fe3c02d8bf42
2013-05-21 08:59:25 -07:00
bbc5321c84
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:47:03 -07:00
d96f63d2ed
am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit 'e2bee5b134aaefc69a680be8ea65e2d7640b3ead':
Fix a crash on a secondary user
2013-05-20 21:32:21 -07:00
e2bee5b134
am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit 'ede3db51f0fb16559c27aa29a7cf07784bb9431c':
Fix a crash on a secondary user
2013-05-20 21:29:50 -07:00
ede3db51f0
Merge "Fix a crash on a secondary user" into jb-mr2-dev
2013-05-21 04:27:34 +00:00
88fcf65f43
am 13d7d568: (-s ours) am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '13d7d5684ee855b2e87160dee8a8754d58f5ee72':
Import translations. DO NOT MERGE
2013-05-20 21:21:40 -07:00
13d7d5684e
am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '23bff513a97a71eacc6eadf694ce6f5a1e07967c':
Import translations. DO NOT MERGE
2013-05-20 21:19:11 -07:00
7f008a62d3
Merge "Import translations. DO NOT MERGE"
2013-05-21 04:18:40 +00:00
23bff513a9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-21 04:17:27 +00:00
05ea7c5d02
am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
...
* commit '167ba3459b0ce02b9add12ade9388bd2b1e6eb62':
Add a method to work around apps broken by recorrection
2013-05-20 21:10:07 -07:00
167ba3459b
am 89fe1f50: Add a method to work around apps broken by recorrection
...
* commit '89fe1f50881180730e451cbe6ec4d1f8dc67acf1':
Add a method to work around apps broken by recorrection
2013-05-20 21:08:41 -07:00
10e8b93977
Fix a crash on a secondary user
...
Bug: 9054063
Change-Id: I092ab6e0077578d0aca57d2e41dfbc00b46e1ba4
2013-05-21 12:27:16 +09:00
adf82a97a9
Fix running on device regression test and profile.
...
Change-Id: Ie16d9514092d6d6f42881b975420e5d1431b776c
2013-05-20 20:14:13 -07:00
a66396369b
Merge "Remove unnecessary @UsedForTesting annotation"
2013-05-21 03:07:59 +00:00
0013f97ddd
am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
...
* commit '5906b05bb50c0a67bd4f03fcfae41db3daefe0bc':
Extract a new class for app-specific workarounds.
2013-05-20 19:50:46 -07:00
5906b05bb5
am 7058b02a: Extract a new class for app-specific workarounds.
...
* commit '7058b02a9c798c21b169b778be2befc7739f4e9b':
Extract a new class for app-specific workarounds.
2013-05-20 19:49:25 -07:00
2532f72b94
Remove unnecessary @UsedForTesting annotation
...
Change-Id: I843fd6bc20da95e61d1a05b5b34d6e4c9db59dab
2013-05-21 10:45:59 +09:00
89fe1f5088
Add a method to work around apps broken by recorrection
...
Bug: 8944307
Change-Id: I8986622554f30aaf4f595099c4ab5652b75c972c
2013-05-21 07:53:31 +09:00
7058b02a9c
Extract a new class for app-specific workarounds.
...
Bug: 8944307
Change-Id: Iaff9dd03d3d856a6bdaa2b16c4e71e95cd2b6349
2013-05-21 07:53:28 +09:00
5914b8d4b6
Import translations. DO NOT MERGE
...
Change-Id: I1075741837c63b5bb93cf2b39aa707cf5afeb9e7
Auto-generated-cl: translation import
2013-05-20 15:29:34 -07:00
6ac1a79f02
Import translations. DO NOT MERGE
...
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
2013-05-20 15:15:36 -07:00
eb724ddbe9
am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '7f78bd5e2517b6a2f6eceb5f1703e51aca236dc0':
2013-05-17 12:59:40 -07:00
7f78bd5e25
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38
2013-05-17 12:54:52 -07:00
de4e579c68
Merge "Fix punctuation logging"
2013-05-17 17:45:21 +00:00
500dea6ad4
Fix punctuation logging
...
Punctuation is currently put into the same LogUnit as the
following word. This is counter-intuitive and makes
post-processing more complicated.
This change causes punctuation to be put into its own
LogUnit.
A tricky case is the phantom space. A phantom space is
inserted right before other text, whose MotionEvents have
already been collected and inserted into mCurrentLogBuffer.
Phantom spaces are handled by creating their own LogUnit and
inserting it into the LogBuffer right before
mCurrentLogBuffer is shifted in.
Change-Id: I102d7cd93982ad37ba0abb6c1ac0f66b85b5f95d
2013-05-17 09:47:40 -07:00
5fb6a99bd6
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-16 05:55:49 -07:00
82c852cb46
am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'b528e2511377b58f2c7e0d1046b3645a3716e0ab':
Fix an NPE in recorrection
Fix an NPE in recapitalize
2013-05-16 05:48:21 -07:00
b528e25113
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe
2013-05-16 05:44:12 -07:00
17b63ba588
Merge "Remove unnecessary commit/uncommit"
2013-05-15 23:52:43 +00:00
7af5300c7d
Merge "Add claifying comment"
2013-05-15 23:31:31 +00:00
a404e36520
am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'd40b4729a5c37f35caff9c37f6f6218cdd46cb1f':
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 13:06:57 -07:00
c3c879ed9f
am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit 'ff0bd7dbfa2421786459125795016853b45dca7b':
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 13:06:56 -07:00
ad6df987ac
am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit 'd6a7a26d6396cf4418a3d35718a332c8d9a32097':
am 50259c70: Merge "Tune layout parameters of setup wizard"
2013-05-15 13:06:55 -07:00
feb169cb53
am e7ef9669: am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit 'e7ef9669d6e04f3dec6161f31af8667b38a6cbb8':
am 66b87269: Update welcome fallback image (using xhdpi asset)
2013-05-15 13:06:54 -07:00
ce0273c26a
am 883905f4: am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
...
* commit '883905f45b836c5ded2527b5fe778c69e744a185':
am 769427cf: Adjust aspect ratio of setup image
2013-05-15 13:06:53 -07:00
e0d3bb2c36
am b6161b40: am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'b6161b40bc1e9ce584ecb40bbae3bc5aa787b7a2':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-05-15 13:06:51 -07:00
ba4e480c43
am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit '39afaf3dc38bb929a87ea6ebed5c5f574e70fc23':
2013-05-15 13:06:50 -07:00
091bcabfd3
am 46bf9f49: am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
...
* commit '46bf9f493c61430cbaed343f09e7e88fdd238098':
2013-05-15 13:06:49 -07:00
7a72480555
am acb37023: am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
...
* commit 'acb37023b2e23b4be29d3b05f6516923adeb9560':
2013-05-15 13:06:47 -07:00
d8e8b007ca
am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '5ee11c5d9a55871e04dc24a34499d16a0d8ae3bd':
2013-05-15 13:06:46 -07:00
Kurt Partridge
Tadashi G. Takaoka
Keisuke Kuroyanagi
The Android Open Source Project
The Android Automerger
Jean Chalard
Baligh Uddin
Satoshi Kataoka
The Android Automerger
Ken Wakasa