Commit graph

566 commits

Author SHA1 Message Date
Tadashi G. Takaoka
921a32f0a9 Remove unnecessary default KeyDetector from PointerTracker
Change-Id: Ib0fbb40a7040202d2a4b4ab49319d9e247a2a6ce
2013-12-20 15:34:54 +09:00
Tadashi G. Takaoka
081989ca30 Remove unused default object of GestureStrokePreviewParams
This change also fixes build broken by Id615556766.

Change-Id: I16605cc3b65e3e9ab2d5a498825c31d9b4046b73
2013-12-20 15:25:24 +09:00
Tadashi G. Takaoka
6e97efef78 Fix rugged gesture trail
Bug: 12222472
Change-Id: Id615556766718a8bd4848f7026833fbcea540c39
2013-12-20 14:40:18 +09:00
Tadashi G. Takaoka
fcacde3dad Revise Armenian punctuations more keys
Bug: 12096943
Change-Id: Ib8559f030fbc27ec7f7e9a9fb36aad72cca29e9f
2013-12-17 11:12:33 +09:00
Tadashi G. Takaoka
1b5b0a3ebc Cancel long press shift key while chording input
Bug: 12123508
Change-Id: I693caad1f8ee47ebeb14419603d1fc29f6263a75
2013-12-16 15:30:41 +09:00
Ken Wakasa
2c25c7c9e1 Fix locale names in the make-keyboard-text tool
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
2013-12-14 18:50:57 +09:00
Jean Chalard
5d98e1d82e Fix a bug where recapitalize prevents going to more syms
Bug: 11004973
Change-Id: I97ee9df6e8464e2149beb41c688cbfbd83ac3d8c
2013-12-13 19:21:49 +09:00
Ken Wakasa
2fa3693c26 Reset to 9bd6dac470
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
2013-12-13 17:13:32 +09:00
Tadashi G. Takaoka
d7d6088130 Revert back punctuations to the more keys keyboard of the period
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
2013-11-12 17:51:54 +09:00
Jean Chalard
7da2295328 Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-22 05:23:47 -07:00
Ken Wakasa
56402cf10a Revert "Add Swiss French and German keyboard layouts."
This reverts commit 220ce8f269.

Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.

Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
2013-10-10 02:05:50 +00:00
Fredrik Roubert
220ce8f269 Add Swiss French and German keyboard layouts.
There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY,
available in LatinIME. They were, however, not actually Swiss layouts
but instead work-arounds to be able to get French or German with qwertz
or qwerty (instead of azerty and qwertz) layouts, respectively. These
were thus removed by commit f6972561fc
replacing them with the generic fr-qwertz and de-qwerty layouts instead.

Here, now, is a proper Swiss keyboard layout, following Swiss standards
for people accustomed to typing on Swiss keyboards, with the expected
tailorings for French and German.

Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
2013-10-09 17:42:17 +02:00
Satoshi Kataoka
56997a80c2 Retry to tweak punctuations
Bug: 11130808
Change-Id: I9ffc457ca44bccfa3eb3bdb0c26535d795215b26
2013-10-09 15:39:23 +09:00
Satoshi Kataoka
30ef03d865 Tweak vertical gap of Emoji palette
Bug: 11140087
Change-Id: I8163568a9d7f9d321148001e161c672f78796c96
2013-10-09 14:56:39 +09:00
Ken Wakasa
c040d59def Merge "Add more_keys_for_* declarations for the Swedish keyboard." 2013-10-08 11:44:54 +00:00
Fredrik Roubert
a30884e0e0 Add more_keys_for_* declarations for the Swedish keyboard.
This adds all those popup keys that were included in commit
b1cb13292f when the Swedish keyboard was
first added. Many of these definitions were later removed by commit
79b965e04f but most likely by mistake, as
that commit log message doesn't mention anything about removing these.

To help making this file more maintainable, this commit also moves a few
definitions around so that all definitions now appear in alphabetical
order.

