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
2ba1bcccdd
Remove unused Keyboard.CODE_CANCEL
...
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +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
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
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
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
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
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
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
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
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
e22baaadd3
Get rid of usage of key index
...
Change-Id: I7596ce3ae52fde436d06c2dd95ae873c7aa5ef7f
2011-11-29 19:07:54 +09:00
c1f7d39b4a
Introduce ignoreWhileTyping flags to Key.keyActionFlags
...
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -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
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
e7eac906c0
Pending onStartInputView only if the EditorInfo is identical
...
Bug: 5604372
Change-Id: I2a88cf15b07eebd29e43e460f6ec758432181b01
2011-11-21 16:32:46 -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
15a01d7272
Merge "Do not show key preview of settings and shortcut key" into ics-mr1
2011-11-17 18:02:05 -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
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
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
28f6948745
Fix referring wrong TypedArray
...
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
2011-11-04 19:41:23 +09: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
80e9bd34d1
Do not clip the popup key preview even if there is no left/right preview icons
...
Change-Id: Ie51f56c64ba4c69400fe6472b2397ba19ee74911
2011-11-04 10:35:06 +09:00
5fdcd7d5cd
Fix JNI as 64bit ready
...
Change-Id: I7a3ed2cee3b20744869aa5cf89ff9fd95f5ab8fe
2011-10-31 20:44:01 +09:00
adc5e6f12c
am f2c57551: Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1
...
* commit 'f2c57551a70de651dc34bd2d73f5e622ba3887db':
Removed lift-to-type from LatinIME accessibility.
2011-10-28 22:27:19 +00:00
8fbf29e2d5
Make some private method static
...
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
37c6bbb675
am a7c41996: Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1
...
* commit 'a7c419964f46d1c354e81c5688f5da6b43428c9a':
Preventing infinite call of dismissMoreKeysPanel
2011-10-27 02:35:12 +00:00
166530b195
Removed lift-to-type from LatinIME accessibility.
...
Bug: 5522854
Change-Id: I32df86450fa0d5dd9606609ea693d0e331b64b19
2011-10-26 18:52:08 -07:00
ef543c725e
Merge "Use onCustomRequest to request haptick and audio feedback"
2011-10-26 07:54:23 -07:00
d999ea4480
Use onCustomRequest to request haptick and audio feedback
...
Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0
2011-10-26 23:32:38 +09:00
e51d164482
Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
...
Change-Id: Idbcd6e3047c6c0c407e3b347cf9f65951d43a312
2011-10-26 20:54:35 +09:00
0cf7a45ac5
Preventing infinite call of dismissMoreKeysPanel
...
Bug: 5514583
Change-Id: Idf8dd1ebba0afdb768e538c2626b60770421d4be
2011-10-26 17:03:41 +09:00
cc02aa8af3
Fix missing TypedArray.recycle calls
...
Change-Id: I333e55b4e7925dac5495e2e73ac57ffcef4fabb4
2011-10-19 13:06:33 +09:00
ddd759aa9e
Close XmlResourceParser when finish parsing
...
Change-Id: If21ee187c83f044b235d88fba15af00e6ac8a308
2011-10-18 02:44:55 +09:00
908a2f6394
Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
2011-10-14 12:20:02 -07:00
28d841534d
Release bitmap buffer when KeyboardView is detached from Window
...
Bug: 5450387
Change-Id: I3e60edd8c0ea70aff9e484f6e00dadcc8f8981f6
2011-10-14 20:13:16 +09:00
a0e4f40994
Special handling of one key mini-keyboard to mitigate visual flicker
...
Use pre-computed width and height of mini keyboard if
* Popup key preview is enabled
* The mini keyboard has only one key
* Pre-computed width and height are specified
Bug: 5248783
Change-Id: I53475698e87d5bd67d36e63323c25a9e9f18fbb1
2011-10-14 17:49:48 +09:00
f44aeb6618
Fix haptic and audio feedback of caps-lock mode changing
...
Bug: 5435669
Change-Id: Ic1c1eb00d7e535a3ac602b9b505fd8bf43da5a8d
2011-10-11 15:27:56 +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
406a54f41c
Use XmlPullParser interface instead of XmlResourceParser
...
Change-Id: I00e8a82aaaf5fec1e27707bce0a82cbfd1bc9fae
2011-10-06 18:40:32 +09:00
cf6d374505
Remove unused local variable
...
Change-Id: Ia71e03ee59153db1dbc35028569f7c76d5b12bf7
2011-10-04 16:46:15 +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
a27812ae15
Fix obtainStyledAttribute not to look for default
...
Bug: 5402266
Change-Id: I8f84754b0080b315f9360e1ffa8353b386e88ad7
2011-10-03 16:48:03 +09:00
ad2dfa7697
Fix keyboard theme parsing
...
This is a followup of I13b9997e.
Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
2011-10-03 12:34:36 +09:00
5c26922ab2
Move themeId and touch correction data to Keyboard style
...
Change-Id: I13b9997e013b704734b6fa94131b1f7fec7a152d
2011-09-30 22:59:53 +09:00
da9f556a15
Merge "Classify touches into three types."
2011-09-30 01:26:15 -07:00
258bfe66e0
Classify touches into three types.
...
Change-Id: I7c1d42835e0c15d596a1b66d421b0aa514ec0890
2011-09-30 17:22:22 +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
ad35835bac
Pass the touch position correction data to native.
...
Change-Id: I92958779377a530410d1682100f9d0a2ba267dea
2011-09-29 17:00:49 +09:00
b45e095aa2
Merge "Add touch position correction data to resources."
2011-09-28 22:41:11 -07:00
d6339639c3
Add touch position correction data to resources.
...
Change-Id: I156205672f3935f70c250a6c538793f35c5d86b2
2011-09-29 14:29:23 +09:00
2fc4248700
Introduce hit box to Key and get rid of edge flags
...
Change-Id: I2b78d2ca756223b5497d01127c3a0190dcc81e57
2011-09-28 19:31:37 +09:00
a59f65ad0c
Merge "Extend JNI interface to pass the theme id of the keybaord to the native."
2011-09-27 20:27:17 -07:00
63584323ca
Add themeId to Keyboard
...
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
2011-09-28 12:08:48 +09:00
1c923d8581
Extend JNI interface to pass the theme id of the keybaord to the native.
...
Change-Id: I705ec2fa1d32a673a8d84bc9afc2a46208a414a1
2011-09-28 11:56:28 +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
73cd4c1428
Fix onDeatchedFromWindow to protected
...
Change-Id: Ief666554ffd405a43363e66ea2bc2d87aa76a882
2011-09-27 15:18:02 +09:00
287f4f83e9
Add horizontal edges paddings to phone/number layout
...
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
2011-09-26 17:11:01 +09:00
acf6b6815a
Merge "Fix keyboard row height calculation"
2011-09-25 19:25:28 -07:00
8fbfac4ffb
Fix keyboard row height calculation
...
The keyboard height will be distrubuted as:
top_padding + (key_height + vertical_gap) * row_count - vertical_gap + bottom_padding
Change-Id: I841f356b9dbf8cfaf3756178bc9e4e6b2aa61364
2011-09-26 10:25:49 +09:00
c66a7278d2
Merge "Revert "Use "..." instead of "\u2026"""
2011-09-23 15:08:23 -07:00
Tadashi G. Takaoka
Jean Chalard
Svetoslav Ganov
Alan Viverette
Yusuke Nojima
Fabrice Di Meglio