Commit Graph

729 Commits (7c06332be25535ed8182a348ba8e5535870f9f29)

Author SHA1 Message Date
Tadashi G. Takaoka 071f47140c Refactor BinaryDictionary a bit
This changes:
* Flag initialization code in BinaryDictionary to be more unit test friendly.
* Removing unnecessary class hierarchy of LatinIME inner class WordAlternatives.
* Formatting normalized score neatly.

Change-Id: I9f10c093d4f36258fe883cf3fb10cbbda2770497
2011-03-16 19:46:19 -07:00
satok 296100fd5a Fix build breakage
Change-Id: If7edc837fb5905fc7b66ef9cf20ac1b097795216
2011-03-16 18:41:29 -07:00
Tadashi G. Takaoka e7a2512aa3 Add Utils.equalsIgnoreCase methods
This change also corrects usage of "frequency", "priority" and "score"
* Frequency is the relative probability in dictionary.
* Score is the relative probability in suggestions.
* Priority is kind a sorted score.

Change-Id: Iafb135a4ecdb401cc505014a07c74dfcac44d699
2011-03-16 16:03:05 -07:00
Jean Chalard d631651b12 Avoid the removal of high-ranking exactly typed candidates.
It used to be the case that the scoring system turns up the same word
that was entered with a different capitalization, but with a lower
score than some other, more frequent word. To cope with this, there
was code that would order such candidates in the first slot no matter
what. This processing is now useless because fully matching words now
have a huge boost that ensures they will get to the top of the list,
before any non-fully matching word (which means, differing only by
capitalization or accents).

The bug that did happen with this was, if a fully-matching word got
matched by several processing passes, and the (chronologically) later
score affected to this word was weaker, it would result in the
duplicate removal pass removing the stronger score. This in turn would
mess with autocorrect.

In an effort to keep the risk at a minimum for MR1, this change does
not actually remove the useless code, but adds a check in the odd case
to avoid the bad situation. Another change will remove the code for
ICS release.

bug: 4100269

Change-Id: I18c0575332981ffec0e257e26a360995838d521e
2011-03-15 21:12:38 -07:00
Tadashi G. Takaoka ab0ee37f52 Disable debug flag in TextEntryState
Bug: 4051276
Change-Id: I980c0dfefdf3ae70935aca9755a55d1c925a23f9
2011-03-08 12:11:47 -08:00
satok bcfce3b3b9 Add whitelist dictionary
Bug: 3447571

Change-Id: I538e4e706982129b666ca1ab1085f1b68b69f87f
2011-03-08 11:29:10 +09:00
Jean Chalard eaecb56f94 Merge "Demote skipped characters matched words with respect to length." into honeycomb-mr1 2011-03-04 22:43:16 -08:00
satok f9a5bfa147 Merge "Add the suggestion algorithm of words with space proximity" into honeycomb-mr1 2011-03-04 22:24:05 -08:00
satok 817e517e46 Add the suggestion algorithm of words with space proximity
Bug: 3311719

Change-Id: Ide12a4a6280103c092fa0f563dd5b9e3f7f5c89b
2011-03-04 20:37:18 -08:00
Jean Chalard 07a8406bc1 Demote skipped characters matched words with respect to length.
Words that matched user input with skipped characters used to be demoted
in BinaryDictionary by a constant factor and not at all in those dictionaries
implemented in java code. To represent the fact that the impact of a skipped
character gets larger as the word is shorter, this change will implement a
demotion that gets larger as the typed word is shorter. The demotion rate
is (n - 2) / (n - 1) where n is the length of the typed word for n >= 2.
It implements it for both BinaryDictionary and java dictionaries.

Bug: 3340731
Change-Id: I3a18be80a9708981d56a950dc25fe08f018b5b89
2011-03-05 13:20:19 +09:00
Ken Wakasa baf263caf4 Fix a NPE caused by a null typedWord
bug: 3514797
Change-Id: Ie1056745ded1f848d1e4f70c5344d6969de509b0
2011-03-05 12:50:58 +09:00
Tadashi G. Takaoka c2c44f94e7 Cleanup Suggest to be able to be unit test ready
Bug: 3414081
Change-Id: Ia76afac4b1a61b8953a215b7cbdb7557736f7b9c
2011-03-03 19:18:03 -08:00
satok dca305dd71 Merge "Move the auto correction functionalities to AutoCorrection.java" 2011-03-03 02:58:06 -08:00
satok 9f67e12a0e Move the auto correction functionalities to AutoCorrection.java
- Also removed a quick fix for 2nd or more suggestions.

