nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4579 commits 1 branch 0 tags 363 MiB
Commit graph

2043 commits

Author SHA1 Message Date
Tadashi G. Takaoka
433ca6a46d Cleanup redundant methods of KeyboardSwitcher 
Change-Id: I2ebeb8852177f6c6e30578d0bb3f372f488dc6c1
 2012-01-31 17:18:14 +09:00
Tadashi G. Takaoka
30964843db Merge "Auto generate various shift states alphabet keyboard automatically" 2012-01-30 20:07:26 -08:00
Tadashi G. Takaoka
ca2f051cc1 Auto generate various shift states alphabet keyboard automatically 
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.

This change also
  * Eliminates KeyboardShiftState object from Keyboard.
  * Removes various set shift state methods from Keyboard.
  * Removes KeyboardSet.Element.elementAutoGenerate attribute.
  * Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
  * Add preserveCase flag to smiley, .com, and labeled special keys.
  * Rename KeyboardShiftState class to AlphabetShiftState.
  * Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
  * Introduce shiftedLetterActivated to Key.keyLabelFlags

Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
 2012-01-31 12:55:45 +09:00
alanv
16f7439682 Removed unused "no item selected" notification & supporting code from keyboard accessibility. 
Change-Id: Ia6323ad0c1e2a0db5a2cf830e97765eddaa32cee
 2012-01-30 13:45:59 -08: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
a1e370ee4f Support keyXPos/keyWidth override in <include> 
Change-Id: I03576a6fb7916f2f66f2035a04872fe89b573cdc
 2012-01-27 21:20:57 +09:00
Tadashi G. Takaoka
425e1996b8 Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags 
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
 2012-01-27 18:11:43 +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
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
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
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
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
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
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
Tadashi G. Takaoka
bd51aaf98f Merge "Warn deprecated privateImeOptions, "nm" and "forceAscii"" 2012-01-25 22:20:35 -08: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
Jean Chalard
5a38ff305f Merge "Convert an internal enum into an int of same underlying value." 2012-01-25 21:13:56 -08:00
Tadashi G. Takaoka
4f5c3a2898 Warn deprecated privateImeOptions, "nm" and "forceAscii" 
Public API EditorInfo.IME_FLAG_FORCE_ASCII has been supported by
I6665b483.

Change-Id: I0ffdee15d8177d126cd8fe86a6bc4ab21be58c36
 2012-01-26 13:37:35 +09:00
Jean Chalard
6e082cb30d Convert an internal enum into an int of same underlying value. 
Goes together with Id4f4e066

Bug: 5922118
Change-Id: I1e39dd01c67e9284d9d7fe008d868847e69986d7
 2012-01-26 13:07:51 +09:00
Jean Chalard
fda847a870 Small cleanup 
All calls to this method are done with the same parameter,
and it's really hard to understand if we call upon this
member inside.

Change-Id: I787664bb59053ab0fe666ed812fb12b2b9090918
 2012-01-26 11:40:16 +09:00
Tadashi G. Takaoka
09f8b126e5 Add Key preserveCase enum to keyLabelOptions attribute 
To support auto generate key depending keyboard element id, the
KeysCache class is introduced to hold whole keys and reuse.

Change-Id: Icb81b5f1c1b3aaa31968dcdb93aa0a856e737f78
 2012-01-25 20:16:21 +09:00
Tadashi G. Takaoka
bcf2b79365 Prepare to get rid of Drawable reference from Key 
Change-Id: If435f95b2863e0af8d8916c643e6b01feabd3ea5
 2012-01-25 19:41:15 +09:00
Tadashi G. Takaoka
2419a31c98 Merge "Add element predicator to <switch><case> condition of Keyboard" 2012-01-25 02:37:27 -08:00
Tadashi G. Takaoka
9650e85662 Merge "Draw language name on spacebar on the fly" 2012-01-25 02:37:22 -08:00
Jean Chalard
d9702a375a Merge "Add a test for auto-correction." 2012-01-25 02:33:39 -08:00
Jean Chalard
0bfe359ee4 Add a test for auto-correction. 
Fix two related subtle bugs:
- Stop singling out fat-finger-only corrections for rejection
  when touch coordinates are not available.
- Remove a racy check that would happen only in debug mode

Change-Id: Ic904f9b27c091ca6b369052c4e65a630bff81257
 2012-01-25 19:29:40 +09:00
Tadashi G. Takaoka
83306b914f Add element predicator to <switch><case> condition of Keyboard 
Change-Id: I8f9eb8eb28707d23e421e88f979022d844a3b3ee
 2012-01-25 19:09:18 +09:00
Tadashi G. Takaoka
bd93eddb52 Draw language name on spacebar on the fly 
Change-Id: If54251acbd40d0dda37df1b368ed76dcdf3c8ac0
 2012-01-25 19:05:58 +09:00
Tadashi G. Takaoka
f9521c6f37 Change scope of some methods in KeyboardView 
Change-Id: I6569b413b20a2e683c6c636aafd755f51868dd28
 2012-01-25 18:50:27 +09:00
