Commit graph

765 commits

Author SHA1 Message Date
Tadashi G. Takaoka
17f53103ee Fix KeyStyles to be able to override the value in style
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
2012-02-07 18:51:51 +09:00
Tadashi G. Takaoka
f6cf387edc Merge "Recursively resolve @string/resource reference in key key spec parsing" 2012-02-03 03:20:37 -08:00
Tadashi G. Takaoka
aca8870128 Recursively resolve @string/resource reference in key key spec parsing
Change-Id: I9d172605e90e828e00f7c4c8d49548498aa3b50d
2012-02-03 20:03:23 +09:00
Jean Chalard
9f17de5b4d Merge "Stop inserting a space after a manually picked word." 2012-02-03 02:09:05 -08:00
Tadashi G. Takaoka
24cd2617f5 Filter out empty entry from more keys CSV
Change-Id: I9a26aaa58f0f502b3bfef9de422370d2b0add8d8
2012-02-03 18:48:01 +09:00
Jean Chalard
fb684cebe8 Stop inserting a space after a manually picked word.
Bug: 4994861
Change-Id: I6ae256a94dbaddea4304304779d17025620c5025
2012-02-03 18:45:44 +09:00
Tadashi G. Takaoka
909b2940db Merge "Get rid of Key.setIcon(Drawable)" 2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka
e7948a8692 Get rid of Key.setIcon(Drawable)
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
Tadashi G. Takaoka
32c54c4dbe Fix key repeat interval timeout
Bug: 5960472
Change-Id: I27d4b81d393f2ace946740a0b0801cea8c63b5b8
2012-02-03 10:02:22 +09:00
Tadashi G. Takaoka
44e0e4f99e Fix Key.equals(Key)
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
2012-02-02 21:33:50 +09:00
Tadashi G. Takaoka
5852a2594f Parse escaped sequence strictly in CSV parser
This change alters the CSV parser behavior. The parser only resolves
  * String resource reference. ["@string/res" -> "<content_of_res>"]
  * Other occurrence of escape sequence will be intact. ["\x" -> "\x"]

Before this change, escape sequence in moreKeys string is parsed three
times. At first in parsing string resource, next in CSV parser, and at
last in KeySpecParser. So that representing single escape character
itself is a bit annoying, "\\\\\\\\".

Now we can represent single escape character itself in string resource by "\\\\".

Change-Id: Ib978e17b779cc82585eed8241ac3857508b14bc7
2012-02-02 20:19:26 +09:00
Tadashi G. Takaoka
8261a4cad7 Merge "Move CSV parser to KeySpecParser" 2012-02-01 23:25:17 -08:00
Tadashi G. Takaoka
0086861d5a Move CSV parser to KeySpecParser
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
2012-02-02 16:10:14 +09:00
satok
e05b3f4b3a Support additional proximity characters
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
2012-02-02 16:07:16 +09:00
Tadashi G. Takaoka
e01d272603 Make KeySpecParser and CSV parser code point aware
This change also renames MoreKeySpecParser to KeySpecParser

Change-Id: I35733cdbb344f16b57ffa2cfe79055c089b4e409
2012-02-02 15:51:40 +09:00
Tadashi G. Takaoka
71c695da22 Remove BIDI mirroring hack from Key
This change also removes isRtlKeyboard attribute from <Keyboard/>

Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +09:00
Tadashi G. Takaoka
40e9012276 Fix wrong long press timeout for shift key
Change-Id: Ifafbed1bcdaf662ee6a69050043739fa71986841
2012-02-01 21:15:34 +09:00
Tadashi G. Takaoka
ff858c7ff5 Use MoreKeySpecParser to parse puctuations strip resources
This change also
  * Doesn't use Key.getRtlParenthesisCode to get correct parentheses
    code in RTL context. Intead uses the outputText feature of
    moreKeys specification.
  * Move CVS string parser from KeyStyles to Utils.

Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
2012-02-01 19:33:26 +09:00
Tadashi G. Takaoka
a5c96f376a Move long press shift handling from PointerTracker to KeyboardState
This change also
  * Rename phone shift keyboard to phone symbols keyboard.
    Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
  * Remove phone symbols keyboard from tablet.
  * Introduces enableLongPress flag of Key.keyActionFlags attribute.
  * Remove clumsy long press code from PointerTracker.
  * Remove CODE_CAPSLOCK handling from LatinIME.
  * Make KeyboardSwitcher to invoke haptic and audio feedback.

Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
2012-02-01 19:04:21 +09:00
Tadashi G. Takaoka
3feb99fa6c Merge "Save/restore alphabet shift locked state while rotating even in symbols mode" 2012-01-31 02:26:41 -08:00
Tadashi G. Takaoka
49bd49c8fb Save/restore alphabet shift locked state while rotating even in symbols mode
Bug: 5730212
Change-Id: Id2342dacd149d6385d61001f880ebcd1883cf0b4
2012-01-31 19:11:39 +09:00
Tadashi G. Takaoka
aab33aac0a Merge "Cleanup redundant methods of KeyboardSwitcher" 2012-01-31 01:33:17 -08:00
Tadashi G. Takaoka
88e079ae6b Cleanup redundant methods of KeyboardSet
Change-Id: I69fa1b5661695d0323222c2969679f4792b6ef0d
2012-01-31 18:27:37 +09:00
Tadashi G. Takaoka
0ed2d3a449 Fix double tap shift key enable/disable shift locked mode
Bug: 5942452
Change-Id: I2c7b1605bceac2b2f929cd4d97c417ef15c6f754
2012-01-31 18:06:54 +09:00
Tadashi G. Takaoka
433ca6a46d Cleanup redundant methods of KeyboardSwitcher
Change-Id: I2ebeb8852177f6c6e30578d0bb3f372f488dc6c1
2012-01-31 17:18:14 +09:00
Tadashi G. Takaoka
ca2f051cc1 Auto generate various shift states alphabet keyboard automatically
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.

