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

1891 commits

Author SHA1 Message Date
Yusuke Nojima
258bfe66e0 Classify touches into three types. 
Change-Id: I7c1d42835e0c15d596a1b66d421b0aa514ec0890
 2011-09-30 17:22:22 +09:00
Tadashi G. Takaoka
59f8ca752d Skip successive InputMethodService callbacks after orientation changed 
IME is called back four methods for each input field as a IME life
cycle. The four methods are onStartInput, onStartInputView,
onFinishInputView and onFinishInput.

After orientation changed, Those quartet methods will be called back
twice. This behavior of the framework might be a bug.

In order to restore the previous keyboard layout, we should skip
onFinishInputView and onFinishInput of the first quartet and
onStartInput and onStartInputView of the second quartet.

Bug: 4311428
Change-Id: I450ddc0cce5d00abc971ffd42a507a8a86682548
 2011-09-30 10:38:32 +09:00
Yusuke Nojima
ad35835bac Pass the touch position correction data to native. 
Change-Id: I92958779377a530410d1682100f9d0a2ba267dea
 2011-09-29 17:00:49 +09:00
Yusuke Nojima
b45e095aa2 Merge "Add touch position correction data to resources." 2011-09-28 22:41:11 -07:00
Yusuke Nojima
d6339639c3 Add touch position correction data to resources. 
Change-Id: I156205672f3935f70c250a6c538793f35c5d86b2
 2011-09-29 14:29:23 +09:00
Tadashi G. Takaoka
2fc4248700 Introduce hit box to Key and get rid of edge flags 
Change-Id: I2b78d2ca756223b5497d01127c3a0190dcc81e57
 2011-09-28 19:31:37 +09:00
Yusuke Nojima
a59f65ad0c Merge "Extend JNI interface to pass the theme id of the keybaord to the native." 2011-09-27 20:27:17 -07:00
Tadashi G. Takaoka
63584323ca Add themeId to Keyboard 
Change-Id: I6abdeaf41459406cf9021efdf5bb96232ba104c7
 2011-09-28 12:08:48 +09:00
Yusuke Nojima
1c923d8581 Extend JNI interface to pass the theme id of the keybaord to the native. 
Change-Id: I705ec2fa1d32a673a8d84bc9afc2a46208a414a1
 2011-09-28 11:56:28 +09:00
Tadashi G. Takaoka
f451ed2012 Forward touch events above the keyboard to the suggestions strip 
The gutter area between the suggestions strip and the top-row keys
looks like a part of the suggestions strip, and the touch events
landing on the area should be forwarded to the suggestions strip.

Bug: 5246673
Change-Id: I92af763be0feed21aa36ceffb5d575abe554f19e
 2011-09-27 19:02:24 +09:00
Tadashi G. Takaoka
73cd4c1428 Fix onDeatchedFromWindow to protected 
Change-Id: Ief666554ffd405a43363e66ea2bc2d87aa76a882
 2011-09-27 15:18:02 +09:00
Tadashi G. Takaoka
287f4f83e9 Add horizontal edges paddings to phone/number layout 
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
 2011-09-26 17:11:01 +09:00
Tadashi G. Takaoka
acf6b6815a Merge "Fix keyboard row height calculation" 2011-09-25 19:25:28 -07:00
Tadashi G. Takaoka
8fbfac4ffb Fix keyboard row height calculation 
The keyboard height will be distrubuted as:
  top_padding + (key_height + vertical_gap) * row_count - vertical_gap + bottom_padding

Change-Id: I841f356b9dbf8cfaf3756178bc9e4e6b2aa61364
 2011-09-26 10:25:49 +09:00
Fabrice Di Meglio
c66a7278d2 Merge "Revert "Use "..." instead of "\u2026""" 2011-09-23 15:08:23 -07:00
Fabrice Di Meglio
9bdce3a59e Revert "Use "..." instead of "\u2026"" 
This reverts commit 8673ceb066

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

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

Change-Id: Ic4c2ea63041af02119dc404e704a04608d041163
 2011-09-16 20:25:23 +09:00
Ken Wakasa
dc52a5621a Use the correct theme on ICS 
bug: 5329939
Change-Id: Ia139813b83eefe53863cae9cbe46b8b3a940e0df
 2011-09-16 16:26:13 +09:00
Ken Wakasa
32cf5bb9f9 Stop auto-switching-back to the main layout by quotes. 
bug: 5314117
Change-Id: Idcd6a146665b93eabdc03875b98988f9fa049791
 2011-09-16 14:53:04 +09:00
Tadashi G. Takaoka
5b0c124ca8 Remove Key.isStick, use backgroundType="stick" instead 
Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8
 2011-09-15 18:33:01 +09:00
Tadashi G. Takaoka
a6d3a4d61b Make action key background more visually prominent 
Bug: 5232726
Change-Id: I76ff2fb431ca295693ceb231a0f13da44f9293e6
 2011-09-15 17:40:44 +09:00
Tadashi G. Takaoka
7918ed0169 Refactor Key.isFunctional to more generic Key.keyType 
Bug: 5232726
Change-Id: Idc861ca725f62eaf37795f57401573394a17d6d3
 2011-09-15 14:38:45 +09:00
Tadashi G. Takaoka
4486d77270 Introduce autoXScale label option 
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
 2011-09-12 17:32:28 +09:00
Tadashi G. Takaoka
30bd8cb2da Add visual dividers to more suggestions panel 
Bug: 5275003
Change-Id: I9464db71388a40ea768984b4cf06c8da05bfa26c
 2011-09-08 23:05:55 +09:00
Tadashi G. Takaoka
18453d69e0 Make Spacer as extended Key class 
Bug: 5275003
Change-Id: I809a8ca363ba72b22ac5cfd926414990f7e8467c
 2011-09-08 17:38:50 +09:00
Ken Wakasa
6b97d2b9c2 Tweak bottom padding for the "..." popup hint 
Follow up to I45bd6edf

bug: 5255103

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

Bug: 5248783
Change-Id: Idb95ac1467085c230fd60e4bc0f466fef5700bfb
 2011-09-05 20:36:19 +09:00
Tadashi G. Takaoka
f2bd8a07bb Merge "Squash MiniKeyboardKeyDetector and SuggestionsPaneKeyDetector into one" 2011-09-02 03:08:41 -07:00
Tadashi G. Takaoka
9734ecbf46 Squash MiniKeyboardKeyDetector and SuggestionsPaneKeyDetector into one 
Bug: 5241105
Change-Id: I4c310373fb8b2426fb46205fa17a49a8346f8244
 2011-09-02 17:58:39 +09:00
Tadashi G. Takaoka
d4d9b33c39 Move Row class into KeyboardBuilder 
This is a followup of I5929e656.

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

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

Bug: 5245837
Change-Id: If5d463304c1689a840c8b761fedb0a8e2193734b
 2011-09-02 16:24:36 +09:00
Tadashi G. Takaoka
1b087064c0 Dim keyboard when more suggestions are shown 
Bug: 5241009
Change-Id: Ia42bcfc34dddf93d35f9cea8a4f0efead6ce3a6a
 2011-09-01 18:48:19 +09:00
Tadashi G. Takaoka
29e7b7ed6e Implement popup suggestions pane 
Bug: 5023981
Change-Id: Ie1d69131dbf884a3f6a2beb3ac3427e5437c1486
 2011-08-31 21:21:22 +09:00
