Tadashi G. Takaoka
4e67085a15
Breakdown Arabic keyboard into rows
...
Change-Id: Ie2215d8baf501dc7dd87c464deb47fe4267171f6
2012-03-09 15:50:54 +09:00
Tadashi G. Takaoka
9a6ccf9bb0
Merge "Breakdown AZERTY keyboard into rows"
2012-03-08 22:32:24 -08:00
Tadashi G. Takaoka
22375e025b
Breakdown AZERTY keyboard into rows
...
Change-Id: Ibd202d7b141209b3e4310499134522cbd1a8c16c
2012-03-09 15:26:16 +09:00
Tadashi G. Takaoka
85d594a80e
Breakdown QWERTY keyboard into rows and share
...
Change-Id: I0b8ad39120a73395ff5a5b1a32e0f3fe681c062b
2012-03-09 15:02:27 +09:00
Tadashi G. Takaoka
1dba7c2d67
Merge "Split tablet symbols and symbols shifted layout into separated rows"
2012-03-08 21:05:53 -08:00
Tadashi G. Takaoka
174d29f468
Split tablet symbols and symbols shifted layout into separated rows
...
Bug: 6100832
Change-Id: I6771364ceca2c152bd9c55e22159f57c3468cc31
2012-03-09 12:41:56 +09:00
Tadashi G. Takaoka
b1de2912b8
Add ":" to ";" key on Greek keyboard
...
Bug: 5679585
Change-Id: I92d4b4d1eff9561adbb1bae607a1c27b4b5168ba
2012-03-09 12:22:34 +09:00
Eric Fischer
ff29b1f8e8
Import translations. DO NOT MERGE
...
Change-Id: Idab425b956341eb8556df92fb0ac33e4036e5a6e
2012-03-08 14:15:38 -08:00
Tadashi G. Takaoka
9c7db965cd
Fix forgotten resource name change
...
Change-Id: I27ea28c7ea93e50ea8f0d947df95e3ab6d146f11
2012-03-08 21:53:37 +09:00
Tadashi G. Takaoka
7d6d98ecc5
Merge "Cleanup keyboard theme switching code"
2012-03-08 03:24:38 -08:00
Tadashi G. Takaoka
411749a4ba
Cleanup keyboard theme switching code
...
Change-Id: I023769b765d07237b2129d8f1b2a02ffd4c4f09d
2012-03-08 19:17:31 +09:00
Tadashi G. Takaoka
bcbaffd9dd
Fix centering more suggestions panel on tablet
...
Bug: 6129726
Change-Id: I8dac3251eec68ad3fb523c632ff39f3cc661c81f
2012-03-08 19:02:22 +09:00
Eric Fischer
77541fc92e
Import translations. DO NOT MERGE
...
Change-Id: Iab45cb6beb91770c53ca6a8c0947f9e7ab838bf4
2012-03-07 14:44:44 -08:00
Tadashi G. Takaoka
c648b88779
Merge "Dynamically determine key preview backing view height"
2012-03-07 04:17:52 -08:00
Tadashi G. Takaoka
c8b0e5797e
Dynamically determine key preview backing view height
...
Bug: 6023947
Change-Id: I53a5c0eb99100a0dfe3e025808f5dc55747d1287
2012-03-07 20:33:17 +09:00
Tadashi G. Takaoka
898d84190b
Merge "Tweak vertical corrections for more keys in the "ICS" theme"
2012-03-07 02:06:46 -08:00
Tadashi G. Takaoka
48f6321630
Tweak vertical corrections for more keys in the "ICS" theme
...
Bug: 6129435
Change-Id: I3800a7a6926967c456e1b9b0dead94717063039a
2012-03-07 18:34:15 +09:00
Tadashi G. Takaoka
e9bfc13bff
Add readable unicode point names
...
Change-Id: I5689711429526a2bad409f235b6825a7ed4c7bc2
2012-03-07 16:35:51 +09:00
Tadashi G. Takaoka
81d4e3cd66
Add language switch key only to the phone layouts
...
Bug: 5759092
Change-Id: Ic7d7d4812976654c0e85fecabd1128eadfc52c5c
2012-03-07 10:03:21 +09:00
Jean Chalard
00ed3be95c
Correct special space handling of punctuation
...
This fixes two defects:
- One where some separators should promote a phantom space to
a real space. This bug had a unit test but wasn't tracked.
- One where French punctuations would behave incorrectly. Tracked
Bug: 6113693
Change-Id: Ia7f86fc960e00141757632ab2c9bce9168dd6966
2012-03-06 14:00:34 +09:00
Eric Fischer
97b6343a38
Import translations. DO NOT MERGE
...
Change-Id: If76e0272d3a4b1ec294ce905accf7bd0280b96dd
2012-03-05 15:49:15 -08:00
satok
907371b54f
Merge "Change the name of AOSP LatinIME spell checker"
2012-03-04 23:11:46 -08:00
satok
e54723d84d
Change the name of AOSP LatinIME spell checker
...
Change-Id: I8b93f66c272d91ba02888da31d56a9811ba2a1f0
2012-03-05 15:39:07 +09:00
Tadashi G. Takaoka
e5cbc94d10
Merge "Support embedded more key"
2012-03-04 22:10:22 -08:00
Tadashi G. Takaoka
e491be6e86
Support embedded more key
...
This is a followup change to Ie10b3e0b.
Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
2012-03-05 14:22:52 +09:00
Tadashi G. Takaoka
c7b0105114
Suppress more keys that share the same meaning with the parent key's imeAction
...
Bug: 6080806
Change-Id: Ifc3145fd79f10b39442b95432a8d19a624c2fdfd
2012-03-05 12:24:28 +09:00
Tadashi G. Takaoka
13057e7c05
Support Greek Keyboard
...
Bug: 5679585
Change-Id: I540d5ea42a830be8b85440e794cfcee92a23838e
2012-03-02 21:00:38 +09:00
Tadashi G. Takaoka
3a1844c33b
Merge "Support dividers in MoreKeysKeyboard"
2012-03-02 03:58:13 -08:00
Tadashi G. Takaoka
5ef4fccbb9
Support dividers in MoreKeysKeyboard
...
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
2012-03-02 20:52:25 +09:00
Tadashi G. Takaoka
3790353472
Merge "Support Macedonian Keyboard"
2012-03-02 03:43:46 -08:00
Tadashi G. Takaoka
775d8d8885
Support Macedonian Keyboard
...
This change also fixes missing Cyrillic DJE key of Seribian keyboard
on 10-inch tablet.
Bug: 5934396
Change-Id: I18ae5f0e54f788b65f649a52bdbbef1813334d96
2012-03-02 20:35:44 +09:00
Tadashi G. Takaoka
ede2133cb1
Support time, date, and datetime keyboard
...
Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
2012-03-02 14:01:07 +09:00
Tadashi G. Takaoka
e4c45c6ef9
Explicitly specify that labels might be in more keys
...
Bug: 6080806
Bug: 6081427
Change-Id: I455a0210e65ea2a7774e0e0071cea5f4a99577bd
2012-03-01 20:03:47 +09:00
Tadashi G. Takaoka
9b764e0cc5
Shift+Smiley can register enter in textMultiLine field
...
Bug: 2498607
Change-Id: Ied2217c49665394a01c7d3451a93c0bc647d392f
2012-02-29 17:21:55 +09:00
Eric Fischer
5a0661eae8
Import translations. DO NOT MERGE
...
Change-Id: I6e4e75a7713a683dcb4d9159179103b412ab41be
2012-02-24 14:15:04 -08:00
Eric Fischer
e2d43ef528
Import translations. DO NOT MERGE
...
Change-Id: Ibcf6712652c6faf320cefb3fe408b172adf130e0
2012-02-22 14:58:07 -08:00
Eric Fischer
f127fb7960
Merge "Import translations. DO NOT MERGE"
2012-02-22 09:38:51 -08:00
Tadashi G. Takaoka
8fe892945a
Merge "Add Georgian keyboard"
2012-02-21 23:27:12 -08:00
Tadashi G. Takaoka
0771671a39
Add Georgian keyboard
...
Bug: 5002108
Change-Id: Ia5751181bffc96e2e6c5daed3c7de8408078f91b
2012-02-21 23:24:13 -08:00
Tadashi G. Takaoka
1b3c16c183
Merge "Add next/prev navigate action more keys and remove tab key"
2012-02-21 23:09:58 -08:00
Tadashi G. Takaoka
05bfd189a8
Add next/prev navigate action more keys and remove tab key
...
Bug: 6037537
Bug: 5961814
Change-Id: I9c6dedf953452a180fcd5bce7bfadfd3c821f224
2012-02-21 22:50:50 -08:00
Tadashi G. Takaoka
c6993e4947
Merge "Add "#" and "%" to punctuation more keys"
2012-02-21 22:43:38 -08:00
Tadashi G. Takaoka
3710a04740
Add "#" and "%" to punctuation more keys
...
Bug: 6029665
Change-Id: I976326a900876a0d39067a760459366f52101c96
2012-02-21 19:43:47 -08:00
Jean Chalard
b141c9cd3f
Rename resources to reflect current usage
...
Bug: 6010403
Change-Id: Ia02ff31007296fdf6901504f238dfd9e4621f658
2012-02-21 18:54:44 -08:00
Eric Fischer
da21000957
Import translations. DO NOT MERGE
...
Change-Id: Ic09c089b8b42fdd672138d14f52a0ffb21733677
2012-02-21 14:57:14 -08:00
Eric Fischer
d1a37520d0
Import translations.
...
Change-Id: I59fdeb4d9df08e82e56d5545ffaaa66e5a04304e
2012-02-17 16:31:50 -08:00
Tadashi G. Takaoka
97bde43740
Settings key always exists in more keys of shortcut/f1 key
...
This change also
* Fix comman/f1 key for Arabic keyboard.
* Removes "show settings key option" and related stuff.
* Renames and simplifies F2 key to shortcut key on 7 inch tablet.
Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04:11 -08:00
Tadashi G. Takaoka
fed72d6038
Merge "Support fixed order more keys"
2012-02-17 01:01:28 -08:00
Tadashi G. Takaoka
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
Eric Fischer
482e0ef983
Import translations.
...
Change-Id: I20bcfc0d6296dc3606ab027e9c78f17e960e62dc
2012-02-16 15:29:44 -08:00
Jean Chalard
a252e0547f
Reactivate the bigram prediction option
...
Change-Id: Ib4dcd05c4ecf38bdf3d28371fcd9e2259a59ec0c
2012-02-15 19:25:12 -08:00
Eric Fischer
05f09b6d58
Merge "Import translations."
2012-02-14 16:36:51 -08:00
Eric Fischer
a476f75209
Import translations.
...
Change-Id: I9ee2da4706d6847b00f37766f79e73f83ea930d8
2012-02-14 16:32:59 -08:00
Ken Wakasa
95dc18a7c4
Follow up to Ie2416ccd
...
space   got lost in some parsing process
Change-Id: I36f5a9ca7172013ce049041886b9cd98659d38f9
2012-02-15 08:23:34 +09:00
Ken Wakasa
a56639613b
Use more standard Unicode notations in keyboard layout resource files.
...
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
2012-02-15 06:44:09 +09:00
Eric Fischer
b396ea9ede
Import translations. DO NOT MERGE
...
Change-Id: I8be564ef6befc36c59caa155f4b9c6c74740d75b
2012-02-13 15:19:16 -08:00
Ken Wakasa
f6f40539aa
Minor string updates in Android keyboard settings
...
bug: 5999345
Change-Id: I77560b02c71c3ba0c525572b7062ebbfd66b3b85
2012-02-14 03:32:39 +09:00
Ken Wakasa
09c677f56a
Replace UTF-8 string resources with their hex representations
...
bug: 5988656
Change-Id: Ifc3c3a2eccfc23d75b4066c2c9c02c48dacda55b
2012-02-11 23:05:23 +09:00
Eric Fischer
1bd181fefa
Import translations.
...
Change-Id: I126a880289de548e914ac442740e789e067e5124
2012-02-10 14:14:38 -08:00
Charles Chen
4baf767fac
Merge "Improved shift key and symbol/alpha switch key accessibility feedback."
2012-02-09 15:33:40 -08:00
Eric Fischer
0d1a5bad54
Import translations. DO NOT MERGE
...
Change-Id: I221670b8e4796346d13a44848f8958904e9bac80
2012-02-09 12:46:37 -08:00
Eric Fischer
7ef97ea1f9
Import translations. DO NOT MERGE
...
Change-Id: I02629c1f8dd311899b3aba89bfb1390150ace7ac
2012-02-08 13:56:30 -08:00
Tadashi G. Takaoka
5962312b07
Custom action label should be a part of keyboard identifier
...
Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
2012-02-08 20:09:39 +09:00
Tadashi G. Takaoka
7a39bd4454
Shift+Smiley key will register newline character of textMultiLine
...
This change also
* Honors the custom action label in EditorInfo.actionLabel.
* Invokes InputConnection.performeEditorAction if action is specifed
at EditorInfo.imeOptions or actionLabel/actionId.
* Stops using InputMethodService.sendKeyChar. Implements
sendKeyCodePoint instead.
Bug: 2498607
Bug: 5961809
Bug: 5368408
Change-Id: If4cd5eb3dacfc6b6a7ea434b0617c2438e06e42d
2012-02-08 19:31:35 +09:00
Tadashi G. Takaoka
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
alanv
8d4f0d5d1d
Improved shift key and symbol/alpha switch key accessibility feedback.
...
Bug: 5933165
Change-Id: Id71f38874640785b7ad43b7a70e27f40c13be748
2012-02-07 13:14:18 -08:00
Eric Fischer
5b7f50b10b
Import translations. DO NOT MERGE
...
Change-Id: I01b1e6476b50108810eb61ad45a198db2b52b7de
2012-02-07 11:14:31 -08:00
Tadashi G. Takaoka
c217dc9237
Convert one letter Key.outputText to Key.code
...
This change also uses Key.code instead of Key.outputText for the
variety of parentheses keys taht introduced by I85998f17.
Bug: 5975484
Change-Id: I86879c9942d264edc71e5893325a2f582763d12f
2012-02-07 22:34:20 +09:00
Eric Fischer
3f8fc4de9a
Import translations. DO NOT MERGE
...
Change-Id: I9e403e4199935cbb8f356f78316671373324d452
2012-02-03 13:02:58 -08:00
Tadashi G. Takaoka
909b2940db
Merge "Get rid of Key.setIcon(Drawable)"
2012-02-02 21:51:51 -08:00
Tadashi G. Takaoka
e7948a8692
Get rid of Key.setIcon(Drawable)
...
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
Tadashi G. Takaoka
56d1dc5a58
Shift + smiley key become return key
...
Bug: 2498607
Change-Id: Iec902d8f0035a81e4e793251006d905025bd81cf
2012-02-03 12:28:57 +09:00
Eric Fischer
fbd83a8712
Restore deleted string still referenced from code to fix the build.
...
Change-Id: Ideb39da09730960f555f2b928d699819c986531b
2012-02-02 13:57:15 -08:00
Eric Fischer
8a0bb00989
Import translations. DO NOT MERGE
...
Change-Id: I5d9c89dfe2e5667ef004d1e8b9106279bd23f6f5
2012-02-02 13:10:41 -08:00
Tadashi G. Takaoka
5852a2594f
Parse escaped sequence strictly in CSV parser
...
This change alters the CSV parser behavior. The parser only resolves
* String resource reference. ["@string/res" -> "<content_of_res>"]
* Other occurrence of escape sequence will be intact. ["\x" -> "\x"]
Before this change, escape sequence in moreKeys string is parsed three
times. At first in parsing string resource, next in CSV parser, and at
last in KeySpecParser. So that representing single escape character
itself is a bit annoying, "\\\\\\\\".
Now we can represent single escape character itself in string resource by "\\\\".
Change-Id: Ib978e17b779cc82585eed8241ac3857508b14bc7
2012-02-02 20:19:26 +09:00
satok
e05b3f4b3a
Support additional proximity characters
...
Change-Id: Ifbe0d7e4eafea1926bbce968eae4724dd5769689
2012-02-02 16:07:16 +09:00
Charles Chen
02dd837805
Merge "Removed spoken descriptions for characters supported by TTS or TalkBack."
2012-02-01 10:00:17 -08:00
Tadashi G. Takaoka
71c695da22
Remove BIDI mirroring hack from Key
...
This change also removes isRtlKeyboard attribute from <Keyboard/>
Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
2012-02-01 22:58:16 +09:00
Tadashi G. Takaoka
ff858c7ff5
Use MoreKeySpecParser to parse puctuations strip resources
...
This change also
* Doesn't use Key.getRtlParenthesisCode to get correct parentheses
code in RTL context. Intead uses the outputText feature of
moreKeys specification.
* Move CVS string parser from KeyStyles to Utils.
Bug: 5948247
Change-Id: I45752c7d01b4f7d3f3da900b110a2185b336a1f0
2012-02-01 19:33:26 +09:00
Tadashi G. Takaoka
a5c96f376a
Move long press shift handling from PointerTracker to KeyboardState
...
This change also
* Rename phone shift keyboard to phone symbols keyboard.
Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
* Remove phone symbols keyboard from tablet.
* Introduces enableLongPress flag of Key.keyActionFlags attribute.
* Remove clumsy long press code from PointerTracker.
* Remove CODE_CAPSLOCK handling from LatinIME.
* Make KeyboardSwitcher to invoke haptic and audio feedback.
Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
2012-02-01 19:04:21 +09:00
alanv
f3e951b259
Removed spoken descriptions for characters supported by TTS or TalkBack.
...
Change-Id: Iddef18559bc6af9487e536a33607b0a0b07df282
2012-01-31 13:02:33 -08:00
Tadashi G. Takaoka
ca2f051cc1
Auto generate various shift states alphabet keyboard automatically
...
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.
This change also
* Eliminates KeyboardShiftState object from Keyboard.
* Removes various set shift state methods from Keyboard.
* Removes KeyboardSet.Element.elementAutoGenerate attribute.
* Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
* Add preserveCase flag to smiley, .com, and labeled special keys.
* Rename KeyboardShiftState class to AlphabetShiftState.
* Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
* Introduce shiftedLetterActivated to Key.keyLabelFlags
Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
2012-01-31 12:55:45 +09:00
Tadashi G. Takaoka
15c99e9f1a
Support addtionalMoreKeys
...
This change also removes
* Unused more_keys_for_q, w, and p.
Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09:00
Tadashi G. Takaoka
38a3ad3e3c
Merge "Rename keyboard XML resource files"
2012-01-29 16:36:22 -08:00
Eric Fischer
49761501db
Import translations. DO NOT MERGE
...
Change-Id: I89dcb839308eadb722f91ccd4327208d8d477dc2
2012-01-27 12:02:20 -08:00
Tadashi G. Takaoka
d1630a3add
Rename keyboard XML resource files
...
* <Keyboard> XML file should be kbd_*.xml
* <Row> XML file should be rows_*.xml or row_*.xml
* <Key> XML file should be key_*.xml or keys_*.xml
* <key-style> XML file should be key_styles_*.xml
Change-Id: Ie57d5d78389c13d6c066ace4e3588518d1f25f13
2012-01-28 01:07:29 +09:00
Tadashi G. Takaoka
344a767b33
Share kbd_row3_smiley.xml
...
Change-Id: Ie5e68f972a739ab151201bd13bb1771e164313e6
2012-01-27 21:48:25 +09:00
Tadashi G. Takaoka
566cded5e7
Merge "Use kbd_row3_comman_period.xml"
2012-01-27 04:21:53 -08:00
Tadashi G. Takaoka
ab7cb71b8f
Create separate XML for number password keyboard
...
Change-Id: I1d73a03bfce9180106575e180bfeb422da03b9fb
2012-01-27 21:09:55 +09:00
Tadashi G. Takaoka
3db07d05a3
Use kbd_row3_comman_period.xml
...
Change-Id: Ie2ce2f4f03e70477d4932072a44fb9aeb7cd7784
2012-01-27 21:07:37 +09:00
Tadashi G. Takaoka
425e1996b8
Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
...
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
2012-01-27 18:11:43 +09:00
Tadashi G. Takaoka
736d740aa5
Merge "Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker"
2012-01-26 00:17:56 -08:00
Tadashi G. Takaoka
160f01211d
Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
...
This change introduces the following attributes.
* KeyboardView
- keyPreviewLingerTimeout
* LatinKeboardView
- keyHysteresisDistance
- touchNoiseThresholdTime
- touchNoiseThresholdDistance
- slidingKeyInputEnable
- keyRepeatStartTimeout
- keyRepeatInterval
- longPressKeyTimeout
- longPressShiftKeyTimeout
- longPressSpaceKeyTimeout
- ignoreSpecialKeyTimeout
- showMiniKeyboardAtTouchedPoint
Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Tadashi G. Takaoka
09f8b126e5
Add Key preserveCase enum to keyLabelOptions attribute
...
To support auto generate key depending keyboard element id, the
KeysCache class is introduced to hold whole keys and reuse.
Change-Id: Icb81b5f1c1b3aaa31968dcdb93aa0a856e737f78
2012-01-25 20:16:21 +09:00
Tadashi G. Takaoka
83306b914f
Add element predicator to <switch><case> condition of Keyboard
...
Change-Id: I8f9eb8eb28707d23e421e88f979022d844a3b3ee
2012-01-25 19:09:18 +09:00
Tadashi G. Takaoka
117c124c13
Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
...
This is the first step to support separate Keyboard for elementName.
This change is the second attempt of Icef66564.
Change-Id: I78ea6cb9ea3d965ff89e0ff5d896a6b11ba5c670
2012-01-25 13:19:53 +09:00
Tadashi Takaoka
8bb20bc682
Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard"
...
This reverts commit b5b92f9b78
Bug: 5908440
2012-01-24 15:20:05 -08:00
Tadashi G. Takaoka
b5b92f9b78
Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard
...
This is the first step to support separate Keyboard for elementName.
Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
2012-01-24 18:31:11 +09:00
Tadashi G. Takaoka
b009a24b83
Support @icon/icon_name for more keys specification
...
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
Tadashi G. Takaoka
3fbf9f85a2
Add Bulgarian keyboard
...
Bug: 5864001
Bug: 5738545
Change-Id: I3aa8a0e531e091680c0e05c55e72edd05e5ebc77
2012-01-19 12:59:59 +09:00
Tadashi G. Takaoka
7dde805745
Enable usability study mode option
...
Change-Id: Iadd69fbde42b895dd30f98890f59b56cdcdd4007
2012-01-18 20:17:57 +09:00
Jean Chalard
cc6ded7a1a
Add a whitelist entry
...
nit → not
Change-Id: I8d0fc6fe4b769cd76c8059848a8ec249bb9fea0d
2012-01-18 15:25:00 +09:00
Tadashi G. Takaoka
06b7c256b1
Add "force non-distinct multitouch" debug option
...
Change-Id: I9fd6fabf03515011cedb8aaa30fdb7a77f2d4d12
2012-01-17 13:19:01 +09:00
Tadashi G. Takaoka
4015a64a26
Fix SubtypeLocaleTests
...
Change-Id: Id85814aa3bcd9cacbe446b2dfda3ca2ab9146c13
2012-01-13 14:35:43 +09:00
satok
c1da6566dd
Change the application name of aosp latin ime
...
Change-Id: I96281709736bc20d70e63af170bfb48b5df3f18d
2012-01-12 14:27:22 +09:00
satok
6d3b422f97
Add EnabledWhenDefaultIsNotAsciiCapable to English keyboard subtype
...
Bug: 5806103
Change-Id: Iffdc68565f4a8b5af98247a4dff9dc4e76b4056a
2012-01-11 14:06:06 +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
0723b94ec2
Fix Slavic layout on phone device
...
Change-Id: I7da35502072e336ba2c32fc78827f5dff1bedddc
2012-01-10 12:52:55 +09:00
Eric Fischer
07af2249bb
Import revised translations.
...
Change-Id: Ie6d481360e801a67f4bc0309a7151b1640bd3c40
2011-12-29 13:37:16 -08:00
Tadashi G. Takaoka
77e7532dab
Merge "Make Estonian keyboard Scandinavian variant"
2011-12-25 21:09:49 -08:00
Tadashi G. Takaoka
6aa7fc0984
Make Estonian keyboard Scandinavian variant
...
This change also fixes Scandinavian keyboard layout around "a" key.
Bug: 5627326
Change-Id: I65da7a56a28d90eabcffcd616164d8e8c1111c96
2011-12-26 12:51:20 +09:00
Ken Wakasa
10862aa4d0
Fix more keys for fr_CA and fr_CH. Also tidy up more keys for de_ZZ as well.
...
bug: 5800592
Change-Id: I0c9abc807ab0100b3839fc7f0f40c6c1a66e0a6e
2011-12-24 17:29:02 +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
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
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
7cc2595b6f
Add LatinKeyboard.spacebarTextRatio attribute
...
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka
fd113151fd
Add Vietnamese keyboard
...
Bug: 5738545
Change-Id: I96abf6807e9375e352a505b822dd50b4d1a7a252
2011-12-16 22:39:56 +09:00
Tadashi G. Takaoka
45a0b32941
Add Slovenian keyboard
...
Bug: 5738545
Change-Id: Id88a30d3fe46988ac2e0ad129b7bea53b8c7ab07
2011-12-16 22:16:48 +09:00
Tadashi G. Takaoka
9fd014ebb7
Add Slovak keyboard
...
Bug: 5738545
Change-Id: I40178f8fc0be4a9fcfc7496dae262574dd0267f9
2011-12-16 22:12:01 +09:00
Tadashi G. Takaoka
62ac4561eb
Add Rumanian keyboard
...
Bug: 5738545
Change-Id: I88ef1a461cf94f10578b5751d0a2fd6abbfd84d9
2011-12-16 22:01:21 +09:00
Tadashi G. Takaoka
969b4e78ce
Add Ukrainian keyboard
...
Bug: 5738545
Change-Id: I78ff8d1c7aa96f3522989e138334b96c5f2aba02
2011-12-16 21:59:40 +09:00
Tadashi G. Takaoka
26e53b4b7d
Add Kyrgyz keyboard
...
Bug: 5738545
Change-Id: I9fda2c75654ab4bbaaeb9ee2442dda0a73a3e07e
2011-12-16 21:16:39 +09:00
Tadashi G. Takaoka
d99d28b764
Add Belarusian keyboard
...
Bug: 5738545
Change-Id: I60113c248a5a122e71e20273d44406e8199fa0eb
2011-12-16 20:56:53 +09:00
Tadashi G. Takaoka
94a3f8f243
Generalize Russian to Slavic layout
...
Adding Belarusian, Kyrgyz, and Ukrainian keyboards will follows.
Bug: 5738545
Change-Id: I05055d519fac8c67f728cee693b133c3dfb29047
2011-12-16 20:54:25 +09:00
Tadashi G. Takaoka
702f9fc194
Fix broken suggestions layout
...
This is follow up change of If4b82376
Change-Id: I9b0d86ba630011372f41f26efb56bb0a80e09505
2011-12-16 16:39:05 +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
23d27fefcb
Fix auto correction spacebar LED
...
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka
5a39e527dd
Ignore settings key if it isn't adjecent to the space key on phone
...
Bug: 5759096
Change-Id: I1e1250d917e726e1931de3247ddc782b005ab5c1
2011-12-14 20:17:36 +09:00
Tadashi G. Takaoka
623d0155b6
Just ignore settings/shortcut key while typing on tablet
...
Bug: 5759096
Change-Id: Ie1f1800d0f32ac0938715c79974e0f382c9c3d27
2011-12-14 17:14:44 +09:00
Tadashi G. Takaoka
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
satok
e0dfc54c5b
Show usability study mode for research purposes
...
Bug: 5722703
Change-Id: I27acc374c5d4b52707708b83689dea5d78a573d7
2011-12-09 15:31:06 +09: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
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
Eric Fischer
97b53f4f42
Merge "Import revised translations."
2011-11-29 11:52:48 -08:00
Eric Fischer
9dda5e408a
Import revised translations.
...
Change-Id: I22f516d922078cf0e26898da7af59ac4fa4b35a8
2011-11-29 11:23:46 -08:00
Tadashi G. Takaoka
e2d00ab470
Support Baltic languages
...
This change supports Estonian, Latvian, and Lithuanian languages
keyboard.
Bug: 5627326
Change-Id: Iaaa966e4164f9593f143e79736c8ec7befc2a5ce
2011-11-29 11:52:31 +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
13d5f6605b
Add Key.keyActionFlags and obsolete Key.isRepeatable
...
This change also renames Key.keyLabelOption to keyLabelFlags.
Change-Id: Iedd0bfaa420ad382c07ce084416355690e390919
2011-11-21 20:33:03 -08:00
Tadashi G. Takaoka
0e4275730b
Tweak number and phone keyboard layout of tablet
...
Change-Id: Icb2f146becb7f834adba2612c9420a8f2d1e87fc
2011-11-18 17:27:55 -08:00
Tadashi G. Takaoka
0be36ee096
Add left/right padding to phone/number layout of tablet
...
Change-Id: Ida6b458f3233cd4ea3ae71e07e2a5c80c7750954
2011-11-18 17:19:58 -08:00
Tadashi G. Takaoka
b98578ed0b
Copy number/phone keyboard layout of tablet
...
Change-Id: I63e576ea88db313ede89f2517436071f5c391204
2011-11-18 17:16:15 -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
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
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
Eric Fischer
168d689ec6
Import revised translations. DO NOT MERGE
...
Change-Id: I9e72643726caf00d8e1acd98d9843576c15f39be
2011-11-16 13:08:54 -08:00
Jean Chalard
09f7e656df
Merge "Fill in the HAS_RECOMMENDED_SUGGESTIONS flag."
2011-11-10 15:50:10 -08:00
Eric Fischer
bd59e064fa
Import revised translations.
...
Change-Id: I3198fcbf1c26961fb1e925afe7079a19422c0afc
2011-11-10 14:27:20 -08:00
Jean Chalard
a409f009fa
Fill in the HAS_RECOMMENDED_SUGGESTIONS flag.
...
Bug: 5530727
Change-Id: Ic53e227f72096053e08d90204bf1f287ec09290b
2011-11-10 02:52:46 +09:00
Eric Fischer
f47e014eb2
Import revised translations. DO NOT MERGE
...
Change-Id: I3650b8f5925e9f71927312acf310f7a165bd4ce3
2011-11-07 12:28:16 -08:00
Eric Fischer
7a181fdf06
Import revised translations.
...
Change-Id: I3633f1b16fc5f5282e9e60cab104835767ddfb63
2011-11-02 10:36:04 -07:00
Eric Fischer
db1fc8f59c
Import revised translations. DO NOT MERGE
...
Change-Id: I63a6dd39a4af314afdb782ea090171c7bc959749
2011-11-01 13:38:10 -07:00
Eric Fischer
f1a44148d1
Import revised translations.
...
Change-Id: I980a04f15289bc1af6b150e4329795865686de63
2011-10-28 11:39:17 -07:00
Eric Fischer
d36f3f8393
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-10-27 09:46:05 -07:00
Tadashi G. Takaoka
49998fc7d3
am 556a7147: Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1
...
* commit '556a7147c124d389da963ebda09410bfd61f5b18':
Tweak more suggesitons modal tolerance a bit longer
2011-10-27 02:35:12 +00:00
Tadashi G. Takaoka
ab617c0745
am ba1c5d44: Merge "Add a few Arabic symbols" into ics-mr1
...
* commit 'ba1c5d44346eef1a6c05cdd11d504e9ebce3610f':
Add a few Arabic symbols
2011-10-27 02:35:11 +00:00
Eric Fischer
a54c178ea7
Import revised translations. DO NOT MERGE
...
Change-Id: I85572da23cd451558d994d8ac36faf1902f07f0d
2011-10-26 17:41:00 -07:00
Tadashi G. Takaoka
556a7147c1
Merge "Tweak more suggesitons modal tolerance a bit longer" into ics-mr1
2011-10-26 17:27:44 -07:00
Tadashi G. Takaoka
ba1c5d4434
Merge "Add a few Arabic symbols" into ics-mr1
2011-10-26 17:27:21 -07:00
Eric Fischer
531b5543fc
Import revised translations. DO NOT MERGE
...
Change-Id: Ie99d52a052033a4994b95b25209fade85d628736
2011-10-26 11:11:11 -07:00
Tadashi G. Takaoka
b35f70acec
Tweak more suggesitons modal tolerance a bit longer
...
Bug: 5459166
Change-Id: I18f10f7d537a451462cf7874e525c5eba103fb9a
2011-10-26 19:33:28 +09:00
Tadashi G. Takaoka
7fe66ea42e
Add a few Arabic symbols
...
Bug: 5458689
Change-Id: I61ce876606ce3fa620d606752c8e5442b8ad78d6
2011-10-26 14:25:11 +09:00
Ed Heyl
720baf0cb3
Merge remote branch 'goog/ics-mr0' into ics-mr1
2011-10-25 19:50:41 +00:00
Eric Fischer
ace21e5b57
Import revised translations.
...
Change-Id: I45b2224d22ea73a50b7bfcc1a05b3ece25f402c5
2011-10-25 11:08:58 -07:00
Eric Fischer
5809d47402
Import revised translations. DO NOT MERGE
...
Change-Id: Ifc8a89ad2be03ebbac311ab9b8ade1d168a592fd
2011-10-24 16:50:18 -07:00
Eric Fischer
9e8ed3f7ce
Import revised translations. DO NOT MERGE
...
Change-Id: I0efc2b5673fae7551d2e4e438974f6c5aac79602
2011-10-21 14:42:50 -07:00
Eric Fischer
6464273f7b
Import revised translations. DO NOT MERGE
...
Change-Id: I77b8dd34e9bdd9d22e850de7c075e9c4c99ff88a
2011-10-20 18:05:02 -07:00
Eric Fischer
bf33637eb2
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
2011-10-20 11:28:36 -07:00
Eric Fischer
2a4e1b6dd3
Import revised translations. DO NOT MERGE
...
Change-Id: I6065f17e96761b203ebff71f81e1feb9de518aad
2011-10-20 11:16:39 -07: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
2c47080e7b
Update suggestions strip divider
...
Bug: 5142447
Change-Id: I275a304e46456e3b80968fb5de330a3b04bd2035
2011-10-19 16:54:37 +09:00
Eric Fischer
d707eeceb5
Import revised translations.
...
Change-Id: I3c98722dfddac5fe3b600cae61255f15540666e4
2011-10-18 15:50:51 -07:00
Eric Fischer
167f76aacb
Import revised translations. DO NOT MERGE
...
Change-Id: I6eaad7122120f7b6454028d5cae2b1db85a7280a
2011-10-18 11:16:04 -07: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
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
8aecd2c990
am 431452d0: Revised Arabic alternates
...
* commit '431452d04bdb65916a23ec9ca66cfe06282f6e4a':
Revised Arabic alternates
2011-10-13 22:09:07 -07:00
Tadashi G. Takaoka
431452d04b
Revised Arabic alternates
...
Bug: 5439635
Change-Id: Ic6ea1317f8892d5dbaaa7e0cbb274e8e06ea89d7
2011-10-13 21:45:06 +09:00
Tadashi G. Takaoka
b94166dedd
am 31e6d20d: Merge "Use consecutive Arabic TATWEEL for its label for discrimination" into ics-mr0
...
* commit '31e6d20db0c0883736a81bbc606d19a8710264b1':
Use consecutive Arabic TATWEEL for its label for discrimination
2011-10-12 23:50:12 -07:00
Tadashi G. Takaoka
31e6d20db0
Merge "Use consecutive Arabic TATWEEL for its label for discrimination" into ics-mr0
2011-10-12 23:48:44 -07:00
Tadashi G. Takaoka
706114382e
Use consecutive Arabic TATWEEL for its label for discrimination
...
Bug: 5446409
Change-Id: I448b39fda42d51139f53c9a48b1d743c5495fb51
2011-10-13 15:45:12 +09:00
Tadashi G. Takaoka
ca922b440a
am 8a4472f0: Merge "Update virtual LED on shift keys" into ics-mr0
...
* commit '8a4472f0ecd774757c7077a40585f2d05e4f9210':
Update virtual LED on shift keys
2011-10-12 23:16:53 -07:00
Tadashi G. Takaoka
1d8abfcf29
Update virtual LED on shift keys
...
Bug: 5142447
Change-Id: I69ca713071bca5a9ff3a0b710e1821264a15ea18
2011-10-13 13:58:46 +09:00
Tadashi G. Takaoka
7ca1a9dad4
am 9ad9425e: Merge "Fix code for initial form of Heh" into ics-mr0
...
* commit '9ad9425e9bc44c593e14da1f5953925cbf75a8a5':
Fix code for initial form of Heh
2011-10-11 23:30:59 -07:00
Tadashi G. Takaoka
ab18e39953
am 5f89fbae: Get rid of daggers from Arabic/Hebrew keyboard
...
* commit '5f89fbaea27666b6d7892e5ac48f40201922c06b':
Get rid of daggers from Arabic/Hebrew keyboard
2011-10-11 23:30:58 -07:00
Tadashi G. Takaoka
9ad9425e9b
Merge "Fix code for initial form of Heh" into ics-mr0
2011-10-11 23:29:16 -07:00
Tadashi G. Takaoka
79e3c2f13b
Fix code for initial form of Heh
...
Bug: 5446566
Change-Id: I9ea4ce288d0678083c6b94867b999f7ec4192097
2011-10-12 12:57:49 +09:00
Tadashi G. Takaoka
5f89fbaea2
Get rid of daggers from Arabic/Hebrew keyboard
...
Bug: 5445200
Change-Id: I5e4e19a17b0edcd0c0de8fa8fe4289b0ca7d66b1
2011-10-12 11:55:30 +09: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
6984a42024
Get rid of card suits from Arabic keyboard
...
Bug: 5439295
Change-Id: Idbcd51acb927d5a9d549c91c93a1a6e32ba8be24
2011-10-11 11:10:25 +09:00
Eric Fischer
381adec657
Merge "Import revised translations."
2011-10-10 11:49:56 -07:00
Eric Fischer
14583f9e5d
Import revised translations.
...
Change-Id: I26adc3038ae5f4d9593f7a71a9efc2967e77d223
2011-10-10 11:29:19 -07:00
satok
633f9592d1
Turn off the auto correction space bar led by default
...
Bug: 5245468
Change-Id: I0c25d733b21dcc43674d9fe4ca22dd2e1d18105a
2011-10-10 19:01:05 +09: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
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
satok
0aa9595773
Merge "Move auto text to white list dictionary"
2011-10-02 22:11:50 -07:00