Change-Id: Iadef9e3dd1dc7b39fe87b2fc75210d0697b24361
2013-10-08 13:28:08 +02:00
Ken Wakasa
8cf2a5e59f Prep for RAM footprint optimization for Emoji palettes
bug: 10902556
Change-Id: I313948c73b60cd33c437cf02e8d3fb61c288a240
2013-10-08 17:09:24 +09:00
Satoshi Kataoka
984aa60e11 Merge "Extend hitbox of emoji keys" 2013-10-07 23:27:07 +00:00
Satoshi Kataoka
5d27cb9397 Extend hitbox of emoji keys
Bug: 11105065
Change-Id: I5e90ba55cf708bf7be27d7d101cbc0719ac583c8
2013-10-07 23:22:12 +09:00
Jean Chalard
3c4e8cb693 Call loadKeyboard later if it can't be called right away
Since loadKeyboard relies on the input connection being
available to give it the auto-caps state, but also can't
be called twice in a row because it needs to save and
restore its state and invalidates it after the restore,
we need to wait until we know we have a valid input
connection to call it.

Bug: 11107229
Change-Id: I1c7baf3215682df6f6ceb357bd37254f9e7418c7
2013-10-07 22:57:59 +09:00
Satoshi Kataoka
4deb824f3a Add navigateEmoji
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
2013-10-07 15:28:39 +09:00
Satoshi Kataoka
d76b552979 Rename EmojiKeyboardView -> EmojiPalettesView
Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
2013-10-07 12:28:13 +09:00
Satoshi Kataoka
e7ed5cae44 Fix emoji recent key behavior
Bug: 10538430
Change-Id: I91e03a8e7914628cdc8e57c124c95e5e6e8ea2a6
2013-10-04 20:01:00 +09:00
Satoshi Kataoka
c7f8d54d6e Merge "Prepare for changing text color for functional keys" 2013-10-03 07:15:03 +00:00
Satoshi Kataoka
194e004e81 Prepare for changing text color for functional keys
Bug: 10786040

Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
2013-10-03 15:54:46 +09:00
Jean Chalard
cd7422f4df Merge "Fix a pernicious bug with caps." 2013-10-02 07:59:08 +00:00
Jean Chalard
f735117d36 Fix a pernicious bug with caps.
What's happening here is, setAlphabetKeyboard sets the
keyboard to AUTOMATIC_SHIFTED and updates the keyboard, then
restoring the keyboard old state sets it back to UNSHIFTED without
updating it. When we finally know what the correct value is,
we try to set it to UNSHIFTED, but since that's already the currently
recorded state, it skips updating the keyboard forever.

The solution is to avoid setting the shift state without updating the
keyboard.

Bug: 10948582
Change-Id: Ic8670401e378f8284e851281f91a9ad93eac8e90
2013-10-02 16:57:36 +09:00
Satoshi Kataoka
9d76391058 Merge "Unfortunately, hide some broken "emoji"s" 2013-10-01 12:18:13 +00:00
Satoshi Kataoka
c7e6f3dbc3 Unfortunately, hide some broken "emoji"s
Bug: 10923117
Change-Id: I27ba38e5f388cc15ae331fd05d63db4e4a41cbbf
2013-10-01 21:02:59 +09:00
Ken Wakasa
e56c2f979f Cleanup and remove redundant more keys on phones
Change-Id: I419c3c119eb1e4d2e877c8c00564e46f40b6abc2
2013-10-01 19:02:09 +09:00
Satoshi Kataoka
9c3b2dbe34 Fix emoji state
Bug: 10919260
Change-Id: I85e897b2de10f147bba40dd2147e041e26f5b8ad
2013-09-25 11:59:21 +09:00
Ken Wakasa
15e33c2373 More tweaks for Armenian layouts
Add Armenian question mark and exclamation mark as more keys in the symbols layout.

bug: 7963631
Change-Id: Ic4f306248c10f5439531cd468b78ba467cd1de6a
2013-09-24 18:53:06 +09:00
Ken Wakasa
1b7fc4f338 Tweaks for Armenian layouts
Added a dedicated key for the Armenian full stop

Added Armenian punctuation letters