Tadashi G. Takaoka
f9c6715b17 Merge "Use PointerTracker.getPointerTracker() class method" 2012-01-25 00:51:22 -08:00
Tadashi G. Takaoka
38d6a18821 Use String instaed of CharSequence in Key class 
Change-Id: Ia76a41daede402ed2a509e110ae97d6bb660c760
 2012-01-25 17:04:00 +09:00
Tadashi G. Takaoka
117c124c13 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard 
This is the first step to support separate Keyboard for elementName.
This change is the second attempt of Icef66564.

Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670
 2012-01-25 13:19:53 +09:00
Tadashi G. Takaoka
e88e1b22c8 Use PointerTracker.getPointerTracker() class method 
Change-Id: Ieab5d43d2bfe9bdf2b499834dff267df84b8d76d
 2012-01-25 11:08:30 +09:00
Tadashi Takaoka
af4efd5a3e Merge "Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"" 2012-01-24 15:22:25 -08:00
Tadashi Takaoka
8bb20bc682 Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard" 
This reverts commit b5b92f9b78

Bug: 5908440
 2012-01-24 15:20:05 -08:00
Tadashi G. Takaoka
a34f66de2d Merge "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard" 2012-01-24 01:34:31 -08:00
Tadashi G. Takaoka
b5b92f9b78 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard 
This is the first step to support separate Keyboard for elementName.

Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
 2012-01-24 18:31:11 +09:00
Jean Chalard
20f437cc49 Merge "Test that delete actually removes any selected text." 2012-01-24 01:19:26 -08:00
Jean Chalard
1e4684ad24 Test that delete actually removes any selected text. 
Bug: 5699301
Change-Id: I09a967eb03690251e8bd69503285c982d6958a7d
 2012-01-24 18:17:09 +09:00
Jean Chalard
196da4a7be Merge "Fix a bug where backspace would not delete the selection" 2012-01-24 01:13:34 -08:00
Jean Chalard
77da3d5a3b Fix a bug where backspace would not delete the selection 
Bug: 5699301
Change-Id: I6c5a8470464d045349ac38e191c859b5c34cbeee
 2012-01-24 18:07:23 +09:00
Tadashi G. Takaoka
25971b5a14 Clean up symbol key chording state from KeyboardState 
Change-Id: I575da2bf2941c8a2e7b1fe0a455cbcdebb201276
 2012-01-24 17:59:35 +09:00
Tadashi G. Takaoka
83d81f2e34 Fix sliding shift input in caps lock mode 
Bug: 5881820
Change-Id: I4cbe3eda83c09edc9da8efbdff7d3359c1e140d5
 2012-01-24 17:58:23 +09:00
Tadashi G. Takaoka
747ed9e99a For get the symbols shifted state when switch back from alphabet layout 
Bug: 5881820
Change-Id: Ic478264e1cd366affc34fbf4cd59f1b6e7efede7
 2012-01-24 17:28:00 +09:00
Tadashi G. Takaoka
0f05076990 Get rid of setShifted/setShiftLocked from SwitchActions 
Change-Id: Ib54b0575be190556690ef2dfb14077842745f038
 2012-01-24 12:27:09 +09:00
Jean Chalard
5fd11a7f33 Fix a typo 
Change-Id: I358350c959d5610214a752b14d7744fe83eb3821
 2012-01-24 11:58:07 +09:00
Tadashi G. Takaoka
4eb240eb2c Force KeyboardShiftState reset by setShiftLocked(false) 
Change-Id: Ib00d598e6e6a91e594ae01cfc51fb688601f6b8f
 2012-01-23 13:18:06 +09:00
Tadashi G. Takaoka
69fa792184 Merge "Get rid of useless updateShiftState" 2012-01-22 20:16:46 -08:00
Tadashi G. Takaoka
b6357bddd5 Merge "Add more debug message to KeyboardState" 2012-01-22 20:15:38 -08:00
Tadashi G. Takaoka
457e506e1a Add more debug message to KeyboardState 
Change-Id: Ie0bceb494b0521bf406418d5ecbc16752c818aba
 2012-01-23 13:14:02 +09:00
Tadashi G. Takaoka
56518d424d Get rid of useless updateShiftState 
Because KeyboardState.onLoadKeyboard will invoke
SwitcherActions.requestUpdateShiftState eventually, the calling
updateShiftState at the end of KeyboardSwitcher.onLoadKeyboard is
useless.

Change-Id: Ib6e746b1516ef1b4c981807a9b8785a046ba50e0
 2012-01-23 12:47:03 +09:00
Jean Chalard
35e9a7ac55 Merge "Squash a ridiculously improbable NPE" 2012-01-22 18:37:29 -08:00
Tadashi G. Takaoka
b009a24b83 Support @icon/icon_name for more keys specification 
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
 2012-01-20 20:09:02 +09:00
Tadashi G. Takaoka
54c2dd67b0 Merge "Support @string reference in moreKeys attribute" 2012-01-20 01:59:31 -08:00
Tadashi G. Takaoka
e54a4005d5 Support @string reference in moreKeys attribute 
Change-Id: If0056d0601149d2ddd0e231a81e7b2409b37fc06
 2012-01-20 18:46:33 +09:00
