Commit graph

841 commits

Author SHA1 Message Date
Jean Chalard
0730bbfbf5 Straighten out magic space vs real spaces behavior.
Picking a suggestion inserts a space after the word. This change makes
this space a magic space.

Incidentally, do some minor cleanup: add CODE_DASH, CODE_SINGLE_QUOTE
and CODE_DOUBLE_QUOTE to Keyboard and use them throughout the code,
and remove a useless import directive in some unrelated file.

Bug: 4319740

Change-Id: I245f396c34dd0af820bca91edc4ec363238a4ae4
2011-05-02 19:19:05 +09:00
Ken Wakasa
9b2192bfd2 Revert the suggestion update delay to the original value (100msec) for phones.
This is actually a follow-up to I385f9eb2

bug: 4361287
Change-Id: I4c4a0a96a7fa28f4f96dd984453d2c9f3fa7d6c2
2011-04-29 19:23:49 +09:00
Tadashi G. Takaoka
44fe4a0598 Include horizontal and vertical gap in the count of Key.isOnKey
This change also reverts I8f6102d6 and considers that the point is on
the key while sorting in proximity key detection.

Bug: 4348994
Change-Id: I3ee913675e28da7e7b164805a7a683f0814b38b9
2011-04-29 01:21:17 +09:00
Jean Chalard
8d165bb5d1 Fix a bug where dead space would appear on the keyboard.
This change fixes a bug where there would be pixels on the keyboard
that would not return a key although it's between two keys - or even
right on top of one.
This change makes it so that the closest key to the touch - within a
certain threshold - is always returned, regardless of whether the
touch is inside or not.

Bug: 4348994

Change-Id: I8f6102d6787eb025cc3c50a26d3a475aeafc4b64
2011-04-28 22:10:02 +09:00
Jean Chalard
d8f52a4f18 Improve the architecture to support multiple dictionaries.
This change enables the interface to get multiple dictionaries from a
dictionary pack. It only implements it to the end in the case of the
proprietary method, as the open method needs still some working out,
and the "inside the package" method does not need it.

This change goes together with Iaa95bf36, and breaks the build
without it.

Bug: 1752028

Change-Id: I3ccfd696e8ef083ef9c074e1c3e4bb0bf2fcfd23
2011-04-28 16:16:46 +09:00
Ken Wakasa
3bf6fbb6b8 Merge "Fix snap back behavior for a quote mark input." 2011-04-27 04:40:19 -07:00
Ken Wakasa
0b4757604d Fix snap back behavior for a quote mark input.
Follow-up for I8168ce6a

Change-Id: I63b04471c90d3d02de1bb8f092b5d57614cd8591
2011-04-27 19:10:32 +09:00
Jean Chalard
f108bf8fe9 Rename a confusing variable.
mHasValidSuggestions -> mHasUncommittedTypedChars

Bug: 4322591

Change-Id: If7df986af3cf087c8e7571fd88a55e2b2ccfa38a
2011-04-27 18:49:49 +09:00
Jean Chalard
19bfef6cb0 Use the new Utils.setSystemLocale method in the new code.
The change list that introduced this code was created at the same
time as the one that introduced the Utils.setSystemLocale method
and didn't use it yet. Fix this.

Change-Id: Ifdd2ad9f7dbb7f300bc255bc2e035ae893a9d410
2011-04-27 17:10:18 +09:00
Jean Chalard
4250eb27f5 Create a dictionary collection and a dictionary factory.
The dictionary collection is a class complying to the Dictionary
interface that acts as a front end to a collection of arbitrarily many
dictionaries of any type.
The dictionary factory is a helper class for creating various
dictionaries and get some meta information about them.

At the same time, this change makes the BinaryDictionary class
not a singleton any more.

This also needs I9afe61a9 to not break the build.

