Commit Graph

3365 Commits (b577005a360f26d090a83b9243f125a8a43c99d2)

Author SHA1 Message Date
Tadashi G. Takaoka fed72d6038 Merge "Support fixed order more keys" 2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka aeeed75848 Support fixed order more keys
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Eric Fischer 823b8a4a57 Merge "Import translations." 2012-02-16 21:16:40 -08:00
Jean Chalard 8e4b3bbf9f Don't assume a word has been added to the user dict
The user may now cancel or edit a word upon adding to the
user dictionary. We can no longer assume the word has been
added as is and for the current locale. We should just rely
on standard mechanisms that inform us of new insertions.

Bug: 6015347
Change-Id: I069b19c0c844ca29d6de4c4d162306f9413adea8
2012-02-16 19:19:05 -08:00
Tadashi G. Takaoka 03c3018492 Merge "Use additional proximity chars even when no key is detected." 2012-02-16 19:17:48 -08:00
Tadashi G. Takaoka 9025c55e9f Use additional proximity chars even when no key is detected.
Change-Id: I06a8c66421fcdd43066934ec31d0a38a7cf12bf2
2012-02-16 18:58:47 -08:00
Tadashi G. Takaoka beb08b398f Remove unnecessary and harmful KeyboardState.onUpdateShiftState call
This change also cancels double tap and long press timers if other
letter key is pressed after shift key.

Bug: 5693999
Bug: 6017610
Change-Id: I3b5f3debfb8915fa73a93b409a38afadf24132e9
2012-02-16 18:02:17 -08:00
Eric Fischer 482e0ef983 Import translations.
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
Jean Chalard 25ff89a75c Merge "Activate bigram predictions from the binary dictionary" 2012-02-15 20:00:54 -08:00
Jean Chalard ad290d6505 Activate bigram predictions from the binary dictionary
Change-Id: If1cc50539d7677b854b1cd3bea3423c8c0865de5
2012-02-15 19:51:24 -08:00
Jean Chalard a252e0547f Reactivate the bigram prediction option
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -08:00
Eric Fischer 05f09b6d58 Merge "Import translations." 2012-02-14 16:36:51 -08:00
Eric Fischer a476f75209 Import translations.
Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8
2012-02-14 16:32:59 -08:00
Ken Wakasa 95dc18a7c4 Follow up to Ie2416ccd
space &#x0020 got lost in some parsing process

Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
2012-02-15 08:23:34 +09:00
Ken Wakasa a56639613b Use more standard Unicode notations in keyboard layout resource files.
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Eric Fischer b396ea9ede Import translations. DO NOT MERGE
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Ken Wakasa f6f40539aa Minor string updates in Android keyboard settings
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
Ken Wakasa 09c677f56a Replace UTF-8 string resources with their hex representations
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Eric Fischer 1bd181fefa Import translations.
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
Tadashi G. Takaoka 6213983fa1 Refactor MoreKeysKeyboard.Builder
Change-Id: Ib5f58b1143be60c748b81299ccc3b237d2587846
2012-02-10 18:53:54 +09:00
Tadashi G. Takaoka b9e10c318a Merge "Key should be distinguished also by moreKeys contents and etc." 2012-02-09 23:51:18 -08:00
Charles Chen 4baf767fac Merge "Improved shift key and symbol/alpha switch key accessibility feedback." 2012-02-09 15:33:40 -08:00
Eric Fischer 0d1a5bad54 Import translations. DO NOT MERGE
Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
2012-02-09 12:46:37 -08:00
Tadashi G. Takaoka fdb6999e55 Key should be distinguished also by moreKeys contents and etc.
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
2012-02-10 03:17:39 +09:00
Jean Chalard accd2a9f61 Merge "Add finals" 2012-02-08 19:08:09 -08:00
Jean Chalard a828f613a8 Merge "Some more simplification" 2012-02-08 19:05:46 -08:00
Jean Chalard 8ff0564f6a Add finals
Change-Id: Ib81be9a0df34c5e9fc49d2b5d9bf02297ea2b499
2012-02-09 11:40:54 +09:00
Jean Chalard 6a800b253f Some more simplification
Remove useless method calls, and ultimately remove useless
method.

