4af75010a1
Merge "Use Set to group Keys in Keyboard instead of List"
2011-12-16 04:26:25 -08:00
7c69397f14
Merge "Fix swapped alphabet and symbols keyboards"
2011-12-16 04:15:35 -08:00
510ebb9b16
Merge "Get rid of key index from ProxymityInfo"
2011-12-16 04:13:38 -08:00
854302282d
Fix swapped alphabet and symbols keyboards
...
Change-Id: I956684332d607cb9ab01d12af7a924c15def7fce
2011-12-16 21:12:06 +09:00
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
0c0ca874fe
Get rid of key index from ProxymityInfo
...
Change-Id: I9bee0a643d09cdd89e42ae913285c9e78d875c1c
2011-12-16 21:03:36 +09:00
43c0a034bd
Merge "Pretty print for InputAttributes"
2011-12-16 04:01:49 -08:00
4d0f03bd66
Remove a write-only variable.
...
Change-Id: I825307a429f46b31ed9bd940b5a97d2713127dfe
2011-12-16 20:54:58 +09:00
6fa003ee23
Pretty print for InputAttributes
...
Change-Id: I5e4b2b6f3cd943c8f6187aaed21d67ec786bf5df
2011-12-16 20:53:44 +09:00
2b2c0b574c
Merge "Use the WordComposer to check if we are composing a word"
2011-12-16 03:47:34 -08:00
80b66bb166
General cleanup.
...
Move variables around, inline useless functions, remove
useless local variables.
Change-Id: Icb89d8b211a2ad4bc3619137c2276a649c2a5e34
2011-12-16 20:36:32 +09:00
644c8b7c96
Initialize input attributes in the InputAttribute class
...
Change-Id: I103d6851f54f47cbffdb567fb0f4c505c4697b05
2011-12-16 20:35:16 +09:00
3b7aceca60
Merge "Make applicationSpecifiedCompletionOn final."
2011-12-16 03:20:00 -08:00
bf7ed75e4f
Merge "Move KeyboardSwitcher.getKeyboard to KeyboardSet"
2011-12-16 03:13:38 -08:00
645128af71
Move KeyboardSwitcher.getKeyboard to KeyboardSet
...
This change also gets rid of XML id from KeyboardId.
Bug: 5002108
Bug: 5679585
Change-Id: I7086c7da3c01ba4ade7f77ee5cc731310da46404
2011-12-16 20:10:57 +09:00
ccc35f7fa7
Make applicationSpecifiedCompletionOn final.
...
This is the last one (whew)
Also move a somewhat unrelated initialization out of the
input attribute initialization function.
Change-Id: Icc77b32fd16b112ab43786715061b1c9dca31c04
2011-12-16 19:09:01 +09:00
9cc1312eee
Make inputTypeAutoCorrect final.
...
Change-Id: I550eba1fc3fa2843d007a8208d81fad208c1196b
2011-12-16 19:08:52 +09:00
13db05f930
Make isSettingsSuggestionStripOn final.
...
Change-Id: Iabb99a7f8f3f1777f9a87ae2bddff9795a50fa92
2011-12-16 19:08:13 +09:00
1ba17f97d5
Small refactoring
...
This helps to make following changes smaller
Change-Id: I95ba2901ac3bf1ed70a748c35a0babdd9af1df63
2011-12-16 18:21:26 +09:00
4fc0f6ab02
Merge "Make insertSpaceOnPickSuggestionManually final."
2011-12-16 01:15:35 -08:00
2ad14a2ea7
Merge "Use temporary variables for computing editor attributes"
2011-12-16 01:07:56 -08:00
520e69056e
Merge "Create a class for input attributes."
2011-12-16 01:06:12 -08:00
ae0c109d11
Make insertSpaceOnPickSuggestionManually final.
...
Change-Id: I32fce0ea8c5c58b6f920d0758c8bf57769f39a12
2011-12-16 18:04:39 +09:00
cadc0f7d79
Merge "Send touch event in usability study mode"
2011-12-16 01:04:26 -08:00
4e8922f1be
Use temporary variables for computing editor attributes
...
The ultimate intent is to make these variables final,
which will allow to move the computing function to the
InputAttributes class.
Change-Id: Ifb1fc7321a19b10d60aa63fa0daaa2708deda2cf
2011-12-16 18:04:17 +09:00
dc9d0fcc11
Create a class for input attributes.
...
Change-Id: I834390c83865aac59fb758d5c66cf9b74103abd8
2011-12-16 18:03:16 +09:00
15d4793911
Send touch event in usability study mode
...
Change-Id: I0cdcd57bfd31c9b21cfb932d7ff91bd013cde6d7
2011-12-16 17:56:14 +09:00
289544d6e4
Use Params instead of Builder as an argument of KeyboardSet constructor
...
Change-Id: I4c576a0b0b632cdf413f2ccd5c69dbd37747fbd3
2011-12-16 16:41:49 +09:00
196d82cdd7
Use the WordComposer to check if we are composing a word
...
...instead of the hard-to-understand mHasUncommittedTypedChars.
This is possible because now the word composer is actually aware
of commits.
Change-Id: I36b664ce8402a280f801e87b9ebe161f416b0853
2011-12-16 15:58:29 +09:00
6ba5f0d341
Merge "Add error log to expensive ArraysCompatUtils.binarySearch"
2011-12-15 22:55:10 -08:00
be2f81f055
Merge "Make the word composer aware of commits."
2011-12-15 22:54:23 -08:00
c73c26790f
Make the word composer aware of commits.
...
Change-Id: I04e691fbc9227d4df195429bca89edea93575347
2011-12-16 15:41:10 +09:00
f8481883cc
Add error log to expensive ArraysCompatUtils.binarySearch
...
Change-Id: Id33998e2a99be9249de4011892555f10c5d0968d
2011-12-16 15:34:11 +09:00
cfd5b4811f
Merge "Cleanup ProximityInfo.calulateSweetSpot"
2011-12-15 22:21:17 -08:00
f1e05e74e6
Merge "Add com.android.inputmethod.latin.suggestions package"
2011-12-15 22:00:05 -08:00
6cb72b0f36
Cleanup ProximityInfo.calulateSweetSpot
...
Change-Id: I98238359dffd76a620d3b0e73b3b22dd82c56c93
2011-12-16 14:59:24 +09:00
8c3d5b6961
Add com.android.inputmethod.latin.suggestions package
...
Change-Id: If4b823768ab9c073625da3034ecc8091be1df230
2011-12-16 14:21:44 +09:00
8950f259b1
Merge "Make Key.mPreviewIcon public final"
2011-12-15 21:20:46 -08:00
0b6237da94
Make Key.mPreviewIcon public final
...
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
2011-12-16 12:47:34 +09:00
a44685ab32
Add colorValidTypedWord and alphaValidTypedWord
...
This change fixes Gingerbread theme.
Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
2011-12-16 12:26:19 +09:00
e9a0efc242
Merge "Cleanup unused variables and parameters"
2011-12-15 18:02:38 -08:00
2ac5988f84
Cleanup unused variables and parameters
...
Change-Id: Iad756a7a775c93f3344c6962e7b3456ef8339490
2011-12-15 20:26:12 +09:00
05f654d498
Merge "Group all input-related info into an inner class."
2011-12-15 03:21:47 -08:00
c3ef86d861
Merge "Fix auto correction spacebar LED"
2011-12-15 03:19:32 -08:00
27dff63833
Group all input-related info into an inner class.
...
Currently, these variables hold the info about the composing
word, or maybe some outdated info, and it's not very clear
which it is. LatinIME is maintaining the freshness info in
a separate boolean, and uses it throughout the code for many,
many things, leading to much confusion.
The idea in grouping this info is, it can be saved in another
instance and restored later. It can be tested against to know
whether there is actually outdated but kept info or not, and
it should allow to straighten out what is actually currently
being typed. Ultimately, it will eliminate the need for
LatinIME to keep track of the status of the info in the
word composer.
Change-Id: I00e2c690f303f8320c9be35590a6df4583e9e456
2011-12-15 19:58:04 +09:00
2d74806262
Change visibility to avoid synthetic accessor method
...
Change-Id: Ie93c7437fb9a3fe63adaa48c2d4a723f96c0a0e1
2011-12-15 19:50:53 +09:00
23d27fefcb
Fix auto correction spacebar LED
...
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
b8c2c6e2ec
Merge "Add XmlParseUtils class"
2011-12-14 03:02:17 -08:00
d549d4334f
Merge "Remove long press settings key function"
2011-12-14 03:02:09 -08:00
17dc10724b
Remove long press settings key function
...
Bug: 5759092
Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
2011-12-14 19:47:17 +09:00
4665463ccd
Add XmlParseUtils class
...
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
2011-12-14 19:46:03 +09:00
6652e45899
Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private"
2011-12-14 02:43:06 -08:00
90c12077b2
Merge "Remove EditorInfo from KeyboardId"
2011-12-14 02:42:58 -08:00
7a91deb685
Move Keyboard.themeName to KeyboardSwitcher and make it private
...
Change-Id: I101b6927d43e86b3c636c1a527e181df8af9c73e
2011-12-14 19:01:20 +09:00
a042150a69
Merge "Just ignore settings/shortcut key while typing on tablet"
2011-12-14 01:59:46 -08:00
2d603fff64
Remove EditorInfo from KeyboardId
...
Change-Id: I70919ff30622afa1d8c29ca45589fa617f2c1f0e
2011-12-14 18:58:55 +09:00
9750165c9a
Merge "Cleanup"
2011-12-14 01:50:25 -08:00
014b755f8a
Merge "Cleanup KeyboardId's hasCode method"
2011-12-14 01:48:46 -08:00
f3ca6a59a7
Cleanup
...
Change-Id: I724df0be7ac07ffb9f1f4974175aed5a2606221b
2011-12-14 18:42:47 +09:00
601e411c13
Cleanup KeyboardId's hasCode method
...
Change-Id: I5fd8f6ac0f42152fb0e2aaaedc6092f6d82fe677
2011-12-14 18:42:20 +09:00
64361bd66d
Merge "Move some code inside a function to simplify flow"
2011-12-14 01:42:17 -08:00
676917dea2
Merge "Fail faster in case of a bug"
2011-12-14 01:42:05 -08:00
2c4b21d7ca
Merge "Cleanup settings key related stuff"
2011-12-14 01:36:34 -08:00
1c6cf26c37
Move some code inside a function to simplify flow
...
Also rename the function to reflect better the behavior.
An upcoming change will clean up the remnants
Change-Id: I19bdf0d9e95f62ee749e1f64fe17132c4a5ef0bc
2011-12-14 17:56:57 +09:00
46798d8f1f
Fail faster in case of a bug
...
Change-Id: Ibea64133f200dce80034c641d4798b62843a2512
2011-12-14 17:54:18 +09:00
623d0155b6
Just ignore settings/shortcut key while typing on tablet
...
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
2011-12-14 17:14:44 +09:00
b588003426
Refactoring.
...
Small simplification of the code.
Change-Id: I1f67ae529bbb2c9316bf5e083d367c57040ea22c
2011-12-14 16:59:25 +09:00
8b1b8aae9c
Cleanup settings key related stuff
...
Change-Id: Ie0d1204e94fcdf9d578974256bf2ae3e87797f13
2011-12-14 16:34:35 +09:00
e35e13fc7d
Merge "Record onStartInputView"
2011-12-13 23:31:43 -08:00
689b901156
Merge "Utilize KeyboardSet XML definitions"
2011-12-13 23:31:00 -08:00
dbdb385bb0
Merge "Fix a long-standing race condition."
2011-12-13 23:29:47 -08:00
f86109ca56
Utilize KeyboardSet XML definitions
...
This change introduces KeyboardSet and SubKeyboard XML definitions to
represent a set of keyboard layouts.
Bug: 5002108
Bug: 5679585
Change-Id: Ib6c8d5936187381bb6725c9fe574e93871c01a86
2011-12-14 16:28:31 +09:00
514beb0992
Fix a long-standing race condition.
...
Upon autocorrection, there is visual feedback in the text
view that quickly flashes the background of the text that
just changed. This fixes a race condition that happens
upon autocorrection when typing fast, and that results in
flashing one character too far left (typically, the flashing
area includes the whitespace before the corrected word and
not the last character of the corrected word).
This happens because the call to commitCorrection may
happen before or after the IPC sent by sendKeyChar, but the
arguments are fit only for the case where it arrives first.
Change-Id: I9b5442a665aad5a9bc66cd49228075b9056b37fa
2011-12-14 16:24:18 +09:00
7ef235f53f
Record onStartInputView
...
Bug: 5722703
Change-Id: I56bcf6ccde82b4176093de4f197a8736b0cc8c10
2011-12-14 16:22:30 +09:00
8e3faff244
Merge "Decouple member logic from control flow"
2011-12-13 06:28:48 -08:00
7b5bc1ff4d
Decouple member logic from control flow
...
This place is very confusing because a member variable with
a consistent meaning is hijacked for the duration of a function
to mean something else. This is in the way of easy-to-understand
refactoring.
Change-Id: If79bc771950d6bfc0ad5f0e9c51c7ef1dbb45b66
2011-12-13 23:15:12 +09:00
f7d6517d6b
Various mini-cleanups
...
- Stop the word composer from escaping - take a page from the law
of Demeter and only report what is actually needed.
- Fix typos in comments.
- Add a comment for a fishy processing.
- Remove a useless local variable.
Change-Id: I5fa78901cbb5483fc9683bfb7094f47244b85df6
2011-12-13 23:09:22 +09:00
edf4995a3b
Merge "Remove the input connection sidework from handleCharacter"
2011-12-13 04:28:30 -08:00
dafa7a8e15
Remove the input connection sidework from handleCharacter
...
Change-Id: I3d376dfda3acd8864274390de3ff5752b18456e0
2011-12-13 21:12:07 +09:00
117fc93f37
Move mBestWord to the word composer.
...
mBestWord has a confusing name - it's actually an auto-correction.
It's cleaner if it lives in the word composer because an
auto-correction should be tied to a specific user input, and
should be reset each time the user input changes to avoid
race conditions.
Change-Id: I718d29395bc747372067e6440e090c6a181994ae
2011-12-13 21:06:51 +09:00
7e6f4daa19
Merge "Tighten conditions for space-related cancelling"
2011-12-13 01:23:15 -08:00
c525750835
Merge "Consolidate underlining code under one function."
2011-12-13 01:22:08 -08:00
cfe264bfee
Merge "Introduce KeyboardSet to hold related KeyboardIds"
2011-12-13 01:12:10 -08:00
c42f285b35
Introduce KeyboardSet to hold related KeyboardIds
...
This change moves
* KeyboardSwitcher.getKeyboardId to KeyboardSet.<init> and
KeyboardSet.getKeyboardId.
* KeyboardSwitcher.getF2KeyMode to KeyboardSet.
This is the first step to get rid of shift state from Keyboard.
Bug: 5002108
Bug: 5679585
Change-Id: I2a5a97e5e89277bc606916d45c1afbc8d105d773
2011-12-13 18:10:50 +09:00
3dcba4279a
Merge "Extract the jni library name"
2011-12-13 00:46:16 -08:00
77d59b0691
Consolidate underlining code under one function.
...
Change-Id: I4393ff1ec28a6b3118d1344dd6d82d04899dea42
2011-12-13 17:42:27 +09:00
8ad4013406
Tighten conditions for space-related cancelling
...
Instead of ignoring silently a found bug, throw an exception.
Change-Id: I0aa96d0cab022b6a5e7cffe8a592dcc443c3c7a8
2011-12-13 17:40:06 +09:00
77ecf52a08
Merge "Remove KeyboardSwitcher.updateShiftLockState method"
2011-12-13 00:27:01 -08:00
ba526e3157
Extract the jni library name
...
Change-Id: Icc58ccea1178d9f35f5be0dceebab67bbb965b7f
2011-12-13 17:25:43 +09:00
34f1820396
Remove KeyboardSwitcher.updateShiftLockState method
...
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
2011-12-13 16:57:23 +09:00
14cb8448df
Remove a useless return
...
Change-Id: Iefe10e94e2d88171387351a5b6cab52e281d0f76
2011-12-13 16:48:28 +09:00
8e404536cd
Merge "Simplification"
2011-12-12 23:39:12 -08:00
cf5cecccfe
Merge "Refactoring"
2011-12-12 23:39:00 -08:00
024ee9ff02
Merge changes I7888797c,I57b2232f
...
* changes:
Refactor + small bugfix
Refactoring
2011-12-12 23:38:17 -08:00
2939063947
Simplification
...
Both tests have the same meaning. They should be merged.
Also, if "deleteLast()" deletes more than one char (which
never happens in the current implementation, but it's not
guaranteed), the new code is more correct.
Change-Id: I216df7cd45f4a7d76d1d5d6aa7f8d7f9a6e35ea3
2011-12-13 16:06:00 +09:00
d2c69c7d12
Refactoring
...
If mHasUncommittedTypedChars is true, then
mWordSavedForAutoCorrectCancellation must always be null, and
spaceState must always be SPACE_STATE_NONE.
Hence, this change is supposed to be very no-op.
Change-Id: I2716f7372d996cc4dec40a4b7ac1ee7f5f4afe91
2011-12-13 16:04:11 +09:00
2245c3b5b3
Refactor + small bugfix
...
postUpdateShiftKeyState used to be called also when
mEnteredText is not null => this is a bugfix.
The rest does not change the logic, as posting a message can
be done anywhere within the function with no impact.
Change-Id: I7888797c0778702d64f96701e35b611a55a6a259
2011-12-13 15:59:36 +09:00
a2a85d45e0
Refactoring
...
Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
2011-12-13 15:38:49 +09:00
dc52e7c646
Remove current keyboard id variable
...
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
2011-12-13 12:49:40 +09:00
34081186f9
Merge "Fix a bug where revert auto-correct would revert too much"
2011-12-12 04:46:27 -08:00
5c3ff4c9c8
Fix a bug where revert auto-correct would revert too much
...
If there are no uncommitted chars, we shouldn't enter any of
the tests that follow. We didn't use to, but a change today
made it possible - it should not happen.
There is no point in doing the rest of the tests, they are
sure to fail.
Change-Id: I580dd104aff3585de72a93b38989bfd9713f615b
2011-12-12 21:27:16 +09:00
4f41cbc588
Remove a useless function call
...
Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
2011-12-12 20:51:43 +09:00
dcf8a6b2c6
Merge "Move a settings var to the settings class"
2011-12-12 03:31:42 -08:00
2a659b8aa6
Remove a useless variable
...
This can be just read when it's needed.
Change-Id: I00753fe55645c244db5d4a96e7fdb8f5325475d9
2011-12-12 20:22:39 +09:00
d567b230b0
Move a settings var to the settings class
...
Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
2011-12-12 19:52:17 +09:00
7208af0ecd
Remove a messy and unused class.
...
Today is a happy day
Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
2011-12-12 19:31:29 +09:00
f162ed7ec8
Merge "Remove side-effects from TextEntryState"
2011-12-12 02:20:49 -08:00
406d192a9e
Remove side-effects from TextEntryState
...
Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
2011-12-12 19:19:39 +09:00
267cd0151f
Add special handling for "Phone number" layout.
...
Bug: 5743584
Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
2011-12-12 18:19:29 +09:00
aa59e24ebe
Merge "Add unit test of KeyboardState"
2011-12-12 00:15:42 -08:00
c2a76a1529
Remove a useless variable.
...
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
2011-12-12 16:49:32 +09:00
205f9ca310
Merge "Straighten out logic for revert word paths"
2011-12-11 23:48:06 -08:00
890d13189d
Straighten out logic for revert word paths
...
This also includes a new memorized string with simpler
logic that will allow to remove other members
Change-Id: I0b97243084902e68fcb835b6163c86fef8190ebc
2011-12-12 16:41:49 +09:00
dfbe254de6
Add unit test of KeyboardState
...
Bug: 5708602
Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
2011-12-12 16:34:11 +09:00
243e034716
Merge "Assign Key.mCode from the label only when outputText is not specified"
2011-12-11 23:32:32 -08:00
06b886f372
Merge "Move KeyDetector.printableCode to Keyboard"
2011-12-11 23:32:25 -08:00
7dfd5a3e83
Move KeyDetector.printableCode to Keyboard
...
Change-Id: I9cde21fbb45c1e5f1a568bb97b1b1a76524f4bf2
2011-12-12 16:17:45 +09:00
de66f3af8a
Assign Key.mCode from the label only when outputText is not specified
...
Bug: 5742827
Change-Id: I72b55ce246b14a2d8f4fd16211b71dc716db30b2
2011-12-12 16:15:18 +09:00
86344836ee
Merge "Remove a duplicated variable."
2011-12-11 21:26:31 -08:00
2ba1bcccdd
Remove unused Keyboard.CODE_CANCEL
...
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +09:00
3651220327
Remove a duplicated variable.
...
This is awesome cleanup.
Change-Id: I35ce8940a13f3084630dc26d6e7e397acfdaac36
2011-12-12 12:06:41 +09:00
9260422423
Build God Mode keyboard with API level 14
...
Change-Id: I29ab9e9041c9faac91dc303175625221bfdb3af8
2011-12-10 03:45:40 +09:00
4af5e3c5f4
Fix isResearcherPackage
...
Change-Id: I286450fe89a37d75cb398f17d300ddc6f5857ffd
2011-12-10 01:16:16 +09:00
2edd109f84
Some tweaks for Researcher Mode
...
Change-Id: I6b16dd2fe6d7356c747ba0ee2da5976738003ded
2011-12-10 00:35:50 +09:00
2a89e36db0
Merge "Add a functionality to attach a log file to Gmail app Bug: 5722703"
2011-12-09 05:59:36 -08:00
a8b6292cee
Add a functionality to attach a log file to Gmail app
...
Bug: 5722703
Change-Id: I089f944bdbf2cbb036eb59dd9b5b414370c770f1
2011-12-09 22:38:15 +09:00
963abf4bcc
Merge "Remove unused public methods from KeyboardState and KeyboardSwitcher"
2011-12-09 04:38:14 -08:00
74671cf6c5
Resolve TODOs: add members to hold preferences
...
Change-Id: I34f6c76bf9318e1fbe8eb5ffab6772a98ff824e0
2011-12-09 21:24:13 +09:00
df9deffba2
Remove unused public methods from KeyboardState and KeyboardSwitcher
...
Bug: 5708602
Change-Id: I3dbc3cd00aa9ddf611e2078ff2cfea8945fa09bf
2011-12-09 21:14:13 +09:00
0fe3611bee
Resolve TODOs: add some members to store prefs
...
Change-Id: Idf09cb5d801e8008eb63cbb5138058faeb7db136
2011-12-09 20:16:57 +09:00
85b063f97e
Resolve TODOs: add members to store raw settings
...
Change-Id: I481eadb6a73faf239e24d05b7e220fcb01194fa4
2011-12-09 19:03:55 +09:00
12f10e1585
Read options in the declaration order
...
Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3
2011-12-09 18:58:24 +09:00
c40b807ca4
Straighten out prefs reading code
...
Change-Id: Ibf9113a8ef07ac720100ee32d2e5ef321e8ddd98
2011-12-09 18:54:07 +09:00
bab1f045f4
Straighten out members extracted from resources.
...
Change-Id: I9b9602ec5b379b44b0f0663d4f065dbcf88fd352
2011-12-09 18:19:30 +09:00
92e85c87a3
Merge "Match constant names to option names"
2011-12-09 01:14:14 -08:00
f8a056c5c8
Merge "Reorder members in SettingsValues."
2011-12-09 01:14:02 -08:00
ba93dda8ce
Match constant names to option names
...
Change-Id: I7586fa342d7a39412d656890f7b525139c45ea4a
2011-12-09 17:58:51 +09:00
837b109f27
Reorder members in SettingsValues.
...
Reorder so that they match the order in the preference xml
file. Also add TODOs for missing raw variables.
Change-Id: I06332c131a624d6c359512d75c808f3f7313fa91
2011-12-09 17:56:31 +09:00
1cc046775d
Merge "KeyboardState keeps track of isAlphabetMode and isSymbolShifted"
2011-12-09 00:43:18 -08:00
c207e0a7da
Move settings variables to the settings class
...
Change-Id: Ifa7033a84b08ea626eb44cf6d04ba8e28c250bea
2011-12-09 16:47:31 +09:00
284c8a0449
Merge "Stop a flag from escaping."
2011-12-08 23:14:15 -08:00
0c3b8ce842
Merge "Move settings method from Utils to SettingsValues"
2011-12-08 23:09:33 -08:00
10dcc7eb67
KeyboardState keeps track of isAlphabetMode and isSymbolShifted
...
Bug: 5708602
Change-Id: I181cdeb90d24984ce6f6c993b278293aae7364eb
2011-12-09 16:09:16 +09:00
4606de117b
Stop a flag from escaping.
...
The ultimate intent is to close it up in the settings, as it does not
change while typing, only when the keyboard is open again.
Change-Id: I12ff56e7482c1584877fe5531473bf03e95a60f6
2011-12-09 16:09:04 +09:00
784181e29f
Merge "Cleanup debug logging code"
2011-12-08 23:08:22 -08:00
ed43296217
Move settings method from Utils to SettingsValues
...
Change-Id: I633378a41f63cd492b8c9345d550e07254df5e5a
2011-12-09 16:03:10 +09:00
a7af03baf4
Merge "Get rid of public KeyboardState.setShifted and setShiftLocked"
2011-12-08 23:02:47 -08:00
4bae9d56d9
Merge "Show usability study mode for research purposes"
2011-12-08 22:40:58 -08:00
e0dfc54c5b
Show usability study mode for research purposes
...
Bug: 5722703
Change-Id: I27acc374c5d4b52707708b83689dea5d78a573d7
2011-12-09 15:31:06 +09:00
930a55b846
Cleanup debug logging code
...
Change-Id: If806d61c5945d319c89d9cc127e09f98b7b10a4e
2011-12-09 15:14:05 +09:00
805402e8fa
Get rid of public KeyboardState.setShifted and setShiftLocked
...
Bug: 5708602
Change-Id: I98bcca7d3e9dd88f034d0faecada76902b2d0dff
2011-12-09 15:13:23 +09:00
a76c62e92d
Merge "Remove direct calls of setKeyboardXXX from KeyboardSwitcher"
2011-12-08 21:33:09 -08:00
96c56cb577
Remove direct calls of setKeyboardXXX from KeyboardSwitcher
...
These calls, setAlphabetKeyboard, setSymbolsKeyboard, and
setSymbolsShiftedKeyboard have to be call backed from KeyboardState.
Bug: 5708602
Change-Id: Ibbe1a21bd10bf942e17886869c0ab0fa1735b87e
2011-12-09 13:26:11 +09:00
7a16a061e6
Extract Settings.Values to a new class
...
This is pretty much automatic refactoring. Thanks Eclipse!
Change-Id: I8ccd24d11878445c836347e9c487c91461eee9cd
2011-12-09 12:40:50 +09:00
d52e760530
Merge "Cleanup KeyboardSwitcher a bit"
2011-12-08 05:55:16 -08:00
6ad9b012d9
Cleanup KeyboardSwitcher a bit
...
* Move caps lock state preserving code to KeyboardState.
* Merge KeyboardState.onLoadKeyboard and onRestoreKeyboardState.
* Merge private methods into toggleShift and toggleKeyboardMode.
Bug: 5708602
Change-Id: I793a934a0ba18d5750be011c52ebe20c1976eac6
2011-12-08 22:50:46 +09:00
92e5756dfb
Merge "Cleanup"
2011-12-08 05:14:26 -08:00
c1fdd966a7
Remove a useless method
...
Change-Id: Ib6a0ee21bfe2000231f9ba7bcad4b18ae57e4249
2011-12-08 21:47:26 +09:00
283b0c2b64
Cleanup
...
Here, shouldAutoCorrect implies mSettingsValues.mAutoCorrectEnabled
Change-Id: I9256718dd63b75252d1454e264db6814bbf18aa5
2011-12-08 21:37:15 +09:00
3da7df8db7
Merge "Add proximity for Russian."
2011-12-08 02:22:28 -08:00
1830cd1dc8
Add proximity for Russian.
...
This also tries to make the code as easy to extend as possible
for future developments.
Bug: 5701241
Change-Id: I1ed48e6a5cc7aab94c5d6e309930cc004247d7e7
2011-12-08 19:00:52 +09:00
9e38f9a980
Merge "Use the system-wide interface to add a word."
2011-12-08 00:52:32 -08:00
cf58f53a1a
Move KeyboardLayoutState into KeyboardState
...
Bug: 5708602
Change-Id: Ieb6b872d0f2cf3ad1fcb69409e2cf49f60427672
2011-12-08 17:00:56 +09:00
eef6238f94
Move SWITCH_STATE related stuffs to KeyboardState
...
Bug: 5708602
Change-Id: I904ec370e3761c47af17a680c0932ec98cfd3c27
2011-12-08 16:12:49 +09:00
b300dbbd39
Reset saved caps lock sate when new keyboard is loaded
...
Bug: 5722919
Change-Id: Id92632a0feffc3342d3c31e90c0da973c934f3c0
2011-12-07 22:48:04 +09:00
6b7100feca
Don't execute pending onStartInputView if EditorInfos are equivalent
...
Bug: 5722732
Bug: 5722867
Change-Id: I8347c258b286c3329f318d50adf205e78e49c722
2011-12-07 22:39:13 +09:00
68d600a5f6
Merge "Remove internal toggleShift calls"
2011-12-07 02:35:52 -08:00
f47993ee34
Remove internal toggleShift calls
...
Bug: 5708602
Change-Id: Id1f76dbd40aaf9ed35d4598d902043675c3d74fc
2011-12-07 19:32:47 +09:00
845d829d47
Merge "Get rid of direct reference to KeyboardId from KeyboardLayoutState"
2011-12-07 01:41:05 -08:00
bc56e04425
Reset keyboard state when loading keyboard
...
Bug: 5627467
Change-Id: I709f97e47144d3270450adc7d8053038d0df57bc
2011-12-07 17:55:22 +09:00
361c42b746
Use the system-wide interface to add a word.
...
Bug: 5306641
Change-Id: Ic87e5bc3a5f1f03c57d48f2d92c28e0aba06847d
2011-12-07 16:19:05 +09:00
2e263b70d5
Get rid of direct reference to KeyboardId from KeyboardLayoutState
...
KeyboardLayoutState.restore directly loads keyboard using private
methods such as setAlphabetKeyboard and setShifted etc. instaed of
calling public methods such as toggleCapsLock, onPressShift, and
onReleaseShift.
Bug: 5708602
Change-Id: I799f80f1d505ac7bdf17b92b189fc418994bfa2f
2011-12-07 13:02:58 +09:00
55c0198eee
am c960695f: Updated keyboard to use SPEAK_PASSWORD preference.
...
* commit 'c960695f38ae0564dff3a6897fd1843c8e74c604':
Updated keyboard to use SPEAK_PASSWORD preference.
2011-12-06 16:59:46 -08:00
c960695f38
Updated keyboard to use SPEAK_PASSWORD preference.
...
Bug: 5678383
Change-Id: Ie9bdc92f4b2c9014159d672b71e4438f8fa34f55
2011-12-06 14:06:57 -08:00
e466583ddc
Fix caps lock key behavior
...
Fix the issue introduced by Idfe69978.
Bug: 5708602
Change-Id: I4265822b7d33417b87b3e7e3f49250ac5d2ecdda
2011-12-06 19:52:25 +09:00
8a70e70c84
Remove toggleSymbolsShift and rename toggleKeyboardMode
...
Bug: 5708602
Change-Id: Iadef3e862d00505d1d9f588d0d64445754d7b962
2011-12-06 18:12:34 +09:00
0da3708540
Merge "Move KeyboardShiftState to KeyboardState"
2011-12-06 00:25:05 -08:00
c1859b8fd2
Move KeyboardShiftState to KeyboardState
...
Bug: 5708602
Change-Id: Idfe69978972bb674e0f360ef5e324739e2652d25
2011-12-06 17:04:12 +09:00
c9f8cb614e
Merge "Refactor reflection member"
2011-12-05 23:38:37 -08:00
b95905669c
Refactor reflection member
...
Change-Id: I112dbf851e10dae9e4291cf440f01b28d51180f4
2011-12-06 16:35:02 +09:00
4f7f61730c
Make Keyboard.setShifted return void
...
Bug: 5708602
Change-Id: If8150f62fbab864344f59853850ff3213c27940e
2011-12-06 14:42:30 +09:00
ec52fb6dbb
Merge "Minor refactoring of Keyboard"
2011-12-05 16:49:35 -08:00
a3cf232a2a
am e5db3871: Fix a field value for the suggestion max size Bug: 5574747
...
* commit 'e5db3871b1269703e5ef360090fb35f50ae57ed4':
Fix a field value for the suggestion max size Bug: 5574747
2011-12-05 07:54:59 -08:00
5b74989bef
Minor refactoring of Keyboard
...
* Remove isAlphaKeyboard().
* Remove isPhoneKeyboard().
* Remove getKeyboardShiftState().
Bug: 5708602
Change-Id: I8bf5009bf499ecb0501d1379f72e43406080062a
2011-12-05 20:04:52 +09:00
f7fa231b7a
Merge "Add support for Russian spell checking."
2011-12-05 02:30:29 -08:00
bb2b30fc7f
Add support for Russian spell checking.
...
Note that this is not enough: we still need to create a
reasonable proximity table for Cyrillic characters, or we
won't be able to show up suggestions.
Bug: 5701241
Change-Id: Idb141f7a230a6e1a46094308c26f43c01ab3b97a
2011-12-05 18:57:03 +09:00
6ddb07433f
Merge setManualTemporaryUpperCase and setAutomaticTemporaryUpperCase
...
Bug: 5708602
Change-Id: I6a0b5f0dcccbb6331a271cd61a48c474a7800289
2011-12-05 18:54:43 +09:00
46831d5a4b
Renaming KeyboardSwitcher.getPointerCount to isSinglePointer
...
Bug: 5708602
Change-Id: If44ed4449a3ea79228e25e2ab2c8c8fe82a93a2b
2011-12-05 17:53:58 +09:00
4a292acc6f
Make ModifierKeySatate and ShiftKeyState non-public class
...
Bug: 5708602
Change-Id: I149c2dab26774686e5c578bbf780081e9fb30e7c
2011-12-05 15:40:51 +09:00
b88c9acd88
Add KeyboardState to host shift and symbol key states
...
The KeyboardState will conatin all logic of keyboard state when series
of refactoring are achieved. And the KeyboardState should not be
entangled with other objcets such as Keyboard and KeyboardSwitcher in
order to keep it easily testable.
Bug: 5708602
Change-Id: I288bc169c47e1b4de27fe78854baadbcc85c5d23
2011-12-05 15:08:59 +09:00
e5db3871b1
Fix a field value for the suggestion max size
...
Bug: 5574747
This bug was introduced by I5e40edf6f790c078c4a05d
Change-Id: I5b0f51e1f5e8a12d786657167082bc604089505e
2011-12-05 12:53:45 +09:00
c410e243e9
Ignore releasing shift key caused by long press
...
Bug: 5694715
Change-Id: If7b84f547f5701e84d740f186d284273565b7eba
2011-12-05 12:23:38 +09:00
5c269d1e0d
Merge "Use Iterator in PointerTrackerQueue"
2011-12-01 01:36:19 -08:00
41a51bb2b4
Merge "Fix debug messages neatly"
2011-12-01 01:01:09 -08:00
78ac86ff9d
Use Iterator in PointerTrackerQueue
...
Change-Id: Ia5ad7d4511b2f2db056f2acf7cc0e002001e2123
2011-12-01 17:50:37 +09:00
e742436a29
Fix debug messages neatly
...
Change-Id: I40538d5ffbdf64df4e2848de33393327d704fc1e
2011-12-01 16:43:22 +09:00
c9f203805c
Fix potential NPE
...
Change-Id: I00e7cd521bafd2705ebc2a59d63b7bfc4fe178ba
2011-12-01 16:29:13 +09:00
ae7746e580
Merge "Add Key.altCode attribute"
2011-11-30 03:15:44 -08:00
2013bab89c
Add Key.altCode attribute
...
* Registering alternate code and while key is typing.
* Showing press/release graphics of the key that has the above altenate code.
* Showing press/release graphics of all shift keys.
* Renaming Key.ignoreWhileTyping to Key.altCodeWhileTyping.
Bug: 5639503
Change-Id: I67fb45bae76284a1f0deb6fd12ae5fb781d06cc3
2011-11-30 20:06:47 +09:00
db5aedb5a5
Add an option to use contacts or not while spell checking
...
Bug: 5447495
Change-Id: Iffb09895676c3dd1a79d1699b0eac865282508d4
2011-11-30 18:58:10 +09:00
e22baaadd3
Get rid of usage of key index
...
Change-Id: I7596ce3ae52fde436d06c2dd95ae873c7aa5ef7f
2011-11-29 19:07:54 +09:00
55042ff977
Merge "Resume suggestion when backspacing to the end of a word"
2011-11-29 01:15:42 -08:00
b230806f44
Merge "Save keyboard layout only when it is shown"
2011-11-29 00:53:38 -08:00
6b1f500da4
Resume suggestion when backspacing to the end of a word
...
Bug: 5515381
Change-Id: I26fea896feaf2e9716c7ae3d4f2630360f23ac50
2011-11-29 17:50:36 +09:00
117fc18ed4
Keep count of the trailing single quotes for suggestions
...
Bug: 5665809
Change-Id: I4d9100dbe980861ccb55c78464524be670cac1f7
2011-11-29 15:16:28 +09:00
f2c9a88887
Save keyboard layout only when it is shown
...
Bug: 5130446
Change-Id: I150b4a053036eae050099155169325f0d1f7dfed
2011-11-29 14:12:49 +09:00
c1f7d39b4a
Introduce ignoreWhileTyping flags to Key.keyActionFlags
...
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -08:00
adb89c109e
Merge "Move ignore special key code out from LatinIME to PointerTracker"
2011-11-22 17:57:59 -08:00
9324665263
Move ignore special key code out from LatinIME to PointerTracker
...
Bug: 5560766
Bug: 5639503
Change-Id: I34c9eea833516adf6ef1db58f1a64a5ef5322fa9
2011-11-22 17:49:12 -08:00
3b82e8163c
Merge "Fixed typing uppercase letters when touch exploration is enabled."
2011-11-22 14:57:59 -08:00
6d1cbbc2ff
Fix a bug with single quotes
...
I14dd3815 special-cased single quotes at the start of a word, but
did not do so correctly - it would kill a composing word if entered
just after some punctuations.
The right test was not isCursorTouchingWord() but
mHasUncommittedTypedChars, which actually makes for a simpler
implementation.
Bug: 5648032
Change-Id: Icd21d213e0cad6da68cacfeb921502cd8dcfac95
2011-11-22 18:29:51 +09:00
13d5f6605b
Add Key.keyActionFlags and obsolete Key.isRepeatable
...
This change also renames Key.keyLabelOption to keyLabelFlags.
Change-Id: Iedd0bfaa420ad382c07ce084416355690e390919
2011-11-21 20:33:03 -08:00
e87fd4d282
Fixed typing uppercase letters when touch exploration is enabled.
...
Bug: 5652774
Change-Id: Id8cd37b3ff93b45f4f18198bbbb827aadf945b02
2011-11-21 17:56:03 -08:00
e7eac906c0
Pending onStartInputView only if the EditorInfo is identical
...
Bug: 5604372
Change-Id: I2a88cf15b07eebd29e43e460f6ec758432181b01
2011-11-21 16:32:46 -08:00
19cbdfc92f
Merge "Remove an unused (and scary) method"
2011-11-21 00:57:45 -08:00
ce86e39e00
Merge "Cleanup."
2011-11-21 00:53:49 -08:00
5d5028f2c5
Remove an unused (and scary) method
...
Change-Id: I14a545a3e4955a25fde17554156552c755d44e2f
2011-11-21 17:45:32 +09:00
6ecd1e1280
Merge "Special case quotes at start and end of words"
2011-11-21 00:21:09 -08:00
c83359f974
Special case quotes at start and end of words
...
Single quote at start of word is not considered a part of a
word any more.
Single quote at the end of a word now behave like capitalization:
lookup in the dictionary is done *disregarding* a final quote,
and it is forcefully added back into the suggestions afterwards.
Bug: 5566368
Change-Id: I14dd3815f4b743edba56d64a3abdf4b73d863a6a
2011-11-21 16:34:39 +09:00
f3dfa55029
Merge "Introduce noKeyPreview Key attribute"
2011-11-18 16:28:54 -08:00
e00ede531f
am 5619d765: Shift/Symbol/Smiley will not disable settings/microphone keys
...
* commit '5619d7658459d13723b6d7ad8969b249adf9e717':
Shift/Symbol/Smiley will not disable settings/microphone keys
2011-11-18 15:23:14 -08:00
5dc318a3f2
am 10dff768: Fix NPE introduced by I38b21d49
...
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
Fix NPE introduced by I38b21d49
2011-11-18 14:48:05 -08:00
431ce93925
Introduce noKeyPreview Key attribute
...
This change also removes hacks in LatinKeyboardView by utilizing
noKeyPreview attribute.
Bug: 5638595
Change-Id: Icd8a3af3b7849b941f8f5532e2b432e126a909e6
2011-11-18 14:40:05 -08:00
18630d5fd6
am 15a01d72: Merge "Do not show key preview of settings and shortcut key" into ics-mr1
...
* commit '15a01d72724ce7f0a9a5814443a03b907962f3fd':
Do not show key preview of settings and shortcut key
2011-11-18 09:15:52 -08:00
49cc3beb75
resolved conflicts for merge of 137667ed to master
...
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
88562bec54
Cleanup.
...
Fix a typo, and move a cursor.close() in a finally{} clause
Change-Id: Iac011ebb80b9430774c7dc5cd94728d05cef443f
2011-11-18 15:24:49 +09:00
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -08:00
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
ca14c8bf34
Do not show key preview of settings and shortcut key
...
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
60acfdf4a8
Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
...
This is cherry-pick of I003101b2 from Master for Bug: 5541192
Bug: 5636367
Change-Id: I560126d17be6a770b19c1f1347332ebdfde5d671
2011-11-17 14:30:54 -08:00
875c16adc3
Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1
2011-11-17 11:18:28 -08:00
ac4bd59864
Merge "Fix long press caps lock handling"
2011-11-17 11:05:51 -08:00
245a4d9304
am d845c26b: Merge "Fix IndexOutOfBoundsException in monkey test" into ics-mr1
...
* commit 'd845c26b0e72e67aa14b5eac4616eb5ee7d81b33':
Fix IndexOutOfBoundsException in monkey test
2011-11-17 07:48:20 -08:00
628ca7a854
Fix long press caps lock handling (DO NOT MERGE)
...
This is cherry-pick of I3850f283.
Bug: 5627467
Change-Id: If46dcbe5bac42b975bd001fefb9f11520a0abb70
2011-11-16 16:50:44 -08:00
42e8c64a04
Fix long press caps lock handling
...
Bug: 5627467
Change-Id: I3850f283d44da81ecb22fc4e6d8aa574f5fcf65f
2011-11-16 16:50:03 -08:00
d17786fcd2
Fix IndexOutOfBoundsException in monkey test
...
Bug: 5627027
Change-Id: I341cfa5c3d553a1c819d8455936b40a40ad30e87
2011-11-16 15:53:03 -08:00
eb520c5683
am 549e295d: Fix updateFullscreenMode of LatinIME
...
* commit '549e295dc113bff50077c3c355dcd94af09a1b2f':
Fix updateFullscreenMode of LatinIME
2011-11-15 18:25:21 -08:00
549e295dc1
Fix updateFullscreenMode of LatinIME
...
Bug: 5597608
Change-Id: If4b18dc933493bd74bc5506c028af86b0450df1f
2011-11-15 15:15:11 -08:00
ed631627cb
Double space conversion should be enabled only when the 1st space is "weak".
...
bug: 5608934
Change-Id: Ide7ca9d526620c4f225a6f5eb27dcd7df5b504bd
2011-11-15 12:35:22 +09:00
85170a9c17
Merge "Be stricter for ruling characters out of spell checking"
2011-11-10 15:51:45 -08:00
72479ea363
Be stricter for ruling characters out of spell checking
...
Bug: 5548308
Change-Id: Ie8025b02424b72b69a07907cde1093830c2d4d3d
2011-11-10 12:57:09 +09:00
a409f009fa
Fill in the HAS_RECOMMENDED_SUGGESTIONS flag.
...
Bug: 5530727
Change-Id: Ic53e227f72096053e08d90204bf1f287ec09290b
2011-11-10 02:52:46 +09:00
0e39e820ce
Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1
2011-11-07 19:14:21 -08:00
cea3c5bc17
am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1
...
* commit '0a75373f4187d2db036757c2c2bcaba42301fd22':
Fix a bug where the UserDictionary may not be released
2011-11-07 23:04:05 +00:00
8b9c89aee2
Fix a bug where the UserDictionary may not be released
...
Bug: 5547357
Change-Id: I521afeaa349c86fb0087cedb70127de6acebec78
2011-11-07 14:31:59 +09:00
549863a7c5
Fix referring wrong TypedArray (DO NOT MERGE)
...
This is the cherry-pick of Change I2a8f00ed from Master.
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
2011-11-07 14:09:36 +09:00
6c1c546a98
Merge "Fix referring wrong TypedArray"
2011-11-04 03:47:01 -07:00
Tadashi G. Takaoka
Jean Chalard
satok
Ken Wakasa
Alan Viverette
Svetoslav Ganov