Tadashi G. Takaoka
dcb1c7b802 Merge "Rename PopupCharactersParser to MoreKeySpecParser" 2011-08-31 02:39:03 -07:00
Tadashi G. Takaoka
9d5601e901 Rename PopupCharactersParser to MoreKeySpecParser 
Also renames PopupPanel to MoreKeysPanel

Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
 2011-08-31 18:34:35 +09:00
Tadashi G. Takaoka
79dc056d22 Remove unused XML attribute 
This is a followup for Ic83cd120.

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

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

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

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

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

Bug: 5023981
Change-Id: Ice6d949581aea7ca68799be2b91ff28234dd88d6
 2011-08-30 14:55:56 +09:00
Tadashi G. Takaoka
3b71e5fae6 Merge "Add keyLetterSize and keyLabelSize as KeyboardView attribute" 2011-08-29 08:13:29 -07:00
Tadashi G. Takaoka
83da6c18fb Add keyLetterSize and keyLabelSize as KeyboardView attribute 
Bug: 5023981
Change-Id: Iea7f8f340775cbb093c50d6e741b2f1476e9ac39
 2011-08-29 23:45:05 +09:00
Tadashi G. Takaoka
2315bfc7c8 Clean up some MiniKeyboard.Builder code 
Change-Id: I5832421cab3d496d4bb8a5e9902d0b5f4929fd0b
 2011-08-29 21:15:05 +09:00
Tadashi G. Takaoka
a9311741b8 Merge "Add KeyboardActionListener.Adapter" 2011-08-29 03:19:04 -07:00
Tadashi G. Takaoka
e3be3bcebc Add KeyboardActionListener.Adapter 
Change-Id: If13df42efffc7cef746c09d5abfe7a8619452a0b
 2011-08-29 19:09:56 +09:00
Tadashi G. Takaoka
46286874f3 Add guard to prevent possible IllegalStateException 
Bug: 5227682
Change-Id: Iff93b425f52981b5e2c65e309b07bcfe4485eeb1
 2011-08-29 18:38:04 +09:00
Tadashi G. Takaoka
ed23cc7f0b Merge "Make PopupPanel decoupled with LatinKeyboardView and Keyboard" 2011-08-29 01:27:07 -07:00
Tadashi G. Takaoka
f44a01b408 Make PopupPanel decoupled with LatinKeyboardView and Keyboard 
Bug: 5023981
Change-Id: Ib4fd55d52718aa244178ca2313f5e8487378324f
 2011-08-29 17:07:48 +09:00
Jean Chalard
ef35cb631c Move locale-related utility methods to LocaleUtils. 
Change-Id: I7e9e6e5bc4486d8618d0213b112308c3d305c15e
 2011-08-29 12:29:35 +09:00
Tadashi G. Takaoka
f3f3189adb Wrap up popup mini keyboard 
Bug: 5218641
Change-Id: I88b3e7efa1f7c009c8a8e4f5453a5c4df2f91cfc
 2011-08-26 15:45:05 +09:00
Tadashi G. Takaoka
fd47b5d09c Merge "Move some static methods from SubtypeSwitcher to Utils" 2011-08-23 22:39:51 -07:00
Tadashi G. Takaoka
af52c0ea04 Implement "forceAscii" private IME option 
This change also introduces "AsciiCapable" extra value for subtype
that indicates the subtype can input any ASCII code point from its
keyboard layout.

Only if the input field has "forceAscii" private IME option and the
current subtype doesn't have "AsciiCapable" extra value, the en_US
keyboard layout will be used for the input field.

Bug: 3384942
Change-Id: I25e2553e37ecb5002df1164e45f6273845fe463b
 2011-08-24 13:19:56 +09:00
Tadashi G. Takaoka
57f05f4412 Move some static methods from SubtypeSwitcher to Utils 
Change-Id: I3ea8ffcdefcefaa82ae76a31bb65977009d8a040
 2011-08-24 12:54:53 +09:00
Tadashi G. Takaoka
c84bc3460d Rename LatinKeyboardBaseView to LatinKeyboardView 
Bug: 5182291
Change-Id: I5089a14902b9f4ff1ab4f34e3f7a42aca5040d3e
 2011-08-23 17:57:02 +09:00
Tadashi G. Takaoka
32572948d7 Refactor and rename popup mini keyoard related classes 
Change-Id: Ia92ec4612090b03829db9a87ce68d701db6e15bc
 2011-08-23 17:51:57 +09:00
Tadashi G. Takaoka
2d306a225c Merge "Extract sudden jumping touch event hack into separate class" 2011-08-23 01:49:38 -07:00
Tadashi G. Takaoka
c403a46f6d Extract sudden jumping touch event hack into separate class 
Bug: 5182291
Change-Id: I6a88ed4df3ec98e31ea4966d82da56f7fca342ac
 2011-08-23 17:44:41 +09:00
Tadashi G. Takaoka
f9da4c548f Remove password field special handling 
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
 2011-08-23 16:49:35 +09:00
Tadashi G. Takaoka
6dde878d51 Move some methods from LatinKeyboardView up into LatinKeyboardBaseView 
Bug: 5182291
Change-Id: I699ecef6fb8ea492d96fca1939f51faf0aac7fa6
 2011-08-23 12:22:24 +09:00
Tadashi G. Takaoka
b39f612d97 Remove hacks related to determine window width 
Bug: 4311428
Change-Id: Ic93f264101d13963503fcd447a69bbffd06e69f3
 2011-08-22 17:17:42 +09:00
Ken Wakasa
cee174b8cc Settings key visibility should always follow the system default value, 
by ignoring its preference value, when the "show settings key option" in
the settings is disabled.

Change-Id: I934be2d9eb0bf6bf731e03f5d9b752de4a7a1c7c
 2011-08-22 12:21:25 +09:00
Ken Wakasa
e56e88beff A follow up to I830de4d1 
bug: 5130446
Change-Id: Ib1a4603590387c30be7555b8386f5e0607ea7249
 2011-08-18 21:51:04 +09:00
Jean Chalard
29ea7b79c7 Merge "Have a pool of dictionaries to check spelling." 2011-08-16 03:05:50 -07:00
Yusuke Nojima
dbf4f2a552 Merge "Pass the touch event in the top padding of keyboard." 2011-08-16 03:04:30 -07:00
Yusuke Nojima
5ec13092a5 Pass the touch event in the top padding of keyboard. 
Bug: 5139932
Change-Id: Id176f92f69160f76ae7e0d46cb3d639080779497
 2011-08-16 18:33:40 +09:00
Jean Chalard
a562767a14 Have a pool of dictionaries to check spelling. 
The dictionaries and proximities are not thread-safe. In order to
be able to check spelling in parallel, make a dictionary pool to
call upon when a spelling check is necessary.

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

Change-Id: Ie441879cac4f67078ec27a95f1fcbbf3ef373df7
 2011-08-04 19:46:21 +09:00
Tadashi G. Takaoka
bb12dc455b Merge "Fix saving keyboard state while rotating" 2011-08-03 15:15:59 -07:00
Tadashi G. Takaoka
38b5605fee Fix saving keyboard state while rotating 
This change also uses longer timeout for restoring keyboard state.