Change-Id: I3f353b1b37460d5e9ceae5cb5dde3fff0da81c21
2012-02-09 11:38:03 +09:00
Jean Chalard 4721427c7d Allow revert swap punctuation again
This may not be the best behavior, but it's the same as ICS.
Bug: 5981844

Change-Id: Ibb7798e2a315312310ed3be4e731d0fe1ac04456
2012-02-09 11:34:00 +09:00
Eric Fischer 7ef97ea1f9 Import translations. DO NOT MERGE
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
2012-02-08 13:56:30 -08:00
Tadashi G. Takaoka 5962312b07 Custom action label should be a part of keyboard identifier
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
2012-02-08 20:09:39 +09:00
Tadashi G. Takaoka 7a39bd4454 Shift+Smiley key will register newline character of textMultiLine
This change also
 * Honors the custom action label in EditorInfo.actionLabel.
 * Invokes InputConnection.performeEditorAction if action is specifed
   at EditorInfo.imeOptions or actionLabel/actionId.
 * Stops using InputMethodService.sendKeyChar. Implements
   sendKeyCodePoint instead.

Bug: 2498607
Bug: 5961809
Bug: 5368408
Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
2012-02-08 19:31:35 +09:00
Jean Chalard 82efc941ba Merge "More simplification" 2012-02-08 01:43:23 -08:00
Jean Chalard e771fc2f1a More simplification
A suggested punctuation is sure to be 1 character and a word separator,
so the isSuggestedPunctuation() test is redundant.

Change-Id: I3d31f0825f069f64d514682e46be62afdae25291
2012-02-08 18:17:51 +09:00
Tadashi G. Takaoka 614cb02a91 Merge "Rename mini keyboard to more keys keyboard" 2012-02-08 00:04:16 -08:00
Tadashi G. Takaoka 2affaf91a0 Rename mini keyboard to more keys keyboard
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
Jean Chalard 1bd1cd19c0 Merge "Fix the auto-composer to support supplementary chars" 2012-02-07 22:46:22 -08:00
Jean Chalard 9159b9953d Fix the auto-composer to support supplementary chars
Change-Id: I61ff218ae2ca4eb443a370e581b677755258670a
2012-02-08 15:45:51 +09:00
Tadashi G. Takaoka 71a14420d8 Merge "Fix obvious bug" 2012-02-07 22:42:18 -08:00
Tadashi G. Takaoka 93bc5e7fda Fix obvious bug
Change-Id: I3a0e5c699bbe4e9274dacdbdf92dff14148bd2c1
2012-02-08 15:35:56 +09:00
Jean Chalard 8174373a0e Merge "Remove a nested edition occurence" 2012-02-07 19:42:35 -08:00
Jean Chalard 5a6daf46cf Merge "Cleanup" 2012-02-07 19:42:26 -08:00
Jean Chalard 862f950da3 Cleanup
Remove a useless test (we can only come here if the code
is not a separator, as we are only called from onCodeInput
inside an explicit test).

Change-Id: Icd996a5a1c18a550117a144a1d35f167b96211f7
2012-02-08 12:06:18 +09:00
Jean Chalard 2124bc5bf5 Remove a nested edition occurence
This was harmless but confusing

Change-Id: Ic271f80d3dadf01b29e3875c6a8ad51b99a936f9
2012-02-08 12:03:55 +09:00
Jean Chalard 2e2d6b4d40 Small simplification
Change-Id: I55f81f3ab427fd5b28bb1f31960077cd1897cbd0
2012-02-08 11:41:15 +09:00
Jean Chalard 1b986cc488 Merge "Fix a bug with manual pick then dotcom key" 2012-02-07 16:59:47 -08:00
alanv 8d4f0d5d1d Improved shift key and symbol/alpha switch key accessibility feedback.
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
2012-02-07 13:14:18 -08:00
Eric Fischer 5b7f50b10b Import translations. DO NOT MERGE
Change-Id: I01b1e6476b50108810eb61ad45a198db2b52b7de
2012-02-07 11:14:31 -08:00
Tadashi G. Takaoka c217dc9237 Convert one letter Key.outputText to Key.code
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.

Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
2012-02-07 22:34:20 +09:00
Tadashi G. Takaoka 69f672a4b3 Merge "Remove unused InputConnection argument" 2012-02-07 04:15:07 -08:00
Jean Chalard 12d67e6d5d Fix a bug with manual pick then dotcom key
Inhibit adding phantom space for tld keys even if the last
character inserted in the textview is not a dot

