Kurt Partridge
663660295b
am a6092dc8
: am 504bbe38
: am 798820ab
: am 3012c891
: am 867b2380
: am 35e02ccd
: am bf62dc03
: am ef103e1f
: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit 'a6092dc8a55d2453a7746c296e3f21d4667b5e94':
2013-04-17 19:39:12 -07:00
The Android Open Source Project
cf0c1a7d6e
am 19289df5
: am e279de02
: (-s ours) am ab6fa041
: am e72a088f
: am a6dcb55e
: (-s ours) am 62adeccd
: am 577f08a3
: am 22384b57
: (-s ours) am 0ed901ff
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '19289df5e40acb355d52c47d6c27fd8e40407058':
2013-04-17 19:39:10 -07:00
The Android Open Source Project
faa9a5ecc7
am d9f9ba39
: am 4b176a01
: (-s ours) am 83346295
: am 2c7b1b82
: am d2582473
: (-s ours) am 22953740
: Reconcile with jb-mr2-release - do not merge
...
* commit 'd9f9ba395fe679d1f89e92ca2a28aa983117d4ea':
2013-04-17 19:39:09 -07:00
Baligh Uddin
bc5075e0da
am 536ec3bf
: am b4fbb295
: (-s ours) am d3ae58ef
: am 3bc22c56
: am e7d91194
: (-s ours) am 370070ae
: am 4cdb7ccb
: Import translations. DO NOT MERGE
...
* commit '536ec3bf58d8f30a5c2952b280536079f4311f1d':
2013-04-17 19:39:07 -07:00
Baligh Uddin
4d5ebdf53f
am f420e3bf
: am 792abb73
: (-s ours) am 3c163ec1
: am ac68b5ce
: am 4b8494c4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f420e3bf9a381c48412e7de2f6a99024a54d9d8b':
2013-04-17 19:39:06 -07:00
Baligh Uddin
ea0d7ecd97
am 82c49d74
: am c1f3a801
: (-s ours) am 8acb56b6
: am 128ab7e5
: Import translations. DO NOT MERGE
...
* commit '82c49d746d154551492ffec046442fc1021b5a49':
2013-04-17 19:39:04 -07:00
Satoshi Kataoka
b2230d9073
am 62f52e4f
: am a514e958
: am a2b129e9
: am 0b0d9827
: am 95fe8267
: Move suggest logic to AOSP
...
* commit '62f52e4fcee553b81a8b4e51162beb4fe527049a':
2013-04-17 19:39:03 -07:00
Jean-Baptiste Queru
67953e4da4
am 626dd2a0
: am 784eda74
: (-s ours) am d9f35e32
: am a21bec13
: am 30667266
: (-s ours) am 5bcb3876
: Merge 2caa1d81ce
- do not merge
...
* commit '626dd2a0ab4fff44a8e313101a908e4752aaf8d3':
2013-04-17 19:39:02 -07:00
Kurt Partridge
9cf3937281
am 94c441a4
: am cdaee868
: Merge "Preserve a class for testing"
...
* commit '94c441a424875f815d7e84d02da5c8943ad6f7a6':
Preserve a class for testing
2013-04-17 19:39:00 -07:00
Tom Ouyang
e9de986d41
am f08c75f2
: am fd9f3d97
: Add ability to handle digraphs in gesture and tap typing
...
* commit 'f08c75f20cb9766141edf7e9b2715510f6da1fdc':
Add ability to handle digraphs in gesture and tap typing
2013-04-17 19:38:59 -07:00
Tom Ouyang
0ca76c94f5
am 38a9e5a5
: am b6e1777d
: Merge "Add mechanism to handle digraphs in DicNode"
...
* commit '38a9e5a5bf1a45e87db9a4b03f670cf402321d45':
Add mechanism to handle digraphs in DicNode
2013-04-17 19:38:58 -07:00
Kurt Partridge
6267ec688e
am 3e1f652c
: am 099dd3f2
: Merge "Better release build reporting"
...
* commit '3e1f652c2c39351d306b3a930340948a46104de0':
Better release build reporting
2013-04-17 19:38:57 -07:00
Baligh Uddin
60ffda411f
am 5bbf4f30
: am cc42e139
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5bbf4f302a131c58010101722719d97c11c350bc':
Import translations. DO NOT MERGE
2013-04-17 19:38:55 -07:00
Baligh Uddin
855b805312
am d86e14ae
: Import translations. DO NOT MERGE
...
* commit 'd86e14aeba44d75651c75d56783f66c294b8f2b7':
Import translations. DO NOT MERGE
2013-04-17 19:38:52 -07:00
Jean Chalard
7503ef330c
am cd51b80a
: am fb3e8057
: Merge "Fix a bug where a space would not be inserted before a gesture"
...
* commit 'cd51b80a0b31493ef9dce9b5283264399b305ba0':
Fix a bug where a space would not be inserted before a gesture
2013-04-17 19:38:51 -07:00
Tadashi G. Takaoka
c627f64274
am 9a6ff5dc
: am c7d41589
: Merge "Use private object as a lock instead of synchronized method"
...
* commit '9a6ff5dcef1a593260032b5e10eb801de297c0b2':
Use private object as a lock instead of synchronized method
2013-04-17 19:38:49 -07:00
Tadashi G. Takaoka
4516304436
am 1502d977
: am 12e77de2
: Merge "Use private lock object instead of synchronized method"
...
* commit '1502d9779555958b0ca147fda1cab1e6302c9035':
Use private lock object instead of synchronized method
2013-04-17 19:38:48 -07:00
Tadashi G. Takaoka
8ea774ebf2
am 14950497
: am 1e256f58
: Merge "Protect simultaneously modifying gesture preview data"
...
* commit '14950497280f15b6d1de9e6c5d159ce46e27180b':
Protect simultaneously modifying gesture preview data
2013-04-17 19:38:46 -07:00
Jean Chalard
818b7d4686
am 80d7ed0b
: am 4f430763
: Fix a faulty test
...
* commit '80d7ed0bb8910fc85e5b5e68f287dc381511293f':
Fix a faulty test
2013-04-17 19:38:45 -07:00
Jean Chalard
99e91fc8ec
am 2dd2e2d7
: am 99b93d17
: Fix a bug where autocorrection status would be wrong.
...
* commit '2dd2e2d7dff8c4446d536bd23fc94a5538c24ddf':
Fix a bug where autocorrection status would be wrong.
2013-04-17 19:38:43 -07:00
Tadashi G. Takaoka
9a0f6ef847
am c35bca68
: am 262d5bd9
: Don\'t override EXTRA_SHOW_FRAGMENT if exists
...
* commit 'c35bca685689ff6430e7a9393af64c74112bf677':
Don't override EXTRA_SHOW_FRAGMENT if exists
2013-04-17 19:38:41 -07:00
Tadashi G. Takaoka
f0a4508ad5
am f5aa2fd5
: am 10af4b6e
: Merge "Separate StringUtils.capitalizeFirstCharacter"
...
* commit 'f5aa2fd5c868cae6e879858738a5eef4445aaca8':
Separate StringUtils.capitalizeFirstCharacter
2013-04-17 19:38:40 -07:00
Keisuke Kuroynagi
5c7c36e31f
am e81c1678
: am 87fdde6e
: Typing double letters via a \'circle\' on the key.
...
* commit 'e81c16788712590fd6cf9e14420d50acf029ad48':
Typing double letters via a 'circle' on the key.
2013-04-17 19:38:38 -07:00
Tadashi G. Takaoka
6f6edd76f8
am ae8a941e
: am f606fd85
: Hide Setup Wizard icon for stock keyboard
...
* commit 'ae8a941e12e927e6f5b2e42bd48999397fd5fe2a':
Hide Setup Wizard icon for stock keyboard
2013-04-17 19:38:37 -07:00
Tadashi G. Takaoka
0d9164ecd8
am 0d7499bc
: am 4fdfce6d
: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo"
...
* commit '0d7499bccfb37bad2364202657a4feebab137aeb':
Refactor SpellCheckerProximityInfo as extending ProximityInfo
2013-04-17 19:38:35 -07:00
Tom Ouyang
6a0f11cc91
am ff981cc3
: am 43779c04
: Merge "Add method to get dictionary flags from DicTraverseSession"
...
* commit 'ff981cc3e3169ca0b9af9bf40cd55cd9f95fa63e':
Add method to get dictionary flags from DicTraverseSession
2013-04-17 19:38:34 -07:00
Baligh Uddin
1646267fdf
am 8e7ca6be
: am 224e969e
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '8e7ca6be7ee0b4bbad536b8434b4e5826b8c9ecf':
Import translations. DO NOT MERGE
2013-04-17 19:38:32 -07:00
Baligh Uddin
2eede9f46d
am 13811400
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '138114008e591af2ffa1169b7d64ff46b0781500':
Import translations. DO NOT MERGE
2013-04-17 19:38:32 -07:00
Kurt Partridge
436008fe8a
am d3497938
: am ab8f166e
: am 09ab6495
: Merge "[FileEncap18] Clean up uploading scheduling"
...
* commit 'd34979381d0adf09d7521668c61b64d3010bd426':
2013-04-17 19:36:59 -07:00
Kurt Partridge
d34979381d
am ab8f166e
: am 09ab6495
: Merge "[FileEncap18] Clean up uploading scheduling"
...
* commit 'ab8f166e6793e214dcb92454b10dbe5cc74daf9b':
[FileEncap18] Clean up uploading scheduling
2013-04-17 19:33:02 -07:00
Kurt Partridge
40070707d8
am 7a172175
: Merge "Fix user recording dialog"
...
* commit '7a1721753bad0578c7bbc1617f5528b4bc4d953e':
Fix user recording dialog
2013-04-17 19:10:11 -07:00
Kurt Partridge
7a1721753b
Merge "Fix user recording dialog"
2013-04-18 02:07:16 +00:00
Kurt Partridge
72ca59bc2a
am 0833b3cb
: Merge "Fix alarm bug"
...
* commit '0833b3cbae69c07dac3623b8a44743761f4b6e8c':
Fix alarm bug
2013-04-17 18:04:44 -07:00
Kurt Partridge
0833b3cbae
Merge "Fix alarm bug"
2013-04-18 01:01:48 +00:00
Kurt Partridge
1019c630fa
am a1913301
: Merge "Avoid duplicate MotionEvents"
...
* commit 'a19133011a1cbeb7a811a59d341c0fe65ba96001':
Avoid duplicate MotionEvents
2013-04-17 16:00:24 -07:00
Kurt Partridge
a19133011a
Merge "Avoid duplicate MotionEvents"
2013-04-17 22:57:20 +00:00
Kurt Partridge
a2a2905033
am b903f103
: Merge "Label logUnits after LatinImeOnEndBatchInput"
...
* commit 'b903f10393399921478114a7cf5e36ce6c692746':
Label logUnits after LatinImeOnEndBatchInput
2013-04-17 14:33:14 -07:00
Kurt Partridge
b903f10393
Merge "Label logUnits after LatinImeOnEndBatchInput"
2013-04-17 21:30:47 +00:00
Kurt Partridge
f5864fbb7a
am a5bfac5b
: Merge "Fix NPE"
...
* commit 'a5bfac5becddda70c76a151d838666b33374c0ef':
Fix NPE
2013-04-17 13:36:09 -07:00
Kurt Partridge
a5bfac5bec
Merge "Fix NPE"
2013-04-17 20:33:26 +00:00
Kurt Partridge
f9c137aa60
am 7da87f97
: Merge "Clean up unnecessary log messages"
...
* commit '7da87f97b07bf2c84e033fb53106f9c50b6200ec':
Clean up unnecessary log messages
2013-04-17 13:21:37 -07:00
Kurt Partridge
7da87f97b0
Merge "Clean up unnecessary log messages"
2013-04-17 20:18:19 +00:00
Kurt Partridge
a9c2ff1b23
am e9e4fe52
: Merge "Fix logic error"
...
* commit 'e9e4fe522720d8b501b7c8a4a070d7eba34b6059':
Fix logic error
2013-04-17 12:00:39 -07:00
Kurt Partridge
e9e4fe5227
Merge "Fix logic error"
2013-04-17 18:57:18 +00:00
Kurt Partridge
b20c7ee750
am 1f99e04b
: Merge "Fix JsonWriter bug"
...
* commit '1f99e04bba22c7c842a7e6d5581286142559ceb6':
Fix JsonWriter bug
2013-04-17 11:22:21 -07:00
Kurt Partridge
1f99e04bba
Merge "Fix JsonWriter bug"
2013-04-17 18:20:34 +00:00
Kurt Partridge
6c80e0475c
am dac3ee49
: Merge "Small dot in corner was not visible"
...
* commit 'dac3ee49ae32bb3c6641876cf5329909008fd2ea':
Small dot in corner was not visible
2013-04-17 10:22:02 -07:00
Kurt Partridge
dac3ee49ae
Merge "Small dot in corner was not visible"
2013-04-17 17:18:35 +00:00
Kurt Partridge
fdc90d4a58
Fix user recording dialog
...
Clicking the "include recording" checkbox in the user feedback dialog did nothing.
The code was relying on the state of the checkbox, rather than keeping its own state.
Fixing this addresses the bug.
Change-Id: I559d57a4e11f869f6e6f5e5de7878f765531a203
2013-04-17 08:42:20 -07:00
Kurt Partridge
9d3bbc82a0
Fix alarm bug
...
The AlarmManager takes absolute times as an argument, not durations.
Change-Id: I419434ba5908c5f4070608070bbecf753088ecc8
2013-04-17 08:39:49 -07:00