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

537 commits

Author SHA1 Message Date
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
a776b7fc4a Should update suggestion strip even if suggetion count is 1, in case typed word's length is 1 
bug: 3320818
Change-Id: I98ac8e0649de5dfd8b886401d42f2e5bcc2a8a1a
 2011-01-11 12:59:33 +09:00
Ken Wakasa
2faf0a176c Merge "Clean up: Update variable names to comply with spec of ApplicationInfo." into honeycomb 2011-01-10 09:05:34 -08:00
Ken Wakasa
255c044b0e Fix StringIndexOutOfBoundsException 
bug: 3325065
Change-Id: Ic3d2dca5b2aa1681d472c7f96b31737e15f4952d
 2011-01-09 18:44:28 +09:00
Ken Wakasa
90d96615bc Clean up: Update variable names to comply with spec of ApplicationInfo. 
ApplicationInfo.sourceDir may or may not be apk file name.  It can be a directory as well.
The spec just says it's "Full path to the location of this package".

Also, added error handling in loadDictionary().

Change-Id: I5e64d0aba4b1ec7634f4b3ac5537e7a774433ece
 2011-01-09 16:53:33 +09:00
Satoshi Kataoka
6d075dbda5 Merge "Get rid of the space bar symbol on the tablet." into honeycomb 2011-01-07 07:38:27 -08: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
Ken Wakasa
e90b333017 Load main dic in native 
Follow up to Id57dce51

bug: 3219819
Change-Id: I00e11ef21d0252ffa88c12dffb9c55b0f2e19a66
 2011-01-07 19:51:45 +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
Ken Wakasa
458249e703 Consolidate main dictionary files. 
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager.  Instead we'll probably use offset and size obtained from AssetFileDescriptor.

Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
 2011-01-05 11:31:58 +09: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
07357f33db Merge "Add config_default_keyboard_theme_id resource" 2010-12-28 04:33:02 -08:00
Tadashi G. Takaoka
05ddb9a5d2 Add config_default_keyboard_theme_id resource 
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
 2010-12-28 21:06:45 +09:00
satok
ceaca96b5c Merge "Fix miss spelling" 2010-12-28 03:08:13 -08:00
satok
9111d76cee Fix miss spelling 
Change-Id: I29d92d316525a897c86eab44f948a6c61ae38c35
 2010-12-28 19:49:43 +09:00
satok
43046fef25 Initialize mMode in SubtypeSwitcher and added TODO 
Change-Id: If3fa38c5ecf12159cee8d237fa3d5260a9ed66cb
 2010-12-28 19:16:36 +09:00
Tadashi G. Takaoka
363cd6ef0f Make dismissing keyboard by swiping down as configurable 
Bug: 3306370
Change-Id: If4e258ce4db05fb75dcd3b23fefa422c1287955b
 2010-12-23 12:44:40 +09:00
Tadashi G. Takaoka
23a3b74722 Merge "Suppress punctuation suggestions if not needed" 2010-12-21 18:57:09 -08:00
Tadashi G. Takaoka
9fb8c6dd48 Suppress punctuation suggestions if not needed 
Bug: 3294256
Bug: 3284745

Change-Id: I77d54cbfcc2e809315bab59ecb808ae944982501
 2010-12-22 01:48:20 +09:00
Ken Wakasa
9aa20e6ad1 Ignore case in editDistance() 
bug: 3278422

Change-Id: Ibd20488dcec215038970749b181857527311947b
 2010-12-22 00:42:41 +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
6311acb7f4 Merge "Suppress long press timer on hinted key while temporary upper case mode" 2010-12-21 00:47:03 -08: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
satok
68d483e2a2 Merge "Add a parameter to getEnabledSubtype" 2010-12-20 23:19:40 -08:00
satok
127ae5465e Add a parameter to getEnabledSubtype 
Change-Id: Iaa87613086093bc83d155ed2c0113fc513898801
 2010-12-21 14:14:00 +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
Tadashi G. Takaoka
a8baf5701f Merge "Tweak base line of key top letter" 2010-12-16 00:22:23 -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
e9311bc893 Update suggestion strip drawables 
Bug: 3286297
Change-Id: I51d4051ea22c465f81852e4fb98e48bad9cf57f1
 2010-12-16 12:38:43 +09:00
Tadashi G. Takaoka
1d11e7903f Fix adding user dictionary 
This change is follow up of I9fe45a61

Bug: 3264920
Change-Id: Ic7b95892e36e30fd9fadd7bea011efad7f2f98ca
 2010-12-16 12:25:01 +09:00
