Commit Graph

138 Commits (dd0a402e3fd3de8f17fb08e0a824611839aa754e)

Author SHA1 Message Date
Jean Chalard 239401745b am 7557d3c6: am bc77adef: Merge "Return the bigram frequency if available." into jb-dev
* commit '7557d3c6f3e7669fa213dbabda0f399e496b56b7':
  Return the bigram frequency if available.
2012-05-21 11:52:23 -07:00
Jean Chalard bc77adefbb Merge "Return the bigram frequency if available." into jb-dev 2012-05-17 03:15:40 -07:00
Ken Wakasa cf74ead3d7 DO NOT MERGE. Hide the usability study mode for the production
Change-Id: Ic0ffe56cd5314a00e81ba99148162dfb3ea1b044
2012-05-16 22:59:03 +09:00
Jean Chalard 9416c81403 Return the bigram frequency if available.
This concludes the work on bug#6313806.
Don't submit it before the dictionaries are suitably amended.

Bug: 6313806
Change-Id: Icfea45bd52bb9d8cc68ba2266f80640e3942bb7f
2012-05-16 21:14:06 +09:00
Tadashi G. Takaoka 7b6afb1287 Enable long-press spacebar on 7 inch tablet
This change also eliminate useless attribute longPressSpaceKeyTimeout
of LatinKeyboardView.

Bug: 6449356
Change-Id: Ib4dace4b9510c0eb96bdddacf8e0dbaa14fcfbbf
2012-05-08 12:50:07 +09:00
Jean Chalard 80f2ccc236 Update the names and default values of bigram options.
Bug: 6293595

Change-Id: I9978a1127c64b7a26a5ccf6f777366f7c4e214db
2012-04-05 21:07:40 +09:00
Tadashi G. Takaoka 2a04637f60 Convert dimension unit "in" and "mm" to "dp"
Bug: 6183561
Change-Id: I06d74705fd49566684815853b8f2df7b5a9f9d7e
2012-03-23 21:21:26 +09:00
Tadashi G. Takaoka 9835808e83 Merge "Use ObjectAnimator" 2012-03-22 01:39:01 -07:00
Tadashi G. Takaoka 31c94cea82 Use ObjectAnimator
Bug: 6187069
Change-Id: I7df18b470b7e746da601fab3311fb4b086f40d41
2012-03-22 12:44:46 +09:00
Eric Fischer 4216350a2a Move locale-specific configuration out of config.xml.
Having it in a translatable file would sometimes cause the translation
importer to try to replace the locale-specific configuration file.

Change-Id: Ib450454b63c1a4de8b85905561a59224b9410147
2012-03-19 09:22:37 -07:00
Tadashi G. Takaoka 73a46bfeb7 Gray out "alt-code-while-typing" key icon while typing
Bug: 6128215
Change-Id: Ie9c13d9d38aad6e92cc465e22f3ef20c80e0a36a
2012-03-14 19:36:24 +09:00
Tadashi G. Takaoka dabf96896e Move language on spacebar parameters to LatinKeyboardView attributes
Change-Id: I06e5d7d158a9b14b00df34e68b12cd012faf17d1
2012-03-13 16:17:13 +09:00
Tadashi G. Takaoka 4c0c638a18 Use Animator to draw language name on spacebar
Note that Animator class exists in framework only on Honeycomb or
later.

Change-Id: Ie3392dbf8acc1547ebb2d16e04086c911d961aed
2012-03-13 14:25:57 +09:00
Tadashi G. Takaoka 411749a4ba Cleanup keyboard theme switching code
Change-Id: I023769b765d07237b2129d8f1b2a02ffd4c4f09d
2012-03-08 19:17:31 +09:00
Tadashi G. Takaoka 97bde43740 Settings key always exists in more keys of shortcut/f1 key
This change also
  * Fix comman/f1 key for Arabic keyboard.
  * Removes "show settings key option" and related stuff.
  * Renames and simplifies F2 key to shortcut key on 7 inch tablet.

Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
2012-02-17 01:04:11 -08:00
Tadashi G. Takaoka 2affaf91a0 Rename mini keyboard to more keys keyboard
Change-Id: Ie4c85e8ca5a1f41a420aae5c1cd9c1cb07e237e5
2012-02-08 16:12:31 +09:00
Tadashi G. Takaoka 15c99e9f1a Support addtionalMoreKeys
This change also removes
  * Unused more_keys_for_q, w, and p.