Change-Id: Ie92554ead7a18c932480905c5738aff7c0159a32
2012-02-07 20:36:48 +09:00
Tadashi G. Takaoka 64eaa67eb5 Remove unused InputConnection argument
Change-Id: Ic45c8c6e7730775654317fb6e2d1cb64f9031f46
2012-02-07 19:38:06 +09:00
Jean Chalard cfec7e72fd Merge "Fix a race condition that makes tests unstable" 2012-02-07 02:28:12 -08:00
Jean Chalard 816a8a0fd8 Fix a race condition that makes tests unstable
Change-Id: Ic19d380eb64855884bc6ded8547c200dd772ffe9
2012-02-07 19:22:37 +09:00
Tadashi G. Takaoka 4a3c0918dc Merge "Fix KeyStyles to be able to override the value in style" 2012-02-07 02:04:22 -08:00
Tadashi G. Takaoka 17f53103ee Fix KeyStyles to be able to override the value in style
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
2012-02-07 18:51:51 +09:00
Jean Chalard 172a013ab5 Fix a bug with the auto-correct indicator
Bug: 5969106
Change-Id: I02d4b9184bb2c3fc0d08ffd5db77a9f9d816631f
2012-02-07 17:20:23 +09:00
Jean Chalard a7f2500001 Fix a bug with common objects.
Bug: 5961179
Change-Id: I452efc552c6ab390931f25557d7aee5a64bf054e
2012-02-06 18:41:00 +09:00
Eric Fischer 3f8fc4de9a Import translations. DO NOT MERGE
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08:00
Tadashi G. Takaoka f6cf387edc Merge "Recursively resolve @string/resource reference in key key spec parsing" 2012-02-03 03:20:37 -08:00
Tadashi G. Takaoka aca8870128 Recursively resolve @string/resource reference in key key spec parsing
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
2012-02-03 20:03:23 +09:00
Jean Chalard 9f17de5b4d Merge "Stop inserting a space after a manually picked word." 2012-02-03 02:09:05 -08:00
Tadashi G. Takaoka 24cd2617f5 Filter out empty entry from more keys CSV
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
2012-02-03 18:48:01 +09:00
Jean Chalard fb684cebe8 Stop inserting a space after a manually picked word.
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
2012-02-03 18:45:44 +09:00
Tadashi G. Takaoka 909b2940db Merge "Get rid of Key.setIcon(Drawable)" 2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka 98aa476131 Merge "Shift + smiley key become return key" 2012-02-02 21:46:50 -08:00
Tadashi G. Takaoka e7948a8692 Get rid of Key.setIcon(Drawable)
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
Jean Chalard 825e2bbd91 Fix a bug when deleting the last char
And unit test

Change-Id: Ic4fc3626f8b86e10156d770d41cd6deab5d31f39
2012-02-03 13:03:54 +09:00
Tadashi G. Takaoka 56d1dc5a58 Shift + smiley key become return key
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
Jean Chalard 71915a3722 Merge "Fix string iterations in a couple places." 2012-02-02 18:40:19 -08:00
Tadashi G. Takaoka ebfae7f5e0 Merge "Fix key repeat interval timeout" 2012-02-02 18:22:24 -08:00
Jean Chalard 9242a2bcf8 Fix string iterations in a couple places.
Seems I didn't get how to iterate on a String correctly >.>
Talk about a big bug. Anyway, I think it's working now.

Bug: 5955228
Change-Id: I988c900cf2a16c44b9505cfd4f77c7cda7e592f0
2012-02-03 11:15:46 +09:00
Tadashi G. Takaoka 32c54c4dbe Fix key repeat interval timeout
Bug: 5960472
Change-Id: I27d4b81d393f2ace946740a0b0801cea8c63b5b8
2012-02-03 10:02:22 +09:00
Eric Fischer fbd83a8712 Restore deleted string still referenced from code to fix the build.
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
Eric Fischer 8a0bb00989 Import translations. DO NOT MERGE
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08:00
Tadashi G. Takaoka 44e0e4f99e Fix Key.equals(Key)
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
2012-02-02 21:33:50 +09:00
Tadashi G. Takaoka 5852a2594f Parse escaped sequence strictly in CSV parser
This change alters the CSV parser behavior. The parser only resolves
  * String resource reference. ["@string/res" -> "<content_of_res>"]
  * Other occurrence of escape sequence will be intact. ["\x" -> "\x"]

