nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
29261 commits 1 branch 0 tags 363 MiB
Commit graph

509 commits

Author SHA1 Message Date
Tadashi G. Takaoka
e7948a8692 Get rid of Key.setIcon(Drawable) 
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
 2012-02-03 14:38:17 +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
0086861d5a Move CSV parser to KeySpecParser 
Change-Id: I424fb47bc70e9b6aaa5a16ae9b2500d23da75c26
 2012-02-02 16:10:14 +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
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
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
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
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
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
bcf2b79365 Prepare to get rid of Drawable reference from Key 
Change-Id: If435f95b2863e0af8d8916c643e6b01feabd3ea5
 2012-01-25 19:41:15 +09: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 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
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
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
457e506e1a Add more debug message to KeyboardState 
Change-Id: Ie0bceb494b0521bf406418d5ecbc16752c818aba
 2012-01-23 13:14:02 +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
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
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
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
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
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
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
Tadashi G. Takaoka
b8c2c6e2ec Merge "Add XmlParseUtils class" 2011-12-14 03:02:17 -08:00
Tadashi G. Takaoka
4665463ccd Add XmlParseUtils class 
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
 2011-12-14 19:46:03 +09:00
Tadashi G. Takaoka
2d603fff64 Remove EditorInfo from KeyboardId 
Change-Id: I70919ff30622afa1d8c29ca45589fa617f2c1f0e
 2011-12-14 18:58:55 +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
dfbe254de6 Add unit test of KeyboardState 
Bug: 5708602
Change-Id: I1a8a9f4320948bb500a96df8773b0bfa1a1d4167
 2011-12-12 16:34:11 +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
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
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
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
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
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
bc56e04425 Reset keyboard state when loading keyboard 
Bug: 5627467
Change-Id: I709f97e47144d3270450adc7d8053038d0df57bc
 2011-12-07 17:55:22 +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
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
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
78ac86ff9d Use Iterator in PointerTrackerQueue 
Change-Id: Ia5ad7d4511b2f2db056f2acf7cc0e002001e2123
 2011-12-01 17:50:37 +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
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
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
28f6948745 Fix referring wrong TypedArray 
Change-Id: I2a8f00edb579e24e612e839498ece097e9d3d7f6
 2011-11-04 19:41:23 +09:00
Tadashi G. Takaoka
8fbf29e2d5 Make some private method static 
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
 2011-10-28 13:31:31 +09:00
Tadashi G. Takaoka
cc02aa8af3 Fix missing TypedArray.recycle calls 
Change-Id: I333e55b4e7925dac5495e2e73ac57ffcef4fabb4
 2011-10-19 13:06:33 +09:00
Tadashi G. Takaoka
ddd759aa9e Close XmlResourceParser when finish parsing 
Change-Id: If21ee187c83f044b235d88fba15af00e6ac8a308
 2011-10-18 02:44:55 +09:00
Tadashi G. Takaoka
406a54f41c Use XmlPullParser interface instead of XmlResourceParser 
Change-Id: I00e8a82aaaf5fec1e27707bce0a82cbfd1bc9fae
 2011-10-06 18:40:32 +09:00
Tadashi G. Takaoka
cf6d374505 Remove unused local variable 
Change-Id: Ia71e03ee59153db1dbc35028569f7c76d5b12bf7
 2011-10-04 16:46:15 +09:00
Yusuke Nojima
294e1b4a5a Pass the touch position correction flag from KeyboardSwitcher. 
Change-Id: Ia242a9fa2fa71f7fdf8f974071a2df7acc4aa51f
 2011-10-03 20:41:03 +09:00
Tadashi G. Takaoka
a27812ae15 Fix obtainStyledAttribute not to look for default 
Bug: 5402266
Change-Id: I8f84754b0080b315f9360e1ffa8353b386e88ad7
 2011-10-03 16:48:03 +09:00
Tadashi G. Takaoka
ad2dfa7697 Fix keyboard theme parsing 
This is a followup of I13b9997e.

Change-Id: I4c10fbc8b250c3bad72e38d46089684a839bdd5f
 2011-10-03 12:34:36 +09:00
Tadashi G. Takaoka
5c26922ab2 Move themeId and touch correction data to Keyboard style 
Change-Id: I13b9997e013b704734b6fa94131b1f7fec7a152d
 2011-09-30 22:59:53 +09:00
Yusuke Nojima
b45e095aa2 Merge "Add touch position correction data to resources." 2011-09-28 22:41:11 -07:00
Yusuke Nojima
d6339639c3 Add touch position correction data to resources. 
Change-Id: I156205672f3935f70c250a6c538793f35c5d86b2
 2011-09-29 14:29:23 +09:00