Change-Id: I7bf46a9cd6a727473e68836954fca160c9d853e6
2011-03-03 19:51:10 +09:00
Tadashi G. Takaoka 4503e2ea98 Hide shortcut key when the shortcut IME is not enabled
Bug: 3398726
Change-Id: I5e1bfc1fec9047c1c4e4f29fbf79f0fdf9356ffb
2011-03-03 01:18:08 -08:00
Tadashi G. Takaoka 424f6ec2bc Continue swapping sentence separator and space
Bug: 3504990
Change-Id: I3de44e9d9adb0bcafa2e59685c4cdc257716b1d6
2011-03-02 22:26:44 -08:00
Tadashi G. Takaoka 662bb7c26c Refactor TextEntryState not to use enum
Bug: 3504990
Change-Id: Id1ae9715d9f9ba99702e4cd5c243026a84d6861d
2011-03-02 22:11:52 -08:00
Tadashi G. Takaoka 1eff7d77c8 Remove mIsApplicationSpecifiedCompletions flags from SuggestedWords
Bug: 3504990
Change-Id: Ib7588ab05fa8b8ab58bf3bea6ff1f644c53ebb94
2011-03-02 22:03:29 -08:00
Jean Chalard c2bbc6a449 Use translation of fallback umlauts digraphs for German.
For German : handle "ae", "oe" and "ue" to be alternate forms for
umlaut-bearing versions of "a", "o" and "u".

Issue: 3275926

Change-Id: I056c707cdacc464ceab63be56c016c7f8439196c
2011-03-03 11:52:23 +09:00
Tadashi G. Takaoka e59491460b Remain in previous state while sliding off from shift key
Bug: 3502290
Change-Id: I69b60051863c78727363ae63576c28d87fb71a3a
2011-03-02 14:59:39 -08:00
Tadashi G. Takaoka 6f99d12b07 Enable re-correction even after revert auto-correction
This change removes the boolean flag mJustReverted.  Because we
preserve separator after canceling auto-correction according to
bug#3230708, there is no need for this flag now.

Bug: 3193810
Change-Id: Icea06ece569774b494ffa4ca4a899c898661cc19
2011-03-02 11:14:04 -08:00
Tadashi G. Takaoka 8bf93c4ba5 Merge "Introduce timeout for "." shortcut" 2011-03-01 23:59:14 -08:00
Tadashi G. Takaoka fc20f2198d Introduce timeout for "." shortcut
Bug: 3294239
Change-Id: I1832be8b54cd4d55cd504a3e1e0434aa284f9592
2011-03-01 23:57:51 -08:00
Ken Wakasa 7e99a28dfc Clear suggestion strip when the suggestion starts
bug: 3488704
bug: 3480132

Change-Id: Ie895d2ad1b58dc65fe16d65baa6fccafd4a142bb
2011-03-02 16:40:08 +09:00
Ken Wakasa 18e15a1e5e Fix null token error
bug: 3499746
Change-Id: I76bd745b0623f4736c6b0aaf0ab42fd4b7c4f349
2011-03-02 07:20:27 +09:00
Ken Wakasa 025a5e356e Reset the suggestion status when composing span gets cleared
bug: 3353818