Before this change, escape sequence in moreKeys string is parsed three
times. At first in parsing string resource, next in CSV parser, and at
last in KeySpecParser. So that representing single escape character
itself is a bit annoying, "\\\\\\\\".

Now we can represent single escape character itself in string resource by "\\\\".

Change-Id: Ib978e17b779cc82585eed8241ac3857508b14bc7
2012-02-02 20:19:26 +09:00
Tadashi G. Takaoka 8261a4cad7 Merge "Move CSV parser to KeySpecParser" 2012-02-01 23:25:17 -08:00
Tadashi G. Takaoka 0086861d5a Move CSV parser to KeySpecParser
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
2012-02-02 16:10:14 +09:00
satok e05b3f4b3a Support additional proximity characters
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
2012-02-02 16:07:16 +09:00
Tadashi G. Takaoka 8ca325f437 Merge "Make KeySpecParser and CSV parser code point aware" 2012-02-01 22:56:54 -08:00
Tadashi G. Takaoka e01d272603 Make KeySpecParser and CSV parser code point aware
This change also renames MoreKeySpecParser to KeySpecParser

Change-Id: I35733cdbb344f16b57ffa2cfe79055c089b4e409
2012-02-02 15:51:40 +09:00
Jean Chalard 51fd1632f5 Stop throwing an exception in some corner cases.
When the application is modifying the text under our feet,
we may come through this code path. We should log the error
rather than crash.

Bug: 5869235
Change-Id: Ic0fd24c3bc805d44c5db0ad781ddebeca0450614
2012-02-02 15:15:55 +09:00
alanv c603409f28 Removed CODE_CAPSLOCK from keyboard accessibility (fixing build).
Change-Id: Ibc7ef979276f563444f3c24e69ac32de5d4eb6e8
2012-02-01 10:27:52 -08:00
Charles Chen 02dd837805 Merge "Removed spoken descriptions for characters supported by TTS or TalkBack." 2012-02-01 10:00:17 -08:00
Charles Chen 9737351775 Merge "Refactored shift key spoken description into separate method." 2012-02-01 09:59:59 -08:00
Tadashi G. Takaoka 71c695da22 Remove BIDI mirroring hack from Key
This change also removes isRtlKeyboard attribute from <Keyboard/>

Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +09:00
Tadashi G. Takaoka 40e9012276 Fix wrong long press timeout for shift key
Change-Id: Ifafbed1bcdaf662ee6a69050043739fa71986841
2012-02-01 21:15:34 +09:00
Tadashi G. Takaoka ff858c7ff5 Use MoreKeySpecParser to parse puctuations strip resources
This change also
  * Doesn't use Key.getRtlParenthesisCode to get correct parentheses
    code in RTL context. Intead uses the outputText feature of
    moreKeys specification.
  * Move CVS string parser from KeyStyles to Utils.

Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
2012-02-01 19:33:26 +09:00
Tadashi G. Takaoka a5c96f376a Move long press shift handling from PointerTracker to KeyboardState
This change also
  * Rename phone shift keyboard to phone symbols keyboard.
    Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
  * Remove phone symbols keyboard from tablet.
  * Introduces enableLongPress flag of Key.keyActionFlags attribute.
  * Remove clumsy long press code from PointerTracker.
  * Remove CODE_CAPSLOCK handling from LatinIME.
  * Make KeyboardSwitcher to invoke haptic and audio feedback.

Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
2012-02-01 19:04:21 +09:00
alanv 7ca1249797 Refactored shift key spoken description into separate method.
Change-Id: I183462a68fdfd339404740fa1564f737430d73d9
2012-01-31 13:03:39 -08:00
alanv f3e951b259 Removed spoken descriptions for characters supported by TTS or TalkBack.
Change-Id: Iddef18559bc6af9487e536a33607b0a0b07df282
2012-01-31 13:02:33 -08:00
Tadashi G. Takaoka 3feb99fa6c Merge "Save/restore alphabet shift locked state while rotating even in symbols mode" 2012-01-31 02:26:41 -08:00
Tadashi G. Takaoka 49bd49c8fb Save/restore alphabet shift locked state while rotating even in symbols mode
Bug: 5730212
Change-Id: Id2342dacd149d6385d61001f880ebcd1883cf0b4
2012-01-31 19:11:39 +09:00
Tadashi G. Takaoka aab33aac0a Merge "Cleanup redundant methods of KeyboardSwitcher" 2012-01-31 01:33:17 -08:00
Tadashi G. Takaoka 88e079ae6b Cleanup redundant methods of KeyboardSet
Change-Id: I69fa1b5661695d0323222c2969679f4792b6ef0d
2012-01-31 18:27:37 +09:00
Tadashi G. Takaoka 0ed2d3a449 Fix double tap shift key enable/disable shift locked mode
Bug: 5942452
Change-Id: I2c7b1605bceac2b2f929cd4d97c417ef15c6f754
2012-01-31 18:06:54 +09:00
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 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 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
Ken Wakasa a7549867c1 Add comments along with Ic108f301
Change-Id: Ic754662865511ad44e99d070585bd9482379c2a0
2012-01-24 11:31:21 +09:00
Jean-Baptiste Queru 11c41216f1 Merge 2577fca1
Change-Id: Ie2c9f6c2eafb59dff95db8954481ce49c87a6d44
2012-01-23 09:06:00 -08: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
Jean-Baptiste Queru 2577fca158 am 9a84071b: Merge "Make the JNI lib an optional module"
* commit '9a84071b36b71c9cf2b454b45308f6c1e22c0c26':
  Make the JNI lib an optional module
