240871ecaf
Move code point constants from Keyboard to Constants class
...
Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
2012-10-29 16:04:20 +09:00
a28a05e971
Cleanup: Make some classes as final
...
Change-Id: I6009b3c1950ba32b7f1e205a3db2307fe0cd688e
2012-09-27 19:03:30 +09:00
e30c4e0bb1
Stabilize gesture recognition algorithm that looks for the nearest key.
...
It relies on the order of the key array.
Change-Id: I58fa71a7b330e59cd774fc208e5b6bc1a3decd2e
2012-09-11 20:00:21 +09:00
dc34da218a
Support per-Key and per-Keyboard key visual attributes
...
This change refactors KeyDrawParams and KeyPreviewDrawParams to
separate KeyVisualAttributes.
Change-Id: I4de549eef303e1debe4b8f84668e042445fc18da
2012-08-31 20:23:21 +09:00
35ff94547c
Separate inner classes of keyboard package out under internal package
...
Change-Id: Ia3969bd5ddec5aa5d81d05ad4cf676d818587922
2012-08-30 15:37:55 +09:00
29d5973fd3
Optimize rare Key attributes to separate class
...
This change also removes per-Key verticalGap and horizontalGap.
Change-Id: Id4d2129022fbbfbf5d740b8d1257032c945bb775
2012-08-30 11:48:19 +09:00
92821614fd
Revert "Revert "Move resource related methods to ResourceUtils""
...
This reverts commit bfc02a7005
2012-08-29 22:30:55 +09:00
bfc02a7005
Revert "Move resource related methods to ResourceUtils"
...
This reverts commit 160dc0f98e
2012-08-29 04:33:39 -07:00
160dc0f98e
Move resource related methods to ResourceUtils
...
Change-Id: I14535b030e58363315dd2daecaaef4edd6990cd9
2012-08-29 17:51:07 +09:00
75fb3ce1be
More readable Key.toString() and MoreKeySpec.toString()
...
Change-Id: Iee3c33dedd0c00ba259aa55e8b0c1c57b84eccdd
2012-07-30 15:51:41 +09:00
907ba59397
Can specify Key.backgroundType in <Row> and <include> attribute
...
Bug: 6568834
Change-Id: I138464b5445e13eaf062ce84a1ba332dfd1afafa
2012-06-06 10:15:51 -07:00
8f590c77e8
Use Math.round instead of (int) to convert Key coordinates from float to int
...
Bug: 6566563
Change-Id: I97d1e9727077cb4d9abbf1ad5bd5d3f061c7bce7
2012-05-28 16:16:35 +09:00
7ab7f66c2d
Fix adjusting key's label/code case
...
With this fix, we may probably be able to revert I76c3e917 (Make
KeySpecParser case insensitive).
Bug: 6561272
Change-Id: Ic7571560d7b422ffc9a07f0acecd388e0b330d50
2012-05-28 12:34:49 +09:00
0a57156c07
Don't use KeyDrawParams as argument of Key#selectTextSize
...
This is a follow up of Ide48c361.
Bug: 6509415
Change-Id: I59f6e47d06ebfbac6d354d36fca6788f092ed41d
2012-05-18 17:09:02 +09:00
aee147e216
Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
...
This reverts commit 4c9e6a15d1
2012-05-18 01:02:53 -07:00
4c9e6a15d1
Make KeyDrawParams and KeyPreviewDrawParams to top level class
...
This is a follow up of Ide48c361.
Bug: 6509415
Change-Id: Ib45c476924bc4b6b2ca65e0cae91d719109a9cb1
2012-05-18 16:58:34 +09:00
a08759f6b1
Support large label text ratio in KeyboardView
...
Bug: 6509415
Change-Id: Ide48c36126c23d91612c322a1027257c9b967e6b
2012-05-17 20:38:48 +09:00
1f2d0aa6c9
Set divider icon's alpha value on the fly
...
Bug: 6183494
Change-Id: I61a0c7617648d9c52e5001b3479afa0ab4913adc
2012-05-16 17:41:56 +09:00
2f83e9e532
Can override key-style
...
Bug: 6412932
Change-Id: I9576ae5b42bcc54cfd8ede0bae5148f3b04c1978
2012-05-01 16:56:53 +09:00
cf41aff251
Use string attribute for icon name
...
Change-Id: I336acf33c7e6bc993b9da9b17ec689975fa8127d
2012-04-20 15:31:42 +09:00
a58ebc73ae
Fix typo of some methods' name
...
Also changes some methods' argument type from Locale to String.
Change-Id: Ib68b528a450dc68a01546483403230f76500bee4
2012-04-18 16:40:50 +09:00
ab0d0d8a02
Add followKeyLabelRatio flag for keyLabelFlags of Key attribute
...
This change renames largeLetter flag to followKeyLargeLetterRatio as
well.
Change-Id: Ida777aac57e4d885fa051654fe863f493f8e946a
2012-04-11 15:53:38 +09:00
2be51f4fd0
Generate KeyboardLabelsSet from donottranslate-more-keys.xml
...
This change introduces makelabel tool that reads all languages'
donottranslate-more-keys and generate KeyboardLabelsSet.java source
file. The makelabel command must be invoked prior to compile LatinIME.
Change-Id: I7515c7919c535e30f9c80a37bdc831d0f682cd43
2012-04-11 11:23:47 +09:00
ed3bac91f2
Introduce KeyboardCodesSet.java and remove keycodes.xml
...
Change-Id: Icfd6d06f47425aa037682d22c895548ba6f047d8
2012-04-10 11:53:58 +09:00
9f0ea52a5d
Add missing Word.hashCode()
...
Some cleanups too.
bug: 6209651
Change-Id: I94e2e29c92e90e554e4952d277d590e093766c4f
2012-03-23 13:11:39 +09:00
b03529aa01
Support disableAdditionalMoreKeys and disableKeyLabelHint
...
Change-Id: Idfa586417acd4a223380d52f044e3a86eb780b21
2012-03-12 17:45:57 +09:00
cc8c8b99bd
Split Utils class to StringUtils, SubtypeUtils, and JniUtils
...
Change-Id: I09e91675fe7d573dad8c933ad513b21d7e409144
2012-03-08 20:30:38 +09:00
8e14e78377
Fix duplicate flag value in Key
...
Change-Id: I98e77e5432a228e4455998bf09a2cc671b113c4e
2012-03-07 18:41:38 +09:00
8c80fb9bcb
Fix Key to use a disabled icon when the key is disabled
...
Bug: 6114350
Change-Id: I419bc1736c27046dfea254ac510f5da478b6412c
2012-03-05 18:01:33 +09:00
e491be6e86
Support embedded more key
...
This is a followup change to Ie10b3e0b.
Change-Id: I1f91d96e32357b83bd0546537d561d638b6ff0c6
2012-03-05 14:22:52 +09:00
5ef4fccbb9
Support dividers in MoreKeysKeyboard
...
Bug: 6080806
Change-Id: Iacd78c6aab6abf948717d34da7489a79c41316d2
2012-03-02 20:52:25 +09:00
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
42fd1d2d72
Refactor more keys spec handling
...
Change-Id: Ibd95eff0725724ea35ad58e1d1ec7ec3d02a6e90
2012-03-01 16:07:02 +09:00
aeeed75848
Support fixed order more keys
...
Change-Id: I979f54e8b54243da4d23cfbe08198d2aa495f870
2012-02-17 00:49:18 -08:00
fdb6999e55
Key should be distinguished also by moreKeys contents and etc.
...
Change-Id: Ib2caabee6af78153b5a7be0e4df522288f2a7d48
2012-02-10 03:17:39 +09:00
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
2affaf91a0
Rename mini keyboard to more keys keyboard
...
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
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
17f53103ee
Fix KeyStyles to be able to override the value in style
...
Change-Id: Ib7476cdc0f81dfeb6292ef663e9dbab6d2b949ba
2012-02-07 18:51:51 +09:00
e7948a8692
Get rid of Key.setIcon(Drawable)
...
Change-Id: If6ebbdefcbfd0cc14c72858f9bb44861e8abe079
2012-02-03 14:38:17 +09:00
44e0e4f99e
Fix Key.equals(Key)
...
Bug: 5956068
Change-Id: I2901ae28bd9121ec4f4429a53b83aae128b75e0c
2012-02-02 21:33:50 +09:00
e01d272603
Make KeySpecParser and CSV parser code point aware
...
This change also renames MoreKeySpecParser to KeySpecParser
Change-Id: I35733cdbb344f16b57ffa2cfe79055c089b4e409
2012-02-02 15:51:40 +09:00
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
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
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
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
425e1996b8
Add inactivatedLabel and inactivatedUppercaseLetter flags for Key.keyLabelFlags
...
Change-Id: I6c7dc79cbad360602b278283f4c3a24c54040622
2012-01-27 18:11:43 +09:00
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
bcf2b79365
Prepare to get rid of Drawable reference from Key
...
Change-Id: If435f95b2863e0af8d8916c643e6b01feabd3ea5
2012-01-25 19:41:15 +09:00
38d6a18821
Use String instaed of CharSequence in Key class
...
Change-Id: Ia76a41daede402ed2a509e110ae97d6bb660c760
2012-01-25 17:04:00 +09:00
b009a24b83
Support @icon/icon_name for more keys specification
...
Change-Id: I8842e5ce77f9d27a0969df947de292c1830e36b7
2012-01-20 20:09:02 +09:00
bd7b160cfb
Change more key specification type to String from CharSequence
...
Change-Id: I5e910f8225a248fc6403771836dec4c0b7294caa
2012-01-20 16:27:32 +09:00
8cab0b56eb
Get rid of Keyboard.CODE_DUMMY
...
Change-Id: Id2320f4d9b5f22f0ac844ab20ce42b0c4e7c6880
2012-01-10 18:19:36 +09:00
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
4e1dab8cfa
Move KeyboardBuilder and KeyboardParams classes into Keyboard class
...
This change also moves XmlParseUtils to com.android.inputmethod.latin package.
Bug: 5778201
Change-Id: I7d9faa344460753ce178ad4048e0fadb65c75614
2011-12-18 20:19:16 +09:00
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
22b48de11c
Get rid of Key.needsSpecialPopupHint and related
...
Change-Id: I28e87ea3af9581f12094770b42f113e9018886c4
2011-12-18 16:08:28 +09:00
4a019a9c96
Use Set to group Keys in Keyboard instead of List
...
In deriving various shift stated alphabet keyboards from base/main
keyboard, almost all keys should be shared among variants. Grouping
keys in Set instead of List is a essential refactor to have.
Bug: 5002108
Bug: 5679585
Change-Id: Idd5644d1c45a3276a24b61c984619c03d4e4c54c
2011-12-16 21:04:04 +09:00
0b6237da94
Make Key.mPreviewIcon public final
...
Change-Id: I280b1fa6a018e095e9b36ea5475dde68e0965350
2011-12-16 12:47:34 +09:00
4665463ccd
Add XmlParseUtils class
...
Change-Id: Ie288272bc75832db7d743262c4c4fbe73b6dca04
2011-12-14 19:46:03 +09:00
de66f3af8a
Assign Key.mCode from the label only when outputText is not specified
...
Bug: 5742827
Change-Id: I72b55ce246b14a2d8f4fd16211b71dc716db30b2
2011-12-12 16:15:18 +09:00
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
e22baaadd3
Get rid of usage of key index
...
Change-Id: I7596ce3ae52fde436d06c2dd95ae873c7aa5ef7f
2011-11-29 19:07:54 +09:00
c1f7d39b4a
Introduce ignoreWhileTyping flags to Key.keyActionFlags
...
Bug: 5639503
Change-Id: Ic2afad6766edb2538a58f722209e2daa40aa488d
2011-11-22 18:18:29 -08:00
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
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
8fbf29e2d5
Make some private method static
...
Change-Id: Ia23765268be0ef89d7fe7c3f5372ed32d6615765
2011-10-28 13:31:31 +09:00
406a54f41c
Use XmlPullParser interface instead of XmlResourceParser
...
Change-Id: I00e8a82aaaf5fec1e27707bce0a82cbfd1bc9fae
2011-10-06 18:40:32 +09:00
2fc4248700
Introduce hit box to Key and get rid of edge flags
...
Change-Id: I2b78d2ca756223b5497d01127c3a0190dcc81e57
2011-09-28 19:31:37 +09:00
287f4f83e9
Add horizontal edges paddings to phone/number layout
...
Bug: 4948171
Change-Id: I8a06a25ffcbd141c9418e77e982233166a347914
2011-09-26 17:11:01 +09:00
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
5b0c124ca8
Remove Key.isStick, use backgroundType="stick" instead
...
Change-Id: I50e88c0870a3fe360b81f19163ca2f64ec38d8e8
2011-09-15 18:33:01 +09:00
a6d3a4d61b
Make action key background more visually prominent
...
Bug: 5232726
Change-Id: I76ff2fb431ca295693ceb231a0f13da44f9293e6
2011-09-15 17:40:44 +09:00
7918ed0169
Refactor Key.isFunctional to more generic Key.keyType
...
Bug: 5232726
Change-Id: Idc861ca725f62eaf37795f57401573394a17d6d3
2011-09-15 14:38:45 +09:00
4486d77270
Introduce autoXScale label option
...
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
2011-09-12 17:32:28 +09:00
30bd8cb2da
Add visual dividers to more suggestions panel
...
Bug: 5275003
Change-Id: I9464db71388a40ea768984b4cf06c8da05bfa26c
2011-09-08 23:05:55 +09:00
18453d69e0
Make Spacer as extended Key class
...
Bug: 5275003
Change-Id: I809a8ca363ba72b22ac5cfd926414990f7e8467c
2011-09-08 17:38:50 +09:00
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
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
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
9d5601e901
Rename PopupCharactersParser to MoreKeySpecParser
...
Also renames PopupPanel to MoreKeysPanel
Change-Id: I37209a5a8fe7dbba1eef03e3be88ba5253653926
2011-08-31 18:34:35 +09:00
9237a72634
Rename PopupMiniKeyboardView to MiniKeyboardView
...
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
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
392276d73d
Add Key constructor for suggestions pane
...
Bug: 5023981
Change-Id: I737bacb1a6bb40f70be65d6eff85614afe6c79ed
2011-08-30 19:14:52 +09:00
84b1284d01
Revert "Add hintLabel to Key constructor"
...
This reverts commit be34d97334
2011-08-30 18:40:21 +09:00
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
f9da4c548f
Remove password field special handling
...
Change-Id: Iaf1b4bbb54be7a4cade856d1ba363e976774f442
2011-08-23 16:49:35 +09:00
11b7febc0b
Ellipsis for "Space" key for triggering the IME switcher
...
bug:5136497
Change-Id: Iab7c68135500e9fed212521484090b52943550ca
2011-08-10 00:31:23 +09:00
62d4a96497
Support label with icon key
...
Bug: 5108339
Change-Id: I7cd4258a95a7e25b8b1114b43ffcca5b77c5c1e3
2011-08-03 01:53:30 -07:00
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
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
4d8eb2e888
Make horigontalGap and verticalGap attributes of Row obsolete
...
Bug: 5023981
Change-Id: Ifb07b54a68cfdd32ff2ea79812188fb6158bd073
2011-08-01 17:45:16 -07:00
723dd753e9
Remove Keyboard reference from Key object
...
Bug: 5023981
Change-Id: Ib0b9debf2018a0a9e9efe9323738e85174589e71
2011-08-01 17:07:45 -07:00
30479de9e5
Merge "Cleanup key label case adjustment"
2011-08-01 17:04:09 -07:00
c499866948
Cleanup key label case adjustment
...
Bug: 5023981
Change-Id: Ida06fc6a588c4eb8543455d932e71ac2797d27e5
2011-08-01 16:43:14 -07:00
b118d4cb58
Cleanup icon drawable related code
...
Bug: 5023981
Change-Id: I729354f32797eef354ec9af8e05f17839f0a361c
2011-08-01 16:37:13 -07:00
2fe68b9616
Filter non-ascii popup charcters from password keyboard
...
Change-Id: I10885efd317770f892165b6bb059313abf241436
2011-08-01 00:35:59 -07:00
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
e9d74adcc8
Merge "Take care of bidi-mirrored characters in suggestion strip as well"
2011-07-25 15:59:18 -07:00
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
Ken Wakasa