Bug: 4311428
Change-Id: Ieade33d7c69f1dee727b2b8c26f0112eca44b336
 2011-08-03 09:41:04 -07:00
Tadashi G. Takaoka
73c02390d3 Reset keyboard shift lock state when new keyboard is ready 
Bug: 5099761
Change-Id: I00ad796ea43a07ae13e71224b7a081ee2f160f1a
 2011-08-03 09:24:13 -07:00
Tadashi G. Takaoka
eedfef0308 Merge "Retain keyboard layout while orientation change" 2011-08-03 02:37:00 -07:00
Tadashi G. Takaoka
055054eef3 Retain keyboard layout while orientation change 
This change also changes the timimng that the window width is
registered.

Bug: 4311428
Change-Id: Ied6b1b43bfa16a85f0e05cd308ce919d5d65677e
 2011-08-03 02:20:27 -07:00
Tadashi G. Takaoka
62d4a96497 Support label with icon key 
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
 2011-08-03 01:53:30 -07:00
Tadashi G. Takaoka
1be29abab2 Cleanup Keyboard related code and rename some classes 
This is	a follow up change of I90ffbde0

Bug: 5023981
Change-Id: I3a6b862d05f5f907dee954cd6d6fee983b20ab5e
 2011-08-02 17:12:02 -07:00
Tadashi G. Takaoka
8da9a13760 Make Keyboard object immutable except shift state 
This is the first step to implement suggestions pane as mini keyboard.

Bug: 5023981
Change-Id: I90ffbde0fda19b4be68add449310997b56bf6904
 2011-08-01 22:04:48 -07:00
Tadashi G. Takaoka
8d7782bf3c Merge "Use generic interface for filed type of Keyboard" 2011-08-01 18:12:58 -07:00
Tadashi G. Takaoka
04bc5a369c Merge "Add KeyboardParams class" 2011-08-01 18:08:17 -07:00
Tadashi G. Takaoka
167e77f170 Use generic interface for filed type of Keyboard 
This change also re-orders and renames some fields.

Bug: 5023981
Change-Id: I28c1ca7384bb70e3584398cd19ce2276ddfe8541
 2011-08-01 17:58:02 -07:00
Tadashi G. Takaoka
4d8eb2e888 Make horigontalGap and verticalGap attributes of Row obsolete 
Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
 2011-08-01 17:45:16 -07:00
Tadashi G. Takaoka
1516d055df Add KeyboardParams class 
This object will hold all keyboard parameter while parsing XML file
and act like a Keyboard. After finishing reading XML file, this will be
passed as an argument for the Keyboard class constructor.

Bug: 5023981
Change-Id: I2737b30036b6e4d204e8ed9984a1272e195209be
 2011-08-01 17:41:30 -07:00
Tadashi G. Takaoka
723dd753e9 Remove Keyboard reference from Key object 
Bug: 5023981
Change-Id: Ib0b9debf2018a0a9e9efe9323738e85174589e71
 2011-08-01 17:07:45 -07:00
Tadashi G. Takaoka
30479de9e5 Merge "Cleanup key label case adjustment" 2011-08-01 17:04:09 -07:00
Tadashi G. Takaoka
c499866948 Cleanup key label case adjustment 
Bug: 5023981
Change-Id: Ida06fc6a588c4eb8543455d932e71ac2797d27e5
 2011-08-01 16:43:14 -07:00
Tadashi G. Takaoka
b118d4cb58 Cleanup icon drawable related code 
Bug: 5023981
Change-Id: I729354f32797eef354ec9af8e05f17839f0a361c
 2011-08-01 16:37:13 -07:00
Tadashi G. Takaoka
2fe68b9616 Filter non-ascii popup charcters from password keyboard 
Change-Id: I10885efd317770f892165b6bb059313abf241436
 2011-08-01 00:35:59 -07:00
Tadashi G. Takaoka
c3afe2c244 Replace the notion of "voice" with "shortcut" as many as possible 
Bug: 4340933
Change-Id: I98b4eca5167cc3767a0868fae8f6436164adbe4d
 2011-07-31 18:46:44 -07:00
Tadashi G. Takaoka
83f6ca10d4 Merge "Fix exception message" 2011-07-31 18:43:22 -07:00
Tadashi G. Takaoka
2afc2adb01 Merge "Eliminate "..." from the key that has no popup mini keyboard automatically" 2011-07-31 18:43:17 -07:00
Tadashi G. Takaoka
09430720d5 Fix exception message 
Bug: 4340933
Change-Id: I81e7b0c72116b5bb56b0fdcd02386288aebd73e7
 2011-07-31 18:40:58 -07:00
Tadashi G. Takaoka
0c6e57f2d1 Eliminate "..." from the key that has no popup mini keyboard automatically 
Bug: 4340933
Change-Id: I08bbdee71f4bc2285fd0c1233d284150be61748e
 2011-07-31 18:22:29 -07:00
Tadashi G. Takaoka
73e716f202 Be aware of "nm" and "noMicrophoneKey" private IME option 
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
 2011-07-31 18:20:20 -07:00
Ken Wakasa
2ba975afb9 Turn off the Settings key by default 
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
 2011-07-31 07:26:24 +09:00
Tadashi G. Takaoka
97c35650ad Dismiss key preview regardless of key preview settings 
Bug: 5099213
Change-Id: Id6c5cb0ae4a07897b34153d4b350b1b45a06aa1a
 2011-07-29 19:52:49 -07:00
Tadashi G. Takaoka
364f1fd1f8 Add WindowWidthCache 
Bug: 4311428
Change-Id: I9f006525c0932d9d49bb8655caf58523135366d7
 2011-07-29 18:43:50 -07:00
Tadashi G. Takaoka
0a054dd107 Cleanup KeyboardSwitcher internal a bit 
Bug: 4311428
Change-Id: Ibe933d0351f750a3a41a08f09befd833d677961b
 2011-07-29 17:00:09 -07:00
Ken Wakasa
f12aa77c4b Merge "Simplifying accessibility code in keyboard's dispatchTouchEvent()" 2011-07-29 01:22:11 -07:00
Tadashi G. Takaoka
5b3c834a9c Merge "Remove enableShiftLock attribute from KeyboardId" 2011-07-28 17:38:50 -07:00
Tadashi G. Takaoka
6d9bcd5e13 Remove enableShiftLock attribute from KeyboardId 
This change is a follow up of Ia72de236.

Bug: 4311428
Change-Id: I0ad0f1fb93545ceb40df8dffe377240b020c2602
 2011-07-28 17:25:44 -07:00
Tadashi G. Takaoka
34400204a5 Merge "Remove unused method" 2011-07-28 15:42:53 -07:00
Tadashi G. Takaoka
b9538bc447 Merge "Fix that long pressing shift on symbol keyboard registers caps lock code" 2011-07-28 15:27:40 -07:00
Tadashi G. Takaoka
d4b533774d Remove unused method 
Bug: 4521802
Change-Id: Iae649f8b77b3bb144ee7eedbb6545e237fa79a17
 2011-07-28 15:24:46 -07:00
Tadashi G. Takaoka
851c3267d4 Fix that long pressing shift on symbol keyboard registers caps lock code 
Bug: 5088376
Change-Id: I586a9fb685f3443aa22fd877df52b36247c4f858
 2011-07-28 12:04:35 -07:00