Change-Id: I61fdcc4867fcda18342807bf1865e6e46979e5d5
2011-04-27 17:06:20 +09:00
Jean Chalard
fd78781ced Merge "Add a method to set the locale to Utils." 2011-04-27 00:42:24 -07:00
Tadashi G. Takaoka
e4181036f6 Enable long press caps lock
Bug: 3319295
Change-Id: I413062c759a1d91c66fcbf5dd04050dfbf15094f
2011-04-27 16:34:13 +09:00
Jean Chalard
309bff562f Add a method to set the locale to Utils.
Add a setLocale method to Utils that returns the previous locale.
Also unify all calls through the code.

Change-Id: Ic850dc5df19fba00ed3601835652859b4321b544
2011-04-27 16:11:34 +09:00
Tadashi G. Takaoka
dbe882ac08 Merge "Release caps lock by double tap on shift key" 2011-04-26 23:57:57 -07:00
satok
bc475dc297 Merge "Handle overflow properly in multiplyRate" 2011-04-26 23:55:13 -07:00
Tadashi G. Takaoka
e541f03286 Release caps lock by double tap on shift key
Bug: 3319295
Change-Id: Ie0cad06c7b1afac0f33af76128303517e9e7bddc
2011-04-27 15:52:56 +09:00
Tadashi G. Takaoka
b880ccc3bd Merge "Fix quotation marks" 2011-04-26 23:47:15 -07:00
Tadashi G. Takaoka
717cef79ea Fix quotation marks
This change
* Allows snap back from symbols shifted to symbol layout.
* Add "left single", "right single", "single low" and "single high
  reversed" quotation marks to popup characters of "single quote".
* Add "double low" and "double high reversed" quatation marks to popup
  characters of "double quote".
* Add "prime" and "double prime" to popup characters of "degree".
* Disable non-ASCII key of symbol more layout on passowrd input.

Bug: 4345054
Bug: 4347045
Change-Id: I8168ce6a74a9536e4966f7f9d1099ac0132925c7
2011-04-27 15:21:06 +09:00
Tadashi G. Takaoka
a6581a2043 Merge "Shorter timeout to update auto caps state (100ms)" 2011-04-26 20:28:28 -07:00
satok
b2e5e5937c Handle overflow properly in multiplyRate
Bug: 3401513
Change-Id: I8dd2523caa58bb51c378a01e160a58f9106ce9b8
2011-04-26 22:03:26 +09:00
Tadashi G. Takaoka
a7a659ab0f Shorter timeout to update auto caps state (100ms)
Bug: 4319726
Change-Id: I068279ddfbb79dfebb6ab845d97cccd62d9e052a
2011-04-26 20:10:54 +09:00
satok
663d4f5cc1 Merge "Fix getMiddleDisplayLanguage" 2011-04-26 01:54:12 -07:00
Jean Chalard
0c8d5ca023 Fix Eclipse warnings.
This change is only there to fix warning issued by Eclipse.
It should have absolutely no impact on the program logic.

Change-Id: Ie0e242ac6c167297d33de19902340b0f6ecae9e1
2011-04-26 16:39:45 +09:00
Jean Chalard
4556de4b45 Do not use contacts for bigram prediction.
bug: 4346034

