Kurt Partridge
e1f8635937
am c4fe2942: Merge "Fix misplaced xml namespace"
...
* commit 'c4fe29425c2a09b5c4de4477228be12cba29895b':
Fix misplaced xml namespace
2013-05-24 06:55:43 -07:00
Kurt Partridge
c4fe29425c
Merge "Fix misplaced xml namespace"
2013-05-24 13:54:46 +00:00
Kurt Partridge
89c66fc12e
Fix layout
...
Children of ScrollViews should specify a wrap_content layout_height,
according to AndroidLint
Change-Id: I4f972535f0df6bda1ba48082b812ce80fb5cfdcc
2013-05-23 17:59:23 -07:00
Kurt Partridge
003ed9b36a
Fix misplaced xml namespace
...
Change-Id: I891293c10afbbee0a73c7c98322bec248cc7afb3
2013-05-23 17:59:23 -07:00
Kurt Partridge
a0542472c2
am 264fb958: Merge "Log reasons for punting n-gram logging"
...
* commit '264fb9581c0c5142dc3f78c50dab77444ef17b00':
Log reasons for punting n-gram logging
2013-05-23 17:21:52 -07:00
Kurt Partridge
264fb9581c
Merge "Log reasons for punting n-gram logging"
2013-05-24 00:19:24 +00:00
Tadashi G. Takaoka
02088f4497
Add vibration override values for Galaxy S4 and HTC One
...
Bug: 9109493
2013-05-23 17:03:42 -07:00
Kurt Partridge
aaa23bc12c
Log reasons for punting n-gram logging
...
Addresses b/9074239
Change-Id: I91a3bfcbd32b03e4891ff5f65be01383a3fb8975
2013-05-23 13:56:36 -07:00
Tadashi G. Takaoka
4e41750d52
am 4187499c: Merge "Remove unnecessary methods of KeyboardSwitcher"
...
* commit '4187499cb0cdd6b2a16d6d90743e411f7b9afc96':
Remove unnecessary methods of KeyboardSwitcher
2013-05-22 16:24:37 -07:00
Tadashi G. Takaoka
4187499cb0
Merge "Remove unnecessary methods of KeyboardSwitcher"
2013-05-22 23:23:23 +00:00
Tadashi G. Takaoka
5075d07da0
am f6797a5e: Fix missing import
...
* commit 'f6797a5ecf67d676aff10a9be99bbe0bbb83ea6d':
Fix missing import
2013-05-22 13:48:32 -07:00
Tadashi G. Takaoka
f6797a5ecf
Fix missing import
...
Change-Id: Ie600993db561afb7891aac4765377fe4a8c4636a
2013-05-22 13:46:17 -07:00
Tadashi G. Takaoka
6f9105383a
Remove unnecessary methods of KeyboardSwitcher
...
Change-Id: Idd3647bb1a1d40df8bb89eda715d45427a58d0cd
2013-05-22 10:49:53 -07:00
Tadashi G. Takaoka
37c2f94b59
am dc22b722: Merge "Clean up unused return value"
...
* commit 'dc22b7226a61bb7fa5adbecee23999f8cbf902e3':
Clean up unused return value
2013-05-22 10:46:55 -07:00
Tadashi G. Takaoka
a1f4af5011
am d8835326: Merge "Haptick and audio feedback on key repeat"
...
* commit 'd88353266acff210e384bea2cb4f9c27c4e42110':
Haptick and audio feedback on key repeat
2013-05-22 10:46:53 -07:00
Tadashi G. Takaoka
dc22b7226a
Merge "Clean up unused return value"
2013-05-22 17:44:51 +00:00
Tadashi G. Takaoka
d88353266a
Merge "Haptick and audio feedback on key repeat"
2013-05-22 17:44:01 +00:00
Kurt Partridge
75b75d8b28
am 5fdea477: Merge "Always record word boundaries"
...
* commit '5fdea4775e18f09e2705f8043a2a9554c4fa3f92':
Always record word boundaries
2013-05-21 20:06:24 -07:00
Kurt Partridge
5fdea4775e
Merge "Always record word boundaries"
2013-05-22 03:04:35 +00:00
Tadashi G. Takaoka
009488eaaf
Haptick and audio feedback on key repeat
...
Bug: 6522943
Change-Id: I181f7e8722bf1b3042d7f384ae8ebf87f29458a9
2013-05-21 19:48:15 -07:00
Tadashi G. Takaoka
48346c474d
am d9a87eb8: Merge "Fix drawing debug points of gesture trails"
...
* commit 'd9a87eb857b766e37517c59dccc05cceaa38c77c':
Fix drawing debug points of gesture trails
2013-05-21 17:40:57 -07:00
Tadashi G. Takaoka
d9a87eb857
Merge "Fix drawing debug points of gesture trails"
2013-05-22 00:39:22 +00:00
Keisuke Kuroyanagi
ea6a59ff15
am 44f679bb: Merge "Fix running on device regression test and profile."
...
* commit '44f679bbd2de6068357b0717d3730350fbc8f59d':
Fix running on device regression test and profile.
2013-05-21 17:20:05 -07:00
Keisuke Kuroyanagi
44f679bbd2
Merge "Fix running on device regression test and profile."
2013-05-22 00:18:14 +00:00
Tadashi G. Takaoka
96efb1252a
Clean up unused return value
...
Change-Id: Ie59f08db947ca5314935c6b723cf498129b4515c
2013-05-21 16:42:07 -07:00
Tadashi G. Takaoka
9764397274
Fix drawing debug points of gesture trails
...
Bug: 7167303
Change-Id: I9a75b1b9b9127c5364da49b2a04b22c16a7ad535
2013-05-21 16:09:10 -07:00
Kurt Partridge
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
Tadashi G. Takaoka
418f8753c9
am 8a6a15e0: Merge "Clean up IntentCompatUtils a bit"
...
* commit '8a6a15e052f2df9e8d71bed21b1936ce37a6c8a2':
Clean up IntentCompatUtils a bit
2013-05-21 15:19:46 -07:00
Tadashi G. Takaoka
8a6a15e052
Merge "Clean up IntentCompatUtils a bit"
2013-05-21 22:17:24 +00:00
Tadashi G. Takaoka
db7d4da3e5
Clean up IntentCompatUtils a bit
...
Change-Id: I803aa6c2160bfa1ffe992b28e7eb6e8a320c9762
2013-05-21 15:13:23 -07:00
Kurt Partridge
e3a72c9b4f
am ff80ee20: Merge "Modify isAllowedToLog"
...
* commit 'ff80ee20b4b7bf703e89660a68f50975a5cec2a5':
Modify isAllowedToLog
2013-05-21 14:24:40 -07:00
Kurt Partridge
ff80ee20b4
Merge "Modify isAllowedToLog"
2013-05-21 21:22:23 +00:00
Kurt Partridge
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
The Android Open Source Project
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
The Android Open Source Project
ea88e2ffe8
am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '150da22528fcb9cd8c275428bd11e1e3f543f46f':
2013-05-21 09:02:34 -07:00
The Android Open Source Project
150da22528
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia5c29124c5251cfba762c1a19190fe3c02d8bf42
2013-05-21 08:59:25 -07:00
The Android Automerger
bbc5321c84
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-21 07:47:03 -07:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
ede3db51f0
Merge "Fix a crash on a secondary user" into jb-mr2-dev
2013-05-21 04:27:34 +00:00
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
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
Baligh Uddin
7f008a62d3
Merge "Import translations. DO NOT MERGE"
2013-05-21 04:18:40 +00:00
Baligh Uddin
27ee1f20aa
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-05-21 04:17:42 +00:00
Baligh Uddin
23bff513a9
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-05-21 04:17:27 +00:00
Jean Chalard
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
Jean Chalard
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