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

2104 commits

Author SHA1 Message Date
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
Tadashi G. Takaoka
06b7c256b1 Add "force non-distinct multitouch" debug option 
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
 2012-01-17 13:19:01 +09:00
Jean Chalard
a8ba49c253 Small cleanup 
The method deleteWordAtCursor would call finishComposingText,
which is a very unexpected state change and would probably cause
surprising bugs to any parent that would call it.
As it happens, it's not used anywhere any more so let's just
remove it.

Change-Id: Iaa9200866e40b4e914f76baa987279948300679c
 2012-01-17 11:55:23 +09:00
Jean Chalard
72d285f4d7 Add some comments about resuming auto-suggestion 
Bug: 5846646
Change-Id: Ib2c76ec173972eb7acadbfaae7e930849d546721
 2012-01-17 10:29:11 +09:00
Tadashi G. Takaoka
58e782a225 Remove duplicate logic from KeyboardSwitcher and KeyboardState 
Change-Id: I1d331ee7f71501baa4ec2df01df39340499834e4
 2012-01-16 19:16:26 +09:00
Tadashi G. Takaoka
7bc61ca183 Fix double tap shift key to turn off capslock mode 
Bug: 5873562
Change-Id: If1f5ae1684905c1418ae43e55df38509444d29e2
 2012-01-16 18:54:25 +09:00
Tadashi G. Takaoka
9751a626ec Don't cache resource value that depends on orientation 
Bug: 5794655
Change-Id: Ib324366c772e20bb54aba63c2f4540dc0f9de515
 2012-01-16 12:26:34 +09:00
Tadashi G. Takaoka
c88026e1df Update shift state when alphabet keyboard has been set 
Bug: 5857492
Change-Id: I5ef78af21a76e8cf645e223d1ffa6212690bb1eb
 2012-01-16 11:08:29 +09:00
Tadashi G. Takaoka
ca132ce8e2 Merge "Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet" 2012-01-13 01:39:50 -08:00
Tadashi G. Takaoka
211680e375 Merge "Fix SuggestTests" 2012-01-13 01:39:43 -08:00
Tadashi G. Takaoka
4087ba69fa Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet 
Change-Id: I6c1150eea5f0a931d01578b0157f06e0aff0cc65
 2012-01-13 18:05:28 +09:00
Tadashi G. Takaoka
9c735b8038 Fix SuggestTests 
We need revised scoring test because dictionary look up algorithm has
been changed significantly since this SuggestTests was made.

Change-Id: I69d527a6bfa24ed0dc189fddad1afab0566c6eb8
 2012-01-13 15:25:28 +09:00
Tadashi G. Takaoka
76dede6b3b Merge "Fix SubtypeLocaleTests" 2012-01-12 22:17:20 -08:00
Tadashi G. Takaoka
4015a64a26 Fix SubtypeLocaleTests 
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
 2012-01-13 14:35:43 +09:00
satok
4da8e8e4d3 Merge "Fix a bug in the logic to show 3 dots of the ime switcher" 2012-01-12 19:41:12 -08:00
satok
83a018419a Fix a bug in the logic to show 3 dots of the ime switcher 
Bug: 5806103
Change-Id: I67b3f0bb25d5fb9cfb902c03f41ae3e582107187
 2012-01-13 11:50:31 +09:00
satok
21814c56f0 Merge "Move auto correction thresthold to the native code" 2012-01-12 02:58:35 -08:00
satok
be0cf72253 Move auto correction thresthold to the native code 
bug: 5858137

Change-Id: Ic4b6270c6e51ef4ed25a6a1d8ddd7fdfa70fd78d
 2012-01-12 19:56:15 +09:00
Jean Chalard
ab34a4a7f5 Merge "Fix a bug where last candidate would not be reset" 2012-01-11 21:47:35 -08:00
Jean Chalard
cda8a42cbe Merge "Add a sanity check" 2012-01-11 21:47:26 -08:00
Jean Chalard
a8c8ab1cb4 Remove an excessive parens 
Change-Id: If8aa4253ab0f664e628ed7f4d7a3adc02a898cc7
 2012-01-12 14:07:56 +09:00