Tadashi G. Takaoka
a893ac38f5 Merge "Tune padding of candidate word" 2010-12-13 01:01:54 -08:00
Tadashi G. Takaoka
4700a6f2b0 Tune padding of candidate word 
Change-Id: I980e568f9b4b87b0f414aa7ce0197dba39a7708f
 2010-12-13 17:46:11 +09:00
Tadashi G. Takaoka
7bb84eac3b Merge "Check user dictionary before inserting new word" 2010-12-12 23:57:15 -08:00
Tadashi G. Takaoka
c5f1368090 Check user dictionary before inserting new word 
Bug: 3264920
Change-Id: I9fe45a61b2ad2b1ed69d3a0cbc6eebecb4038acc
 2010-12-13 16:52:25 +09:00
satok
7f1d3fa5d8 Remove language settings from preference activity 
Bug: 3268561

Change-Id: Ia910f0a090dc66c7dd9176999930d8cb763203b0
 2010-12-13 15:27:33 +09:00
Tadashi G. Takaoka
9ecad8c2e8 Fix auto correction threshold values array reference 
This change also removes unused argument from Suggest.getSuggestions().

Change-Id: I512f8695d22898bb906e136a66e0ee6b521cd1d1
 2010-12-13 14:40:49 +09:00
Tadashi G. Takaoka
4ca16dbd65 Highlight auto corrected word 
Bug: 3230726
Bug: 3215175
Change-Id: I086324cdab610b50a96d8eb08b81aa89c886ba00
 2010-12-12 22:23:39 +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
7e181fe101 Introduce SuggestedWords class to represent suggestions list 
Change-Id: I81677a785640d37296be8b42c7a74bd0c00edf46
 2010-12-12 16:44:42 +09:00
Tadashi G. Takaoka
a15e45ef45 Keep previous suggestions when there is only one suggestion found 
Bug: 1647861
Change-Id: I7aa7ceeb93b5d8db69480d73cc8a7177ab6bbb42
 2010-12-10 18:30:50 +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
satok
20cdb37bd0 Use setInputMethodAndSubtype and shortcutIME API instead of changing only view to Voice Input 
Bug: 3201828

Change-Id: If452f0b2d19eeb1f8f6e7e40539ba4bac6759fcd
 2010-12-10 18:03:30 +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
55b9d333c5 Show auto correction feedback 
Bug: 3230726
Change-Id: Iecf6fc837952c4721f6b726edcf16179254179ca
 2010-12-09 20:37:07 +09:00
Tadashi G. Takaoka
8ec36be4f5 Cleanup calling Spannable.setSpan() to set character style span 
This change is followup of Iadc11992

Bug: 3230726
Change-Id: I4f6692c3dbfb42986d478f4315105726ff89723a
 2010-12-09 14:43:54 +09:00
Tadashi G. Takaoka
522d5c16d2 Show underline for auto-completion candidate instead of bolding 
Bug: 3230726
Change-Id: Iadc11992d45776f7a4002ee9ebf24828646bcc53
 2010-12-09 14:04:50 +09:00
Tadashi G. Takaoka
89c58745d6 Tweak candidate view height and etc. 
Change-Id: I91963d0be122baf2274ea03b5028a66259a2cdb6
 2010-12-08 20:05:34 +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
satok
59cd73b916 Merge "Suggest excessive characters" 2010-12-07 23:58:23 -08:00
satok
cdbbea735f Suggest excessive characters 
bug: 3193883

Change-Id: Iea7a0fce7ce62d8779a7c7e4613d50db30d82b07
 2010-12-08 16:56:06 +09:00
Tadashi G. Takaoka
e49bd1c43a Implement CandidateView using HorizontalScrollView 
This change re-implements CandidateView using HorizontalScrollView and
customized Button, so that the candidate strip can be flingable.

This change also introduces the following features.

- Highlighting candidate strip and space bar is configurable by
  @bool/config_candidate_highlight_enabled.
- Candidate strip can be centered with left/right padding if
  @dimen/candidate_strip_padding size is greater than 0.
- Candidate text size is configurable by @dimen/candidate_text_size.

Bug: 1575885
Bug: 3230726
Change-Id: Iedf78ff31bc9f2f6291a8e8fb7faa0e6b961dd6d
 2010-12-08 16:55:36 +09:00
satok
e00b7c5f7b Merge "Fix a crash when MAX_WORD_LENGTH is too short." 2010-12-06 20:06:03 -08:00
Tadashi G. Takaoka
292faee8ba Fix ghost popup mini keyboard 
Bug: 3257700
Change-Id: I522ceb426b825575c90e8445336191bcf889f05d
 2010-12-07 11:24:18 +09:00
Ken Wakasa
d024ea605c Fix an issue with lingering composing span underline after orientation changes 
bug: 3246868