Change-Id: Ibc3c27ca92ed61f1f689df3e90e2eb60fa0cbd33
2011-04-26 15:26:51 +09:00
satok
12e07767a1 Fix getMiddleDisplayLanguage
Change-Id: Ia73d74b122069197ac471879e5f1cee34f31b182
2011-04-26 12:15:21 +09:00
satok
1123bcaf2e Merge "Display the language name on the spacebar if the full display locale name is too longer than the space bar" 2011-04-25 06:21:08 -07:00
satok
cae6b1060e Display the language name on the spacebar if the full display locale name is too longer than the space bar
Bug: 4329512
Change-Id: I477684747bf9e70a6909c25877fbe9e622571fd4
2011-04-25 22:12:52 +09:00
satok
efb32f7e95 Merge "Refresh the dictionary when the language settings were changed on Dogfood keyboard" 2011-04-25 05:57:44 -07:00
satok
97f855ba45 Refresh the dictionary when the language settings were changed on Dogfood keyboard
Bug: 4339319
Change-Id: Id6361927f579797932c465988f6728191748f143
2011-04-25 20:30:54 +09:00
Tadashi G. Takaoka
4c82225ad6 Disable sliding language switch on phone and number layout
Bug: 4331621
Change-Id: Id02c64bb2724a5f990d6dcc548a8d98a1034d531
2011-04-25 19:36:50 +09:00
Tadashi G. Takaoka
d0f3f90789 Narrower the language switch threshold to key width x 1.25
Change-Id: I4ea9553bce34bc3783f03d1615c34b6abb153077
2011-04-22 23:21:05 +09:00
Tadashi G. Takaoka
608469c5ab Release the previous key if multi touch input is started
Change-Id: Ib1205e67e900353976150e5ad58abfc92c3dfc21
2011-04-22 21:31:22 +09:00
Tadashi G. Takaoka
a0537fb4c7 Fix repeat key behavior
Change-Id: Ia7e5b2e9579aa0e5050857cdb14f16fa05a33621
2011-04-22 21:17:55 +09:00
Tadashi G. Takaoka
0156713f2a Merge "Clear spacebar sliding language switch diff" 2011-04-22 04:23:03 -07:00
satok
c82b8dbd4a Merge "Fix the spacebar language switcher" 2011-04-22 03:55:05 -07:00
satok
61393a88b0 Fix the spacebar language switcher
Change-Id: I54711ff2014facefe3afd22e536045cd0ffe4955
2011-04-22 19:50:08 +09:00
Tadashi G. Takaoka
f172be448c Clear spacebar sliding language switch diff
Change-Id: If82540b6632476e049fa9c4b3122e9c053227d6e
2011-04-22 18:49:15 +09:00
Tadashi G. Takaoka
75136cd009 Fix language switch preview
This change also makes the delay after key preview longer to 60ms.

Change-Id: If7cf3b493824bb12e0bf44aa0bc3c186b15b51f6
2011-04-22 18:26:32 +09:00
Tadashi G. Takaoka
d00d963b9d Fix NPE on non-distict multitouch device
Change-Id: I6d8a05bf62e510d0556fa4831b3d510041cca63a
2011-04-22 17:33:24 +09:00
Tadashi G. Takaoka
c5c57b506e Move sliding language switch code to PointerTracker
This change is hack and temporal.

Big: 4328445
Change-Id: I0b8851e9f05390db20ddaa10f35cff1cc9f016da
2011-04-22 17:02:38 +09:00
Jean Chalard
c121b5d03e Merge "Actually use the bigram prediction option." 2011-04-22 00:51:07 -07:00
satok
940b8d81f3 Merge "Add an debug option to use spacebar switcher" 2011-04-22 00:51:07 -07:00
Jean Chalard
cb3320179d Actually use the bigram prediction option.
This change also rename methods that should have been renamed in a
previous commit (namely, the
*SetBigramSuggestions family -> *UpdateBigramSuggestions)

Change-Id: I18cac17ba2b93fcc011ea133324f2c7f3532946c
2011-04-22 16:36:20 +09:00
satok
c5a2b51924 Add an debug option to use spacebar switcher
Change-Id: Icc483f097696a1c5a2a7ab037afce19c9cfe837f
2011-04-22 15:54:39 +09:00
Jean Chalard
b50591295d Add an option for using bigram prediction.
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.

Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
2011-04-22 15:53:48 +09:00
Jean Chalard
89bd776cf6 Use user-history bigrams when no input if available.
This also fixes a small inconsistency upon clicking on whitespace
twice in a row.
Also add some unit tests for an introduced and an existing method.

Change-Id: I1be2fb53c9624f4d0f5299009632cb4384fdfc15
2011-04-22 15:46:23 +09:00
Tadashi G. Takaoka
6c10cf6bf8 Merge "Rename and reorganize key code" 2011-04-21 23:33:21 -07:00
satok
1b9eecb521 Fix language selection settings
Change-Id: I84e51ce2b80a21650e309e5e6c9ee5f1739170c9
2011-04-21 23:27:46 +09:00
Tadashi G. Takaoka
d2c5fdda86 Rename and reorganize key code
Change-Id: I13d6fef7af1c4356a22b0e8aebc9e613b1693ece
2011-04-21 20:32:33 +09:00
satok
49a11524fc Fix language selection settings
Change-Id: I99e2039579a5bd606a8e698cdee2739465b998bc
2011-04-21 19:46:06 +09:00
Tadashi G. Takaoka
c9c3aa219e Merge "Disable key preview of space, return and delete" 2011-04-21 03:10:21 -07:00
Tadashi G. Takaoka
ba9aefcc18 Disable key preview of space, return and delete
This change also re-orders punctuation mini keyboard.

