Commit graph

1017 commits

Author SHA1 Message Date
Tadashi G. Takaoka
3f00c6151f Reduce amount of empty space in which keypresses are detected
Bug: 6942329
Change-Id: Ie92ccf43f307b8ceb9a311c30390d0cb2abf2cd7
2012-09-04 16:11:21 +09:00
Tadashi G. Takaoka
2c0c1cc677 Merge "Fix key info reported by keyboard accessibility node provider." into jb-mr1-dev 2012-09-03 18:34:55 -07:00
Tadashi G. Takaoka
eceea877bd Consolidate Esperanto layout into Spanish layout
This change also removes AsciiCapable extra value from Esperanto
subtype.

Change-Id: I0fa18ef7c52e4ba24b182e8ecb9788572660b704
2012-09-03 17:38:56 +09:00
Tadashi G. Takaoka
ab5f9532db Use 5-row layout for Thai phone keybopard
Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
2012-09-03 14:15:48 +09:00
Tadashi G. Takaoka
a643b54b4d Add missing KeyDrawParams default constructor to fix build
Change-Id: Id2ae9e4085b4137c961b5202e0822d484dd71e8e
2012-08-31 20:28:46 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
36b5f4aae2 Fix key label padding
Change-Id: I971dd17afdaf1ce6e64e3c41bdb42a6ba3f6fd0e
2012-08-31 19:57:25 +09:00
Tadashi G. Takaoka
71b52a84e2 Move key label padding attributes back to KeyboardView
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394

Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
2012-08-31 10:35:54 +09:00
Tadashi G. Takaoka
49d8af8a4e Separate inner classes of KeyboardView out under internal package
Change-Id: I6d53b53526bbab951044a026476bd88a9ebd5a90
2012-08-30 16:23:01 +09:00
Tadashi G. Takaoka
749cc18751 Move some key top visual attributes from KeyboardView to Key
Change-Id: I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
2012-08-30 16:14:32 +09:00
Tadashi G. Takaoka
35ff94547c Separate inner classes of keyboard package out under internal package
Change-Id: Ia3969bd5ddec5aa5d81d05ad4cf676d818587922
2012-08-30 15:37:55 +09:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
61bc66b324 Revert "Revert "Fix key letter size of 5-rows Thai keyboard""
This reverts commit 7a5ca9982f.
Depends: Ia4fa5046b3106e2710b9d5df1a6cc5f2cf995ec7

Change-Id: I0b9d0125380efe898943dc26ae884378145c44a3
2012-08-30 11:30:13 +09:00
alanv
26b424b644 Fix key info reported by keyboard accessibility node provider.
Bug: 6704529
Change-Id: I519881a96767a8858c11da7c0abac3e276a45cf5
2012-08-29 13:07:37 -07:00
Tadashi G. Takaoka
92821614fd Revert "Revert "Move resource related methods to ResourceUtils""
This reverts commit bfc02a7005.

Change-Id: Ife4c0312ea3260211b1b5ee39b239e8e9d7db67e
Depends: I3d862515568be36d5aa80d12e7e5c0a9bf4d06a6
2012-08-29 22:30:55 +09:00
Ken Wakasa
bfc02a7005 Revert "Move resource related methods to ResourceUtils"
This reverts commit 160dc0f98e

Change-Id: Ic5a3d9c70b8f6f2993d8455799945ec2633cad66
2012-08-29 04:33:39 -07:00
Tadashi G. Takaoka
160dc0f98e Move resource related methods to ResourceUtils
Change-Id: I14535b030e58363315dd2daecaaef4edd6990cd9
2012-08-29 17:51:07 +09:00
Tadashi G. Takaoka
f7a83d5584 Merge "Use non-bold text for Arabic and Thai keyboard" into jb-mr1-dev 2012-08-29 01:39:48 -07:00
Tadashi G. Takaoka
1e11c44d1b Make utility classes final
Change-Id: Ic4f69b4c8da33c9fca50d6829724179310c2f875
2012-08-29 17:38:08 +09:00
Tadashi G. Takaoka
d20652c878 Use non-bold text for Arabic and Thai keyboard
The key text style can be specified in each keyboard layout in
addition to by KeyboardView theme.