This change also
  * Eliminates KeyboardShiftState object from Keyboard.
  * Removes various set shift state methods from Keyboard.
  * Removes KeyboardSet.Element.elementAutoGenerate attribute.
  * Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
  * Add preserveCase flag to smiley, .com, and labeled special keys.
  * Rename KeyboardShiftState class to AlphabetShiftState.
  * Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
  * Introduce shiftedLetterActivated to Key.keyLabelFlags

Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
2012-01-31 12:55:45 +09:00
Tadashi G. Takaoka
3b0f2bf169 Merge "Support addtionalMoreKeys" 2012-01-30 00:11:29 -08:00
Tadashi G. Takaoka
15c99e9f1a Support addtionalMoreKeys
This change also removes
  * Unused more_keys_for_q, w, and p.

Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09:00
Ken Wakasa
6029b43a3d Add "size" and "pressure" for MotionEvent logs
bug: 5722703
Change-Id: I8e08942324b666de96682ce63e70c8d324535782
2012-01-30 12:22:15 +09:00
Tadashi G. Takaoka
a1e370ee4f Support keyXPos/keyWidth override in <include>
Change-Id: I03576a6fb7916f2f66f2035a04872fe89b573cdc
2012-01-27 21:20:57 +09:00
Tadashi G. Takaoka
425e1996b8 Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
2012-01-27 18:11:43 +09:00
Tadashi G. Takaoka
f057b25cdd Save and restore previous mode keyboard state at KeyboardState.toggleAlphabetAndSymbols
Bug: 5881820
Change-Id: I9b1718b16c60f27c05ba727724c0189aa5284334
2012-01-27 16:03:51 +09:00
Tadashi G. Takaoka
757f8d96ee Add KeyboardState.SwitchActions.setAlphabetShiftLockShifted
Change-Id: I6c49d8eb0a8272840ff03e0940d88a31c3d20bd9
2012-01-26 18:25:48 +09:00
Tadashi G. Takaoka
736d740aa5 Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker" 2012-01-26 00:17:56 -08:00
Tadashi G. Takaoka
160f01211d Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
This change introduces the following attributes.
 * KeyboardView
   - keyPreviewLingerTimeout
 * LatinKeboardView
   - keyHysteresisDistance
   - touchNoiseThresholdTime
   - touchNoiseThresholdDistance
   - slidingKeyInputEnable
   - keyRepeatStartTimeout
   - keyRepeatInterval
   - longPressKeyTimeout
   - longPressShiftKeyTimeout
   - longPressSpaceKeyTimeout
   - ignoreSpecialKeyTimeout
   - showMiniKeyboardAtTouchedPoint

Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Tadashi G. Takaoka
4f5c3a2898 Warn deprecated privateImeOptions, "nm" and "forceAscii"
Public API EditorInfo.IME_FLAG_FORCE_ASCII has been supported by
I6665b483.

Change-Id: I0ffdee15d8177d126cd8fe86a6bc4ab21be58c36
2012-01-26 13:37:35 +09:00
Tadashi G. Takaoka
09f8b126e5 Add Key preserveCase enum to keyLabelOptions attribute
To support auto generate key depending keyboard element id, the
KeysCache class is introduced to hold whole keys and reuse.