2012-01-20 12:02:31 -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 4dd48372d7 Merge "Add Bulgarian keyboard" 2012-01-18 20:06:11 -08:00
Tadashi G. Takaoka 3fbf9f85a2 Add Bulgarian keyboard
Bug: 5864001
Bug: 5738545
Change-Id: I3aa8a0e531e091680c0e05c55e72edd05e5ebc77
2012-01-19 12:59:59 +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
Robert CH Chou bd1ed5b859 Make the JNI lib an optional module
Make it a user module will force it installed no matter the
IME is actually required by the product or not. Replace the
user by optional and add requiring the libjni_latinime by using
LOCAL_REQUIRED_MODULES

Change-Id: Ibfc37cf2e2391021d45538c7cea342894b56fbf8
2012-01-19 10:02:25 +08:00
Tadashi G. Takaoka 7dde805745 Enable usability study mode option
Change-Id: Iadd69fbde42b895dd30f98890f59b56cdcdd4007
2012-01-18 20:17:57 +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
Jean Chalard cc6ded7a1a Add a whitelist entry
nit → not

Change-Id: I8d0fc6fe4b769cd76c8059848a8ec249bb9fea0d
2012-01-18 15:25:00 +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
satok 53f56ddef9 Merge "Change the application name of aosp latin ime" 2012-01-11 21:31:46 -08:00
satok c1da6566dd Change the application name of aosp latin ime
Change-Id: I96281709736bc20d70e63af170bfb48b5df3f18d
2012-01-12 14:27:22 +09: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
Ken Wakasa 4b23789ecb Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well." into ics-mr1 2012-01-11 14:49:45 -08:00
satok 6d3b422f97 Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype
Bug: 5806103

Change-Id: Iffdc68565f4a8b5af98247a4dff9dc4e76b4056a
2012-01-11 14:06:06 +09:00
Tadashi G. Takaoka 2611d3d751 Merge "Get rid of Keyboard.CODE_DUMMY" 2012-01-10 01:52:53 -08: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 82b3727c83 Fix proguard.flags to keep method for testing
Change-Id: Iab6c9a4104e8eec3eeb55fdb063d4368338ac74d
2012-01-10 17:19:01 +09:00
Tadashi G. Takaoka 33e2813d09 Merge "Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter" 2012-01-09 22:25:37 -08: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 0723b94ec2 Fix Slavic layout on phone device
Change-Id: I7da35502072e336ba2c32fc78827f5dff1bedddc
2012-01-10 12:52:55 +09:00
Tadashi G. Takaoka 3e405f3afd DO NOT MERGE. Save keyboard layout only when it is shown
This is a cherrypick of I150b4a05 from master to ics-mr1.

