The Android Automerger
58180210a8
merge in jb-release history after reset to master
2012-01-30 07:03:57 -08:00
satok
a191afb78d
Merge "Implement multi words suggestions step1"
2012-01-30 01:04:42 -08:00
satok
1f6b52e76c
Implement multi words suggestions step1
...
Change-Id: I96e8e1b0d9ccc0ed13d53c40300d8c19bcb7af5b
2012-01-30 18:01:25 +09:00
Tadashi G. Takaoka
3b0f2bf169
Merge "Support addtionalMoreKeys"
2012-01-30 00:11:29 -08:00
Tadashi G. Takaoka
15c99e9f1a
Support addtionalMoreKeys
...
This change also removes
* Unused more_keys_for_q, w, and p.
Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09:00
Ken Wakasa
6029b43a3d
Add "size" and "pressure" for MotionEvent logs
...
bug: 5722703
Change-Id: I8e08942324b666de96682ce63e70c8d324535782
2012-01-30 12:22:15 +09:00
Tadashi G. Takaoka
38a3ad3e3c
Merge "Rename keyboard XML resource files"
2012-01-29 16:36:22 -08:00
Eric Fischer
49761501db
Import translations. DO NOT MERGE
...
Change-Id: I89dcb839308eadb722f91ccd4327208d8d477dc2
2012-01-27 12:02:20 -08:00
Tadashi G. Takaoka
d1630a3add
Rename keyboard XML resource files
...
* <Keyboard> XML file should be kbd_*.xml
* <Row> XML file should be rows_*.xml or row_*.xml
* <Key> XML file should be key_*.xml or keys_*.xml
* <key-style> XML file should be key_styles_*.xml
Change-Id: Ie57d5d78389c13d6c066ace4e3588518d1f25f13
2012-01-28 01:07:29 +09:00
Tadashi G. Takaoka
344a767b33
Share kbd_row3_smiley.xml
...
Change-Id: Ie5e68f972a739ab151201bd13bb1771e164313e6
2012-01-27 21:48:25 +09:00
Tadashi G. Takaoka
ed50cf005b
Merge "Support keyXPos/keyWidth override in <include>"
2012-01-27 04:33:48 -08:00
Tadashi G. Takaoka
566cded5e7
Merge "Use kbd_row3_comman_period.xml"
2012-01-27 04:21:53 -08:00
Tadashi G. Takaoka
a1e370ee4f
Support keyXPos/keyWidth override in <include>
...
Change-Id: I03576a6fb7916f2f66f2035a04872fe89b573cdc
2012-01-27 21:20:57 +09:00
Tadashi G. Takaoka
ab7cb71b8f
Create separate XML for number password keyboard
...
Change-Id: I1d73a03bfce9180106575e180bfeb422da03b9fb
2012-01-27 21:09:55 +09:00
Tadashi G. Takaoka
3db07d05a3
Use kbd_row3_comman_period.xml
...
Change-Id: Ie2ce2f4f03e70477d4932072a44fb9aeb7cd7784
2012-01-27 21:07:37 +09:00
Tadashi G. Takaoka
32c4635ff4
Merge "Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags"
2012-01-27 01:15:01 -08:00
Tadashi G. Takaoka
425e1996b8
Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
...
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
2012-01-27 18:11:43 +09:00
satok
23f486f770
Merge "Merge missing space and mistyped space correction algorithm"
2012-01-27 00:01:27 -08:00
satok
9955716d0b
Merge missing space and mistyped space correction algorithm
...
Change-Id: Idd64d38d3d29be24748f9c0359667883698a5756
2012-01-27 16:54:15 +09:00
Tadashi G. Takaoka
c882d619bf
Merge "Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols"
2012-01-26 23:45:36 -08:00
Tadashi G. Takaoka
f057b25cdd
Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols
...
Bug: 5881820
Change-Id: I9b1718b16c60f27c05ba727724c0189aa5284334
2012-01-27 16:03:51 +09:00
The Android Automerger
abb3ff3902
merge in jb-release history after reset to master
2012-01-26 07:01:37 -08:00
Jean Chalard
5971a0a0bb
Remove a useless member (A8)
...
It turns out this can be removed entirely.
Change-Id: I6f23703cef1666311989a825285317eef696487f
2012-01-26 20:10:49 +09:00
Jean Chalard
449415c72f
Cleanup (A9)
...
Deactivate the LastComposedWord when the commit was not the right
type, instead of fooling it by passing it a null auto-correction.
Change-Id: I032b477dc691bd151a644ca4b0c9f0a9b5512e45
2012-01-26 20:10:49 +09:00
Jean Chalard
5ef094f816
Merge "Remove the CharacterStore class (A7)"
2012-01-26 03:09:31 -08:00
Tadashi G. Takaoka
1112a545cc
Merge "Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted"
2012-01-26 03:05:47 -08:00
Jean Chalard
be79227dc9
Remove the CharacterStore class (A7)
...
Remove the now useless WordComposer.CharacterStore class
and merge back its members inside WordComposer. This should
simplify the word composer a bit.
Change-Id: I5fe32418c62a583cd558dce98758a4701559bdf5
2012-01-26 20:03:44 +09:00
Jean Chalard
c7c152de4b
Guard against wrong auto-correction cancellation (A6)
...
This deactivates the cancellation at each separator pressed while
not composing a word. The net effect is to fix
Bug: 5875776
Change-Id: I67aa3f842ddff250828c60596ad5a7e466c1ddaa
2012-01-26 19:57:37 +09:00
Jean Chalard
b6b8729374
Straighten out resuming suggestion on kept word (A5)
...
This is cleanup.
This also introduces a "deactivated" state to the last committed
word, that can be used for
Bug: 5875776
Change-Id: I1855adb8ac8123f6d2c5365b0ae899145e5c3ba1
2012-01-26 19:24:36 +09:00
Jean Chalard
dd5e1d157b
Merge "Remove mCommittedWordSavedForSuggestionResuming (A4)"
2012-01-26 02:15:38 -08:00
satok
3c09bb18d9
Merge multiple words suggestions algorithm
...
Change-Id: I70d85b90ddaa28a41e9679f445bc14ef9ff50f16
2012-01-26 18:59:51 +09:00
Jean Chalard
2712f23acb
Remove mCommittedWordSavedForSuggestionResuming (A4)
...
Change-Id: Ia62ef33b5c777a258b02280bda1b8368780a7eef
2012-01-26 18:36:28 +09:00
Tadashi G. Takaoka
757f8d96ee
Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted
...
Change-Id: I6c49d8eb0a8272840ff03e0940d88a31c3d20bd9
2012-01-26 18:25:48 +09:00
Jean Chalard
2692a87007
Move some functionality into LastComposedWord (A3)
...
Change-Id: Ie0ea02a061dd0cb84db5f33113ff433584636bc7
2012-01-26 18:25:08 +09:00
Jean Chalard
1f8fc62ccb
Add useful information to LastComposedWord (A2)
...
Change-Id: Idf47f2e2bdd1d6394fc4b1ab7df28d64a808da1e
2012-01-26 17:49:55 +09:00
Jean Chalard
95eeb2df63
Merge "Add a class for previously composed data (A1)"
2012-01-26 00:43:57 -08:00
satok
6a03350521
Merge "Refactor words priority queue"
2012-01-26 00:36:23 -08:00
Jean Chalard
267563d1bb
Add a class for previously composed data (A1)
...
Change-Id: I87498799e6a48b8fa65924a098bb0ceb7626dce1
2012-01-26 17:22:52 +09:00
Tadashi G. Takaoka
736d740aa5
Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker"
2012-01-26 00:17:56 -08:00
satok
7409d151a1
Refactor words priority queue
...
Change-Id: I14b7ef39263ad2b1d5ec087bc80b7b8d7c30abe7
2012-01-26 16:13:25 +09:00
Tadashi G. Takaoka
160f01211d
Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
...
This change introduces the following attributes.
* KeyboardView
- keyPreviewLingerTimeout
* LatinKeboardView
- keyHysteresisDistance
- touchNoiseThresholdTime
- touchNoiseThresholdDistance
- slidingKeyInputEnable
- keyRepeatStartTimeout
- keyRepeatInterval
- longPressKeyTimeout
- longPressShiftKeyTimeout
- longPressSpaceKeyTimeout
- ignoreSpecialKeyTimeout
- showMiniKeyboardAtTouchedPoint
Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Jean Chalard
a02e703289
Add a missing brace
...
Change-Id: Ia51da6506d78a295b8b70a241208fb81602cf0ea
2012-01-26 16:08:53 +09:00
Jean Chalard
9184d8b235
Add a test for moving cursor then backspace
...
This is a test for the case in
Bug: 5851148
Change-Id: I58ee459d85f463b445a28137bdc6c40bc3067ff5
2012-01-26 15:39:29 +09:00
Jean Chalard
41df8a98fd
Add a test case for backspace at start of line
...
Tests the behavior from
Bug: 5784542
Change-Id: I78ec9d77c5dd1e3ea8eff530f9d7d284a1c094d4
2012-01-26 15:36:27 +09:00
Tadashi G. Takaoka
bd51aaf98f
Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii""
2012-01-25 22:20:35 -08:00
satok
f8ce19c29d
Merge "Cleanup unused code"
2012-01-25 22:12:52 -08:00
Jean Chalard
20ec43a265
Merge "Add tests for double space behavior"
2012-01-25 22:09:40 -08:00
satok
1c03306994
Cleanup unused code
...
Change-Id: I6c840f9ed170919e48d1c576cd0a48777ad44030
2012-01-26 14:56:52 +09:00
Jean Chalard
051ac1ef14
Merge "Add a guard against OOB."
2012-01-25 21:22:18 -08:00
Jean Chalard
8be16f78b1
Add a guard against OOB.
...
...and avoid crashing in one case where the application may
change the text while we are typing.
Bug: 5685922
Change-Id: I4a22c63168986f43ac84f512aaa4267023d536e3
2012-01-26 14:17:48 +09:00