Change-Id: I987ef14fe5956d13439a0a76de367feed825314c
2011-04-21 19:04:49 +09:00
satok
9ee51db95b Optimize InputLanguageSelection
Change-Id: I49117a1e5f7766fcfa0140ff602ff1e19ba1e3d2
2011-04-21 18:05:27 +09:00
satok
bdb3d6909a Merge "Check the availability of layouts for showing the input languages in the settings" 2011-04-21 01:33:05 -07:00
satok
15a0ba6d74 Check the availability of layouts for showing the input languages in the settings
Bug: 4316889

Change-Id: I746b3ff79c2a6cd4925fca1817d5b209623b5108
2011-04-21 17:17:32 +09:00
Tadashi G. Takaoka
46ca845848 Compute content and visible insets even in voice mode
Bug: 4317779
Change-Id: If54d15466db9d0362b4470a2ba4618377bdffc2a
2011-04-21 15:20:37 +09:00
Tadashi G. Takaoka
6d645e13e4 Merge "Display spacebar language switcher even when key preview is off" 2011-04-20 22:03:43 -07:00
Tadashi G. Takaoka
e6cb8fc234 Display spacebar language switcher even when key preview is off
Bug: 4313884
Change-Id: I9d4a474302dadbfc610324799f8768b803705e52
2011-04-21 12:53:53 +09:00
Jean Chalard
0c72ea1c92 Remove a useless import.
Change-Id: I911e3e928a45bbca352a87e6b0616a2ba9bd9e9c
2011-04-20 20:25:26 +09:00
satok
5454ff5a66 Merge "Tweak the normalized score for the words with spaces" 2011-04-20 02:13:28 -07:00
Jean Chalard
c9bc5c8d34 Merge "Move language-specific keyboard setting to resources." 2011-04-20 01:52:54 -07:00
satok
22104663fc Tweak the normalized score for the words with spaces
Change-Id: Icc0c4fd0474ed5094fb274a6ea745ca583ba524d
2011-04-20 17:44:13 +09:00
Jean Chalard
c899038eee Move language-specific keyboard setting to resources.
Some flag settings used to be stored in a keyboard layout extravalue setting. This
change:
- Introduces the capability of setting such specific flags in values/config.xml
- Retains the ability to use extravalues (for layout-specific settings), though
  there is no more any such setting at the moment.
- Fixes a bug where loading a dictionary from outside does not initialize the flags.
- Moves Flag to another class.

Note: this needs I705ec68c to avoid breaking the build

Change-Id: Ia7703aae3215b06c0b3cb792821649806e8998c1
2011-04-20 17:31:59 +09:00
satok
0aae85fb67 Merge "Tweak edit distance" 2011-04-20 00:58:08 -07:00
satok
e18ba4275f Tweak edit distance
- The edit distance of transposed characters will be changed to 1 from 2

Change-Id: I369e2f94278b3b290957eef43d23cb7048166a99
2011-04-20 16:55:21 +09:00
satok
95d9e47104 Merge "Tweak voice layout for Dogfood" 2011-04-19 23:15:37 -07:00
satok
015b21cf52 Tweak voice layout for Dogfood
Change-Id: Ic51a044901a63c4cec907163e35cd5e458f36dde
2011-04-20 15:13:57 +09:00
Jean Chalard
aafa17e283 Fix a typo.
Change-Id: I245deb5af6b504ff20617929c0510036d0c930d5
2011-04-20 12:10:28 +09:00
Tadashi G. Takaoka
d9786ce2e3 Refactor key preview code
This change removes mOldPreviewKeyIndex from KeyboardView.

