Commit Graph

806 Commits (6cbe204fce109fab652da15f4c8ea1ae35fca3e7)

Author SHA1 Message Date
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
Tadashi G. Takaoka 5fdcd7d5cd Fix JNI as 64bit ready
Change-Id: I7a3ed2cee3b20744869aa5cf89ff9fd95f5ab8fe
2011-10-31 20:44:01 +09:00
Svetoslav Ganov 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
Tadashi G. Takaoka 8fbf29e2d5 Make some private method static
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
Tadashi G. Takaoka 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
Alan Viverette 166530b195 Removed lift-to-type from LatinIME accessibility.
Bug: 5522854
Change-Id: I32df86450fa0d5dd9606609ea693d0e331b64b19
2011-10-26 18:52:08 -07:00
Tadashi G. Takaoka ef543c725e Merge "Use onCustomRequest to request haptick and audio feedback" 2011-10-26 07:54:23 -07:00
Tadashi G. Takaoka d999ea4480 Use onCustomRequest to request haptick and audio feedback
Change-Id: I958f274d8cfebb1551cdf08f1bada50c20fb9ca0
2011-10-26 23:32:38 +09:00
Tadashi G. Takaoka e51d164482 Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
Change-Id: Idbcd6e3047c6c0c407e3b347cf9f65951d43a312
2011-10-26 20:54:35 +09:00
Tadashi G. Takaoka 0cf7a45ac5 Preventing infinite call of dismissMoreKeysPanel
Bug: 5514583

Change-Id: Idf8dd1ebba0afdb768e538c2626b60770421d4be
2011-10-26 17:03:41 +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 908a2f6394 Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0 2011-10-14 12:20:02 -07:00
Tadashi G. Takaoka 28d841534d Release bitmap buffer when KeyboardView is detached from Window
Bug: 5450387
Change-Id: I3e60edd8c0ea70aff9e484f6e00dadcc8f8981f6
2011-10-14 20:13:16 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka f44aeb6618 Fix haptic and audio feedback of caps-lock mode changing
Bug: 5435669
Change-Id: Ic1c1eb00d7e535a3ac602b9b505fd8bf43da5a8d
2011-10-11 15:27:56 +09:00
Tadashi G. Takaoka 416ee19d33 Add haptic feedback for caps lock
When long press triggers caps lock, the keyboard also triggers haptic
feedback.

This change also fixes trivial harmless bug in KeyboardSwitcher.

Bug: 5424681
Change-Id: I62706b49abd7be1dcebc3c5166ea03f426fc8c86
2011-10-07 13:57:49 +09:00
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
Tadashi G. Takaoka ab72a97d7c Cleanup unused import
This change also gets rid of several compiler warnings.

Change-Id: I23962edaadad18a6e0395d528af17b909dcf5dad
2011-10-04 12:46:20 +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 da9f556a15 Merge "Classify touches into three types." 2011-09-30 01:26:15 -07:00
Yusuke Nojima 258bfe66e0 Classify touches into three types.
Change-Id: I7c1d42835e0c15d596a1b66d421b0aa514ec0890
2011-09-30 17:22:22 +09:00
Tadashi G. Takaoka 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
Yusuke Nojima ad35835bac Pass the touch position correction data to native.
Change-Id: I92958779377a530410d1682100f9d0a2ba267dea
2011-09-29 17:00:49 +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
Yusuke Nojima a59f65ad0c Merge "Extend JNI interface to pass the theme id of the keybaord to the native." 2011-09-27 20:27:17 -07:00
Tadashi G. Takaoka 63584323ca Add themeId to Keyboard
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
2011-09-28 12:08:48 +09:00
Yusuke Nojima 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 73cd4c1428 Fix onDeatchedFromWindow to protected
Change-Id: Ief666554ffd405a43363e66ea2bc2d87aa76a882
2011-09-27 15:18:02 +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 acf6b6815a Merge "Fix keyboard row height calculation" 2011-09-25 19:25:28 -07: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
Fabrice Di Meglio c66a7278d2 Merge "Revert "Use "..." instead of "\u2026""" 2011-09-23 15:08:23 -07:00
Fabrice Di Meglio 9bdce3a59e Revert "Use "..." instead of "\u2026""
This reverts commit 8673ceb066