Change-Id: Icb81b5f1c1b3aaa31968dcdb93aa0a856e737f78
2012-01-25 20:16:21 +09:00
Tadashi G. Takaoka
bcf2b79365 Prepare to get rid of Drawable reference from Key
Change-Id: If435f95b2863e0af8d8916c643e6b01feabd3ea5
2012-01-25 19:41:15 +09:00
Tadashi G. Takaoka
2419a31c98 Merge "Add element predicator to <switch><case> condition of Keyboard" 2012-01-25 02:37:27 -08:00
Tadashi G. Takaoka
83306b914f Add element predicator to <switch><case> condition of Keyboard
Change-Id: I8f9eb8eb28707d23e421e88f979022d844a3b3ee
2012-01-25 19:09:18 +09:00
Tadashi G. Takaoka
bd93eddb52 Draw language name on spacebar on the fly
Change-Id: If54251acbd40d0dda37df1b368ed76dcdf3c8ac0
2012-01-25 19:05:58 +09:00
Tadashi G. Takaoka
f9521c6f37 Change scope of some methods in KeyboardView
Change-Id: I6569b413b20a2e683c6c636aafd755f51868dd28
2012-01-25 18:50:27 +09:00
Tadashi G. Takaoka
f9c6715b17 Merge "Use PointerTracker.getPointerTracker() class method" 2012-01-25 00:51:22 -08:00
Tadashi G. Takaoka
38d6a18821 Use String instaed of CharSequence in Key class
Change-Id: Ia76a41daede402ed2a509e110ae97d6bb660c760
2012-01-25 17:04:00 +09:00
Tadashi G. Takaoka
117c124c13 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
This is the first step to support separate Keyboard for elementName.
This change is the second attempt of Icef66564.

Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670
2012-01-25 13:19:53 +09:00
Tadashi G. Takaoka
e88e1b22c8 Use PointerTracker.getPointerTracker() class method
Change-Id: Ieab5d43d2bfe9bdf2b499834dff267df84b8d76d
2012-01-25 11:08:30 +09:00
Tadashi Takaoka
af4efd5a3e Merge "Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"" 2012-01-24 15:22:25 -08:00
Tadashi Takaoka
8bb20bc682 Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"
This reverts commit b5b92f9b78

Bug: 5908440
2012-01-24 15:20:05 -08:00
Tadashi G. Takaoka
a34f66de2d Merge "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard" 2012-01-24 01:34:31 -08:00
Tadashi G. Takaoka
b5b92f9b78 Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
This is the first step to support separate Keyboard for elementName.

Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
2012-01-24 18:31:11 +09:00
Jean Chalard
20f437cc49 Merge "Test that delete actually removes any selected text." 2012-01-24 01:19:26 -08:00
Jean Chalard
1e4684ad24 Test that delete actually removes any selected text.
Bug: 5699301
Change-Id: I09a967eb03690251e8bd69503285c982d6958a7d
2012-01-24 18:17:09 +09:00
Tadashi G. Takaoka
25971b5a14 Clean up symbol key chording state from KeyboardState
Change-Id: I575da2bf2941c8a2e7b1fe0a455cbcdebb201276
2012-01-24 17:59:35 +09:00
Tadashi G. Takaoka
83d81f2e34 Fix sliding shift input in caps lock mode
Bug: 5881820
Change-Id: I4cbe3eda83c09edc9da8efbdff7d3359c1e140d5
2012-01-24 17:58:23 +09:00
Tadashi G. Takaoka
747ed9e99a For get the symbols shifted state when switch back from alphabet layout
Bug: 5881820
Change-Id: Ic478264e1cd366affc34fbf4cd59f1b6e7efede7
2012-01-24 17:28:00 +09:00
Tadashi G. Takaoka
0f05076990 Get rid of setShifted/setShiftLocked from SwitchActions
Change-Id: Ib54b0575be190556690ef2dfb14077842745f038
2012-01-24 12:27:09 +09:00
Tadashi G. Takaoka
4eb240eb2c Force KeyboardShiftState reset by setShiftLocked(false)
Change-Id: Ib00d598e6e6a91e594ae01cfc51fb688601f6b8f
2012-01-23 13:18:06 +09:00
Tadashi G. Takaoka
69fa792184 Merge "Get rid of useless updateShiftState" 2012-01-22 20:16:46 -08:00
Tadashi G. Takaoka
457e506e1a Add more debug message to KeyboardState
Change-Id: Ie0bceb494b0521bf406418d5ecbc16752c818aba
2012-01-23 13:14:02 +09:00
Tadashi G. Takaoka
56518d424d Get rid of useless updateShiftState
Because KeyboardState.onLoadKeyboard will invoke
SwitcherActions.requestUpdateShiftState eventually, the calling
updateShiftState at the end of KeyboardSwitcher.onLoadKeyboard is
useless.