Bug: 6753168
Change-Id: I4b5abda9322600eb8c6421f20ceef136ef103c05
2012-08-29 17:33:44 +09:00
Tadashi G. Takaoka
9879f65651 Add ResourceUtils
Change-Id: Ia198f8d95eae8c007623cd52d73cc1528d22fee9
2012-08-29 16:36:00 +09:00
Tadashi G. Takaoka
6c3304ea96 Support bimanual gesture input
Change-Id: Id86dc93fb7115ab4a6d05b3c05652df35ad08c12
2012-08-28 18:26:07 +09:00
Tadashi G. Takaoka
9fa0736d6a Consolidate KeyboardView.keyLetterSize and keyLetterRatio
This change also consolidates keyboardView.keyLabelSize and
keyLabelRatio.

Change-Id: I4a45bcb6e7fc104ae4a9ae3ecdae9842d813840e
2012-08-28 16:04:59 +09:00
Tadashi G. Takaoka
ef2bfad590 Use TypedArray.getFraction to read percentile values in resource
Change-Id: Ifc8b024d190efba4cd536fd639621e841eb9970e
2012-08-28 15:18:40 +09:00
Tadashi G. Takaoka
1c2f332239 Optimize gesture preview trail drawing a bit
This change also change the fading out duration of the gesture
preview trail to 800msec from 1,000msec

Change-Id: Icfd5b1ecad66db4f978249486f5fe362a3ae9640
2012-08-27 14:43:39 +09:00
Tadashi G. Takaoka
5e3b93542d Fix the bug that the first gesture preview trail isn't drawn
Change-Id: Ib3acd7c0b401e6d95b39552b48d0d974793eb438
2012-08-24 17:48:23 +09:00
Tadashi G. Takaoka
333a300586 Add multiple gesture preview trails animation
Change-Id: I533e6de9b138317472565be82c8ba5e422472888
2012-08-24 17:04:20 +09:00
Tadashi G. Takaoka
922a85734d Merge "Remeve the reference of MainKeyboardView from PointerTracker" into jb-mr1-dev 2012-08-23 00:26:30 -07:00
Tadashi G. Takaoka
5509798977 Remeve the reference of MainKeyboardView from PointerTracker
This change also consolidates MainKeyboardView.KeyTimerParams with
KeyTimerHandler.

Change-Id: Ifc70ca81fa7d7daded4c2204fcdffdf942c16bc5
2012-08-23 16:22:13 +09:00
Tadashi G. Takaoka
b28139f51b Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
Change-Id: I089e905def0b70bd38fd54ab2d84689b904bb320
2012-08-23 15:54:00 +09:00
Tadashi G. Takaoka
694ccb5ba1 Cosmetic change to PointerTracker
* Add final to parameters and locals
* Add curly bracket around single statement if-block