Tadashi G. Takaoka
2fc4248700 Introduce hit box to Key and get rid of edge flags 
Change-Id: I2b78d2ca756223b5497d01127c3a0190dcc81e57
 2011-09-28 19:31:37 +09:00
Tadashi G. Takaoka
63584323ca Add themeId to Keyboard 
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
 2011-09-28 12:08:48 +09:00
Tadashi G. Takaoka
287f4f83e9 Add horizontal edges paddings to phone/number layout 
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
 2011-09-26 17:11:01 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
5b0c124ca8 Remove Key.isStick, use backgroundType="stick" instead 
Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8
 2011-09-15 18:33:01 +09:00
Tadashi G. Takaoka
7918ed0169 Refactor Key.isFunctional to more generic Key.keyType 
Bug: 5232726
Change-Id: Idc861ca725f62eaf37795f57401573394a17d6d3
 2011-09-15 14:38:45 +09:00
Tadashi G. Takaoka
18453d69e0 Make Spacer as extended Key class 
Bug: 5275003
Change-Id: I809a8ca363ba72b22ac5cfd926414990f7e8467c
 2011-09-08 17:38:50 +09:00
Tadashi G. Takaoka
d4d9b33c39 Move Row class into KeyboardBuilder 
This is a followup of I5929e656.

Bug: 5245837
Change-Id: I06bc2774f77a2c5ddf0b6fe1b3ee70e9b3a7dd23
 2011-09-02 17:51:27 +09:00
Tadashi G. Takaoka
b58925ea0d Calculate x coordinate with floating point 
This change also fixes some keyboard layouts a bit.

Bug: 5245837
Change-Id: I5929e656763b150e71afe89238386904da214e21
 2011-09-02 17:05:24 +09:00
Tadashi G. Takaoka
e84274ede1 Move current x coordinate value into Row class 
This is a preparation to address the issue.

Bug: 5245837
Change-Id: If5d463304c1689a840c8b761fedb0a8e2193734b
 2011-09-02 16:24:36 +09:00
Tadashi G. Takaoka
9d5601e901 Rename PopupCharactersParser to MoreKeySpecParser 
Also renames PopupPanel to MoreKeysPanel

Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
 2011-08-31 18:34:35 +09:00
Tadashi G. Takaoka
9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView 
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
 2011-08-31 15:30:54 +09:00
Tadashi G. Takaoka
c06d0ef01d Cleanup keyboard related code a bit 
Change-Id: I04f1014ab3b115bd457e25a267d2e46d306c8a0e
 2011-08-30 19:16:46 +09:00
Tadashi G. Takaoka
32572948d7 Refactor and rename popup mini keyoard related classes 
Change-Id: Ia92ec4612090b03829db9a87ce68d701db6e15bc
 2011-08-23 17:51:57 +09:00
Tadashi G. Takaoka
f9da4c548f Remove password field special handling 
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
 2011-08-23 16:49:35 +09:00
Yusuke Nojima
dbf4f2a552 Merge "Pass the touch event in the top padding of keyboard." 2011-08-16 03:04:30 -07:00
Yusuke Nojima
5ec13092a5 Pass the touch event in the top padding of keyboard. 
Bug: 5139932
Change-Id: Id176f92f69160f76ae7e0d46cb3d639080779497
 2011-08-16 18:33:40 +09:00
Ken Wakasa
286a5bf1c6 Update shift state in onSizeChanged() 
bug: 5130446
Change-Id: I830de4d184dffa2b263206c3f078de054e227b9e
 2011-08-15 20:10:28 +09:00
Tadashi G. Takaoka
62d4a96497 Support label with icon key 
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
 2011-08-03 01:53:30 -07:00
Tadashi G. Takaoka
1be29abab2 Cleanup Keyboard related code and rename some classes 
This is	a follow up change of I90ffbde0

Bug: 5023981
Change-Id: I3a6b862d05f5f907dee954cd6d6fee983b20ab5e
 2011-08-02 17:12:02 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
04bc5a369c Merge "Add KeyboardParams class" 2011-08-01 18:08:17 -07:00
Tadashi G. Takaoka
4d8eb2e888 Make horigontalGap and verticalGap attributes of Row obsolete 
Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
 2011-08-01 17:45:16 -07:00
Tadashi G. Takaoka
1516d055df Add KeyboardParams class 
This object will hold all keyboard parameter while parsing XML file
and act like a Keyboard. After finishing reading XML file, this will be
passed as an argument for the Keyboard class constructor.

Bug: 5023981
Change-Id: I2737b30036b6e4d204e8ed9984a1272e195209be
 2011-08-01 17:41:30 -07:00
Tadashi G. Takaoka
723dd753e9 Remove Keyboard reference from Key object 
Bug: 5023981
Change-Id: Ib0b9debf2018a0a9e9efe9323738e85174589e71
 2011-08-01 17:07:45 -07:00