Change-Id: Ib6e746b1516ef1b4c981807a9b8785a046ba50e0
2012-01-23 12:47:03 +09:00
Tadashi G. Takaoka
b009a24b83 Support @icon/icon_name for more keys specification
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
Tadashi G. Takaoka
e54a4005d5 Support @string reference in moreKeys attribute
Change-Id: If0056d0601149d2ddd0e231a81e7b2409b37fc06
2012-01-20 18:46:33 +09:00
Tadashi G. Takaoka
3eede315dc Merge "Move MoreKeySpecParser.getResourceId to Utils" 2012-01-20 00:01:29 -08:00
Tadashi G. Takaoka
0718590486 Move MoreKeySpecParser.getResourceId to Utils
Change-Id: I0640dbe76a8ff2dc45b504eca631942811571736
2012-01-20 16:28:18 +09:00
Tadashi G. Takaoka
bd7b160cfb Change more key specification type to String from CharSequence
Change-Id: I5e910f8225a248fc6403771836dec4c0b7294caa
2012-01-20 16:27:32 +09:00
Tadashi G. Takaoka
f36f90a173 Fix KeyboardState switching back from alphabet-chording input correctly
Bug: 5881820
Change-Id: I108bbc25baa331cc87f00955b48188b3557d10dd
2012-01-19 18:53:38 +09:00
Tadashi G. Takaoka
d26d63b35d Fix KeyboardState to pass KeyboardStateMultiTouchTests
Change-Id: If2b9ee7cf3fad7633d64b98758f802792d66f7a8
2012-01-19 18:48:02 +09:00
Tadashi G. Takaoka
01d9fc966a Cleanup KeyboardState a bit
Rename KeyboardShiftState variable and reorder some statements.

Change-Id: I7e8842836f35876f8697f9906343f7d4a1f9db4f
2012-01-19 18:42:11 +09:00
Tadashi G. Takaoka
23bacdb6a5 Fix MoreKeySpecParser to be able to handle outputText correctly
The issue was introduced by Id2320f4d.

Bug: 5887936
Change-Id: Ifec3aefb5b168f790de696ece104b84cdab46539
2012-01-19 12:51:27 +09:00
Tadashi G. Takaoka
06bc1db017 Add more multitouch tests
Change-Id: I424a4b608fec084cb787003ef4417ccf273366ae
2012-01-18 19:35:01 +09:00
Tadashi G. Takaoka
60c4594ee6 Get rid of hasDistinctMultitouch reference from KeyboardState
Change-Id: I0a783a425302fbc381d056f5b0d757c27f2a9f14
2012-01-18 18:11:46 +09:00
Tadashi G. Takaoka
5731b939c7 Remove KeyboardSwicther.toggleCapslock
Change-Id: Id613c06e2df770659095d78d42637aed063d0c70
2012-01-17 19:26:24 +09:00
Tadashi G. Takaoka
2a88440419 Rename KeyboardActionListener methods
* Rename KeyboardActionListener.onPress to onPressKey
* Rename KeyboardActionListener.onRelease to onReleaseKey
* Merge KeyboardSwicther.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardSwitcher.onReleaseShift and onReleaseSymbol to onReleaseKey.
* Merge KeyboardState.onPressShift, onPressSymbol, and onPressOtherKey to onPressKey.
* Merge KeyboardState.onReleaseShift and onReleaseSymbol to onReleaseKey.

Change-Id: Icf28fd18e238c5e534c292893e4ab5b6b98e72f8
2012-01-17 19:07:20 +09:00
Tadashi G. Takaoka
87e025da11 Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher
Change-Id: I9bb8f78b0a766cd7937d5cbe1c1e5e35898b2997
2012-01-17 16:49:33 +09:00
Tadashi G. Takaoka
1ef6fc7e15 Support EditorInfo.IME_FLAG_FORCE_ASCII
Bug: 5850605
Change-Id: I6665b483f775094903f2e26f5584e4b141592ab5
2012-01-17 14:38:00 +09:00
Tadashi G. Takaoka
edf107e2a6 Merge "Add "force non-distinct multitouch" debug option" 2012-01-16 20:22:36 -08:00
Tadashi G. Takaoka
06b7c256b1 Add "force non-distinct multitouch" debug option
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
2012-01-17 13:19:01 +09:00
Tadashi G. Takaoka
58e782a225 Remove duplicate logic from KeyboardSwitcher and KeyboardState
Change-Id: I1d331ee7f71501baa4ec2df01df39340499834e4
2012-01-16 19:16:26 +09:00
Tadashi G. Takaoka
7bc61ca183 Fix double tap shift key to turn off capslock mode
Bug: 5873562
Change-Id: If1f5ae1684905c1418ae43e55df38509444d29e2
2012-01-16 18:54:25 +09:00
Tadashi G. Takaoka
c88026e1df Update shift state when alphabet keyboard has been set
Bug: 5857492
Change-Id: I5ef78af21a76e8cf645e223d1ffa6212690bb1eb
2012-01-16 11:08:29 +09:00
Tadashi G. Takaoka
4087ba69fa Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet
Change-Id: I6c1150eea5f0a931d01578b0157f06e0aff0cc65
2012-01-13 18:05:28 +09:00
Tadashi G. Takaoka
4015a64a26 Fix SubtypeLocaleTests
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
2012-01-13 14:35:43 +09:00
Tadashi G. Takaoka
8cab0b56eb Get rid of Keyboard.CODE_DUMMY
Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
2012-01-10 18:19:36 +09:00
Tadashi G. Takaoka
ee4be6e3c6 Call KeyboardState.onUpdateShiftState from onCodeInput if code is a normal letter
This will be helpful to write unit test code.