Jean Chalard
852630ba34 Add a sanity check 
Check if any character is both a magic space swapper and
a magic space stripper for the current language, and throw
an exception if found. Since this is expensive, it's done
only in debug mode.

Change-Id: Ibd166db87c91495b76878ea0e4f420a62c7bb276
 2012-01-12 12:44:49 +09:00
Jean Chalard
9de5cfc67a Fix a crash where revertSwap would be wrongly called 
This would crash the program when inputting a punctuation
symbol that should not swap with a weak space through the
suggestion strip, then press backspace.
Those include all two-part punctuation symbols in French for
example, as well as magic space strippers like the dash in
English. For English all suggestion strips symbols happen to
be magic space swappers so this would not happen in English
by default.
Also fix a typo.

Change-Id: Ia40678c264e978509b5786290a75a3c57181648e
 2012-01-12 11:55:40 +09:00
Jean Chalard
cd2286fff1 Fix a bug where last candidate would not be reset 
Bug: 5851148
Change-Id: Ic270318842d8e16bc62d78d5fe0d6be0ca1fb532
 2012-01-12 11:16:51 +09:00
Tadashi G. Takaoka
8cab0b56eb Get rid of Keyboard.CODE_DUMMY 
Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
 2012-01-10 18:19:36 +09:00
Tadashi G. Takaoka
ee4be6e3c6 Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter 
This will be helpful to write unit test code.

Change-Id: Ib61cc46ac547084e0dc9ecd3a50814fecf08ace2
 2012-01-10 15:13:05 +09:00
Tadashi G. Takaoka
0fe45eac18 Merge "Optimize KeybaordView.invalidateAllKeys a bit" 2011-12-26 06:50:31 -08:00
Tadashi G. Takaoka
9f6485a448 Optimize KeybaordView.invalidateAllKeys a bit 
Change-Id: I118c792219f649b7297477c78fa725c678650159
 2011-12-26 23:43:53 +09:00
Tadashi G. Takaoka
07145a3706 Fix automatic temporary upper case mode shift key graphics 
Bug: 5802387
Change-Id: I4f59fb2f971c543748ed32b37af528767a0549e4
 2011-12-26 21:05:33 +09:00
Ken Wakasa
0d0f01da67 Fix a typo. A follow up to I68dd6b8d 
Change-Id: I16fa4099c75faac35344b0e4d3c2b866ddac896a
 2011-12-21 22:34:08 +09:00
Jean Chalard
0fd625bcfd Fix a bug with wrong auto-correct cancellation 
Auto-correct cancellation would sometimes kick in at
wrong times, causing crashes.

Bug: 5784542
Change-Id: I68dd6b8d9237ce9b66af2dc63e77ba6dd5fd69dd
 2011-12-21 19:28:02 +09:00
Jean Chalard
752d8cc4fc Fix a bug with TYPE_TEXT_CLASS 
This was introduced by a badly-rebased commit. The culprit was
I103d6851. There was also another bug lurking there introduced
by a previous commit that this fixes.

Bug: 5775347
Change-Id: I133b54a5159e19714f4bcae8ffbb4824cff9f466
 2011-12-20 15:31:55 +09:00
Jean Chalard
715a203501 Merge "Reorganize the auto-correction memory" 2011-12-19 02:22:49 -08:00
Ken Wakasa
4f7d278af6 Follow-up fix for I68c667b0 
Should have preserved the logic of LatinKeyboard.getNearestKeys().

Change-Id: I97b05aa24006402be03088a215fa07abda9477df
 2011-12-19 17:58:36 +09:00
Jean Chalard
9e8761c440 Reorganize the auto-correction memory 
Change-Id: I31cce9db471dcd4a7b3477bcb037a8ff482b7696
 2011-12-19 17:33:15 +09:00