Change-Id: I9f3b23f7145e6b1d6ef806d991ed71ebc63311ff
2012-08-23 15:14:46 +09:00
Tadashi G. Takaoka
dde36ef343 Remove TextView reference from PointerTracker
Change-Id: If8e65c08ec97f6d57932c9e3412d6fe17b0994ea
2012-08-22 16:13:29 +09:00
Tadashi G. Takaoka
ecfbf4625c Add static construct method for SparseArray
Change-Id: I6da97f6ea23578318f403bb5d64c30b1663c69ee
2012-08-22 14:22:20 +09:00
Tadashi G. Takaoka
1f05cf6dab Remove GCUtils utility class
Change-Id: Ia666aeb10c155d69763faf7f01ceca113b9b4653
2012-08-22 12:34:22 +09:00
Tadashi G. Takaoka
c3f78c9057 Remove KeyboardSwitcher reference from ResearchLogger
Change-Id: I671a83c19977fda358c8e8a730e22ee155f65512
2012-08-22 12:14:52 +09:00
Tadashi G. Takaoka
5f282ea9e4 Add CollectionUtils class to create generic collection easily
Change-Id: I6b4de9187e122298e5e9cd8ddc9070d062df6a89
2012-08-22 10:21:38 +09:00
Jean Chalard
324cc1dbe6 Merge "Tell the shift mode to the word composer." into jb-mr1-dev 2012-08-21 04:38:27 -07:00
Jean Chalard
adbd9ae105 Tell the shift mode to the word composer.
Bug: 6950087
Change-Id: Ifab9d6d075af398c6468d081216488712f8a53fb
2012-08-21 20:27:42 +09:00
Tadashi G. Takaoka
ac78633be2 Rename and consolidate some constants
Change-Id: I7863936cca18b28bf0117afcbcf544a5fd7f185d
2012-08-21 17:54:53 +09:00
Tadashi G. Takaoka
8d0cf41f49 Fix NPE
Bug: 7017430
Change-Id: Ie46f02a934763c3b6d65d0d62a8239d80eaefabd
2012-08-21 16:56:45 +09:00
Tadashi G. Takaoka
978c0fc878 Cleaup gesture preview drawing code a bit
Change-Id: Ie75d497ba88805d945d6039ecad09ed0e8e5e4d3
2012-08-20 15:40:03 +09:00
Tadashi G. Takaoka
6c63f71265 Add standard view constructors of PrevewPlacerView
Change-Id: I00d7ae4d2330804c342a5e51cf8c0df6ed8a85d6
2012-08-20 11:56:28 +09:00
Ken Wakasa
522e12660a Cosmetic fixes
Change-Id: I5460252af534d4455ba22273a06ac956bc904831
2012-08-19 01:26:05 +09:00
Tadashi G. Takaoka
f92f9de7a9 Merge "Eliminate redundant time parameter from gesture detection code" into jb-mr1-dev 2012-08-13 02:25:28 -07:00
Ken Wakasa
40a6d4af2a Merge "Cleanups in geometry_utils.h" into jb-mr1-dev 2012-08-13 02:11:52 -07:00
Tadashi G. Takaoka
74d0bb09c7 Eliminate redundant time parameter from gesture detection code
This change also uses the key width to determine the sampling rate of
the gesture points (instead of the key height).

Change-Id: I987487825693b4883d8359eb5b31f1d668cd5ef4
2012-08-13 18:11:03 +09:00
Ken Wakasa
0fb950858e Cleanups in geometry_utils.h
Change-Id: Ic051703e5b67adfc62753ebd9ab254296719c6e9
2012-08-13 17:47:00 +09:00
Tadashi G. Takaoka
fc5e3f973c Remove unnecessary drawing point
Change-Id: Ib9cba3484a72306320eb9c1744d940da1a0998c7
2012-08-13 14:03:10 +09:00
Tadashi G. Takaoka
708cc94a35 Remove gesture detection hacking code
Change-Id: Idaec3753592ca0a5c5545eb5ab65254a3e32e662
2012-08-13 12:19:19 +09:00
Ken Wakasa
bcec82de66 Clean up constructors
And, use C++ style casts and use float math functions rather than double ones to save memory space.

Also, stop using FloatMath and NativeUtils as standard Math methods are faster now.
See http://code.google.com/p/android/issues/detail?id=36199 and https://android-review.googlesource.com/40700

multi-project commit with I4259fb5ab8a15ac5760a7f04fc8f4c860529f04a

Change-Id: I0b81cff8c91769f7559a59b9528c75a5aabb4211
2012-08-13 10:48:37 +09:00
Tadashi G. Takaoka
1b6829b0e0 Remove conservative MainKeyboardView.draw
Change-Id: I52f58d1e013dfe1f1b0f8320cba903d3dbb4eabd
2012-08-10 11:02:41 +09:00
Tadashi G. Takaoka
877157e1f5 Optimize keyboard drawing code a bit
* Remove useless boolean flag.
 * Use invalidate(int,int,int,int).
 * Don't draw background when hardware acceleration is enabled.

Change-Id: Id560ac84f33b5151437a42a4ff22736284d71e2d
2012-08-09 16:44:11 +09:00
Tadashi G. Takaoka
8335c59ea7 Fix NPE and don't call UI API from non-UI thread
This change also reverts I29ec3e9f10484f30288fac76f0c45b3707bc2259