Tadashi G. Takaoka
b118d4cb58 Cleanup icon drawable related code 
Bug: 5023981
Change-Id: I729354f32797eef354ec9af8e05f17839f0a361c
 2011-08-01 16:37:13 -07:00
Tadashi G. Takaoka
2fe68b9616 Filter non-ascii popup charcters from password keyboard 
Change-Id: I10885efd317770f892165b6bb059313abf241436
 2011-08-01 00:35:59 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
09430720d5 Fix exception message 
Bug: 4340933
Change-Id: I81e7b0c72116b5bb56b0fdcd02386288aebd73e7
 2011-07-31 18:40:58 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
7139335dcd Swap parenthesis-like character code on RTL keyboard 
Bug: 5047217
Change-Id: I1b88484825f5c035401cf083522bf95bbee30edb
 2011-07-24 18:40:46 -07:00
Tadashi G. Takaoka
d3002aa8cd Merge key preview handling into key graphics handling 
Change-Id: I7b0ba38d833362817c607f6abffbaf0a07f52832
 2011-07-23 02:23:24 -07:00
Tadashi G. Takaoka
cce61aa045 Merge "Refactor Keyboard and KeyboardView resizing and drawing code" 2011-07-22 18:41:23 -07:00
Tadashi G. Takaoka
38f55b36c3 Refactor Keyboard and KeyboardView resizing and drawing code 
Bug: 4311428
Change-Id: Ice4050f92c8f3cec1bec2074fe6a913d04f50524
 2011-07-22 16:50:53 -07:00
Tadashi G. Takaoka
419b90fe86 Fix missing right edge flag 
Bug: 5062972
Change-Id: I2daffdd58802c6173696fe2417e6efcbef66d7bf
 2011-07-21 14:32:16 -07:00
Tadashi G. Takaoka
5cce2161fb Revert "Add Right-To-Left delete icon" 
This reverts commit 886246b19a.

Bug: 5047500
Change-Id: Iefef20b7aeba0dbedfe8f81384a33f65e3907e9f
 2011-07-21 00:05:22 -07:00
Tadashi G. Takaoka
426723a9cf Remove Key edge flags from XML 
The first key and the last of the row are automatically marked as left
and right edge key respectively.  The existence of Spacer will prevent
those automatic marking.

Bug: 5038844
Change-Id: Ie34169ceaf76e24923b8d8125eda6ecb95cf1fee
 2011-07-20 16:56:21 -07:00
Tadashi G. Takaoka
ef5dfc480c Remove sliding spacebar language switcher 
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
 2011-07-19 23:24:49 -07:00
Tadashi G. Takaoka
5c73ed628b Move PointerTrackerQueue into PointerTracker 
Bug: 4768084
Change-Id: I1be83b38c48147827c871c92e17d37da3aeb0f95
 2011-07-12 23:35:23 -07:00
Tadashi G. Takaoka
886246b19a Add Right-To-Left delete icon 
Bug: 4161983
Bug: 4170083
Change-Id: Ife9a933353e97f3c7c3ede47623dc7528160f3c5
 2011-07-12 20:59:20 -07:00
Tadashi G. Takaoka
8a995157f3 Merge PointerTrackerKeyState into PointerTracker 
Bug: 4768084
Change-Id: I0be0e07bff2542db6ba764dcb13505dfbff6994e
 2011-07-08 16:26:11 -07:00
Tadashi G. Takaoka
a9f69513df Merge "Remove swipe gesture" 2011-07-08 00:06:25 -07:00
Tadashi G. Takaoka
c71854a661 Remove swipe gesture 
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
 2011-07-08 00:00:14 -07:00
Tadashi G. Takaoka
5a7a696aff Let KeyDetector hold Keyboard 
Bug: 4768084
Change-Id: Ia28d6971fc59086dd4e6fedc9fd1b50f13b59854
 2011-07-07 23:31:04 -07:00
Tadashi G. Takaoka
f60d09ac30 Narrower KeyboardView reference 
This change also rename static inner class to more readable name and
get rid of unnecessary object reference from PointerTracker.

Bug: 4768084
Change-Id: Ie4e2b940d66b47d41efcae7eeac853cdae2e4d38
 2011-07-04 22:42:48 +09:00
Tadashi G. Takaoka
a19b84dcf6 Move key hysteresis distance parameter to KeyDetector class 
Bug: 4768084
Change-Id: Ib8771afd7363a4a5590b2b4a586e3014c026be34
 2011-07-04 22:32:21 +09:00
Tadashi G. Takaoka
5f6816fa8b Move keyboard event handling code to separate LatinKeyboardBaseView class 
To sort out the issue, main keyboard and mini keyboard have to share
the pointer trackers.

