The Android Automerger
4e4b8a9705
merge in ics-release history after reset to master
2012-01-17 07:01:35 -08:00
Tadashi G. Takaoka
3510c36049
am 5731b939: Remove KeyboardSwicther.toggleCapslock
...
* commit '5731b939c7baa2ca64a59b35f48fb3c2a43ba739':
Remove KeyboardSwicther.toggleCapslock
2012-01-17 02:31:45 -08:00
Tadashi G. Takaoka
5731b939c7
Remove KeyboardSwicther.toggleCapslock
...
Change-Id: Id613c06e2df770659095d78d42637aed063d0c70
2012-01-17 19:26:24 +09:00
Tadashi G. Takaoka
908cd7215a
am 2a884404: Rename KeyboardActionListener methods
...
* commit '2a88440419f49d100c73e067a823390f64aba3b1':
Rename KeyboardActionListener methods
2012-01-17 02:14:29 -08:00
Tadashi G. Takaoka
2a88440419
Rename KeyboardActionListener methods
...
* Rename KeyboardActionListener.onPress to onPressKey
* Rename KeyboardActionListener.onRelease to onReleaseKey
* Merge KeyboardSwicther.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardSwitcher.onReleaseShift and onReleaseSymbol to onReleaseKey.
* Merge KeyboardState.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardState.onReleaseShift and onReleaseSymbol to onReleaseKey.
Change-Id: Icf28fd18e238c5e534c292893e4ab5b6b98e72f8
2012-01-17 19:07:20 +09:00
Tadashi G. Takaoka
41701fc1f5
am c9fade6b: Merge "Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher"
...
* commit 'c9fade6b87b77251f90ef7d7c03bf70c3b97d889':
Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher
2012-01-17 00:09:23 -08:00
Tadashi G. Takaoka
c9fade6b87
Merge "Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher"
2012-01-17 00:07:38 -08:00
Tadashi G. Takaoka
87e025da11
Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher
...
Change-Id: I9bb8f78b0a766cd7937d5cbe1c1e5e35898b2997
2012-01-17 16:49:33 +09:00
Jean Chalard
0310c3f13d
am d104a7aa: Merge "Fix a bug where words disappear on inserting separators"
...
* commit 'd104a7aac8b0791341c71deb013d4e6adfc57e8a':
Fix a bug where words disappear on inserting separators
2012-01-16 23:23:46 -08:00
Jean Chalard
d104a7aac8
Merge "Fix a bug where words disappear on inserting separators"
2012-01-16 23:22:03 -08:00
Jean Chalard
edc6395d9b
Fix a bug where words disappear on inserting separators
...
The basic idea is that in some situations, we would restart
suggestions, but before evaluating them we would bail out
because suggestions were not requested. This would lead to
the "correction" set to null, so we would commit a null word.
This fix does two things:
- Do not restart suggestions when not requested.
- If we still end up with a composing word when suggestions
are not requested, we select the typed word as the
correct version.
Bug: 5846646
Change-Id: Ic35351841d0cb20afa99092ef681ecb7bd68bec6
2012-01-17 16:16:52 +09:00
satok
2af901c64c
am ff020671: Merge "Prepair for advanced two words error correction"
...
* commit 'ff020671a9790a095c135b9dbe5d22d011d3e2db':
Prepair for advanced two words error correction
2012-01-16 23:08:23 -08:00
satok
ff020671a9
Merge "Prepair for advanced two words error correction"
2012-01-16 23:07:13 -08:00
satok
29dc80614b
Prepair for advanced two words error correction
...
Change-Id: I4c8a21f0f6e349ddafd9b402583321a60855cfe8
2012-01-17 16:00:55 +09:00
Jean Chalard
a8843c7465
am aed5819a: Merge "Fix a bug where suggestion would restart at a bad time"
...
* commit 'aed5819a84d0d0500de9e6d8dc6c7fad6f0c4edf':
Fix a bug where suggestion would restart at a bad time
2012-01-16 22:53:17 -08:00
Jean Chalard
aed5819a84
Merge "Fix a bug where suggestion would restart at a bad time"
2012-01-16 22:51:23 -08:00
Jean Chalard
fbd1ac8083
Fix a bug where suggestion would restart at a bad time
...
Bug: 5846646
Change-Id: I7c907d0a9478e0878b92ead94173caefc21b627b
2012-01-17 15:50:18 +09:00
Tadashi G. Takaoka
76916e94b5
am ddf41668: Merge "Support EditorInfo.IME_FLAG_FORCE_ASCII"
...
* commit 'ddf4166815b9e72fc7fe8091d664f9b12a9cbcad':
Support EditorInfo.IME_FLAG_FORCE_ASCII
2012-01-16 22:17:46 -08:00
Tadashi G. Takaoka
ddf4166815
Merge "Support EditorInfo.IME_FLAG_FORCE_ASCII"
2012-01-16 22:15:55 -08:00
Tadashi G. Takaoka
1ef6fc7e15
Support EditorInfo.IME_FLAG_FORCE_ASCII
...
Bug: 5850605
Change-Id: I6665b483f775094903f2e26f5584e4b141592ab5
2012-01-17 14:38:00 +09:00
satok
00738a4360
am f611f24b: Merge "Use edit distance for transposing correction"
...
* commit 'f611f24b32149fc928c0f31934d563ea7a053274':
Use edit distance for transposing correction
2012-01-16 21:17:17 -08:00
satok
f611f24b32
Merge "Use edit distance for transposing correction"
2012-01-16 21:15:12 -08:00
Tadashi G. Takaoka
c0bfe54d82
am edf107e2: Merge "Add "force non-distinct multitouch" debug option"
...
* commit 'edf107e2a610c53f419995e8268bf6a333bfdd46':
Add "force non-distinct multitouch" debug option
2012-01-16 20:24:06 -08:00
Tadashi G. Takaoka
e3f90db6a4
am 2764e1df: Merge "Remove duplicate logic from KeyboardSwitcher and KeyboardState"
...
* commit '2764e1dffe17510fd10f54eaadf3f2fb3551cc7e':
Remove duplicate logic from KeyboardSwitcher and KeyboardState
2012-01-16 20:24:05 -08:00
Tadashi G. Takaoka
edf107e2a6
Merge "Add "force non-distinct multitouch" debug option"
2012-01-16 20:22:36 -08:00
Tadashi G. Takaoka
2764e1dffe
Merge "Remove duplicate logic from KeyboardSwitcher and KeyboardState"
2012-01-16 20:22:34 -08:00
Tadashi G. Takaoka
06b7c256b1
Add "force non-distinct multitouch" debug option
...
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
2012-01-17 13:19:01 +09:00
satok
a161a4afd6
Use edit distance for transposing correction
...
+1 73
-1 4
+2 0
-2 0
+3 0
-3 0
+4 11
-4 19
+5 9
-5 3
+6 2
-6 63
+7 2
-7 8
Change-Id: I269cd2386f451f8932e4e0ae66223e794fdfa862
2012-01-17 13:14:35 +09:00
Jean Chalard
25a42b99a5
am a8ba49c2: Small cleanup
...
* commit 'a8ba49c2534220105ce302a50b3a9ddaf831ef20':
Small cleanup
2012-01-16 19:08:27 -08:00
Jean Chalard
a8ba49c253
Small cleanup
...
The method deleteWordAtCursor would call finishComposingText,
which is a very unexpected state change and would probably cause
surprising bugs to any parent that would call it.
As it happens, it's not used anywhere any more so let's just
remove it.
Change-Id: Iaa9200866e40b4e914f76baa987279948300679c
2012-01-17 11:55:23 +09:00
Jean Chalard
b22f77004a
am 72d285f4: Add some comments about resuming auto-suggestion
...
* commit '72d285f4d758dd1ceafb7d9bd3dd330efd24c1f8':
Add some comments about resuming auto-suggestion
2012-01-16 18:44:02 -08:00
Jean Chalard
72d285f4d7
Add some comments about resuming auto-suggestion
...
Bug: 5846646
Change-Id: Ib2c76ec173972eb7acadbfaae7e930849d546721
2012-01-17 10:29:11 +09:00
Tadashi G. Takaoka
83998f7c0b
am 16025407: Remove redundant permission tag
...
* commit '16025407647022db0f1f20bb108d774944d1a978':
Remove redundant permission tag
2012-01-16 04:15:25 -08:00
Tadashi G. Takaoka
1602540764
Remove redundant permission tag
...
Change-Id: I717e2fc9dca13096d76c159f8c3bebff065c6ca1
2012-01-16 20:17:18 +09:00
Tadashi G. Takaoka
47d02eddd4
am 4910c962: Merge "KeyboardState unit tests for non-distinct multitouch device"
...
* commit '4910c9621c3bbf2a80afdd14dafedcad5157f520':
KeyboardState unit tests for non-distinct multitouch device
2012-01-16 02:33:17 -08:00
Tadashi G. Takaoka
4910c9621c
Merge "KeyboardState unit tests for non-distinct multitouch device"
2012-01-16 02:31:37 -08:00
Jean Chalard
99eabc62f1
am c8399997: Merge "Actually add shortcut-only entries."
...
* commit 'c83999972d309a9a57aac0473e72654bb3ca5438':
Actually add shortcut-only entries.
2012-01-16 02:25:13 -08:00
Jean Chalard
c83999972d
Merge "Actually add shortcut-only entries."
2012-01-16 02:23:53 -08:00
Jean Chalard
c0bf277fe3
am 382f44f3: Merge "Add shortcut only to xml output."
...
* commit '382f44f359170740ac668e48eeedf535b4b8928e':
Add shortcut only to xml output.
2012-01-16 02:22:18 -08:00
Jean Chalard
382f44f359
Merge "Add shortcut only to xml output."
2012-01-16 02:19:59 -08:00
Tadashi G. Takaoka
58e782a225
Remove duplicate logic from KeyboardSwitcher and KeyboardState
...
Change-Id: I1d331ee7f71501baa4ec2df01df39340499834e4
2012-01-16 19:16:26 +09:00
Tadashi G. Takaoka
e47bd3f4fb
KeyboardState unit tests for non-distinct multitouch device
...
Bug: 5708602
Change-Id: Id85db2f8b7b427ba62205f5aaad481a3d33e65fc
2012-01-16 19:14:18 +09:00
Tadashi G. Takaoka
93281dc578
am af951181: Merge "Fix double tap shift key to turn off capslock mode"
...
* commit 'af951181090339ac5747daa6dd9cd11325b671ad':
Fix double tap shift key to turn off capslock mode
2012-01-16 02:14:14 -08:00
Jean Chalard
93e154715c
am 82ddd168: Stop avoiding adding what the user typed to candidates
...
* commit '82ddd168893892cfe4366e1e2fa9e9bfeb5478a5':
Stop avoiding adding what the user typed to candidates
2012-01-16 02:12:19 -08:00
Tadashi G. Takaoka
af95118109
Merge "Fix double tap shift key to turn off capslock mode"
2012-01-16 02:12:07 -08:00
Jean Chalard
6145b73523
Add shortcut only to xml output.
...
Change-Id: I23b53826ce30b0ac81962d2f916514cb60bea6ff
2012-01-16 19:06:37 +09:00
Jean Chalard
c599f2e9d6
Actually add shortcut-only entries.
...
Change-Id: I84bec8fb560cec2ad9cc857397a3f77a96b1d12d
2012-01-16 19:04:37 +09:00
Jean Chalard
82ddd16889
Stop avoiding adding what the user typed to candidates
...
There does not seem to be any reason other than a historical
one to avoid doing this, but it takes processing power and
makes things more complicated.
This has a very limited impact on regression tests:
5 -> 3 [He, the]
5 -> 3 [An, an]
5 -> 3 [Where, where]
5 -> 3 [This, this]
7 -> 1 [wAtch, watch]
6 -> 4 [oveNs, oceans]
5 -> 1 [Ahere, Where]
7 -> 1 [Hast, Hast]
7 -> 5 [bjp, bill]
5 -> 1 [What, What]
5 -> 3 [Sound, So und]
7 -> 3 [causalities, casualties]
7 -> 3 [discontentment, discontent]
7 -> 3 [irregardless, regardless]
5 -> 1 : 2
5 -> 3 : 5
6 -> 4 : 1
7 -> 1 : 2
7 -> 3 : 3
7 -> 5 : 1
+1 4
-1 0
+2 0
-2 0
+3 8
-3 0
+4 1
-4 0
+5 1
-5 7
+6 0
-6 1
+7 0
-7 6
Change-Id: I6407cf922f27bbd3992df11d63690e71fc61111b
2012-01-16 18:58:10 +09:00
Tadashi G. Takaoka
7bc61ca183
Fix double tap shift key to turn off capslock mode
...
Bug: 5873562
Change-Id: If1f5ae1684905c1418ae43e55df38509444d29e2
2012-01-16 18:54:25 +09:00
Jean Chalard
082d3f6255
am d64b8c97: Merge "Read the group count correctly from the binary format"
...
* commit 'd64b8c97fea0ab5dd6d16feef329127dc7ecc833':
Read the group count correctly from the binary format
2012-01-16 01:14:14 -08:00