Change-Id: Ib61cc46ac547084e0dc9ecd3a50814fecf08ace2
2012-01-10 15:13:05 +09:00
Tadashi G. Takaoka
0fe45eac18 Merge "Optimize KeybaordView.invalidateAllKeys a bit" 2011-12-26 06:50:31 -08:00
Tadashi G. Takaoka
9f6485a448 Optimize KeybaordView.invalidateAllKeys a bit
Change-Id: I118c792219f649b7297477c78fa725c678650159
2011-12-26 23:43:53 +09:00
Tadashi G. Takaoka
07145a3706 Fix automatic temporary upper case mode shift key graphics
Bug: 5802387
Change-Id: I4f59fb2f971c543748ed32b37af528767a0549e4
2011-12-26 21:05:33 +09:00
Ken Wakasa
4f7d278af6 Follow-up fix for I68c667b0
Should have preserved the logic of LatinKeyboard.getNearestKeys().

Change-Id: I97b05aa24006402be03088a215fa07abda9477df
2011-12-19 17:58:36 +09:00
Tadashi G. Takaoka
42fcb2de64 Get rid of public reference to KeyboardIconsSet.ICON_* constants
As a consequence,
  * Add Key.iconDisabledKey has been introduced and Key.getIcon honors
    the enabled state of the key.
  * The attribute id of disabled icon for shortcut key,
    Keyboard_iconShortcutKeyDisabled, is renamed to
    Keyboard_iconDisbledShortcutKey
  * KeyboardIconsSet has getIconByIconId and getIconByAttrId methods
    instead of getIcon.

Bug: 5778201
Change-Id: Ica93b073b9a04acd18ead7a33b60e3c6d813e7a1
2011-12-19 01:11:09 +09:00
Tadashi G. Takaoka
4e1dab8cfa Move KeyboardBuilder and KeyboardParams classes into Keyboard class
This change also moves XmlParseUtils to com.android.inputmethod.latin package.

Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
2011-12-18 20:19:16 +09:00
Tadashi G. Takaoka
3708787fe9 Remove LatinKeyboard class
Change-Id: I68c667b00dadf2ed9f1c62fb7da37d2cf499cd81
2011-12-18 19:10:42 +09:00
Tadashi G. Takaoka
4112dc0500 Move spacebar drawing code from LatinKeyboard to LatinKeyboardView
Also this change moves LatinKeyboard attributes,
autoCorrectionSpacebarLedEnabled, autoCorrectionSpacebarLedIcon,
spacebarTextRatio, spacebarTextColor, and spacebarTextShadowColor to
LatinKeyboardView.

Change-Id: I7cc27ce1fc550e9f620a9ed0fbe4b8172902d5a1
2011-12-18 19:07:12 +09:00
Tadashi G. Takaoka
7bd714c086 Add extra key icons to KeyboardIconsSet
* Get rid of Key.keyIconShifted attribute.
    Add Keyboard.iconShiftKeyShifted to KeyboardIconsSet.
  * Get rid of LatinKeyboardView.disabledShortcutIcon attribute.
    Add Keyboard.iconShortcurKeyDisabled to KeyboardIconsSet.
  * Add Keyboard.iconSpaceKeyForNumber to KeyboardIconsSet.
  * Fix misplaced autoCorrectionSpacebarLedIcon resources.

Change-Id: I381bff3789254977ab3cb18f58f95b3c433b1e1a
2011-12-18 18:25:29 +09:00
Tadashi G. Takaoka
1ebedd7a15 Remove LatinKeyboard.adjustLabelCase override
Change-Id: If032605c1cd6bb8e913d465e20dec70798c4b8fb
2011-12-18 16:46:44 +09:00
Tadashi G. Takaoka
5afc3ae2d9 Add LatinKeyboardView style
As a result, this change moves shortcut related update code to
LatinKeyboardView from LatinKeyboard.

Change-Id: I1882672577f61e73c90d6c018b7dbb61f3fe21e4
2011-12-18 16:42:23 +09:00
Tadashi G. Takaoka
22b48de11c Get rid of Key.needsSpecialPopupHint and related
Change-Id: I28e87ea3af9581f12094770b42f113e9018886c4
2011-12-18 16:08:28 +09:00
Tadashi G. Takaoka
bc781e963f Can override key drawing methods of KeyboardView
Change-Id: Ie303df4f5e944ea868f5c28ba3bb72a57cc9a35f
2011-12-18 16:08:00 +09:00
Tadashi G. Takaoka
605f730959 Merge "Add LatinKeyboard.spacebarTextRatio attribute" 2011-12-17 08:43:34 -08:00
Tadashi G. Takaoka
40a6739645 Fix broken build
This is a followup change of I8376f4f5