bug: 7963631
Change-Id: Id28e224329b083a2465256f2713477b4f0782393
2013-09-24 18:22:32 +09:00
Ken Wakasa
be5e21ecbb Add Khmer layout
bug: 6910993
Change-Id: Ie515acd625bc266494d9e63b0694e2c05a19b661
2013-09-19 22:22:41 +09:00
Satoshi Kataoka
2a9e065f1a Fix hitbox of emoji key
Bug: 10780368
Change-Id: If10c18fdb0e7f0b0460a721d55001ab0fef28664
2013-09-19 15:37:36 +09:00
Satoshi Kataoka
ea7bfa5cd5 Fix Emoji recents
Bug: 10538430

Change-Id: Ia2e423eb1843195b3c3218afc79a5820b8cd729b
2013-09-18 17:44:16 +09:00
Satoshi Kataoka
f3f00006cb Save & restore emoji keyboard state
Bug: 10538430
Change-Id: I7982f53f5dfa44071e74da63826acffcdc2547e6
2013-09-16 19:39:20 +09:00
Satoshi Kataoka
5dfbc8af24 Split Emoji categories fitting the pager
Bug: 10538430
Change-Id: Ic023ac0b9db8a1fe16c73ab5fd12dfcd7cbbe6a3
2013-09-16 18:27:20 +09:00
Ken Wakasa
0f317a5603 Fix issues with Nepali layouts
- Added the missing ZWNJ/ZWJ key
- Fix a wrong letter in the shift layout of Nepali Romaized layout
- Put the currency symbol for Nepalese Rupee
- Fix the missing 2nd symbols layout
- Use the Devanagari numbers just like Hindi layout
- Fix the Main/Symbols switch key label just like Hindi layout

bug: 6910787
bug: 9833890
Change-Id: Ie6aa5a06008f1e9347d4fc08ededd48287df5d73
2013-09-16 02:08:51 +09:00
Ken Wakasa
1313d17d37 Small tweak for label_to_more_symbol_for_tablet_key
To make it a bit more consistent with the one for phones

Change-Id: Ia5775b07a0d70cabc5c51ff2b954c64ce4dc8c7c
2013-09-14 12:10:04 +09:00
Satoshi Kataoka
cdc2ce8c89 Merge "Use DynamicGridKeyboard for EmojiPager" 2013-09-13 12:20:14 +00:00
Satoshi Kataoka
b0bf7e729b Use DynamicGridKeyboard for EmojiPager
Bug: 10538430
Change-Id: Iff84e306faaa8e87d107e418d5c61c5613b57430
2013-09-13 21:18:57 +09:00
Ken Wakasa
47761678f1 Add Lao keyboard
bug: 6911140
Change-Id: Id689be1fb9dbc89b5a9b7f142626751a62d931ed
2013-09-13 21:10:17 +09:00
Satoshi Kataoka
2c011c697b Refactor RecentsKeyboard
Bug: 10538430
Change-Id: I7a22d2d4a105b17b2a84a3fff2bc3981823d228d
2013-09-13 16:35:07 +09:00
Satoshi Kataoka
98565a9c02 Optimize tablet layout
Bug: 9059539
Change-Id: Ideb6965768fcf092c081eb1d3102312c863cc5b6
2013-09-06 16:43:19 +09:00
Satoshi Kataoka
d6217a323c Optimize layout
Bug: 9059539

Change-Id: Iabfd44daae1ef6da99a864859488a4f644240925
2013-09-05 22:27:26 +09:00
Satoshi Kataoka
e0502496da Revert "Remove symbols shifted layout"
This reverts commit c02a365485.

Change-Id: I11d31632469a594c0637f035bdd74ba60b2ac33e
2013-09-04 18:22:59 +09:00
Satoshi Kataoka
e3150664ae Revert "Remove symbols shifted layout related code"
This reverts commit 1cd027850b.

Bug: 9059539

Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
2013-09-04 16:27:34 +09:00
Satoshi Kataoka
42b799d93a Revert "Remove symbols shifted related unused texts and styles"
This reverts commit 59f49b3861.

Bug: 9059539

