Merge commit 'b1babb799b30db6e3d275d6c103bb77dbfa560ec'
* commit 'b1babb799b30db6e3d275d6c103bb77dbfa560ec':
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
Merge commit '85d85c2026ff95d3c9cd272e00757a6c50eeb708' into gingerbread-plus-aosp
* commit '85d85c2026ff95d3c9cd272e00757a6c50eeb708':
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'
* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
Merge commit 'c1ff28462eee5880267fd2eae4da389b25f6f3da' into gingerbread-plus-aosp
* commit 'c1ff28462eee5880267fd2eae4da389b25f6f3da':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
Merge commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea'
* commit 'e5abf25d4b57ecdfc01ca3ddf94753d5bcb07fea':
Dismiss mini keyboard when finger is released outside mini keyboard
Merge commit '83e63ace2a1bd5b3c27d26d914456c2b0def17c5' into gingerbread-plus-aosp
* commit '83e63ace2a1bd5b3c27d26d914456c2b0def17c5':
Dismiss mini keyboard when finger is released outside mini keyboard
Merge commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24'
* commit 'bc1a0354ef1cac0319cab63822c66203f1fa2c24':
Fixed extra periods when chording with shift and space
Merge commit '26aff8c62f61f18b1b9a40ce647984284a41c895' into gingerbread-plus-aosp
* commit '26aff8c62f61f18b1b9a40ce647984284a41c895':
Fixed extra periods when chording with shift and space
Actually it was caused by canceling repeat key (space and delete) when
multiple pointer are touching.
Bug: 2975041
Change-Id: If82183b9225efdace7b5418860b9664f1705b7ec
Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f'
* commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f':
Add isModifier to the buttons in the lowest line
Merge commit 'd27c7aea7c0bd82dddd25c2ccf46cb2a14aa385d' into gingerbread-plus-aosp
* commit 'd27c7aea7c0bd82dddd25c2ccf46cb2a14aa385d':
Add isModifier to the buttons in the lowest line
Merge commit '8d7ffcb2ac3a8cdd051c7e493ff17b6bf1ded9c0' into gingerbread-plus-aosp
* commit '8d7ffcb2ac3a8cdd051c7e493ff17b6bf1ded9c0':
Disable pop-up preview on mini keyboard
This change also disable the special behavior of long press a key that
has only one digit alternate. If the visual design of both the pop-up
preview and the mini keyboard will look like same, I think that
showing mini keyboard is enough for the key that has one digit
alternate.
Bug: 2973546
Change-Id: I04f138c120aa58526fe054626dac856171fb7a58
Merge commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2'
* commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2':
Fix an asset for the feedback of delete key
Merge commit 'f02e42080bba22201077f6582a48d38e564f053e' into gingerbread-plus-aosp
* commit 'f02e42080bba22201077f6582a48d38e564f053e':
Fix an asset for the feedback of delete key
Merge commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31'
* commit 'd5bcbf8156fdba8199452b8f95ed1940b7e96d31':
Support multi-touch only when device has distinct multi-touch panel
Merge commit 'c8b9afe0378e3f33c3f83271bd1df9678a70c2a2' into gingerbread-plus-aosp
* commit 'c8b9afe0378e3f33c3f83271bd1df9678a70c2a2':
Support multi-touch only when device has distinct multi-touch panel
Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791'
* commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791':
Fix layout issue of the bottom row in web entry mode
Merge commit 'a8d9702fc4782206ea45c53109132138f9e04c18' into gingerbread-plus-aosp
* commit 'a8d9702fc4782206ea45c53109132138f9e04c18':
Fix layout issue of the bottom row in web entry mode