Commit Graph

3095 Commits (d82898c5a91f8aa69d5dc594b7a9290b8be1247a)

Author SHA1 Message Date
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
Jean Chalard 196da4a7be Merge "Fix a bug where backspace would not delete the selection" 2012-01-24 01:13:34 -08:00
Jean Chalard 77da3d5a3b Fix a bug where backspace would not delete the selection
Bug: 5699301
Change-Id: I6c5a8470464d045349ac38e191c859b5c34cbeee
2012-01-24 18:07:23 +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
Jean Chalard 5fd11a7f33 Fix a typo
Change-Id: I358350c959d5610214a752b14d7744fe83eb3821
2012-01-24 11:58:07 +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 b6357bddd5 Merge "Add more debug message to KeyboardState" 2012-01-22 20:15:38 -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
Jean Chalard 35e9a7ac55 Merge "Squash a ridiculously improbable NPE" 2012-01-22 18:37:29 -08: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 54c2dd67b0 Merge "Support @string reference in moreKeys attribute" 2012-01-20 01:59:31 -08:00
Tadashi G. Takaoka e54a4005d5 Support @string reference in moreKeys attribute
Change-Id: If0056d0601149d2ddd0e231a81e7b2409b37fc06
2012-01-20 18:46:33 +09:00
Jean Chalard 7c177e82af Merge "Fix a bug where a check would fail" 2012-01-20 01:16:44 -08:00
Jean Chalard 7546ff6e34 Fix a bug where a check would fail
Bug: 5894393
Change-Id: I810de58730f2cabcaf7b8dc1d85b3725f959094b
2012-01-20 18:09:59 +09:00
Tadashi G. Takaoka 3eede315dc Merge "Move MoreKeySpecParser.getResourceId to Utils" 2012-01-20 00:01:29 -08:00
Tadashi G. Takaoka 86641ef6e8 Merge "Change more key specification type to String from CharSequence" 2012-01-20 00:01:24 -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
Jean Chalard af9fe5c5fc Fix a bug where the user typed word would not be passed.
Bug: 5894271
Change-Id: I4f02ff322697159e08f5e898608c0aff11dacb2f
2012-01-20 15:39:06 +09:00
Tadashi G. Takaoka 0ef9bfe593 Merge "Fix KeyboardState switching back from alphabet-chording input correctly" 2012-01-19 02:14:20 -08:00
Tadashi G. Takaoka 085b659463 Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests" 2012-01-19 02:14:15 -08:00
Tadashi G. Takaoka 4d229410f0 Merge "Cleanup KeyboardState a bit" 2012-01-19 02:14:10 -08:00
Jean Chalard 250cf0a781 Merge "Fix a bug with backspace happening after a manual pick." 2012-01-19 01:55:30 -08: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
Jean Chalard 3b2112e70a Fix a bug with backspace happening after a manual pick.
Bug: 5884397
Change-Id: I01f462075bcbf7da38e9af2084ecd37143923e8b
2012-01-19 18:41:02 +09:00
Jean Chalard 8ae770f39b Merge "Small code simplification." 2012-01-19 01:33:21 -08:00
Jean Chalard 95a6e58ebc Small code simplification.
I'm pretty sure the test here was useless.

Change-Id: Iaece641fbd5455406533b19555f2b639759a525f
2012-01-19 18:03:45 +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
Jean Chalard af480be66e Squash a ridiculously improbable NPE
This probably can't be triggered by anything that is not
a monkey, but still, let's fix this

Bug: 5797549
Change-Id: I9a7d9fd6664c97787ce676a28675e96f46df7658
2012-01-19 12:06:00 +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 c9fade6b87 Merge "Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher" 2012-01-17 00:07:38 -08:00
Tadashi G. Takaoka 87e025da11 Remove toggleShift and toggleAlphabetAndSymbols from KeyboardSwitcher
Change-Id: I9bb8f78b0a766cd7937d5cbe1c1e5e35898b2997
2012-01-17 16:49:33 +09:00
Jean Chalard d104a7aac8 Merge "Fix a bug where words disappear on inserting separators" 2012-01-16 23:22:03 -08:00
Jean Chalard edc6395d9b Fix a bug where words disappear on inserting separators
The basic idea is that in some situations, we would restart
suggestions, but before evaluating them we would bail out
because suggestions were not requested. This would lead to
the "correction" set to null, so we would commit a null word.

This fix does two things:
- Do not restart suggestions when not requested.
- If we still end up with a composing word when suggestions
  are not requested, we select the typed word as the
  correct version.

Bug: 5846646
Change-Id: Ic35351841d0cb20afa99092ef681ecb7bd68bec6
2012-01-17 16:16:52 +09:00
Jean Chalard aed5819a84 Merge "Fix a bug where suggestion would restart at a bad time" 2012-01-16 22:51:23 -08:00
Jean Chalard fbd1ac8083 Fix a bug where suggestion would restart at a bad time
Bug: 5846646
Change-Id: I7c907d0a9478e0878b92ead94173caefc21b627b
2012-01-17 15:50:18 +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 2764e1dffe Merge "Remove duplicate logic from KeyboardSwitcher and KeyboardState" 2012-01-16 20:22:34 -08:00
Tadashi G. Takaoka 06b7c256b1 Add "force non-distinct multitouch" debug option
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
2012-01-17 13:19:01 +09:00
Jean Chalard a8ba49c253 Small cleanup
The method deleteWordAtCursor would call finishComposingText,
which is a very unexpected state change and would probably cause
surprising bugs to any parent that would call it.
As it happens, it's not used anywhere any more so let's just
remove it.

Change-Id: Iaa9200866e40b4e914f76baa987279948300679c
2012-01-17 11:55:23 +09:00
Jean Chalard 72d285f4d7 Add some comments about resuming auto-suggestion
Bug: 5846646
Change-Id: Ib2c76ec173972eb7acadbfaae7e930849d546721
2012-01-17 10:29:11 +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 9751a626ec Don't cache resource value that depends on orientation
Bug: 5794655
Change-Id: Ib324366c772e20bb54aba63c2f4540dc0f9de515
2012-01-16 12:26:34 +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 ca132ce8e2 Merge "Remove reference of SubtypeSwitcher and SettingsValues from KeyboardSet" 2012-01-13 01:39:50 -08:00
Tadashi G. Takaoka 211680e375 Merge "Fix SuggestTests" 2012-01-13 01:39:43 -08: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 9c735b8038 Fix SuggestTests
We need revised scoring test because dictionary look up algorithm has
been changed significantly since this SuggestTests was made.

Change-Id: I69d527a6bfa24ed0dc189fddad1afab0566c6eb8
2012-01-13 15:25:28 +09:00
Tadashi G. Takaoka 76dede6b3b Merge "Fix SubtypeLocaleTests" 2012-01-12 22:17:20 -08:00
Tadashi G. Takaoka 4015a64a26 Fix SubtypeLocaleTests
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
2012-01-13 14:35:43 +09:00
satok 4da8e8e4d3 Merge "Fix a bug in the logic to show 3 dots of the ime switcher" 2012-01-12 19:41:12 -08:00
satok 83a018419a Fix a bug in the logic to show 3 dots of the ime switcher
Bug: 5806103
Change-Id: I67b3f0bb25d5fb9cfb902c03f41ae3e582107187
2012-01-13 11:50:31 +09:00
satok 21814c56f0 Merge "Move auto correction thresthold to the native code" 2012-01-12 02:58:35 -08:00
satok be0cf72253 Move auto correction thresthold to the native code
bug: 5858137

Change-Id: Ic4b6270c6e51ef4ed25a6a1d8ddd7fdfa70fd78d
2012-01-12 19:56:15 +09:00
Jean Chalard ab34a4a7f5 Merge "Fix a bug where last candidate would not be reset" 2012-01-11 21:47:35 -08:00
Jean Chalard cda8a42cbe Merge "Add a sanity check" 2012-01-11 21:47:26 -08:00
Jean Chalard a8c8ab1cb4 Remove an excessive parens
Change-Id: If8aa4253ab0f664e628ed7f4d7a3adc02a898cc7
2012-01-12 14:07:56 +09:00
Jean Chalard 852630ba34 Add a sanity check
Check if any character is both a magic space swapper and
a magic space stripper for the current language, and throw
an exception if found. Since this is expensive, it's done
only in debug mode.

Change-Id: Ibd166db87c91495b76878ea0e4f420a62c7bb276
2012-01-12 12:44:49 +09:00
Jean Chalard 9de5cfc67a Fix a crash where revertSwap would be wrongly called
This would crash the program when inputting a punctuation
symbol that should not swap with a weak space through the
suggestion strip, then press backspace.
Those include all two-part punctuation symbols in French for
example, as well as magic space strippers like the dash in
English. For English all suggestion strips symbols happen to
be magic space swappers so this would not happen in English
by default.
Also fix a typo.

Change-Id: Ia40678c264e978509b5786290a75a3c57181648e
2012-01-12 11:55:40 +09:00
Jean Chalard cd2286fff1 Fix a bug where last candidate would not be reset
Bug: 5851148
Change-Id: Ic270318842d8e16bc62d78d5fe0d6be0ca1fb532
2012-01-12 11:16:51 +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 0d0f01da67 Fix a typo. A follow up to I68dd6b8d
Change-Id: I16fa4099c75faac35344b0e4d3c2b866ddac896a
2011-12-21 22:34:08 +09:00
Jean Chalard 0fd625bcfd Fix a bug with wrong auto-correct cancellation
Auto-correct cancellation would sometimes kick in at
wrong times, causing crashes.

Bug: 5784542
Change-Id: I68dd6b8d9237ce9b66af2dc63e77ba6dd5fd69dd
2011-12-21 19:28:02 +09:00
Jean Chalard 752d8cc4fc Fix a bug with TYPE_TEXT_CLASS
This was introduced by a badly-rebased commit. The culprit was
I103d6851. There was also another bug lurking there introduced
by a previous commit that this fixes.

Bug: 5775347
Change-Id: I133b54a5159e19714f4bcae8ffbb4824cff9f466
2011-12-20 15:31:55 +09:00
Jean Chalard 715a203501 Merge "Reorganize the auto-correction memory" 2011-12-19 02:22:49 -08: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
Jean Chalard 9e8761c440 Reorganize the auto-correction memory
Change-Id: I31cce9db471dcd4a7b3477bcb037a8ff482b7696
2011-12-19 17:33:15 +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 510ebb9b16 Merge "Get rid of key index from ProxymityInfo" 2011-12-16 04:13:38 -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
Jean Chalard 43c0a034bd Merge "Pretty print for InputAttributes" 2011-12-16 04:01:49 -08:00
Jean Chalard 4d0f03bd66 Remove a write-only variable.
Change-Id: I825307a429f46b31ed9bd940b5a97d2713127dfe
2011-12-16 20:54:58 +09:00
Jean Chalard 6fa003ee23 Pretty print for InputAttributes
Change-Id: I5e4b2b6f3cd943c8f6187aaed21d67ec786bf5df
2011-12-16 20:53:44 +09:00
Jean Chalard 2b2c0b574c Merge "Use the WordComposer to check if we are composing a word" 2011-12-16 03:47:34 -08:00
Jean Chalard 80b66bb166 General cleanup.
Move variables around, inline useless functions, remove
useless local variables.

Change-Id: Icb89d8b211a2ad4bc3619137c2276a649c2a5e34
2011-12-16 20:36:32 +09:00
Jean Chalard 644c8b7c96 Initialize input attributes in the InputAttribute class
Change-Id: I103d6851f54f47cbffdb567fb0f4c505c4697b05
2011-12-16 20:35:16 +09:00
Jean Chalard 3b7aceca60 Merge "Make applicationSpecifiedCompletionOn final." 2011-12-16 03:20:00 -08:00
Tadashi G. Takaoka bf7ed75e4f Merge "Move KeyboardSwitcher.getKeyboard to KeyboardSet" 2011-12-16 03:13:38 -08: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
Jean Chalard ccc35f7fa7 Make applicationSpecifiedCompletionOn final.
This is the last one (whew)
Also move a somewhat unrelated initialization out of the
input attribute initialization function.

Change-Id: Icc77b32fd16b112ab43786715061b1c9dca31c04
2011-12-16 19:09:01 +09:00
Jean Chalard 9cc1312eee Make inputTypeAutoCorrect final.
Change-Id: I550eba1fc3fa2843d007a8208d81fad208c1196b
2011-12-16 19:08:52 +09:00
Jean Chalard 13db05f930 Make isSettingsSuggestionStripOn final.
Change-Id: Iabb99a7f8f3f1777f9a87ae2bddff9795a50fa92
2011-12-16 19:08:13 +09:00
Jean Chalard 1ba17f97d5 Small refactoring
This helps to make following changes smaller

Change-Id: I95ba2901ac3bf1ed70a748c35a0babdd9af1df63
2011-12-16 18:21:26 +09:00
Jean Chalard 4fc0f6ab02 Merge "Make insertSpaceOnPickSuggestionManually final." 2011-12-16 01:15:35 -08:00
Jean Chalard 2ad14a2ea7 Merge "Use temporary variables for computing editor attributes" 2011-12-16 01:07:56 -08:00
Jean Chalard 520e69056e Merge "Create a class for input attributes." 2011-12-16 01:06:12 -08:00
Jean Chalard ae0c109d11 Make insertSpaceOnPickSuggestionManually final.
Change-Id: I32fce0ea8c5c58b6f920d0758c8bf57769f39a12
2011-12-16 18:04:39 +09:00
satok cadc0f7d79 Merge "Send touch event in usability study mode" 2011-12-16 01:04:26 -08:00
Jean Chalard 4e8922f1be Use temporary variables for computing editor attributes
The ultimate intent is to make these variables final,
which will allow to move the computing function to the
InputAttributes class.

Change-Id: Ifb1fc7321a19b10d60aa63fa0daaa2708deda2cf
2011-12-16 18:04:17 +09:00
Jean Chalard dc9d0fcc11 Create a class for input attributes.
Change-Id: I834390c83865aac59fb758d5c66cf9b74103abd8
2011-12-16 18:03:16 +09: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
Jean Chalard 196d82cdd7 Use the WordComposer to check if we are composing a word
...instead of the hard-to-understand mHasUncommittedTypedChars.
This is possible because now the word composer is actually aware
of commits.

Change-Id: I36b664ce8402a280f801e87b9ebe161f416b0853
2011-12-16 15:58:29 +09:00
Tadashi G. Takaoka 6ba5f0d341 Merge "Add error log to expensive ArraysCompatUtils.binarySearch" 2011-12-15 22:55:10 -08:00
Jean Chalard be2f81f055 Merge "Make the word composer aware of commits." 2011-12-15 22:54:23 -08:00
Jean Chalard c73c26790f Make the word composer aware of commits.
Change-Id: I04e691fbc9227d4df195429bca89edea93575347
2011-12-16 15:41:10 +09:00
Tadashi G. Takaoka f8481883cc Add error log to expensive ArraysCompatUtils.binarySearch
Change-Id: Id33998e2a99be9249de4011892555f10c5d0968d
2011-12-16 15:34:11 +09:00
Tadashi G. Takaoka cfd5b4811f Merge "Cleanup ProximityInfo.calulateSweetSpot" 2011-12-15 22:21:17 -08:00
Tadashi G. Takaoka f1e05e74e6 Merge "Add com.android.inputmethod.latin.suggestions package" 2011-12-15 22:00:05 -08:00
Tadashi G. Takaoka 6cb72b0f36 Cleanup ProximityInfo.calulateSweetSpot
Change-Id: I98238359dffd76a620d3b0e73b3b22dd82c56c93
2011-12-16 14:59:24 +09:00
Tadashi G. Takaoka 8c3d5b6961 Add com.android.inputmethod.latin.suggestions package
Change-Id: If4b823768ab9c073625da3034ecc8091be1df230
2011-12-16 14:21:44 +09:00
Tadashi G. Takaoka 8950f259b1 Merge "Make Key.mPreviewIcon public final" 2011-12-15 21:20:46 -08:00
Tadashi G. Takaoka 0b6237da94 Make Key.mPreviewIcon public final
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
2011-12-16 12:47:34 +09:00
Tadashi G. Takaoka a44685ab32 Add colorValidTypedWord and alphaValidTypedWord
This change fixes Gingerbread theme.

Change-Id: I142437ac0173df48ab36390f47ed67c6cea24a65
2011-12-16 12:26:19 +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
Jean Chalard 05f654d498 Merge "Group all input-related info into an inner class." 2011-12-15 03:21:47 -08:00
Tadashi G. Takaoka c3ef86d861 Merge "Fix auto correction spacebar LED" 2011-12-15 03:19:32 -08:00
Jean Chalard 27dff63833 Group all input-related info into an inner class.
Currently, these variables hold the info about the composing
word, or maybe some outdated info, and it's not very clear
which it is. LatinIME is maintaining the freshness info in
a separate boolean, and uses it throughout the code for many,
many things, leading to much confusion.
The idea in grouping this info is, it can be saved in another
instance and restored later. It can be tested against to know
whether there is actually outdated but kept info or not, and
it should allow to straighten out what is actually currently
being typed. Ultimately, it will eliminate the need for
LatinIME to keep track of the status of the info in the
word composer.

Change-Id: I00e2c690f303f8320c9be35590a6df4583e9e456
2011-12-15 19:58:04 +09:00
Tadashi G. Takaoka 2d74806262 Change visibility to avoid synthetic accessor method
Change-Id: Ie93c7437fb9a3fe63adaa48c2d4a723f96c0a0e1
2011-12-15 19:50:53 +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
Jean Chalard 9750165c9a Merge "Cleanup" 2011-12-14 01:50:25 -08:00
Tadashi G. Takaoka 014b755f8a Merge "Cleanup KeyboardId's hasCode method" 2011-12-14 01:48:46 -08:00
Jean Chalard f3ca6a59a7 Cleanup
Change-Id: I724df0be7ac07ffb9f1f4974175aed5a2606221b
2011-12-14 18:42:47 +09:00
Tadashi G. Takaoka 601e411c13 Cleanup KeyboardId's hasCode method
Change-Id: I5fd8f6ac0f42152fb0e2aaaedc6092f6d82fe677
2011-12-14 18:42:20 +09:00
Jean Chalard 64361bd66d Merge "Move some code inside a function to simplify flow" 2011-12-14 01:42:17 -08:00
Jean Chalard 676917dea2 Merge "Fail faster in case of a bug" 2011-12-14 01:42:05 -08:00
Tadashi G. Takaoka 2c4b21d7ca Merge "Cleanup settings key related stuff" 2011-12-14 01:36:34 -08:00
Jean Chalard 1c6cf26c37 Move some code inside a function to simplify flow
Also rename the function to reflect better the behavior.
An upcoming change will clean up the remnants

Change-Id: I19bdf0d9e95f62ee749e1f64fe17132c4a5ef0bc
2011-12-14 17:56:57 +09:00
Jean Chalard 46798d8f1f Fail faster in case of a bug
Change-Id: Ibea64133f200dce80034c641d4798b62843a2512
2011-12-14 17:54:18 +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
Jean Chalard b588003426 Refactoring.
Small simplification of the code.

Change-Id: I1f67ae529bbb2c9316bf5e083d367c57040ea22c
2011-12-14 16:59:25 +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 e35e13fc7d Merge "Record onStartInputView" 2011-12-13 23:31:43 -08:00
Tadashi G. Takaoka 689b901156 Merge "Utilize KeyboardSet XML definitions" 2011-12-13 23:31:00 -08:00
Jean Chalard dbdb385bb0 Merge "Fix a long-standing race condition." 2011-12-13 23:29:47 -08: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
Jean Chalard 514beb0992 Fix a long-standing race condition.
Upon autocorrection, there is visual feedback in the text
view that quickly flashes the background of the text that
just changed. This fixes a race condition that happens
upon autocorrection when typing fast, and that results in
flashing one character too far left (typically, the flashing
area includes the whitespace before the corrected word and
not the last character of the corrected word).
This happens because the call to commitCorrection may
happen before or after the IPC sent by sendKeyChar, but the
arguments are fit only for the case where it arrives first.

Change-Id: I9b5442a665aad5a9bc66cd49228075b9056b37fa
2011-12-14 16:24:18 +09:00
Tadashi G. Takaoka 7ef235f53f Record onStartInputView
Bug: 5722703
Change-Id: I56bcf6ccde82b4176093de4f197a8736b0cc8c10
2011-12-14 16:22:30 +09:00
Jean Chalard 8e3faff244 Merge "Decouple member logic from control flow" 2011-12-13 06:28:48 -08:00
Jean Chalard 7b5bc1ff4d Decouple member logic from control flow
This place is very confusing because a member variable with
a consistent meaning is hijacked for the duration of a function
to mean something else. This is in the way of easy-to-understand
refactoring.

Change-Id: If79bc771950d6bfc0ad5f0e9c51c7ef1dbb45b66
2011-12-13 23:15:12 +09:00
Jean Chalard f7d6517d6b Various mini-cleanups
- Stop the word composer from escaping - take a page from the law
  of Demeter and only report what is actually needed.
- Fix typos in comments.
- Add a comment for a fishy processing.
- Remove a useless local variable.

Change-Id: I5fa78901cbb5483fc9683bfb7094f47244b85df6
2011-12-13 23:09:22 +09:00
Jean Chalard edf4995a3b Merge "Remove the input connection sidework from handleCharacter" 2011-12-13 04:28:30 -08:00
Jean Chalard dafa7a8e15 Remove the input connection sidework from handleCharacter
Change-Id: I3d376dfda3acd8864274390de3ff5752b18456e0
2011-12-13 21:12:07 +09:00
Jean Chalard 117fc93f37 Move mBestWord to the word composer.
mBestWord has a confusing name - it's actually an auto-correction.
It's cleaner if it lives in the word composer because an
auto-correction should be tied to a specific user input, and
should be reset each time the user input changes to avoid
race conditions.

Change-Id: I718d29395bc747372067e6440e090c6a181994ae
2011-12-13 21:06:51 +09:00
Jean Chalard 7e6f4daa19 Merge "Tighten conditions for space-related cancelling" 2011-12-13 01:23:15 -08:00
Jean Chalard c525750835 Merge "Consolidate underlining code under one function." 2011-12-13 01:22:08 -08:00
Tadashi G. Takaoka cfe264bfee Merge "Introduce KeyboardSet to hold related KeyboardIds" 2011-12-13 01:12:10 -08: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
satok 3dcba4279a Merge "Extract the jni library name" 2011-12-13 00:46:16 -08:00
Jean Chalard 77d59b0691 Consolidate underlining code under one function.
Change-Id: I4393ff1ec28a6b3118d1344dd6d82d04899dea42
2011-12-13 17:42:27 +09:00
Jean Chalard 8ad4013406 Tighten conditions for space-related cancelling
Instead of ignoring silently a found bug, throw an exception.

Change-Id: I0aa96d0cab022b6a5e7cffe8a592dcc443c3c7a8
2011-12-13 17:40:06 +09:00
Tadashi G. Takaoka 77ecf52a08 Merge "Remove KeyboardSwitcher.updateShiftLockState method" 2011-12-13 00:27:01 -08:00
satok ba526e3157 Extract the jni library name
Change-Id: Icc58ccea1178d9f35f5be0dceebab67bbb965b7f
2011-12-13 17:25:43 +09:00
Tadashi G. Takaoka 34f1820396 Remove KeyboardSwitcher.updateShiftLockState method
Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
2011-12-13 16:57:23 +09:00
Jean Chalard 14cb8448df Remove a useless return
Change-Id: Iefe10e94e2d88171387351a5b6cab52e281d0f76
2011-12-13 16:48:28 +09:00
Jean Chalard 8e404536cd Merge "Simplification" 2011-12-12 23:39:12 -08:00
Jean Chalard cf5cecccfe Merge "Refactoring" 2011-12-12 23:39:00 -08:00
Jean Chalard 024ee9ff02 Merge changes I7888797c,I57b2232f
* changes:
  Refactor + small bugfix
  Refactoring