Bug: 6956969
Bug: 6891020
Bug: 6947253
Change-Id: I7901c0f9489b4deb79314c2c903b138611bfd78e
2012-08-09 11:55:41 +09:00
Tadashi G. Takaoka
732f27984e Merge "Add toString() method to Keyboard" into jb-mr1-dev 2012-08-08 00:08:13 -07:00
Tadashi G. Takaoka
35336cf83a Add toString() method to Keyboard
Change-Id: I74c8f006323ed78ec67414fd17849ab40966968e
2012-08-08 15:59:56 +09:00
Tadashi G. Takaoka
7ae1fd02d4 Use ArrayList to implement PointerTrackerQueue
Change-Id: Ie386e6c7869df4df940e09fccffc5cd661134557
2012-08-08 14:18:30 +09:00
Tadashi G. Takaoka
0cc425bd9c Add PointerTrackerQueue unit tests
This is a groundwork to elminate LinkedList from PointerTrackerQueue.

Change-Id: Ib77780537ceb0b4273fb8e483977ab76124c5ce7
2012-08-07 16:56:41 +09:00
Tadashi G. Takaoka
27e48447a4 Lingering gesture floating preview text a bit
Bug: 6936095
Change-Id: I873343e9aa6afdf6bdb223795f03232509b012a7
2012-08-07 13:54:42 +09:00
Tadashi G. Takaoka
4e9e6cd154 Fix IllegalStateException of KeyDetector
A KeyDetector without Keyboard may exist in some rare cases. This
change eliminates throwing IllegalStateException and checks explicitly
against null.

Bug: 6891020
Change-Id: I29ec3e9f10484f30288fac76f0c45b3707bc2259
2012-08-06 11:09:50 +09:00
Tadashi G. Takaoka
622d6a5b1b Using hardware accelerated drawing
When Canvas has been hardware accelerated, don't use offscreen bitmap.

Bug: 6872994
Change-Id: I1121f76377991692bc29ebeedbfbfa1b2a12dbb7
2012-08-03 20:46:10 +09:00
Tadashi G. Takaoka
ffe36cdc6d Merge "Small cleanup for keyboard drawing code" into jb-mr1-dev 2012-08-02 01:04:05 -07:00
Tadashi G. Takaoka
8344259fc9 Small cleanup for keyboard drawing code
Change-Id: I8b562e03b30f82dddae311b49d316402e867cd31
2012-08-02 16:50:31 +09:00
Tadashi G. Takaoka
44972bcdb6 Fix multi-touch input in auto-caps field
Bug: 6905194
Change-Id: I7f9f61f36b7f3aa2b40c126a68232a947976aad2
2012-08-01 18:56:11 +09:00
Tadashi G. Takaoka
d2173b5737 Cancel the while-typing timer when user hits the spacebar
Bug: 6689079
Change-Id: I6b366acdcefb8b2c0d973a4f2a12329fc12eb5c5
2012-07-31 19:39:52 +09:00
Tadashi G. Takaoka
b98b957424 Fix east slavic keyboard layouts
This change affects Ukrainian, Belarusian, Kyrgyz, and Russian
keyboard. The followings are the layout changes for each language
respectively.

[Ukrainian]
 * Replace useless CYRILLIC LETTER E with CYRILLIC LETTER UKRAINIAN IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER YI
   on 10-inch tablet.
 * Add CYRILLIC LETTER GHE WITH UPTURN as more keys of CYRILLIC LETTER
   GHE.

[Belarusian]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Replace useless CYRILLIC LETTER HARD SIGN with CYRILLIC LETTER IE
   on 10-inch tablet.

[Kyrgyz]
 * Add CYRILLIC LETTER IO as more keys of CYRILLIC LETTER IE.
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

[Russian]
 * Remove CYRILLIC LETTER HARD SIGN from more keys of CYRILLIC LETTER
   HA because CYRILLIC LETTER SOFT SIGN has it.