The Roboto Font is having the real ellipsis back
2011-09-23 14:59:33 -07:00
Yusuke Nojima b225516366 Merge "Extend JNI interface to pass the key coordinate information" 2011-09-22 02:50:51 -07:00
Yusuke Nojima 0e1f656c1b Extend JNI interface to pass the key coordinate information
Change-Id: Iec0d1415d6abba43b775a014516b961b167597b7
2011-09-22 18:39:34 +09:00
Tadashi G. Takaoka 8673ceb066 Use "..." instead of "\u2026"
Because "TRHEE DOT LEADER" glyph of Roboto font is broken, we decide
to use "..." instead.

Bug: 5344295
Change-Id: I0fa5eefc00baf80747ff5215c018619a7e15a58e
2011-09-21 14:00:36 +09:00
Tadashi G. Takaoka 40fd76faf2 Use Build.HARDWARE to determine "sudden jumping hack"
Bug: 5182291
Change-Id: I6c1ec0c4dd0f96902be89a0ad230dd2264a0dade
2011-09-20 11:09:42 +09:00
Ken Wakasa 2d9722e46c Update the theme pref key.
Follow up to Ia139813b

Change-Id: Ic4c2ea63041af02119dc404e704a04608d041163
2011-09-16 20:25:23 +09:00
Ken Wakasa dc52a5621a Use the correct theme on ICS
bug: 5329939
Change-Id: Ia139813b83eefe53863cae9cbe46b8b3a940e0df
2011-09-16 16:26:13 +09:00
Ken Wakasa 32cf5bb9f9 Stop auto-switching-back to the main layout by quotes.
bug: 5314117
Change-Id: Idcd6a146665b93eabdc03875b98988f9fa049791
2011-09-16 14:53:04 +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 a6d3a4d61b Make action key background more visually prominent
Bug: 5232726
Change-Id: I76ff2fb431ca295693ceb231a0f13da44f9293e6
2011-09-15 17:40:44 +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 4486d77270 Introduce autoXScale label option
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
2011-09-12 17:32:28 +09:00
Tadashi G. Takaoka 30bd8cb2da Add visual dividers to more suggestions panel
Bug: 5275003
Change-Id: I9464db71388a40ea768984b4cf06c8da05bfa26c
2011-09-08 23:05:55 +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
Ken Wakasa 6b97d2b9c2 Tweak bottom padding for the "..." popup hint
Follow up to I45bd6edf

bug: 5255103

Change-Id: I6d5368dadbaf6c7dffadd783d8a8756fea9dbff7
2011-09-07 21:58:30 +09:00
Tadashi G. Takaoka 2ed13003af Use different reference character for hit label
Bug: 5255103
Change-Id: I45bd6edfa68abccb9d67fed617b88efad2bfcc04
2011-09-07 15:06:59 +09:00
Tadashi G. Takaoka 50e1073e11 More suggestions view can be modal
Bug: 5241105
Change-Id: Ib430ee129b9f3cad0bdb1ae083b1068c51a5f2ea
2011-09-06 19:18:40 +09:00
Tadashi G. Takaoka 8ac6d505b7 More processTouchEvent from LatinKeyboardView to PointerTracker
Bug: 5241105
Change-Id: I8a5d15f43e2c9f294e78127eda68b0f85da5ad15
2011-09-06 15:57:15 +09:00
Tadashi G. Takaoka ea0c567f86 Tune mini keyboard visual
This change only gets rid of the surrounding paddings of the mini keyboard.