Jean Chalard
7c177e82af Merge "Fix a bug where a check would fail" 2012-01-20 01:16:44 -08:00
Jean Chalard
7546ff6e34 Fix a bug where a check would fail 
Bug: 5894393
Change-Id: I810de58730f2cabcaf7b8dc1d85b3725f959094b
 2012-01-20 18:09:59 +09:00
Tadashi G. Takaoka
3eede315dc Merge "Move MoreKeySpecParser.getResourceId to Utils" 2012-01-20 00:01:29 -08:00
Tadashi G. Takaoka
86641ef6e8 Merge "Change more key specification type to String from CharSequence" 2012-01-20 00:01:24 -08:00
Tadashi G. Takaoka
0718590486 Move MoreKeySpecParser.getResourceId to Utils 
Change-Id: I0640dbe76a8ff2dc45b504eca631942811571736
 2012-01-20 16:28:18 +09:00
Tadashi G. Takaoka
bd7b160cfb Change more key specification type to String from CharSequence 
Change-Id: I5e910f8225a248fc6403771836dec4c0b7294caa
 2012-01-20 16:27:32 +09:00
Jean Chalard
af9fe5c5fc Fix a bug where the user typed word would not be passed. 
Bug: 5894271
Change-Id: I4f02ff322697159e08f5e898608c0aff11dacb2f
 2012-01-20 15:39:06 +09:00
Tadashi G. Takaoka
0ef9bfe593 Merge "Fix KeyboardState switching back from alphabet-chording input correctly" 2012-01-19 02:14:20 -08:00
Tadashi G. Takaoka
085b659463 Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests" 2012-01-19 02:14:15 -08:00
Tadashi G. Takaoka
4d229410f0 Merge "Cleanup KeyboardState a bit" 2012-01-19 02:14:10 -08:00
Jean Chalard
250cf0a781 Merge "Fix a bug with backspace happening after a manual pick." 2012-01-19 01:55:30 -08:00
Tadashi G. Takaoka
f36f90a173 Fix KeyboardState switching back from alphabet-chording input correctly 
Bug: 5881820
Change-Id: I108bbc25baa331cc87f00955b48188b3557d10dd
 2012-01-19 18:53:38 +09:00
Tadashi G. Takaoka
d26d63b35d Fix KeyboardState to pass KeyboardStateMultiTouchTests 
Change-Id: If2b9ee7cf3fad7633d64b98758f802792d66f7a8
 2012-01-19 18:48:02 +09:00
Tadashi G. Takaoka
01d9fc966a Cleanup KeyboardState a bit 
Rename KeyboardShiftState variable and reorder some statements.

Change-Id: I7e8842836f35876f8697f9906343f7d4a1f9db4f
 2012-01-19 18:42:11 +09:00
Jean Chalard
3b2112e70a Fix a bug with backspace happening after a manual pick. 
Bug: 5884397
Change-Id: I01f462075bcbf7da38e9af2084ecd37143923e8b
 2012-01-19 18:41:02 +09:00
Jean Chalard
8ae770f39b Merge "Small code simplification." 2012-01-19 01:33:21 -08:00
Jean Chalard
95a6e58ebc Small code simplification. 
I'm pretty sure the test here was useless.

Change-Id: Iaece641fbd5455406533b19555f2b639759a525f
 2012-01-19 18:03:45 +09:00
Tadashi G. Takaoka
23bacdb6a5 Fix MoreKeySpecParser to be able to handle outputText correctly 
The issue was introduced by Id2320f4d.

Bug: 5887936
Change-Id: Ifec3aefb5b168f790de696ece104b84cdab46539
 2012-01-19 12:51:27 +09:00
Jean Chalard
af480be66e Squash a ridiculously improbable NPE 
This probably can't be triggered by anything that is not
a monkey, but still, let's fix this

Bug: 5797549
Change-Id: I9a7d9fd6664c97787ce676a28675e96f46df7658
 2012-01-19 12:06:00 +09:00
Tadashi G. Takaoka
06bc1db017 Add more multitouch tests 
Change-Id: I424a4b608fec084cb787003ef4417ccf273366ae
 2012-01-18 19:35:01 +09:00
Tadashi G. Takaoka
60c4594ee6 Get rid of hasDistinctMultitouch reference from KeyboardState 
Change-Id: I0a783a425302fbc381d056f5b0d757c27f2a9f14
 2012-01-18 18:11:46 +09:00
Tadashi G. Takaoka
5731b939c7 Remove KeyboardSwicther.toggleCapslock 
Change-Id: Id613c06e2df770659095d78d42637aed063d0c70
 2012-01-17 19:26:24 +09: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
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
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
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
1ef6fc7e15 Support EditorInfo.IME_FLAG_FORCE_ASCII 
Bug: 5850605
Change-Id: I6665b483f775094903f2e26f5584e4b141592ab5
 2012-01-17 14:38:00 +09: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