Bug: 4298393
Change-Id: I832eb6deab7e078609973bf0b8be09f73db204d7
2011-04-19 20:32:57 +09:00
Tadashi G. Takaoka
bc91d89473 Merge "Remove mPreviousKey in PointerTracker" 2011-04-19 02:30:09 -07:00
Tadashi G. Takaoka
d2c2b4d112 Remove mPreviousKey in PointerTracker
This change also introduces PointerTracker.onLongPressed.

Change-Id: I079eb52175d8fe8b88ce3f13e31493d34d00ad5e
2011-04-19 17:35:11 +09:00
satok
e0f35042a5 Merge "Show all languages supported in LatinImeGoogle in InputLanguageSelection" 2011-04-18 19:29:46 -07:00
satok
88808fcdd4 Show all languages supported in LatinImeGoogle in InputLanguageSelection
Bug: 4311203
Change-Id: I7a94e9697758cb79743c026e7f1c023f618a9aa1
2011-04-18 20:28:36 +09:00
Tadashi G. Takaoka
7751ac3bdb Merge "Refactor key preview related code in KeyboardView" 2011-04-18 03:52:07 -07:00
satok
bc3dba451a A fix for handling dummy voice subtypes
Change-Id: I75d4d1625e0925d01ae84c9577e15087d83e4191
2011-04-18 19:32:40 +09:00
Tadashi G. Takaoka
3f2653ba60 Refactor key preview related code in KeyboardView
Change-Id: Ib8f08cb4f5e03d0c32c32a0ea0363ce3d72fc050
2011-04-18 17:00:58 +09:00
Jean Chalard
a0efebf304 Merge "Allow use of assets for data in the dictionary content provider." 2011-04-17 18:50:51 -07:00
Tadashi G. Takaoka
6fb97bf71c Don't show spacebar preview if key preview is disabled
This change also introduces soft reference cache of spacebar Drawable.

Bug: 4307333
Change-Id: I4d2c500bb47d794aa4f8dfa6ec415dbcb9ab0b74
2011-04-15 23:22:48 +09:00
Tadashi G. Takaoka
dc90d0a15f Refactoring keyboard drawing code and KeyDetector
Change-Id: I55009bf38b1422301223bd90463f837562559dc5
2011-04-15 18:35:08 +09:00
Tadashi G. Takaoka
5d542c2492 Auto mini keyboard layout
Bug: 4280617
Change-Id: I34c344cbf350fe125589aa14ad69e4bd1f4e6f66
2011-04-15 18:19:31 +09:00
Jean Chalard
4e3bd58b86 Allow use of assets for data in the dictionary content provider.
This update is necessary to allow dictionary content providers to use
assets, which are part of their apk, as data to pass to the keyboard.
Using plain file descriptors doesn't allow for sections of files to
be correctly used.

Change-Id: Ia94c26d6387bce61c73d38f5c2821f20e50e54d4
2011-04-15 17:38:24 +09:00
Tadashi G. Takaoka
72a82d7ee8 Count up horizontal gap as part of key width
Change-Id: Ic9a070a9b6a461f4c8330d1cc3e2c33fd7369f73
2011-04-15 09:54:39 +09:00
Jean Chalard
646d950ed8 Receive a broadcast that the dictionary has been updated.
Change-Id: I9751cc627a835a4061f144c48ff51e9d81b2c93b
2011-04-14 20:52:25 +09:00
Tadashi G. Takaoka
e4b2d22636 Merge "Make showing key preview compatible with pre-Honeycomb" 2011-04-14 01:56:15 -07:00
Tadashi G. Takaoka
37cfacbae6 Make showing key preview compatible with pre-Honeycomb
Bug: 4179964
Change-Id: Ide0a9c75983b45f8e829f0d64f41557d42fc11e7
2011-04-14 17:43:25 +09:00
satok
6d9021527a Fix for language bar switching
Change-Id: Id3974642b62b012968c537eff7c1a7ee37e2def2
2011-04-14 12:34:48 +09:00
Tadashi G. Takaoka
dc3d4e8c06 Merge "Fast key preview" 2011-04-13 03:12:06 -07:00
Tadashi G. Takaoka
7a3d3ae17f Fast key preview
Previously the key preview was implemented by PopupWindow.  The key
preview popup window would be dismissed and shown each time the key
was released and pressed.  It turned out that it was taking several
milliseconds.