Alan Viverette
65a898d9ef Simplifying accessibility code in keyboard's dispatchTouchEvent() 
Change-Id: Ie33cf93ee2d7eadad38ca170aa8ad988bb0ae9a9
 2011-07-28 11:55:45 -07:00
Tadashi G. Takaoka
c3d175c01f Fix wrong keyboard width when orientation has changed while IME is not shown 
Bug: 5084021
Change-Id: Ie42da40b8249eaf9cf29707058906949278eff6a
 2011-07-28 11:02:29 -07:00
Tadashi G. Takaoka
0a5345c7b6 Fix NPE 
Bug: 5086698
Change-Id: Iaa3082649344722bd643c49c9d151df754d6e337
 2011-07-27 15:37:42 -07:00
Tadashi G. Takaoka
60ccbe16ee Clean up keyboard loading and switching 
Bug: 4311428
Change-Id: Ia72de23634f824d82b7b5f2267d439ce922a3b57
 2011-07-27 13:34:16 -07:00
Ken Wakasa
3ca85794a0 Merge "Fixed duplicate call to dispatchOnPopulateAccessibilityEvent()" 2011-07-26 15:15:34 -07:00
Tadashi G. Takaoka
4692af50da Support multiple key preview 
Bug: 4298393
Change-Id: Ibd3681f7255c85e3602e1af4ace8f8e7fce3fb06
 2011-07-26 14:55:19 -07:00
Alan Viverette
586a15c3f0 Fixed duplicate call to dispatchOnPopulateAccessibilityEvent() 
Bug: 5060194
Change-Id: I585ae52204a045fa3941e846b4f9bdd7d541bea6
 2011-07-26 14:06:26 -07:00
Tadashi G. Takaoka
9ec80d9d89 Make PointerTracker aware of that popup panel is showing 
Bug: 5070598
Change-Id: I0604287b8c373e4763b4ccf88c0bd7235af907d5
 2011-07-26 10:22:07 -07:00
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
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
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
255486a5d0 Disable VoiceInputLogger inside LatinIME 
Bug: 4985273
Change-Id: I6c70e50a58be0973f78c6a1abc1fb4eac5449c0b
 2011-07-22 02:37:56 -07: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
Tadashi G. Takaoka
b880731620 Merge "Revert "Add Right-To-Left delete icon"" 2011-07-21 00:45:08 -07:00
Tadashi G. Takaoka
5cce2161fb Revert "Add Right-To-Left delete icon" 
This reverts commit 886246b19a.

Bug: 5047500
Change-Id: Iefef20b7aeba0dbedfe8f81384a33f65e3907e9f
 2011-07-21 00:05:22 -07:00
Tadashi G. Takaoka
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
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
89bb88f61c Revert "Keep keyboard layout while orientation change" 
This reverts commit 8ebbe03fed.

Bug: 5037466
 2011-07-19 18:13:22 -07: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
6989e0b804 Update Arabic keyboard 
Bug: 4161983
Change-Id: Ie163cd17c87773bf2ca37fff7cff79611fff644f
 2011-07-14 01:04:12 -07:00
Tadashi G. Takaoka
5c73ed628b Move PointerTrackerQueue into PointerTracker 
Bug: 4768084
Change-Id: I1be83b38c48147827c871c92e17d37da3aeb0f95
 2011-07-12 23:35:23 -07:00
Tadashi G. Takaoka
e0d3922ba3 Merge "Fix mini keyboard behavior while chording input" 2011-07-12 21:53:48 -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
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
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
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
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
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
3fdae97417 Move processing MotionEvent out from PointerTracker 
Bug: 4768084
Change-Id: Idfbc9706f9daeaa979edeee9064cb69326bd3bbc
 2011-07-08 21:19:16 -07: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
Tadashi G. Takaoka
8a995157f3 Merge PointerTrackerKeyState into PointerTracker 
Bug: 4768084
Change-Id: I0be0e07bff2542db6ba764dcb13505dfbff6994e
 2011-07-08 16:26:11 -07:00
Tadashi G. Takaoka
a9f69513df Merge "Remove swipe gesture" 2011-07-08 00:06:25 -07:00
Tadashi G. Takaoka
c71854a661 Remove swipe gesture 
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
 2011-07-08 00:00:14 -07:00
Tadashi G. Takaoka
5a7a696aff Let KeyDetector hold Keyboard 
Bug: 4768084
Change-Id: Ia28d6971fc59086dd4e6fedc9fd1b50f13b59854
 2011-07-07 23:31:04 -07:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
f60d09ac30 Narrower KeyboardView reference 
This change also rename static inner class to more readable name and
get rid of unnecessary object reference from PointerTracker.

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

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

Bug: 4768084

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

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

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

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

Bug: 4948171
Change-Id: I6e4d03b3144caa95c793aac97af22df34c5f454f
 2011-06-29 18:34:57 +09:00
Tadashi G. Takaoka
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
8aee759262 Remove reference to system theme 
This change also introduces
 * Background for space key preview
 * Tune stone theme

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

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

Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859
 2011-06-27 20:04:34 +09:00
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
14daf66fc5 Remove spacebar preview and arrows 
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
 2011-06-24 21:41:27 +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
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
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
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
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
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
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
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
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
Tadashi G. Takaoka
a61967330e Make LatinKeyboard aware of theme 
Bug: 4436327
Change-Id: Idecdd470cbb0720b96958039eb11f6978d39629e
 2011-06-16 20:10:49 +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
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
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
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
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
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
Tadashi G. Takaoka
c25e07d212 Fix web input type judgment 
Bug: 4490948
Change-Id: I71efb8f5784970f1d2a94da1d2eb852f7f11885f
 2011-05-30 19:10:25 +09: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
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
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
c150acc7c8 Move CandidateView into input view 
Bug: 4175031
Change-Id: I95f379b9943d1dcab1dc5527b6e5ac5abd58e280
 2011-05-24 15:37:53 +09: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
8632bff2d5 Fix copyright author from Google to AOSP 
Change-Id: Iaceedc783181e43af6dd48ece218a42eace66532
 2011-05-20 12:09:57 +09:00
Tadashi G. Takaoka
96f185d8af Fix NPE in Key.isDigitPopupCharacter 
Change-Id: Ie6e8d31e41010db27e2db415b577458b73a9f1a2
 2011-05-19 14:32:33 +09: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
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
Tadashi G. Takaoka
bdd9341f61 Refactor KeyboardView constructor 
Change-Id: I1fd869c180c6c9f966936fce90bc031bc7824983
 2011-05-13 20:04:06 +09: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
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
Tadashi G. Takaoka
ff082d081f Refactor KeyboardView and create MiniKeyboardView 
Change-Id: I8d68b944762ccde05020978f20b3742eb6ab945b
 2011-05-09 19:17:39 +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
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
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
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
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
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
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
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
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
Tadashi G. Takaoka
d2c5fdda86 Rename and reorganize key code 
Change-Id: I13d6fef7af1c4356a22b0e8aebc9e613b1693ece
 2011-04-21 20:32:33 +09:00
Tadashi G. Takaoka
c9c3aa219e Merge "Disable key preview of space, return and delete" 2011-04-21 03:10:21 -07:00
Tadashi G. Takaoka
ba9aefcc18 Disable key preview of space, return and delete 
This change also re-orders punctuation mini keyboard.