2011-12-12 23:38:17 -08:00
Jean Chalard 2939063947 Simplification
Both tests have the same meaning. They should be merged.
Also, if "deleteLast()" deletes more than one char (which
never happens in the current implementation, but it's not
guaranteed), the new code is more correct.

Change-Id: I216df7cd45f4a7d76d1d5d6aa7f8d7f9a6e35ea3
2011-12-13 16:06:00 +09:00
Jean Chalard d2c69c7d12 Refactoring
If mHasUncommittedTypedChars is true, then
mWordSavedForAutoCorrectCancellation must always be null, and
spaceState must always be SPACE_STATE_NONE.
Hence, this change is supposed to be very no-op.

Change-Id: I2716f7372d996cc4dec40a4b7ac1ee7f5f4afe91
2011-12-13 16:04:11 +09:00
Jean Chalard 2245c3b5b3 Refactor + small bugfix
postUpdateShiftKeyState used to be called also when
mEnteredText is not null => this is a bugfix.
The rest does not change the logic, as posting a message can
be done anywhere within the function with no impact.

Change-Id: I7888797c0778702d64f96701e35b611a55a6a259
2011-12-13 15:59:36 +09:00
Jean Chalard a2a85d45e0 Refactoring
Change-Id: I57b2232f7fde32df5f6e1925aad1df988def34f9
2011-12-13 15:38:49 +09:00
Tadashi G. Takaoka dc52e7c646 Remove current keyboard id variable
Change-Id: Iec19af98209e1ea8ecd176d3be04d628d4b38950
2011-12-13 12:49:40 +09:00
Jean Chalard 34081186f9 Merge "Fix a bug where revert auto-correct would revert too much" 2011-12-12 04:46:27 -08:00
Jean Chalard 5c3ff4c9c8 Fix a bug where revert auto-correct would revert too much
If there are no uncommitted chars, we shouldn't enter any of
the tests that follow. We didn't use to, but a change today
made it possible - it should not happen.
There is no point in doing the rest of the tests, they are
sure to fail.

Change-Id: I580dd104aff3585de72a93b38989bfd9713f615b
2011-12-12 21:27:16 +09:00
Jean Chalard 4f41cbc588 Remove a useless function call
Change-Id: I1a775cbf90dca301e1e6b596ddac64fdbc023199
2011-12-12 20:51:43 +09:00
Jean Chalard dcf8a6b2c6 Merge "Move a settings var to the settings class" 2011-12-12 03:31:42 -08:00
Jean Chalard 2a659b8aa6 Remove a useless variable
This can be just read when it's needed.

Change-Id: I00753fe55645c244db5d4a96e7fdb8f5325475d9
2011-12-12 20:22:39 +09:00
Jean Chalard d567b230b0 Move a settings var to the settings class
Change-Id: I1331ad6dec3a9d64a77e314f8a1f4c29282df31b
2011-12-12 19:52:17 +09:00
Jean Chalard 7208af0ecd Remove a messy and unused class.
Today is a happy day

Change-Id: I3ef484bd258d5a59815bfcb0bd35ea3606b32430
2011-12-12 19:31:29 +09:00
Jean Chalard f162ed7ec8 Merge "Remove side-effects from TextEntryState" 2011-12-12 02:20:49 -08:00
Jean Chalard 406d192a9e Remove side-effects from TextEntryState
Change-Id: Ib98eea9e791e426435cfdfd0c9ab3ed9061664aa
2011-12-12 19:19:39 +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
Jean Chalard c2a76a1529 Remove a useless variable.
Change-Id: Iea5ce5cfc05bad8b1d9085438e90147bd54b7e9c
2011-12-12 16:49:32 +09:00
Jean Chalard 205f9ca310 Merge "Straighten out logic for revert word paths" 2011-12-11 23:48:06 -08:00
Jean Chalard 890d13189d Straighten out logic for revert word paths
This also includes a new memorized string with simpler
logic that will allow to remove other members

Change-Id: I0b97243084902e68fcb835b6163c86fef8190ebc
2011-12-12 16:41:49 +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 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
Jean Chalard 86344836ee Merge "Remove a duplicated variable." 2011-12-11 21:26:31 -08:00
Tadashi G. Takaoka 2ba1bcccdd Remove unused Keyboard.CODE_CANCEL
Change-Id: Ic2eab17e525901a1cf7096ebe7d24ae78624ed2e
2011-12-12 12:56:30 +09:00
Jean Chalard 3651220327 Remove a duplicated variable.
This is awesome cleanup.

Change-Id: I35ce8940a13f3084630dc26d6e7e397acfdaac36
2011-12-12 12:06:41 +09:00
Ken Wakasa 9260422423 Build God Mode keyboard with API level 14
Change-Id: I29ab9e9041c9faac91dc303175625221bfdb3af8
2011-12-10 03:45:40 +09:00
satok 4af5e3c5f4 Fix isResearcherPackage
Change-Id: I286450fe89a37d75cb398f17d300ddc6f5857ffd
2011-12-10 01:16:16 +09:00
Ken Wakasa 2edd109f84 Some tweaks for Researcher Mode
Change-Id: I6b16dd2fe6d7356c747ba0ee2da5976738003ded
2011-12-10 00:35:50 +09:00
satok 2a89e36db0 Merge "Add a functionality to attach a log file to Gmail app Bug: 5722703" 2011-12-09 05:59:36 -08:00
satok a8b6292cee Add a functionality to attach a log file to Gmail app
Bug: 5722703

Change-Id: I089f944bdbf2cbb036eb59dd9b5b414370c770f1
2011-12-09 22:38:15 +09:00
Tadashi G. Takaoka 963abf4bcc Merge "Remove unused public methods from KeyboardState and KeyboardSwitcher" 2011-12-09 04:38:14 -08:00
Jean Chalard 74671cf6c5 Resolve TODOs: add members to hold preferences
Change-Id: I34f6c76bf9318e1fbe8eb5ffab6772a98ff824e0
2011-12-09 21:24:13 +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
Jean Chalard 0fe3611bee Resolve TODOs: add some members to store prefs
Change-Id: Idf09cb5d801e8008eb63cbb5138058faeb7db136
2011-12-09 20:16:57 +09:00
Jean Chalard 85b063f97e Resolve TODOs: add members to store raw settings
Change-Id: I481eadb6a73faf239e24d05b7e220fcb01194fa4
2011-12-09 19:03:55 +09:00
Jean Chalard 12f10e1585 Read options in the declaration order
Change-Id: I1a7c4d0bcaedad6d4045c36c79280c23234db5b3
2011-12-09 18:58:24 +09:00
Jean Chalard c40b807ca4 Straighten out prefs reading code
Change-Id: Ibf9113a8ef07ac720100ee32d2e5ef321e8ddd98
2011-12-09 18:54:07 +09:00
Jean Chalard bab1f045f4 Straighten out members extracted from resources.
Change-Id: I9b9602ec5b379b44b0f0663d4f065dbcf88fd352
2011-12-09 18:19:30 +09:00
Jean Chalard 92e85c87a3 Merge "Match constant names to option names" 2011-12-09 01:14:14 -08:00
Jean Chalard f8a056c5c8 Merge "Reorder members in SettingsValues." 2011-12-09 01:14:02 -08:00
Jean Chalard ba93dda8ce Match constant names to option names
Change-Id: I7586fa342d7a39412d656890f7b525139c45ea4a
2011-12-09 17:58:51 +09:00
Jean Chalard 837b109f27 Reorder members in SettingsValues.
Reorder so that they match the order in the preference xml
file. Also add TODOs for missing raw variables.

Change-Id: I06332c131a624d6c359512d75c808f3f7313fa91
2011-12-09 17:56:31 +09:00
Tadashi G. Takaoka 1cc046775d Merge "KeyboardState keeps track of isAlphabetMode and isSymbolShifted" 2011-12-09 00:43:18 -08:00
Jean Chalard c207e0a7da Move settings variables to the settings class
Change-Id: Ifa7033a84b08ea626eb44cf6d04ba8e28c250bea
2011-12-09 16:47:31 +09:00
Jean Chalard 284c8a0449 Merge "Stop a flag from escaping." 2011-12-08 23:14:15 -08:00
Jean Chalard 0c3b8ce842 Merge "Move settings method from Utils to SettingsValues" 2011-12-08 23:09:33 -08: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
Jean Chalard 4606de117b Stop a flag from escaping.
The ultimate intent is to close it up in the settings, as it does not
change while typing, only when the keyboard is open again.

Change-Id: I12ff56e7482c1584877fe5531473bf03e95a60f6
2011-12-09 16:09:04 +09:00
Tadashi G. Takaoka 784181e29f Merge "Cleanup debug logging code" 2011-12-08 23:08:22 -08:00
Jean Chalard ed43296217 Move settings method from Utils to SettingsValues
Change-Id: I633378a41f63cd492b8c9345d550e07254df5e5a
2011-12-09 16:03:10 +09:00
Tadashi G. Takaoka a7af03baf4 Merge "Get rid of public KeyboardState.setShifted and setShiftLocked" 2011-12-08 23:02:47 -08:00
satok 4bae9d56d9 Merge "Show usability study mode for research purposes" 2011-12-08 22:40:58 -08:00
satok e0dfc54c5b Show usability study mode for research purposes
Bug: 5722703

Change-Id: I27acc374c5d4b52707708b83689dea5d78a573d7
2011-12-09 15:31:06 +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 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 92e5756dfb Merge "Cleanup" 2011-12-08 05:14:26 -08:00
Jean Chalard c1fdd966a7 Remove a useless method
Change-Id: Ib6a0ee21bfe2000231f9ba7bcad4b18ae57e4249
2011-12-08 21:47:26 +09:00
Jean Chalard 283b0c2b64 Cleanup
Here, shouldAutoCorrect implies mSettingsValues.mAutoCorrectEnabled

Change-Id: I9256718dd63b75252d1454e264db6814bbf18aa5
2011-12-08 21:37:15 +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
Jean Chalard 9e38f9a980 Merge "Use the system-wide interface to add a word." 2011-12-08 00:52:32 -08: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
Jean Chalard 361c42b746 Use the system-wide interface to add a word.
Bug: 5306641
Change-Id: Ic87e5bc3a5f1f03c57d48f2d92c28e0aba06847d
2011-12-07 16:19:05 +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
Alan Viverette 55c0198eee am c960695f: Updated keyboard to use SPEAK_PASSWORD preference.
* commit 'c960695f38ae0564dff3a6897fd1843c8e74c604':
  Updated keyboard to use SPEAK_PASSWORD preference.
2011-12-06 16:59:46 -08:00
Alan Viverette c960695f38 Updated keyboard to use SPEAK_PASSWORD preference.
Bug: 5678383
Change-Id: Ie9bdc92f4b2c9014159d672b71e4438f8fa34f55
2011-12-06 14:06:57 -08: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 0da3708540 Merge "Move KeyboardShiftState to KeyboardState" 2011-12-06 00:25:05 -08:00
Tadashi G. Takaoka c1859b8fd2 Move KeyboardShiftState to KeyboardState
Bug: 5708602
Change-Id: Idfe69978972bb674e0f360ef5e324739e2652d25
2011-12-06 17:04:12 +09:00
satok c9f8cb614e Merge "Refactor reflection member" 2011-12-05 23:38:37 -08:00
satok b95905669c Refactor reflection member
Change-Id: I112dbf851e10dae9e4291cf440f01b28d51180f4
2011-12-06 16:35:02 +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
satok a3cf232a2a am e5db3871: Fix a field value for the suggestion max size Bug: 5574747
* commit 'e5db3871b1269703e5ef360090fb35f50ae57ed4':
  Fix a field value for the suggestion max size Bug: 5574747
2011-12-05 07:54:59 -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
Jean Chalard f7fa231b7a Merge "Add support for Russian spell checking." 2011-12-05 02:30:29 -08:00
Jean Chalard bb2b30fc7f Add support for Russian spell checking.
Note that this is not enough: we still need to create a
reasonable proximity table for Cyrillic characters, or we
won't be able to show up suggestions.

Bug: 5701241
Change-Id: Idb141f7a230a6e1a46094308c26f43c01ab3b97a
2011-12-05 18:57:03 +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
satok e5db3871b1 Fix a field value for the suggestion max size
Bug: 5574747

This bug was introduced by I5e40edf6f790c078c4a05d

Change-Id: I5b0f51e1f5e8a12d786657167082bc604089505e
2011-12-05 12:53:45 +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 ae7746e580 Merge "Add Key.altCode attribute" 2011-11-30 03:15:44 -08: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
Jean Chalard db5aedb5a5 Add an option to use contacts or not while spell checking
Bug: 5447495
Change-Id: Iffb09895676c3dd1a79d1699b0eac865282508d4
2011-11-30 18:58:10 +09:00
Tadashi G. Takaoka e22baaadd3 Get rid of usage of key index
Change-Id: I7596ce3ae52fde436d06c2dd95ae873c7aa5ef7f
2011-11-29 19:07:54 +09:00
Jean Chalard 55042ff977 Merge "Resume suggestion when backspacing to the end of a word" 2011-11-29 01:15:42 -08:00
Tadashi G. Takaoka b230806f44 Merge "Save keyboard layout only when it is shown" 2011-11-29 00:53:38 -08:00
Jean Chalard 6b1f500da4 Resume suggestion when backspacing to the end of a word
Bug: 5515381
Change-Id: I26fea896feaf2e9716c7ae3d4f2630360f23ac50
2011-11-29 17:50:36 +09:00
Jean Chalard 117fc18ed4 Keep count of the trailing single quotes for suggestions
Bug: 5665809
Change-Id: I4d9100dbe980861ccb55c78464524be670cac1f7
2011-11-29 15:16:28 +09:00
Tadashi G. Takaoka f2c9a88887 Save keyboard layout only when it is shown
Bug: 5130446
Change-Id: I150b4a053036eae050099155169325f0d1f7dfed
2011-11-29 14:12:49 +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 adb89c109e Merge "Move ignore special key code out from LatinIME to PointerTracker" 2011-11-22 17:57:59 -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
Svetoslav Ganov 3b82e8163c Merge "Fixed typing uppercase letters when touch exploration is enabled." 2011-11-22 14:57:59 -08:00
Jean Chalard 6d1cbbc2ff Fix a bug with single quotes
I14dd3815 special-cased single quotes at the start of a word, but
did not do so correctly - it would kill a composing word if entered
just after some punctuations.
The right test was not isCursorTouchingWord() but
mHasUncommittedTypedChars, which actually makes for a simpler
implementation.

Bug: 5648032
Change-Id: Icd21d213e0cad6da68cacfeb921502cd8dcfac95
2011-11-22 18:29:51 +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
Alan Viverette e87fd4d282 Fixed typing uppercase letters when touch exploration is enabled.
Bug: 5652774
Change-Id: Id8cd37b3ff93b45f4f18198bbbb827aadf945b02
2011-11-21 17:56: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
Jean Chalard 19cbdfc92f Merge "Remove an unused (and scary) method" 2011-11-21 00:57:45 -08:00
Jean Chalard ce86e39e00 Merge "Cleanup." 2011-11-21 00:53:49 -08:00
Jean Chalard 5d5028f2c5 Remove an unused (and scary) method
Change-Id: I14a545a3e4955a25fde17554156552c755d44e2f
2011-11-21 17:45:32 +09:00
Jean Chalard 6ecd1e1280 Merge "Special case quotes at start and end of words" 2011-11-21 00:21:09 -08:00
Jean Chalard c83359f974 Special case quotes at start and end of words
Single quote at start of word is not considered a part of a
word any more.
Single quote at the end of a word now behave like capitalization:
lookup in the dictionary is done *disregarding* a final quote,
and it is forcefully added back into the suggestions afterwards.

Bug: 5566368
Change-Id: I14dd3815f4b743edba56d64a3abdf4b73d863a6a
2011-11-21 16:34:39 +09:00
Tadashi G. Takaoka f3dfa55029 Merge "Introduce noKeyPreview Key attribute" 2011-11-18 16:28:54 -08:00
Tadashi G. Takaoka e00ede531f am 5619d765: Shift/Symbol/Smiley will not disable settings/microphone keys
* commit '5619d7658459d13723b6d7ad8969b249adf9e717':
  Shift/Symbol/Smiley will not disable settings/microphone keys
2011-11-18 15:23:14 -08:00
Tadashi G. Takaoka 5dc318a3f2 am 10dff768: Fix NPE introduced by I38b21d49
* commit '10dff76856a98b6eec86a53d3d07fdc9708037b7':
  Fix NPE introduced by I38b21d49
2011-11-18 14:48:05 -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 49cc3beb75 resolved conflicts for merge of 137667ed to master
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
Tadashi G. Takaoka 5619d76584 Shift/Symbol/Smiley will not disable settings/microphone keys
Bug: 5560766
Change-Id: Ic2dbb835e87a7debb222093756816e683b464b83
2011-11-17 23:32:19 -08:00
Jean Chalard 88562bec54 Cleanup.
Fix a typo, and move a cursor.close() in a finally{} clause

Change-Id: Iac011ebb80b9430774c7dc5cd94728d05cef443f
2011-11-18 15:24:49 +09:00
Tadashi G. Takaoka 10dff76856 Fix NPE introduced by I38b21d49
Bug: 5560766
Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3
2011-11-17 21:46:24 -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 137667ed3d Merge "Ignore microphone and settings key while typing" into ics-mr1 2011-11-17 18:01:43 -08:00
Tadashi G. Takaoka 175acb8205 Ignore microphone and settings key while typing
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -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 60acfdf4a8 Skip loading keyboard when SoftInputWindow hasn't shown yet. (DO NOT MERGE)
This is cherry-pick of I003101b2 from Master for Bug: 5541192
Bug: 5636367

Change-Id: I560126d17be6a770b19c1f1347332ebdfde5d671
2011-11-17 14:30:54 -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 eb520c5683 am 549e295d: Fix updateFullscreenMode of LatinIME
* commit '549e295dc113bff50077c3c355dcd94af09a1b2f':
  Fix updateFullscreenMode of LatinIME
2011-11-15 18:25:21 -08:00
Tadashi G. Takaoka 549e295dc1 Fix updateFullscreenMode of LatinIME
Bug: 5597608
Change-Id: If4b18dc933493bd74bc5506c028af86b0450df1f
2011-11-15 15:15:11 -08:00
Ken Wakasa ed631627cb Double space conversion should be enabled only when the 1st space is "weak".
bug: 5608934
Change-Id: Ide7ca9d526620c4f225a6f5eb27dcd7df5b504bd
2011-11-15 12:35:22 +09:00
Jean Chalard 85170a9c17 Merge "Be stricter for ruling characters out of spell checking" 2011-11-10 15:51:45 -08:00
Jean Chalard 72479ea363 Be stricter for ruling characters out of spell checking
Bug: 5548308
Change-Id: Ie8025b02424b72b69a07907cde1093830c2d4d3d
2011-11-10 12:57:09 +09:00
Jean Chalard a409f009fa Fill in the HAS_RECOMMENDED_SUGGESTIONS flag.
Bug: 5530727
Change-Id: Ic53e227f72096053e08d90204bf1f287ec09290b
2011-11-10 02:52:46 +09:00
Tadashi G. Takaoka 0e39e820ce Merge "Fix referring wrong TypedArray (DO NOT MERGE)" into ics-mr1 2011-11-07 19:14:21 -08:00
Ken Wakasa cea3c5bc17 am 0a75373f: Merge "Fix a bug where the UserDictionary may not be released" into ics-mr1
* commit '0a75373f4187d2db036757c2c2bcaba42301fd22':
  Fix a bug where the UserDictionary may not be released
2011-11-07 23:04:05 +00:00
Jean Chalard 8b9c89aee2 Fix a bug where the UserDictionary may not be released
Bug: 5547357
Change-Id: I521afeaa349c86fb0087cedb70127de6acebec78
2011-11-07 14:31:59 +09: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 1e39565bb4 Skip loading keyboard when SoftInputWindow hasn't shown yet.
Bug: 5541192
Change-Id: I003101b2a3fdeb5bb554d249634ec5ab50aea09e
2011-11-04 15:01:58 +09:00
Tadashi G. Takaoka b8291fb46b Merge "Do not clip the popup key preview even if there is no left/right preview icons" 2011-11-03 20:19:58 -07: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
Jean Chalard 2c77216e22 Remove trailing spaces when appropriate
Bug: 5509651
Change-Id: I99cfb5a6fc2873e2c11ed16967cd82a7f504a263
2011-11-02 19:44:26 +09:00
Tadashi G. Takaoka 824876ebbb Merge "Fix JNI as 64bit ready" 2011-10-31 05:49:39 -07:00
satok cbd8ece513 am 352b9310: Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1
* commit '352b93104afa73fd53a04c4414bf382fcf477f04':
  Use reflection to get field values of SuggestionSpan
2011-10-31 12:26:22 +00:00
Tadashi G. Takaoka 5fdcd7d5cd Fix JNI as 64bit ready
Change-Id: I7a3ed2cee3b20744869aa5cf89ff9fd95f5ab8fe
2011-10-31 20:44:01 +09:00
satok 352b93104a Merge "Use reflection to get field values of SuggestionSpan" into ics-mr1 2011-10-28 18:26:11 -07: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
Svetoslav Ganov f2c57551a7 Merge "Removed lift-to-type from LatinIME accessibility." into ics-mr1 2011-10-28 11:13:15 -07:00
satok 68ef7b77ed Use reflection to get field values of SuggestionSpan
Bug: 5440299
Change-Id: I5e40edf6f790c078c4a05d0d347a89d63f7c042a
2011-10-28 19:03:49 +09:00
Tadashi G. Takaoka 6f811bd13f Merge "Make some private method static" 2011-10-27 22:57:58 -07:00
Tadashi G. Takaoka 8fbf29e2d5 Make some private method static
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
Tadashi G. Takaoka 3122cf8daa am 07a44557: Merge "Cancel pending rotation when another rotation start" into ics-mr1
* commit '07a445572f7fa21c0e24f5cdb0f0b88ff2adc672':
  Cancel pending rotation when another rotation start
2011-10-27 22:59:14 +00:00
Ken Wakasa 644d33d60e Display "Touch again to save" in the keyboard locale
bug: 524239
Change-Id: I227c193ba149f9296f8b1cf40aa3d9cf4e6ae2ab
2011-10-28 00:33:15 +09:00
Tadashi G. Takaoka dd25e4fa2c Cancel pending rotation when another rotation start
Bug: 5516802
Change-Id: Iccb0abeb94e6dc1322a98a0c744188bb74034c7f
2011-10-27 17:03:03 +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 a7c419964f Merge "Preventing infinite call of dismissMoreKeysPanel" into ics-mr1 2011-10-26 17:27:35 -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 e648e83939 Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel" 2011-10-26 07:29:25 -07:00
Ken Wakasa 44f4d77b75 am cb8cb95d: Fix NPE
* commit 'cb8cb95d0afd340de9f1a0e15948f0068d2450bc':
  Fix NPE
2011-10-26 14:25:28 +00:00
Tadashi G. Takaoka e51d164482 Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
Change-Id: Idbcd6e3047c6c0c407e3b347cf9f65951d43a312
2011-10-26 20:54:35 +09:00
Jean Chalard 120586c226 Group special spaces and double/swapped spaces in undo mode
This introduces an elementary undo facility that accounts
for magic space, strong space, double space and its cancelling,
and swapped punctuation and its cancelling.
The former three were existing behavior ; this change adds
the swapped punctuation cancelling behavior.

Bug: 5454442
Change-Id: I87af633f30caa2788e9af725e556a7f0746d9a14
2011-10-26 19:12:55 +09:00
Jean Chalard dec6c0f929 DO NOT MERGE: Fix a bug where the sequence numbers would be wrong
The spell checker cannot afford to return static objects,
seeing as the framework will then use the same objects to
pair the cookie and sequence ids to the request.
This is a backport of Ia9c3a933

Bug: 5503243
Change-Id: Ia9c3a933bfb30cf5525418b240ef60632d72c9d0
2011-10-26 17:57:00 +09:00
Tadashi G. Takaoka 0cf7a45ac5 Preventing infinite call of dismissMoreKeysPanel
Bug: 5514583