Bug: 5248783
Change-Id: Idb95ac1467085c230fd60e4bc0f466fef5700bfb
2011-09-05 20:36:19 +09:00
Tadashi G. Takaoka f2bd8a07bb Merge "Squash MiniKeyboardKeyDetector and SuggestionsPaneKeyDetector into one" 2011-09-02 03:08:41 -07:00
Tadashi G. Takaoka 9734ecbf46 Squash MiniKeyboardKeyDetector and SuggestionsPaneKeyDetector into one
Bug: 5241105
Change-Id: I4c310373fb8b2426fb46205fa17a49a8346f8244
2011-09-02 17:58:39 +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 3e0511e304 Merge "Move current x coordinate value into Row class" 2011-09-02 00:58:15 -07: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 1b087064c0 Dim keyboard when more suggestions are shown
Bug: 5241009
Change-Id: Ia42bcfc34dddf93d35f9cea8a4f0efead6ce3a6a
2011-09-01 18:48:19 +09:00
Tadashi G. Takaoka 29e7b7ed6e Implement popup suggestions pane
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
2011-08-31 21:21:22 +09:00
Tadashi G. Takaoka dcb1c7b802 Merge "Rename PopupCharactersParser to MoreKeySpecParser" 2011-08-31 02:39:03 -07: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 79dc056d22 Remove unused XML attribute
This is a followup for Ic83cd120.

Change-Id: Iecdcf28e2e07e1110c1b2974a9cb994ab2c0a769
2011-08-31 16:08:25 +09:00
Tadashi G. Takaoka 9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
Tadashi G. Takaoka b8dc674663 Get rid of MeasureSpec.UNSPECIFIED
Bug: 5023981
Change-Id: I14ded3c3d554ac72b66f190110652f54d91df954
2011-08-31 14:15:20 +09:00
Tadashi G. Takaoka 241f1cfdf6 Add outputText and icon to the Key constructor
This is a follow up change for I737bacb1.

Bug: 5023981
Change-Id: I980e3e993c81afe4fbdb95c9c263d7aa52aff66c
2011-08-30 21:47:12 +09:00
Tadashi G. Takaoka 39cc806605 Merge "Cleanup keyboard related code a bit" 2011-08-30 03:40:37 -07: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 392276d73d Add Key constructor for suggestions pane
Bug: 5023981
Change-Id: I737bacb1a6bb40f70be65d6eff85614afe6c79ed
2011-08-30 19:14:52 +09:00
Tadashi G. Takaoka 84b1284d01 Revert "Add hintLabel to Key constructor"
This reverts commit be34d97334.

Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118
2011-08-30 18:40:21 +09:00
Tadashi G. Takaoka be34d97334 Add hintLabel to Key constructor
This change also partialy reverts I5832421c, because of incorrect
popup mini key width calculation.

