Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">. The keyboard XML file which is
included must have <merge> tag as root element.
Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
Merge commit 'e13a301328b7104624db5b37a9b043fd7a6825b7' into gingerbread-plus-aosp
* commit 'e13a301328b7104624db5b37a9b043fd7a6825b7':
Import revised translations. DO NOT MERGE
Merge commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368' into gingerbread-plus-aosp
* commit '6495bfc7a6f6bfa6ab82e7f062ee80f4b6b33368':
Follow-up to I36faf679 Cancel pending messages related to suggestion updates.
Merge commit '55b10796522b871c1e04d6f2254fdff5dc7aced4' into gingerbread-plus-aosp
* commit '55b10796522b871c1e04d6f2254fdff5dc7aced4':
Addressed bug: 3058217 "-" key not working at beginning of line
Also fixed related issues below:
* Punc suggestions list was sometimes not displayed after cursor move which follows re-correction
* Punc suggestions list was disappearing with words which contains certain punc chars (but not word separator) such as ' and -
Change-Id: I36faf679321782fa8eaf318411308a4a6b89cc25
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'
* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
Long press mic/comma key bring mini keyboard with settings
Merge commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718' into gingerbread-plus-aosp
* commit '8e1f1be0f3cfce4ed0623d3d137f53f034f5b718':
Long press mic/comma key bring mini keyboard with settings
Merge commit 'bd677880494f30d58913f1bac612a32410e6465b'
* commit 'bd677880494f30d58913f1bac612a32410e6465b':
Make the background of keypopup transparent
Merge commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9' into gingerbread-plus-aosp
* commit '88a045637a8aa812ec09e2fa6ad0b75dd401e1f9':
Make the background of keypopup transparent
Merge commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878'
* commit '8e6a92703d1bdf530d32c8cdf90deefc6bc3a878':
Dismiss orange highlight after suggestion has been selected
Merge commit '18d536f66b2a063a462b2d28410da80b7788e5da' into gingerbread-plus-aosp
* commit '18d536f66b2a063a462b2d28410da80b7788e5da':
Dismiss orange highlight after suggestion has been selected
Merge commit 'a0a60b37b265988191083e1b5abbe616a67759b4' into gingerbread-plus-aosp
* commit 'a0a60b37b265988191083e1b5abbe616a67759b4':
Revert changes to keyboard_popup.xml for now.
Merge commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6'
* commit '105f7c36b7fa1845b9edbf47ca55b4a6660303b6':
Long pressing mic/comma key will show settings menue
Merge commit '93176d869a496051344d80ef03573bc6bb99035a'
* commit '93176d869a496051344d80ef03573bc6bb99035a':
Display feedback popup for saving word while the word is pressing.
Merge commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3'
* commit '4d158dc2779ffff8c92a41f32e6885bd0f155fc3':
Check recorrection on focusing into a text field that has text already.
Merge commit '3297ee80f0b5b93128123d98d7f8b42257e36445' into gingerbread-plus-aosp
* commit '3297ee80f0b5b93128123d98d7f8b42257e36445':
Long pressing mic/comma key will show settings menue
Merge commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98' into gingerbread-plus-aosp
* commit '77c9f2d314d9fbb5c4bd5b6918326d2e1f4e3a98':
Display feedback popup for saving word while the word is pressing.
Merge commit '11a578f4f130ebae66fb1bd9953874f421c3c09c' into gingerbread-plus-aosp
* commit '11a578f4f130ebae66fb1bd9953874f421c3c09c':
Disable suggestion bar before invoke Voice input
- Make the background of popup key a full transparent color
- Updated the background mdpi asset of keyboard
Bug: 2975027
Bug: 3048638
Change-Id: I8709a1ca403e5c3f862a8be9be1668d30c7687f8
Tadashi G. Takaoka
Eric Fischer
Ken Wakasa
Roy West
Mitsuhiro Shimoda
satok
Ying Wang
Amith Yamasani