The Android Automerger
89b4a66939
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-18 07:00:10 -07:00
Tadashi G. Takaoka
5faf419519
Suggestion strip will honor haptic feedback settings of keyboard
...
Bug: 7313372
Change-Id: I427da8de68be3d2a78e810556340b96ab4edcc2d
2012-10-17 21:40:02 -07:00
Tadashi G. Takaoka
8e360c68f1
Move AudioAndHapticFeedbackManager from LatinIME to KeyboardSwitcher
...
Bug: 7313372
Change-Id: I9bd3275f57ed3f5c2c4a95768443af505513ee97
2012-10-17 19:39:16 -07:00
Jean Chalard
b0f6b70d44
am bb0bc326: am 5b095509: am 65225d82: Merge "Update AOSP dictionaries." into jb-mr1-dev
...
* commit 'bb0bc3260eccf6952e71655e4d933e7ca84e9a53':
Update AOSP dictionaries.
2012-10-17 19:08:41 -07:00
Jean Chalard
bb0bc3260e
am 5b095509: am 65225d82: Merge "Update AOSP dictionaries." into jb-mr1-dev
...
* commit '5b095509c989166ee5d8cbf9ebed674fc730abe5':
Update AOSP dictionaries.
2012-10-17 19:06:22 -07:00
Jean Chalard
5b095509c9
am 65225d82: Merge "Update AOSP dictionaries." into jb-mr1-dev
...
* commit '65225d8211ee4f551c0996cf58552c721e45c39c':
Update AOSP dictionaries.
2012-10-17 19:04:28 -07:00
Jean Chalard
65225d8211
Merge "Update AOSP dictionaries." into jb-mr1-dev
2012-10-17 19:03:01 -07:00
Tadashi G. Takaoka
aeae68479d
Merge "Shortcut key is enabled on the no language keyoard"
2012-10-17 17:39:50 -07:00
Jean Chalard
5f9e008d60
am 005f3768: am 25b4a14e: am d03e065b: Don\'t consider non-words for split word suggestion
...
* commit '005f3768400ce1d7bb29ef69151183084aceeb2c':
Don't consider non-words for split word suggestion
2012-10-17 17:06:11 -07:00
Jean Chalard
005f376840
am 25b4a14e: am d03e065b: Don\'t consider non-words for split word suggestion
...
* commit '25b4a14e5f44d8921aa834755f4550960846de0c':
Don't consider non-words for split word suggestion
2012-10-17 17:04:41 -07:00
Jean Chalard
25b4a14e5f
am d03e065b: Don\'t consider non-words for split word suggestion
...
* commit 'd03e065b861bd1cdb90bc70f18b7d7a3815b7a4d':
Don't consider non-words for split word suggestion
2012-10-17 17:02:16 -07:00
Tadashi G. Takaoka
723d32ad6e
Shortcut key is enabled on the no language keyoard
...
Bug: 6617754
Change-Id: Id8336f152456367320de3151823691eebc2e02f6
2012-10-17 16:27:43 -07:00
Jean Chalard
d03e065b86
Don't consider non-words for split word suggestion
...
Bug: 7368683
Change-Id: Iecd8348be788e5a749dafabdf7eddc4a14d901e0
2012-10-18 07:28:18 +09:00
Jean Chalard
3d83a1648b
Update AOSP dictionaries.
...
Differences :
oh 90 -> 105
ooh 54 -> 54
hoy,kinkier,kinkiest,kinkiness,kinkily,kinky -> 0
trst -> remove
New whitelist entries (actually old that had not been applied)
"berm" -> "been"
"foe" -> "for"
"hid" -> "his"
"thong" -> "thing"
French :
Add "six" and remove some non-words
Bug: 7329149
Bug: 7356297
Change-Id: I55092f0538db8627148b0a314e50eff926c47275
2012-10-18 00:39:16 +09:00
The Android Automerger
2dd555077e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 07:00:06 -07:00
Baligh Uddin
3e37b22fa7
am ee4b3e64: (-s ours) am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ee4b3e64ee95bd17c81cdd87a0de60ebbbf1ebe9':
Import translations. DO NOT MERGE
2012-10-16 22:34:35 -07:00
Baligh Uddin
ee4b3e64ee
am e5fd5ea5: am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e5fd5ea596c769f496be54960e26ef0da220f83e':
Import translations. DO NOT MERGE
2012-10-16 22:32:27 -07:00
Baligh Uddin
c1b5108bde
am 72339a62: (-s ours) am c561cc2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '72339a62e13c0d51fbc67e59d28b1e7cff5142d9':
Import translations. DO NOT MERGE
2012-10-16 22:32:06 -07:00
Baligh Uddin
e5fd5ea596
am dbba676c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'dbba676c00cd5479e292a91c5672d920b9137759':
Import translations. DO NOT MERGE
2012-10-16 22:30:16 -07:00
Baligh Uddin
72339a62e1
am c561cc2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit 'c561cc2b641cecdc8f5c29a7a3ac17bae6282747':
Import translations. DO NOT MERGE
2012-10-16 22:29:58 -07:00
Baligh Uddin
52992085f5
Merge "Import translations. DO NOT MERGE"
2012-10-16 22:28:24 -07:00
Baligh Uddin
dbba676c00
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 22:27:36 -07:00
Baligh Uddin
c561cc2b64
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 22:27:14 -07:00
Jean Chalard
c5dc32ac59
am b37e87e7: am 63b3fc0d: am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit 'b37e87e7d50725f20a6b2f8484fc25cc7db3134f':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:12:50 -07:00
Jean Chalard
b37e87e7d5
am 63b3fc0d: am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit '63b3fc0d23696ec33b3cbe817bdd77f5d1a0aa03':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:11:02 -07:00
Jean Chalard
63b3fc0d23
am 15142588: Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
...
* commit '15142588244a10b241f5d3691f80b6540f3f3fc3':
Have "no whitespace before cursor" upon gesture trigger phantom space
2012-10-16 18:08:11 -07:00
Jean Chalard
1514258824
Merge "Have "no whitespace before cursor" upon gesture trigger phantom space" into jb-mr1-dev
2012-10-16 18:06:11 -07:00
Jean Chalard
e91d495c53
Have "no whitespace before cursor" upon gesture trigger phantom space
...
Bug: 7359291
Bug: 7357758
Bug: 7197651
Change-Id: Ia805a87e922739ae0a06978a3bf00d91c94b6c51
2012-10-17 09:36:07 +09:00
Tadashi G. Takaoka
788c885aa5
am 344a7fef: am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit '344a7fef5bd101e2d1c4278cc35de2862f28a456':
Fix more suggestions text width calculation
2012-10-16 17:32:00 -07:00
Tadashi G. Takaoka
477088c612
am 6b169dc9: am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '6b169dc91d7533d36bc1f5864bcaf05450af3beb':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:31:56 -07:00
Tadashi G. Takaoka
344a7fef5b
am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit '658e935ba1d7763854b2df87d90f7d374a81c7a1':
Fix more suggestions text width calculation
2012-10-16 17:29:39 -07:00
Tadashi G. Takaoka
6b169dc91d
am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '718a07441ee27c0ba66d3d7aa9d1299c39e7f8b1':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:29:37 -07:00
Jean Chalard
fa3d984d1b
am 60211f0d: am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '60211f0d250ca931788d32d5a69c880f75ef7d49':
Honor automatic shift turned off for gestures
2012-10-16 17:28:18 -07:00
Tadashi G. Takaoka
658e935ba1
am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
...
* commit 'c0bc3369555435c677804b652b5fb36faf3602e5':
Fix more suggestions text width calculation
2012-10-16 17:26:59 -07:00
Tadashi G. Takaoka
718a07441e
am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
...
* commit '0cbc19b0b1d2540cd4bebf20ce4fb62c014e9cac':
Restrict bogus move event detector to a horizontal movement
2012-10-16 17:26:58 -07:00
Jean Chalard
60211f0d25
am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '2631fe4c4ea2135ae439381bd62d7c94b99b0e45':
Honor automatic shift turned off for gestures
2012-10-16 17:25:58 -07:00
Tadashi G. Takaoka
c0bc336955
Merge "Fix more suggestions text width calculation" into jb-mr1-dev
2012-10-16 17:24:35 -07:00
Tadashi G. Takaoka
0cbc19b0b1
Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
2012-10-16 17:24:23 -07:00
Jean Chalard
2631fe4c4e
am 6686e63f: Honor automatic shift turned off for gestures
...
* commit '6686e63f2158eff07e39ff002ba211d0578f2a4f':
Honor automatic shift turned off for gestures
2012-10-16 17:23:29 -07:00
Baligh Uddin
ed48f8e4bc
Import translations. DO NOT MERGE
...
Change-Id: I69bfbfe56c58ccc2d1c0422c9d8e93d68c6202b5
Auto-generated-cl: translation import
2012-10-16 15:59:26 -07:00
Baligh Uddin
97903bf95e
Import translations. DO NOT MERGE
...
Change-Id: I16dccd4bf5897d4b62a4642fbb3d24bd379deb4e
Auto-generated-cl: translation import
2012-10-16 15:55:23 -07:00
Baligh Uddin
6501204007
Import translations. DO NOT MERGE
...
Change-Id: Ibab3b46b8d19b4d8d2dc69f08be84dcc7431ddf1
Auto-generated-cl: translation import
2012-10-16 15:54:10 -07:00
Tadashi G. Takaoka
d631778e1c
Restrict bogus move event detector to a horizontal movement
...
The bogus move detection threshold is in proportional to a diagonal
length of a key. It was in proportional to a key width.
Bug: 7346614
Change-Id: I796add8aea16dd05e9844d6c4fba8072eece39c6
2012-10-16 14:53:54 -07:00
Tadashi G. Takaoka
bdc8b9e42b
Fix more suggestions text width calculation
...
Bug: 7345983
Change-Id: Ic1554db98e7aaf032eb90a98c0c37c7c789461b5
2012-10-16 14:24:30 -07:00
Jean Chalard
6686e63f21
Honor automatic shift turned off for gestures
...
Bug: 7354129
Change-Id: Ia02336e8cea2f04b629edbe74b7815cce0d7fad6
2012-10-17 05:41:06 +09:00
The Android Automerger
8fa3c6de9e
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:31:33 -07:00
The Android Open Source Project
3bfe1ce3d0
am fd04a7ab: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'fd04a7abe7722be94c84e24dc71a2b695e3ddafc':
2012-10-15 07:43:15 -07:00
The Android Open Source Project
fd04a7abe7
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ib3966b6c9ec856c39096899083cb41fa25434047
2012-10-15 07:40:37 -07:00
The Android Automerger
1e0255d145
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-15 06:59:54 -07:00
Jason Chen
5cbb130618
am abd8170e: am f2eeb4ae: am c1bcb8ee: Let\'s enhance
...
* commit 'abd8170efd40804504eb9022a9e685bb01ffdc59':
Let's enhance
2012-10-14 23:13:19 -07:00