Bug: 5023981
Change-Id: I1acde090c01d3d861fcc5559cad81e638de2c2bb
2011-08-30 16:48:38 +09:00
Tadashi G. Takaoka 619f707c95 Fix another mismatched attribute in KeyboardView
This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I1135383ff0f0a2b8a5940d0d5c407fd01706a7f7
2011-08-30 15:19:42 +09:00
Tadashi G. Takaoka 3e63fbe400 Fix mismatched attribute in KeyboardView
This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: Ice6d949581aea7ca68799be2b91ff28234dd88d6
2011-08-30 14:55:56 +09:00
Tadashi G. Takaoka 3b71e5fae6 Merge "Add keyLetterSize and keyLabelSize as KeyboardView attribute" 2011-08-29 08:13:29 -07:00
Tadashi G. Takaoka 83da6c18fb Add keyLetterSize and keyLabelSize as KeyboardView attribute
Bug: 5023981
Change-Id: Iea7f8f340775cbb093c50d6e741b2f1476e9ac39
2011-08-29 23:45:05 +09:00
Tadashi G. Takaoka 2315bfc7c8 Clean up some MiniKeyboard.Builder code
Change-Id: I5832421cab3d496d4bb8a5e9902d0b5f4929fd0b
2011-08-29 21:15:05 +09:00
Tadashi G. Takaoka a9311741b8 Merge "Add KeyboardActionListener.Adapter" 2011-08-29 03:19:04 -07:00
Tadashi G. Takaoka e3be3bcebc Add KeyboardActionListener.Adapter
Change-Id: If13df42efffc7cef746c09d5abfe7a8619452a0b
2011-08-29 19:09:56 +09:00
Tadashi G. Takaoka 46286874f3 Add guard to prevent possible IllegalStateException
Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1
2011-08-29 18:38:04 +09:00
Tadashi G. Takaoka ed23cc7f0b Merge "Make PopupPanel decoupled with LatinKeyboardView and Keyboard" 2011-08-29 01:27:07 -07:00
Tadashi G. Takaoka f44a01b408 Make PopupPanel decoupled with LatinKeyboardView and Keyboard
Bug: 5023981
Change-Id: Ib4fd55d52718aa244178ca2313f5e8487378324f
2011-08-29 17:07:48 +09:00
Jean Chalard ef35cb631c Move locale-related utility methods to LocaleUtils.
Change-Id: I7e9e6e5bc4486d8618d0213b112308c3d305c15e
2011-08-29 12:29:35 +09:00
Tadashi G. Takaoka f3f3189adb Wrap up popup mini keyboard
Bug: 5218641
Change-Id: I88b3e7efa1f7c009c8a8e4f5453a5c4df2f91cfc
2011-08-26 15:45:05 +09:00
Tadashi G. Takaoka fd47b5d09c Merge "Move some static methods from SubtypeSwitcher to Utils" 2011-08-23 22:39:51 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 57f05f4412 Move some static methods from SubtypeSwitcher to Utils
Change-Id: I3ea8ffcdefcefaa82ae76a31bb65977009d8a040
2011-08-24 12:54:53 +09:00
Tadashi G. Takaoka c84bc3460d Rename LatinKeyboardBaseView to LatinKeyboardView
Bug: 5182291
Change-Id: I5089a14902b9f4ff1ab4f34e3f7a42aca5040d3e
2011-08-23 17:57:02 +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 2d306a225c Merge "Extract sudden jumping touch event hack into separate class" 2011-08-23 01:49:38 -07:00
Tadashi G. Takaoka c403a46f6d Extract sudden jumping touch event hack into separate class
Bug: 5182291
Change-Id: I6a88ed4df3ec98e31ea4966d82da56f7fca342ac
2011-08-23 17:44:41 +09:00
Tadashi G. Takaoka f9da4c548f Remove password field special handling
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
2011-08-23 16:49:35 +09:00
Tadashi G. Takaoka 6dde878d51 Move some methods from LatinKeyboardView up into LatinKeyboardBaseView
Bug: 5182291
Change-Id: I699ecef6fb8ea492d96fca1939f51faf0aac7fa6
2011-08-23 12:22:24 +09:00
Tadashi G. Takaoka b39f612d97 Remove hacks related to determine window width
Bug: 4311428
Change-Id: Ic93f264101d13963503fcd447a69bbffd06e69f3
2011-08-22 17:17:42 +09:00
Ken Wakasa 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
Ken Wakasa e56e88beff A follow up to I830de4d1
bug: 5130446
Change-Id: Ib1a4603590387c30be7555b8386f5e0607ea7249
2011-08-18 21:51:04 +09:00
Jean Chalard 29ea7b79c7 Merge "Have a pool of dictionaries to check spelling." 2011-08-16 03:05:50 -07: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
Jean Chalard a562767a14 Have a pool of dictionaries to check spelling.
The dictionaries and proximities are not thread-safe. In order to
be able to check spelling in parallel, make a dictionary pool to
call upon when a spelling check is necessary.