Change-Id: Idb99e5f6d8c2ad2d28437f42b35b21c282cd181f
2012-01-30 17:04:25 +09:00
Tadashi G. Takaoka 160f01211d Get rid of Resource reference from KeyboardView, LatinKeyboardView and PointerTracker
This change introduces the following attributes.
 * KeyboardView
   - keyPreviewLingerTimeout
 * LatinKeboardView
   - keyHysteresisDistance
   - touchNoiseThresholdTime
   - touchNoiseThresholdDistance
   - slidingKeyInputEnable
   - keyRepeatStartTimeout
   - keyRepeatInterval
   - longPressKeyTimeout
   - longPressShiftKeyTimeout
   - longPressSpaceKeyTimeout
   - ignoreSpecialKeyTimeout
   - showMiniKeyboardAtTouchedPoint

Change-Id: I25159a87289b12447e20031add173523070e9b03
2012-01-26 16:10:20 +09:00
Tadashi G. Takaoka 7dde805745 Enable usability study mode option
Change-Id: Iadd69fbde42b895dd30f98890f59b56cdcdd4007
2012-01-18 20:17:57 +09:00
Tadashi G. Takaoka 7cc2595b6f Add LatinKeyboard.spacebarTextRatio attribute
Bug: 5776979
Change-Id: Ia568d1170ed33a000eb3bb02ecdf611e4b5ff2d5
2011-12-18 01:00:06 +09:00
Tadashi G. Takaoka 23d27fefcb Fix auto correction spacebar LED
Change-Id: I4894d188d5612380cc9f8eec7cb72544e37fb2b0
2011-12-15 17:34:14 +09:00
Tadashi G. Takaoka 49cc3beb75 resolved conflicts for merge of 137667ed to master
Change-Id: I75fc5d278b002ab89dd2475d282d0ee4aede7817
2011-11-18 08:51:39 -08:00
Tadashi G. Takaoka 175acb8205 Ignore microphone and settings key while typing
Bug: 5560766
Change-Id: I38b21d49b7e803bf94805ba8e13849b3c734e010
2011-11-17 16:01:31 -08:00
Jean Chalard a409f009fa Fill in the HAS_RECOMMENDED_SUGGESTIONS flag.
Bug: 5530727
Change-Id: Ic53e227f72096053e08d90204bf1f287ec09290b
2011-11-10 02:52:46 +09:00
satok 633f9592d1 Turn off the auto correction space bar led by default
Bug: 5245468
Change-Id: I0c25d733b21dcc43674d9fe4ca22dd2e1d18105a
2011-10-10 19:01:05 +09:00
Jean Chalard 45f45a4fdb Cleanup : remove recorrection-related stuff.
This removes UPDATE_OLD_SUGGESTIONS, and the associated settings.

Bug: 5402537
Change-Id: Ie87d4e05c54e4b7d2dd5a05f2d0b570e9cd3e463
2011-10-03 18:23:23 +09:00
Jean Chalard 4609c02f9e Add a threshold for suggestion score.
Bug: 5384578

Change-Id: Ic0b0203d873492a41c72defef835adf36f010f47
2011-09-29 17:38:08 +09:00
Ken Wakasa 37af28dd23 Enable vibrate on keypress by default
bug: 5337363
Change-Id: I14c95d27dd236d0a43e64a46ae6fbf9f2a97a3da
2011-09-20 20:31:03 +09:00
Eric Fischer cd15b9300f Mark configuration string as not translatable.
Change-Id: I691e5a2254c20d339f831ccc79c581b74079e8c9
2011-09-12 16:32:11 -07:00
Ken Wakasa 2057f3b8d8 Update comment for "log_screen_metrics"
Change-Id: Ic558246814a09fa53c99c4b96ecd5c0f77ca5e93
2011-09-12 18:44:21 +09:00
Tadashi G. Takaoka 2be872555c Use full screen mode on landscape/phone device
Bug: 5262767
Change-Id: I721c18522c972ced9f359f2e5208572d54a4b7a1
2011-09-08 11:02:55 +09:00
Jean Chalard 59b501a050 Only set LOOKS_LIKE_TYPO if the max score meets a threshold
Bug: 5240463
Change-Id: I51e85edae57789d638aa1e12b82e6a75c49d33c7
2011-09-05 12:31:43 +09:00
Tadashi G. Takaoka 913e2aeef2 Rename CandidateView to SuggestionsView
Change-Id: I6480cdf025f065130e1969899b259a243e7a11be
2011-09-01 15:41:34 +09: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 9237a72634 Rename PopupMiniKeyboardView to MiniKeyboardView
Change-Id: Ic83cd1200cfb8f8c0b0cfbcad449031b8e8a29e0
2011-08-31 15:30:54 +09:00
Tadashi G. Takaoka bea6b72106 Get rid of auto correction flash animation in the suggestion strip
This change also reverts I1350ad3d.

Bug: 5156762
Change-Id: I047e75699e8eea02204ad95e12dcc0aefe49ac34
2011-08-16 17:47:23 -07:00
Jean Chalard 7674f869dc Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Idc4a464e499a2530f517bf7fa449326779129371
2011-08-15 16:38:00 +09:00
Jean Chalard ab791d0bbc Revert "Remove the "Touch to correct words" option."
This reverts commit 8e69dd80d8