Tadashi G. Takaoka
42fcb2de64 Get rid of public reference to KeyboardIconsSet.ICON_* constants 
As a consequence,
  * Add Key.iconDisabledKey has been introduced and Key.getIcon honors
    the enabled state of the key.
  * The attribute id of disabled icon for shortcut key,
    Keyboard_iconShortcutKeyDisabled, is renamed to
    Keyboard_iconDisbledShortcutKey
  * KeyboardIconsSet has getIconByIconId and getIconByAttrId methods
    instead of getIcon.

Bug: 5778201
Change-Id: Ica93b073b9a04acd18ead7a33b60e3c6d813e7a1
 2011-12-19 01:11:09 +09:00
Tadashi G. Takaoka
4e1dab8cfa Move KeyboardBuilder and KeyboardParams classes into Keyboard class 
This change also moves XmlParseUtils to com.android.inputmethod.latin package.

Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
 2011-12-18 20:19:16 +09:00
Tadashi G. Takaoka
3708787fe9 Remove LatinKeyboard class 
Change-Id: I68c667b00dadf2ed9f1c62fb7da37d2cf499cd81
 2011-12-18 19:10:42 +09:00
Tadashi G. Takaoka
4112dc0500 Move spacebar drawing code from LatinKeyboard to LatinKeyboardView 
Also this change moves LatinKeyboard attributes,
autoCorrectionSpacebarLedEnabled, autoCorrectionSpacebarLedIcon,
spacebarTextRatio, spacebarTextColor, and spacebarTextShadowColor to
LatinKeyboardView.

Change-Id: I7cc27ce1fc550e9f620a9ed0fbe4b8172902d5a1
 2011-12-18 19:07:12 +09:00
Tadashi G. Takaoka
7bd714c086 Add extra key icons to KeyboardIconsSet 
* Get rid of Key.keyIconShifted attribute.
    Add Keyboard.iconShiftKeyShifted to KeyboardIconsSet.
  * Get rid of LatinKeyboardView.disabledShortcutIcon attribute.
    Add Keyboard.iconShortcurKeyDisabled to KeyboardIconsSet.
  * Add Keyboard.iconSpaceKeyForNumber to KeyboardIconsSet.
  * Fix misplaced autoCorrectionSpacebarLedIcon resources.

Change-Id: I381bff3789254977ab3cb18f58f95b3c433b1e1a
 2011-12-18 18:25:29 +09:00
Tadashi G. Takaoka
1ebedd7a15 Remove LatinKeyboard.adjustLabelCase override 
Change-Id: If032605c1cd6bb8e913d465e20dec70798c4b8fb
 2011-12-18 16:46:44 +09:00
Tadashi G. Takaoka
5afc3ae2d9 Add LatinKeyboardView style 
As a result, this change moves shortcut related update code to
LatinKeyboardView from LatinKeyboard.

Change-Id: I1882672577f61e73c90d6c018b7dbb61f3fe21e4
 2011-12-18 16:42:23 +09:00
Tadashi G. Takaoka
22b48de11c Get rid of Key.needsSpecialPopupHint and related 
Change-Id: I28e87ea3af9581f12094770b42f113e9018886c4
 2011-12-18 16:08:28 +09:00
Tadashi G. Takaoka
bc781e963f Can override key drawing methods of KeyboardView 
Change-Id: Ie303df4f5e944ea868f5c28ba3bb72a57cc9a35f
 2011-12-18 16:08:00 +09:00
Tadashi G. Takaoka
605f730959 Merge "Add LatinKeyboard.spacebarTextRatio attribute" 2011-12-17 08:43:34 -08:00
Tadashi G. Takaoka
40a6739645 Fix broken build 
This is a followup change of I8376f4f5

Change-Id: I4de4cbc903beb71d805e62b5172076a949854bc0
 2011-12-18 01:36:11 +09:00
Tadashi G. Takaoka
7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute 
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
 2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka
ebec5259b7 Get rid of LatinKeyboardParam class 
Change-Id: I8376f4f570e72929679c5e4955986c48881abd75
 2011-12-18 00:39:40 +09:00
Ken Wakasa
67394a394f Preparatory small clean up for bug: 5776979 
Change-Id: I96b20d3775180366fac50c2bb4e0b47a92ee4cdb
 2011-12-17 20:45:39 +09:00
Ken Wakasa
3425852be4 Remove redundant logs 
bug: 5722703
Change-Id: I6b7285ad6f5c0c8486d24712f22249f83a1c6396
 2011-12-17 00:22:01 +09:00
Tadashi G. Takaoka
4af75010a1 Merge "Use Set to group Keys in Keyboard instead of List" 2011-12-16 04:26:25 -08:00
Tadashi G. Takaoka
7c69397f14 Merge "Fix swapped alphabet and symbols keyboards" 2011-12-16 04:15:35 -08:00
Tadashi G. Takaoka
510ebb9b16 Merge "Get rid of key index from ProxymityInfo" 2011-12-16 04:13:38 -08:00
Tadashi G. Takaoka
854302282d Fix swapped alphabet and symbols keyboards 
Change-Id: I956684332d607cb9ab01d12af7a924c15def7fce
 2011-12-16 21:12:06 +09:00
Tadashi G. Takaoka
4a019a9c96 Use Set to group Keys in Keyboard instead of List 
In deriving various shift stated alphabet keyboards from base/main
keyboard, almost all keys should be shared among variants.  Grouping
keys in Set instead of List is a essential refactor to have.

Bug: 5002108
Bug: 5679585
Change-Id: Idd5644d1c45a3276a24b61c984619c03d4e4c54c
 2011-12-16 21:04:04 +09:00
Tadashi G. Takaoka
0c0ca874fe Get rid of key index from ProxymityInfo 
Change-Id: I9bee0a643d09cdd89e42ae913285c9e78d875c1c
 2011-12-16 21:03:36 +09:00
Jean Chalard
43c0a034bd Merge "Pretty print for InputAttributes" 2011-12-16 04:01:49 -08:00
Jean Chalard
4d0f03bd66 Remove a write-only variable. 
Change-Id: I825307a429f46b31ed9bd940b5a97d2713127dfe
 2011-12-16 20:54:58 +09:00
Jean Chalard
6fa003ee23 Pretty print for InputAttributes 
Change-Id: I5e4b2b6f3cd943c8f6187aaed21d67ec786bf5df
 2011-12-16 20:53:44 +09:00
Jean Chalard
2b2c0b574c Merge "Use the WordComposer to check if we are composing a word" 2011-12-16 03:47:34 -08:00
Jean Chalard
80b66bb166 General cleanup. 
Move variables around, inline useless functions, remove
useless local variables.

Change-Id: Icb89d8b211a2ad4bc3619137c2276a649c2a5e34
 2011-12-16 20:36:32 +09:00
Jean Chalard
644c8b7c96 Initialize input attributes in the InputAttribute class 
Change-Id: I103d6851f54f47cbffdb567fb0f4c505c4697b05
 2011-12-16 20:35:16 +09:00
Jean Chalard
3b7aceca60 Merge "Make applicationSpecifiedCompletionOn final." 2011-12-16 03:20:00 -08:00
Tadashi G. Takaoka
bf7ed75e4f Merge "Move KeyboardSwitcher.getKeyboard to KeyboardSet" 2011-12-16 03:13:38 -08:00
Tadashi G. Takaoka
645128af71 Move KeyboardSwitcher.getKeyboard to KeyboardSet 
This change also gets rid of XML id from KeyboardId.

Bug: 5002108
Bug: 5679585
Change-Id: I7086c7da3c01ba4ade7f77ee5cc731310da46404
 2011-12-16 20:10:57 +09:00
Jean Chalard
ccc35f7fa7 Make applicationSpecifiedCompletionOn final. 
This is the last one (whew)
Also move a somewhat unrelated initialization out of the
input attribute initialization function.