Change-Id: I6e298a55feb942fc3720a91b65f841220443b42b
2013-09-04 12:24:55 +09:00
Satoshi Kataoka
eaee156128 Optimize tablet layout
Bug: 9059539
Change-Id: I049941d2c83764c7f07c5215799b9657a7f27764
2013-09-03 17:36:42 +09:00
Satoshi Kataoka
5169937dd4 Revert "Revert "Support Emoji keyboard""
Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc972338.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d
2013-08-30 19:46:10 +09:00
Ken Wakasa
4445671efc Merge "Revert "Support Emoji keyboard"" 2013-08-30 07:27:48 +00:00
Ken Wakasa
aabc972338 Revert "Support Emoji keyboard"
This reverts commit d7791a93b0.

Change-Id: I5ca4c0227f97540e8a22b487b5056dfa3611082b
2013-08-30 07:23:42 +00:00
Tadashi G. Takaoka
bcfcdae230 Add Armenian Phoetic keyboard
We believe this layout is Armenian Eastern Phonetic Keyboard.

Bug: 7963631
Change-Id: Iff3dd879268dd95f00855f67f749e8562fff490c
2013-08-29 20:29:39 +09:00
Tadashi G. Takaoka
d7791a93b0 Support Emoji keyboard
Bug: 6370846
Change-Id: I33ce8f952799c89929996a226ac17731a953ec2a
2013-08-29 19:48:34 +09:00
Tadashi G. Takaoka
47b71c82ec Fix keyStyle flags handling
Change-Id: Ia0d21f7a00ff99eae89c746244484d6fa3f0f44e
2013-08-29 17:20:18 +09:00
Tadashi G. Takaoka
e9e8d2d986 Use fixed column order for punctuation more keys
This is a follow up of I71f58fc49b.

Bug: 9059539
Change-Id: Ibf5684ac196e03e889160d8bb14e2b1377331133
2013-08-29 14:22:30 +09:00
Tadashi G. Takaoka
fcc6ab08ae Merge "Reduce the number of more keys of the period key" 2013-08-29 01:12:25 +00:00
Tadashi G. Takaoka
85d9b3c281 Reduce the number of more keys of the period key
Bug: 9059539
Change-Id: I71f58fc49bf33b40c17b5a94cad82e942b95e3f1
2013-08-29 10:10:13 +09:00
Tadashi G. Takaoka
41745c4995 Add keyboardLayoutSet attribute to <case> condition
Change-Id: I017c4a3c1c7b2e4c6f607940078f61e120042270
2013-08-29 09:50:45 +09:00
Tadashi G. Takaoka
803ea61d55 Add recents keyboard
Bug: 6370846
Change-Id: I5dc235395fe9b3bd95711fee2fe9b678b4660760
2013-08-28 16:33:54 +09:00
Tadashi G. Takaoka
2da94ad8cd Add scrollable KeyboardView
Bug: 6370846
Change-Id: I8b9a619e0e6a980c8b17788ad03c62effc7f35b5
2013-08-26 23:37:52 +09:00
Tadashi G. Takaoka
4e7825cb58 Merge "Add GridRows tag to support emoji keyboard" 2013-08-26 08:24:16 +00:00
Tadashi G. Takaoka
2f5a933c04 Add GridRows tag to support emoji keyboard
Bug: 6370846
Change-Id: Ia68284b2402e52d835040da900a51cca669add2f
2013-08-26 17:19:24 +09:00
Tadashi G. Takaoka
7f28b3cc6a Clean up PC QWERTY keyboard
Change-Id: Ibb52683e8f27517b9e7bf398d3b7a31215bd5a8d
2013-08-26 16:23:29 +09:00
Tadashi G. Takaoka
59f49b3861 Remove symbols shifted related unused texts and styles
This is a follow up of I7fe6520e4e.

Bug: 9059539
Change-Id: I1b2cdc4f6ae2f59fabc75c38f43e2b2512b08721
2013-08-26 12:08:08 +09:00
Tadashi G. Takaoka
73c2948113 Fix Persian currency symbol
Change-Id: Iea202e6d6857cbc0a3d4374c76bd72ed992da9a6
2013-08-24 02:07:47 +09:00
Tadashi G. Takaoka
1cd027850b Remove symbols shifted layout related code
This is a follow up of I7fe6520e4e.