Change-Id: I987ef14fe5956d13439a0a76de367feed825314c
 2011-04-21 19:04:49 +09:00
satok
15a0ba6d74 Check the availability of layouts for showing the input languages in the settings 
Bug: 4316889

Change-Id: I746b3ff79c2a6cd4925fca1817d5b209623b5108
 2011-04-21 17:17:32 +09:00
Tadashi G. Takaoka
e6cb8fc234 Display spacebar language switcher even when key preview is off 
Bug: 4313884
Change-Id: I9d4a474302dadbfc610324799f8768b803705e52
 2011-04-21 12:53:53 +09:00
Tadashi G. Takaoka
d9786ce2e3 Refactor key preview code 
This change removes mOldPreviewKeyIndex from KeyboardView.

Bug: 4298393
Change-Id: I832eb6deab7e078609973bf0b8be09f73db204d7
 2011-04-19 20:32:57 +09:00
Tadashi G. Takaoka
d2c2b4d112 Remove mPreviousKey in PointerTracker 
This change also introduces PointerTracker.onLongPressed.

Change-Id: I079eb52175d8fe8b88ce3f13e31493d34d00ad5e
 2011-04-19 17:35:11 +09:00
Tadashi G. Takaoka
3f2653ba60 Refactor key preview related code in KeyboardView 
Change-Id: Ib8f08cb4f5e03d0c32c32a0ea0363ce3d72fc050
 2011-04-18 17:00:58 +09:00
Tadashi G. Takaoka
6fb97bf71c Don't show spacebar preview if key preview is disabled 
This change also introduces soft reference cache of spacebar Drawable.

Bug: 4307333
Change-Id: I4d2c500bb47d794aa4f8dfa6ec415dbcb9ab0b74
 2011-04-15 23:22:48 +09:00
Tadashi G. Takaoka
dc90d0a15f Refactoring keyboard drawing code and KeyDetector 
Change-Id: I55009bf38b1422301223bd90463f837562559dc5
 2011-04-15 18:35:08 +09:00
Tadashi G. Takaoka
5d542c2492 Auto mini keyboard layout 
Bug: 4280617
Change-Id: I34c344cbf350fe125589aa14ad69e4bd1f4e6f66
 2011-04-15 18:19:31 +09:00
Tadashi G. Takaoka
72a82d7ee8 Count up horizontal gap as part of key width 
Change-Id: Ic9a070a9b6a461f4c8330d1cc3e2c33fd7369f73
 2011-04-15 09:54:39 +09:00
Tadashi G. Takaoka
37cfacbae6 Make showing key preview compatible with pre-Honeycomb 
Bug: 4179964
Change-Id: Ide0a9c75983b45f8e829f0d64f41557d42fc11e7
 2011-04-14 17:43:25 +09:00
Tadashi G. Takaoka
dc3d4e8c06 Merge "Fast key preview" 2011-04-13 03:12:06 -07:00
Tadashi G. Takaoka
7a3d3ae17f Fast key preview 
Previously the key preview was implemented by PopupWindow.  The key
preview popup window would be dismissed and shown each time the key
was released and pressed.  It turned out that it was taking several
milliseconds.

This change implements the key preview by a simple TextView which will
be layout-ed at absolute coordinates within the screen FrameLayout.
And dismissing and showing the key preview is implemented by the
TextView's visibility.

This implementation needs careful coordination of candidates.xml
layout and LatinIME.onComputeInsets to control suggestion strip
visibility.

Bug: 4179964
Change-Id: Id6347cb35b91eb14ab20dd2f312e58b54b6625a7
 2011-04-13 18:59:33 +09:00
satok
88fc9d4418 Support language bar swich for InputMethodSubtype 
Change-Id: Ie49f0c1c7aea135331dc1d4a635197b3f4a96e93
 2011-04-13 17:05:24 +09:00
Tadashi G. Takaoka
56abeabced Add visualInsetsLeft and Right as Key attribute 
Bug: 4269094
Change-Id: Ic38d326a8e9ef802453c909f3a81d556863acc9b
 2011-04-11 12:13:38 +09:00
Tadashi G. Takaoka
2c389c5b9e Merge "Increase the horizontal gap between shift/delete and normal keys" 2011-04-08 02:00:59 -07:00
Tadashi G. Takaoka
967d6073bf Disable popup preview and long press on disabled key 
Bug: 4268147
Change-Id: Ibcb54791ef78737dd09d8a594b5a53b0909609d6
 2011-04-08 17:14:12 +09:00
Tadashi G. Takaoka
6d81e2b79b Increase the horizontal gap between shift/delete and normal keys 
This change also adds capability to add horizontal padding to the
keyboard.

Bug: 4269094
Change-Id: I805e76b253a497079517c01bd2a976f8702f7e56
 2011-04-08 16:43:01 +09:00
Tadashi G. Takaoka
e7c0e73a19 Simplify the Key's on state transition 
Because handling shift locked state of alphabet keyboard is done by
KeyboardSwitcher, there is no need to change the "on" state of Key
when releasing the key. On the other hand, symbol and symbol shifted
keyboard has fixed "on" state "ALT/MORE" key.

This change also renames the attribute "isModifier" to "isFunctional".

Change-Id: I082885bd2376ae26bdfc378c14add2b5d6be1d4e
 2011-04-07 20:28:46 +09:00
Tadashi G. Takaoka
996db15d3c Disable successive modifier key while sliding input 
When user starts sliding key input, sliding through successive
modifier key will be ignored.

Bug: 4181843
Depends: I082885bd2376ae26bdfc378c14add2b5d6be1d4e

Change-Id: Ibe890b9cc1183dbe9f68a421650fcd97e7ff221c
 2011-04-07 20:17:27 +09:00
Tadashi G. Takaoka
da4bfbbbb3 Fix popup key preview on tablet 
This change temporally enable popup key preview option on
tablet. (config_enable_show_popup_on_keypress_option).

Bug: 3286117
Change-Id: Iabbac5a333460e1ed2f8d05ba82f4bae81854b85
 2011-04-07 15:56:16 +09:00
satok
f1a81f5eb3 Move a debug utility function to EditorInfoCompatUtils 
- imeOptionName

Change-Id: I7a7ea9bee410cedc0ef9b3d2aa4df8260d7f6a35
 2011-03-25 12:56:57 -07:00
satok
e9957752bc Added InputTypeCompatUtils 
Also Moved utilities related to InputType to InputTypeCompatUtils

Change-Id: Iab8ff5389f624f2abe627ece2acb156b0e1285ef
 2011-03-25 00:46:40 -07:00
satok
b86905943c Renamed Proxy classes 
- VoiceConnector to VoiceProxy
- VoiceInputConnector to VoiceInputWrapper
- VoiceLoggerConnector to VoiceLoggerWrapper

Change-Id: I908ddc590c8846cf5cbd80b9c0257cb65c638bde
 2011-03-24 17:50:19 -07:00
satok
610f1dc855 Use reflections for classes related to InputMethodSubtype 
Change-Id: Ica53ce879c2b4c5eb47f757fb788a795a881c30e
 2011-03-18 22:49:57 -07:00
satok
9807ab27ea (Refactor 1) Moved voice related codes to deprecated/voice 
Change-Id: I008ac7099c815fb74a9ab374419617b336453f97
 2011-03-16 23:00:59 -07:00