Change-Id: I87b80470015dbeb2eaaec9aa4d9d802597c18e19
2011-03-02 04:30:03 +09:00
Ken Wakasa 952cb7e973 Refactor recorrection variable and method names
Change-Id: I3cb76e622e33985a187afe0a8928ed7b261615fd
2011-03-01 15:59:06 +09:00
Tadashi G. Takaoka 2e04770adf Add output variables to BinaryDictionary's test entry
Bug: 3414081
Change-Id: I1d11710476ffadcef67b0dbfbde309e7f8344d8a
2011-02-28 17:25:38 -08:00
Tadashi G. Takaoka 6f4eba814a Add test entry for BinaryDictionary class
Bug: 3414081
Change-Id: I1a3d60698795bf28c477086838e726d498fb6de0
2011-02-28 15:08:04 -08:00
Ken Wakasa eaef1c5007 Change how to load native lib to be on the safe side
Change-Id: If170d4821b8dbc187f29137ea99d10e30c20955f
2011-02-25 18:21:02 +09:00
Tadashi Takaoka 52e96f1e89 Merge "Added support for speaking keys through accessibility service." 2011-02-24 17:45:44 -08:00
Tadashi G. Takaoka d77e968942 Merge "Add noSettingsKey private IME option" 2011-02-23 23:48:45 -08:00
Tadashi G. Takaoka 6b05d482f4 Merge "Fix AutoText enabling timing" 2011-02-23 23:47:58 -08:00
Tadashi G. Takaoka 4199e29a7d Add noSettingsKey private IME option
Change-Id: Idf74aa32c9ea565fa6771013e2d37ee952c83a57
2011-02-24 16:31:20 +09:00
Tadashi G. Takaoka 2702334165 Fix AutoText enabling timing
Bug: 3479978
Change-Id: Ic3a9e947536b1508eb2bbe45753d6f7c0e99e416
2011-02-24 16:18:24 +09:00
Jean Chalard fdc4b08309 Merge "Allow the user to save words when there is no binary dictionary." 2011-02-23 19:18:10 -08:00
satok 10c169a44d Merge "Add proximity info to native" 2011-02-23 18:28:14 -08:00
Jean Chalard 7f2ba16aa2 Allow the user to save words when there is no binary dictionary.
At the moment, if there is no binary dictionary, even when pressing the
word in the suggestion strip the option to save in the user dictionary
is not displayed. This change addresses that.

Bug: 3363756
Change-Id: I4993a7f81ed15ab948a3098cdc49663e0f109e4a
2011-02-24 11:20:21 +09:00
Alan Viverette dcade18113 Added support for speaking keys through accessibility service.
Issue: 3366636

Change-Id: I70a2ebb4420782ba4d7d874ffc2259bb1b80446f
2011-02-23 18:16:43 -08:00
satok 8fbd552292 Add proximity info to native
Bug: 3311719

Change-Id: Ie596304070e321ad23fb67a13bf05e2b6af1b54b
2011-02-23 23:04:00 +09:00
Tadashi G. Takaoka 435711dee0 Merge "Fix privateImeOptions parsing" 2011-02-23 03:03:19 -08:00
Tadashi G. Takaoka 8efc0addce Fix privateImeOptions parsing
This change deprecates "nm" private IME options and introduces new
private option, <package name>.noMicrophone, instead.

Change-Id: I9d5e3daaead2cdd42e017cd29f5f786ef3ba3649
2011-02-23 20:00:08 +09:00
Tadashi G. Takaoka edb722abef Merge "Add countryCode attribute to case tag of Keyboard" 2011-02-23 01:00:00 -08:00
Tadashi G. Takaoka 912ade36d2 Add countryCode attribute to case tag of Keyboard
Change-Id: I0480c3350a335e4cb57bba2d3484622990cd90af
2011-02-23 17:09:24 +09:00
Tadashi G. Takaoka cb97c2f140 Refactor keyboard mode holding variables
Change-Id: Id8d4e780a98292fda63b1e5bbf739eda78935a3b
2011-02-23 14:17:10 +09:00
Jean Chalard a5d5849701 Force autocorrection of matching words with different accents.
When entering a word without accents the user expects the system to
add accents automatically if there is no other matching word. This
patch ensures the accented version is promoted accordingly and
autocorrection really takes place.

Issue: 3400015

Change-Id: I8cd3db5bf131ec6844b26abecc1ecbd1d6269df4
2011-02-22 15:27:06 +09:00
Tadashi G. Takaoka 050c0462dc Display language name on spacebar even in symbol keyboard.
Bug: 3468634
Change-Id: I1a25eb71ddbd7efae6f40ea357714924a9d56dc4
2011-02-20 21:16:49 +09:00
Tadashi G. Takaoka 4adf5d9ae5 Disable non-ASCII symbol keys in password input
Bug: 3384942

