The Android Open Source Project
7f78bd5e25
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38
2013-05-17 12:54:52 -07:00
Kurt Partridge
de4e579c68
Merge "Fix punctuation logging"
2013-05-17 17:45:21 +00:00
Kurt Partridge
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
The Android Automerger
5fb6a99bd6
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-16 05:55:49 -07:00
The Android Open Source Project
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
The Android Open Source Project
b528e25113
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I823f0c7f5fd55d748e7651188eb7ff1edace6dfe
2013-05-16 05:44:12 -07:00
Kurt Partridge
17b63ba588
Merge "Remove unnecessary commit/uncommit"
2013-05-15 23:52:43 +00:00
Kurt Partridge
7af5300c7d
Merge "Add claifying comment"
2013-05-15 23:31:31 +00:00
Jean Chalard
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
The Android Automerger
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
Kurt Partridge
ba4e480c43
am 39afaf3d: am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit '39afaf3dc38bb929a87ea6ebed5c5f574e70fc23':
2013-05-15 13:06:50 -07:00
Tadashi G. Takaoka
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
Ken Wakasa
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
Ken Wakasa
d8e8b007ca
am 5ee11c5d: am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '5ee11c5d9a55871e04dc24a34499d16a0d8ae3bd':
2013-05-15 13:06:46 -07:00
Tadashi G. Takaoka
315e8fac82
am 8e7b1739: am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
...
* commit '8e7b173936778503b2d08b47e39457d934192e17':
2013-05-15 13:06:44 -07:00
Tadashi G. Takaoka
7ab91dfe3a
am 03f2ca6d: am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit '03f2ca6d50c78b2584dedb894534167a5a35343a':
2013-05-15 13:06:43 -07:00
Jean Chalard
a1912d14de
am 95586abc: am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit '95586abc11d07ceb363040921542c85c3378afa1':
2013-05-15 13:06:42 -07:00
Baligh Uddin
d64589b4e8
am 8587e879: (-s ours) am 5ec5e0b6: am e69066d1: (-s ours) Import translations. DO NOT MERGE
...
* commit '8587e879b76fb14d6dc3be491065560563c8bc03':
2013-05-15 13:06:40 -07:00
Baligh Uddin
29cfa87b31
am fd2c2e62: (-s ours) am 298d8232: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fd2c2e627089c6f4355aad477cb1cc90c52365b3':
Import translations. DO NOT MERGE
2013-05-15 13:06:39 -07:00
Jean Chalard
d40b4729a5
am b1e37e4a: am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'b1e37e4a478a577c59930767148e50f8f45af21f':
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
2013-05-15 12:59:27 -07:00
Tadashi G. Takaoka
ff0bd7dbfa
am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit '25f0c8089eecfcded7f41c66453bd874ba92219a':
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 12:59:26 -07:00
Tadashi G. Takaoka
d6a7a26d63
am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit 'd59c1f8324d568fa05a0ba660c602357b8f68958':
am 50259c70: Merge "Tune layout parameters of setup wizard"
2013-05-15 12:59:25 -07:00
Tadashi G. Takaoka
e7ef9669d6
am 7d9bd6f5: am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit '7d9bd6f54e5ebed4b4a1657c44e5731a2d182560':
am 66b87269: Update welcome fallback image (using xhdpi asset)
2013-05-15 12:59:23 -07:00
Tadashi G. Takaoka
883905f45b
am 7fe67544: am 769427cf: Adjust aspect ratio of setup image
...
* commit '7fe675440e5ecc3da872803dae60bec8bd66c9e5':
am 769427cf: Adjust aspect ratio of setup image
2013-05-15 12:59:22 -07:00
The Android Automerger
b6161b40bc
am 66c5f8cb: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit '66c5f8cbe8cea83dcedc952a07250d855e9f8c7e':
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 12:59:20 -07:00
Kurt Partridge
39afaf3dc3
am 6d0f0347: am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit '6d0f0347013fbd59d967b438c9f2754141d35f85':
Remove FeedbackLog instance variables.
2013-05-15 12:59:19 -07:00
Tadashi G. Takaoka
46bf9f493c
am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image"
...
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
Revise welcome screen video and still image
2013-05-15 12:59:17 -07:00
Ken Wakasa
acb37023b2
am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
...
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
Adjust sampling interval for gesture stroke drawing a bit.
2013-05-15 12:59:11 -07:00
Ken Wakasa
5ee11c5d9a
am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
...
* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
Revert "Fix isSuggestionsStripVisible when keyboard hidden"
2013-05-15 12:59:09 -07:00
Tadashi G. Takaoka
8e7b173936
am 3fff5179: am 41016aca: Back to previous keyboard layout by canceling sliding input
...
* commit '3fff5179d5020123c5bae7a1c83591afd45ace58':
Back to previous keyboard layout by canceling sliding input
2013-05-15 12:59:08 -07:00
Tadashi G. Takaoka
03f2ca6d50
am f46eafe2: am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit 'f46eafe2555a8d405ce7171bc4a2977a9aecf2b9':
Fix PointerTrackerQueue.releaseAllPointerOlderThan
2013-05-15 12:59:06 -07:00
Jean Chalard
95586abc11
am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
Fix isSuggestionsStripVisible when keyboard hidden
2013-05-15 12:59:05 -07:00
Baligh Uddin
8587e879b7
am 5ec5e0b6: am e69066d1: (-s ours) Import translations. DO NOT MERGE
...
* commit '5ec5e0b6f82987e8545629c38a7d595e02eb2887':
Import translations. DO NOT MERGE
2013-05-15 12:59:04 -07:00
Baligh Uddin
fd2c2e6270
am 298d8232: (-s ours) Import translations. DO NOT MERGE
...
* commit '298d823297820418d0602e41f0eee7a57e6a659b':
Import translations. DO NOT MERGE
2013-05-15 12:59:04 -07:00
Tadashi G. Takaoka
b76d17373c
am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
...
* commit '2d86b73ffe7755c311b7bf415b1c7d37495a9a4e':
2013-05-15 12:56:27 -07:00
Tadashi G. Takaoka
aeff9902a7
am 7e52c35d: am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
...
* commit '7e52c35dce0160842b1f746a1649563f23323b59':
2013-05-15 12:56:26 -07:00
Tadashi G. Takaoka
93a1540ab1
am f1973350: am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
...
* commit 'f197335027bac9225274a1677bd53698dac68fbc':
2013-05-15 12:56:25 -07:00
Tadashi G. Takaoka
4103044a91
am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
...
* commit 'c731457f8abb5342a34f27a3a5c65efc33bc3848':
2013-05-15 12:56:23 -07:00
Tadashi G. Takaoka
81fabdb808
am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression
...
* commit '73673b4c4133587e0d310041bb9155798dd6ec37':
2013-05-15 12:56:22 -07:00
Tadashi G. Takaoka
209a97bbf3
am 7a876b31: am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
...
* commit '7a876b3114dc977283248672c309359223ed678f':
2013-05-15 12:56:21 -07:00
Tadashi G. Takaoka
f05eeeccf2
am 94ad2ef7: am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
...
* commit '94ad2ef7627cce6f9fa0203164011c822ec59d86':
2013-05-15 12:56:19 -07:00
Tadashi G. Takaoka
cae4cd7b82
am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern
...
* commit '66e5e05fbfc1f8094048d8fe1020bf1117aebeab':
2013-05-15 12:56:18 -07:00
Tadashi G. Takaoka
4c6fe8ed66
am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
...
* commit 'aaf7d70be7b3f835c80a0d030c41dbdbe015cedb':
2013-05-15 12:56:16 -07:00
Ken Wakasa
645b62fbdb
am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
...
* commit '8738eeaf65aee217349aa4abfaea5451a9b5bc23':
2013-05-15 12:56:15 -07:00
Kurt Partridge
22fa812398
am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
...
* commit '7bc99237b3c8e04070b0de606c3c899bc5061ef5':
2013-05-15 12:56:13 -07:00
Kurt Partridge
7c2ca940cf
am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"
...
* commit '1e0f8cffaf06dbe045375eb173a8d84175dccb32':
2013-05-15 12:56:12 -07:00