satok
817e517e46 Add the suggestion algorithm of words with space proximity 
Bug: 3311719

Change-Id: Ide12a4a6280103c092fa0f563dd5b9e3f7f5c89b
 2011-03-04 20:37:18 -08:00
Tadashi G. Takaoka
4503e2ea98 Hide shortcut key when the shortcut IME is not enabled 
Bug: 3398726
Change-Id: I5e1bfc1fec9047c1c4e4f29fbf79f0fdf9356ffb
 2011-03-03 01:18:08 -08:00
Tadashi G. Takaoka
e59491460b Remain in previous state while sliding off from shift key 
Bug: 3502290
Change-Id: I69b60051863c78727363ae63576c28d87fb71a3a
 2011-03-02 14:59:39 -08:00
Ken Wakasa
eaef1c5007 Change how to load native lib to be on the safe side 
Change-Id: If170d4821b8dbc187f29137ea99d10e30c20955f
 2011-02-25 18:21:02 +09:00
Tadashi Takaoka
52e96f1e89 Merge "Added support for speaking keys through accessibility service." 2011-02-24 17:45:44 -08:00
Tadashi G. Takaoka
d77e968942 Merge "Add noSettingsKey private IME option" 2011-02-23 23:48:45 -08:00
Tadashi G. Takaoka
4199e29a7d Add noSettingsKey private IME option 
Change-Id: Idf74aa32c9ea565fa6771013e2d37ee952c83a57
 2011-02-24 16:31:20 +09:00
Alan Viverette
dcade18113 Added support for speaking keys through accessibility service. 
Issue: 3366636

Change-Id: I70a2ebb4420782ba4d7d874ffc2259bb1b80446f
 2011-02-23 18:16:43 -08:00
satok
8fbd552292 Add proximity info to native 
Bug: 3311719

Change-Id: Ie596304070e321ad23fb67a13bf05e2b6af1b54b
 2011-02-23 23:04:00 +09:00
Tadashi G. Takaoka
edb722abef Merge "Add countryCode attribute to case tag of Keyboard" 2011-02-23 01:00:00 -08:00
Tadashi G. Takaoka
912ade36d2 Add countryCode attribute to case tag of Keyboard 
Change-Id: I0480c3350a335e4cb57bba2d3484622990cd90af
 2011-02-23 17:09:24 +09:00
Tadashi G. Takaoka
cb97c2f140 Refactor keyboard mode holding variables 
Change-Id: Id8d4e780a98292fda63b1e5bbf739eda78935a3b
 2011-02-23 14:17:10 +09:00
Tadashi G. Takaoka
050c0462dc Display language name on spacebar even in symbol keyboard. 
Bug: 3468634
Change-Id: I1a25eb71ddbd7efae6f40ea357714924a9d56dc4
 2011-02-20 21:16:49 +09:00
Tadashi G. Takaoka
4adf5d9ae5 Disable non-ASCII symbol keys in password input 
Bug: 3384942

Change-Id: Ifa10e84f22bb6ff85dfc397fac95a0294b2a6bea
 2011-02-20 18:59:25 +09:00
Tadashi G. Takaoka
a9f2fe2d59 Merge "Add "passwordInput" attribute to case tag of Keyboard" 2011-02-20 01:50:16 -08:00
Tadashi G. Takaoka
4b13b4f942 Add "passwordInput" attribute to case tag of Keyboard 
This change also introduces number password (a.k.a. PIN) layout. The
text password layout will follow.

Bug: 3384942
Change-Id: I50b5e413e47a28d5285fd0468115e11ce46c7f18
 2011-02-20 18:46:48 +09:00
Tadashi G. Takaoka
690b1360bf Don't play key press sound if the key is disabled 
Change-Id: I1c6d1b16a7420bc7e5f97f50da549e6a89498f18
 2011-02-20 18:14:05 +09:00
Tadashi G. Takaoka
fdb6a194b1 Read "enabled" attribute of Key from <key-style> 
This is follow up change of I1ea82d9f.

Bug: 3384942
Change-Id: If96eda69fe81edbfc1b243a6fa9f8eb6bbf4c12d
 2011-02-20 15:25:57 +09:00
Tadashi G. Takaoka
ea6c2e3350 Add "languageCode" attribute to "case" tag in Keyboard XML 
bug: 3451586
Change-Id: I08ca80e48648ba18543e9b8ca7362c06bb61a826
 2011-02-18 17:04:04 +09:00
Tadashi G. Takaoka
d9c52ba623 Rename imeOptions attribute of Keyboard to imeAction. 
Bug: 3384942
Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6
 2011-02-18 16:56:05 +09:00
Tadashi G. Takaoka
aa721c4783 Add "enabled" as an attribute of Key in Keyboard xml 
If the key is marked as "enabled=false", the key will not respond to be pressed.

Bug: 3384942
Change-Id: I1ea82d9f3dfa5a9916ff3bbc736ea7e6c77426ae
 2011-02-18 14:45:37 +09:00
Tadashi G. Takaoka
887f11ee43 Remove next letters frequency handling 
Bug: 3428942
Change-Id: Id62f467ce4e50c60a56d59bf96770e799a4659e2
 2011-02-17 13:59:41 +09:00
Tadashi G. Takaoka
5ef096f5f6 Move and rename computeProximityThreshold 
Move and rename KeyboardView.computeProximityThreshold to
KeyDetector.getMostCommonKeyWidth. And make it public for unit test
use.

This is a part of multi-project change (If751659a, Idb18f362)

Bug: 3414081
Change-Id: If751659a53c7412f836d6d28866760ffe84b179b
 2011-02-08 11:43:39 +09:00
Tadashi G. Takaoka
9a5b592b27 Skip sudden jump detection on distinct multitouch device 
Bug: 3400448
Change-Id: I37150d624b73ed089875a905fe04c5b8b3ecfa0a
 2011-02-04 15:49:11 +09:00
Tadashi G. Takaoka
f2fd472dcc Cleanup keyboard drawing code 
Change-Id: I084e3ac835ee60b8e463ac10c075adbf08b9a7cb
 2011-02-01 19:42:56 +09:00
Ken Wakasa
063a98a7b2 Merge "Reuse keyboard view's drawing bitmap if possible" into honeycomb 2011-01-27 23:43:02 -08:00
Tadashi G. Takaoka
513f1b0454 Merge "Add hack to translate sudden move to up/down events" into honeycomb 2011-01-27 23:37:49 -08:00
Tadashi G. Takaoka
faf437b507 Add hack to translate sudden move to up/down events 
This change also gets rid of unnecessary debug messages.

Bug: 3400735
Change-Id: I3f003b1c2b553a2f841d4880f348a012d2d9c8ad
 2011-01-28 16:35:02 +09:00
Ken Wakasa
566630147d Reuse keyboard view's drawing bitmap if possible 
bug: 3398660
Change-Id: I0c7f7c084904990563ac62b5d9cf829f86855661
 2011-01-28 16:33:34 +09:00
Tadashi G. Takaoka
4d3b9d709c Import new icon for disabled mic key 
This change also updates other hdpi assets.

Bug: 3345931
Change-Id: Ia91e449905677b025307bf9ea6e618d82090a389
 2011-01-28 16:16:59 +09:00