...since it breaks the build
2011-08-14 23:49:01 -07:00
Jean Chalard 8e69dd80d8 Remove the "Touch to correct words" option.
Bug: 5113009
Change-Id: Iae8a64e22cf618f4533f966feaf0b5a76725d551
2011-08-15 15:02:51 +09:00
Ken Wakasa 59f5cc8572 Get rid of auto correction flash animation in the suggestion strip
bug: 5156762
Change-Id: I1350ad3d7125f8ecdfc699233ed05e253cc3f010
2011-08-12 23:14:34 +09:00
Ken Wakasa 21fa416c43 Revive the missing Settings key on tablets
This is a follow up change to Ieb42fdfa.

bug: 5094401
Change-Id: If78c966ed02fbc9b8c6da726e00424a927349142
2011-08-03 17:00:14 +09:00
Tadashi G. Takaoka 596600d4ac Tweak long press timeout of language switcher
Previously 1200ms, down to 400ms that is the same value of system
default.

Change-Id: Ia94c6b729893d528ec3f2b961bf2ad22b47fdbb1
2011-07-26 15:02:47 -07:00
Jean Chalard f50aa19337 Purge quick fixes option.
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.

Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
2011-07-26 16:25:57 +09:00
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 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 c71854a661 Remove swipe gesture
Bug: 4971680
Change-Id: Ifff27f3bd3dd26417bfcb7072aaba074025b1bb7
2011-07-08 00:00:14 -07:00
satok 07a62cf3d6 Added very aggressive
Bug: 4905916

Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
2011-06-24 21:31:10 +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
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 d794c6f078 Remove manual config item controlling to show input language settings
Change-Id: I77f831c653567f2cf214a5b61107b25cca6d751d
2011-05-20 12:36:46 +09:00
Tadashi G. Takaoka a645d88228 Remove unused resources
Bug: 4436327
Change-Id: I2573786aac5fd8d543cf12d24c951b67c7353fd7
2011-05-16 16:22:39 +09:00
Ken Wakasa 7642eb3b4b Tweak keyboard heights for phone, and key preview delay.
Change-Id: I1c5e6db2923ce256ae70347f17ab28ff3c700ef1
2011-05-06 19:56:07 +09:00
Ken Wakasa 9b2192bfd2 Revert the suggestion update delay to the original value (100msec) for phones.
This is actually a follow-up to I385f9eb2

bug: 4361287
Change-Id: I4c4a0a96a7fa28f4f96dd984453d2c9f3fa7d6c2
2011-04-29 19:23:49 +09:00
Tadashi G. Takaoka a0537fb4c7 Fix repeat key behavior
Change-Id: Ia7e5b2e9579aa0e5050857cdb14f16fa05a33621
2011-04-22 21:17:55 +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
Jean Chalard b50591295d Add an option for using bigram prediction.
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.

Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
2011-04-22 15:53:48 +09:00
Jean Chalard c899038eee Move language-specific keyboard setting to resources.
Some flag settings used to be stored in a keyboard layout extravalue setting. This
change:
- Introduces the capability of setting such specific flags in values/config.xml
- Retains the ability to use extravalues (for layout-specific settings), though
  there is no more any such setting at the moment.
- Fixes a bug where loading a dictionary from outside does not initialize the flags.
- Moves Flag to another class.

Note: this needs I705ec68c to avoid breaking the build

Change-Id: Ia7703aae3215b06c0b3cb792821649806e8998c1
2011-04-20 17:31:59 +09:00
satok 4f6e646352 Merge "Add a value for the screen metrics" 2011-04-15 04:06:22 -07:00
Tadashi G. Takaoka 5d542c2492 Auto mini keyboard layout
Bug: 4280617
Change-Id: I34c344cbf350fe125589aa14ad69e4bd1f4e6f66
2011-04-15 18:19:31 +09:00
satok 16e9edfb14 Add a value for the screen metrics
Change-Id: I4d221e19b495e865a6714854c4addfaeddeb4e18
2011-04-15 16:55:07 +09: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
Tadashi G. Takaoka fc20f2198d Introduce timeout for "." shortcut
Bug: 3294239
Change-Id: I1832be8b54cd4d55cd504a3e1e0434aa284f9592
2011-03-01 23:57:51 -08:00
Jean Chalard f0d99b8677 Make the keyboard sound on by default for xlarge screens.
Also change the name of the default value for re-correction for
consistency with other constant names.

Bug: 3426884

Change-Id: I615ba640fb17e6d7514b8a0e4f52028eb0e23908
2011-02-08 12:44:03 +09:00
Tadashi G. Takaoka 04c96ab966 Automatically layout mini keyboard
Bug: 2214959