Change-Id: I4de4cbc903beb71d805e62b5172076a949854bc0
2011-12-18 01:36:11 +09:00
Tadashi G. Takaoka
7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka
ebec5259b7 Get rid of LatinKeyboardParam class
Change-Id: I8376f4f570e72929679c5e4955986c48881abd75
2011-12-18 00:39:40 +09:00
Ken Wakasa
67394a394f Preparatory small clean up for bug: 5776979
Change-Id: I96b20d3775180366fac50c2bb4e0b47a92ee4cdb
2011-12-17 20:45:39 +09:00
Ken Wakasa
3425852be4 Remove redundant logs
bug: 5722703
Change-Id: I6b7285ad6f5c0c8486d24712f22249f83a1c6396
2011-12-17 00:22:01 +09:00
Tadashi G. Takaoka
4af75010a1 Merge "Use Set to group Keys in Keyboard instead of List" 2011-12-16 04:26:25 -08:00
Tadashi G. Takaoka
7c69397f14 Merge "Fix swapped alphabet and symbols keyboards" 2011-12-16 04:15:35 -08:00
Tadashi G. Takaoka
854302282d Fix swapped alphabet and symbols keyboards
Change-Id: I956684332d607cb9ab01d12af7a924c15def7fce
2011-12-16 21:12:06 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
0c0ca874fe Get rid of key index from ProxymityInfo
Change-Id: I9bee0a643d09cdd89e42ae913285c9e78d875c1c
2011-12-16 21:03:36 +09:00
Tadashi G. Takaoka
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
satok
cadc0f7d79 Merge "Send touch event in usability study mode" 2011-12-16 01:04:26 -08:00
satok
15d4793911 Send touch event in usability study mode
Change-Id: I0cdcd57bfd31c9b21cfb932d7ff91bd013cde6d7
2011-12-16 17:56:14 +09:00
Tadashi G. Takaoka
289544d6e4 Use Params instead of Builder as an argument of KeyboardSet constructor
Change-Id: I4c576a0b0b632cdf413f2ccd5c69dbd37747fbd3
2011-12-16 16:41:49 +09:00
Tadashi G. Takaoka
6cb72b0f36 Cleanup ProximityInfo.calulateSweetSpot
Change-Id: I98238359dffd76a620d3b0e73b3b22dd82c56c93
2011-12-16 14:59:24 +09:00
Tadashi G. Takaoka
0b6237da94 Make Key.mPreviewIcon public final
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
2011-12-16 12:47:34 +09:00
Tadashi G. Takaoka
e9a0efc242 Merge "Cleanup unused variables and parameters" 2011-12-15 18:02:38 -08:00
Tadashi G. Takaoka
2ac5988f84 Cleanup unused variables and parameters
Change-Id: Iad756a7a775c93f3344c6962e7b3456ef8339490
2011-12-15 20:26:12 +09:00
Tadashi G. Takaoka
23d27fefcb Fix auto correction spacebar LED
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka
b8c2c6e2ec Merge "Add XmlParseUtils class" 2011-12-14 03:02:17 -08:00
Tadashi G. Takaoka
d549d4334f Merge "Remove long press settings key function" 2011-12-14 03:02:09 -08:00
Tadashi G. Takaoka
17dc10724b Remove long press settings key function
Bug: 5759092
Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
2011-12-14 19:47:17 +09:00
Tadashi G. Takaoka
4665463ccd Add XmlParseUtils class
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
2011-12-14 19:46:03 +09:00
Tadashi G. Takaoka
6652e45899 Merge "Move Keyboard.themeName to KeyboardSwitcher and make it private" 2011-12-14 02:43:06 -08:00
Tadashi G. Takaoka
90c12077b2 Merge "Remove EditorInfo from KeyboardId" 2011-12-14 02:42:58 -08:00
Tadashi G. Takaoka
7a91deb685 Move Keyboard.themeName to KeyboardSwitcher and make it private
Change-Id: I101b6927d43e86b3c636c1a527e181df8af9c73e
2011-12-14 19:01:20 +09:00
Tadashi G. Takaoka
a042150a69 Merge "Just ignore settings/shortcut key while typing on tablet" 2011-12-14 01:59:46 -08:00
Tadashi G. Takaoka
2d603fff64 Remove EditorInfo from KeyboardId
Change-Id: I70919ff30622afa1d8c29ca45589fa617f2c1f0e
2011-12-14 18:58:55 +09:00
Tadashi G. Takaoka
601e411c13 Cleanup KeyboardId's hasCode method
Change-Id: I5fd8f6ac0f42152fb0e2aaaedc6092f6d82fe677
2011-12-14 18:42:20 +09:00
Tadashi G. Takaoka
623d0155b6 Just ignore settings/shortcut key while typing on tablet
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
2011-12-14 17:14:44 +09:00
Tadashi G. Takaoka
8b1b8aae9c Cleanup settings key related stuff
Change-Id: Ie0d1204e94fcdf9d578974256bf2ae3e87797f13
2011-12-14 16:34:35 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
34f1820396 Remove KeyboardSwitcher.updateShiftLockState method
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
2011-12-13 16:57:23 +09:00
Tadashi G. Takaoka
dc52e7c646 Remove current keyboard id variable
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
2011-12-13 12:49:40 +09:00
Tadashi G. Takaoka
267cd0151f Add special handling for "Phone number" layout.
Bug: 5743584
Change-Id: I821b837a2078afb64b460191c98b28f7733cf2c1
2011-12-12 18:19:29 +09:00
Tadashi G. Takaoka
aa59e24ebe Merge "Add unit test of KeyboardState" 2011-12-12 00:15:42 -08:00
Tadashi G. Takaoka
dfbe254de6 Add unit test of KeyboardState
Bug: 5708602
Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
2011-12-12 16:34:11 +09:00
Tadashi G. Takaoka
243e034716 Merge "Assign Key.mCode from the label only when outputText is not specified" 2011-12-11 23:32:32 -08:00
Tadashi G. Takaoka
06b886f372 Merge "Move KeyDetector.printableCode to Keyboard" 2011-12-11 23:32:25 -08:00
Tadashi G. Takaoka
7dfd5a3e83 Move KeyDetector.printableCode to Keyboard
Change-Id: I9cde21fbb45c1e5f1a568bb97b1b1a76524f4bf2
2011-12-12 16:17:45 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
2ba1bcccdd Remove unused Keyboard.CODE_CANCEL
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +09: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
Tadashi G. Takaoka
10dcc7eb67 KeyboardState keeps track of isAlphabetMode and isSymbolShifted
Bug: 5708602
Change-Id: I181cdeb90d24984ce6f6c993b278293aae7364eb
2011-12-09 16:09:16 +09:00
Tadashi G. Takaoka
784181e29f Merge "Cleanup debug logging code" 2011-12-08 23:08:22 -08:00
Tadashi G. Takaoka
a7af03baf4 Merge "Get rid of public KeyboardState.setShifted and setShiftLocked" 2011-12-08 23:02:47 -08:00
Tadashi G. Takaoka
930a55b846 Cleanup debug logging code
Change-Id: If806d61c5945d319c89d9cc127e09f98b7b10a4e
2011-12-09 15:14:05 +09:00
Tadashi G. Takaoka
805402e8fa Get rid of public KeyboardState.setShifted and setShiftLocked
Bug: 5708602
Change-Id: I98bcca7d3e9dd88f034d0faecada76902b2d0dff
2011-12-09 15:13:23 +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
Tadashi G. Takaoka
d52e760530 Merge "Cleanup KeyboardSwitcher a bit" 2011-12-08 05:55:16 -08:00
Tadashi G. Takaoka
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
Jean Chalard
3da7df8db7 Merge "Add proximity for Russian." 2011-12-08 02:22:28 -08:00
Jean Chalard
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
Tadashi G. Takaoka
cf58f53a1a Move KeyboardLayoutState into KeyboardState
Bug: 5708602
Change-Id: Ieb6b872d0f2cf3ad1fcb69409e2cf49f60427672
2011-12-08 17:00:56 +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
b300dbbd39 Reset saved caps lock sate when new keyboard is loaded
Bug: 5722919
Change-Id: Id92632a0feffc3342d3c31e90c0da973c934f3c0
2011-12-07 22:48:04 +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
68d600a5f6 Merge "Remove internal toggleShift calls" 2011-12-07 02:35:52 -08:00
Tadashi G. Takaoka
f47993ee34 Remove internal toggleShift calls
Bug: 5708602
Change-Id: Id1f76dbd40aaf9ed35d4598d902043675c3d74fc
2011-12-07 19:32:47 +09:00
Tadashi G. Takaoka
845d829d47 Merge "Get rid of direct reference to KeyboardId from KeyboardLayoutState" 2011-12-07 01:41:05 -08:00
Tadashi G. Takaoka
bc56e04425 Reset keyboard state when loading keyboard
Bug: 5627467
Change-Id: I709f97e47144d3270450adc7d8053038d0df57bc
2011-12-07 17:55:22 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
8a70e70c84 Remove toggleSymbolsShift and rename toggleKeyboardMode
Bug: 5708602
Change-Id: Iadef3e862d00505d1d9f588d0d64445754d7b962
2011-12-06 18:12:34 +09:00
Tadashi G. Takaoka
c1859b8fd2 Move KeyboardShiftState to KeyboardState
Bug: 5708602
Change-Id: Idfe69978972bb674e0f360ef5e324739e2652d25
2011-12-06 17:04:12 +09:00
Tadashi G. Takaoka
4f7f61730c Make Keyboard.setShifted return void
Bug: 5708602
Change-Id: If8150f62fbab864344f59853850ff3213c27940e
2011-12-06 14:42:30 +09:00
Tadashi G. Takaoka
ec52fb6dbb Merge "Minor refactoring of Keyboard" 2011-12-05 16:49:35 -08:00
Tadashi G. Takaoka
5b74989bef Minor refactoring of Keyboard
* Remove isAlphaKeyboard().
* Remove isPhoneKeyboard().
* Remove getKeyboardShiftState().