Bug: 9059539
Change-Id: Idb39906ddb1e2234a0d1c7c4d5e6fc728090e79e
2013-08-24 00:07:23 +09:00
Tadashi G. Takaoka
c02a365485 Remove symbols shifted layout
Bug: 9059539
Change-Id: I7fe6520e4eafcb7e1748b8bf011333c7e0da7ac2
2013-08-23 13:41:46 +09:00
Tadashi G. Takaoka
6d9b4e913a Fix Hebrew currency symbol
Change-Id: Ib747828aeec20c1ebb4087169a7eb373deb163c3
2013-08-22 10:55:46 +09:00
Tadashi G. Takaoka
bcd173dfa1 Save and restore Row attributes using stack
Change-Id: I5cb402060946a711384ee53fa1caaeac86aa10cc
2013-08-19 18:36:49 +09:00
Tadashi G. Takaoka
221929c643 Keyboard.Row can have keyLabelFlags attribute
Change-Id: I5af1f1d88153068d7be6e496e6dd77bd5b09a894
2013-08-19 11:45:30 +09:00
Tadashi G. Takaoka
0154e3620f Merge "Rename KeyStyle.getFlag to getFlags" 2013-08-19 02:41:49 +00:00
Tadashi G. Takaoka
784416f73b Make all KeyboardRow attributes private
Change-Id: Ifaca6ad5e642964d8c3a77a96a1cd74f363ee996
2013-08-19 11:36:34 +09:00
Tadashi G. Takaoka
0cfd2b08af Rename KeyStyle.getFlag to getFlags
Change-Id: Iff3d850466cb6016a53bf86104cd5d22363f96a8
2013-08-19 11:35:11 +09:00
Tadashi G. Takaoka
25f0d73fa4 Fix cosmetic source code formatting
Change-Id: I33c14a20bc55b826082e468c0aecfa026ba5d9f3
2013-08-15 20:13:31 +09:00
Tadashi G. Takaoka
7dc60f9db7 Add getters and copy constructor to Key class
Change-Id: I78eb96dcc26378926dc63acbfeb4828cbd44435d
2013-08-15 20:12:46 +09:00
Tadashi G. Takaoka
ca6acfdd6b Rename maketext tool to make-keyboard-text
Change-Id: Icceda22aec75f9e3602da8775c0e94b110283575
2013-08-13 15:33:14 +09:00
Tadashi G. Takaoka
d41c44498c Fix parenthesis direction for RTL languages
Bug: 10284912
Change-Id: Ie0fc09b101034482a775961c8f8f1fcdf6dbec8f
2013-08-13 12:23:25 +09:00
Jean Chalard
0f47d5163d Merge "Reword "No language"" 2013-08-06 11:11:21 +00:00
Tadashi G. Takaoka
b127d88285 Add emoji icon and code as a groundwork
The emoji switching key icon asset should be updated. The icons in
this change are just borrowed from Hangout.

Bug: 10179862
Bug: 6370846
Change-Id: Icea26d2cf2ac6a6df9beb4c98f646dbe309bdcd9
2013-08-06 14:16:15 +09:00
Tadashi G. Takaoka
c0a732f032 Remove CODE_RESEARCH
Instead of CODE_RESEARCH, special outputText ".research." is used to
invoke a research feedback dialog.

Change-Id: Ic95c956ab4f2b5f0c3f2205c9bbcdcfb67db5d6e
2013-08-05 19:05:07 +09:00
Jean Chalard
c5beb522ed Reword "No language"
Bug: 10064334
Change-Id: Ie4e6c333566eee9000fa5c8e59e9df8b9b56a5b3
2013-08-05 18:16:35 +09:00
Ken Wakasa
52876bbefd Remove unnecessary setLayerType() calls
Calling up setLayerType(LAYER_TYPE_HARDWARE, ..) on non-HW accelerated
devices was ending up with having a drawing cache in View that is not
quite needed for PreviewPlacerView.