Change-Id: Icc77b32fd16b112ab43786715061b1c9dca31c04
 2011-12-16 19:09:01 +09:00
Jean Chalard
9cc1312eee Make inputTypeAutoCorrect final. 
Change-Id: I550eba1fc3fa2843d007a8208d81fad208c1196b
 2011-12-16 19:08:52 +09:00
Jean Chalard
13db05f930 Make isSettingsSuggestionStripOn final. 
Change-Id: Iabb99a7f8f3f1777f9a87ae2bddff9795a50fa92
 2011-12-16 19:08:13 +09:00
Jean Chalard
1ba17f97d5 Small refactoring 
This helps to make following changes smaller

Change-Id: I95ba2901ac3bf1ed70a748c35a0babdd9af1df63
 2011-12-16 18:21:26 +09:00
Jean Chalard
4fc0f6ab02 Merge "Make insertSpaceOnPickSuggestionManually final." 2011-12-16 01:15:35 -08:00
Jean Chalard
2ad14a2ea7 Merge "Use temporary variables for computing editor attributes" 2011-12-16 01:07:56 -08:00
Jean Chalard
520e69056e Merge "Create a class for input attributes." 2011-12-16 01:06:12 -08:00
Jean Chalard
ae0c109d11 Make insertSpaceOnPickSuggestionManually final. 
Change-Id: I32fce0ea8c5c58b6f920d0758c8bf57769f39a12
 2011-12-16 18:04:39 +09:00
satok
cadc0f7d79 Merge "Send touch event in usability study mode" 2011-12-16 01:04:26 -08:00
Jean Chalard
4e8922f1be Use temporary variables for computing editor attributes 
The ultimate intent is to make these variables final,
which will allow to move the computing function to the
InputAttributes class.

Change-Id: Ifb1fc7321a19b10d60aa63fa0daaa2708deda2cf
 2011-12-16 18:04:17 +09:00
Jean Chalard
dc9d0fcc11 Create a class for input attributes. 
Change-Id: I834390c83865aac59fb758d5c66cf9b74103abd8
 2011-12-16 18:03:16 +09:00
satok
15d4793911 Send touch event in usability study mode 
Change-Id: I0cdcd57bfd31c9b21cfb932d7ff91bd013cde6d7
 2011-12-16 17:56:14 +09:00
Tadashi G. Takaoka
289544d6e4 Use Params instead of Builder as an argument of KeyboardSet constructor 
Change-Id: I4c576a0b0b632cdf413f2ccd5c69dbd37747fbd3
 2011-12-16 16:41:49 +09:00
Jean Chalard
196d82cdd7 Use the WordComposer to check if we are composing a word 
...instead of the hard-to-understand mHasUncommittedTypedChars.
This is possible because now the word composer is actually aware
of commits.

Change-Id: I36b664ce8402a280f801e87b9ebe161f416b0853
 2011-12-16 15:58:29 +09:00
Tadashi G. Takaoka
6ba5f0d341 Merge "Add error log to expensive ArraysCompatUtils.binarySearch" 2011-12-15 22:55:10 -08:00
Jean Chalard
be2f81f055 Merge "Make the word composer aware of commits." 2011-12-15 22:54:23 -08:00
Jean Chalard
c73c26790f Make the word composer aware of commits. 
Change-Id: I04e691fbc9227d4df195429bca89edea93575347
 2011-12-16 15:41:10 +09:00
Tadashi G. Takaoka
f8481883cc Add error log to expensive ArraysCompatUtils.binarySearch 
Change-Id: Id33998e2a99be9249de4011892555f10c5d0968d
 2011-12-16 15:34:11 +09:00