This change also replace misspelled "more_keys_for_cyrillic_ye" text
name with "more_keys_for_cyrillic_ie".

Bug: 6881007
Change-Id: I9e88c4e27f66225e1676f2b286a7e55b9f2cbf5b
2012-07-31 13:19:11 +09:00
Tadashi G. Takaoka
ca57f5ba40 Move gesture preview parameters to KeyboardView attributes
Change-Id: Iff9d6b485e202656fc869f3ff4d94575ad2c186f
2012-07-30 20:10:48 +09:00
Tadashi G. Takaoka
6b9677d84b Merge "Small fix to KeyboardView" into jb-mr1-dev 2012-07-30 01:48:59 -07:00
Tadashi G. Takaoka
b9770cb7f7 Merge "Add device form factor to KeyboardId" into jb-mr1-dev 2012-07-30 00:50:25 -07:00
Tadashi G. Takaoka
edf7990e84 Small fix to KeyboardView
Change-Id: Ifb7500ec2e55b50bb7951aa847fd4fbf49e32f4e
2012-07-30 16:50:03 +09:00
Tadashi G. Takaoka
293f062c26 Merge "Add advanced options to turn on/off the gesture trail and text preview" into jb-mr1-dev 2012-07-30 00:22:41 -07:00
Tadashi G. Takaoka
47e2bf3298 Add advanced options to turn on/off the gesture trail and text preview
Bug: 6883053
Change-Id: I601718afb37289108b45ef68626c7c315edca35d
2012-07-30 15:54:27 +09:00
Tadashi G. Takaoka
75fb3ce1be More readable Key.toString() and MoreKeySpec.toString()
Change-Id: Iee3c33dedd0c00ba259aa55e8b0c1c57b84eccdd
2012-07-30 15:51:41 +09:00
Tadashi G. Takaoka
4731b67629 Add device form factor to KeyboardId
This is a groundword for optimizing keyboard parsing.

Bug: 6860259
Change-Id: Ie65aa502b18c920e25cf2998b79120b3cc835952
2012-07-30 15:33:17 +09:00
Tadashi G. Takaoka
efd8b838ee Add MoreKeySpec.toString() method for debugging
Change-Id: Icf9c6e15521849ffc51911c1e256c9815c1960f4
2012-07-30 15:06:26 +09:00
Tadashi G. Takaoka
1057670881 Make PreviewPlacerView final
This is a groundwork for the bug.