Tadashi G. Takaoka
5cd87e1b1c Disable shortcut key when network is not available 
Bug: 3345931
Change-Id: I1deef774598b8e78da4404535b6d3814464a9d2d
 2011-01-26 17:07:55 +09:00
Tadashi G. Takaoka
e5ce433a9e Check second down event of double tap is on shift key 
This change also removes unnecessary touch point tweaks.

Bug: 3385404
Change-Id: Ic398268ec4fcfaa9eafe8a70f2d10c2cd1fdfc62
 2011-01-25 23:34:49 +09:00
Tadashi G. Takaoka
04c96ab966 Automatically layout mini keyboard 
Bug: 2214959

Change-Id: I06370e1c9e0683666ad19454a2fb501008af95c0
 2011-01-25 20:36:11 +09:00
Ken Wakasa
86f189fd96 Fix NPE 
bug: 3364217
Change-Id: If6a2514a8feac509d7b6716c8574521a0ec0fa3e
 2011-01-19 17:44:51 +09:00
Tadashi G. Takaoka
d01ae897d3 Pressing shift could turn off shift state while auto capitalize mode 
Bug: 3363137
Change-Id: I442c1fbb185ad9ea16ee9bab70649f2b9f89400c
 2011-01-19 11:59:45 +09:00
Tadashi G. Takaoka
d5a6b910e8 Purge keyboard only when voice input will be invoked 
This change also draws the language name in light gray on spacebar
without fading out even when the keyboard locale has not been changed.

Bug: 3362369
Bug: 3361915
Change-Id: I66538b03ce2e48c3441091319d0377176f8118ec
 2011-01-18 11:41:12 +09:00
Tadashi G. Takaoka
a0ff76638c Merge "Make sure that keyboard is not displayed when voice mode" into honeycomb 2011-01-17 05:49:00 -08:00
Tadashi G. Takaoka
04f815eca4 Make sure that keyboard is not displayed when voice mode 
Bug: 3352347

Change-Id: I43cf5159f8bdcf2bc2c9a48662ea44a43ad4e25d
 2011-01-17 22:41:05 +09:00
Tadashi G. Takaoka
8bec4aa912 Fix voice key enable status has not been reflected to keyboard id 
Bug: 3355428
Change-Id: Id4e572357a7b5603e9a609b7e80b81d8e2c500f6
 2011-01-17 19:27:39 +09:00
Tadashi G. Takaoka
66432cfc9b Place language name at center of spacebar if no space icon 
This change also leaves the language name as light grayed after fading out.

Bug: 3290290

Change-Id: I71adf80c9a3b77d2fd34bca458845d85d55cbee7
 2011-01-17 17:04:53 +09:00
Tadashi G. Takaoka
93e2d77741 Merge "Fix froyo-ub-LatinImeGoogle compatibility" into honeycomb 2011-01-14 06:59:01 -08:00
Tadashi G. Takaoka
34cee317d8 Fix froyo-ub-LatinImeGoogle compatibility 
Change-Id: I46fca4735d08552dfb414b2b302b4ed97ae96ab0
 2011-01-14 22:24:10 +09:00
Tadashi G. Takaoka
de0c8874a4 Notify keyboard language on space bar when it has changed 
This change also introduces the following.
* space bar language switcher is enabled for phone device.
* get rid of spcae key icon from number keyboard of tablet.
* slightly lower the position of language name on space bar of tablet.

Bug: 3290290
Change-Id: I432be8f757bcc84c257770112ff1f6fa7970c584
 2011-01-14 20:11:52 +09:00
Tadashi G. Takaoka
ee66e6fa90 Reset old keyboard state before switching to new keyboard 
This change is ported version of I8030202f from Gingerbread.
Bug: 3322158

Change-Id: Idc1ef7f174b50b0478ba53b14427485275e97748
 2011-01-12 14:13:32 +09:00
Ken Wakasa
715189fe6e Get rid of the space bar symbol on the tablet. 
bug: 3290290
Change-Id: I4c57151197989375e6e9f36f508e6e875f856654
 2011-01-08 00:15:14 +09:00
Tadashi G. Takaoka
f16028b92e Remove digit popup characters from mini keyboard of tablet 
Bug: 3321376
Change-Id: I38d963952d3c6d2cf1ad19a69b32f90191f17178
 2011-01-07 01:12:15 +09:00
Tadashi G. Takaoka
cc55d947ad Calculate mini keyboard key width from labels 
Change-Id: I4259753bd10fdf488fcffacb6b131e30511e780f
 2011-01-06 22:40:20 +09:00
Tadashi G. Takaoka
ca65332145 Merge "Remove Row object from MiniKeyboardBuilder" 2011-01-05 21:20:18 -08:00
Tadashi G. Takaoka
e89af1fa5f Remove Row object from MiniKeyboardBuilder 
Change-Id: I981278f29fdd23d80c3da21ecdbbda6d62a0dfde
 2011-01-01 13:52:36 +09:00
Tadashi G. Takaoka
a96574fdd5 Move NOT_A_TOUCH_COORDINATE constant to KeyboardActionListener 
Change-Id: Iff3fde48682a7c56201fc9eb3640755e0090d0ee
 2011-01-01 13:43:28 +09:00
Tadashi G. Takaoka
611044ab30 Merge "Snap back to the previous keyboard when sliding input is canceled" 2010-12-31 03:28:35 -08:00
Tadashi G. Takaoka
5f922caff8 Snap back to the previous keyboard when sliding input is canceled 
Bug: 3316517
Change-Id: Iffaad1eb93b6a014d8445f3e27b0e24c20967daf
 2010-12-31 14:02:04 +09:00
Tadashi G. Takaoka
1a6fba5702 Fix potential keyboard layout change bug 
Change-Id: I2518dd1d2ef4b77fe32bb1fed4e0c722f3d120c1
 2010-12-31 11:46:48 +09:00
Tadashi G. Takaoka
5797cefca6 Longer long-press timeout in sliding input 
Change-Id: Id74bddef4837ee46569775ce54f54d5535cfa463
 2010-12-30 17:27:47 +09:00
Tadashi G. Takaoka
05ddb9a5d2 Add config_default_keyboard_theme_id resource 
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
 2010-12-28 21:06:45 +09:00
Tadashi G. Takaoka
baf83886be Filter out too short noisy touch events 
Bug: 3294017
Change-Id: I1769eab1d096d16bfa9d6f23b973483ee6e7a478
 2010-12-21 23:46:15 +09:00
Tadashi G. Takaoka
1d7d9664a9 Refactor PointerTracker class to include queue management 
Change-Id: I81d025220df6d970d8758157a89168851c8421ae
 2010-12-21 18:56:27 +09:00
Tadashi G. Takaoka
2b13b4f5e5 Suppress long press timer on hinted key while temporary upper case mode 
Bug: 3301932
Change-Id: I29b5e5a9aa8b44681e763a4d6485109f3f99f6fa
 2010-12-21 17:28:19 +09:00
Tadashi G. Takaoka
c4f71668d7 Remove multi-tap feature 
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
 2010-12-20 21:58:31 +09:00
Tadashi G. Takaoka
8aa3f5a3ad Cleanup KeyboardActionListener interface 
Change-Id: I851eaea479f1590fd404a7a37a9a35d1bdcd378c
 2010-12-20 19:52:08 +09:00