Tadashi G. Takaoka
cfd5b4811f Merge "Cleanup ProximityInfo.calulateSweetSpot" 2011-12-15 22:21:17 -08:00
Tadashi G. Takaoka
f1e05e74e6 Merge "Add com.android.inputmethod.latin.suggestions package" 2011-12-15 22:00:05 -08:00
Tadashi G. Takaoka
6cb72b0f36 Cleanup ProximityInfo.calulateSweetSpot 
Change-Id: I98238359dffd76a620d3b0e73b3b22dd82c56c93
 2011-12-16 14:59:24 +09:00
Tadashi G. Takaoka
8c3d5b6961 Add com.android.inputmethod.latin.suggestions package 
Change-Id: If4b823768ab9c073625da3034ecc8091be1df230
 2011-12-16 14:21:44 +09:00
Tadashi G. Takaoka
8950f259b1 Merge "Make Key.mPreviewIcon public final" 2011-12-15 21:20:46 -08:00
Tadashi G. Takaoka
0b6237da94 Make Key.mPreviewIcon public final 
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
 2011-12-16 12:47:34 +09:00
Tadashi G. Takaoka
a44685ab32 Add colorValidTypedWord and alphaValidTypedWord 
This change fixes Gingerbread theme.

Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
 2011-12-16 12:26:19 +09:00
Tadashi G. Takaoka
e9a0efc242 Merge "Cleanup unused variables and parameters" 2011-12-15 18:02:38 -08:00
Tadashi G. Takaoka
2ac5988f84 Cleanup unused variables and parameters 
Change-Id: Iad756a7a775c93f3344c6962e7b3456ef8339490
 2011-12-15 20:26:12 +09:00
Jean Chalard
05f654d498 Merge "Group all input-related info into an inner class." 2011-12-15 03:21:47 -08:00
Tadashi G. Takaoka
c3ef86d861 Merge "Fix auto correction spacebar LED" 2011-12-15 03:19:32 -08:00
Jean Chalard
27dff63833 Group all input-related info into an inner class. 
Currently, these variables hold the info about the composing
word, or maybe some outdated info, and it's not very clear
which it is. LatinIME is maintaining the freshness info in
a separate boolean, and uses it throughout the code for many,
many things, leading to much confusion.
The idea in grouping this info is, it can be saved in another
instance and restored later. It can be tested against to know
whether there is actually outdated but kept info or not, and
it should allow to straighten out what is actually currently
being typed. Ultimately, it will eliminate the need for
LatinIME to keep track of the status of the info in the
word composer.

Change-Id: I00e2c690f303f8320c9be35590a6df4583e9e456
 2011-12-15 19:58:04 +09:00
Tadashi G. Takaoka
2d74806262 Change visibility to avoid synthetic accessor method 
Change-Id: Ie93c7437fb9a3fe63adaa48c2d4a723f96c0a0e1
 2011-12-15 19:50:53 +09:00
Tadashi G. Takaoka
23d27fefcb Fix auto correction spacebar LED 
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
 2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka
b8c2c6e2ec Merge "Add XmlParseUtils class" 2011-12-14 03:02:17 -08:00
Tadashi G. Takaoka
d549d4334f Merge "Remove long press settings key function" 2011-12-14 03:02:09 -08:00
Tadashi G. Takaoka
17dc10724b Remove long press settings key function 
Bug: 5759092
Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
 2011-12-14 19:47:17 +09:00
Tadashi G. Takaoka
4665463ccd Add XmlParseUtils class 
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
 2011-12-14 19:46:03 +09:00
Tadashi G. Takaoka
6652e45899 Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private" 2011-12-14 02:43:06 -08:00
Tadashi G. Takaoka
90c12077b2 Merge "Remove EditorInfo from KeyboardId" 2011-12-14 02:42:58 -08:00
Tadashi G. Takaoka
7a91deb685 Move Keyboard.themeName to KeyboardSwitcher and make it private 
Change-Id: I101b6927d43e86b3c636c1a527e181df8af9c73e
 2011-12-14 19:01:20 +09:00