Change-Id: Ifa10e84f22bb6ff85dfc397fac95a0294b2a6bea
2011-02-20 18:59:25 +09:00
Tadashi G. Takaoka a9f2fe2d59 Merge "Add "passwordInput" attribute to case tag of Keyboard" 2011-02-20 01:50:16 -08:00
Tadashi G. Takaoka 4b13b4f942 Add "passwordInput" attribute to case tag of Keyboard
This change also introduces number password (a.k.a. PIN) layout. The
text password layout will follow.

Bug: 3384942
Change-Id: I50b5e413e47a28d5285fd0468115e11ce46c7f18
2011-02-20 18:46:48 +09:00
Tadashi G. Takaoka 690b1360bf Don't play key press sound if the key is disabled
Change-Id: I1c6d1b16a7420bc7e5f97f50da549e6a89498f18
2011-02-20 18:14:05 +09:00
Tadashi G. Takaoka fdb6a194b1 Read "enabled" attribute of Key from <key-style>
This is follow up change of I1ea82d9f.

Bug: 3384942
Change-Id: If96eda69fe81edbfc1b243a6fa9f8eb6bbf4c12d
2011-02-20 15:25:57 +09:00
Tadashi G. Takaoka ea6c2e3350 Add "languageCode" attribute to "case" tag in Keyboard XML
bug: 3451586
Change-Id: I08ca80e48648ba18543e9b8ca7362c06bb61a826
2011-02-18 17:04:04 +09:00
Tadashi G. Takaoka d9c52ba623 Rename imeOptions attribute of Keyboard to imeAction.
Bug: 3384942
Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6
2011-02-18 16:56:05 +09:00
Tadashi G. Takaoka aa721c4783 Add "enabled" as an attribute of Key in Keyboard xml
If the key is marked as "enabled=false", the key will not respond to be pressed.

Bug: 3384942
Change-Id: I1ea82d9f3dfa5a9916ff3bbc736ea7e6c77426ae
2011-02-18 14:45:37 +09:00
satok 290b4a8ff9 Merge "Not to make a thread at changing view from keyboard to voice" 2011-02-17 01:45:28 -08:00
satok 060efb6d82 Not to make a thread at changing view from keyboard to voice
Change-Id: If3f89b3e9774c566a1bb2119b161c42b715e6709
2011-02-17 17:45:46 +09:00
Ken Wakasa eebbe54113 Merge "Fix password variation check code" 2011-02-16 22:00:01 -08:00
Ken Wakasa 16ee377bcd Fix password variation check code
Change-Id: Id994112a029982b4dabd6ebca34edd1d787e5ae2
2011-02-17 14:44:44 +09:00
Tadashi G. Takaoka 887f11ee43 Remove next letters frequency handling
Bug: 3428942
Change-Id: Id62f467ce4e50c60a56d59bf96770e799a4659e2
2011-02-17 13:59:41 +09:00
Jean Chalard a7b2ac26ee Remove a useless flag.
This has become useless when LatinIME stopped being a
SharedPreferenceListener.

Change-Id: I708ec3c3a299ead18548c85b435b45558c984e8d
2011-02-15 17:15:13 +09:00
Ken Wakasa b1e05d6638 Fix NPE
bug: 3446590
Change-Id: Iea5bd8f63f3322496b5d68539f0215d5d01e68d1
2011-02-14 23:55:16 +09:00
Jean Chalard 75fa4b8c0d Merge "Add stack dumper helper function." 2011-02-13 19:03:11 -08:00
Jean Chalard 5b85d032cd Add stack dumper helper function.
Change-Id: I78e5aef3cc6abfeb764a7e8a432f063f18d56da2
2011-02-14 11:32:48 +09:00
satok a7ea6cad82 Merge remote branch 'goog/master' into merge
Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8
2011-02-10 17:31:37 +09:00
Jean Chalard 9a5d2ba03e Stop listening on shared preferences change.
It appears it is not useful to listen to this change, because in any
case, settings will be reloaded when the view is shown again or when
IME is changed.