bug: 8967766

Change-Id: Ic8e6eeaf536530ff5f23eb353b0a8e5ba96fa0e2
2013-08-02 19:30:05 +09:00
Ken Wakasa
82018f9972 Forgot to reset the matrix of offscreen canvas
Follow up to I5bc980c4dc41bc304be3c190934c1f7c55c9d244

bug: 8967766
Change-Id: I37c2e8e70ff4966ca5e4f29e5cac8349d8fe73b6
2013-08-02 18:51:57 +09:00
Tadashi G. Takaoka
e08c418ff8 Move motion event dispatcher to PointerTracker
Change-Id: I967bf4629b7d1002be6aff6007dc03d2db05c562
2013-08-02 16:34:44 +09:00
Tadashi G. Takaoka
b6cc3a85ab Move non-distinct multitouch support to a separate class
Move code that support non-distinct multitouch screen device to the
NonDistinchMultitouchHelper class.

Change-Id: I2e44f782b83dbcd095ee8e51c36b0766da0cd457
2013-08-01 18:18:33 +09:00
Ken Wakasa
c8814e20b7 Deallocate gesture trail bitmap when unneeded
This frees up 1.7MB on Nexus 4 (occam), and 900KB on occam_svelte while
LatinIME goes to background.
The keyboard bring-up speed feels acceptable on both devices.

bug: 8967766
Change-Id: I5bc980c4dc41bc304be3c190934c1f7c55c9d244
2013-07-31 20:39:32 +09:00
Tadashi G. Takaoka
310ea9ab90 Remove sudden jump touch event hack
This hack was for Nexus One and Droid that can't run on ICS or later.

Change-Id: I1f9cef2022b0bbb333235e6b7c311c9785a1d894
2013-07-31 17:32:41 +09:00
Tadashi G. Takaoka
3b5c05f18c Merge "Fix Catalan keyboard layout" 2013-07-31 08:01:51 +00:00
Tadashi G. Takaoka
fea0862cf6 Merge "Fix missing Azerbaijani text resource" 2013-07-31 07:58:15 +00:00
Tadashi G. Takaoka
087c8a84a5 Fix Catalan keyboard layout
Bug: 10098472
Change-Id: I60e4aa6716f8166ca60ab5687b0faf2d84cd846b
2013-07-31 16:56:34 +09:00
Tadashi G. Takaoka
d4a6869d38 Fix missing Azerbaijani text resource
Though Azerbaijani subtype is disabled temporary by Ib8a38f85f4.

Change-Id: I887cf3508bd2945016c506eae1969778ba4582d3
2013-07-31 16:54:46 +09:00
Jean Chalard
8d46ea9156 Merge "Fix some warnings" 2013-07-31 07:38:49 +00:00
Jean Chalard
93445b4821 Fix some warnings
Change-Id: I7290cd1fb675a1b85b9b6ac2d464c932b5bca1dd
2013-07-31 16:17:01 +09:00
Tadashi G. Takaoka
212165b0b8 Clean up PointerTracker a bit
Change-Id: If4ff87348fbc40f271c68dad255dbc42f9b26eb6
2013-07-31 14:52:18 +09:00
Tadashi G. Takaoka
5c095e59f6 Cancel all ongoing event when onFinishInputView
Bug: 9334755
Change-Id: If0c2ac49a50f4a529aefeca603569f9413367469
2013-07-25 20:05:39 +09:00
Tadashi G. Takaoka
0c3a9b549c Make RunInLocale as top-level class
Change-Id: I07ed606b7aba098a5be85533e5baff300b21fb44
2013-07-24 16:00:25 +09:00
Tadashi G. Takaoka
a410cb48ea Move subtype related utility class to utils package
Change-Id: I3564796531ea85f2ebafde40cd822b806b8741df
2013-07-24 15:52:43 +09:00
Tadashi G. Takaoka
fe202d6738 Add Azerbaijani keyboard
Bug: 7963448
Change-Id: I39c192b342278e82e30ac6ef12c6d150c817ae70
2013-07-04 14:47:33 +09:00