Tadashi G. Takaoka
a042150a69 Merge "Just ignore settings/shortcut key while typing on tablet" 2011-12-14 01:59:46 -08:00
Tadashi G. Takaoka
2d603fff64 Remove EditorInfo from KeyboardId 
Change-Id: I70919ff30622afa1d8c29ca45589fa617f2c1f0e
 2011-12-14 18:58:55 +09:00
Jean Chalard
9750165c9a Merge "Cleanup" 2011-12-14 01:50:25 -08:00
Tadashi G. Takaoka
014b755f8a Merge "Cleanup KeyboardId's hasCode method" 2011-12-14 01:48:46 -08:00
Jean Chalard
f3ca6a59a7 Cleanup 
Change-Id: I724df0be7ac07ffb9f1f4974175aed5a2606221b
 2011-12-14 18:42:47 +09:00
Tadashi G. Takaoka
601e411c13 Cleanup KeyboardId's hasCode method 
Change-Id: I5fd8f6ac0f42152fb0e2aaaedc6092f6d82fe677
 2011-12-14 18:42:20 +09:00
Jean Chalard
64361bd66d Merge "Move some code inside a function to simplify flow" 2011-12-14 01:42:17 -08:00
Jean Chalard
676917dea2 Merge "Fail faster in case of a bug" 2011-12-14 01:42:05 -08:00
Tadashi G. Takaoka
2c4b21d7ca Merge "Cleanup settings key related stuff" 2011-12-14 01:36:34 -08:00
Jean Chalard
1c6cf26c37 Move some code inside a function to simplify flow 
Also rename the function to reflect better the behavior.
An upcoming change will clean up the remnants

Change-Id: I19bdf0d9e95f62ee749e1f64fe17132c4a5ef0bc
 2011-12-14 17:56:57 +09:00
Jean Chalard
46798d8f1f Fail faster in case of a bug 
Change-Id: Ibea64133f200dce80034c641d4798b62843a2512
 2011-12-14 17:54:18 +09:00
Tadashi G. Takaoka
623d0155b6 Just ignore settings/shortcut key while typing on tablet 
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
 2011-12-14 17:14:44 +09:00
Jean Chalard
b588003426 Refactoring. 
Small simplification of the code.

Change-Id: I1f67ae529bbb2c9316bf5e083d367c57040ea22c
 2011-12-14 16:59:25 +09:00
Tadashi G. Takaoka
8b1b8aae9c Cleanup settings key related stuff 
Change-Id: Ie0d1204e94fcdf9d578974256bf2ae3e87797f13
 2011-12-14 16:34:35 +09:00
Tadashi G. Takaoka
e35e13fc7d Merge "Record onStartInputView" 2011-12-13 23:31:43 -08:00
Tadashi G. Takaoka
689b901156 Merge "Utilize KeyboardSet XML definitions" 2011-12-13 23:31:00 -08:00
Jean Chalard
dbdb385bb0 Merge "Fix a long-standing race condition." 2011-12-13 23:29:47 -08:00
Tadashi G. Takaoka
f86109ca56 Utilize KeyboardSet XML definitions 
This change introduces KeyboardSet and SubKeyboard XML definitions to
represent a set of keyboard layouts.

Bug: 5002108
Bug: 5679585
Change-Id: Ib6c8d5936187381bb6725c9fe574e93871c01a86
 2011-12-14 16:28:31 +09:00
Jean Chalard
514beb0992 Fix a long-standing race condition. 
Upon autocorrection, there is visual feedback in the text
view that quickly flashes the background of the text that
just changed. This fixes a race condition that happens
upon autocorrection when typing fast, and that results in
flashing one character too far left (typically, the flashing
area includes the whitespace before the corrected word and
not the last character of the corrected word).
This happens because the call to commitCorrection may
happen before or after the IPC sent by sendKeyChar, but the
arguments are fit only for the case where it arrives first.

Change-Id: I9b5442a665aad5a9bc66cd49228075b9056b37fa
 2011-12-14 16:24:18 +09:00