Bug: 5156851
Change-Id: Ie3796164187dd7b7abf5ccd5d014073d43d74408
2011-08-16 18:13:12 +09:00
Ken Wakasa f18bda60aa Code cleanup
Change-Id: I7df8c813038adec750eda260740bcc8a4da41acf
2011-08-16 17:32:37 +09:00
Yusuke Nojima 8f7f406c5b Merge "Add a margin between "123" and the mic icon." 2011-08-15 18:17:48 -07:00
Yusuke Nojima 35775197aa Add a margin between "123" and the mic icon.
Bug: 5161711
Change-Id: I04c777c24b9aac4d82eb3adff8e077640a866f61
2011-08-16 10:07:34 +09:00
Ken Wakasa 286a5bf1c6 Update shift state in onSizeChanged()
bug: 5130446
Change-Id: I830de4d184dffa2b263206c3f078de054e227b9e
2011-08-15 20:10:28 +09:00
Ken Wakasa 11b7febc0b Ellipsis for "Space" key for triggering the IME switcher
bug:5136497
Change-Id: Iab7c68135500e9fed212521484090b52943550ca
2011-08-10 00:31:23 +09:00
Jean Chalard f098fbbef3 Add proximity info for the spell checker.
Bug: 5119987
Change-Id: I35700fd8b0ffa6bced428cc6d46b3f64eb251281
2011-08-09 17:24:28 +09:00
Tadashi G. Takaoka 6983cf4a19 Merge "Remove all key preview from placer when window gets hide" 2011-08-06 00:59:03 -07:00
Ken Wakasa cadb2128f5 Fix issues with long-pressing the spacebar
bug: 5114433
Change-Id: I18f2147724a08965147bafe93e11fc86c7c59d33
2011-08-06 16:49:32 +09:00
Tadashi G. Takaoka 1149abd876 Remove all key preview from placer when window gets hide
Bug: 5130302
Change-Id: I70e3737c33bfbac99366ab36d3437b0801f5140a
2011-08-05 23:33:51 -07:00
Tadashi G. Takaoka 94ac3d760b Fix NPE
Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
2011-08-04 09:40:25 -07:00
Jean Chalard 043f784198 Create a way to pass the proximity info to the dictionary
This is a preparative change for inserting the spell checker.

Change-Id: Ie441879cac4f67078ec27a95f1fcbbf3ef373df7
2011-08-04 19:46:21 +09:00
Tadashi G. Takaoka bb12dc455b Merge "Fix saving keyboard state while rotating" 2011-08-03 15:15:59 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 73c02390d3 Reset keyboard shift lock state when new keyboard is ready
Bug: 5099761
Change-Id: I00ad796ea43a07ae13e71224b7a081ee2f160f1a
2011-08-03 09:24:13 -07:00
Tadashi G. Takaoka eedfef0308 Merge "Retain keyboard layout while orientation change" 2011-08-03 02:37:00 -07:00
Tadashi G. Takaoka 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
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 8d7782bf3c Merge "Use generic interface for filed type of Keyboard" 2011-08-01 18:12:58 -07:00
Tadashi G. Takaoka 04bc5a369c Merge "Add KeyboardParams class" 2011-08-01 18:08:17 -07:00
Tadashi G. Takaoka 167e77f170 Use generic interface for filed type of Keyboard
This change also re-orders and renames some fields.