Change-Id: Id3887953e195281d677f31fba5feca1e60016bfa
 2010-12-06 23:35:32 +09:00
satok
f5cded1c6c Fix a crash when MAX_WORD_LENGTH is too short. 
Change-Id: Idcb5aa2685321b8d0ac7d846caecbd1c79e4dd77
 2010-12-06 22:58:56 +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
satok
711abe6756 Merge "Fix parameters of native functions and refactor Dictionary" 2010-12-01 18:30:33 -08:00
satok
3008825948 Fix parameters of native functions and refactor Dictionary 
- created bigram/unigram dictionary classes

Change-Id: I233a28ed8d611870db3f4cf8f25fc45b5d41529b
 2010-12-02 01:16:44 +09:00
Tadashi G. Takaoka
8d7ecc70a6 Load keyboard only when subtype is keyboard mode 
Bug: 3224990
Change-Id: I1ae1d86dce923464d4474fc7ce02f2ff22067603
 2010-12-01 22:53:06 +09:00
Ken Wakasa
383d6d8c81 Disable "touch to correct words" when suggestion strip is off 
bug: 3232408
Change-Id: Ic0d5f86288befcd5cf93cd86aaf8936929dbcdcc
 2010-12-01 20:24:05 +09:00
Tadashi G. Takaoka
c0007568d9 Merge "Key release event should be sent when finger sliding" 2010-12-01 02:35:17 -08:00
satok
d4952c8fe9 Move a logic for finding words with a missing character to the native code. 
Change-Id: I58338643830ff4f9708f78a9c26f75c8bf2ebf45
 2010-12-01 19:26:36 +09:00
Tadashi G. Takaoka
bd20db25be Merge "Tweak tablet keyboard design" 2010-12-01 02:07:26 -08:00
Tadashi G. Takaoka
5d04042663 Tweak tablet keyboard design 
This change introduces,
- center align "More" key label
- remove drop shadow from key label
- darker key label color when manual temporary upper case
- narrower pop up mini keyboard
- remove unnecessary key background from pop up mini keyboard
- smaller key label in portrait

Bug: 3216592
Change-Id: I77e0733f467a88aa32e09fcbace56fe08f755229
 2010-12-01 18:51:38 +09:00
Tadashi G. Takaoka
c0b5c9c43e Key release event should be sent when finger sliding 
This change is cherry-pick I1a020e3d from Gingerbread-MR

Bug: 3132881
Change-Id: I885eab7744369dfb841f9b34d210b6c2aef8f19a
 2010-12-01 15:12:08 +09:00
Ken Wakasa
80e459f8c9 Update the voice input warning dialog message string. 
Updated the relevant settings menu as well.

bug: 3194809

Change-Id: Ibcd00fcf32f82b7733da155ef6e15e389d53c645
 2010-12-01 14:14:47 +09:00
satok
965004fbe9 Remove excessive call of onKeyboardLanguageChanged in SubtypeSwitcher 
Change-Id: I8f85f9b053a70b8ad1755e4f343ac06ecd9e103b
 2010-11-30 11:10:50 +09:00
Tadashi G. Takaoka
fa086c9076 Cleanup unused Java import 
This change also fixes wrong file mode.

Change-Id: Ifcf4c9444ddcdc62d2e4b394891d6eee135c1e8f
 2010-11-29 17:57:48 +09:00
Ken Wakasa
27d13713bb Preload SharedPreferences at start. 
bug: 3207554
Change-Id: I84072461aee9675cc67897de03f89e9c0036bc1f
 2010-11-26 18:48:04 +09:00
Tadashi G. Takaoka
7f0befe1f0 Update tablet keyboard layout to the latest design 
This change introduces shiftedIcon attribute for Key which specifies
icon to draw the shift key while the key is in shifted state.

This change also intriduces new configurable dimension value
key_label_horizontal_alignment_padding which represents horizontal
padding for left or right alignment of key label.

Bug: 3216592
Bug: 3201839
Change-Id: I3aa7392227ce573c404517678e6340a8d1fcb328
 2010-11-25 00:11:21 -08:00
satok
79efbed76f Call showInputMethodPicker instead of showInputMethodSubtypePicker 
- because showInputMethodSubtypePicker will be removed.

Change-Id: I255f9bbff77de24ce067f35ee101d368e36edd45
 2010-11-25 14:09:50 +09:00
satok
1fb28137f4 Fix a bug at showing warning dialog at the first time when IME is trigerred in voice mode 
bug: 3226268

Change-Id: Ife7c752ad309ef796d9b7cc32517f00c2bb2af34
 2010-11-24 20:53:57 +09:00