Bug: 5130446
Bug: 5787394
Change-Id: Ie0d58283042166537ff161344564c3c51b0d1296
2012-01-05 17:28:19 +09:00
Eric Fischer 07af2249bb Import revised translations.
Change-Id: Ie6d481360e801a67f4bc0309a7151b1640bd3c40
2011-12-29 13:37:16 -08: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
Tadashi G. Takaoka 77e7532dab Merge "Make Estonian keyboard Scandinavian variant" 2011-12-25 21:09:49 -08:00
Ken Wakasa 2168795ea6 DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.

bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
2011-12-26 12:55:32 +09:00
Tadashi G. Takaoka 6aa7fc0984 Make Estonian keyboard Scandinavian variant
This change also fixes Scandinavian keyboard layout around "a" key.

Bug: 5627326
Change-Id: I65da7a56a28d90eabcffcd616164d8e8c1111c96
2011-12-26 12:51:20 +09:00
Ken Wakasa 10862aa4d0 Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
bug: 5800592
Change-Id: I0c9abc807ab0100b3839fc7f0f40c6c1a66e0a6e
2011-12-24 17:29:02 +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 e5748387ac Merge "Remove redundant logs" 2011-12-16 07:35:23 -08:00
Ken Wakasa 3425852be4 Remove redundant logs
bug: 5722703
Change-Id: I6b7285ad6f5c0c8486d24712f22249f83a1c6396
2011-12-17 00:22:01 +09:00
Tadashi G. Takaoka fd113151fd Add Vietnamese keyboard
Bug: 5738545
Change-Id: I96abf6807e9375e352a505b822dd50b4d1a7a252
2011-12-16 22:39:56 +09:00
Tadashi G. Takaoka 45a0b32941 Add Slovenian keyboard
Bug: 5738545
Change-Id: Id88a30d3fe46988ac2e0ad129b7bea53b8c7ab07
2011-12-16 22:16:48 +09:00
Tadashi G. Takaoka 9fd014ebb7 Add Slovak keyboard
Bug: 5738545
Change-Id: I40178f8fc0be4a9fcfc7496dae262574dd0267f9
2011-12-16 22:12:01 +09:00
Tadashi G. Takaoka 62ac4561eb Add Rumanian keyboard
Bug: 5738545
Change-Id: I88ef1a461cf94f10578b5751d0a2fd6abbfd84d9
2011-12-16 22:01:21 +09:00
Tadashi G. Takaoka 969b4e78ce Add Ukrainian keyboard
Bug: 5738545
Change-Id: I78ff8d1c7aa96f3522989e138334b96c5f2aba02
2011-12-16 21:59:40 +09:00
Tadashi G. Takaoka 45affceb76 Merge "Add Kyrgyz keyboard" 2011-12-16 04:46:09 -08: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 26e53b4b7d Add Kyrgyz keyboard
Bug: 5738545
Change-Id: I9fda2c75654ab4bbaaeb9ee2442dda0a73a3e07e
2011-12-16 21:16:39 +09: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 64506cd038 Merge "Remove a write-only variable." 2011-12-16 04:01:39 -08:00
Tadashi G. Takaoka d99d28b764 Add Belarusian keyboard
Bug: 5738545
Change-Id: I60113c248a5a122e71e20273d44406e8199fa0eb
2011-12-16 20:56:53 +09:00
Jean Chalard 4d0f03bd66 Remove a write-only variable.
Change-Id: I825307a429f46b31ed9bd940b5a97d2713127dfe
2011-12-16 20:54:58 +09:00
Tadashi G. Takaoka 94a3f8f243 Generalize Russian to Slavic layout
Adding Belarusian, Kyrgyz, and Ukrainian keyboards will follows.

Bug: 5738545
Change-Id: I05055d519fac8c67f728cee693b133c3dfb29047
2011-12-16 20:54:25 +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