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

1972 commits

Author SHA1 Message Date
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