Change-Id: I06370e1c9e0683666ad19454a2fb501008af95c0
2011-01-25 20:36:11 +09:00
Jean Chalard 89764ad4ac Simplify text correction settings in latin IME.
Conditionally remove the "Quick fixes", "Bigram suggestions" and
"Usability study mode" options, depending on configuration.
When disabled, have the quick fixes and bigram option become
false if autocorrect is off, and true otherwise.
Also reorder options to bring "Auto correction" above "Show
suggestions".

bug: 3282448

Change-Id: Ib7fd928be417a816ef9e21423a531773069b7468
2011-01-19 20:08:46 +09:00
Jean Chalard fd7d814c81 Simplify latin IME settings page.
Do not show the recorrection option on xlarge terminals,
and make it true by default. Also, bring the Auto-capitalization
at the top of the settings page.

Issue: 3282448
Change-Id: I51a9ae6c7e496be2970107277f0a4ac65b12821e
2011-01-18 18:41:15 +09:00
Jean Chalard 6c381b38cc Remove the keyboard popup option by default.
Add an option to mask the sound on keypress preference, and
make it false on xlarge terminals by default.

bug: 3282448

Change-Id: I747272d9edf854dc229aa620836cfa35a437d13f
2011-01-18 16:26:11 +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 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
Eric Fischer f73e76de00 Mark configuration strings untranslatable.
Change-Id: If8a35fe33e2091bcf95cc543e76df1184d52ce2b
2011-01-07 10:42:26 -08: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 05ddb9a5d2 Add config_default_keyboard_theme_id resource
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
2010-12-28 21:06:45 +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 baf83886be Filter out too short noisy touch events
Bug: 3294017
Change-Id: I1769eab1d096d16bfa9d6f23b973483ee6e7a478
2010-12-21 23:46:15 +09:00
Tadashi G. Takaoka c4f71668d7 Remove multi-tap feature
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
2010-12-20 21:58:31 +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 183fbbb0db Revise language string size on spacebar
bug: 3290290
Change-Id: I09694392d7fa447796c56a1f74b5b719ca28e466
2010-12-16 16:53:02 +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
satok 74103ee1b9 Increased the size of GRID in Keyboard
Bug: 3122894

- Changed width 10 -> 32
- Changed height 5 -> 16

Change-Id: I07354cf5c942974cc25a5e043f41e0f13a09351b
2010-10-29 18:50:18 +09:00
Ken Wakasa 276845c7a9 Follow-up change to revise Caps Lock sequence.
bug: 3122877
Change-Id: I44c539d7c041443f3ad027de4b75a67adf6b2c87
2010-10-26 20:00:21 +09:00
Tadashi G. Takaoka 4189eb2308 Revise caps lock sequences
This change also fixes that the popup preview of ALT on symbol
keyboard is not showing.

Bug: 3122877
Bug: 3127255
Change-Id: I978cb30a0d05298274d8ab6541b91323a0fef211
2010-10-25 00:03:46 +09:00
Tadashi G. Takaoka 65100ff39c am c247df2d: am 0ccc4bfe: Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread
Merge commit 'c247df2d05932f36ca1ebbba34b57a92254f433e'

* commit 'c247df2d05932f36ca1ebbba34b57a92254f433e':
  Reduce popup preview fading out animation duration to 70ms
2010-10-16 09:13:20 -07:00
Tadashi G. Takaoka 62e3fafac6 Reduce popup preview fading out animation duration to 70ms
Bug: 3099331
Change-Id: I32c11bb25ebdb97af0c883c475d96fc8e2749101
2010-10-15 10:22:43 +09:00
Kenny Root 6f6dd71862 resolved conflicts for merge of 23d50bfb to master
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
2010-10-10 15:19:53 -07:00
Tadashi G. Takaoka 5e02930a7f Reduce delay before mini popup keyboard is shown
Before this change, the delay was 500 ms that came from
ViewConfiguration.getLongPressTimeout().  This change reduces the
delay to 400 ms.

Bug: 3074984
Change-Id: Ia5af5e877a3c4bb29211ef4040c728ac09a9fe85
2010-10-08 19:05:16 +09:00
Mitsuhiro Shimoda b1abda8d62 Add an auto complete's threshold option.
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
Tadashi G. Takaoka 0ae817c9ae Add enter/exit animation style to prevew and mini keyboard
TODO This animation style API of PopupWindow can be called only in
Gingrebread or later.  We should refactor this using reflection to be
able to be compatible with Froyo.

Bug: 3004787
Bug: 2973989
Change-Id: I2abfcc853b1a0af2bccee7bdf5fbd723456b7d34
2010-09-24 20:51:13 +09:00