Tadashi G. Takaoka
7ef235f53f Record onStartInputView 
Bug: 5722703
Change-Id: I56bcf6ccde82b4176093de4f197a8736b0cc8c10
 2011-12-14 16:22:30 +09:00
Jean Chalard
8e3faff244 Merge "Decouple member logic from control flow" 2011-12-13 06:28:48 -08:00
Jean Chalard
7b5bc1ff4d Decouple member logic from control flow 
This place is very confusing because a member variable with
a consistent meaning is hijacked for the duration of a function
to mean something else. This is in the way of easy-to-understand
refactoring.

Change-Id: If79bc771950d6bfc0ad5f0e9c51c7ef1dbb45b66
 2011-12-13 23:15:12 +09:00
Jean Chalard
f7d6517d6b Various mini-cleanups 
- Stop the word composer from escaping - take a page from the law
  of Demeter and only report what is actually needed.
- Fix typos in comments.
- Add a comment for a fishy processing.
- Remove a useless local variable.

Change-Id: I5fa78901cbb5483fc9683bfb7094f47244b85df6
 2011-12-13 23:09:22 +09:00
Jean Chalard
edf4995a3b Merge "Remove the input connection sidework from handleCharacter" 2011-12-13 04:28:30 -08:00
Jean Chalard
dafa7a8e15 Remove the input connection sidework from handleCharacter 
Change-Id: I3d376dfda3acd8864274390de3ff5752b18456e0
 2011-12-13 21:12:07 +09:00
Jean Chalard
117fc93f37 Move mBestWord to the word composer. 
mBestWord has a confusing name - it's actually an auto-correction.
It's cleaner if it lives in the word composer because an
auto-correction should be tied to a specific user input, and
should be reset each time the user input changes to avoid
race conditions.

Change-Id: I718d29395bc747372067e6440e090c6a181994ae
 2011-12-13 21:06:51 +09:00
Jean Chalard
7e6f4daa19 Merge "Tighten conditions for space-related cancelling" 2011-12-13 01:23:15 -08:00
Jean Chalard
c525750835 Merge "Consolidate underlining code under one function." 2011-12-13 01:22:08 -08:00
Tadashi G. Takaoka
cfe264bfee Merge "Introduce KeyboardSet to hold related KeyboardIds" 2011-12-13 01:12:10 -08:00
Tadashi G. Takaoka
c42f285b35 Introduce KeyboardSet to hold related KeyboardIds 
This change moves
  * KeyboardSwitcher.getKeyboardId to KeyboardSet.<init> and
    KeyboardSet.getKeyboardId.
  * KeyboardSwitcher.getF2KeyMode to KeyboardSet.
This is the first step to get rid of shift state from Keyboard.

Bug: 5002108
Bug: 5679585
Change-Id: I2a5a97e5e89277bc606916d45c1afbc8d105d773
 2011-12-13 18:10:50 +09:00
satok
3dcba4279a Merge "Extract the jni library name" 2011-12-13 00:46:16 -08:00
Jean Chalard
77d59b0691 Consolidate underlining code under one function. 
Change-Id: I4393ff1ec28a6b3118d1344dd6d82d04899dea42
 2011-12-13 17:42:27 +09:00
Jean Chalard
8ad4013406 Tighten conditions for space-related cancelling 
Instead of ignoring silently a found bug, throw an exception.

Change-Id: I0aa96d0cab022b6a5e7cffe8a592dcc443c3c7a8
 2011-12-13 17:40:06 +09:00
Tadashi G. Takaoka
77ecf52a08 Merge "Remove KeyboardSwitcher.updateShiftLockState method" 2011-12-13 00:27:01 -08:00
satok
ba526e3157 Extract the jni library name 
Change-Id: Icc58ccea1178d9f35f5be0dceebab67bbb965b7f
 2011-12-13 17:25:43 +09:00
Tadashi G. Takaoka
34f1820396 Remove KeyboardSwitcher.updateShiftLockState method 
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
 2011-12-13 16:57:23 +09:00