Bug: 6883053
Change-Id: I51e9235d3bc7021790a88a44596c4314125a1ab3
2012-07-27 19:40:39 +09:00
Tadashi G. Takaoka
99906b3fc2 Move SuddenJumpingTouchEventHandler to internal package
Change-Id: Ifc9fb6322a2edbaac0b10e7134ee7e735f14937b
2012-07-27 14:25:53 +09:00
Tadashi G. Takaoka
97c8d288a8 Add Zulu keyboard
Bug: 6867914
Change-Id: I13316ac2a554a8601f920e875d540e5375e12860
2012-07-26 19:03:35 +09:00
Tadashi G. Takaoka
e863fb712f Merge "Fix gesture detection when sliding key input is disabled" 2012-07-26 02:13:20 -07:00
Tadashi G. Takaoka
c902dfeb8f Fix gesture detection when sliding key input is disabled
Bug: 6867837
Change-Id: Icbfa69928c436343db545860a7d63171f52266b6
2012-07-26 17:41:54 +09:00
Tadashi G. Takaoka
b90363e40c Fix Afrikaans more keys layout
Bug: 6867914
Change-Id: I43178a729f4770743f9fea87bad539c54da045c5
2012-07-26 16:31:06 +09:00
Tadashi G. Takaoka
55c01170c4 Add Afrikaans keyboard layout
Bug: 6867914
Change-Id: Ice35b20a0a51dda21c8271256064523bb5844952
2012-07-26 15:57:35 +09:00
Tadashi G. Takaoka
941f222c21 Merge "Remove unused setProximityCorrectionEnabled() methods" 2012-07-25 19:54:40 -07:00
Shawn Pearce
0a370ac80f Merge "Add Swahili keyboard layout" 2012-07-25 10:58:44 -07:00
Tadashi G. Takaoka
c4376db0f0 Remove unused setProximityCorrectionEnabled() methods
Change-Id: I03aa6608ee435b36377de41684162b303740f571
2012-07-25 20:37:36 +09:00
Tom Ouyang
2f81757c3a Add dynamic floating preview for incremental gesture recognition.
Change-Id: I7ba7ac24aa96a0ff19267997c5b58853079bc6dc
2012-07-25 19:40:55 +09:00
Tadashi G. Takaoka
a28f6c9a18 Add Swahili keyboard layout
Bug: 6867914
Change-Id: I2b9b0a06ff49a2afe16ec7a0ace0503d1658d413
2012-07-25 17:48:37 +09:00
Tom Ouyang
e68385871a Fix gesture trail rendering on tablet.
Bug: 6867837
Change-Id: I54dceee1c83679f78462104d6cee1f2300a0cfc2
2012-07-25 16:12:37 +09:00
Tadashi G. Takaoka
0657b9698a Update gesture mode state when dictionary gets available
Bug: 6860204
Change-Id: I840b7bf1983ab92fa4e0b180129176539e96409f
2012-07-25 16:11:53 +09:00
Tadashi G. Takaoka
9ecf634686 Add Seriban Latin keyboard layout as comments
Bug: 6867914
Bug: 6867842
Change-Id: I3434434628e72fdb127d158de6c17fdfa77ee9c8
2012-07-24 20:07:59 +09:00
Tadashi G. Takaoka
a01d9aea64 Add Tagalog keyboard layout
Bug: 6867914
Change-Id: I78ca6216cc74f8d34291950c05c810c800a3ddba
2012-07-24 18:54:43 +09:00
Tadashi G. Takaoka
c8e45ddb03 Rename LatinKeyboardView to MainKeyboardView
Change-Id: I8f3123b8d727c7beb72e226f80c17794f89c8b60
2012-07-23 12:11:43 +09:00
Kurt Partridge
a4f762ff98 Merge "ResearchLogging indicator" 2012-07-22 19:31:40 -07:00
Kurt Partridge
4fa6e57260 ResearchLogging indicator
- shows a indicator that logging is on.  two options are available: an obvious
red outline around the keyboard, and a subtle red dot in the lower right-hand
corner.  currently configured for the subtle red dot.

Bug: 6188932
Change-Id: I0fd1ac5a0f20329adc603aa65ab85f2d38b9fc43
2012-07-22 19:04:34 -07:00
Kurt Partridge
74c95d6d18 Merge "ResearchLog splash screen" 2012-07-22 18:53:38 -07:00
Kurt Partridge
4331012a9e ResearchLog splash screen
Bug: 6188932
Change-Id: I1b247ecc26a2dd4f3f1c1b1cd3d928af717ebdd5
2012-07-22 18:36:43 -07:00
Tom Ouyang
ccaa799ee9 Update gesture bounding box handling.
Change-Id: I085611ce6fd82608f284d74973e5bb14258cdc24
2012-07-22 10:54:27 +09:00
Kurt Partridge
6b966160ac ResearchLog refactor
- new package: com.android.inputmethod.research

multi-project commit with Ic0a5744f3160d13218addd589890623c0d120ffc

Bug: 6188932

Change-Id: Icf8d4a40a5725401799be6e209a640d99a5f34c4
2012-07-20 15:06:51 -07:00
Tadashi G. Takaoka
7519091f7c Use ResizableIntArray in GestureStroke
Change-Id: I034e80df03c7c6c0895fdf2c03763627d410d425
2012-07-20 19:32:28 +09:00
Tadashi G. Takaoka
2474b37abd Merge "Disable gesture input detection when more keys keyboard is showing" 2012-07-20 03:28:52 -07:00
Tadashi G. Takaoka
62b8dddb6d Add gesture input enable settings
Bug: 6845325
Change-Id: I3165465b0b280e32a9288da16abb75baa67288dc
2012-07-20 19:26:36 +09:00