Change-Id: I08dddccc630b01718da7fab011ce14f189dd31c3
2011-02-10 16:34:58 +09:00
Tadashi G. Takaoka 33e0b1e79e Add unit test helper method to BinaryDictionary and Suggest
Bug: 3414081
Change-Id: Idee64010f2f423d3c7c548d0279c7bf287088762
2011-02-08 17:56:55 +09:00
Tadashi G. Takaoka 39c323eb12 Merge "Move and rename computeProximityThreshold" 2011-02-08 00:05:27 -08:00
Jean Chalard f0d99b8677 Make the keyboard sound on by default for xlarge screens.
Also change the name of the default value for re-correction for
consistency with other constant names.

Bug: 3426884

Change-Id: I615ba640fb17e6d7514b8a0e4f52028eb0e23908
2011-02-08 12:44:03 +09:00
Tadashi G. Takaoka 5ef096f5f6 Move and rename computeProximityThreshold
Move and rename KeyboardView.computeProximityThreshold to
KeyDetector.getMostCommonKeyWidth. And make it public for unit test
use.

This is a part of multi-project change (If751659a, Idb18f362)

Bug: 3414081
Change-Id: If751659a53c7412f836d6d28866760ffe84b179b
2011-02-08 11:43:39 +09:00
Jean-Michel Trivi cf675cc808 am 78f9ee97: am 985fb645: Revert I871cfaaf Latin IME Keyboard sounds off by default
* commit '78f9ee978a6a3e8a78ae161034c273d4c8600f6f':
  Revert I871cfaaf Latin IME Keyboard sounds off by default
2011-02-07 13:49:56 -08:00
Jean-Michel Trivi a428945d90 am 2fb80292: am 435ea0f5: Fix bug 3426884 Latin IME Keyboard sounds should be on by default
* commit '2fb802922e76f20bfb21c0b988bab4a67c56161d':
  Fix bug 3426884 Latin IME Keyboard sounds should be on by default
2011-02-07 13:49:43 -08:00
Jean-Michel Trivi 985fb645ef Revert I871cfaaf Latin IME Keyboard sounds off by default
Change-Id: If4b90daa04df0b554faf2886fe83410e086e5b9c
2011-02-04 17:44:17 -08:00
Jean-Michel Trivi 435ea0f5dc Fix bug 3426884 Latin IME Keyboard sounds should be on by default
Change the default value when retrieving the PREF_SOUND_ON property
 from the Settings from false to true.

Change-Id: I871cfaaf1f33b5e0301c84ee9c94f1c429901021
2011-02-04 16:42:46 -08:00
satok 8dac5fe98d Merge "Duplicate enabled languages when there is only one enabled language" 2011-02-04 00:30:11 -08:00
satok c98a943eda Duplicate enabled languages when there is only one enabled language
Bug: 3415274

Change-Id: Ibc17733be888044cfa5d1787b8489e642d70d70f
2011-02-04 17:27:18 +09:00
Tadashi G. Takaoka fdb2225803 Merge "Skip sudden jump detection on distinct multitouch device" 2011-02-03 23:00:19 -08:00
Tadashi G. Takaoka 9a5b592b27 Skip sudden jump detection on distinct multitouch device
Bug: 3400448
Change-Id: I37150d624b73ed089875a905fe04c5b8b3ecfa0a
2011-02-04 15:49:11 +09:00
Jean Chalard f5cf266ad9 Rename a member to comply to the member naming policy.
Change-Id: Ie9493f438c6ac371029e52a5d5f6191c7239bf75
2011-02-03 18:38:55 +09:00
Jean Chalard f9ec16f9c0 Kill the process when the debug mode is updated.
Killing the process allows for some settings that are read only on
service start up to be correctly read again.

