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
34f1820396
Remove KeyboardSwitcher.updateShiftLockState method
...
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
2011-12-13 16:57:23 +09:00
dc52e7c646
Remove current keyboard id variable
...
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
2011-12-13 12:49:40 +09:00
267cd0151f
Add special handling for "Phone number" layout.
...
Bug: 5743584
Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
2011-12-12 18:19:29 +09:00
df9deffba2
Remove unused public methods from KeyboardState and KeyboardSwitcher
...
Bug: 5708602
Change-Id: I3dbc3cd00aa9ddf611e2078ff2cfea8945fa09bf
2011-12-09 21:14:13 +09:00
10dcc7eb67
KeyboardState keeps track of isAlphabetMode and isSymbolShifted
...
Bug: 5708602
Change-Id: I181cdeb90d24984ce6f6c993b278293aae7364eb
2011-12-09 16:09:16 +09:00
784181e29f
Merge "Cleanup debug logging code"
2011-12-08 23:08:22 -08:00
a7af03baf4
Merge "Get rid of public KeyboardState.setShifted and setShiftLocked"
2011-12-08 23:02:47 -08: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
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
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
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
8a70e70c84
Remove toggleSymbolsShift and rename toggleKeyboardMode
...
Bug: 5708602
Change-Id: Iadef3e862d00505d1d9f588d0d64445754d7b962
2011-12-06 18:12:34 +09:00
c1859b8fd2
Move KeyboardShiftState to KeyboardState
...
Bug: 5708602
Change-Id: Idfe69978972bb674e0f360ef5e324739e2652d25
2011-12-06 17:04:12 +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
5b74989bef
Minor refactoring of Keyboard
...
* Remove isAlphaKeyboard().
* Remove isPhoneKeyboard().
* Remove getKeyboardShiftState().
Bug: 5708602
Change-Id: I8bf5009bf499ecb0501d1379f72e43406080062a
2011-12-05 20:04:52 +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
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
c410e243e9
Ignore releasing shift key caused by long press
...
Bug: 5694715
Change-Id: If7b84f547f5701e84d740f186d284273565b7eba
2011-12-05 12:23:38 +09:00
42e8c64a04
Fix long press caps lock handling
...
Bug: 5627467
Change-Id: I3850f283d44da81ecb22fc4e6d8aa574f5fcf65f
2011-11-16 16:50:03 -08:00
cb83b300e7
Remember shift locked state when switching between Main keyboard and Symbols
...
Bug: 5553660
Change-Id: Icb15a9f8a58243bd113c2d4897fee623ac48b66d
2011-11-04 17:36:40 +09:00
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
ab72a97d7c
Cleanup unused import
...
This change also gets rid of several compiler warnings.
Change-Id: I23962edaadad18a6e0395d528af17b909dcf5dad
2011-10-04 12:46:20 +09:00
294e1b4a5a
Pass the touch position correction flag from KeyboardSwitcher.
...
Change-Id: Ia242a9fa2fa71f7fdf8f974071a2df7acc4aa51f
2011-10-03 20:41:03 +09:00
59f8ca752d
Skip successive InputMethodService callbacks after orientation changed
...
IME is called back four methods for each input field as a IME life
cycle. The four methods are onStartInput, onStartInputView,
onFinishInputView and onFinishInput.
After orientation changed, Those quartet methods will be called back
twice. This behavior of the framework might be a bug.
In order to restore the previous keyboard layout, we should skip
onFinishInputView and onFinishInput of the first quartet and
onStartInput and onStartInputView of the second quartet.
Bug: 4311428
Change-Id: I450ddc0cce5d00abc971ffd42a507a8a86682548
2011-09-30 10:38:32 +09:00
63584323ca
Add themeId to Keyboard
...
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
2011-09-28 12:08:48 +09:00
f451ed2012
Forward touch events above the keyboard to the suggestions strip
...
The gutter area between the suggestions strip and the top-row keys
looks like a part of the suggestions strip, and the touch events
landing on the area should be forwarded to the suggestions strip.
Bug: 5246673
Change-Id: I92af763be0feed21aa36ceffb5d575abe554f19e
2011-09-27 19:02:24 +09:00
2d9722e46c
Update the theme pref key.
...
Follow up to Ia139813b
Change-Id: Ic4c2ea63041af02119dc404e704a04608d041163
2011-09-16 20:25:23 +09:00
dc52a5621a
Use the correct theme on ICS
...
bug: 5329939
Change-Id: Ia139813b83eefe53863cae9cbe46b8b3a940e0df
2011-09-16 16:26:13 +09:00
32cf5bb9f9
Stop auto-switching-back to the main layout by quotes.
...
bug: 5314117
Change-Id: Idcd6a146665b93eabdc03875b98988f9fa049791
2011-09-16 14:53:04 +09:00
ef35cb631c
Move locale-related utility methods to LocaleUtils.
...
Change-Id: I7e9e6e5bc4486d8618d0213b112308c3d305c15e
2011-08-29 12:29:35 +09:00
af52c0ea04
Implement "forceAscii" private IME option
...
This change also introduces "AsciiCapable" extra value for subtype
that indicates the subtype can input any ASCII code point from its
keyboard layout.
Only if the input field has "forceAscii" private IME option and the
current subtype doesn't have "AsciiCapable" extra value, the en_US
keyboard layout will be used for the input field.
Bug: 3384942
Change-Id: I25e2553e37ecb5002df1164e45f6273845fe463b
2011-08-24 13:19:56 +09:00
c84bc3460d
Rename LatinKeyboardBaseView to LatinKeyboardView
...
Bug: 5182291
Change-Id: I5089a14902b9f4ff1ab4f34e3f7a42aca5040d3e
2011-08-23 17:57:02 +09:00
c403a46f6d
Extract sudden jumping touch event hack into separate class
...
Bug: 5182291
Change-Id: I6a88ed4df3ec98e31ea4966d82da56f7fca342ac
2011-08-23 17:44:41 +09:00
b39f612d97
Remove hacks related to determine window width
...
Bug: 4311428
Change-Id: Ic93f264101d13963503fcd447a69bbffd06e69f3
2011-08-22 17:17:42 +09:00
cee174b8cc
Settings key visibility should always follow the system default value,
...
by ignoring its preference value, when the "show settings key option" in
the settings is disabled.
Change-Id: I934be2d9eb0bf6bf731e03f5d9b752de4a7a1c7c
2011-08-22 12:21:25 +09:00
e56e88beff
A follow up to I830de4d1
...
bug: 5130446
Change-Id: Ib1a4603590387c30be7555b8386f5e0607ea7249
2011-08-18 21:51:04 +09:00
286a5bf1c6
Update shift state in onSizeChanged()
...
bug: 5130446
Change-Id: I830de4d184dffa2b263206c3f078de054e227b9e
2011-08-15 20:10:28 +09:00
94ac3d760b
Fix NPE
...
Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
2011-08-04 09:40:25 -07:00
bb12dc455b
Merge "Fix saving keyboard state while rotating"
2011-08-03 15:15:59 -07:00
38b5605fee
Fix saving keyboard state while rotating
...
This change also uses longer timeout for restoring keyboard state.
Bug: 4311428
Change-Id: Ieade33d7c69f1dee727b2b8c26f0112eca44b336
2011-08-03 09:41:04 -07:00
73c02390d3
Reset keyboard shift lock state when new keyboard is ready
...
Bug: 5099761
Change-Id: I00ad796ea43a07ae13e71224b7a081ee2f160f1a
2011-08-03 09:24:13 -07:00
055054eef3
Retain keyboard layout while orientation change
...
This change also changes the timimng that the window width is
registered.
Bug: 4311428
Change-Id: Ied6b1b43bfa16a85f0e05cd308ce919d5d65677e
2011-08-03 02:20:27 -07:00
8da9a13760
Make Keyboard object immutable except shift state
...
This is the first step to implement suggestions pane as mini keyboard.
Bug: 5023981
Change-Id: I90ffbde0fda19b4be68add449310997b56bf6904
2011-08-01 22:04:48 -07:00
c3afe2c244
Replace the notion of "voice" with "shortcut" as many as possible
...
Bug: 4340933
Change-Id: I98b4eca5167cc3767a0868fae8f6436164adbe4d
2011-07-31 18:46:44 -07:00
73e716f202
Be aware of "nm" and "noMicrophoneKey" private IME option
...
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
2011-07-31 18:20:20 -07:00
2ba975afb9
Turn off the Settings key by default
...
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
2011-07-31 07:26:24 +09:00
364f1fd1f8
Add WindowWidthCache
...
Bug: 4311428
Change-Id: I9f006525c0932d9d49bb8655caf58523135366d7
2011-07-29 18:43:50 -07:00
0a054dd107
Cleanup KeyboardSwitcher internal a bit
...
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
2011-07-29 17:00:09 -07:00
5b3c834a9c
Merge "Remove enableShiftLock attribute from KeyboardId"
2011-07-28 17:38:50 -07:00
6d9bcd5e13
Remove enableShiftLock attribute from KeyboardId
...
This change is a follow up of Ia72de236.
Bug: 4311428
Change-Id: I0ad0f1fb93545ceb40df8dffe377240b020c2602
2011-07-28 17:25:44 -07:00
c3d175c01f
Fix wrong keyboard width when orientation has changed while IME is not shown
...
Bug: 5084021
Change-Id: Ie42da40b8249eaf9cf29707058906949278eff6a
2011-07-28 11:02:29 -07:00
60ccbe16ee
Clean up keyboard loading and switching
...
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
2011-07-27 13:34:16 -07:00
cce61aa045
Merge "Refactor Keyboard and KeyboardView resizing and drawing code"
2011-07-22 18:41:23 -07:00
38f55b36c3
Refactor Keyboard and KeyboardView resizing and drawing code
...
Bug: 4311428
Change-Id: Ice4050f92c8f3cec1bec2074fe6a913d04f50524
2011-07-22 16:50:53 -07:00
255486a5d0
Disable VoiceInputLogger inside LatinIME
...
Bug: 4985273
Change-Id: I6c70e50a58be0973f78c6a1abc1fb4eac5449c0b
2011-07-22 02:37:56 -07:00
ef5dfc480c
Remove sliding spacebar language switcher
...
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
2011-07-19 23:24:49 -07:00
1dc80048d7
Merge "Support select input method dialog on pre-HC platform"
2011-07-19 23:22:37 -07:00
bf9d8348d8
Support select input method dialog on pre-HC platform
...
Bug: 4971680
Change-Id: I641b336da54813e13409bd7874aa22e51f790729
2011-07-19 22:22:47 -07:00
89bb88f61c
Revert "Keep keyboard layout while orientation change"
...
This reverts commit 8ebbe03fed
2011-07-19 18:13:22 -07:00
8ebbe03fed
Keep keyboard layout while orientation change
...
This change can retain symbols layout only, can't retain shift or
shift lock state of the keyboard.
Bug: 4311428
Change-Id: I6248ed9a6d762e1ca4b72e391fdca9bc9f55ac35
2011-07-11 18:16:14 -07:00
5a7a696aff
Let KeyDetector hold Keyboard
...
Bug: 4768084
Change-Id: Ia28d6971fc59086dd4e6fedc9fd1b50f13b59854
2011-07-07 23:31:04 -07:00
80b79bf9a2
Merge "Fix "Show settings key" option on 7" device"
2011-06-23 08:35:21 -07:00
cd96a691b1
Fix "Show settings key" option on 7" device
...
Cherry-pic I993ac772 from Honeycomb-MR2.
Bug: 4586882
Change-Id: Ie74138523a3ae7958c7bec674c49aa0ab1a72d05
2011-06-24 00:08:42 +09:00
e7759091dd
Move Key class out of internal package
...
Bug: 4903326
Change-Id: I2493d6dae613d2e37dfa8ce96b4cddc9a038160c
2011-06-23 22:59:12 +09:00
9116bf18f9
New IceCreamSandwich assets and theme
...
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich. Though checked only on
hdpi-phone and mdpi-10"-tablet.
File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.
Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
2011-06-23 21:06:17 +09:00
5ac4638f99
Added support for touch exploration to Latin IME.
...
Bug: 4379983
Change-Id: I97f22e54827c6229054b514801401ffa5b4ed3b8
2011-06-22 10:54:06 -07:00
a93d27d6b8
Remove colorScheme attribute from KeyboardView
...
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
72934bd596
Move keyboard related internal class to separate package
...
Change-Id: Ic1459066b865cde5104b3734193f76c997959c68
2011-06-22 11:54:00 +09:00
87154c656e
Fix NPE
...
Bug: 4727778
Change-Id: I08f1204d5f77251c197dda7d2b332441f9f7123d
2011-06-21 02:31:33 +09:00
5a2d063047
Remove unnecessary onRefreshKeyboard call.
...
When using the sliding spacebar language switch on ICS, both
LatinIME.toggleLanguage() and
InputMethodService.onCurrentInputMethodSubtypeChanged() invoke
LatinIME.onRefreshKeyboard(). This change eliminates the first one if
it isn't necessary.
This change also cleans up the followings.
* reuse theme Context when the keyboard theme hasn't been changed.
* clear the Keyboard cache when theme has been switched.
* eliminates unnecessary Context reference from LatinKeyboard and
SlidingLocaleDrawable.
* recycle Bitmap and reuse Canvas in KeyboardView.
Bug: 4725930
Change-Id: I87366e9304879d94d12b7345adea768d86d43519
2011-06-20 19:21:31 +09:00
5e4e05afd2
Fix NPE
...
Bug: 4686479
Change-Id: I0b8a32d0f9bcebe55eebecd38dc5e69198e94378
2011-06-18 23:43:58 +09:00
b7758d6f91
Make Keyboard aware of theme
...
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.
Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +09:00
86e815a142
Implement expandable candidates pane
...
This change removes horizontal scroll from candidates strip. Instead
of that this change introduces "fixed 3 items candidates strip" and
"expandable candidates pane".
Bug: 4175031
Change-Id: Ia367d9074436fdea76d3b653d81798ce2749170e
2011-06-14 20:40:56 +09:00
070760dc5a
Clean up candidate strip view hierarchy
...
Bug: 4175031
Change-Id: I8073739ac7624d2c0a111c5ef7043d8766162a83
2011-06-13 15:12:23 +09:00
c25e07d212
Fix web input type judgment
...
Bug: 4490948
Change-Id: I71efb8f5784970f1d2a94da1d2eb852f7f11885f
2011-05-30 19:10:25 +09:00
13a7419994
Use custom theme for Keyboard theme switch
...
This change reduces the number of layout files and make these
theme-generic. This might be very helpful to re-design suggestion
strip.
Bug: 4175031
Change-Id: Idca10a4aa0bf7ac496eedd1879311e59780a423b
2011-05-25 18:59:00 +09:00
f3cd2bb33d
Fix IllegalStateException when setting input view
...
This is followup change of I95f379b9.
Bug: 4175031
Change-Id: Ibf3e3bd2524c9543ec6193cb6e59529b2c4df3b1
2011-05-25 15:09:09 +09:00
c150acc7c8
Move CandidateView into input view
...
Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
2011-05-24 15:37:53 +09:00
e896d31bb9
Reload keyboard after SoftInputWindow size changed
...
Bug: 4450008
Change-Id: Ic6c457db808d8e7479bfaa509192c07a384453e2
2011-05-20 16:23:20 +09:00
240297d0ee
Add advanced settings screen
...
Also add an option for popup dismissal delay so as to inaugurate the
new screen. Besides, remove a path for options to escape from
LatinIME and replace with a direct read from the settings.
Change-Id: I7ec6e724262871fa6523506ecc39f65c5fbe34da
2011-05-13 20:40:21 +09:00
101a00e3d4
Revert "Added support for speaking keys through accessibility service."
...
This reverts commit dcade18113
2011-05-12 00:14:55 +09:00
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
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
fd78781ced
Merge "Add a method to set the locale to Utils."
2011-04-27 00:42:24 -07:00
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
dbe882ac08
Merge "Release caps lock by double tap on shift key"
2011-04-26 23:57:57 -07:00
Tadashi G. Takaoka
Jean Chalard
Yusuke Nojima
Ken Wakasa
Alan Viverette