Change-Id: Idf8dd1ebba0afdb768e538c2626b60770421d4be
2011-10-26 17:03:41 +09:00
Ken Wakasa cb8cb95d0a Fix NPE
bug: 5512097
Change-Id: Id6752c95c9c4b39e7975daa187a2ab92b740060a
2011-10-26 02:35:44 +09:00
Jean Chalard d0c5f9395a Cleanup.
Remove a state that can never be reached, and ajust all the
callers that would always have received false.

Change-Id: Iac025568be11743428419e0772da306a4f0a0bf1
2011-10-25 21:57:30 +09:00
Jean Chalard ce668e7a0b Small clean up.
Remove unused methods and constants.

Change-Id: If72e04394a2943b416915217d22cb6e58a0508b3
2011-10-25 21:35:43 +09:00
Jean Chalard 126698fdd2 Add a strong space behavior.
Bug: 5454442
Change-Id: Ic095cb65dd7b4427617cd74fc7c53a9666b218c4
2011-10-25 18:40:14 +09:00
Jean Chalard c47c2dc65a Merge "Fix a cosmetic bug where text would blink on space swap" 2011-10-25 02:14:28 -07:00
Jean Chalard b715299125 Fix a cosmetic bug where text would blink on space swap
On space swap or space removal in some occasions there would be
a small blink on the screen. This change fixes that.

Change-Id: I486cbcc5dfcafd531b3fa92c4f9a3255832f22cc
2011-10-25 18:02:23 +09:00
Jean Chalard cd43edbc32 Small clean up
Remove an unused method and constant

Change-Id: I3e99ea9fc182c83399d46aca81d1b69aab2c36d1
2011-10-25 17:12:51 +09:00
Jean Chalard cba1af9c56 Fix a bug where the sequence numbers would be wrong
The spell checker cannot afford to return static objects,
seeing as the framework will then use the same objects to
pair the cookie and sequence ids to the request.

Bug: 5503243
Change-Id: Ia9c3a933bfb30cf5525418b240ef60632d72c9d0
2011-10-24 22:40:41 +09:00
Jean Chalard ee89b40a92 Merge "Use the contacts dictionary in the spell checker." 2011-10-24 03:48:34 -07:00
Jean Chalard 2e3c6da868 Use the contacts dictionary in the spell checker.
Bug: 5447495
Change-Id: I7292eb291a1630265884cc8e505a2e83a74f0c72
2011-10-24 19:44:01 +09:00
Tadashi G. Takaoka b2b1eb5ca5 Call updateFulscreenMode before calling isFullscreenMode
Bug: 5495739
Change-Id: I25eab59833a8b95a0b75893d37a45e67504fa7d0
2011-10-24 15:30:49 +09:00
Jean Chalard 26a531c6fe Rename a flag
...and insert some explaining commands

Change-Id: Iff6511e71d66abfaea9f6c21c47f74fa0a67ad78
2011-10-21 19:59:46 +09:00
Tadashi G. Takaoka 49426a1ea9 Fix potential NPE
Bug: 5462524
Change-Id: I76012d1bbcd83d58f034c2f588802e4d1b7edc4d
2011-10-20 20:31:17 +09:00
Tadashi G. Takaoka 9f058749f2 am 61aebb0a: Merge "Update suggestions strip divider" into ics-mr0
* commit '61aebb0a1e3d12cd5287c9be3c2e37df565af888':
  Update suggestions strip divider
2011-10-19 18:11:20 -07:00
Tadashi G. Takaoka 61aebb0a1e Merge "Update suggestions strip divider" into ics-mr0 2011-10-19 18:09:17 -07:00
Tadashi G. Takaoka 78674d0ff7 Add warning log for unexpected inputType (DO NOT MERGE)
This is a cherry-pick of I3484c751 from Master.

Bug: 5130446
Change-Id: I140980bf093fb3310496c8021166d16f0ddc362f
2011-10-19 18:52:07 +09:00
Tadashi G. Takaoka 2c47080e7b Update suggestions strip divider
Bug: 5142447
Change-Id: I275a304e46456e3b80968fb5de330a3b04bd2035
2011-10-19 16:54:37 +09:00
Tadashi G. Takaoka 82c8c2e6c0 Add warning log for unexpected inputType
Bug: 5130446
Change-Id: I3484c75144ba68db0734a4d38186d2eafd1b1879
2011-10-19 16:53:07 +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 bf7d8ecb48 Merge "Close XmlResourceParser when finish parsing" 2011-10-17 19:11:12 -07:00
satok c5d51a40a4 am fe2d9079: Fix a bug that the typed word with the blue underline indicator will be duplicated
* commit 'fe2d90798ea409ee39d6f63942eb01bb7eed98e3':
  Fix a bug that the typed word with the blue underline indicator will be duplicated
2011-10-17 11:32:24 -07:00
Tadashi G. Takaoka ddd759aa9e Close XmlResourceParser when finish parsing
Change-Id: If21ee187c83f044b235d88fba15af00e6ac8a308
2011-10-18 02:44:55 +09:00
satok fe2d90798e Fix a bug that the typed word with the blue underline indicator will be duplicated
Bug: 5466373

Change-Id: I0300c34cb6076b12ecb89cb29bea95288559108f
2011-10-17 13:25:22 +09:00
Tadashi G. Takaoka d2bc850c4c am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0
* commit '908a2f63949687c9e7acb2e3d50fd50815582e8b':
  Special handling of one key mini-keyboard to mitigate visual flicker
2011-10-14 12:21:17 -07:00
Tadashi G. Takaoka 75c4b5fe1b am 5ad37baf: Merge "Release bitmap buffer when KeyboardView is detached from Window" into ics-mr0
* commit '5ad37baf1e09416b197da76881a30e79ac2032c7':
  Release bitmap buffer when KeyboardView is detached from Window
2011-10-14 12:21:17 -07: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 5ad37baf1e Merge "Release bitmap buffer when KeyboardView is detached from Window" into ics-mr0 2011-10-14 12:19:49 -07:00
satok c1981eb83b am 59a55fcb: Merge "Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span" into ics-mr0
* commit '59a55fcbec6e9f2b856c3876e51da6191fd2774e':
  Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span
2011-10-14 11:16:59 -07:00
satok 59a55fcbec Merge "Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span" into ics-mr0 2011-10-14 11:15:14 -07:00
satok 53af4ae634 Set SuggestionSpan with FLAG_AUTO_CORRECTION as a composing span
Bug: 5460262
Change-Id: Ibeb875bb885fb663ed23f0299d671e995a66b642
2011-10-15 02:02:41 +09: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 6262fa5307 am ed6bc82d: Merge "Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"" into ics-mr0
* commit 'ed6bc82d9785372c407e1a4f563ae7d30c479b8a':
  Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
2011-10-13 22:09:08 -07:00
Tadashi G. Takaoka d874ac581e Revert "Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced"
This reverts commit b1bc5fd896. (If3a73179)
Bug: 5410786
2011-10-14 12:15:24 +09:00
satok 22c2a23cda am 605a6fea: Merge "Fix the safety net Bug: 5453150" into ics-mr0
* commit '605a6fea750c4acc96a5136ecaf7162e0a858b9f':
  Fix the safety net Bug: 5453150
2011-10-12 23:46:25 -07:00
satok 605a6fea75 Merge "Fix the safety net Bug: 5453150" into ics-mr0 2011-10-12 23:44:54 -07:00
satok 2aa1dd45c4 Fix the safety net
Bug: 5453150

Change-Id: I5990feb2622738988bf29843c6bcdb9cbf8bbf33
2011-10-13 15:16:59 +09:00
Tadashi G. Takaoka 283d35cb6c am 62fb8a48: Merge "Take invisible extractArea height into account" into ics-mr0
* commit '62fb8a480df325ebc6b2a4dc023a944e3cd0bcef':
  Take invisible extractArea height into account
2011-10-12 12:00:44 -07:00
Tadashi G. Takaoka 62fb8a480d Merge "Take invisible extractArea height into account" into ics-mr0 2011-10-12 11:02:05 -07:00
satok e596fe2702 am ef0a7b75: Merge "Suppress flickers of the auto correction indicator" into ics-mr0
* commit 'ef0a7b75462c75b756caa09d9dd356309968abf3':
  Suppress flickers of the auto correction indicator
2011-10-12 10:10:41 -07:00
satok 604d80c671 Suppress flickers of the auto correction indicator
Bug: 5440788
Change-Id: I7832b449ee777dbd87388a02cebdfee0ce350fbd
2011-10-12 19:14:13 +09:00
Tadashi G. Takaoka d44647e76f Take invisible extractArea height into account
Bug: 5410786
Change-Id: I97ce2d72f86ce62b37d408103863af66f91e7107
2011-10-12 19:13:28 +09:00
satok a86869711e Merge "Add a settings to change the sound effect volume" 2011-10-11 06:29:11 -07:00
satok 79c0acf519 Add a settings to change the sound effect volume
Bug: 5345401
Bug: 5402541
Change-Id: I1e653573a3362160104b77388d6cbd1700424649
2011-10-11 22:25:13 +09:00
Tadashi G. Takaoka 8d4be2516a Merge "Fix haptic and audio feedback of caps-lock mode changing" 2011-10-11 00:38:17 -07: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 ed2b6c714b Remove unused import
Change-Id: I31115c29e47cdd09b2d8cc8f04e9fc9f9d542811
2011-10-11 12:53:36 +09:00
satok 602bcecf6b Merge "Put SuggestionSpan as the indicater of the auto-correction" 2011-10-10 02:58:22 -07:00
satok ec780e2868 Put SuggestionSpan as the indicater of the auto-correction
Bug: 5245468

Change-Id: Ia5609e1b3c69f5553e3632fbce60a55665a5b185
2011-10-10 18:44:52 +09:00
Svetoslav Ganov 7c2d7ad634 Merge "Let accessibility users know to connect a headset when the IME connects to a password field." 2011-10-07 15:36:04 -07:00
Jean Chalard fee149abe0 Use the whitelist as a dictionary in the spell checker.
Bug: 5402436
Change-Id: If89b8bbdebf6751697c4788270d01d4639cff665
2011-10-07 19:25:36 +09:00
Jean Chalard 266ae6964d Merge "Fix a bug with the whitelist" 2011-10-07 02:50:11 -07:00
Jean Chalard 5f41b705fc Fix a bug with the whitelist
This bug would kill the case where the whitelist contains
a word to be autocorrected to an uppercased version of
itself, and the user would enter the uppercase version.
In this case, this bug would cause the typed word to be
killed off the list of candidates, and possibly autocorrected
to the *next* candidate.

When the whitelist checks whether this the typed word is
a candidate for whitelisting, this change has it check whether
the whitelisting results in the typed word before returning.
Hence, it can keep the case-insensitive behavior of the
whitelist.

Coincidentally, this change renames the method used to do
this, because it does not comply with the general contract
of Dictionary. This happens to be in the way of another
upcoming change.

Bug: 5420371
Change-Id: Ifb305271acc5f171adf9b18c762ae7975b14be0a
2011-10-07 18:40:23 +09:00
Tadashi G. Takaoka beac24226b Merge "Add haptic feedback for caps lock" 2011-10-07 02:21:15 -07:00
Jean Chalard af0f13d15c Add pretty-printing to SuggestedWords.Builder to help debug
Change-Id: I2f40ca40f2b452078d0f24cef72e0182e10e2269
2011-10-07 14:35:18 +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 ce9e4f926b Merge "Use XmlPullParser interface instead of XmlResourceParser" 2011-10-06 18:10:19 -07:00
Alan Viverette b0c8db018d Let accessibility users know to connect a headset when the IME connects to a password field.
Change-Id: If96cd7626950dd12e88a8a97f5e405d303d41e06
2011-10-06 11:02:29 -07:00
Jean Chalard 3d36cdcd2d Merge "Fix possible NPE in debug mode" 2011-10-06 03:44:24 -07:00
Jean Chalard 51075d145a Fix possible NPE in debug mode
Change-Id: I55776110a489621c99e9a3bf58daa6fcaf415cb3
2011-10-06 19:36:40 +09:00
Jean Chalard c53661f152 Fix a possible OutOfBoundsException
Change-Id: I6eb13c228738119c78496a96acaedbccefd83cd3
2011-10-06 19:05:23 +09:00
Tadashi G. Takaoka 406a54f41c Use XmlPullParser interface instead of XmlResourceParser
Change-Id: I00e8a82aaaf5fec1e27707bce0a82cbfd1bc9fae
2011-10-06 18:40:32 +09:00
Jean Chalard 3458d61807 Make the whitelist an instanciable class.
This goes together with I6b8628b9acc32449e4147a2a754b222fbb76c754
or it will break the build

Bug: 5402436
Change-Id: I07c6266b713773a8de80bb22afdd4c566261f78a
2011-10-06 16:05:21 +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 a25dd3b5c3 Merge "Pass the touch position correction flag from KeyboardSwitcher." 2011-10-03 04:42:53 -07:00
Yusuke Nojima 294e1b4a5a Pass the touch position correction flag from KeyboardSwitcher.
Change-Id: Ia242a9fa2fa71f7fdf8f974071a2df7acc4aa51f
2011-10-03 20:41:03 +09:00
Jean Chalard 45f45a4fdb Cleanup : remove recorrection-related stuff.
This removes UPDATE_OLD_SUGGESTIONS, and the associated settings.

Bug: 5402537
Change-Id: Ie87d4e05c54e4b7d2dd5a05f2d0b570e9cd3e463
2011-10-03 18:23:23 +09:00
Jean Chalard fe5364c825 Cleanup : remove old recorrection code
This removes the calls, but another change will be needed to remove
the messages LatinIME used to send itself to update the suggestion
strip.

Bug: 5402537
Change-Id: I5d1aa63a892516f339f3ceac21f43771b5ffda34
2011-10-03 17:45:45 +09:00
Jean Chalard 6b64a0fedc Merge "Fix a bug where moving the cursor would not reset selection" 2011-10-03 01:32:30 -07:00
Jean Chalard cd95a36558 Fix a bug where moving the cursor would not reset selection
This change updates suggestions when the cursor is moved.
It is now reasonable to remove the explicit test for
TextEntryState.isAcceptedDefault because it is now shielded
by mExpectingUpdateSelection : actually, this probably fixes
a long-standing bug.

Bug: 5337309
Change-Id: Iee4046420c6a88d1a07d428230f93c3ebef25c39
2011-10-03 17:18:29 +09:00
Satoshi Kataoka 21ffb08a73 Merge "Fix obtainStyledAttribute not to look for default" 2011-10-03 00:50:21 -07: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
Jean Chalard 397f6f8299 Merge "Small refactoring" 2011-10-02 23:12:41 -07:00
Jean Chalard 4c0fe57198 Small refactoring
Change-Id: Ifc33e109562abb3dd720ad4fed76add8ab1a64aa
2011-10-03 14:58:34 +09:00
satok 904baab25a Remove code related to AutoText
Bug: 5245751

Change-Id: Ic02f951e8e1dbde9d8964d2c16e4928fb374ca41
2011-10-03 14:38:44 +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 aef4f906ff Merge "Move themeId and touch correction data to Keyboard style" 2011-09-30 20:02:19 -07: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
satok 62c7e25e11 Move SharedPreferencesCompat to com.android.inputmethod.compat
Change-Id: Ied336339b8eb3643f14517c251b07c09398f61fe
2011-09-30 20:17:32 +09:00
satok ba76e6ff27 Show the duration of vibration in settings
bug: 5345401

Change-Id: I666d48d8ddf6c14540eb401129c20ce93972d9cf
2011-09-30 20:09:04 +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
Jean Chalard 646a66159a Merge "Make use of the FULL_EDIT_DISTANCE flag." 2011-09-30 00:41:14 -07:00
Jean Chalard 673cebf9e9 Make use of the FULL_EDIT_DISTANCE flag.
In effect, this stops the spell checker from suggesting overly
long words.
More precisely, it takes advantage of the new facility that
takes into account the whole length of the dictionary word when
computing scores, so words much longer than the input word will
see their score demoted accordingly.

Bug: 5384578
Change-Id: I326cd7c87c3080e7fa8729f78517f8ba13672a9b
2011-09-30 16:00:07 +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
satok db096d681f Merge "Add a flag to demote completed suggestions" 2011-09-29 03:58:27 -07:00
satok 40a5f6fa4d Add a flag to demote completed suggestions
Bug: 5390063
Change-Id: I0ef4fbcc705539624269fd2f8c4e782679fc44b3
2011-09-29 19:48:18 +09:00
Jean Chalard 3ff95b7290 Merge "Add a threshold for suggestion score." 2011-09-29 01:47:50 -07:00
Yusuke Nojima 43149e454c Merge "Pass the touch position correction data to native." 2011-09-29 01:42:54 -07:00
Jean Chalard 4609c02f9e Add a threshold for suggestion score.
Bug: 5384578

Change-Id: Ic0b0203d873492a41c72defef835adf36f010f47
2011-09-29 17:38:08 +09:00
Yusuke Nojima ad35835bac Pass the touch position correction data to native.
Change-Id: I92958779377a530410d1682100f9d0a2ba267dea
2011-09-29 17:00:49 +09:00
satok 4866758a98 Merge "Update suggestions when user presses the backspace even when there is not two or more suggestions" 2011-09-29 00:19:17 -07:00
satok 074cda4d26 Update suggestions when user presses the backspace even when there is not two or more suggestions
Bug: 5384445
Change-Id: I419999da8f5745ac114d0173beeadcb365a8c3ac
2011-09-29 16:12:11 +09:00
Tadashi G. Takaoka 2087cf508a Merge "Handle back key and outside touch correctly in more suggestions window" 2011-09-28 23:41:55 -07:00
Tadashi G. Takaoka bfc1d732ac Handle back key and outside touch correctly in more suggestions window
Bug: 5385284
Change-Id: Ic0517182d294c79e37c88f1ef30cb4d2917b2800
2011-09-29 15:07:15 +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
Jean Chalard 85782abaf1 Move some arguments to final members.
This is preparation for
Bug: 5384578

Change-Id: I7d493c441f375fa5f23c5e3cfa8134e2ce7775fe
2011-09-29 13:11:09 +09:00
satok 433965784d add vibration duration settings
Change-Id: I56a1a94df63160f367f866da759d7dd4fc428ed5
2011-09-29 11:46:20 +09:00
Jean Chalard 90086846dc Merge "Change the logic of the LOOKS_LIKE_TYPO flag" 2011-09-28 03:59:26 -07:00
Jean Chalard 647db70fec Change the logic of the LOOKS_LIKE_TYPO flag
It now follows the following logic:
- If the word should be filtered out => false
- Else => !IN_THE_DICTIONARY

This defines the behavior for ICS MR0, and prepares for addition
of a new HAS_LIKELY_SUGGESTIONS flag in MR1.

Bug: 5383800

Change-Id: I530b1404ae8cf3337ff68ef5ab0f4d95f2dad0e8
2011-09-28 19:42:43 +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 ffd156c77e Postpone onDisplayCompletions until onStartInputView has been executed
Bug: 5108267
Change-Id: I42d297ce4e4913e5dab5f5d647b1d13dc860b884
2011-09-28 09:36:40 +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
Jean Chalard b95f454018 Merge "Fix a possible deadlock." 2011-09-26 02:30:21 -07:00
Jean Chalard a9876980c8 Fix a possible deadlock.
Bug: 5359873
Change-Id: I80ae901c43b6ae59879e3c8b1a9dd8a937d558c1
2011-09-26 18:16:24 +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
Ken Wakasa c9f562a9a4 Partially revert I0fa5eefc
bug: 5344295
Change-Id: Idb10e37862773a62ff60afe874844e8968a58b5d
2011-09-24 09:38:45 +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
Gilles Debunne 8d6fd877c5 am b1bc5fd8: Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced
* commit 'b1bc5fd896329a39ad51a8c79e2970750c814ea0':
  Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced
2011-09-21 18:57:03 -07:00
Gilles Debunne b1bc5fd896 Bug 5352720: IME_FLAG_NO_EXTRACT_UI is not enforced
CL https://android-git.corp.google.com/g/#/c/136474 refactored
the fullscreen test, but ithe IME_FLAG_NO_EXTRACT_UI test was
lost in the process.

