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
5a603f3fa2
Merge "Reorganize LatinIME native build directory structure. Now it got NDK friendly."
2011-12-13 04:24:20 -08:00
d5e35acffb
Reorganize LatinIME native build directory structure. Now it got NDK friendly.
...
Change-Id: I0f62ce8a6a4d2b6134db698f8b8d0576616e524d
2011-12-13 21:16:20 +09: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
Jean Chalard
Ken Wakasa
Tadashi G. Takaoka
satok