Change-Id: Ia48f2ca4760a530ac47b727f290d606715cb6bde
2011-02-03 17:57:29 +09:00
Tadashi G. Takaoka ea55bf5df7 Fix menu option dialog order
Change-Id: Iea619d26a2f2091b71182face2f6a66d188e0287
2011-02-03 15:56:01 +09:00
Tadashi G. Takaoka 919cab4893 Merge "Cleanup keyboard drawing code" 2011-02-01 03:35:26 -08:00
Tadashi G. Takaoka f2fd472dcc Cleanup keyboard drawing code
Change-Id: I084e3ac835ee60b8e463ac10c075adbf08b9a7cb
2011-02-01 19:42:56 +09:00
Jean Chalard 6550dce015 Merge "Add debugging info for Latin IME." 2011-01-31 23:25:00 -08:00
Jean Chalard 8553b5ec31 Add debugging info for Latin IME.
Add frequency of candidates in the candidates view when the debug
mode is active.

Bug: 3312867

Change-Id: Ie911f14ef11b2fa02af8f3a74302129f16ed0604
2011-02-01 16:06:50 +09:00
Tadashi G. Takaoka 34252baa86 Use custom dialog builder building url link clickable from service
This change is derived from I7611ebc1 (Honeycomb).

Bug: 3246715
Change-Id: I6446bd785f1bd3d7b901e86661c91ca5a823f30e
2011-02-01 15:39:33 +09:00
Ken Wakasa eaa091da78 Merge "Fix subtype settings activity string" 2011-01-31 08:24:53 -08:00
Ken Wakasa 435bd31db3 Fix subtype settings activity string
original (abandoned) change: I78463bbb

Change-Id: I1ef4df882fb09dd31a77e8f12d30d03460ecaada
2011-02-01 01:16:32 +09:00
Jean Chalard 728115493e Do not read the pop up setting if the config says not to.
If the configuration says the device should not display the "Pop up
on key press" setting, then do not read the preference and always
use the default setting.

bug: 3406181

Change-Id: Ice2989760cda1d40387ed88311144cbf2c114b93
2011-01-31 15:45:24 +09:00
Ken Wakasa 063a98a7b2 Merge "Reuse keyboard view's drawing bitmap if possible" into honeycomb 2011-01-27 23:43:02 -08:00
Tadashi G. Takaoka 513f1b0454 Merge "Add hack to translate sudden move to up/down events" into honeycomb 2011-01-27 23:37:49 -08:00
Tadashi G. Takaoka faf437b507 Add hack to translate sudden move to up/down events
This change also gets rid of unnecessary debug messages.

Bug: 3400735
Change-Id: I3f003b1c2b553a2f841d4880f348a012d2d9c8ad
2011-01-28 16:35:02 +09:00
Ken Wakasa 566630147d Reuse keyboard view's drawing bitmap if possible
bug: 3398660
Change-Id: I0c7f7c084904990563ac62b5d9cf829f86855661
2011-01-28 16:33:34 +09:00
Tadashi G. Takaoka 4d3b9d709c Import new icon for disabled mic key
This change also updates other hdpi assets.

Bug: 3345931
Change-Id: Ia91e449905677b025307bf9ea6e618d82090a389
2011-01-28 16:16:59 +09:00
satok b5d7857fbc Merge "Fix auto-correction threshold and promote full matched words" into honeycomb 2011-01-26 20:10:31 -08:00
satok 14e427d5bb Fix safety net not to be enabled at aggressive autocompletion mode
Bug: 3374359

Change-Id: I7b1dbeb64a87dda05397c236bb58da292f819471
2011-01-27 13:09:27 +09:00
satok 58c49b9132 Fix auto-correction threshold and promote full matched words
Bug: 3374359
Bug: 3278422

"zbe" will be auto corrected to "be" by fixing s-line
"teh" will be auto corrected to "the" by promotion of full matched words

Change-Id: I314c632820e4e0b1501edeca60ada205d291451f
2011-01-27 12:53:13 +09:00
Tadashi G. Takaoka 5c35e4109f Merge "Fix BroadcastReceiver leakage in SubtypeSwitcher" into honeycomb 2011-01-26 09:07:44 -08:00
satok 5ecb352f7f Merge "If there is no keyboard view attached, use voice input view." into honeycomb 2011-01-26 09:07:33 -08:00
satok a42cc5303b If there is no keyboard view attached, use voice input view.
Change-Id: Ibf0945f3bd70f02fe0d09229fc899641567c0d4c
2011-01-27 01:51:02 +09:00