Bug: 5023981
Change-Id: I28c1ca7384bb70e3584398cd19ce2276ddfe8541
2011-08-01 17:58:02 -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 30479de9e5 Merge "Cleanup key label case adjustment" 2011-08-01 17:04:09 -07:00
Tadashi G. Takaoka c499866948 Cleanup key label case adjustment
Bug: 5023981
Change-Id: Ida06fc6a588c4eb8543455d932e71ac2797d27e5
2011-08-01 16:43:14 -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 83f6ca10d4 Merge "Fix exception message" 2011-07-31 18:43:22 -07:00
Tadashi G. Takaoka 2afc2adb01 Merge "Eliminate "..." from the key that has no popup mini keyboard automatically" 2011-07-31 18:43:17 -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 0c6e57f2d1 Eliminate "..." from the key that has no popup mini keyboard automatically
Bug: 4340933
Change-Id: I08bbdee71f4bc2285fd0c1233d284150be61748e
2011-07-31 18:22:29 -07:00
Tadashi G. Takaoka 73e716f202 Be aware of "nm" and "noMicrophoneKey" private IME option
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
2011-07-31 18:20:20 -07:00
Ken Wakasa 2ba975afb9 Turn off the Settings key by default
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
2011-07-31 07:26:24 +09:00
Tadashi G. Takaoka 97c35650ad Dismiss key preview regardless of key preview settings
Bug: 5099213
Change-Id: Id6c5cb0ae4a07897b34153d4b350b1b45a06aa1a
2011-07-29 19:52:49 -07:00
Tadashi G. Takaoka 364f1fd1f8 Add WindowWidthCache
Bug: 4311428
Change-Id: I9f006525c0932d9d49bb8655caf58523135366d7
2011-07-29 18:43:50 -07:00
Tadashi G. Takaoka 0a054dd107 Cleanup KeyboardSwitcher internal a bit
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
2011-07-29 17:00:09 -07:00
Ken Wakasa f12aa77c4b Merge "Simplifying accessibility code in keyboard's dispatchTouchEvent()" 2011-07-29 01:22:11 -07:00
Tadashi G. Takaoka 5b3c834a9c Merge "Remove enableShiftLock attribute from KeyboardId" 2011-07-28 17:38:50 -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 34400204a5 Merge "Remove unused method" 2011-07-28 15:42:53 -07:00
Tadashi G. Takaoka b9538bc447 Merge "Fix that long pressing shift on symbol keyboard registers caps lock code" 2011-07-28 15:27:40 -07:00
Tadashi G. Takaoka d4b533774d Remove unused method
Bug: 4521802
Change-Id: Iae649f8b77b3bb144ee7eedbb6545e237fa79a17
2011-07-28 15:24:46 -07:00
Tadashi G. Takaoka 851c3267d4 Fix that long pressing shift on symbol keyboard registers caps lock code
Bug: 5088376
Change-Id: I586a9fb685f3443aa22fd877df52b36247c4f858
2011-07-28 12:04:35 -07:00
Alan Viverette 65a898d9ef Simplifying accessibility code in keyboard's dispatchTouchEvent()
Change-Id: Ie33cf93ee2d7eadad38ca170aa8ad988bb0ae9a9
2011-07-28 11:55:45 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 0a5345c7b6 Fix NPE
Bug: 5086698
Change-Id: Iaa3082649344722bd643c49c9d151df754d6e337
2011-07-27 15:37:42 -07:00
Tadashi G. Takaoka 60ccbe16ee Clean up keyboard loading and switching
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
2011-07-27 13:34:16 -07:00
Ken Wakasa 3ca85794a0 Merge "Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()" 2011-07-26 15:15:34 -07:00
Tadashi G. Takaoka 4692af50da Support multiple key preview
Bug: 4298393
Change-Id: Ibd3681f7255c85e3602e1af4ace8f8e7fce3fb06
2011-07-26 14:55:19 -07:00
Alan Viverette 586a15c3f0 Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()
Bug: 5060194
Change-Id: I585ae52204a045fa3941e846b4f9bdd7d541bea6
2011-07-26 14:06:26 -07:00
Tadashi G. Takaoka 9ec80d9d89 Make PointerTracker aware of that popup panel is showing
Bug: 5070598
Change-Id: I0604287b8c373e4763b4ccf88c0bd7235af907d5
2011-07-26 10:22:07 -07:00