Jean Chalard
77d59b0691
Consolidate underlining code under one function.
...
Change-Id: I4393ff1ec28a6b3118d1344dd6d82d04899dea42
2011-12-13 17:42:27 +09:00
Jean Chalard
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
Jean Chalard
14cb8448df
Remove a useless return
...
Change-Id: Iefe10e94e2d88171387351a5b6cab52e281d0f76
2011-12-13 16:48:28 +09:00
Jean Chalard
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
Jean Chalard
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
Jean Chalard
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
Jean Chalard
a2a85d45e0
Refactoring
...
Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
2011-12-13 15:38:49 +09:00
Jean Chalard
34081186f9
Merge "Fix a bug where revert auto-correct would revert too much"
2011-12-12 04:46:27 -08:00
Jean Chalard
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
Jean Chalard
4f41cbc588
Remove a useless function call
...
Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
2011-12-12 20:51:43 +09:00
Jean Chalard
dcf8a6b2c6
Merge "Move a settings var to the settings class"
2011-12-12 03:31:42 -08:00
Jean Chalard
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
Jean Chalard
d567b230b0
Move a settings var to the settings class
...
Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
2011-12-12 19:52:17 +09:00
Jean Chalard
7208af0ecd
Remove a messy and unused class.
...
Today is a happy day
Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
2011-12-12 19:31:29 +09:00
Jean Chalard
f162ed7ec8
Merge "Remove side-effects from TextEntryState"
2011-12-12 02:20:49 -08:00
Jean Chalard
406d192a9e
Remove side-effects from TextEntryState
...
Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
2011-12-12 19:19:39 +09:00
Jean Chalard
c2a76a1529
Remove a useless variable.
...
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
2011-12-12 16:49:32 +09:00
Jean Chalard
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
Jean Chalard
86344836ee
Merge "Remove a duplicated variable."
2011-12-11 21:26:31 -08:00
Tadashi G. Takaoka
2ba1bcccdd
Remove unused Keyboard.CODE_CANCEL
...
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +09:00
Jean Chalard
3651220327
Remove a duplicated variable.
...
This is awesome cleanup.
Change-Id: I35ce8940a13f3084630dc26d6e7e397acfdaac36
2011-12-12 12:06:41 +09:00
Tadashi G. Takaoka
963abf4bcc
Merge "Remove unused public methods from KeyboardState and KeyboardSwitcher"
2011-12-09 04:38:14 -08:00
Tadashi G. Takaoka
df9deffba2
Remove unused public methods from KeyboardState and KeyboardSwitcher
...
Bug: 5708602
Change-Id: I3dbc3cd00aa9ddf611e2078ff2cfea8945fa09bf
2011-12-09 21:14:13 +09:00
Jean Chalard
0fe3611bee
Resolve TODOs: add some members to store prefs
...
Change-Id: Idf09cb5d801e8008eb63cbb5138058faeb7db136
2011-12-09 20:16:57 +09:00
Jean Chalard
c207e0a7da
Move settings variables to the settings class
...
Change-Id: Ifa7033a84b08ea626eb44cf6d04ba8e28c250bea
2011-12-09 16:47:31 +09:00
Jean Chalard
284c8a0449
Merge "Stop a flag from escaping."
2011-12-08 23:14:15 -08:00
Jean Chalard
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
Jean Chalard
ed43296217
Move settings method from Utils to SettingsValues
...
Change-Id: I633378a41f63cd492b8c9345d550e07254df5e5a
2011-12-09 16:03:10 +09:00
Tadashi G. Takaoka
a76c62e92d
Merge "Remove direct calls of setKeyboardXXX from KeyboardSwitcher"
2011-12-08 21:33:09 -08:00
Tadashi G. Takaoka
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
Jean Chalard
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
Jean Chalard
283b0c2b64
Cleanup
...
Here, shouldAutoCorrect implies mSettingsValues.mAutoCorrectEnabled
Change-Id: I9256718dd63b75252d1454e264db6814bbf18aa5
2011-12-08 21:37:15 +09:00
Tadashi G. Takaoka
eef6238f94
Move SWITCH_STATE related stuffs to KeyboardState
...
Bug: 5708602
Change-Id: I904ec370e3761c47af17a680c0932ec98cfd3c27
2011-12-08 16:12:49 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
8a70e70c84
Remove toggleSymbolsShift and rename toggleKeyboardMode
...
Bug: 5708602
Change-Id: Iadef3e862d00505d1d9f588d0d64445754d7b962
2011-12-06 18:12:34 +09:00
Jean Chalard
55042ff977
Merge "Resume suggestion when backspacing to the end of a word"
2011-11-29 01:15:42 -08:00
Tadashi G. Takaoka
b230806f44
Merge "Save keyboard layout only when it is shown"
2011-11-29 00:53:38 -08:00
Jean Chalard
6b1f500da4
Resume suggestion when backspacing to the end of a word
...
Bug: 5515381
Change-Id: I26fea896feaf2e9716c7ae3d4f2630360f23ac50
2011-11-29 17:50:36 +09:00
Jean Chalard
117fc18ed4
Keep count of the trailing single quotes for suggestions
...
Bug: 5665809
Change-Id: I4d9100dbe980861ccb55c78464524be670cac1f7
2011-11-29 15:16:28 +09:00
Tadashi G. Takaoka
f2c9a88887
Save keyboard layout only when it is shown
...
Bug: 5130446
Change-Id: I150b4a053036eae050099155169325f0d1f7dfed
2011-11-29 14:12:49 +09:00
Tadashi G. Takaoka
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
Jean Chalard
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
Tadashi G. Takaoka
e7eac906c0
Pending onStartInputView only if the EditorInfo is identical
...
Bug: 5604372
Change-Id: I2a88cf15b07eebd29e43e460f6ec758432181b01
2011-11-21 16:32:46 -08:00
Jean Chalard
19cbdfc92f
Merge "Remove an unused (and scary) method"
2011-11-21 00:57:45 -08:00
Jean Chalard
ce86e39e00
Merge "Cleanup."
2011-11-21 00:53:49 -08:00
Jean Chalard
5d5028f2c5
Remove an unused (and scary) method
...
Change-Id: I14a545a3e4955a25fde17554156552c755d44e2f
2011-11-21 17:45:32 +09:00
Jean Chalard
6ecd1e1280
Merge "Special case quotes at start and end of words"
2011-11-21 00:21:09 -08:00
Jean Chalard
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
5dc318a3f2
am 10dff768
: Fix NPE introduced by I38b21d49
...
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
Fix NPE introduced by I38b21d49
2011-11-18 14:48:05 -08:00
Tadashi G. Takaoka
49cc3beb75
resolved conflicts for merge of 137667ed
to master
...
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
Tadashi G. Takaoka
5619d76584
Shift/Symbol/Smiley will not disable settings/microphone keys
...
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
Jean Chalard
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
Tadashi G. Takaoka
10dff76856
Fix NPE introduced by I38b21d49
...
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -08:00
Tadashi G. Takaoka
137667ed3d
Merge "Ignore microphone and settings key while typing" into ics-mr1
2011-11-17 18:01:43 -08:00
Tadashi G. Takaoka
175acb8205
Ignore microphone and settings key while typing
...
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
eb520c5683
am 549e295d
: Fix updateFullscreenMode of LatinIME
...
* commit '549e295dc113bff50077c3c355dcd94af09a1b2f':
Fix updateFullscreenMode of LatinIME
2011-11-15 18:25:21 -08:00
Tadashi G. Takaoka
549e295dc1
Fix updateFullscreenMode of LatinIME
...
Bug: 5597608
Change-Id: If4b18dc933493bd74bc5506c028af86b0450df1f
2011-11-15 15:15:11 -08:00
Ken Wakasa
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
Tadashi G. Takaoka
1e39565bb4
Skip loading keyboard when SoftInputWindow hasn't shown yet.
...
Bug: 5541192
Change-Id: I003101b2a3fdeb5bb554d249634ec5ab50aea09e
2011-11-04 15:01:58 +09:00
Jean Chalard
2c77216e22
Remove trailing spaces when appropriate
...
Bug: 5509651
Change-Id: I99cfb5a6fc2873e2c11ed16967cd82a7f504a263
2011-11-02 19:44:26 +09:00
Tadashi G. Takaoka
6f811bd13f
Merge "Make some private method static"
2011-10-27 22:57:58 -07:00
Tadashi G. Takaoka
8fbf29e2d5
Make some private method static
...
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
Tadashi G. Takaoka
3122cf8daa
am 07a44557
: Merge "Cancel pending rotation when another rotation start" into ics-mr1
...
* commit '07a445572f7fa21c0e24f5cdb0f0b88ff2adc672':
Cancel pending rotation when another rotation start
2011-10-27 22:59:14 +00:00
Ken Wakasa
644d33d60e
Display "Touch again to save" in the keyboard locale
...
bug: 524239
Change-Id: I227c193ba149f9296f8b1cf40aa3d9cf4e6ae2ab
2011-10-28 00:33:15 +09:00
Tadashi G. Takaoka
dd25e4fa2c
Cancel pending rotation when another rotation start
...
Bug: 5516802
Change-Id: Iccb0abeb94e6dc1322a98a0c744188bb74034c7f
2011-10-27 17:03:03 +09:00
Tadashi G. Takaoka
ef543c725e
Merge "Use onCustomRequest to request haptick and audio feedback"
2011-10-26 07:54:23 -07:00
Tadashi G. Takaoka
d999ea4480
Use onCustomRequest to request haptick and audio feedback
...
Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0
2011-10-26 23:32:38 +09:00
Ken Wakasa
44f4d77b75
am cb8cb95d
: Fix NPE
...
* commit 'cb8cb95d0afd340de9f1a0e15948f0068d2450bc':
Fix NPE
2011-10-26 14:25:28 +00:00
Jean Chalard
120586c226
Group special spaces and double/swapped spaces in undo mode
...
This introduces an elementary undo facility that accounts
for magic space, strong space, double space and its cancelling,
and swapped punctuation and its cancelling.
The former three were existing behavior ; this change adds
the swapped punctuation cancelling behavior.
Bug: 5454442
Change-Id: I87af633f30caa2788e9af725e556a7f0746d9a14
2011-10-26 19:12:55 +09:00
Ken Wakasa
cb8cb95d0a
Fix NPE
...
bug: 5512097
Change-Id: Id6752c95c9c4b39e7975daa187a2ab92b740060a
2011-10-26 02:35:44 +09:00
Jean Chalard
d0c5f9395a
Cleanup.
...
Remove a state that can never be reached, and ajust all the
callers that would always have received false.
Change-Id: Iac025568be11743428419e0772da306a4f0a0bf1
2011-10-25 21:57:30 +09:00
Jean Chalard
126698fdd2
Add a strong space behavior.
...
Bug: 5454442
Change-Id: Ic095cb65dd7b4427617cd74fc7c53a9666b218c4
2011-10-25 18:40:14 +09:00
Jean Chalard
b715299125
Fix a cosmetic bug where text would blink on space swap
...
On space swap or space removal in some occasions there would be
a small blink on the screen. This change fixes that.
Change-Id: I486cbcc5dfcafd531b3fa92c4f9a3255832f22cc
2011-10-25 18:02:23 +09:00
Tadashi G. Takaoka
b2b1eb5ca5
Call updateFulscreenMode before calling isFullscreenMode
...
Bug: 5495739
Change-Id: I25eab59833a8b95a0b75893d37a45e67504fa7d0
2011-10-24 15:30:49 +09:00
Jean Chalard
26a531c6fe
Rename a flag
...
...and insert some explaining commands
Change-Id: Iff6511e71d66abfaea9f6c21c47f74fa0a67ad78
2011-10-21 19:59:46 +09:00
Tadashi G. Takaoka
49426a1ea9
Fix potential NPE
...
Bug: 5462524
Change-Id: I76012d1bbcd83d58f034c2f588802e4d1b7edc4d
2011-10-20 20:31:17 +09:00
Tadashi G. Takaoka
82c8c2e6c0
Add warning log for unexpected inputType
...
Bug: 5130446
Change-Id: I3484c75144ba68db0734a4d38186d2eafd1b1879
2011-10-19 16:53:07 +09:00
satok
c5d51a40a4
am fe2d9079
: Fix a bug that the typed word with the blue underline indicator will be duplicated
...
* commit 'fe2d90798ea409ee39d6f63942eb01bb7eed98e3':
Fix a bug that the typed word with the blue underline indicator will be duplicated
2011-10-17 11:32:24 -07:00
satok
fe2d90798e
Fix a bug that the typed word with the blue underline indicator will be duplicated
...
Bug: 5466373
Change-Id: I0300c34cb6076b12ecb89cb29bea95288559108f
2011-10-17 13:25:22 +09:00
Tadashi G. Takaoka
6262fa5307
am ed6bc82d
: Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0
...
* commit 'ed6bc82d9785372c407e1a4f563ae7d30c479b8a':
Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
2011-10-13 22:09:08 -07:00
Tadashi G. Takaoka
d874ac581e
Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
...
This reverts commit b1bc5fd896
. (If3a73179)
Bug: 5410786
2011-10-14 12:15:24 +09:00
satok
22c2a23cda
am 605a6fea
: Merge "Fix the safety net Bug: 5453150" into ics-mr0
...
* commit '605a6fea750c4acc96a5136ecaf7162e0a858b9f':
Fix the safety net Bug: 5453150
2011-10-12 23:46:25 -07:00
satok
605a6fea75
Merge "Fix the safety net Bug: 5453150" into ics-mr0
2011-10-12 23:44:54 -07:00
satok
2aa1dd45c4
Fix the safety net
...
Bug: 5453150
Change-Id: I5990feb2622738988bf29843c6bcdb9cbf8bbf33
2011-10-13 15:16:59 +09:00
Tadashi G. Takaoka
283d35cb6c
am 62fb8a48
: Merge "Take invisible extractArea height into account" into ics-mr0
...
* commit '62fb8a480df325ebc6b2a4dc023a944e3cd0bcef':
Take invisible extractArea height into account
2011-10-12 12:00:44 -07:00
Tadashi G. Takaoka
62fb8a480d
Merge "Take invisible extractArea height into account" into ics-mr0
2011-10-12 11:02:05 -07:00
satok
e596fe2702
am ef0a7b75
: Merge "Suppress flickers of the auto correction indicator" into ics-mr0
...
* commit 'ef0a7b75462c75b756caa09d9dd356309968abf3':
Suppress flickers of the auto correction indicator
2011-10-12 10:10:41 -07:00
satok
604d80c671
Suppress flickers of the auto correction indicator
...
Bug: 5440788
Change-Id: I7832b449ee777dbd87388a02cebdfee0ce350fbd
2011-10-12 19:14:13 +09:00
Tadashi G. Takaoka
d44647e76f
Take invisible extractArea height into account
...
Bug: 5410786
Change-Id: I97ce2d72f86ce62b37d408103863af66f91e7107
2011-10-12 19:13:28 +09:00
satok
a86869711e
Merge "Add a settings to change the sound effect volume"
2011-10-11 06:29:11 -07:00
satok
79c0acf519
Add a settings to change the sound effect volume
...
Bug: 5345401
Bug: 5402541
Change-Id: I1e653573a3362160104b77388d6cbd1700424649
2011-10-11 22:25:13 +09:00
Tadashi G. Takaoka
f44aeb6618
Fix haptic and audio feedback of caps-lock mode changing
...
Bug: 5435669
Change-Id: Ic1c1eb00d7e535a3ac602b9b505fd8bf43da5a8d
2011-10-11 15:27:56 +09:00
satok
602bcecf6b
Merge "Put SuggestionSpan as the indicater of the auto-correction"
2011-10-10 02:58:22 -07:00
satok
ec780e2868
Put SuggestionSpan as the indicater of the auto-correction
...
Bug: 5245468
Change-Id: Ia5609e1b3c69f5553e3632fbce60a55665a5b185
2011-10-10 18:44:52 +09:00
Svetoslav Ganov
7c2d7ad634
Merge "Let accessibility users know to connect a headset when the IME connects to a password field."
2011-10-07 15:36:04 -07:00
Jean Chalard
266ae6964d
Merge "Fix a bug with the whitelist"
2011-10-07 02:50:11 -07:00
Jean Chalard
5f41b705fc
Fix a bug with the whitelist
...
This bug would kill the case where the whitelist contains
a word to be autocorrected to an uppercased version of
itself, and the user would enter the uppercase version.
In this case, this bug would cause the typed word to be
killed off the list of candidates, and possibly autocorrected
to the *next* candidate.
When the whitelist checks whether this the typed word is
a candidate for whitelisting, this change has it check whether
the whitelisting results in the typed word before returning.
Hence, it can keep the case-insensitive behavior of the
whitelist.
Coincidentally, this change renames the method used to do
this, because it does not comply with the general contract
of Dictionary. This happens to be in the way of another
upcoming change.
Bug: 5420371
Change-Id: Ifb305271acc5f171adf9b18c762ae7975b14be0a
2011-10-07 18:40:23 +09:00
Tadashi G. Takaoka
416ee19d33
Add haptic feedback for caps lock
...
When long press triggers caps lock, the keyboard also triggers haptic
feedback.
This change also fixes trivial harmless bug in KeyboardSwitcher.
Bug: 5424681
Change-Id: I62706b49abd7be1dcebc3c5166ea03f426fc8c86
2011-10-07 13:57:49 +09:00