Merge commit '83b3cf56cdb64f91ec32869bce237e16a1487f4a' into gingerbread-plus-aosp
* commit '83b3cf56cdb64f91ec32869bce237e16a1487f4a':
Corresponding to TBR of Id2b0b974
Merge commit '0fe4c9e1a78445a27b74ae24afb292a84a893703' into gingerbread-plus-aosp
* commit '0fe4c9e1a78445a27b74ae24afb292a84a893703':
Corresponding to TBR of Ie6cf6768
Merge commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4'
* commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4':
Add PointerTracker argument to long press related methods
Merge commit '6b4d521fb486f2762eee1a7ebf3c5e285d3aa83e' into gingerbread-plus-aosp
* commit '6b4d521fb486f2762eee1a7ebf3c5e285d3aa83e':
Add PointerTracker argument to long press related methods
Merge commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6'
* commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6':
Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
Merge commit '83c6069b986e11fd88caead1e5bbeb5e82d105a2' into gingerbread-plus-aosp
* commit '83c6069b986e11fd88caead1e5bbeb5e82d105a2':
Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed.
Merge commit 'd0457eae17d10535023a02579d16ede7bfcc6bec'
* commit 'd0457eae17d10535023a02579d16ede7bfcc6bec':
Queuing PointerTracker to support n-key roll-over and shift modifier.
Merge commit '3491c877dd25df829e5e6541a72f375cc2842ea5' into gingerbread-plus-aosp
* commit '3491c877dd25df829e5e6541a72f375cc2842ea5':
Queuing PointerTracker to support n-key roll-over and shift modifier.
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'
* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
Change the preference name for a theme and remove a preference settings
Merge commit 'a327485e595c9f7676989097c830ff452085d4c9' into gingerbread-plus-aosp
* commit 'a327485e595c9f7676989097c830ff452085d4c9':
Change the preference name for a theme and remove a preference settings
Merge commit '308acfa714a3a0aae073871e76e753b5a98096d1'
* commit '308acfa714a3a0aae073871e76e753b5a98096d1':
Change background color for functional keys in LatinIME
Merge commit 'ac4f8e4629b0206b41c1c38271d62af88e4df21b' into gingerbread-plus-aosp
* commit 'ac4f8e4629b0206b41c1c38271d62af88e4df21b':
Change background color for functional keys in LatinIME
Merge commit 'c354167c84b06b572067efaddfbd3667ffdadb98'
* commit 'c354167c84b06b572067efaddfbd3667ffdadb98':
Correction improvements - use the new InputConnection APIs for underlining and
Merge commit 'b00a1d0c0adbdfc507676772201e979e539a2801' into gingerbread-plus-aosp
* commit 'b00a1d0c0adbdfc507676772201e979e539a2801':
Correction improvements - use the new InputConnection APIs for underlining and
fetching the selected text.
Bug: 2950652
Some refinements to correction behavior, such as retaining the tap-to-save
when in correction mode.
Use reflection to access the new InputConnection APIs with fallbacks, in case
we run on older OS versions.
Some refactoring to separate lookup for voice alternatives and typed alternatives.
Change-Id: I7c4178bf7e6b47ee274c49fa7a694f8c2d50cea7
Merge commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94'
* commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94':
Add new public attribute mPointerId to PointerTracker
Merge commit 'c6cb2ec1f3264a7b626022bcfdc8da180b87920c' into gingerbread-plus-aosp
* commit 'c6cb2ec1f3264a7b626022bcfdc8da180b87920c':
Add new public attribute mPointerId to PointerTracker
Merge commit '2085d43daf44752deae1b6b00a14cb0f517d69cb' into gingerbread-plus-aosp
* commit '2085d43daf44752deae1b6b00a14cb0f517d69cb':
Make abstract KeyDetector class
The KeyDetector abstracts key detection algorithm. The
ProximityKeyDetector is one of its concrete implementations. Another
one that might be called XAxisKeyDetector will follow to realize the
pop-up mini-keyboard behavior described in bug#2959169.
Bug: 2959169
Change-Id: Idd3fc53282e6b721ec7a4ce500af8aba21ce07a3