In order to prepare for that, KeyboardView needs to be refactored as
two separate classes. KeyboardView is responsible for drawing keyboard
visual. And LatinKeyboardBaseView is responsible for handling key
event and mini keyboard as well.

Bug: 4768084

Change-Id: I5643e333b9bdfde0c939a0693cea76bd22f38897
 2011-07-04 18:53:50 +09:00
Tadashi G. Takaoka
9812fb0fe9 Specify Key gaps by percentage 
Change-Id: I4721bf831b5edbea1dd4309c6ce907544b098d62
 2011-07-04 15:11:17 +09:00
Tadashi G. Takaoka
e5276b39c1 Remove top padding parameter from MiniKeyboardBuilder constructor 
To keep unit test simple, instead of specifying top padding in
the constructor, make separate setter for it.

Change-Id: I8870622cc1bd97420637b8c465bdb6c9dd366062
 2011-07-02 02:06:33 +09:00
Tadashi G. Takaoka
17a1676e72 Add top padding to mini keyboard 
Because Key only has bottom padding, to make mini keyboard vertically
symmetric and looks nicer, we should add mini keyboard top padding
that equals to Key bottom padding (a.k.a. vertical gap).

Change-Id: Icceb687d50edfa48e0f0830a60a1e230836c982f
 2011-07-01 23:02:47 +09:00
Tadashi G. Takaoka
d773bf38a3 Cleanup key drawing code 
This change also modifies 9-patch drawables to fix the following
issues.  In order to draw key background drawable just on the
coordinates we want, we have to know where an actual "visible" part is
in the drawable.  The only clue we can use is "padding" of the
drawable.  To achieve this, the 9-patch drawable must have its
"visible" part marked as "content".  Please refer the Bug: 4948171 for
more detailed explanation.

This change also reverts the following "black" drawables back from
Gingerbread because recent change broke these (I70019a91).
  * drawable-hdpi/sym_bkeyboard_*.png
  * drawable-hdpi/btn_keyboard_key_*_stone.9.png

Bug: 4948171
Change-Id: I6e4d03b3144caa95c793aac97af22df34c5f454f
 2011-06-29 18:34:57 +09:00
Tadashi G. Takaoka
87089985b1 Render sliding spacebar language switch arrows by text 
Change-Id: Ief1a4f12a3d4840c36aa7a082f44b5b1ff894dd1
 2011-06-28 15:58:45 +09:00
Tadashi G. Takaoka
8aee759262 Remove reference to system theme 
This change also introduces
 * Background for space key preview
 * Tune stone theme

Change-Id: I84fca0baf2392582da870d2ff77b3e99c28faf7b
 2011-06-27 22:36:04 +09:00
Tadashi G. Takaoka
520a297ad1 Draw phone/number keyboard layout witout icon 
This change introduces:

* New KeyboardView attribute
  * keyLargeLetterRatio to specify large letter text size.
  * keyHintLabelRatio to specify hint label text size.
  * keyHintLabelColor to specify hint label text color.
  * keyPreviewTextRatio to specify key preview text size.
* New Key.keyLabelOption flags
  * alignLeftOfCenter, align the key label slightly left of the key center.
  * largeLetter, use keyLargeLetterRatio to draw key letter.
  * hasHintLabel, draw keyHintLabel at the right of key letter.
  * followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size.
* Renames
  * Key.keyHintLetter to keyHintLabel.
  * Key.keylLabelOption fontFixedWidth to fontMonoSpace.
  * Key.keylLabelOption popupHint to hasPopupHint.
* Removes
  * number icon releted attributes and declarations.

Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859
 2011-06-27 20:04:34 +09:00
Tadashi G. Takaoka
14daf66fc5 Remove spacebar preview and arrows 
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
 2011-06-24 21:41:27 +09:00
Tadashi G. Takaoka
80b79bf9a2 Merge "Fix "Show settings key" option on 7" device" 2011-06-23 08:35:21 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
e7759091dd Move Key class out of internal package 
Bug: 4903326
Change-Id: I2493d6dae613d2e37dfa8ce96b4cddc9a038160c
 2011-06-23 22:59:12 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
a93d27d6b8 Remove colorScheme attribute from KeyboardView 
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
 2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka
c2a21786e5 Move icon declaration to Keyboard theme 
Bug: 4436327
Change-Id: I074014d28dcb323b60dbc8fd9e169c75c393e0b3
 2011-06-22 17:44:49 +09:00
Tadashi G. Takaoka
72934bd596 Move keyboard related internal class to separate package 
Change-Id: Ic1459066b865cde5104b3734193f76c997959c68
 2011-06-22 11:54:00 +09:00