Tadashi G. Takaoka
cb2469ae17 Suppress haptic feedback while sliding key input 
Bug: 3298222
Change-Id: I9507a98cc833fc6403cf9abf23457748a2bf89de
 2010-12-20 19:48:27 +09:00
Tadashi G. Takaoka
5ef421b58a Cancel long press timer when sliding key input is not allowed 
This change also fixes auto snap back behavior of key which has output
text, such as smiley key.

Bug: 3297825
Change-Id: Ia06e1abc0fbdff2a26504ddcce1dc7f933b45453
 2010-12-19 21:57:50 +09:00
Tadashi G. Takaoka
cc0e41222d Merge "Do not pick up closest key if the point is out of any key" 2010-12-19 04:07:41 -08:00
Tadashi G. Takaoka
6d929d586f Do not pick up closest key if the point is out of any key 
Bug: 3286308
Change-Id: I62771fb209027ddec4595d099d5d397ae4e200fd
 2010-12-19 20:34:32 +09:00
Tadashi G. Takaoka
ef71c4aa4c Fix checking of sliding off from key 
This is follow up change of Id6f69e82.

Change-Id: I15127929b8eeb511a652c7ae6a14ababbb49ee24
 2010-12-19 19:52:15 +09:00
Tadashi G. Takaoka
dbc44989a5 Refactor PointerTracker class 
Change-Id: Id6f69e82119a9a3f618d95443a3ecc766abab08a
 2010-12-19 19:15:01 +09:00
Tadashi G. Takaoka
9e91472285 Automaticaly snap back to the previous mode from sliding symbol input 
Bug: 3280151

Change-Id: I48ea134639465d0cc178e524af8d7885d185957d
 2010-12-19 18:48:49 +09:00
Tadashi G. Takaoka
67a4ecacc7 Disallow sliding key input 
This feature is configurable by R.bool.config_sliding_key_input_enabled.

Bug: 3294076
Change-Id: I0225a6ce19d9b911c9d9543a106ab57ee0b7de75
 2010-12-18 20:41:53 +09:00
Tadashi G. Takaoka
9b6d1d52d9 Add popupKeyboardTemplate attribute to Keyboard 
This change
- introduces the popupKeyboardTemplate attribute of Keyboard to
  specify XML Keyboard file for popup mini keyboard.
- introduces the maxPopupKeyboardColumn attribute of Keyboard to
  specify the maximum column of popup mini keyboard.
- changes the content format of the popupCharacters attribute of Key.
  It now represents keyLabel, codes and keyTextOutput of each key of
  popup mini keyboard using CSV format.

Bug: 2214959
Change-Id: I539e310f7e38a049ee193de0b4ad5d7afdce37b1
 2010-12-17 17:18:28 +09:00
Ken Wakasa
014f4883c7 Merge "Revise language string size on spacebar" 2010-12-16 00:50:42 -08:00
Ken Wakasa
183fbbb0db Revise language string size on spacebar 
bug: 3290290
Change-Id: I09694392d7fa447796c56a1f74b5b719ca28e466
 2010-12-16 16:53:02 +09:00
Tadashi G. Takaoka
98935836f0 Tweak base line of key top letter 
Bug: 3285380
Change-Id: Idf6b9b7e000d87df924742634188d193f948130f
 2010-12-16 16:07:40 +09:00
Tadashi G. Takaoka
1b1f7f907f Cleanup unused string resources 
This change also renames some "completion" to "correction".

Change-Id: I156dd7ccafe99a632721f20769d5f0ea5915a564
 2010-12-12 21:55:00 +09:00
Tadashi G. Takaoka
e26ef1bccd Remove Tutorial class and unused debug feature 
This change also cleanups compiler warnings.

Bug: 2897373
Change-Id: If972cf45c1eb40436adbddbf71969e5409f4c9c5
 2010-12-10 18:24:00 +09:00
Tadashi G. Takaoka
9502cc177c Remove LatinIME prefix from classes 
This change also cleanups preference key string constants

Change-Id: I58510f220a90d00d71a935731abeab87384675bb
 2010-12-09 21:54:51 +09:00
Tadashi G. Takaoka
4a734aa21e Fix popup mini keyboard for smiley and .com key 
Change-Id: Idd156b14a4a259bc7dcaf498fbc8a121a069cbe9
 2010-12-08 17:48:23 +09:00
Tadashi G. Takaoka
9f01ed51d7 Support keyboardHeight and maxKeyboardHeight to Keyboard XML 
This change introduces,
- new attribute keyboardHeight to specify default keyboard height.
- new attribute maxKeyboardHeight to specify maximum keyboard height,
  usually specified by percentage to the screen height.
- keyHeight attribute is obsoleted
- new attribute rowHeight to specify a row height, can be specifed as
  percentage of the keyboard height. And verticalGap is included to
  the row height (row height = key height + vertical gap).

Change-Id: I48a2f2661e8a91a998503a847437c1baf1de9b9c
 2010-12-08 17:43:29 +09:00
Tadashi G. Takaoka
292faee8ba Fix ghost popup mini keyboard 
Bug: 3257700
Change-Id: I522ceb426b825575c90e8445336191bcf889f05d
 2010-12-07 11:24:18 +09:00
Tadashi G. Takaoka
e18bd3e323 Fix voice key on phone device 
This change,
- changes voice key code back to -102
- renames some key code names and method names
- adds mic_slash_holo to drawable-hdpi

Change-Id: I8be3a20921f472ece4298edad2d275f29a7e4955
 2010-12-06 12:29:59 +09:00
Tadashi G. Takaoka
a275e9eb48 Make Key, Row and Keyboard attributes final 
Change-Id: Ie87e9e8936646334646cc93b228e0f6a93a79e5b
 2010-12-03 14:11:38 +09:00
Tadashi G. Takaoka
7545ec8df0 Fix no smiley popup mini keyboard 
Change-Id: I0e010c6f0c06fd59b7aef75fc142a4ce0089e740
 2010-12-03 13:36:17 +09:00
Tadashi G. Takaoka
391a7ce6d8 Remove LatinKey class 
Change-Id: I56b15980d994eed698566a1d0451e3ec7ab490a0
 2010-12-03 12:55:51 +09:00
Tadashi G. Takaoka
566870c0f1 Fix NPE at Keyboard 
Bug: 3250672
Change-Id: Ieef7ff5e8ba77a2d43f561c2bd2a1921230bd49d
 2010-12-03 12:36:31 +09:00
Tadashi G. Takaoka
418d80d7de Double tap on shift key turns on caps lock 
Bug: 3238128
Change-Id: Ib641d33da148b72c7c775caa11e0b2ab58a8c081
 2010-12-03 09:31:35 +09:00
Tadashi G. Takaoka
571bdb401f Refactor LatinKeyboard and LatinKey 
This change also moves KeyboardSwitcher and related classes to
com.android.inputmethod.keyboard package.

Multi project change with Ib23017b2

Change-Id: Id7d54b24615fe22ebb540ca847549909e346ee24
 2010-12-02 23:03:59 +09:00
Tadashi G. Takaoka
5a309f5715 Move some inner static class to top class in new package 
This change introduces new package com.android.inputmethod.keyboard
which hosts keyboard related classes.

Also adds missing @Override and @SuppressWarning("unused") annotation

Change-Id: I0317f5cfa317e13f3c77815f48ffc69b5d1ade05
 2010-12-02 20:06:01 +09:00