e3a72c9b4f
am ff80ee20: Merge "Modify isAllowedToLog"
...
* commit 'ff80ee20b4b7bf703e89660a68f50975a5cec2a5':
Modify isAllowedToLog
2013-05-21 14:24:40 -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
8b26ab2653
am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'ea88e2ffe86cad12387c8ab741c38de6e6e15713':
2013-05-21 09:05:35 -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
bab46b4ae2
am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev
...
* commit 'd96f63d2ed2dfcdfe8c83ed8b9020c2aae5b351d':
Fix a crash on a secondary user
2013-05-20 21:34:17 -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
7408a09259
am 88fcf65f: (-s ours) am 13d7d568: (-s ours) am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '88fcf65f431c7f46a72bd05a37f3d83b6d2c7d72':
Import translations. DO NOT MERGE
2013-05-20 21:23:47 -07: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
931252471d
am 7f008a62: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '7f008a62d3d47ae0d0b7ba4ea7440178ed8b3f82':
Import translations. DO NOT MERGE
2013-05-20 21:20:36 -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
27ee1f20aa
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-05-21 04:17:42 +00:00
23bff513a9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-21 04:17:27 +00:00
56dba59ada
am 05ea7c5d: am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection
...
* commit '05ea7c5d0233d2ba703de1123e99f81938badf66':
Add a method to work around apps broken by recorrection
2013-05-20 21:12:11 -07: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
d3cf671524
am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"
...
* commit 'a66396369b1d03dbe1303833af8b1baf7e5b95cf':
Remove unnecessary @UsedForTesting annotation
2013-05-20 20:09:40 -07:00
a66396369b
Merge "Remove unnecessary @UsedForTesting annotation"
2013-05-21 03:07:59 +00:00
2380f927dc
am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.
...
* commit '0013f97dddb581b0ac506a867ebb95705e929479':
Extract a new class for app-specific workarounds.
2013-05-20 19:52:02 -07: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
f9b75f999d
Import translations. DO NOT MERGE
...
Change-Id: I6e59176430efa1da9767391da553e3a6157c2b77
Auto-generated-cl: translation import
2013-05-20 15:18:38 -07:00
6ac1a79f02
Import translations. DO NOT MERGE
...
Change-Id: I40c83f490ebab993d07fd92b78a6901f3ddbc2b2
Auto-generated-cl: translation import
2013-05-20 15:15:36 -07:00
f8ce1ffaa6
am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'eb724ddbe92ba4c090fafad42ca65af4fd8d5143':
2013-05-17 13:01:13 -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
ec6e5d37be
am de4e579c: Merge "Fix punctuation logging"
...
* commit 'de4e579c68e74fa0c85b376769e9428cd822add7':
Fix punctuation logging
2013-05-17 10:47:00 -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
265861dc98
am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '82c852cb4644e28b55fad08f04cae9e124b32cc2':
Fix an NPE in recorrection
Fix an NPE in recapitalize
2013-05-16 05:51:40 -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
f83050d961
am 17b63ba5: Merge "Remove unnecessary commit/uncommit"
...
* commit '17b63ba588598d0bd6f643d3a8cb385c75d2c163':
Remove unnecessary commit/uncommit
2013-05-15 16:54:55 -07:00
17b63ba588
Merge "Remove unnecessary commit/uncommit"
2013-05-15 23:52:43 +00:00
577bc2989e
am 7af5300c: Merge "Add claifying comment"
...
* commit '7af5300c7dc8d3816b0f02fa9dae112d3d22a71a':
Add claifying comment
2013-05-15 16:33:07 -07:00
7af5300c7d
Merge "Add claifying comment"
2013-05-15 23:31:31 +00:00
9a606af478
am a404e365: am d40b4729: am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'a404e36520c975660f9fbc0c7ae65353407140d4':
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 13:11:35 -07:00
a12f001d5f
am c3c879ed: am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit 'c3c879ed9f3232b4631f7fb699a7993aa173258b':
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 13:11:28 -07:00
Kurt Partridge
The Android Open Source Project
The Android Automerger
Jean Chalard
Baligh Uddin
Satoshi Kataoka
Keisuke Kuroyanagi
Tadashi G. Takaoka