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
Kurt Partridge
28b9aec422
am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
...
* commit 'eaf5c22782a3847a745e6f022f36ed6dd469c765':
2013-05-15 12:56:11 -07:00
Kurt Partridge
3ffe11a5ab
am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
...
* commit '4ee6df8d6e77bb7179238716fe1687b88f478028':
2013-05-15 12:56:09 -07:00
Tadashi G. Takaoka
aca3b6251b
am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
...
* commit '941e8bbaa97f8f3a09a072cf96120e5058949f19':
2013-05-15 12:56:08 -07:00
Tadashi G. Takaoka
4b18d513c8
am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
...
* commit 'e90fe9c3a42e440da477932704bf4cc42c94f722':
2013-05-15 12:56:07 -07:00
Tadashi G. Takaoka
82e697bfb2
am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
...
* commit '05aa5e75f36cc897e8ab94d8673929c83c8b9d82':
2013-05-15 12:56:05 -07:00
Tadashi G. Takaoka
1784791ce8
am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
...
* commit '82e3ea9505fdbb81a9954563f834b2a3cf9e0dda':
2013-05-15 12:56:04 -07:00
Jean Chalard
b2e4031e85
am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
...
* commit '28eab9d57c9e3fcf2ea3f713a31118540a9fb2fc':
2013-05-15 12:56:02 -07:00
Satoshi Kataoka
94734c93aa
am 1884044e: am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
...
* commit '1884044eb7645bb427eb056e43736179a3f62b09':
2013-05-15 12:56:01 -07:00
Tadashi G. Takaoka
aab8a18b45
am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
...
* commit '1cb72a09391c2115e9d2c5f563a9641d7f0cfc11':
2013-05-15 12:56:00 -07:00
Baligh Uddin
e31e4a9c97
am ad12dfa6: (-s ours) am dfc0adfe: am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE
...
* commit 'ad12dfa6ccc88f5ac6aaed43562bf31d7d6f8086':
2013-05-15 12:55:58 -07:00
Baligh Uddin
9e58ced4e8
am 86bd88fa: (-s ours) am 0e2f68c9: am 42dc0c25: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '86bd88fadd9b1127fb6d365065922ea8a16d7f55':
2013-05-15 12:55:57 -07:00
Baligh Uddin
c78d98e9b4
am 896767cf: (-s ours) am a45821e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '896767cfd2e6b3aa7e25fc3d3ec817db37e43beb':
Import translations. DO NOT MERGE
2013-05-15 12:55:55 -07:00
Tadashi G. Takaoka
2d86b73ffe
am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds
...
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
Tune maximum keypress duration to 100 milliseconds
2013-05-15 12:53:14 -07:00
Tadashi G. Takaoka
7e52c35dce
am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"
...
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
Fix keypress vibration duration of HTC One X
2013-05-15 12:53:13 -07:00
Tadashi G. Takaoka
f197335027
am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"
...
* commit 'a70da988d78ffd20941dfaa34f7a6324e465808e':
Disable functional key while in sliding input mode
2013-05-15 12:53:11 -07:00
Tadashi G. Takaoka
c731457f8a
am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database
...
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
Add device specific keypress vibration duration database
2013-05-15 12:53:10 -07:00
Tadashi G. Takaoka
73673b4c41
am f1708394: am 0efd8d1b: Fix landscape override value expression
...
* commit 'f17083941daefe146358dc39a3e8d0ca660c530d':
Fix landscape override value expression
2013-05-15 12:53:09 -07:00
Tadashi G. Takaoka
7a876b3114
am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"
...
* commit '813ba9f5262c59ba99efdcf838036ae3b7e2dd0c':
Disable long press timer while sliding input mode
2013-05-15 12:53:07 -07:00
Tadashi G. Takaoka
94ad2ef762
am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode
...
* commit '094447bd4652f9ed038f0489ef4e4f5af1679143':
Disable delete key repeating while in slide input mode
2013-05-15 12:53:06 -07:00
Tadashi G. Takaoka
66e5e05fbf
am 6780e43d: am 18184eac: Support regular expression for condition pattern
...
* commit '6780e43d761b0cbe0ce54cfc017ac779509e1c61':
Support regular expression for condition pattern
2013-05-15 12:53:04 -07:00
Tadashi G. Takaoka
aaf7d70be7
am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"
...
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
Support multiple condition for getDeviceOverrideValue
2013-05-15 12:53:03 -07:00
Ken Wakasa
8738eeaf65
am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java
...
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
Rename GesturePreviewTrail.java -> GestureTrail.java
2013-05-15 12:53:02 -07:00
Kurt Partridge
7bc99237b3
am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error
...
* commit '03a32146458f3cd192fde2ff0e85e3a0271a7d2a':
Avoid JsonWriter multi-write error
2013-05-15 12:53:00 -07:00
Kurt Partridge
1e0f8cffaf
am 697f6abb: am 260df841: Merge "Remove unused code"
...
* commit '697f6abb5d6478e0e0493ee7f821522fa4411f18':
Remove unused code
2013-05-15 12:52:59 -07:00
Kurt Partridge
eaf5c22782
am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."
...
* commit '026b2645c8561b554aa4f127bc90f4805354dc7d':
Remove ref to LatinImeLogger preference.
2013-05-15 12:52:57 -07:00
Kurt Partridge
4ee6df8d6e
am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"
...
* commit '1f8b354c9e30963f48ddf6c08b9333bcdc0e0a6f':
Avoid NPE by fixing ResearchLogger initialization
2013-05-15 12:52:56 -07:00
Tadashi G. Takaoka
941e8bbaa9
am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
...
* commit 'a01ab9ea3580d95e87f3357b2612fb84971b3bfd':
Refactor StringUtils.findPrefixedString to findValueOfKey
2013-05-15 12:52:55 -07:00
Tadashi G. Takaoka
e90fe9c3a4
am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity
...
* commit 'afc40e74fe01f138155bec26733a413c1b83e0c7':
Fix screen flash when launching settings activity
2013-05-15 12:52:54 -07:00