Bug: 5708602
Change-Id: I8bf5009bf499ecb0501d1379f72e43406080062a
2011-12-05 20:04:52 +09:00
Tadashi G. Takaoka
6ddb07433f Merge setManualTemporaryUpperCase and setAutomaticTemporaryUpperCase
Bug: 5708602
Change-Id: I6a0b5f0dcccbb6331a271cd61a48c474a7800289
2011-12-05 18:54:43 +09:00
Tadashi G. Takaoka
46831d5a4b Renaming KeyboardSwitcher.getPointerCount to isSinglePointer
Bug: 5708602
Change-Id: If44ed4449a3ea79228e25e2ab2c8c8fe82a93a2b
2011-12-05 17:53:58 +09:00
Tadashi G. Takaoka
4a292acc6f Make ModifierKeySatate and ShiftKeyState non-public class
Bug: 5708602
Change-Id: I149c2dab26774686e5c578bbf780081e9fb30e7c
2011-12-05 15:40:51 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
c410e243e9 Ignore releasing shift key caused by long press
Bug: 5694715
Change-Id: If7b84f547f5701e84d740f186d284273565b7eba
2011-12-05 12:23:38 +09:00
Tadashi G. Takaoka
5c269d1e0d Merge "Use Iterator in PointerTrackerQueue" 2011-12-01 01:36:19 -08:00
Tadashi G. Takaoka
41a51bb2b4 Merge "Fix debug messages neatly" 2011-12-01 01:01:09 -08:00
Tadashi G. Takaoka
78ac86ff9d Use Iterator in PointerTrackerQueue
Change-Id: Ia5ad7d4511b2f2db056f2acf7cc0e002001e2123
2011-12-01 17:50:37 +09:00
Tadashi G. Takaoka
e742436a29 Fix debug messages neatly
Change-Id: I40538d5ffbdf64df4e2848de33393327d704fc1e
2011-12-01 16:43:22 +09:00
Tadashi G. Takaoka
c9f203805c Fix potential NPE
Change-Id: I00e7cd521bafd2705ebc2a59d63b7bfc4fe178ba
2011-12-01 16:29:13 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
e22baaadd3 Get rid of usage of key index
Change-Id: I7596ce3ae52fde436d06c2dd95ae873c7aa5ef7f
2011-11-29 19:07:54 +09:00
Tadashi G. Takaoka
c1f7d39b4a Introduce ignoreWhileTyping flags to Key.keyActionFlags
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -08: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
Tadashi G. Takaoka
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
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
15a01d7272 Merge "Do not show key preview of settings and shortcut key" into ics-mr1 2011-11-17 18:02:05 -08:00
Tadashi G. Takaoka
ca14c8bf34 Do not show key preview of settings and shortcut key
Bug: 5560766
Change-Id: I580efaf4e33f7dfbaa591e2afae9c49547bf26fb
2011-11-17 15:34:57 -08:00
Tadashi G. Takaoka
875c16adc3 Merge "Fix long press caps lock handling (DO NOT MERGE)" into ics-mr1 2011-11-17 11:18:28 -08:00
Tadashi G. Takaoka
ac4bd59864 Merge "Fix long press caps lock handling" 2011-11-17 11:05:51 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
42e8c64a04 Fix long press caps lock handling
Bug: 5627467
Change-Id: I3850f283d44da81ecb22fc4e6d8aa574f5fcf65f
2011-11-16 16:50:03 -08:00
Tadashi G. Takaoka
d17786fcd2 Fix IndexOutOfBoundsException in monkey test
Bug: 5627027

Change-Id: I341cfa5c3d553a1c819d8455936b40a40ad30e87
2011-11-16 15:53:03 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
6c1c546a98 Merge "Fix referring wrong TypedArray" 2011-11-04 03:47:01 -07:00
Tadashi G. Takaoka
28f6948745 Fix referring wrong TypedArray
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
2011-11-04 19:41:23 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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