Note that there is still a problem (orthogonal to that change
with key_preview_backing, which appears opaque and black sometimes.

I'll re-open 5315001.

Change-Id: If3a73179d21eaca10bdc948db7bac4b4f7a88d34
2011-09-21 16:14:30 -07:00
Tadashi G. Takaoka 68c7b9b195 Merge "Remove "autoCorrectInvert" feature from SuggestionsView" 2011-09-20 23:28:31 -07:00
Tadashi G. Takaoka 92a83e74ec Merge "Fix key preview backing view height" 2011-09-20 23:24:43 -07:00
Tadashi G. Takaoka 77a87e3cb5 Remove "autoCorrectInvert" feature from SuggestionsView
Bug: 5162005
Change-Id: Iec679f5f05f28cd7e8013d7350ea03372f1cd7b2
2011-09-21 15:06:51 +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 f5fe245df0 Fix key preview backing view height
Bug: 5344344
Change-Id: Ied0cda2c4b822b391ece54a6880fae8e349cc0bc
2011-09-21 11:22:05 +09:00
Tadashi G. Takaoka 3fc4ddec68 Sliding suggestions strip starts showing more suggestions
Bug: 5301019
Change-Id: I87daa9e472f9e93a6da9de754376b7fa4740171a
2011-09-21 10:42:50 +09:00
Ken Wakasa 37af28dd23 Enable vibrate on keypress by default
bug: 5337363
Change-Id: I14c95d27dd236d0a43e64a46ae6fbf9f2a97a3da
2011-09-20 20:31:03 +09:00
Ken Wakasa 34a9831811 Merge "Tweak LatinIME's keypress volume" 2011-09-20 04:07:38 -07:00
Tadashi G. Takaoka 95dba8a82c Merge "The back button key event is delivered correctly" 2011-09-20 04:00:44 -07:00
Ken Wakasa f58293f6eb Tweak LatinIME's keypress volume
bug: 5337902
Change-Id: I7f864f158d110aa3e755961303799882f59b7e4c
2011-09-20 20:00:43 +09:00
Tadashi G. Takaoka d7b00f3490 The back button key event is delivered correctly
Bug: 5275063
Change-Id: I439ce18665e40dc8b2e40e923e5cabfcae7c81cf
2011-09-20 19:51:03 +09:00
Tadashi G. Takaoka 6d8d25ee5a (DO NOT MERGE) Update fullscreen mode also at onStartInputView
This is a cherry-pick cheof I190a71f7 from Master.

Bug: 5315001
Change-Id: I76c756eeecf21eec4c88dd4558d5c50f10ff3d3c
2011-09-20 16:59:00 +09:00
Tadashi G. Takaoka 3ea503c851 Merge "Update fullscreen mode also at onStartInputView" 2011-09-20 00:47:00 -07:00
Tadashi G. Takaoka 59010a89b8 Update fullscreen mode also at onStartInputView
This change also separates controlling visibility of "key preview
backing view" from suggestions strip visibility.

Bug: 5315001
Change-Id: I190a71f7956c804e5d89d2d5bacecc62d565ac2c
2011-09-20 16:38:24 +09:00
Jean Chalard d2547c6888 Merge "Have the spell checker report IN_DICT correctly" 2011-09-19 23:19:47 -07:00
Ken Wakasa 8efe9bb15a Merge "Tweak LatinIME's keypress vibration duration" 2011-09-19 19:29:09 -07:00
Ken Wakasa 28f36d68af Tweak LatinIME's keypress vibration duration
bug: 5337363
Change-Id: If6e6de587cbcddf26710d8f0b237c4bc393589b6
2011-09-20 11:23:30 +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
Jean Chalard e897e4d342 Have the spell checker report IN_DICT correctly
...even if the word is filtered out.
This also contains minor refactoring.

Bug: 5329658
Change-Id: I397a2a74f819a51df3bd07c6b94e8d29244389c4
2011-09-16 18:26:02 +09:00
Ken Wakasa 60e4997eab Merge "Use the correct theme on ICS" 2011-09-16 01:08:56 -07:00
Tadashi G. Takaoka dc7974d54c Merge "Draw more suggestions hint using text font" 2011-09-16 01:07:17 -07:00
Tadashi G. Takaoka 0967ef4036 Draw more suggestions hint using text font
Bug: 5287964
Change-Id: I692b5303268c7b5115853177c956e147312c582d
2011-09-16 16:47:58 +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 ba0e30f212 (DO NOT MERGE) Fix checking capitalized word code
This is a follow up change of If6c0edef.
This is a cherry-pick of Idb415f53 from Master.

Bug: 5328922
Change-Id: I36d8bda9fb95e4809598296226c598a9f08bd8bb
2011-09-16 12:40:09 +09:00
Tadashi G. Takaoka 436a645ea8 Fix checking capitalized word code
This is a follow up change of If6c0edef.

Bug: 5328922
Change-Id: Idb415f53f3fea6660c7802577d08b4d89d4e7842
2011-09-16 12:28:13 +09:00
Tadashi G. Takaoka 5b0c124ca8 Remove Key.isStick, use backgroundType="stick" instead
Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8
2011-09-15 18:33:01 +09:00
Jean Chalard 97ec205504 Merge "Add an option to user dict to match more precise locales" 2011-09-15 02:28:20 -07:00
Jean Chalard cfed273922 Add an option to user dict to match more precise locales
This should not be used lightly, as it violates the general
contract of locale, and does kill some legitimate (albeit
alledgedly rare) use patterns.
Currently, the spell checker uses this because it uses a
negative logic: it should match broadly, and when in doubt,
match even more broadly, which is almost never the case of
something that uses the locale.
In other words: don't use this option unless you are
very, VERY sure that's what you want. Hint: it isn't

Bug: 5280929
Change-Id: Ib3cae319c692161d653630038c5bcde1f4340c05
2011-09-15 18:01:13 +09:00
Tadashi G. Takaoka 3dcb281fb0 Merge "Make action key background more visually prominent" 2011-09-15 01:51:15 -07: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
Jean Chalard 39fe5bfc3c Merge "Avoid returning an object that's still used internally" 2011-09-15 00:28:19 -07:00
Jean Chalard 5c08151c22 Avoid returning an object that's still used internally
There is no definite path known for this to end up being
touched by other classes, but we could imagine through
some way or some other it ends up shoved in the stringbuilder
pool, leading to catastrophic results.

Hopefully related to
Bug: 5248688

Change-Id: Ib8abfc31263cbf31d515ed607ced5d8253971938
2011-09-15 16:23:03 +09:00
Jean Chalard b568a627b4 Merge "Don't kill LatinIME if the spellchecker crashes." 2011-09-15 00:13:45 -07:00
Jean Chalard 199dc5e0e4 Don't kill LatinIME if the spellchecker crashes.
If the spellchecker encounters a bug and happens to crash,
it may be sensible to avoid killing the keyboard in response.
This is a possible way to do it, which comes with the big
drawback of making bugs in the spell checker harder to find.

Change-Id: Idb26fb592b9718e1dbdadeda8fbd1a8a1d805c28
2011-09-15 16:01:21 +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
satok fa52a09f21 Merge "Remove experimental settings" 2011-09-14 02:57:58 -07:00
Jean Chalard d2738757d2 Merge "Filter out of spellchecking words that don't look like words" 2011-09-14 02:05:48 -07:00
Jean Chalard 88fa53b840 Filter out of spellchecking words that don't look like words
Note that this affects only the results of the spell checker if
actually passed such a word. For example, the spell checker will
not flag "http://oju" as a typo, because it looks like a URL.
But in the current implementation, TextView passes "http" and
"oju" separately, so "oju" is still flagged as a typo.

Bug: 5281875
Change-Id: I9d721fd3af34edc51b11908cf2e8fe994b164242
2011-09-14 17:46:06 +09:00
satok c9c54a84bc Remove experimental settings
Bug: 5314288
Change-Id: I31cbc6da0ca5e61a5fa4a893c774f2110a5698f1
2011-09-14 16:24:39 +09:00
Jean Chalard 1586dc6edf Merge "Fix a bug where the user dict's locale match would be wrong" 2011-09-13 23:44:44 -07:00
Jean Chalard d97def5925 Fix a bug where the user dict's locale match would be wrong
This is preparation for
Bug: 5280929

Change-Id: Iab0096acf057aa288b1986d225aad815bd70b145
2011-09-14 15:41:46 +09:00
Jean Chalard 63e55cd55e Don't report 1-char words as typos
Bug: 5281875
Change-Id: If6b6d057e18390bf01dcd31c46104b6856fbdbda
2011-09-13 21:45:19 +09:00
Tadashi G. Takaoka ea843f2a24 Make WordComposer aware of capitalized word
Change-Id: If6c0edef2334f018f2e04c6034f8ce747206f150
2011-09-13 19:11:10 +09:00
Tadashi G. Takaoka 6602b03e80 Merge "Linger the "more suggestions" when the user is sliding the touch point" 2011-09-12 21:33:14 -07:00
Tadashi G. Takaoka 02ce5392f5 Merge "Dismiss the more suggestions when the user is sliding down the touch point" 2011-09-12 21:32:40 -07:00
Tadashi G. Takaoka 87104bace9 Dismiss the more suggestions when the user is sliding down the touch point
Bug: 5299142
Change-Id: I466ff41948bbb49fb6874817ecfd94d338238d19
2011-09-13 13:03:50 +09:00
Tadashi G. Takaoka 2abd8547e3 Linger the "more suggestions" when the user is sliding the touch point
Bug: 5299024
Change-Id: I00b5e59ba480cbf057bdd69d1357d2c477be90f7
2011-09-13 13:03:24 +09:00
Tadashi G. Takaoka 697bf585f8 Update suggestions strip text color
Bug: 5287964
Change-Id: Ic40bb656873f41bb6d65427f02399464e831aab2
2011-09-13 12:54:59 +09:00
Tadashi G. Takaoka 4486d77270 Introduce autoXScale label option
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
2011-09-12 17:32:28 +09:00
Jean Chalard f5ef30dfc6 Have the spell checker honor case
Bug: 5281103
Change-Id: I415c84dbb55f1eeb5deb9f248b4056881982ee13
2011-09-12 12:25:25 +09:00
satok 53bbf4da5a Merge "Remove the exception in SubtypeSwitcher" 2011-09-09 02:49:18 -07:00
satok 1ecf0fb5d7 Remove the exception in SubtypeSwitcher
Bug: 5261455

Change-Id: Idb070702418caeb6cb975849d71b39952ac4afab
2011-09-09 18:44:48 +09:00
Jean Chalard a40aba0022 Merge "Fix an NPE" 2011-09-09 02:18:11 -07:00
Jean Chalard 5955cfdaea Fix an NPE
I think only the monkey can realistically stumble on this one,
but still.

Bug: 5276917
Change-Id: I0d9f76e4786973d3695fcd46127f0bed46621c33
2011-09-09 18:08:53 +09:00
Tadashi G. Takaoka f01ba10c8f Merge "Cancel more suggestions when its outside is touched" 2011-09-09 00:49:15 -07:00
Tadashi G. Takaoka 530b4176c2 Merge "Fix potential ArrayIndexOutOfBoundsException" 2011-09-08 23:24:20 -07:00
Tadashi G. Takaoka 4a9be115f2 Cancel more suggestions when its outside is touched
Bug: 5241105
Change-Id: Ic28afaf998dabd3c5529286a3e60400d733d3d82
2011-09-09 14:21:43 +09:00
Tadashi G. Takaoka 8332fd0b81 Fix potential ArrayIndexOutOfBoundsException
Change-Id: I5dad81fb274cbbcf2c4f106825eecf8e4903461c
2011-09-09 09:42:22 +09:00
Tadashi G. Takaoka 2cb36637f4 Back button to dismiss the more suggestions
Bug: 5275063
Change-Id: If31e9a25d827f44c8d4ff455a780ec2a6d2d9bef
2011-09-09 09:33:35 +09:00
Tadashi G. Takaoka a08a7e99b4 Merge "Add visual dividers to more suggestions panel" 2011-09-08 07:25:17 -07: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
Jean Chalard af3b56c887 Fix a bug where the wrong suggestion score would matter.
Also introduce a few debug prints.

Bug: 5240463
Change-Id: Iea2fffa3be9d7bd69da751ece9e67e94e9819ee1
2011-09-08 21:17:24 +09:00
Tadashi G. Takaoka 236928c555 Merge "Make Spacer as extended Key class" 2011-09-08 01:44:24 -07: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 293db0873f Get rid of the double quote from the suggestion strip
bug: 5271209
Change-Id: I1823eaac07e184092bdf2a5d607fa08ff680fca5
2011-09-08 11:46:09 +09:00
Tadashi G. Takaoka 2be872555c Use full screen mode on landscape/phone device
Bug: 5262767
Change-Id: I721c18522c972ced9f359f2e5208572d54a4b7a1
2011-09-08 11:02:55 +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 ed3758e33c Merge "Tune the threshold of fullscreen mode from 2.5in to 500dip" 2011-09-07 01:08:51 -07:00
Tadashi G. Takaoka f80b6a0699 Tune the threshold of fullscreen mode from 2.5in to 500dip
Bug: 5262767
Change-Id: Ie418ab766951a568d0f40822d8e8d719582749ba
2011-09-07 16:37:50 +09:00
Tadashi G. Takaoka ae56d5c33d Merge "Use different reference character for hit label" 2011-09-07 00:30:32 -07: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
satok 6d468c513f Fix NPE in settings
Bug: 5246032
Change-Id: I452dab9bf863fb8cba142467f338088ee8b30283
2011-09-07 12:36:07 +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 4269a7cebd Add gap between suggestions strip and more suggestions
Bug: 5260292
Change-Id: Iba792ebe0767f5117f259bcb73ac0bff778b166e
2011-09-06 18:33:01 +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 3f8351e186 Merge "Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView" 2011-09-05 03:56:37 -07:00
Tadashi G. Takaoka 9676038b6e Introduce maxMoreSuggestionsRow and minMoreSuggetionsWidth attributes to SuggestionsView
Bug: 5257594
Change-Id: Id52c841b72e38eb9034a1a7f26bcf3d4d81ad216
2011-09-05 18:59:37 +09:00
satok 6a9f0db202 Merge "Support automatic language" 2011-09-05 02:39:58 -07:00
satok 0cba0c11f6 Support automatic language
Bug: 5057886

Change-Id: I807776b0a3d1286c66ba032c3701b3503911664c
2011-09-05 17:54:01 +09:00
Tadashi G. Takaoka 1d8ec1cb9f Merge "Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle" 2011-09-05 01:39:33 -07:00
Tadashi G. Takaoka 0e7bd388d2 Merge "Get rid of LinearLayoutCompatUtils" 2011-09-05 01:22:15 -07:00
Tadashi G. Takaoka 0e2fa66144 Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle
Change-Id: I30873ad870c728e28a044baf9946b4461ab03575
2011-09-05 16:48:56 +09:00
Tadashi G. Takaoka c412309b7a Get rid of LinearLayoutCompatUtils
Change-Id: If0f63eaeb4539c0e03ef20190d2f9211a176babc
2011-09-05 16:15:28 +09:00
Jean Chalard 59b501a050 Only set LOOKS_LIKE_TYPO if the max score meets a threshold
Bug: 5240463
Change-Id: I51e85edae57789d638aa1e12b82e6a75c49d33c7
2011-09-05 12:31:43 +09:00
Tadashi G. Takaoka 787bac0603 Merge "Use separate View for key preview backing" 2011-09-02 12:59:31 -07:00
Tadashi G. Takaoka abb0c77af1 Use separate View for key preview backing
Bug: 5246982
Change-Id: Icec4281cb01771909fcece36647ee42ba179118c
2011-09-03 01:36:26 +09:00
satok e197542a57 Merge "Add logs" 2011-09-02 04:21:07 -07:00
satok 8e5d12af9f Add logs
Change-Id: I640186c8be8013841b542e8cefa5f033eb7afc32
2011-09-02 19:55:09 +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 08e64e1874 Merge "Calculate x coordinate with floating point" 2011-09-02 01:13:34 -07:00
Tadashi G. Takaoka f8c617028b Merge "Squash SuggestionsStripParams into SuggestionsViewParams" 2011-09-02 01:07:30 -07: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 d3e50a2acf Squash SuggestionsStripParams into SuggestionsViewParams
Bug: 5246982
Change-Id: Idc2563cb0175aabc4282f9fd45eefaa129ed4961
2011-09-02 16:53:38 +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
Jean Chalard 5bb7a64fe2 Merge "Fix an NPE in settings" 2011-09-01 23:42:43 -07:00
Jean Chalard ad56a9ac51 Fix an NPE in settings
Change-Id: I264c001a9cc28f864ad024fcf51fb42e9c203d3f
2011-09-02 15:35:23 +09:00
Jean Chalard 66a5884ad8 Merge "Add an option to prevent insertion of suggestion spans" 2011-09-01 22:57:39 -07:00
Jean Chalard 1531528bfe Add an option to prevent insertion of suggestion spans
This is to help debug of
Bug: 5250788

Change-Id: I961321aff3776c4912eaf7a1fa4de0c01d715f24
2011-09-02 14:43:13 +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 913e2aeef2 Rename CandidateView to SuggestionsView
Change-Id: I6480cdf025f065130e1969899b259a243e7a11be
2011-09-01 15:41:34 +09:00
Jean Chalard b17300e2f0 Merge "Fix a bug where autotext would occasionally not work" 2011-08-31 22:42:11 -07:00
Tadashi G. Takaoka 537e3d3696 Merge "Remove unused suggestions pane code" 2011-08-31 22:35:12 -07:00
Tadashi G. Takaoka 3a566c48b0 Remove unused suggestions pane code
This is a followup for Ie1d69131.

Bug: 5023981
Change-Id: I42ec596af40cb7dcdd84b96ba5bff9ef1fb5dc92
2011-09-01 14:28:59 +09:00
Tadashi G. Takaoka d81479a340 Implement KeyboardLocale InputMethodSubtype extra key
The locale is specified by KeyboardLocale extra key in method.xml,
LatinIME will use the specified locale for keyboard layout.

Bug: 5238658
Change-Id: I8e6cb66c73a7ac1bf611d9910b42fa9cff38eba0
2011-09-01 14:05:01 +09:00
Jean Chalard 358e1327d8 Fix a bug where autotext would occasionally not work
Autotext correction would check whether the first suggestion
so far was the same as what Autotext would return, and if it
was indeed the same, would not send its result as
autocorrect. However, the first suggestion is not guaranteed
to have a high enough score to trigger autocorrection, and
there would be cases where a word in autotext would not get
autocorrected because the word came out of bigram
suggestions. These occurrences would be extremely rare, as
they would require concomitant insert between autotext for
one char and bigram suggestion. It is, in fact, probably
limited to the capitalization of "I".

This did not happen in gingerbread because gingerbread would
not register 1-letter words as valid bigrams.

This fix works by just always sending the result of autotext
regardless of whether it is already the first suggestion or
not. This is okay because duplicates are removed afterwards
anyway - and this processing is absolutely necessary because
the autotext'd word may actually be somewhere else in the
suggestion, so it made really no sense checking for only the
first one.

Please note that there is also a race condition that can
result in "i" not being converted to "I": at the moment,
Latin IME relies on having the suggestions evaluated
at the time autocorrection is performed, but when typing
very, very fast, those messages may have been canceled.
This is not limited to the autocorrection of "i", but
affects all autocorrections. It requires a nearly
inhumane typing speed to trigger, but hitting "i" and
space in turn as fast as one can it's possible to
reproduce occasionally.

Bug: 5135113
Change-Id: I530ea6212487300001a2c0fc5b25a5c7716bdf63
2011-09-01 12:59:17 +09:00
Tadashi G. Takaoka fdec5c1a78 Merge "Implement popup suggestions pane" 2011-08-31 05:23:54 -07:00
Tadashi G. Takaoka 29e7b7ed6e Implement popup suggestions pane
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
2011-08-31 21:21:22 +09:00
Jean Chalard 0fd2135219 Merge "Fix a possible NPE" 2011-08-31 03:06:37 -07:00
Jean Chalard a770d650b5 Fix a possible NPE
Change-Id: I5c57752772414b4f9475d0ad43d7fc52b97c3f33
2011-08-31 19:04:34 +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 2fe9a43ab7 Merge "Remove unused XML attribute" 2011-08-31 00:14:55 -07: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
Jean Chalard b29b225847 Merge "Clean up bigram settings" 2011-08-31 00:03:41 -07:00
Jean Chalard 18ccd552a8 Clean up bigram settings
Move bigram suggestion option to the advanced settings screen,
remove bigram prediction option for ICS release and remove the
now-empty bigram option category.

Bug: 5240082
Change-Id: Ib1fc608ad33d5598410f7b0cb4a1639bffef28c7
2011-08-31 15:41:13 +09:00
Tadashi G. Takaoka 0e7ee45f54 Merge "Rename PopupMiniKeyboardView to MiniKeyboardView" 2011-08-30 23:39:14 -07:00
Tadashi G. Takaoka 9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
Jean Chalard fcee70ea92 Merge "Check the magic number of a decoded file" 2011-08-30 22:58:29 -07:00
Jean Chalard 7a408431fe Check the magic number of a decoded file
Checking the magic number of a file upon decoding is necessary,
because if the file is corrupt and we don't check it, we will
fall back to a simple copy of the corrupted file. Latin IME
would realize this and would not crash, but would not use the
corrupted dictionary. If this happened to be a main dictionary,
then the user would lose the ability to use the correct
built-in dictionary.

Not the same, but kinda similar to
Bug: 5223031

Change-Id: Ic2783dc9dd5f3dcf2865623d9452765fe3778db7
2011-08-31 14:37:11 +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
Jean Chalard 5406d63d34 Merge "Fix a bug with synchronicity of spell checking/user dict" 2011-08-29 02:55:46 -07:00
Tadashi G. Takaoka 46286874f3 Add guard to prevent possible IllegalStateException
Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1
2011-08-29 18:38:04 +09:00
Jean Chalard f019d505d7 Fix a bug with synchronicity of spell checking/user dict
This fixes a race condition that would end up with the spell
checker not finding some words in the user dictionary when it
just booted.

Bug: 5194627
Change-Id: I1ba911cc53e6ae3b111d54a6f91d1d5feef3f5de
2011-08-29 18:33:20 +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 940514989a Merge "Move locale-related utility methods to LocaleUtils." 2011-08-28 20:34:02 -07: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 85b4752270 Merge "Move debug information back to suggestions strip" 2011-08-26 04:07:00 -07:00
Tadashi G. Takaoka 013ba3e3e7 Move debug information back to suggestions strip
Change-Id: I8cfad5f780a481a251cc4f752bff3cda5ae3ffbe
2011-08-26 20:05:19 +09:00
satok add3e05379 Do not put the suggestion span for obsolete suggestions.
Bug: 5219037

Change-Id: I0300fbc7e1cc97f0f8ba4d21e0e699d9fe66ed76
2011-08-26 19:12:18 +09:00
Tadashi G. Takaoka 7fe084a856 Merge "Fix "touch to save" colors" 2011-08-26 03:06:40 -07:00
Tadashi G. Takaoka c04bbc1ae9 Fix "touch to save" colors
Bug: 5218662
Change-Id: I094b2ceb7438148eb5bdf620b188f598e8442a07
2011-08-26 18:55:36 +09:00
Tadashi G. Takaoka f3f3189adb Wrap up popup mini keyboard
Bug: 5218641
Change-Id: I88b3e7efa1f7c009c8a8e4f5453a5c4df2f91cfc
2011-08-26 15:45:05 +09:00
Jean Chalard de4e8dedcc Allow sharing dictionaries between similar locales.
Bug: 5058488
Change-Id: Ib12013f58afad957a8205b439f87480cc12ea06f
2011-08-25 19:42:06 +09:00
Jean Chalard a16621ada4 Add a debug variable
...that was missing

Change-Id: Ia3b17909f295e0a93dee633c8d67c0e03840023e
2011-08-24 21:36:18 +09:00
Jean Chalard 20973de72b Avoid unnecessary output to the system log.
The message this removes gets printed under normal conditions.
Normally dictionary files are compressed then crypted, but not
compressed a second time; however LatinIME tries to open a
compressed-crypted-compressed file first, because it could not
do it afterwards and we want to support this case. So under
normal operations, the first method LatinIME tries is actually
expected to fail.
Also, if we decide to stop compressing or/and encrypting dicts
LatinIME supports it as a valid use case. It should not print
errors to the log.

If the file cannot be open at all, then it is an unexpected
case, and Latin IME still reports to the log.

Change-Id: Ic5228c51365a101af1d03e2c893484d3050b5a1c
2011-08-24 20:27:04 +09:00
Tadashi G. Takaoka 1d59e0dbdf Merge "Fix suggestions strip press state to align vertically" 2011-08-24 03:35:57 -07:00
Tadashi G. Takaoka 580e1d7ac0 Fix suggestions strip press state to align vertically
This change also tweaks more_suggestions_hint drawables to eliminate
unnecessarily padding at the bottom.

Bug: 5204563
Change-Id: If5ec731c9a490da0116a020e8fd405c7d025d707
2011-08-24 18:15:19 +09:00
Jean Chalard 38d512c0b2 Call the decrypt/unzip routines upon copying a dictionary.
Bug: 5095140
Change-Id: I7000f752bc9b7fd6a7af4839b2f225c085300128
2011-08-24 17:12:12 +09:00
Jean Chalard 8b21eb2507 Merge "Refactoring: cut out a method for caching a word list" 2011-08-23 23:17:31 -07:00
Jean Chalard 7b1f74bb9d Refactoring: cut out a method for caching a word list
This is preparation to have the decrypting/unzipping code
moved over to LatinIME.

Bug: 5095140
Change-Id: Ic3fdcc3de673b46cef2eb9ebe6a52cbdd614e50a
2011-08-24 15:09:57 +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
Jean Chalard 1616e2e96e Merge "Fix an excessive fallback problem." 2011-08-23 02:12:17 -07:00
Tadashi G. Takaoka c84bc3460d Rename LatinKeyboardBaseView to LatinKeyboardView
Bug: 5182291
Change-Id: I5089a14902b9f4ff1ab4f34e3f7a42aca5040d3e
2011-08-23 17:57:02 +09:00
Jean Chalard 0ee3b69483 Fix an excessive fallback problem.
LatinIME has several fallbacks to ensure a dictionary is used.
However, it should now be possible to deactivate the main dictionary
through the dictionary pack settings. In this case, Latin IME should
not fallback to the built-in dictionary.

Change-Id: Ibd992ad89793169f04a968b40781fce819b87b6f
2011-08-23 17:55: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 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 2b27f3e698 Merge "Remove password field special handling" 2011-08-23 01:29:11 -07:00
Tadashi G. Takaoka f9da4c548f Remove password field special handling
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
2011-08-23 16:49:35 +09:00
Tadashi G. Takaoka 0940093c30 Merge "Remove screen orientation confirmation hack" 2011-08-23 00:39:19 -07:00
Jean Chalard d6834c8125 Merge "Fix a bug with the string pool." 2011-08-22 23:05:51 -07:00
Tadashi G. Takaoka f94df382fb Remove screen orientation confirmation hack
Bug: 4311428
Change-Id: Ie7e094ded9c7c1fe811b7eb97bc33ffecb29a73c
2011-08-23 14:58:45 +09:00
Jean Chalard a6e912cf98 Fix a bug with the string pool.
This also adds some optional debug code to detect more easily possible
future occurrences of the same problem.

Bug: 5195017
Change-Id: I2558b468e46f7090de868f1ec2dc9e24895d670f
2011-08-23 14:55:34 +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 9f31575045 Merge "Fix suggestions strip text colors" 2011-08-22 03:32:05 -07:00
Tadashi G. Takaoka d47a955610 Fix suggestions strip text colors
This change also shows the valid typed word in bold face.

Bug: 5161713
Change-Id: I15355a11888fc8ef90ecc8b64a52eb08c1a2b367
2011-08-22 18:56:54 +09:00
Jean Chalard 70a92a33f8 Merge "Remove duplicates from the spell checker suggestions." 2011-08-22 02:49:33 -07:00
Jean Chalard 6b166a1933 Remove duplicates from the spell checker suggestions.
Bug: 5175740
Change-Id: I592401b3b8c3074d70e06dc3a9919cc3cb47ba49
2011-08-22 18:44:04 +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
Jean Chalard 5d4c5692f1 Fix case sensitivity for the spell checker.
The new behavior is as follows:
- If the word in the dictionary is not fully lower case, then the
exact case is required to match.
- If the word in the dictionary is fully lower case, then any of
the following patterns match:
  - fully lower case
  - only the first char capitalized
  - all caps
Any other capitalization is rejected.

This is probably what people want. If you type a name in all lower
case, it should be marked as a typo, but if you type a word with a
capital for emphasis or just because it's the start of the sentence,
it should match a lower case word in the dictionary. If you have
a spurious capital letter in the middle of a word because of a typo,
it should be marked as such.

Accents are not affected, and should not be. An accented letter
is a different letter and a missing accent should be reported.
We should maybe consider again for some common transpositions
like the "ue" digraph for German, which is now considered a typo,
but will suggest the correct diacritics as the first suggestion.

Bug: 5145751
Change-Id: I651e24f13c90fb94700a1674ad380e95336e7dca
2011-08-22 14:02:57 +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
Jean Chalard 6da8b74582 Move the dupes-removing method to the Utils class
This is preparation for bug: 5175740

Change-Id: I18b2042317f740cb1e021d3dfbf90ecfbb1a1d37
2011-08-19 19:49:59 +09:00
Jean Chalard 150bad6fd4 Have the spell checker use the User dictionary.
Bug: 5175868
Change-Id: I165eee4c865caa5ee1daf3e0b1acde8788b996ef
2011-08-19 17:19:49 +09:00
Jean Chalard 1e841de2ce Merge "Check the main dict id to be able to fallback." 2011-08-18 19:55:16 -07:00
Ken Wakasa e56e88beff A follow up to I830de4d1
bug: 5130446
Change-Id: Ib1a4603590387c30be7555b8386f5e0607ea7249
2011-08-18 21:51:04 +09:00
Jean Chalard ee7daefd97 Check the main dict id to be able to fallback.
Bug: 5095140
Change-Id: I02032923ca2a65bd8fbabc0abbe6a476f7542187
2011-08-18 20:09:35 +09:00
Jean Chalard 89fdb82753 Merge "Move the settings test to a more appropriate place." 2011-08-18 03:39:08 -07:00
Jean Chalard 83207fb482 Move the settings test to a more appropriate place.
This change refactors the dictionary selection code so that the
cached dictionary files list and the settings tests are more
cleanly separated.
This will also help with future refactorings that will test for
the presence of the main dictionary and insert the fall back if
it's not supplied by the dictionary pack.

Bug: 5095140
Change-Id: I8d7caad7c054031df71fe78b043801a774d50f65
2011-08-18 19:35:52 +09:00
Jean Chalard 4e01afc520 Make the string builder pool in Suggest a singleton.
This is internal refactoring, done as preliminary work to fix
Bug: 5175740

Change-Id: I21bd4c001c27e7b925ddb87a152105b4dcab320a
2011-08-18 18:41:57 +09:00
Jean Chalard 5ba5ff9b80 Merge "Exception refactoring" 2011-08-18 02:36:42 -07:00
Jean Chalard 03c3b64ee5 Merge "Refactor string removal to make it static" 2011-08-18 02:36:32 -07:00
Jean Chalard 3016863f86 Refactor string removal to make it static
The next step is to move this over to the Utils class.
The ultimate goal is to make use of the duplicate removal code
also in the spell checker as per
Bug: 5175740

Change-Id: Ica36691b843b0713b832c56ffc65e5b2ec427c4a
2011-08-18 15:16:59 +09:00
Jean Chalard 80e0bf0429 Exception refactoring
Now that the dictionary pack can return several files, it's better
to handle IO exceptions for each file rather than globally. This
also will help with next implementation steps.

Bug: 5095140
Change-Id: I5ed135ad2ad4f55f61f9b3f92c48a35d5c24bdb2
2011-08-18 15:11:19 +09:00
Jean Chalard 091bbf85d8 Merge "Factor dict pack settings reading into a static inner class" 2011-08-17 19:34:31 -07:00
Jean Chalard c11c4fd61b Factor dict pack settings reading into a static inner class
This is essentially refactoring to help next steps

Bug: 5095140
Change-Id: Ic97044d2ed354027bac4f84e6ce69d20ef6da092
2011-08-17 11:25:21 +09:00
Tadashi G. Takaoka 961453c3b3 Merge "Get rid of auto correction flash animation in the suggestion strip" 2011-08-16 18:49:36 -07:00
Ken Wakasa e486175987 Merge "Fixed speaking keys when editing password fields" 2011-08-16 18:45:26 -07:00
Tadashi G. Takaoka bea6b72106 Get rid of auto correction flash animation in the suggestion strip
This change also reverts I1350ad3d.

Bug: 5156762
Change-Id: I047e75699e8eea02204ad95e12dcc0aefe49ac34
2011-08-16 17:47:23 -07:00
Tadashi G. Takaoka 5cb10f78ed Fix possible NPE
Bug: 5171442
Change-Id: I280f6a0ef5fb06f1e03e17c0065d078604e4747a
2011-08-16 17:36:13 -07:00
Jean Chalard c160373b6a Close dictionary pools when they are not used any more.
Bug: 5156851
Change-Id: Icaba54734eb790b40dc2012aac25df5b2af71dbb
2011-08-16 20:04:57 +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
Jean Chalard 70b9c5d991 Make the spell checker re-entrant.
Until the dictionary itself is re-entrant, unfortunately we have
to synchronize accesses to it.

Bug: 5156851
Change-Id: I1629a160d707e6fa1ad80cba828798abb24b68b1
2011-08-16 13:58: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 e8bbc54e74 Merge "Update shift state in onSizeChanged()" 2011-08-15 04:12:24 -07:00
Ken Wakasa 286a5bf1c6 Update shift state in onSizeChanged()
bug: 5130446
Change-Id: I830de4d184dffa2b263206c3f078de054e227b9e
2011-08-15 20:10:28 +09:00
Jean Chalard 7674f869dc Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Idc4a464e499a2530f517bf7fa449326779129371
2011-08-15 16:38:00 +09:00
Jean Chalard ab791d0bbc Revert "Remove the "Touch to correct words" option."
This reverts commit 8e69dd80d8

...since it breaks the build
2011-08-14 23:49:01 -07:00
Jean Chalard 8e69dd80d8 Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Iae8a64e22cf618f4533f966feaf0b5a76725d551
2011-08-15 15:02:51 +09:00
Ken Wakasa bb5504c47d Merge "Get rid of auto correction flash animation in the suggestion strip" 2011-08-12 07:19:50 -07:00
Ken Wakasa 59f5cc8572 Get rid of auto correction flash animation in the suggestion strip
bug: 5156762
Change-Id: I1350ad3d7125f8ecdfc699233ed05e253cc3f010
2011-08-12 23:14:34 +09:00
Jean Chalard b6b7d81f5d Merge "Add a settings activity for the spell checker." 2011-08-12 03:11:33 -07:00
Jean Chalard 31fd54c53f Add a settings activity for the spell checker.
Bug: 5156940
Change-Id: I762de1296f861abce2d0413404bca54571e0ea0a
2011-08-12 19:07:51 +09:00
Jean Chalard 86e517fe4a Read shared prefs from the dictionary pack.
Bug: 5095140
Change-Id: I227fbd95d8a0330b6dede6de99fde3a5a715fe2d
2011-08-12 17:31:24 +09:00
Ken Wakasa 7fca6a5357 Merge "Key click sound volume fix" 2011-08-11 10:06:49 -07:00
Ken Wakasa bf7dd47329 Key click sound volume fix
bug: 5145886
Change-Id: Ic599373ee17423ef9c61b3dd5177c3763aa31015
2011-08-12 02:02:03 +09:00
Jean Chalard 08868624ed Use the dictionaries cached LatinIME-side
Dictionaries are now copied over from the dictionary pack to Latin IME.
This change enables Latin IME to use all dictionaries that have been
cached until now.

Bug: 5095140
Change-Id: Id9a2bacf9dc1c693189b0ac8aa3f75756dc1e3e6
2011-08-11 18:15:39 +09:00
Jean Chalard 2896673461 Rename a function and update a comment
Bug: 5095140
Change-Id: Idf66a04c6a1a05015f94187a8dbce3d443bbf38b
2011-08-11 17:07:28 +09:00
Jean Chalard f102f6a3ac Merge "Give the orders to delete the source files to the dict pack" 2011-08-10 21:54:27 -07:00
Jean Chalard 5774908bb3 Give the orders to delete the source files to the dict pack
Bug: 5095140
Change-Id: I64552861768ca30073ffe0d631b2e0c44dad4aa9
2011-08-10 21:55:15 +09:00
Luca Zanolin c359d75ca7 Merge "Execute the switching to a different IME in a POOL_EXECUTOR." 2011-08-10 04:17:53 -07:00
Luca Zanolin 613073d01b Execute the switching to a different IME in a POOL_EXECUTOR.
Using only a single thread may slow down the application, if there is already another thread running.

Bug: 5142142
Change-Id: I314480a58af20ea09458ff82e586304fc3c7c070
2011-08-10 10:29:06 +01:00
Jean Chalard d4c08d9be3 Make sure the directory where to put files actually exists
Bug: 5095140
Change-Id: I764471e54ce0bf6aefe5d604cee97639d5ad0af9
2011-08-10 17:14:34 +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
Jean Chalard 3a22708e65 Have Latin IME copy files from the dictionary pack.
Also some minor cleanup: remove unused methods, minor refactoring into methods.

Bug: 5095140
Change-Id: I035537b37a31adfc8db3b933fb0cefcf703d6c7c
2011-08-09 16:02:14 +09:00
Jean Chalard 14051e2b53 Stop reloading contacts when not appropriate.
A recent change had the contacts reloaded every time a new field
is touched. This change not only fixes the problem, but also removes
reloading contacts when changing language, which should make language
switch within LatinIME lighter.

Bug: 5125034
Change-Id: Ia61c4f75a8617113cdce88a2e2c6fdf073146a2d
2011-08-09 12:49:19 +09:00
Alan Viverette 58e3f1065e Fixed speaking keys when editing password fields
Bug: 5042681
Change-Id: Ic4523ec38b0faa2b6a91d476ea7af7e69404861c
2011-08-08 11:05:04 -07:00
Ken Wakasa 44beeab4a4 Merge "Fix issues with long-press access to more suggestions" 2011-08-08 04:37:09 -07:00
Ken Wakasa bbf25cf251 Fix issues with long-press access to more suggestions
Change-Id: If5a45dcae7f7e7881d305104e35a04c341719aec
2011-08-08 20:33:44 +09:00
Ken Wakasa ad7ddca397 Merge "Correction mode should not rely on the existence of the main dic" 2011-08-08 04:24:05 -07:00
Ken Wakasa c769ef4dd1 Correction mode should not rely on the existence of the main dic
bug: 5114094
Change-Id: I2088918ec2c9ad6f8db13b55e58d3e73e180aef8
2011-08-08 19:42:24 +09:00
Tadashi G. Takaoka ae5c736e37 Remove suggestion pane controller from strip
This change also removes speacebar LED to represent auto correction.

Bug: 5023981
Change-Id: Idedaabd147ed608df35cb51769388578a05174a1
2011-08-08 00:15:49 -07:00
Ken Wakasa 20c4aec827 Partially revert I531a3257 as it mistakenly broke some logic -- textToTheLeft was required.
Change-Id: I24f55cec05fea68836d6b3413b69f1e1b9c68ba2
2011-08-06 22:37:45 +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 60a004f78e Fixed count suggestions strip
Bug: 5023981
Change-Id: I434d23bdfb653989866d3822c978cd929a2b553c
2011-08-05 19:25:36 -07:00
satok 5bcf8ee66c Update the spell checker according to API cleanup
Change-Id: Ia95a63963c16265bc9bc7e1fcecf120e17bf8636
2011-08-05 19:57:47 +09:00
Tadashi G. Takaoka fd047f61e4 Merge "Move suggestions layout code into parameter class" 2011-08-04 23:57:31 -07:00
Tadashi G. Takaoka 94ac3d760b Fix NPE
Bug: 5120674
Change-Id: Iedfd7af33a96b68d83d9a844f61ac40b9523ecdb
2011-08-04 09:40:25 -07:00
Tadashi G. Takaoka 16713e5630 Move suggestions layout code into parameter class
Bug: 5023981
Change-Id: I30f45191524c38bfe550845b003e8972abd2ee49
2011-08-04 09:26:37 -07:00
Jean Chalard 3234123fba Implement the spell checker.
Bug: 4176026
Change-Id: I297c47202e96ce0db74d703f30709777f26b93ac
2011-08-04 21:27:14 +09:00
Jean Chalard ac21e0a349 Merge "Create a way to pass the proximity info to the dictionary" 2011-08-04 04:17:33 -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 80ba224fff Merge "Cleanup CandidateView class" 2011-08-04 01:19:55 -07:00
Tadashi G. Takaoka d95a6365be Cleanup CandidateView class
Bug: 5023981
Change-Id: Id79e31c60dfb41be546f5c5a3680e8651457151d
2011-08-04 01:14:55 -07:00
Ken Wakasa 3aacd1d7d8 Merge "Additional hack for bug:4311428, a follow up for Ieade33d7." 2011-08-03 23:34:12 -07:00
Ken Wakasa de30f9f2d6 Additional hack for bug:4311428, a follow up for Ieade33d7.
Change-Id: If1799a6fa3b2f45c98c9f3aeb88845f1fb08f09b
2011-08-04 15:31:33 +09:00
Jean Chalard 8289dede0a Merge "Remove newly unused code" 2011-08-03 22:47:27 -07:00
Jean Chalard 09e91ee072 Remove newly unused code
Bug: 5095140
Change-Id: Ie4322815f029f063dda2925697d6d8f63bfaf6d6
2011-08-04 13:53:24 +09:00
Ken Wakasa 3889462439 Handle non word separators correctly even for the initial letter of a word
bug: 5101114
Change-Id: I0d804c9a500ff000dc06cadad46a2c6c6b8088b2
2011-08-04 12:24:45 +09:00
Tadashi G. Takaoka bb12dc455b Merge "Fix saving keyboard state while rotating" 2011-08-03 15:15:59 -07:00
Tadashi G. Takaoka 99debd7519 Merge "Reset keyboard shift lock state when new keyboard is ready" 2011-08-03 15:08:28 -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
satok e486290013 Merge "Temporary don't use "looks type" for comming rename cl." 2011-08-03 03:24:48 -07:00
satok 55d1c5efab Temporary don't use "looks type" for comming rename cl.
Change-Id: If016a61f9e303b615c59c0035724256535aec817
2011-08-03 18:42:56 +09: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 a0ac590c8d Merge "Support label with icon key" 2011-08-03 01:56:24 -07:00
Tadashi G. Takaoka 62d4a96497 Support label with icon key
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
2011-08-03 01:53:30 -07:00
Ken Wakasa 21fa416c43 Revive the missing Settings key on tablets
This is a follow up change to Ieb42fdfa.

bug: 5094401
Change-Id: If78c966ed02fbc9b8c6da726e00424a927349142
2011-08-03 17:00:14 +09:00
Jean Chalard 81f227de5a Merge "Change the dictionary file passing schema to a list of ids" 2011-08-02 21:02:11 -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
Jean Chalard fae8d60ee9 Change the dictionary file passing schema to a list of ids
The dictionary filename used to be passed directly to Latin IME.
This change implements, on the part of Latin IME, the passing of
them as an id that should then be passed through
openAssetFileDescriptor.

Bug: 5095140
Change-Id: I7d1e9d57c19f0645045368f68681680f238189fc
2011-08-02 19:16:39 +09: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
Jean Chalard cb1cc0d0de Merge "Try to compensate for a race condition." 2011-08-01 04:17:22 -07:00
Jean Chalard f2f9715319 Try to compensate for a race condition.
This does not really fix the underlying bug, but it does fix
the apparent symptoms.
When the user presses space and a letter quick, the
onUpdateSelection handler may be called after the letter has been
actually committed. The keyboard then happily proceeds to clearing
the composition because it thinks space was pressed (or the user
moved the cursor, since it can't guess which happened).
This change removes this behavior when we are expecting an update
event from a keypress. This means the bug still exists if the user
presses space twice and a letter, and all events come after the
letter, but it is very very hard to reproduce this. There may be
other collateral damage when the user moves the cursor in the form
of race conditions, but likewise, they should be really hard to
reproduce.

Bug: 5100521
Change-Id: Ib05328c9b451bf6fe288ae00296fd283a9a4e863
2011-08-01 19:51:55 +09:00
Tadashi G. Takaoka 271e55fe53 Merge "Filter non-ascii popup charcters from password keyboard" 2011-08-01 01:32:48 -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
Ken Wakasa 9351550dc6 Clean up revertLastWord()
The "deleteChar" argument of this method is acutally always true in the current code path.
Also, in this method, textToTheLeft virtually never has a punctuation letter as its initial
character.  This change is one of preparatory changes for bug:4983945.

Change-Id: I531a32570a35634c21c1d74b2b461e40a1b7f660
2011-08-01 16:03:43 +09: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
satok 4e7d0663ba Merge "Modified the test spell checker" 2011-07-28 18:09:51 -07:00
Tadashi G. Takaoka 259ce17f5d Merge "Use isFullscreenMode to determine candidate container height" 2011-07-28 17:40:18 -07:00
Tadashi G. Takaoka ecf43d4f9d Merge "Remove dead area around separators in the suggestion strip" 2011-07-28 17:39:43 -07:00
Tadashi G. Takaoka 3782f2bf1e Merge "Remove icon and negative button from dialogs" 2011-07-28 17:39:07 -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 4b1780fa95 Use isFullscreenMode to determine candidate container height
Bug: 5081182
Change-Id: I3783d3994e96f8bf466cbc47c9e0aecc2a6bed50
2011-07-28 15:06:15 -07:00
Tadashi G. Takaoka a1aab83a24 Remove dead area around separators in the suggestion strip
If user touches the separator, the right hand side suggestion will be
selected.

Bug: 4431485
Change-Id: Ieaa79fe2ac7b15e312829dca847ddb1b25056c09
2011-07-28 14:15:24 -07:00
Tadashi G. Takaoka e4b445f1ce Remove icon and negative button from dialogs
Bug: 5092028
Change-Id: I25b86c6e74e380e6cee4998bfe494bdafb611f36
2011-07-28 13:49:57 -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
satok a90992e562 Modified the test spell checker
Change-Id: Ib64fac8672a4107638cd05a0232d46b49fc4aa8c
2011-07-28 20:55:00 +09: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
Jean Chalard a48f8b3764 Merge "Load the binary dictionary asynchronously." 2011-07-26 23:34:52 -07:00
Jean Chalard 3af9f05f29 Load the binary dictionary asynchronously.
This should help with LatinIME opening performance.
It should not be merged before Ia9e4741f (if it is, there is a
race condition where the wrong dictionary is opened).

Bug: 5023141
Change-Id: I39c52de70a449929a622dddfdd92b38425ad9416
2011-07-27 15:18:49 +09:00
Jean Chalard e576a0d537 Fix a NPE when sent buggy data by an application
Bug: 5072247
Change-Id: I7369877072f6bb94dff5b1bcf52c9f8dde4854b7
2011-07-27 13:27:37 +09: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 ff6ad279e6 Merge "Make PointerTracker aware of that popup panel is showing" 2011-07-26 11:33:35 -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
Jean Chalard d3da6e6311 Close a multiprocess file handle.
Bug: 5034192
Change-Id: I9c3d757cfae313e9b7510e167de797a74c74a351
2011-07-26 22:13:34 +09:00
Jean Chalard f50aa19337 Purge quick fixes option.
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.

Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
Ken Wakasa e9d74adcc8 Merge "Take care of bidi-mirrored characters in suggestion strip as well" 2011-07-25 15:59:18 -07:00
Ken Wakasa 83ffff2a49 Take care of bidi-mirrored characters in suggestion strip as well
Follow up to I1b884848

bug: 5047217
Change-Id: I18b9962c4943363bae88009354fcc75ab60ad2ba
2011-07-26 07:55:12 +09:00
Tadashi G. Takaoka 71ffd74f05 Merge "Add Bidi-Mirrored letter list link as comment" 2011-07-25 15:25:51 -07:00
Tadashi G. Takaoka 34ce778802 Add Bidi-Mirrored letter list link as comment
Bug: 5047217
Change-Id: I29449892803c5150726aebfe97ecef6d481e1e97
2011-07-25 15:00:55 -07:00
Tadashi G. Takaoka 5800eb48d0 Merge "Fix voice key mode default back to "on main keyboard"" 2011-07-25 14:52:10 -07:00
Tadashi G. Takaoka f92bd4de20 Fix voice key mode default back to "on main keyboard"
Bug: 5074042
Change-Id: I0c4a09b286c7680306741d47a48d5d9783e4a890
2011-07-25 14:44:47 -07:00
satok 2c18ffb97f Merge "[step3] Add spell checker service." 2011-07-25 13:48:47 -07:00
satok 022c1cc203 [step3] Add spell checker service.
Change-Id: Ib13b3a524e0f0b90de40a3e255040b3158d49258
2011-07-25 11:05:24 +09: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 f640a97566 Fix NPE
Bug: 5067161
Change-Id: I466d40fc1bffa01efc1205a47b3330ae6f30bc66
2011-07-22 12:58:45 -07:00
Tadashi G. Takaoka f3e7688361 Merge "Disable VoiceInputLogger inside LatinIME" 2011-07-22 02:41:31 -07:00
Tadashi G. Takaoka 255486a5d0 Disable VoiceInputLogger inside LatinIME
Bug: 4985273
Change-Id: I6c70e50a58be0973f78c6a1abc1fb4eac5449c0b
2011-07-22 02:37:56 -07:00
Tadashi G. Takaoka 60c8eba634 Merge "Check user dictionary is enabled before showing touch-to-save" 2011-07-22 02:35:16 -07:00
Tadashi G. Takaoka ada26bb383 Check user dictionary is enabled before showing touch-to-save
Bug: 5024127
Change-Id: If4d691a4a59c43579d1f977e9a0545495f30bafb
2011-07-22 01:32:53 -07:00
Jean Chalard 6988d09ac2 Merge "Do not register null pointers as dictionaries" 2011-07-21 22:56:46 -07:00
Jean Chalard f6f0e63d79 Do not register null pointers as dictionaries
Bug: 5062425
Change-Id: I025991424de40c2b31b90238f99ef160e7efd92e
2011-07-22 14:46:43 +09:00
Tadashi G. Takaoka 68ff3a0a8b Merge "Fix missing right edge flag" 2011-07-21 14:59:50 -07:00
Tadashi G. Takaoka 419b90fe86 Fix missing right edge flag
Bug: 5062972
Change-Id: I2daffdd58802c6173696fe2417e6efcbef66d7bf
2011-07-21 14:32:16 -07:00
Ken Wakasa 035f0f5c94 Fix NPE
bug: 5054162
Change-Id: I69d308f0eeb32968515100dde98ad51a7c35020e
2011-07-22 06:14:22 +09:00
Ken Wakasa 8721398ec0 Merge "Fixed accessibility navigation gesture sound volume" 2011-07-21 13:21:11 -07:00
Ken Wakasa f9051733b7 Merge "Updated check for touch exploration enabled state" 2011-07-21 13:13:18 -07:00
Alan Viverette cc4b63ec4c Updated check for touch exploration enabled state
Bug: 5061704
Change-Id: Id2c0cce953f7bdb2b4c18b68f9e318d95eabc1b8
2011-07-21 10:49:16 -07:00
Alan Viverette 356d6871f1 Fixed accessibility navigation gesture sound volume
Bug: 5061527
Change-Id: I88728f7368a55ae7e6ca2ce6cfed6af42ffa03df
2011-07-21 10:44:57 -07:00
Jean Chalard a3dd3887c9 Merge "Set the locale for opening an asset" 2011-07-21 03:18:23 -07:00
Jean Chalard e150ef9856 Set the locale for opening an asset
This is necessary because we don't know any more whether the
locale of the process is the expected one when the dictionary
is loaded asynchronously.

Bug: 5023141
Change-Id: Ia9e4741f3b4a04a9f085f5b65ec122471b0c2dff
2011-07-21 19:14:16 +09:00
Tadashi G. Takaoka 3be0039164 Fix potential NPE
Change-Id: I3679d24b6c89e081d24d59c91b136c139dcb3d5c
2011-07-21 02:27:27 -07:00
Tadashi G. Takaoka 055265684b Revert "Guard unused voice functions"
This reverts commit 795a712ecf.
Bug: 4985273
2011-07-21 02:18:35 -07:00
Tadashi G. Takaoka b880731620 Merge "Revert "Add Right-To-Left delete icon"" 2011-07-21 00:45:08 -07:00
satok 60cb1cc7b3 Merge "Guard unused voice functions" 2011-07-21 00:10:30 -07:00
Tadashi G. Takaoka 852f052737 Merge "Fix centering key icon when visual inset is specified" 2011-07-21 00:08:13 -07:00
satok 795a712ecf Guard unused voice functions
Bug: 4985273
Change-Id: I9491b4af24e636cba6362cdde44568d14f7b2b85
2011-07-21 16:07:00 +09: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
Jean Chalard 728ab86f8c Merge "Fallback to the included dict if the passed one is invalid" 2011-07-20 19:50:54 -07:00
Tadashi G. Takaoka 6ffb827ad5 Fix centering key icon when visual inset is specified
Change-Id: Iae9cb87cc341a88fab269b629aa45c77adf232be
2011-07-20 19:05:27 -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
Jean Chalard 7e19a64c86 Fallback to the included dict if the passed one is invalid
If all dictionaries returned by the dictionary pack are invalid,
then fallback to the dictionary included in the resources for this
locale.

Bug: 5052486
Change-Id: Id875194ca56a74b2ed6f5b0b4fdd55475f6842c8
2011-07-20 19:53:47 +09:00
Ken Wakasa 856b582cfb Vibrator.hasVibrator() takes no parameter.
bug: 5038842
Change-Id: I239a2f35488a1f18ecdb019abc50e72e3e9da297
2011-07-20 16:51:05 +09: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 1dc80048d7 Merge "Support select input method dialog on pre-HC platform" 2011-07-19 23:22:37 -07:00
Tadashi G. Takaoka bf9d8348d8 Support select input method dialog on pre-HC platform
Bug: 4971680
Change-Id: I641b336da54813e13409bd7874aa22e51f790729
2011-07-19 22:22:47 -07:00
Tadashi G. Takaoka d856b94a7b Merge "Revert "Keep keyboard layout while orientation change"" 2011-07-19 21:22:14 -07:00
Tadashi G. Takaoka 89bb88f61c Revert "Keep keyboard layout while orientation change"
This reverts commit 8ebbe03fed.

Bug: 5037466
2011-07-19 18:13:22 -07:00
Tadashi G. Takaoka 5ab5807d91 Remove long-press-to-save feature from CandidateView
Bug: 5027059
Change-Id: I884a84e50e810c0c4a8255217b39ea24937c756b
2011-07-19 17:22:02 -07:00
Jean Chalard 40f7efc172 Fix an NPE related to absent InputConnection
Bug: 5035577
Change-Id: I1a11fc475d4a0f692636000d0b0f40bc35427867
2011-07-19 19:25:48 +09:00
Jean Chalard 44861474fb Add a number of NULL pointer guards.
None of these are expected to actually be null, but those are
included for peace of mind and foolproofing against future
code changes.

Bug: 4580040
Change-Id: Ib112b3e5db5f177aaf61767164b7e78d711f90a0
2011-07-19 18:19:23 +09:00
Jean Chalard 494ab16396 Merge "Deactivate the user unigram dictionary." 2011-07-19 01:50:57 -07:00
Jean Chalard 52f20d6a43 Deactivate the user unigram dictionary.
Bug: 3459274
Change-Id: I41b7617623b5b2e48c2e460dc7f2d5ff410c8a4c
2011-07-19 17:30:52 +09:00
Jean Chalard 2b4eabed2b Allow double-space-period after relevant punctuation signs.
This allows the user to enter a period via double-space after quotes,
currency symbols, brackets and other non-sentence-finishing
punctuation marks.

Bug: 3430389
Change-Id: Ibe40b3902861207eb918e7be6113e8be12216f53
2011-07-19 16:12:24 +09:00
Tadashi G. Takaoka fa9f4d1bad Merge "Trigger IME switcher by long-pressing space key" 2011-07-17 17:34:57 -07:00
Tadashi G. Takaoka 98b5c982b9 Trigger IME switcher by long-pressing space key
Long press time out for space key is set to 1000msec.
FYI: Time out for shift key is 1200ms and for mini popup keyboard is 400ms.

Bug: 4971680
Change-Id: Id05f519baa15ca2e54958997ddf7b6b3b7a2d078
2011-07-17 17:23:43 -07:00
Tadashi G. Takaoka f0d6058b9e Fix NPE
Bug: 5030817
Change-Id: I13133abb308d9f0c8169b6ea3fc0913ce5dda3d6
2011-07-17 16:37:01 -07:00
Tadashi G. Takaoka 2811841ab4 Honor EditorType's IME_FLAG_NO_EXTRACT_UI and IME_FLAG_NO_FULLSCREEN flags
Bug: 5030408
Change-Id: I1c5649725780cd063db7a437b8559b7f2573469c
2011-07-15 16:21:16 -07:00
Jean Chalard faf913c1b2 Merge "Rename AutoDictionary to UserUnigramDictionary." 2011-07-14 20:45:48 -07:00
Jean Chalard f422345211 Rename AutoDictionary to UserUnigramDictionary.
...and adjust internal functions, variables and constant names.

Bug: 3459274
Change-Id: I1b11c6adfee360ac0fc22d627955688b3dbdcffc
2011-07-15 12:14:47 +09:00
Tadashi G. Takaoka 6989e0b804 Update Arabic keyboard
Bug: 4161983
Change-Id: Ie163cd17c87773bf2ca37fff7cff79611fff644f
2011-07-14 01:04:12 -07:00
Tadashi G. Takaoka 41c1f48028 Fix IndexOutOfBound exception
Bug: 5011243
Change-Id: Iaaafa50b42e5155e3682132217d3e079a170ed89
2011-07-13 18:45:10 -07:00
Tadashi G. Takaoka 5cbdb23621 Fix IOOB Exception
Bug: 5021745
Change-Id: I58815ca3f3c8b1bead895e8a94e2f89dbcc67436
2011-07-13 12:26:40 -07:00
Jean Chalard 18fa487202 Merge "Fix crash on adding a word in the user dictionary." 2011-07-13 02:06:14 -07:00
Jean Chalard 092826c8cd Fix crash on adding a word in the user dictionary.
When the User dictionary service is off, LatinIME still allows to add
words to it and it crashed if the user tries to do so. This change
fixes the crash; it does not however fix the interface.

Bug: 5004408
Change-Id: I5bd2684ab3010963c1f737fc764e70e79aadbe8d
2011-07-13 17:52:34 +09: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 e0d3922ba3 Merge "Fix mini keyboard behavior while chording input" 2011-07-12 21:53:48 -07:00
Tadashi G. Takaoka 5245401b57 Merge "Add Right-To-Left delete icon" 2011-07-12 21:53:05 -07:00
Tadashi G. Takaoka 63c233ab9f Fix mini keyboard behavior while chording input
This change makes PopupMiniKeyboardView based on KeyboardView, so that
only LatinKeyboardBaseView can manage touch event and PointerTracker.

Bug: 4768084
Change-Id: Id30b132f1fae45da6e79ce822745cf0a653b8eb3
2011-07-12 21:52:49 -07:00
Ken Wakasa 4f365403c5 Fix build breakage
Change-Id: Id2c2d152f54d00842ef9e200ccdce1e13cc128cb
2011-07-13 13:49:13 +09: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
Ken Wakasa 84cb23a789 Small code cleanup
Change-Id: I7075d85f745c3b186e6d06086b9fcd54e7459feb
2011-07-13 12:15:22 +09:00
Ken Wakasa 656a35f9df Merge "Code cleanup" 2011-07-12 00:57:33 -07:00
satok 8275fb0a1a Merge "Create proximity info just after parsing keyboard layouts" 2011-07-12 00:57:06 -07:00
satok 0d5494c66a Create proximity info just after parsing keyboard layouts
Bug: 4807069
Change-Id: Ic18b2fc526efec58510841884a949a1a0201e7f5
2011-07-12 16:52:02 +09:00
Ken Wakasa 8558cfb42a Code cleanup
Change-Id: Ie43181721ba18e0c04048eaa9e3016dcea9f5a49
2011-07-12 16:47:08 +09:00
Ken Wakasa 9318d33b6e Change variable names for readability
Change-Id: I9face4e90af4bcd6040eb7e303b596af7d643934
2011-07-12 12:08:58 +09:00
Tadashi G. Takaoka 1fa878339e Merge "Fix event handling on non-distinct multi touch device" 2011-07-11 19:07:22 -07:00
Tadashi G. Takaoka 8ebbe03fed Keep keyboard layout while orientation change
This change can retain symbols layout only, can't retain shift or
shift lock state of the keyboard.

Bug: 4311428
Change-Id: I6248ed9a6d762e1ca4b72e391fdca9bc9f55ac35
2011-07-11 18:16:14 -07:00
Tadashi G. Takaoka 04dec7f84d Fix event handling on non-distinct multi touch device
This bug has been introduced by Idfbc9706.

Bug: 4768084
Change-Id: If9e2a2d3ed1f6b4e6209c883e6fcca52286ede3f
2011-07-11 17:03:12 -07:00
Tadashi G. Takaoka 08eea95650 Merge "Add KeyEventHandler interface" 2011-07-11 10:54:31 -07:00
Tadashi G. Takaoka f426cdd5c6 Add KeyEventHandler interface
This change also revert KeyboardView to non-abstract class.

Bug: 4768084
Change-Id: I827defb58bfb28b345464f6a89aa4438e41cf1e2
2011-07-10 19:48:14 -07:00
satok 4a0c343dbd Use InputMethodSettingsActivity
Bug: 4979539
Change-Id: Ib721814bfe80822ded7b0d801f6bc0c854588da4
2011-07-11 10:15:03 +09:00
Tadashi G. Takaoka 0efe174ea4 Pass KeyboardView to PointerTracker on down event
Bug: 4768084
Change-Id: I446b98daef8c9ec2408481e59cb2a88754ef9e01
2011-07-10 18:06:42 -07:00
Tadashi G. Takaoka 952266674a Merge "Move processing MotionEvent out from PointerTracker" 2011-07-10 14:24:26 -07:00
Tadashi G. Takaoka 3fdae97417 Move processing MotionEvent out from PointerTracker
Bug: 4768084
Change-Id: Idfbc9706f9daeaa979edeee9064cb69326bd3bbc
2011-07-08 21:19:16 -07:00
satok ba1390f999 Merge "Use InputMethodSettingsFragment" 2011-07-08 21:18:36 -07:00
Tadashi G. Takaoka d719fe1f5c Merge "Narrower key timer handler static inner class to TimerProxy interface" 2011-07-08 19:26:50 -07:00
satok 1a3bb54bb4 Use InputMethodSettingsFragment
Bug: 4979539

Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
2011-07-09 11:25:54 +09:00
Tadashi G. Takaoka 2321caa1f9 Narrower key timer handler static inner class to TimerProxy interface
Bug: 4768084
Change-Id: I8fdff864d09321b44d56a6a32e10aec3f0f5a4d1
2011-07-08 19:15:16 -07:00
satok 68d419d1f5 Merge "Internal cleanup before using InputMethodSettingsFragment" 2011-07-08 17:40:32 -07:00
satok 4598d12064 Internal cleanup before using InputMethodSettingsFragment
Change-Id: I7e3211feadf7b87b789040f6dcd6dda84a9d454a
2011-07-09 09:22:03 +09:00
Tadashi G. Takaoka ab41391cb4 Merge "Merge PointerTrackerKeyState into PointerTracker" 2011-07-08 17:03:37 -07:00
Tadashi G. Takaoka 8a995157f3 Merge PointerTrackerKeyState into PointerTracker
Bug: 4768084
Change-Id: I0be0e07bff2542db6ba764dcb13505dfbff6994e
2011-07-08 16:26:11 -07:00
satok 41f1509334 Remove override which will be invalid.
Change-Id: I8b548e0167791c1f5e46971901d13ee1aadc45da
2011-07-09 08:15:36 +09: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 1c9817f0e6 Remove stale TODO comments
Change-Id: I800e25ca1ecfb11580decd1de147b3f3ae5defb0
2011-07-07 22:51:12 -07:00
Tadashi G. Takaoka 48f989dee5 Merge "Override onSizeChanged only on main keyboard view" 2011-07-07 22:33:44 -07:00
Tadashi G. Takaoka bb4be5444b Override onSizeChanged only on main keyboard view
Bug: 4768084
Change-Id: I555efbd1bf75691a3a2724e9d9c1a9055039aacc
2011-07-07 22:02:17 -07:00
Tadashi G. Takaoka 906f03121b Holding PointerTrackerQueue inside PointerTracker
Bug: 4768084
Change-Id: Id5006e549c4018a656abd088f14a209415baafed
2011-07-07 17:16:35 -07:00
Ken Wakasa 1bd62a5621 Fix missing suggestions after "Touch again to save"
This is an amendment to If848320c

bug: 5000317
Change-Id: I7eed5759c6adc0538c51f540c84a597919e792fa
2011-07-07 17:59:19 +09:00
Tadashi G. Takaoka c810b0d63a Merge "Make sure that each view has its own dedicated background drawable" 2011-07-06 19:12:39 -07:00
Tadashi G. Takaoka 88110d1799 Clear CandidateView in onStartInputView
Before starting input on new TextView, we must clear the CandidateView
because it may hold the suggestion of previous TextView or even worse
the suggestions pane has been expanded and keyboard has been hidden.

Bug: 4995414
Change-Id: If848320c1a510e7018d36ed8ac61291be2fc6ce5
2011-07-06 17:57:24 -07:00
Tadashi G. Takaoka 7c57e3bda1 Make sure that each view has its own dedicated background drawable
Bug: 4998490
Change-Id: I3527fc41f0f03bbb32e3d1880665c6995354aa57
2011-07-06 17:42:03 -07:00
Ken Wakasa 273e5d60f4 Use the new settings activity class name
Follow up to I96230f05

Change-Id: I0ee7ccb5461764490ae9c977658883b10fe3ed3d
2011-07-06 12:38:34 +09: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 bd02fa8495 Merge "Move key hysteresis distance parameter to KeyDetector class" 2011-07-04 06:38:41 -07: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
satok e55996373f Removed unused import
Change-Id: I87344f071e982dfc37b17553c5a7054e26009cc7
2011-07-04 22:26:05 +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 386899a8b0 Merge "Disable auto-correction when application auto completion has set" 2011-07-04 02:20:05 -07:00
satok 67b5180e85 Merge "Add SettingsActivity" 2011-07-04 02:11:38 -07:00
satok 29387a8922 Merge "Fixed a visibility of a shortcut button" 2011-07-04 02:10:44 -07:00
satok 1be5028dcf Add SettingsActivity
Change-Id: I26d9f90fe18bd7723f1c3c0c9fafbb659cb2f020
2011-07-04 18:08:26 +09:00
satok 1cda6eb176 Fixed a visibility of a shortcut button
Change-Id: I65e57f6742186b3434d6582ce7f2a1d5d91ce588
2011-07-04 17:49:30 +09:00
Tadashi G. Takaoka 5238df54ad Disable auto-correction when application auto completion has set
Change-Id: I3f4ecfe7f2d96613dd37d41d9195d94864f82b48
2011-07-04 16:21:32 +09:00
Tadashi G. Takaoka 7d3821c2b3 Merge "Use Key background for suggestions strip control" 2011-07-04 00:10:39 -07:00
Tadashi G. Takaoka e583371b13 Use Key background for suggestions strip control
Change-Id: I5e43c0919e89972283fd18eb29d69f96f1bd0290
2011-07-04 15:42:20 +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 c190da0e02 Merge "Remove top padding parameter from MiniKeyboardBuilder constructor" 2011-07-02 05:24:50 -07:00
Tadashi G. Takaoka 17dc839503 Merge "Set candidates pane control visibility gone when touch-to-save is activated" 2011-07-02 05:24:15 -07: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 5a931efe1e Set candidates pane control visibility gone when touch-to-save is activated
Bug: 4985540
Change-Id: I9ca9e9bd990d9cdae0da22625be88bbfa4c7ee62
2011-07-02 01:59:49 +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 7f3e5979d7 Merge "Calculate text width more conservatively" 2011-07-01 06:35:10 -07:00
Tadashi G. Takaoka fe9b65afa8 Calculate text width more conservatively
Change-Id: If937ca0d05d50def115f6d275ed4b727c71e7bf4
2011-07-01 22:26:24 +09:00
Tadashi G. Takaoka 4edc7d074b Disable candidate pane controller just after suggestions are set
Change-Id: I62e24bc39e80e2b51d1a29d093a96a8480254da2
2011-07-01 21:19:31 +09:00
Tadashi G. Takaoka f008ae9ece Merge "Tweak ICS theme a bit" 2011-07-01 05:12:43 -07:00
Tadashi G. Takaoka 3118277dd4 Tweak ICS theme a bit
Change-Id: Ib8f1a712a1fc3fd6f08b336617b4b6a17af11376
2011-07-01 21:11:34 +09:00
satok 7821a1d4d1 Merge "Refactor settings" 2011-07-01 03:49:29 -07:00
satok dec7703d9b Refactor settings
Change-Id: I2e0108ba429b477a07cfd53dcc664c0e43ff16a7
2011-07-01 19:43:09 +09:00
Alan Viverette 87d7929d14 Added text navigation gestures for keyboard touch exploration.
Bug: 4905427
Change-Id: I9b44d65e4503e46ce71322a3c325c55d188e34a0
2011-06-30 11:59:35 -07:00
Tadashi G. Takaoka 7e7244873a Merge "Adaptive suggestions strip" 2011-06-30 08:52:04 -07:00
Tadashi G. Takaoka 74b6897a12 Adaptive suggestions strip
Bug: 4903845
Change-Id: I9e2e17a9eee72df5c92414dcd4796ed7fe1655e1
2011-07-01 00:46:34 +09:00
Ken Wakasa 9ae24750f4 Some clean up and fixes around auto-correction cancellation logic
Change-Id: I07f4c3cd98d14d9f0da2de54bfa76a3867389f6f
2011-06-30 18:35:17 +09:00
Tadashi G. Takaoka a65d84ce81 Merge "Add key description for "fullwidth asterisk" used on phone/number layout" 2011-06-29 03:02:30 -07:00
Tadashi G. Takaoka 0464850e6c Add key description for "fullwidth asterisk" used on phone/number layout
This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.

Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
2011-06-29 18:51:22 +09:00
Tadashi G. Takaoka 73d377a953 Merge "Cleanup key drawing code" 2011-06-29 02:40:33 -07: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
satok 284c32900b Merge "Show subtype settings preference for new design" 2011-06-28 22:10:20 -07:00
satok b9e56cde8b Show subtype settings preference for new design
Change-Id: I6164ab6ae3d97e2095778a4a6fd9f36c508af7b0
2011-06-28 21:33:17 +09:00
Tadashi G. Takaoka 670e1c6b71 Add visual debug mode
Change-Id: Ife131a398c0753b5b0e6e8969fe7bbc2a3bdab96
2011-06-28 19:13:52 +09:00
Tadashi G. Takaoka 49c8567db2 Merge "Use left/right-edge popup preview background" 2011-06-28 00:32:19 -07:00
Tadashi G. Takaoka d87f28f145 Use left/right-edge popup preview background
Bug: 4902361
Change-Id: Iafbadd0e44c0db2fb6a0875c964304bec6ac8cb0
2011-06-28 16:00:23 +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 d44160d253 Merge "Draw popup hint "..." by text rendering" 2011-06-27 09:53:25 -07:00
Tadashi G. Takaoka 3040c8bcdd Draw popup hint "..." by text rendering
Bug: 4959808
Change-Id: I30456b91852904c6801cbdd6476406fd60e84551
2011-06-28 01:50:26 +09:00
Tadashi G. Takaoka 660d42fb36 Remove mInForeground flag from KeyboardView
Instead of that, added cancelAllMessages() and call it from
onFinishInputView().

Change-Id: I58f6f0931ed8d73441d80d9616ba3afbbbe38e05
2011-06-28 01:00:59 +09:00
Tadashi G. Takaoka 55303bc634 Re-create input view after voice IME finished
Change-Id: Ia389eb43ac7ffec229bfd8b0fe56ce8271cb1d39
2011-06-27 23:46:15 +09:00
Tadashi G. Takaoka 7e9615f218 Fix NPE
Change-Id: Ia2c7d9e9298330ae991956fca64b225adaeff898
2011-06-27 22:54:18 +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 281e180c33 Fix NPE
Change-Id: Ie4b8b657fc6cc5a819d4ea3a0ca4536e6fdf6825
2011-06-27 20:30:40 +09:00
Tadashi G. Takaoka d8850ae1ab Merge "Draw phone/number keyboard layout witout icon" 2011-06-27 04:17:51 -07:00
Tadashi G. Takaoka b47319867e Show long suggestion in condensed and ellipsized text
Bug: 4903845
Change-Id: I75d58fb55f81594ebb2628ea21d00c2eb59fa70e
2011-06-27 20:17:08 +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 717a8f50ae Use dedicated layout for "touch to save word" feature
Change-Id: Ie8c948476740a645d8b2d9a9d821236941d27adf
2011-06-27 18:04:22 +09:00
Tadashi G. Takaoka 7fb04fe007 Fix ragged suggestion strip baseline
Change-Id: I5fa9e2ad0993602e24f436e1d8ad0999209e5180
2011-06-26 02:07:07 +09:00
Ken Wakasa 4f0d290c5d Avoid memory leak by by non-static Handler inner classes
bug: 4901934
Change-Id: I870ab2e621ef3640a84468f09c074cdd726dc963
2011-06-26 00:14:40 +09:00
Tadashi G. Takaoka 87a32135ab Merge "Remove spacebar preview and arrows" 2011-06-24 05:45:09 -07:00
Tadashi G. Takaoka 14daf66fc5 Remove spacebar preview and arrows
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +09:00
Jean Chalard bbda98dc3e Merge "Add a link from Latin IME to the dictionary pack." 2011-06-24 04:27:12 -07:00
Jean Chalard 4f3d5d3733 Add a link from Latin IME to the dictionary pack.
The link only shows up if the dictionary pack is installed.

Bug: 1752028
Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d
2011-06-24 20:17:38 +09:00
Ken Wakasa 52344a0788 Fix NPE with the unit test
Change-Id: I0836f8b7191287bcff65cdc8a8ce0ff7484e9f65
2011-06-24 15:31:09 +09:00
Tadashi G. Takaoka 2442e77985 Display suggested word info in debug mode
Bug: 4686782
Change-Id: I0e5bef33aa39c3d6f75edda7818524965aa40b79
2011-06-24 14:19:59 +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 35bda743ed Merge "Move Key class out of internal package" 2011-06-23 07:22:58 -07: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 75d7fb6675 Remove unused argument from PopupPanel.showPanel
Change-Id: I726b98001042c8b874113ed964b7230fdd525abe
2011-06-23 21:14:55 +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
Alan Viverette 44f8dc3132 Fixing build error due to refactored import.
Change-Id: I7ed51fa4373fd5d1ebc6ebe52c6e93b27b43cff5
2011-06-22 12:08:10 -07:00
Svetoslav Ganov 8521781fd7 Merge "Added support for touch exploration to Latin IME." 2011-06-22 11:50:28 -07:00
Freeman Ng ae706548d6 Merge "move setup wizard package name into google namespace" 2011-06-22 11:03:43 -07:00
Alan Viverette 5ac4638f99 Added support for touch exploration to Latin IME.
Bug: 4379983
Change-Id: I97f22e54827c6229054b514801401ffa5b4ed3b8
2011-06-22 10:54:06 -07:00
Tadashi G. Takaoka 3edc97b275 Merge "Remove colorScheme attribute from KeyboardView" 2011-06-22 08:51:36 -07:00
Tadashi G. Takaoka a93d27d6b8 Remove colorScheme attribute from KeyboardView
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka a7eed902f1 Make CandidateView backward compatible
Up to version 10 (Gingerbread) of the API, FrameLayout doesn't handle
margin properly.  This change inserts RelativeLayout to FrameLayout as
placer to set margin and place children views absolutely.

Change-Id: Iee785bc2da77677738caf456bcd2bbf57b89f007
2011-06-22 20:16:21 +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
Freeman Ng 713c686447 move setup wizard package name into google namespace
bug: 3027897
Change-Id: I8fbc7a742051d62880cb65edfb2808cd2b0ccba8
2011-06-21 14:56:42 -07:00
Tadashi G. Takaoka 0150be2a9b Merge "Use 2 arguments LinearLayout constructor" 2011-06-21 07:39:55 -07:00
Tadashi G. Takaoka f921129f9b Use 2 arguments LinearLayout constructor
To maintain backward compatibility back to Froyo, we can't call
3-argument constructor of LinearLayout.

Change-Id: I35310704f92812d2748d32f35820a5058fa2bf31
2011-06-21 22:09:19 +09:00
Tadashi G. Takaoka 839fb35f2b Merge "Support Turkish keyboard" 2011-06-21 02:40:42 -07:00
Tadashi G. Takaoka 35f20916e5 Support Turkish keyboard
I left TODOs in Suggest.java because we must pay attention to locale
when changing character's case. Filed another Bug: 4769095 to track
that.

Bug: 4768050
Change-Id: I1ae2c4ffd2208403a8c2a25dd3a56b71dcefc826
2011-06-21 17:50:17 +09:00
Tadashi G. Takaoka 6313db1d11 Merge "Add ArraysCompatUtils.binarySearch" 2011-06-21 01:42:17 -07:00
Tadashi G. Takaoka acd1a1c7a8 Add ArraysCompatUtils.binarySearch
Until API version 9, java.util.Arrays.binarySearch(int[], int, int,
int) doesn't exist.

Change-Id: Ife0ed4fbac642eda069e7b6f6b8dd30e0cd5fdee
2011-06-21 17:02:38 +09:00
Tadashi G. Takaoka 05c0fc6136 Fix NPE in LatinKeyboard
Bug: 4727778
Change-Id: I9d5b7185d75408a8af6d302fb348e118c0f9721e
2011-06-21 10:15:54 +09:00
Tadashi G. Takaoka 87154c656e Fix NPE
Bug: 4727778
Change-Id: I08f1204d5f77251c197dda7d2b332441f9f7123d
2011-06-21 02:31:33 +09:00
Tadashi G. Takaoka 2951aa7e93 Fix NPE
NPE has occured while getting containerHeight in
LatinIME.onComputeInsets().

Change-Id: Ib906c20791a1f80a5c484a75eead9d2816a9da1b
2011-06-20 22:34:24 +09:00
Tadashi G. Takaoka 905a6cdcba Merge "Close dictionary appropriately" 2011-06-20 04:08:04 -07:00
Tadashi G. Takaoka 3439c72639 Close dictionary appropriately
The dictionary that extends ExpandableDictionary must be closed when
it becomes unused.

Bug: 4725930
Change-Id: Ib5d2c39771fb7010d303a26d1ea1c8e237c0101f
2011-06-20 20:06:54 +09:00
Tadashi G. Takaoka 5a2d063047 Remove unnecessary onRefreshKeyboard call.
When using the sliding spacebar language switch on ICS, both
LatinIME.toggleLanguage() and
InputMethodService.onCurrentInputMethodSubtypeChanged() invoke
LatinIME.onRefreshKeyboard().  This change eliminates the first one if
it isn't necessary.

This change also cleans up the followings.
  * reuse theme Context when the keyboard theme hasn't been changed.
  * clear the Keyboard cache when theme has been switched.
  * eliminates unnecessary Context reference from LatinKeyboard and
    SlidingLocaleDrawable.
  * recycle Bitmap and reuse Canvas in KeyboardView.

Bug: 4725930
Change-Id: I87366e9304879d94d12b7345adea768d86d43519
2011-06-20 19:21:31 +09:00
Tadashi G. Takaoka e218baa6cc Fix NPE
Change-Id: I35efd1d6c8c2b48d93675d014d5c7aef7d12ed58
2011-06-20 11:29:04 +09:00
Tadashi G. Takaoka 5e4e05afd2 Fix NPE
Bug: 4686479
Change-Id: I0b8a32d0f9bcebe55eebecd38dc5e69198e94378
2011-06-18 23:43:58 +09:00
Tadashi G. Takaoka 8f5a3842e6 Merge "Disable showing TAB key when navigate flags are specified" 2011-06-17 05:27:35 -07:00
Tadashi G. Takaoka f0f726464d Disable showing TAB key when navigate flags are specified
Bug: 3094312
Change-Id: Ibbd36020c1e40daab220b588e6c190979afe7149
2011-06-17 21:13:35 +09:00
Tadashi G. Takaoka c78278bfb4 Temporarily disable displaying debug information
Should come up with the way to display the debug info again soon.

Change-Id: I20a01d1f03330cee05d4e52fd1ab622e315c87e9
2011-06-17 21:11:23 +09:00
satok 144ba95813 Merge "Refactor of SuggestionSpanUtils" 2011-06-17 03:29:08 -07:00
Tadashi G. Takaoka 28a38fdfee Tab key is shown when editor navigation flag is set
Previously tab key is shown only when the input type variant says that
it is web input.  In addition to that, this change also shows tab key
when the IME option includes editor action (next and/or previous)
flag.

Bug: 3094312
Change-Id: I3f8841fdbcee918a0f93f3259090f24e70d96471
2011-06-17 19:08:49 +09:00
satok 23726dbdca Refactor of SuggestionSpanUtils
Change-Id: Id266062831e8c28a346e129168b883ee3d5622bf
2011-06-17 18:25:36 +09:00
Tadashi G. Takaoka 237af54df5 Tune up 7 inch keyboard layout
Bug: 4479212
Change-Id: I25c48ef474f6198dde9b670b23509c087acae149
2011-06-17 16:27:51 +09:00
Tadashi G. Takaoka 4b1c759c77 Merge "Add Key.keyHintLabel and remove Key.keyHintIcon" 2011-06-16 05:24:49 -07:00
Tadashi G. Takaoka 9d9522abdc Add Key.keyHintLabel and remove Key.keyHintIcon
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon.  Instead of these keyLabelOption now
has hasUppercaseLetter flag value.

Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
2011-06-16 21:24:19 +09:00
Jean Chalard f844094e83 Merge "Small performance fix." 2011-06-16 04:29:21 -07:00
Tadashi G. Takaoka a61967330e Make LatinKeyboard aware of theme
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
2011-06-16 20:10:49 +09:00
Jean Chalard 516f18f97e Small performance fix.
This improves performance by not allocating an iterator.

Change-Id: I5511fd8b8d3aa826917620c0af994dbaf1562bb1
2011-06-16 20:05:46 +09:00
Tadashi G. Takaoka 08a6f2aea7 Make CandidateView aware of theme
This change is needed to introduce new theme easily.

Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
2011-06-15 20:02:45 +09:00
Tadashi G. Takaoka 66bafe24f6 Merge "Make Keyboard aware of theme" 2011-06-15 03:56:26 -07:00
Tadashi G. Takaoka b7758d6f91 Make Keyboard aware of theme
This change is needed to introduce new theme easily. As a starter this
change introduces Keyboard.popupHintIcon attribute and
Key.keyLabelOption.popupHint flag to show popup hint icon that is
previously specified by Key.keyHintIcon attribute.

Bug: 4436327
Change-Id: I6b1c5c1b88eece541141b2d2cedd164ee02e5c2a
2011-06-15 19:51:30 +09:00
satok e968ad8ad1 Merge "Remove the original text from SuggestionSpan" 2011-06-15 02:43:03 -07:00
satok 064e21bb1d Remove the original text from SuggestionSpan
Change-Id: If70d32cad980b46ba77f399606d7ab3957c5d096
2011-06-15 18:32:07 +09:00
Tadashi G. Takaoka 1ddb4897fe Fix Keyboard crash when chording and long pressing key
This change just prevents crashing. The another bug#4646271 has been
opened to support chording and long pressing key.

Bug: 4463909
Change-Id: I50e42656fe111e6b261310c899e672b8ba001e5d
2011-06-15 17:05:39 +09:00
Tadashi G. Takaoka 862e05a8f0 Fix NPE in CandidateView.offsetMargin
Bug: 4609124
Change-Id: I14913afba80732e6beb8458b404001798a221a79
2011-06-15 10:48:53 +09:00
Tadashi G. Takaoka 86e815a142 Implement expandable candidates pane
This change removes horizontal scroll from candidates strip. Instead
of that this change introduces "fixed 3 items candidates strip" and
"expandable candidates pane".

Bug: 4175031

Change-Id: Ia367d9074436fdea76d3b653d81798ce2749170e
2011-06-14 20:40:56 +09:00
Jean Chalard 90cb2e6296 Merge "Add an option to use or not the contacts dictionary." 2011-06-13 01:48:00 -07:00
Jean Chalard 699094f9b6 Add an option to use or not the contacts dictionary.
Bug: 4586840
Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
2011-06-13 17:33:04 +09:00
Tadashi G. Takaoka 070760dc5a Clean up candidate strip view hierarchy
Bug: 4175031
Change-Id: I8073739ac7624d2c0a111c5ef7043d8766162a83
2011-06-13 15:12:23 +09:00
Tadashi G. Takaoka 8d828fc449 am bdbefac0: am 263749f2: am 37deb112: Fix IndexOutOfBoundsException
* commit 'bdbefac0b471e8a70c5d4958b8d1a345777d6bdb':
  Fix IndexOutOfBoundsException
2011-06-10 15:11:13 -07:00
Jean Chalard 35daf4007c Merge "Stop using raw e-mail addresses as names in contacts dict." 2011-06-10 02:34:05 -07:00
Jean Chalard 1ea78d92e6 Stop using raw e-mail addresses as names in contacts dict.
Bug: 4590281
Change-Id: I37016dd066efa1463077c67e05218148cbb67df4
2011-06-10 18:18:05 +09:00
Jean Chalard dc05c6650e Demote contacts frequency.
Bug: 4586840
Change-Id: I6dbef2d973174fc49c3955547dde923d6fa48ae1
2011-06-10 17:36:12 +09:00
Tadashi G. Takaoka 37deb112c7 Fix IndexOutOfBoundsException
Bug: 4586181
Change-Id: I10a2d1486c9a0d11aa42cf7c6a33ecd70b6918d7
2011-06-10 09:57:32 +09:00
Tadashi G. Takaoka 98275e4512 Merge "Enable long press caps lock" into honeycomb-mr2 2011-06-08 23:01:46 -07:00
Tadashi G. Takaoka 7dd37ef267 Enable long press caps lock
This change is a back port from Master.
Cherry-pick: I413062c759a1d91c66fcbf5dd04050dfbf15094f

Bug: 3319295
Change-Id: I461942fde05d91519775d260410356dfcbe7f7c0
2011-06-09 14:54:57 +09:00
Tadashi G. Takaoka 06f66153be Release caps lock by double tap on shift key
This change is a back port from Master.
Cherry-pick: Ie0cad06c7b1afac0f33af76128303517e9e7bddc

Bug: 3319295
Change-Id: I4bc294161cb8bc4edfdcb1afc0c66b3812667bf3
2011-06-09 14:53:52 +09:00
Jean Chalard cb6d82da44 Merge "Enable reverting the auto-conversion of double space." 2011-06-08 22:39:49 -07:00
Tadashi G. Takaoka 91b9a6808c Merge "Introduce CandidateView.Listener" 2011-06-08 22:38:47 -07:00
Jean Chalard 4733609947 Enable reverting the auto-conversion of double space.
Bug: 3376923
Change-Id: If3fcfd208ad4a2b8a1452a21b07694d8d512c6ae
2011-06-09 14:27:40 +09:00
Tadashi G. Takaoka c97810693d Introduce CandidateView.Listener
Bug: 4175031
Change-Id: Ie84d1c86ff099350b786c71e7081d9ea9ee0d81f
2011-06-09 14:22:37 +09:00
Tadashi G. Takaoka e6d376298a Fix duplicate action next
Change-Id: I986528131a1dbe5926b8b6b2a6ffa75f48c5151a
2011-06-09 14:18:53 +09:00
Tadashi G. Takaoka 0143e11f11 Merge "Separate debug information display from candidate view" 2011-06-08 01:02:19 -07:00
Tadashi G. Takaoka 1e273fa6d1 Separate debug information display from candidate view
This change is one of the preparations for suggestion strip redesign.

Bug: 4175031
Change-Id: I82675936773ed6cf132a52486909ff21af828256
2011-06-08 16:59:37 +09:00
Freeman Ng 3d3e6f5faa Merge "Revert "move setup wizard package name to google namespace"" 2011-06-07 13:48:00 -07:00
Freeman Ng 60c5851cc8 Revert "move setup wizard package name to google namespace"
This reverts commit 1af8006352
2011-06-07 13:46:02 -07:00
Ken Wakasa a88a5eddbc Revise hasMultipleEnabledIMEsOrSubtypes()
bug: 4559308

Change-Id: If831c0827dbf030eaf1d241ebfa60d4e5029ae63
2011-06-07 22:22:15 +09:00
Tadashi G. Takaoka f20eb55d4f Fix NPE introduced by Ia0dc487c
Bug: 4553273
Change-Id: Iaf7a969b2c96750070a296791108d67887d613e4
2011-06-07 12:30:28 +09:00
Tadashi G. Takaoka ddb61ea461 Separate candidate divider from candidate view
This change is one of the preparations for suggestion strip redesign.

Bug: 4175031
Change-Id: Ia0dc487c11c3005ef19b87ec0efcc18e48411f76
2011-06-06 18:21:08 +09:00
Tadashi G. Takaoka 0dd778f832 Merge "Fix mini keyboard position" 2011-06-03 09:04:50 -07:00
Tadashi G. Takaoka f03883025f Fix mini keyboard position
This change adjusts popup mini keyboard X-coordinate not to be clipped
out of the display.

Bug: 4442045
Cherry-Pick: Ibdf4e2d0a79cddbeb89ed8ded81a2db9af9797b8
Change-Id: I1c3ce7b1c6a6d247b796a1cdcd821bf88321ddef
2011-06-04 00:21:01 +09:00
Tadashi G. Takaoka abd7392d66 Keep tablet keyboard in sync with Honeycomb-MR2
This change removes Russian keyboard layout exceptions and make it
compatible with other Latin's.

Also tweaks some locales' keyboard layout to match with standard PC's
keyboard layout at most.

Change-Id: I305201fb850b4f94ae7e746ab4c039473d09da70
2011-06-03 21:44:57 +09:00
Tadashi G. Takaoka 5859205139 Implement logical or to Keyboard switch-case matching
Change-Id: Iab615459c21fa5799a7b30b8649d75347e46c804
2011-06-03 21:03:26 +09:00
Jean Chalard 8fd75b3147 Add spell checking core methods.
Bug: 4176026
Change-Id: Ic6ea3e084b3ebacfc5fd998d2c7b0130f7b0ec48
2011-06-03 17:11:16 +09:00
Jean Chalard e93b1f2209 Allow reading a binary dictionary even without proximity info.
This prepares the way for spell checking, which is to be done
without context so without proximity info.

Bug: 4176026
Change-Id: I1b4bfaefe2611e1b484acdf3c33598cb80f81ff4
2011-06-02 12:10:13 +09:00
Tadashi G. Takaoka 2f894882a8 Revised phone/number layout for 7 inch tablet
Bug: 4442045
Change-Id: I562d75436aec2057863f6a8252275a5e47ecea6e
2011-06-01 18:45:28 +09:00
Tadashi G. Takaoka 528be97fca Fix mini keyboard position
This change adjusts popup mini keyboard X-coordinate not to be clipped
out of the display.

Bug: 4442045
Change-Id: Ibdf4e2d0a79cddbeb89ed8ded81a2db9af9797b8
2011-05-31 21:58:46 +09:00
Tadashi G. Takaoka e99738564a Merge "Adaptive keyboard width/position parser" 2011-05-31 01:55:44 -07:00
Tadashi G. Takaoka 327763e518 Adaptive keyboard width/position parser
This change introduces the following features to Keyboard XML format.

 * "keyXPos" can specify the key X coordinate directly.
 * "keyXPos" can be negative. The X coordinate will be calcluated from
    the right edge of the keyboard toward left.
 * "keyWidth" can be zero to be filled up to the right side.
 * "keyWidth can be negative. The key will be filled up to both sides.
 * Spacer's horizontalGap is renamed as keyWidth, and can be inherited
   from key-style.
 * Spacer can have keyXPos attribute.

Using these syntax, all keyboard layouts have been re-written.

Cherry-Pick: I314b2e8ca2aa145ff9506cbf927140a15685af42
Bug: 4442045
Change-Id: I048fe5eaef020d8472ab577e9d326042bae2f3fa
2011-05-31 17:52:32 +09:00
Jean Chalard 57c38bf4b0 Merge "Enable choosing a bigram prediction several times in a row." 2011-05-30 19:35:15 -07:00
Tadashi G. Takaoka c25e07d212 Fix web input type judgment
Bug: 4490948
Change-Id: I71efb8f5784970f1d2a94da1d2eb852f7f11885f
2011-05-30 19:10:25 +09:00
Jean Chalard 41ec3ec2f3 Enable choosing a bigram prediction several times in a row.
This change fixes a bug that prevented to choose a prediction
several times in a row because the predictions would be replaced
right away by punctuations.
Please note several things about this change:
- Recorrection is pretty much in the middle of being refactored.
  This change has no effect on recorrection itself, but may make
  existing strange behavior more obvious when moving the cursor
  for example.
- The part of this change in Recorrection.java is not used in
  master at the moment because ongoing changes on recorrection
  result in the control never landing there, but would have been
  needed in the past and may be needed in the future.
- This change may have adverse effects on performance which need
  to be evaluated. A comment in the code has also been written
  to this effect.
- This does not fix bug 4466199, only addresses a pinpoint case
  of it to help evaluating the bigram predictions feature.

Bug: 4466199
Change-Id: I7219e5aeb74dff9251d12b2a72f94448dbb3e63f
2011-05-30 16:03:39 +09:00
Tadashi G. Takaoka 6b38a5fd4c Adaptive keyboard width/position parser (DO NOT MERGE)
This change introduces the following features to Keyboard XML format.

 * "keyXPos" can specify the key X coordinate directly.
 * "keyXPos" can be negative. The X coordinate will be calcluated from
    the right edge of the keyboard toward left.
 * "keyWidth" can be zero to be filled up to the right side.
 * "keyWidth can be negative. The key will be filled up to both sides.
 * Spacer's horizontalGap is renamed as keyWidth, and can be inherited
   from key-style.
 * Spacer can have keyXPos attribute.

Using these syntax, all keyboard layouts have been re-written.

Bug: 4442045
Change-Id: I314b2e8ca2aa145ff9506cbf927140a15685af42
2011-05-28 10:01:00 +09:00
Tadashi G. Takaoka a8fd3af67a Merge "Remove web mode and add webInput boolean" 2011-05-27 09:09:30 -07:00
Tadashi G. Takaoka 9e2d810dc5 Remove web mode and add webInput boolean
Bug: 4490948
Change-Id: I6fe23c9ab4918eab6806cc621c4d6821c2e1baf9
Cherry-Pick: I4cd1af0b
2011-05-27 21:47:14 +09:00
Jean Chalard f4a05624ee Merge "Stop promoting auto dictionary words to the user dict." 2011-05-27 03:26:30 -07:00
Tadashi G. Takaoka 38515ae577 Remove web mode and add webInput boolean (DO NOT MERGE)
Bug: 4490948
Change-Id: I4cd1af0b48d7ebcf8f4bd939e0e363e34dbfe8b7
2011-05-27 15:20:08 +09:00
satok a0493fa070 Fix whitelist
Bug: 4090049
Change-Id: I1d57ddafcacb895196c65acaae198dad7499983b
2011-05-26 20:30:27 +09:00
Tadashi G. Takaoka f5d9649680 Introduce web and email mode (DO NOT MERGE)
This change introduces new keyboard mode "webEmail" to honor
InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS. In this mode, both
'@' key and TAB key appear on the keyboard.

The keyboard layouts will be modified with other change.

Bug: 4490948
Change-Id: I66f9bda4907da448db097e9c900199dfa700b16a
2011-05-26 19:47:47 +09:00
satok ea9098ca69 Add SuggestionSpan suggestion picked notification receiver
Bug: 4443922

Change-Id: I8a9dc5077ae06c6d0c39fd7fdd823fc4f4d05f45
2011-05-26 19:47:29 +09:00
Jean Chalard 8ef4dd9af8 Stop promoting auto dictionary words to the user dict.
Also see change I5a57ecc8 which is another fix for the same
problem.

Bug: 3459274
Change-Id: Ica2bb5b5aa4362d538df3765559d676c1aab4a85
2011-05-25 21:24:07 +09:00
Tadashi G. Takaoka 9e5be6caad Merge "Use custom theme for Keyboard theme switch" 2011-05-25 03:02:25 -07:00
Tadashi G. Takaoka 13a7419994 Use custom theme for Keyboard theme switch
This change reduces the number of layout files and make these
theme-generic.  This might be very helpful to re-design suggestion
strip.

Bug: 4175031
Change-Id: Idca10a4aa0bf7ac496eedd1879311e59780a423b
2011-05-25 18:59:00 +09:00
satok 30f38adb0b Merge "Disable the legacy recorrection functionalities if the suggestion span is supported" 2011-05-25 02:56:36 -07:00
satok 0d4757bb0b Disable the legacy recorrection functionalities if the suggestion span is supported
Bug: 4346045

Change-Id: Ib4594a9073b961038564bbcd601f9c290d153d5d
2011-05-25 18:37:48 +09:00
Tadashi G. Takaoka 6c4add55f9 Initialize CandidateView in setInputView
When keyboard theme has been switched, input view will be replaced
with new theme one and current CandidateView will get stale.  The
CandidateView must be reseted in setInputView.

Change-Id: I36fd14280572d2d367cfef549d7705b3b321ba3e
2011-05-25 18:28:03 +09:00
satok f4c9e9d359 Merge "Put SuggestionSpan at commitText" 2011-05-25 02:00:05 -07:00
Tadashi G. Takaoka 3e17686c68 Fix missing setService call for CandaiteView
This bug has been introduced by I95f379b9.

Bug: 4486388
Change-Id: I23fd3abe05946d4709b4593efa4713cd19723479
2011-05-25 17:57:33 +09:00
satok 1fef530ec7 Put SuggestionSpan at commitText
Bug: 4346045
Change-Id: Iaabdb8a148b2601bb9cbc2b08509adac164105a4
2011-05-25 17:48:31 +09:00
Tadashi G. Takaoka 0aa0133795 Fix missing initializartion of key preview position
This is followup of Iddab254c

Change-Id: I2d8e68b696779b742d29fdcf03c5fb509cb0bd87
2011-05-25 16:14:19 +09:00
Tadashi G. Takaoka 598a25d990 Merge "Enable long press even if the key is disabled" 2011-05-24 23:52:12 -07:00
Tadashi G. Takaoka e07b51e7c6 Enable long press even if the key is disabled
Change-Id: Iddab254c7d6625bf44473109b4a52d2f7a163a27
2011-05-25 15:22:03 +09:00
Tadashi G. Takaoka f3cd2bb33d Fix IllegalStateException when setting input view
This is followup change of I95f379b9.

Bug: 4175031
Change-Id: Ibf3e3bd2524c9543ec6193cb6e59529b2c4df3b1
2011-05-25 15:09:09 +09:00
Tadashi G. Takaoka 187a8da246 Merge "Move CandidateView into input view" 2011-05-24 00:12:20 -07:00
Tadashi G. Takaoka c150acc7c8 Move CandidateView into input view
Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
2011-05-24 15:37:53 +09:00
Tadashi G. Takaoka 5979673c9e Merge "Fix reflection method invokation" 2011-05-23 19:27:11 -07:00
Tadashi G. Takaoka 8e26dfeaae Add missing IME_ACTION_NEXT
Change-Id: I377042c1750dd97b922bcf40bffb4046e023f6bb
2011-05-24 11:22:25 +09:00
Tadashi G. Takaoka f23f00a13a Fix reflection method invokation
Either of Method.invoke, Field.get and Field.set can accept null as
receiver.

Change-Id: I4539dcc95a794f6ee84cf4e7aabf4e8f0206728f
2011-05-24 11:15:18 +09:00
Jean Chalard 8c08a49895 Merge "Squash case for bigram insertion/lookup." 2011-05-23 02:34:48 -07:00
Tadashi G. Takaoka 3a38fef7a0 Remove CandidatesView related method call from voice ime
Change-Id: I33ccf2c141d94437b175222b9e65c0b4e2671a35
2011-05-23 18:05:46 +09:00
Jean Chalard ed8c29568d Squash case for bigram insertion/lookup.
Bug: 4464446
Change-Id: If7b6d73fb408d53f941c82ed4f47221e85c845d8
2011-05-23 15:44:35 +09:00
Tadashi G. Takaoka 20e16475e6 Merge "Remove manual config item controlling to show input language settings" 2011-05-20 03:02:14 -07:00
Tadashi G. Takaoka 29a4b1ac88 Merge "Reload keyboard after SoftInputWindow size changed" 2011-05-20 00:42:13 -07:00
Tadashi G. Takaoka e896d31bb9 Reload keyboard after SoftInputWindow size changed
Bug: 4450008
Change-Id: Ic6c457db808d8e7479bfaa509192c07a384453e2
2011-05-20 16:23:20 +09:00
Tadashi G. Takaoka 9d98a7ed18 Merge "Fix copyright author from Google to AOSP" 2011-05-19 20:38:12 -07:00
Tadashi G. Takaoka d794c6f078 Remove manual config item controlling to show input language settings
Change-Id: I77f831c653567f2cf214a5b61107b25cca6d751d
2011-05-20 12:36:46 +09:00
Tadashi G. Takaoka f5443e4ef5 Replace large device keyboard with phone style keyboard (DO NOT MERGE)
This change also fixes copyright comments.

Bug: 4442045
Change-Id: I297a2c64e709fb0d613404e5f1de45d810f9de15
2011-05-20 12:28:26 +09:00
Tadashi G. Takaoka 8632bff2d5 Fix copyright author from Google to AOSP
Change-Id: Iaceedc783181e43af6dd48ece218a42eace66532
2011-05-20 12:09:57 +09:00
Tadashi G. Takaoka a4944dffa9 Fix NPE in Key.isDigitPopupCharacter (DO NOT MERGE)
This is the cherry-pick Ie6e8d31e41010db27e2db415b577458b73a9f1a2

Bug: 4442045
Change-Id: I004b15858d3d69b336c66accd0e078f0eaec0a9a
2011-05-19 14:36:47 +09:00
Tadashi G. Takaoka 96f185d8af Fix NPE in Key.isDigitPopupCharacter
Change-Id: Ie6e8d31e41010db27e2db415b577458b73a9f1a2
2011-05-19 14:32:33 +09:00
Freeman Ng 0e8bbe3ab4 Merge "move setup wizard package name to google namespace" 2011-05-18 12:26:57 -07:00
satok 0b47f3af83 Merge "Show full display names in the popup of the spacebar language swicher" 2011-05-18 02:34:37 -07:00
satok eaa10f44a4 Show full display names in the popup of the spacebar language swicher
- Multiply the speed of the slide

Bug: 4427222
Change-Id: Ifd2de9843191296f0f311440ea7b8ab075c67d8d
2011-05-18 18:15:50 +09:00
Jean Chalard bf65f31c5f Fix a bug in one of the methods to get a dictionary.
One of the two methods for getting a dictionary from the dictionary
pack had a bug and would not tolerate not getting an actual dictionary.
This change fixes that.

Change-Id: Id58bb27258494fb3aa60ec07a4eb27cfb5cc7279
2011-05-17 22:55:58 +09:00
satok 1f050f6348 Fix NPE
Change-Id: Ib9a000ead8be91fab815dda161fcb258f678c3f4
2011-05-14 05:52:13 +09:00
Jean Chalard bb02bd1d50 Merge "Add advanced settings screen" 2011-05-13 04:44:26 -07:00
satok 7f3674af5a Merge "Fix null pointer exception in LatinIME" 2011-05-13 04:43:47 -07:00
Jean Chalard 240297d0ee Add advanced settings screen
Also add an option for popup dismissal delay so as to inaugurate the
new screen.  Besides, remove a path for options to escape from
LatinIME and replace with a direct read from the settings.

Change-Id: I7ec6e724262871fa6523506ecc39f65c5fbe34da
2011-05-13 20:40:21 +09:00
satok fe1a6d961c Fix null pointer exception in LatinIME
Change-Id: Ic4d60fe651bdc83771137c0f61f07c3879a3f1a1
2011-05-13 20:34:53 +09:00
Tadashi G. Takaoka bdd732721d Merge "Refactor KeyboardView constructor" 2011-05-13 04:08:20 -07:00
Tadashi G. Takaoka bdd9341f61 Refactor KeyboardView constructor
Change-Id: I1fd869c180c6c9f966936fce90bc031bc7824983
2011-05-13 20:04:06 +09:00
Jean Chalard 17d6348f3f Merge "Fix a bug with dictionary add interface." 2011-05-13 03:55:04 -07:00
Jean Chalard 777118a40a Fix a bug with dictionary add interface.
Fix a bug where the "Touch again to save" message would not stay
on screen, following a wrong fix for a problem where Gingerbread-
would not display punctuation in the suggestion strip in
WebTextView.

Change-Id: I3556f83f867240ed7f16753450e6c975853208e5
2011-05-13 19:33:33 +09:00
satok 950def1df3 Merge "Update the setting of re-correction when user changed" 2011-05-13 03:19:18 -07:00
Tadashi G. Takaoka d157834345 Auto text sizing using fraction of key height
Bug: 4411676
Change-Id: I8f289dcebe577d277fe2ad6a8331d59f735cbada
2011-05-13 18:44:57 +09:00
Tadashi G. Takaoka 13e6725a78 Merge "Add minKeyboardHeight attribute to Keyboard layout" 2011-05-13 02:41:50 -07:00
satok 9467a7a523 Update the setting of re-correction when user changed
Bug: 4401929

Change-Id: I5929e44f27ba057201110d814e9ec767d09c0ee7
2011-05-13 18:35:09 +09:00
satok cbcae9a6e8 Merge "Fix the available input locales and moved Recorrection" 2011-05-12 19:33:58 -07:00
Freeman Ng 1af8006352 move setup wizard package name to google namespace
bug: 3027897
Change-Id: I0113db212d41212142265a133c1763a4acd003a5
2011-05-12 16:55:08 -07:00
satok f733074aae Fix the available input locales and moved Recorrection
Bug: 4409091

Change-Id: I6efd23ebb9528bf1bd35320057a0ea264c187451
2011-05-12 20:26:24 +09:00
Jean Chalard b47f4cd1c6 Merge "Fix a bug where the locale of the keyboard app would end up wrong." 2011-05-12 03:04:29 -07:00
Jean Chalard 039e6d7695 Merge "Fix a bug where suggestions would not update in Froyo WebTextView" 2011-05-12 02:51:24 -07:00
Jean Chalard 0d2843d852 Fix a bug where the locale of the keyboard app would end up wrong.
Change-Id: I1f9172dd987f8c2ed9b2f3d16a494e4cd264ead7
2011-05-12 18:50:21 +09:00
Jean Chalard 892b1fb18a Fix a bug where suggestions would not update in Froyo WebTextView
Bug: 4396864
Change-Id: Ia45466319498ae7e35fe8a39b4e3a361d66ac2cc
2011-05-12 18:24:55 +09:00
Tadashi G. Takaoka ff483e8d0c Add minKeyboardHeight attribute to Keyboard layout
Bug: 4411676
Change-Id: I1f56ba58bacb90790f82326718bf9de95dba5d28
2011-05-12 18:19:12 +09:00
Tadashi G. Takaoka 101a00e3d4 Revert "Added support for speaking keys through accessibility service."
This reverts commit dcade18113.

Bug: 4379983
Change-Id: I2448d8f03990a39a3e328a88904d82efc70241a2
2011-05-12 00:14:55 +09:00
Jean Chalard 4ef1b6b6b6 Merge "Refactor settings flags." 2011-05-11 04:22:52 -07:00
Jean Chalard 17c7ffeb1e Refactor settings flags.
This needs Ic5bd9b45 to not break the build.

Change-Id: I9684be89baba0f855f19c11d000c5638c04cc26e
2011-05-11 20:18:08 +09:00
Jean Chalard 4f3b59711f Fix a bug where suggestion strip pick would reset magic space
Bug: 4391347
Change-Id: I93c3c821d3ab78a300edc3d251ce7b1ee0dc3958
2011-05-11 12:40:17 +09:00
satok 9fbfd58773 Move re-correction codes to Recorrection.java
Change-Id: I0641f333bbc7d4ac27361c97252c4591584efb9d
2011-05-10 16:58:27 +09:00
satok 5c051dfefb Merge "Move Recorrection functions to Recorrection.java" 2011-05-09 22:56:35 -07:00
Tadashi G. Takaoka 14a5f53c27 Merge "Fix suggestion strip geometry" 2011-05-09 20:52:16 -07:00
Tadashi G. Takaoka 37b6b44a90 Fix suggestion strip geometry
Bug: 4393288
Change-Id: I6cad1d186db25174a3f31a57975165e720b41266
2011-05-10 11:53:55 +09:00
satok 7a8dac5527 Move Recorrection functions to Recorrection.java
Change-Id: I309d78c50074cd6fb02a9d6f51b675b158a56202
2011-05-09 20:17:02 +09:00
Jean Chalard 3d994a48a2 Merge "Improve magic space handling." 2011-05-09 04:07:16 -07:00
Tadashi G. Takaoka ff082d081f Refactor KeyboardView and create MiniKeyboardView
Change-Id: I8d68b944762ccde05020978f20b3742eb6ab945b
2011-05-09 19:17:39 +09:00
Jean Chalard 863f95b605 Improve magic space handling.
Split symbols into:
- Symbols that should swap themselves with a magic space.
- Symbols that should remove the magic space.
- Symbols that should transform the magic space into a real space.

Also, have symbols inserted from the suggestion strip always consider
the space before them to be magic.

Also, do minor refactoring to remove useless variables or make clearer
how to carry some symbol-related information.

Bug: 4391347
Change-Id: Ie2308a62c8fef55e3610897c0f58943acb7aa8c9
2011-05-09 19:15:11 +09:00
Tadashi G. Takaoka 14de691f22 Include horizontal and vertical gap in the count of Key.isOnKey
This change considers that the point is on the key while sorting in
proximity key detection.

This change is the cherry-pick of I3ee91367.

Bug: 4353949
Change-Id: I04fa0acf4d32c18bea9640b39a5c770466a37803
2011-05-09 15:41:37 +09:00
Ken Wakasa ec5ae3a1b6 Fix IndexOutOfBoundsException in LatinIME.setSuggestions
bug: 4369728
Change-Id: I7f8b09ecf7fb096bdff73b2d3575ed3779ed120d
2011-05-06 13:52:07 +09:00
Jean Chalard ccb60b7627 Merge "Straighten out magic space vs real spaces behavior." 2011-05-02 04:28:16 -07:00
Jean Chalard 0730bbfbf5 Straighten out magic space vs real spaces behavior.
Picking a suggestion inserts a space after the word. This change makes
this space a magic space.

Incidentally, do some minor cleanup: add CODE_DASH, CODE_SINGLE_QUOTE
and CODE_DOUBLE_QUOTE to Keyboard and use them throughout the code,
and remove a useless import directive in some unrelated file.

Bug: 4319740

Change-Id: I245f396c34dd0af820bca91edc4ec363238a4ae4
2011-05-02 19:19:05 +09:00
Ken Wakasa 9b2192bfd2 Revert the suggestion update delay to the original value (100msec) for phones.
This is actually a follow-up to I385f9eb2

bug: 4361287
Change-Id: I4c4a0a96a7fa28f4f96dd984453d2c9f3fa7d6c2
2011-04-29 19:23:49 +09:00
Tadashi G. Takaoka 44fe4a0598 Include horizontal and vertical gap in the count of Key.isOnKey
This change also reverts I8f6102d6 and considers that the point is on
the key while sorting in proximity key detection.

Bug: 4348994
Change-Id: I3ee913675e28da7e7b164805a7a683f0814b38b9
2011-04-29 01:21:17 +09:00
Jean Chalard 8d165bb5d1 Fix a bug where dead space would appear on the keyboard.
This change fixes a bug where there would be pixels on the keyboard
that would not return a key although it's between two keys - or even
right on top of one.
This change makes it so that the closest key to the touch - within a
certain threshold - is always returned, regardless of whether the
touch is inside or not.

Bug: 4348994

Change-Id: I8f6102d6787eb025cc3c50a26d3a475aeafc4b64
2011-04-28 22:10:02 +09:00
Jean Chalard d8f52a4f18 Improve the architecture to support multiple dictionaries.
This change enables the interface to get multiple dictionaries from a
dictionary pack. It only implements it to the end in the case of the
proprietary method, as the open method needs still some working out,
and the "inside the package" method does not need it.

This change goes together with Iaa95bf36, and breaks the build
without it.

Bug: 1752028

Change-Id: I3ccfd696e8ef083ef9c074e1c3e4bb0bf2fcfd23
2011-04-28 16:16:46 +09:00
Ken Wakasa 3bf6fbb6b8 Merge "Fix snap back behavior for a quote mark input." 2011-04-27 04:40:19 -07:00
Ken Wakasa 0b4757604d Fix snap back behavior for a quote mark input.
Follow-up for I8168ce6a

Change-Id: I63b04471c90d3d02de1bb8f092b5d57614cd8591
2011-04-27 19:10:32 +09:00
Jean Chalard f108bf8fe9 Rename a confusing variable.
mHasValidSuggestions -> mHasUncommittedTypedChars

Bug: 4322591

Change-Id: If7df986af3cf087c8e7571fd88a55e2b2ccfa38a
2011-04-27 18:49:49 +09:00
Jean Chalard 19bfef6cb0 Use the new Utils.setSystemLocale method in the new code.
The change list that introduced this code was created at the same
time as the one that introduced the Utils.setSystemLocale method
and didn't use it yet. Fix this.

Change-Id: Ifdd2ad9f7dbb7f300bc255bc2e035ae893a9d410
2011-04-27 17:10:18 +09:00
Jean Chalard 4250eb27f5 Create a dictionary collection and a dictionary factory.
The dictionary collection is a class complying to the Dictionary
interface that acts as a front end to a collection of arbitrarily many
dictionaries of any type.
The dictionary factory is a helper class for creating various
dictionaries and get some meta information about them.

At the same time, this change makes the BinaryDictionary class
not a singleton any more.

This also needs I9afe61a9 to not break the build.

Change-Id: I61fdcc4867fcda18342807bf1865e6e46979e5d5
2011-04-27 17:06:20 +09:00
Jean Chalard fd78781ced Merge "Add a method to set the locale to Utils." 2011-04-27 00:42:24 -07:00
Tadashi G. Takaoka e4181036f6 Enable long press caps lock
Bug: 3319295
Change-Id: I413062c759a1d91c66fcbf5dd04050dfbf15094f
2011-04-27 16:34:13 +09:00
Jean Chalard 309bff562f Add a method to set the locale to Utils.
Add a setLocale method to Utils that returns the previous locale.
Also unify all calls through the code.

Change-Id: Ic850dc5df19fba00ed3601835652859b4321b544
2011-04-27 16:11:34 +09:00
Tadashi G. Takaoka dbe882ac08 Merge "Release caps lock by double tap on shift key" 2011-04-26 23:57:57 -07:00
satok bc475dc297 Merge "Handle overflow properly in multiplyRate" 2011-04-26 23:55:13 -07:00
Tadashi G. Takaoka e541f03286 Release caps lock by double tap on shift key
Bug: 3319295
Change-Id: Ie0cad06c7b1afac0f33af76128303517e9e7bddc
2011-04-27 15:52:56 +09:00
Tadashi G. Takaoka b880ccc3bd Merge "Fix quotation marks" 2011-04-26 23:47:15 -07:00
Tadashi G. Takaoka 717cef79ea Fix quotation marks
This change
* Allows snap back from symbols shifted to symbol layout.
* Add "left single", "right single", "single low" and "single high
  reversed" quotation marks to popup characters of "single quote".
* Add "double low" and "double high reversed" quatation marks to popup
  characters of "double quote".
* Add "prime" and "double prime" to popup characters of "degree".
* Disable non-ASCII key of symbol more layout on passowrd input.

Bug: 4345054
Bug: 4347045
Change-Id: I8168ce6a74a9536e4966f7f9d1099ac0132925c7
2011-04-27 15:21:06 +09:00
Tadashi G. Takaoka a6581a2043 Merge "Shorter timeout to update auto caps state (100ms)" 2011-04-26 20:28:28 -07:00
satok b2e5e5937c Handle overflow properly in multiplyRate
Bug: 3401513
Change-Id: I8dd2523caa58bb51c378a01e160a58f9106ce9b8
2011-04-26 22:03:26 +09:00
Tadashi G. Takaoka a7a659ab0f Shorter timeout to update auto caps state (100ms)
Bug: 4319726
Change-Id: I068279ddfbb79dfebb6ab845d97cccd62d9e052a
2011-04-26 20:10:54 +09:00
satok 663d4f5cc1 Merge "Fix getMiddleDisplayLanguage" 2011-04-26 01:54:12 -07:00
Jean Chalard 0c8d5ca023 Fix Eclipse warnings.
This change is only there to fix warning issued by Eclipse.
It should have absolutely no impact on the program logic.

Change-Id: Ie0e242ac6c167297d33de19902340b0f6ecae9e1
2011-04-26 16:39:45 +09:00
Jean Chalard 4556de4b45 Do not use contacts for bigram prediction.
bug: 4346034

Change-Id: Ibc3c27ca92ed61f1f689df3e90e2eb60fa0cbd33
2011-04-26 15:26:51 +09:00
satok 12e07767a1 Fix getMiddleDisplayLanguage
Change-Id: Ia73d74b122069197ac471879e5f1cee34f31b182
2011-04-26 12:15:21 +09:00
satok 1123bcaf2e Merge "Display the language name on the spacebar if the full display locale name is too longer than the space bar" 2011-04-25 06:21:08 -07:00
satok cae6b1060e Display the language name on the spacebar if the full display locale name is too longer than the space bar
Bug: 4329512
Change-Id: I477684747bf9e70a6909c25877fbe9e622571fd4
2011-04-25 22:12:52 +09:00
satok efb32f7e95 Merge "Refresh the dictionary when the language settings were changed on Dogfood keyboard" 2011-04-25 05:57:44 -07:00
satok 97f855ba45 Refresh the dictionary when the language settings were changed on Dogfood keyboard
Bug: 4339319
Change-Id: Id6361927f579797932c465988f6728191748f143
2011-04-25 20:30:54 +09:00
Tadashi G. Takaoka 4c82225ad6 Disable sliding language switch on phone and number layout
Bug: 4331621
Change-Id: Id02c64bb2724a5f990d6dcc548a8d98a1034d531
2011-04-25 19:36:50 +09:00
Tadashi G. Takaoka d0f3f90789 Narrower the language switch threshold to key width x 1.25
Change-Id: I4ea9553bce34bc3783f03d1615c34b6abb153077
2011-04-22 23:21:05 +09:00
Tadashi G. Takaoka 608469c5ab Release the previous key if multi touch input is started
Change-Id: Ib1205e67e900353976150e5ad58abfc92c3dfc21
2011-04-22 21:31:22 +09:00
Tadashi G. Takaoka a0537fb4c7 Fix repeat key behavior
Change-Id: Ia7e5b2e9579aa0e5050857cdb14f16fa05a33621
2011-04-22 21:17:55 +09:00
Tadashi G. Takaoka 0156713f2a Merge "Clear spacebar sliding language switch diff" 2011-04-22 04:23:03 -07:00
satok c82b8dbd4a Merge "Fix the spacebar language switcher" 2011-04-22 03:55:05 -07:00
satok 61393a88b0 Fix the spacebar language switcher
Change-Id: I54711ff2014facefe3afd22e536045cd0ffe4955
2011-04-22 19:50:08 +09:00
Tadashi G. Takaoka f172be448c Clear spacebar sliding language switch diff
Change-Id: If82540b6632476e049fa9c4b3122e9c053227d6e
2011-04-22 18:49:15 +09:00
Tadashi G. Takaoka 75136cd009 Fix language switch preview
This change also makes the delay after key preview longer to 60ms.

Change-Id: If7cf3b493824bb12e0bf44aa0bc3c186b15b51f6
2011-04-22 18:26:32 +09:00
Tadashi G. Takaoka d00d963b9d Fix NPE on non-distict multitouch device
Change-Id: I6d8a05bf62e510d0556fa4831b3d510041cca63a
2011-04-22 17:33:24 +09:00
Tadashi G. Takaoka c5c57b506e Move sliding language switch code to PointerTracker
This change is hack and temporal.

Big: 4328445
Change-Id: I0b8851e9f05390db20ddaa10f35cff1cc9f016da
2011-04-22 17:02:38 +09:00
Jean Chalard c121b5d03e Merge "Actually use the bigram prediction option." 2011-04-22 00:51:07 -07:00
satok 940b8d81f3 Merge "Add an debug option to use spacebar switcher" 2011-04-22 00:51:07 -07:00
Jean Chalard cb3320179d Actually use the bigram prediction option.
This change also rename methods that should have been renamed in a
previous commit (namely, the
*SetBigramSuggestions family -> *UpdateBigramSuggestions)

Change-Id: I18cac17ba2b93fcc011ea133324f2c7f3532946c
2011-04-22 16:36:20 +09:00
satok c5a2b51924 Add an debug option to use spacebar switcher
Change-Id: Icc483f097696a1c5a2a7ab037afce19c9cfe837f
2011-04-22 15:54:39 +09:00
Jean Chalard b50591295d Add an option for using bigram prediction.
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.

Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
2011-04-22 15:53:48 +09:00
Jean Chalard 89bd776cf6 Use user-history bigrams when no input if available.
This also fixes a small inconsistency upon clicking on whitespace
twice in a row.
Also add some unit tests for an introduced and an existing method.

Change-Id: I1be2fb53c9624f4d0f5299009632cb4384fdfc15
2011-04-22 15:46:23 +09:00