This change implements the key preview by a simple TextView which will
be layout-ed at absolute coordinates within the screen FrameLayout.
And dismissing and showing the key preview is implemented by the
TextView's visibility.

This implementation needs careful coordination of candidates.xml
layout and LatinIME.onComputeInsets to control suggestion strip
visibility.

Bug: 4179964
Change-Id: Id6347cb35b91eb14ab20dd2f312e58b54b6625a7
2011-04-13 18:59:33 +09:00
satok
88fc9d4418 Support language bar swich for InputMethodSubtype
Change-Id: Ie49f0c1c7aea135331dc1d4a635197b3f4a96e93
2011-04-13 17:05:24 +09:00
Tadashi G. Takaoka
56abeabced Add visualInsetsLeft and Right as Key attribute
Bug: 4269094
Change-Id: Ic38d326a8e9ef802453c909f3a81d556863acc9b
2011-04-11 12:13:38 +09:00
Jean Chalard
a944574967 Merge "Reinforce user-history based bigram use." 2011-04-08 02:14:06 -07:00
Tadashi G. Takaoka
2c389c5b9e Merge "Increase the horizontal gap between shift/delete and normal keys" 2011-04-08 02:00:59 -07:00
Tadashi G. Takaoka
967d6073bf Disable popup preview and long press on disabled key
Bug: 4268147
Change-Id: Ibcb54791ef78737dd09d8a594b5a53b0909609d6
2011-04-08 17:14:12 +09:00
Tadashi G. Takaoka
6d81e2b79b Increase the horizontal gap between shift/delete and normal keys
This change also adds capability to add horizontal padding to the
keyboard.

Bug: 4269094
Change-Id: I805e76b253a497079517c01bd2a976f8702f7e56
2011-04-08 16:43:01 +09:00
satok
b5d17e52fc Add logOnSeparator
This is a supplement for  I9abb8141f23100d

Change-Id: I529d2a78f4fe630611db4cba830d933370c8c34f
2011-04-08 15:24:55 +09:00
Tadashi G. Takaoka
e7c0e73a19 Simplify the Key's on state transition
Because handling shift locked state of alphabet keyboard is done by
KeyboardSwitcher, there is no need to change the "on" state of Key
when releasing the key. On the other hand, symbol and symbol shifted
keyboard has fixed "on" state "ALT/MORE" key.

This change also renames the attribute "isModifier" to "isFunctional".

Change-Id: I082885bd2376ae26bdfc378c14add2b5d6be1d4e
2011-04-07 20:28:46 +09:00
Tadashi G. Takaoka
996db15d3c Disable successive modifier key while sliding input
When user starts sliding key input, sliding through successive
modifier key will be ignored.

Bug: 4181843
Depends: I082885bd2376ae26bdfc378c14add2b5d6be1d4e

Change-Id: Ibe890b9cc1183dbe9f68a421650fcd97e7ff221c
2011-04-07 20:17:27 +09:00
Tadashi G. Takaoka
da4bfbbbb3 Fix popup key preview on tablet
This change temporally enable popup key preview option on
tablet. (config_enable_show_popup_on_keypress_option).

Bug: 3286117
Change-Id: Iabbac5a333460e1ed2f8d05ba82f4bae81854b85
2011-04-07 15:56:16 +09:00
Jean Chalard
3e23682862 Reinforce user-history based bigram use.
- Have user-history based bigrams used as soon as they are entered,
  not after 6 times.
- Limit bigram frequency to 255 (this limits the multiplier to 1.8, and
  has no effect on main dict bigrams which already have this limit)
- Some TODO resolving

bug: 4192129

Change-Id: I4777f1a58c43dd55381c4b01252d722ab3a70547
2011-04-06 12:26:01 +09:00
satok
fd58877d4f Merge "Add settings for theme, userfeedback and other settings (temporary)" 2011-04-01 03:53:26 -07:00